adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Making Helper extend Object, this fixes issues where Helpers would not have dispatchMethod or requestAction available.

Browse source 
Correcting JsHelper::call__ into JsHelper::__call
Updating test cases to remove reference operators
This commit is contained in:
Mark Story 2010-04-23 21:21:31 -04:00
parent 9e08196c76
commit 33bfe0e5e2
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/view/helper.php
View file

@ -27,7 +27,7 @@
* @package cake
* @subpackage cake.cake.libs.view
*/
class Helper {
class Helper extends Object {
/**
* List of helpers used by this helper

2
cake/libs/view/helpers/js.php
View file

@ -119,7 +119,7 @@ class JsHelper extends AppHelper {
* @param array $params Parameters for the method being called.
* @return mixed Depends on the return of the dispatched method, or it could be an instance of the EngineHelper
*/
public function call__($method, $params) {
public function __call($method, $params) {
if (isset($this->{$this->__engineName}) && method_exists($this->{$this->__engineName}, $method)) {
$buffer = false;
if (in_array(strtolower($method), $this->{$this->__engineName}->bufferedMethods)) {

36
cake/tests/cases/libs/view/helpers/js.test.php
View file

@ -83,13 +83,13 @@ class JsHelperTestCase extends CakeTestCase {
$this->_asset = Configure::read('Asset.timestamp');
Configure::write('Asset.timestamp', false);
$this->Js =& new JsHelper('JsBase');
$this->Js->Html =& new HtmlHelper();
$this->Js->Form =& new FormHelper();
$this->Js->Form->Html =& new HtmlHelper();
$this->Js->JsBaseEngine =& new JsBaseEngineHelper();
$this->Js = new JsHelper('JsBase');
$this->Js->Html = new HtmlHelper();
$this->Js->Form = new FormHelper();
$this->Js->Form->Html = new HtmlHelper();
$this->Js->JsBaseEngine = new JsBaseEngineHelper();
$view =& new JsHelperMockView();
$view = new JsHelperMockView();
ClassRegistry::addObject('view', $view);
}
@ -111,11 +111,11 @@ class JsHelperTestCase extends CakeTestCase {
* @return void
*/
function _useMock() {
$this->Js =& new JsHelper(array('TestJs'));
$this->Js->TestJsEngine =& new TestJsEngineHelper($this);
$this->Js->Html =& new HtmlHelper();
$this->Js->Form =& new FormHelper();
$this->Js->Form->Html =& new HtmlHelper();
$this->Js = new JsHelper(array('TestJs'));
$this->Js->TestJsEngine = new TestJsEngineHelper($this);
$this->Js->Html = new HtmlHelper();
$this->Js->Form = new FormHelper();
$this->Js->Form->Html = new HtmlHelper();
}
/**
@ -124,16 +124,16 @@ class JsHelperTestCase extends CakeTestCase {
* @return void
*/
function testConstruction() {
$js =& new JsHelper();
$js = new JsHelper();
$this->assertEqual($js->helpers, array('Html', 'Form', 'JqueryEngine'));
$js =& new JsHelper(array('mootools'));
$js = new JsHelper(array('mootools'));
$this->assertEqual($js->helpers, array('Html', 'Form', 'mootoolsEngine'));
$js =& new JsHelper('prototype');
$js = new JsHelper('prototype');
$this->assertEqual($js->helpers, array('Html', 'Form', 'prototypeEngine'));
$js =& new JsHelper('MyPlugin.Dojo');
$js = new JsHelper('MyPlugin.Dojo');
$this->assertEqual($js->helpers, array('Html', 'Form', 'MyPlugin.DojoEngine'));
}
@ -148,7 +148,7 @@ class JsHelperTestCase extends CakeTestCase {
$this->Js->methodOne();
$this->Js->TestEngine =& new StdClass();
$this->Js->TestEngine = new StdClass();
$this->expectError();
$this->Js->someMethodThatSurelyDoesntExist();
}
@ -228,7 +228,7 @@ class JsHelperTestCase extends CakeTestCase {
$result = $this->Js->writeBuffer(array('onDomReady' => true, 'cache' => false, 'clear' => false));
ClassRegistry::removeObject('view');
$view =& new JsHelperMockView();
$view = new JsHelperMockView();
ClassRegistry::addObject('view', $view);
$view->expectCallCount('addScript', 1);
@ -244,7 +244,7 @@ class JsHelperTestCase extends CakeTestCase {
function testWriteBufferNotInline() {
$this->Js->set('foo', 1);
$view =& new JsHelperMockView();
$view = new JsHelperMockView();
ClassRegistry::removeObject('view');
ClassRegistry::addObject('view', $view);
$view->expectCallCount('addScript', 1);