adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding settings['callbacks'] as a way to define enabled/disabled state of helpers in settings arrays. This should replace the separate parameter.

Browse source 
Tests updated.
This commit is contained in:
mark_story 2010-11-06 14:58:27 -04:00
parent 92fec4588a
commit 1ba28c246b
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cake/libs/view/helper_collection.php
View file

@ -38,6 +38,9 @@ class HelperCollection extends ObjectCollection {
/**
* Loads/constructs a helper. Will return the instance in the registry if it already exists.
* By setting `$enable` to false you can disable callbacks for a helper. Alternatively you
* can set `$settings['callbacks'] = false` to disable callbacks. This alias is provided so that when
* declaring $helpers arrays you can disable callbacks on helpers.
*
* @param string $helper Helper name to load
* @param array $settings Settings for the helper.
@ -72,7 +75,7 @@ class HelperCollection extends ObjectCollection {
foreach ($vars as $var) {
$this->_loaded[$name]->{$var} = $this->_View->{$var};
}
$enable = isset($settings['callbacks']) ? $settings['callbacks'] : $enable;
if ($enable === true) {
$this->_enabled[] = $name;
}

14
cake/tests/cases/libs/view/helper_collection.test.php
View file

@ -69,6 +69,20 @@ class HelperCollectionTest extends CakeTestCase {
$this->assertFalse($this->Helpers->enabled('Html'), 'Html should be disabled');
}
/**
* test that the callbacks setting disables the helper.
*
* @return void
*/
function testLoadWithCallbacksFalse() {
$result = $this->Helpers->load('Html', array('callbacks' => false));
$this->assertType('HtmlHelper', $result);
$this->assertType('HtmlHelper', $this->Helpers->Html);
$this->assertFalse($this->Helpers->enabled('Html'), 'Html should be disabled');
}
/**
* test missinghelper exception
*