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

Merge branch 'master' into 2.4

Browse source 
Conflicts:
	lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
	lib/Cake/VERSION.txt
This commit is contained in:
ADmad 2013-07-07 12:22:12 +05:30
commit 4ded269549
59 changed files with 153 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/Cake/Console/Command/Task/ExtractTask.php
View file

@ -247,6 +247,7 @@ class ExtractTask extends AppShell {
* @param string $domain
* @param string $msgid
* @param array $details
* @return void
*/
protected function _addTranslation($domain, $msgid, $details = array()) {
if (empty($this->_translations[$domain][$msgid])) {
@ -440,11 +441,29 @@ class ExtractTask extends AppShell {
return;
}
$plugins = array(null);
if (empty($this->params['exclude-plugins'])) {
$plugins = array_merge($plugins, App::objects('plugins'));
}
foreach ($plugins as $plugin) {
$this->_extractPluginValidationMessages($plugin);
}
}
/**
* Extract validation messages from application or plugin models
*
* @param string $plugin Plugin name or `null` to process application models
* @return void
*/
protected function _extractPluginValidationMessages($plugin = null) {
App::uses('AppModel', 'Model');
$plugin = null;
if (!empty($this->params['plugin'])) {
App::uses($this->params['plugin'] . 'AppModel', $this->params['plugin'] . '.Model');
$plugin = $this->params['plugin'] . '.';
if (!empty($plugin)) {
if (!CakePlugin::loaded($plugin)) {
return;
}
App::uses($plugin . 'AppModel', $plugin . '.Model');
$plugin = $plugin . '.';
}
$models = App::objects($plugin . 'Model', null, false);

1
lib/Cake/Console/ConsoleErrorHandler.php
View file

@ -96,6 +96,7 @@ class ConsoleErrorHandler {
* Wrapper for exit(), used for testing.
*
* @param int $code The exit code.
* @return void
*/
protected function _stop($code = 0) {
exit($code);

2
lib/Cake/Controller/Component/Acl/AclInterface.php
View file

@ -28,6 +28,7 @@ interface AclInterface {
* @param string $aro ARO The requesting object identifier.
* @param string $aco ACO The controlled object identifier.
* @param string $action Action (defaults to *)
* @return boolean Success
*/
public function check($aro, $aco, $action = "*");
@ -65,6 +66,7 @@ interface AclInterface {
* Initialization method for the Acl implementation
*
* @param AclComponent $component
* @return void
*/
public function initialize(Component $component);

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

@ -31,7 +31,7 @@ App::uses('CakeEmail', 'Network/Email');
* @package Cake.Controller.Component
* @link http://book.cakephp.org/2.0/en/core-libraries/components/email.html
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/email.html
* @deprecated Use Network/CakeEmail
* @deprecated Will be removed in 3.0. Use Network/CakeEmail instead
*/
class EmailComponent extends Component {

17
lib/Cake/Error/exceptions.php
View file

@ -36,13 +36,12 @@ class CakeBaseException extends RuntimeException {
/**
* Get/set the response header to be used
*
* See also CakeResponse::header()
*
* @param string|array $header. An array of header strings or a single header string
* - an associative array of "header name" => "header value"
* - an array of string headers is also accepted
* @param string $value. The header value.
* @return array
* @see CakeResponse::header()
*/
public function responseHeader($header = null, $value = null) {
if ($header) {
@ -79,7 +78,7 @@ class BadRequestException extends HttpException {
* Constructor
*
* @param string $message If no message is given 'Bad Request' will be the message
* @param string $code Status code, defaults to 400
* @param int $code Status code, defaults to 400
*/
public function __construct($message = null, $code = 400) {
if (empty($message)) {
@ -101,7 +100,7 @@ class UnauthorizedException extends HttpException {
* Constructor
*
* @param string $message If no message is given 'Unauthorized' will be the message
* @param string $code Status code, defaults to 401
* @param int $code Status code, defaults to 401
*/
public function __construct($message = null, $code = 401) {
if (empty($message)) {
@ -123,7 +122,7 @@ class ForbiddenException extends HttpException {
* Constructor
*
* @param string $message If no message is given 'Forbidden' will be the message
* @param string $code Status code, defaults to 403
* @param int $code Status code, defaults to 403
*/
public function __construct($message = null, $code = 403) {
if (empty($message)) {
@ -145,7 +144,7 @@ class NotFoundException extends HttpException {
* Constructor
*
* @param string $message If no message is given 'Not Found' will be the message
* @param string $code Status code, defaults to 404
* @param int $code Status code, defaults to 404
*/
public function __construct($message = null, $code = 404) {
if (empty($message)) {
@ -167,7 +166,7 @@ class MethodNotAllowedException extends HttpException {
* Constructor
*
* @param string $message If no message is given 'Method Not Allowed' will be the message
* @param string $code Status code, defaults to 405
* @param int $code Status code, defaults to 405
*/
public function __construct($message = null, $code = 405) {
if (empty($message)) {
@ -189,7 +188,7 @@ class InternalErrorException extends HttpException {
* Constructor
*
* @param string $message If no message is given 'Internal Server Error' will be the message
* @param string $code Status code, defaults to 500
* @param int $code Status code, defaults to 500
*/
public function __construct($message = null, $code = 500) {
if (empty($message)) {
@ -231,7 +230,7 @@ class CakeException extends CakeBaseException {
*
* @param string|array $message Either the string of the error message, or an array of attributes
* that are made available in the view, and sprintf()'d into CakeException::$_messageTemplate
* @param string $code The code of the error, is also the HTTP status code for the error.
* @param int $code The code of the error, is also the HTTP status code for the error.
*/
public function __construct($message, $code = 500) {
if (is_array($message)) {

8
lib/Cake/Log/CakeLog.php
View file

@ -255,8 +255,8 @@ class CakeLog {
* }}}
*
* @param array $levels array
* @param bool $append true to append, false to replace
* @return array active log levels
* @param boolean $append true to append, false to replace
* @return array Active log levels
*/
public static function levels($levels = array(), $append = true) {
if (empty(self::$_Collection)) {
@ -278,7 +278,7 @@ class CakeLog {
/**
* Reset log levels to the original value
*
* @return array default log levels
* @return array Default log levels
*/
public static function defaultLevels() {
self::$_levelMap = self::$_defaultLevels;
@ -304,7 +304,7 @@ class CakeLog {
* Checks whether $streamName is enabled
*
* @param string $streamName to check
* @return bool
* @return boolean
* @throws CakeLogException
*/
public static function enabled($streamName) {

1
lib/Cake/Model/Behavior/TranslateBehavior.php
View file

@ -628,6 +628,7 @@ class TranslateBehavior extends ModelBehavior {
*
* @param Model $Model Model instance
* @param string $field The field to update.
* @return void
*/
protected function _removeField(Model $Model, $field) {
if (array_key_exists($field, $this->settings[$Model->alias])) {

1
lib/Cake/Model/Validator/CakeValidationSet.php
View file

@ -331,6 +331,7 @@ class CakeValidationSet implements ArrayAccess, IteratorAggregate, Countable {
*
* @param string $index name of the rule
* @param CakeValidationRule|array rule to add to $index
* @return void
*/
public function offsetSet($index, $rule) {
$this->setRule($index, $rule);

4
lib/Cake/Network/CakeRequest.php
View file

@ -475,7 +475,7 @@ class CakeRequest implements ArrayAccess {
* on routing parameters.
*
* @param string $name The property being accessed.
* @return bool Existence
* @return boolean Existence
*/
public function __isset($name) {
return isset($this->params[$name]);
@ -693,7 +693,7 @@ class CakeRequest implements ArrayAccess {
*
* @param integer $tldLength Number of segments your tld contains. For example: `example.com` contains 1 tld.
* While `example.co.uk` contains 2.
* @return array of subdomains.
* @return array An array of subdomains.
*/
public function subdomains($tldLength = 1) {
$segments = explode('.', $this->host());

2
lib/Cake/Network/CakeResponse.php
View file

@ -776,7 +776,7 @@ class CakeResponse {
* This method controls the `public` or `private` directive in the Cache-Control
* header
*
* @param boolean $public if set to true, the Cache-Control header will be set as public
* @param boolean $public If set to true, the Cache-Control header will be set as public
* if set to false, the response will be set to private
* if no value is provided, it will return whether the response is sharable or not
* @param integer $time time in seconds after which the response should no longer be considered fresh

1
lib/Cake/Network/CakeSocket.php
View file

@ -186,6 +186,7 @@ class CakeSocket {
*
* @param int $code
* @param string $message
* @return void
*/
protected function _connectionErrorHandler($code, $message) {
$this->_connectionErrors[] = $message;

3
lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
View file

@ -268,7 +268,7 @@ class ExtractTaskTest extends CakeTestCase {
$this->out = $this->getMock('ConsoleOutput', array(), array(), '', false);
$this->in = $this->getMock('ConsoleInput', array(), array(), '', false);
$this->Task = $this->getMock('ExtractTask',
array('_isExtractingApp', '_extractValidationMessages', 'in', 'out', 'err', 'clear', '_stop'),
array('_isExtractingApp', 'in', 'out', 'err', 'clear', '_stop'),
array($this->out, $this->out, $this->in)
);
@ -280,6 +280,7 @@ class ExtractTaskTest extends CakeTestCase {
$this->assertNotRegExp('#Pages#', $result);
$this->assertContains('translate.ctp:1', $result);
$this->assertContains('This is a translatable string', $result);
$this->assertContains('I can haz plugin model validation message', $result);
}
/**

2
lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php
View file

@ -498,7 +498,7 @@ class DbAclTest extends CakeTestCase {
* Generates a list of the current aro and aco structures and a grid dump of the permissions that are defined
* Only designed to work with the db based ACL
*
* @param bool $treesToo
* @param boolean $treesToo
* @return void
*/
protected function _debug($printTreesToo = false) {

2
lib/Cake/Test/Case/Core/ConfigureTest.php
View file

@ -447,7 +447,7 @@ class ConfigureTest extends CakeTestCase {
/**
* Test dumping only some of the data.
*
* @return
* @return void
*/
public function testDumpPartial() {
Configure::config('test_reader', new PhpReader(TMP));

2
lib/Cake/Test/Case/I18n/I18nTest.php
View file

@ -194,7 +194,7 @@ class I18nTest extends CakeTestCase {
/**
* Assertions for rules zero.
*
* @return
* @return void
*/
public function assertRulesZero() {
$singular = $this->__singular();

6
lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
View file

@ -184,7 +184,7 @@ class TestBehavior extends ModelBehavior {
* afterValidate method
*
* @param Model $model
* @param bool $cascade
* @param boolean $cascade
* @return void
*/
public function afterValidate(Model $model) {
@ -205,7 +205,7 @@ class TestBehavior extends ModelBehavior {
* beforeDelete method
*
* @param Model $model
* @param bool $cascade
* @param boolean $cascade
* @return void
*/
public function beforeDelete(Model $model, $cascade = true) {
@ -277,7 +277,7 @@ class TestBehavior extends ModelBehavior {
* testMethod method
*
* @param Model $model
* @param bool $param
* @param boolean $param
* @return void
*/
public function testMethod(Model $model, $param = true) {

2
lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
View file

@ -2508,7 +2508,7 @@ class MysqlTest extends CakeTestCase {
/**
* Test that array conditions with only one element work.
*
* @return
* @return void
*/
public function testArrayConditionsOneElement() {
$conditions = array('id' => array(1));

3
lib/Cake/Test/Case/Model/ModelReadTest.php
View file

@ -3765,7 +3765,7 @@ class ModelReadTest extends BaseModelTest {
/**
* Test find(neighbors) with missing fields so no neighbors are found.
*
* @return
* @return void
*/
public function testFindNeighborsNoPrev() {
$this->loadFixtures('User', 'Article', 'Comment', 'Tag', 'ArticlesTag', 'Attachment');
@ -3786,6 +3786,7 @@ class ModelReadTest extends BaseModelTest {
);
$this->assertEquals($expected, $result);
}
/**
* testFindCombinedRelations method
*

2
lib/Cake/Test/Case/Model/models.php
View file

@ -2547,7 +2547,7 @@ class NumberTree extends CakeTestModel {
* @param mixed $currentLevel
* @param mixed $parent_id
* @param string $prefix
* @param bool $hierarchal
* @param boolean $hierarchal
* @return void
*/
public function initialize($levelLimit = 3, $childLimit = 3, $currentLevel = null, $parentId = null, $prefix = '1', $hierarchal = true) {

4
lib/Cake/Test/Case/Network/CakeRequestTest.php
View file

@ -33,7 +33,8 @@ class TestCakeRequest extends CakeRequest {
* reConstruct method
*
* @param string $url
* @param bool $parseEnvironment
* @param boolean $parseEnvironment
* @return void
*/
public function reConstruct($url = 'some/path', $parseEnvironment = true) {
$this->_base();
@ -2159,6 +2160,7 @@ XML;
/**
* Test onlyAllow throwing exception
*
* @return void
*/
public function testOnlyAllowException() {
$_SERVER['REQUEST_METHOD'] = 'PUT';

2
lib/Cake/Test/Case/Utility/FileTest.php
View file

@ -543,7 +543,7 @@ class FileTest extends CakeTestCase {
/**
* getTmpFile method
*
* @param bool $paintSkip
* @param boolean $paintSkip
* @return void
*/
protected function _getTmpFile($paintSkip = true) {

2
lib/Cake/Test/Case/Utility/SecurityTest.php
View file

@ -265,7 +265,7 @@ class SecurityTest extends CakeTestCase {
/**
* Test that rijndael() can still decrypt values with a fixed iv.
*
* @return
* @return void
*/
public function testRijndaelBackwardCompatibility() {
$this->skipIf(!function_exists('mcrypt_encrypt'));

2
lib/Cake/Test/Case/View/HelperTest.php
View file

@ -309,7 +309,7 @@ class HelperTest extends CakeTestCase {
/**
* test setEntity with setting a scope.
*
* @return
* @return void
*/
public function testSetEntityScoped() {
$this->Helper->setEntity('HelperTestPost', true);

9
lib/Cake/Test/test_app/Plugin/TestPlugin/Model/TestPluginAuthors.php
View file

@ -32,4 +32,13 @@ class TestPluginAuthors extends TestPluginAppModel {
public $name = 'TestPluginAuthors';
public $validate = array(
'field' => array(
'notEmpty' => array(
'rule' => 'notEmpty',
'message' => 'I can haz plugin model validation message',
),
),
);
}

2
lib/Cake/Test/test_app/tmp/dir_map
View file

@ -1,2 +0,0 @@
1845415352
a:4:{s:27:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs";a:24:{i:0;s:27:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs";i:1;s:32:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view";i:2;s:42:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\scaffolds";i:3;s:38:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\pages";i:4;s:40:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\layouts";i:5;s:44:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\layouts\\\\xml";i:6;s:44:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\layouts\\\\rss";i:7;s:43:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\layouts\\\\js";i:8;s:46:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\layouts\\\\email";i:9;s:51:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\layouts\\\\email\\\\text";i:10;s:51:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\layouts\\\\email\\\\html";i:11;s:40:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\helpers";i:12;s:39:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\errors";i:13;s:41:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\elements";i:14;s:47:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\elements\\\\email";i:15;s:52:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\elements\\\\email\\\\text";i:16;s:52:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\elements\\\\email\\\\html";i:17;s:33:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\model";i:18;s:45:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\model\\\\datasources";i:19;s:49:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\model\\\\datasources\\\\dbo";i:20;s:43:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\model\\\\behaviors";i:21;s:38:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\controller";i:22;s:49:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\controller\\\\components";i:23;s:33:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\cache";}s:35:"C:\\\\dev\\\\prj2\\\\sites\\\\main_site\\\\vendors";a:7:{i:0;s:35:"C:\\\\dev\\\\prj2\\\\sites\\\\main_site\\\\vendors";i:1;s:42:"C:\\\\dev\\\\prj2\\\\sites\\\\main_site\\\\vendors\\\\shells";i:2;s:52:"C:\\\\dev\\\\prj2\\\\sites\\\\main_site\\\\vendors\\\\shells\\\\templates";i:3;s:64:"C:\\\\dev\\\\prj2\\\\sites\\\\main_site\\\\vendors\\\\shells\\\\templates\\\\cdc_project";i:4;s:48:"C:\\\\dev\\\\prj2\\\\sites\\\\main_site\\\\vendors\\\\shells\\\\tasks";i:5;s:38:"C:\\\\dev\\\\prj2\\\\sites\\\\main_site\\\\vendors\\\\js";i:6;s:39:"C:\\\\dev\\\\prj2\\\\sites\\\\main_site\\\\vendors\\\\css";}s:25:"C:\\\\dev\\\\prj2\\\\sites\\\\vendors";a:10:{i:0;s:25:"C:\\\\dev\\\\prj2\\\\sites\\\\vendors";i:1;s:36:"C:\\\\dev\\\\prj2\\\\sites\\\\vendors\\\\simpletest";i:2;s:41:"C:\\\\dev\\\\prj2\\\\sites\\\\vendors\\\\simpletest\\\\test";i:3;s:49:"C:\\\\dev\\\\prj2\\\\sites\\\\vendors\\\\simpletest\\\\test\\\\support";i:4;s:59:"C:\\\\dev\\\\prj2\\\\sites\\\\vendors\\\\simpletest\\\\test\\\\support\\\\collector";i:5;s:47:"C:\\\\dev\\\\prj2\\\\sites\\\\vendors\\\\simpletest\\\\extensions";i:6;s:55:"C:\\\\dev\\\\prj2\\\\sites\\\\vendors\\\\simpletest\\\\extensions\\\\testdox";i:7;s:41:"C:\\\\dev\\\\prj2\\\\sites\\\\vendors\\\\simpletest\\\\docs";i:8;s:44:"C:\\\\dev\\\\prj2\\\\sites\\\\vendors\\\\simpletest\\\\docs\\\\fr";i:9;s:44:"C:\\\\dev\\\\prj2\\\\sites\\\\vendors\\\\simpletest\\\\docs\\\\en";}s:41:"C:\\\\dev\\\\prj2\\\\sites\\\\main_site\\\\views\\\\helpers";a:1:{i:0;s:41:"C:\\\\dev\\\\prj2\\\\sites\\\\main_site\\\\views\\\\helpers";}}

0
lib/Cake/Test/test_app/tmp/empty Normal file
View file

1
lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php
View file

@ -373,6 +373,7 @@ class CakeHtmlReporter extends CakeBaseReporter {
* A test suite started.
*
* @param PHPUnit_Framework_TestSuite $suite
* @return void
*/
public function startTestSuite(PHPUnit_Framework_TestSuite $suite) {
if (!$this->_headerSent) {

6
lib/Cake/Utility/String.php
View file

@ -191,9 +191,9 @@ class String {
* - clean: A boolean or array with instructions for String::cleanInsert
*
* @param string $str A string containing variable placeholders
* @param string $data A key => val array where each key stands for a placeholder variable name
* @param array $data A key => val array where each key stands for a placeholder variable name
* to be replaced with val
* @param string $options An array of options, see description above
* @param array $options An array of options, see description above
* @return string
*/
public static function insert($str, $data, $options = array()) {
@ -256,7 +256,7 @@ class String {
* by String::insert().
*
* @param string $str
* @param string $options
* @param array $options
* @return string
* @see String::insert()
*/

41
lib/Cake/View/Helper/FormHelper.php
View file

@ -599,9 +599,9 @@ class FormHelper extends AppHelper {
*
* @param boolean $lock Whether this field should be part of the validation
* or excluded as part of the unlockedFields.
* @param string|array $field Reference to field to be secured. Should be dot separated to indicate nesting.
* @param string $field Reference to field to be secured. Should be dot separated to indicate nesting.
* @param mixed $value Field value, if value should not be tampered with.
* @return void
* @return mixed|null Not used yet
*/
protected function _secure($lock, $field = null, $value = null) {
if (!$field) {
@ -649,10 +649,10 @@ class FormHelper extends AppHelper {
*
* ### Options:
*
* - `escape` bool Whether or not to html escape the contents of the error.
* - `wrap` mixed Whether or not the error message should be wrapped in a div. If a
* - `escape` bool - Whether or not to html escape the contents of the error.
* - `wrap` mixed - Whether or not the error message should be wrapped in a div. If a
* string, will be used as the HTML tag to use.
* - `class` string The classname for the error message
* - `class` string - The classname for the error message
*
* @param string $field A field name, like "Modelname.fieldname"
* @param string|array $text Error message as string or array of messages.
@ -1029,8 +1029,8 @@ class FormHelper extends AppHelper {
/**
* Generates an input element
*
* @param type $args
* @return type
* @param array $args The options for the input element
* @return string The generated input element
*/
protected function _getInput($args) {
extract($args);
@ -1069,7 +1069,7 @@ class FormHelper extends AppHelper {
/**
* Generates input options array
*
* @param type $options
* @param array $options
* @return array Options
*/
protected function _parseOptions($options) {
@ -1100,7 +1100,7 @@ class FormHelper extends AppHelper {
/**
* Generates list of options for multiple select
*
* @param type $options
* @param array $options
* @return array
*/
protected function _optionsOptions($options) {
@ -1110,7 +1110,7 @@ class FormHelper extends AppHelper {
$varName = Inflector::variable(
Inflector::pluralize(preg_replace('/_id$/', '', $this->field()))
);
$varOptions = $this->_View->getVar($varName);
$varOptions = $this->_View->get($varName);
if (!is_array($varOptions)) {
return $options;
}
@ -1124,7 +1124,7 @@ class FormHelper extends AppHelper {
/**
* Magically set option type and corresponding options
*
* @param type $options
* @param array $options
* @return array
*/
protected function _magicOptions($options) {
@ -1192,7 +1192,7 @@ class FormHelper extends AppHelper {
/**
* Generate format options
*
* @param type $options
* @param array $options
* @return array
*/
protected function _getFormat($options) {
@ -1211,8 +1211,8 @@ class FormHelper extends AppHelper {
/**
* Generate label for input
*
* @param type $fieldName
* @param type $options
* @param string $fieldName
* @param array $options
* @return boolean|string false or Generated label element
*/
protected function _getLabel($fieldName, $options) {
@ -1234,7 +1234,7 @@ class FormHelper extends AppHelper {
/**
* Calculates maxlength option
*
* @param type $options
* @param array $options
* @return array
*/
protected function _maxLength($options) {
@ -1310,9 +1310,8 @@ class FormHelper extends AppHelper {
*
* @param string $fieldName
* @param string $label
* @param array $options Options for the label element.
* @param array $options Options for the label element. 'NONE' option is deprecated and will be removed in 3.0
* @return string Generated label element
* @deprecated 'NONE' option is deprecated and will be removed in 3.0
*/
protected function _inputLabel($fieldName, $label, $options) {
$labelAttributes = $this->domId(array(), 'for');
@ -1739,7 +1738,7 @@ class FormHelper extends AppHelper {
* @param string $title The content to be wrapped by <a> tags.
* @param string|array $url Cake-relative URL or array of URL parameters, or external URL (starts with http://)
* @param array $options Array of HTML attributes.
* @param string $confirmMessage JavaScript confirmation message.
* @param bool|string $confirmMessage JavaScript confirmation message.
* @return string An `<a />` element.
* @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::postLink
*/
@ -2242,7 +2241,7 @@ class FormHelper extends AppHelper {
* - `value` The selected value of the input.
*
* @param string $fieldName Prefix name for the SELECT element
* @param string $attributes Array of Attributes
* @param array $attributes Array of Attributes
* @return string Completed minute select input.
* @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::minute
*/
@ -2302,7 +2301,7 @@ class FormHelper extends AppHelper {
* - `value` The selected value of the input.
*
* @param string $fieldName Prefix name for the SELECT element
* @param string $attributes Array of Attributes
* @param array|string $attributes Array of Attributes
* @return string Completed meridian select input
* @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::meridian
*/
@ -2352,7 +2351,7 @@ class FormHelper extends AppHelper {
* @param string $fieldName Prefix name for the SELECT element
* @param string $dateFormat DMY, MDY, YMD, or null to not generate date inputs.
* @param string $timeFormat 12, 24, or null to not generate time inputs.
* @param string $attributes array of Attributes
* @param array|string $attributes array of Attributes
* @return string Generated set of select boxes for the date and time formats chosen.
* @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::dateTime
*/

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

@ -583,7 +583,7 @@ class View extends Object {
*
* @param string $var The view var you want the contents of.
* @return mixed The content of the named var if its set, otherwise null.
* @deprecated Will be removed in 3.0 Use View::get() instead.
* @deprecated Will be removed in 3.0. Use View::get() instead.
*/
public function getVar($var) {
return $this->get($var);

4
lib/Cake/View/XmlView.php
View file

@ -94,9 +94,9 @@ class XmlView extends View {
}
/**
* Serialize view vars
* Serialize view vars.
*
* @param array $serialize The viewVars that need to be serialized
* @param array $serialize The viewVars that need to be serialized.
* @return string The serialized data
*/
protected function _serialize($serialize) {

2
lib/Cake/basics.php
View file

@ -68,6 +68,7 @@ if (!function_exists('debug')) {
* @param boolean $var Variable to show debug information for.
* @param boolean $showHtml If set to true, the method prints the debug data in a browser-friendly way.
* @param boolean $showFrom If set to true, the method prints from where the function was called.
* @return void
* @link http://book.cakephp.org/2.0/en/development/debugging.html#basic-debugging
* @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#debug
*/
@ -238,6 +239,7 @@ if (!function_exists('pr')) {
*
* @see debug()
* @param array $var Variable to print out
* @return void
* @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#pr
*/
function pr($var) {