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

Updated Controller:: doc block and ControllerMergeVarsTest::

Browse source
This commit is contained in:
Bryan Crowe 2013-09-25 22:53:23 -04:00
parent 915b51b239
commit ab4bc16463
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Controller/Controller.php
View file

@ -88,7 +88,7 @@ class Controller extends Object implements CakeEventListener {
* An array containing the names of helpers this controller uses. The array elements should * An array containing the names of helpers this controller uses. The array elements should
* not contain the "Helper" part of the classname. * not contain the "Helper" part of the classname.
* *
* Example: `public $helpers = array('Html', 'JavaScript', 'Time', 'Ajax');` * Example: `public $helpers = array('Html', 'Js', 'Time', 'Ajax');`
* *
* @var mixed A single name as a string or a list of names as an array. * @var mixed A single name as a string or a list of names as an array.
* @link http://book.cakephp.org/2.0/en/controllers.html#components-helpers-and-uses * @link http://book.cakephp.org/2.0/en/controllers.html#components-helpers-and-uses

4
lib/Cake/Test/Case/Controller/ControllerMergeVarsTest.php
View file

@ -94,7 +94,7 @@ class MergeVarPluginAppController extends MergeVarsAppController {
* *
* @var array * @var array
*/ */
public $helpers = array('JavaScript'); public $helpers = array('Js');
/** /**
* parent for mergeVars * parent for mergeVars
@ -205,7 +205,7 @@ class ControllerMergeVarsTest extends CakeTestCase {
$expected = array( $expected = array(
'MergeVar' => array('format' => 'html', 'terse'), 'MergeVar' => array('format' => 'html', 'terse'),
'JavaScript' => null 'Js' => null
); );
$this->assertEquals($expected, $Controller->helpers, 'Helpers are unexpected.'); $this->assertEquals($expected, $Controller->helpers, 'Helpers are unexpected.');