mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
Merge branch 'master' into 2.4
Conflicts: lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php lib/Cake/VERSION.txt
This commit is contained in:
ADmad
commit
4ded269549
59 changed files with 153 additions and 116 deletions
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -585,7 +585,7 @@ class Shell extends Object {
|
|||
*
|
||||
* There are 3 built-in output level. Shell::QUIET, Shell::NORMAL, Shell::VERBOSE.
|
||||
* The verbose and quiet output levels, map to the `verbose` and `quiet` output switches
|
||||
* present in most shells. Using Shell::QUIET for a message means it will always display.
|
||||
* present in most shells. Using Shell::QUIET for a message means it will always display.
|
||||
* While using Shell::VERBOSE means it will only display when verbose output is toggled.
|
||||
*
|
||||
* @param string|array $message A string or a an array of strings to output
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
*/
|
||||
?>
|
||||
<div class="<?php echo $pluralVar; ?> view">
|
||||
<h2><?php echo "<?php echo __('{$singularHumanName}'); ?>"; ?></h2>
|
||||
<h2><?php echo "<?php echo __('{$singularHumanName}'); ?>"; ?></h2>
|
||||
<dl>
|
||||
<?php
|
||||
foreach ($fields as $field) {
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -28,15 +28,15 @@ App::uses('FormAuthenticate', 'Controller/Component/Auth');
|
|||
* )
|
||||
* }}}
|
||||
*
|
||||
* When configuring BlowfishAuthenticate you can pass in settings to which fields, model and additional conditions
|
||||
* When configuring BlowfishAuthenticate you can pass in settings to which fields, model and additional conditions
|
||||
* are used. See FormAuthenticate::$settings for more information.
|
||||
*
|
||||
* For initial password hashing/creation see Security::hash(). Other than how the password is initially hashed,
|
||||
* BlowfishAuthenticate works exactly the same way as FormAuthenticate.
|
||||
*
|
||||
* @package Cake.Controller.Component.Auth
|
||||
* @since CakePHP(tm) v 2.3
|
||||
* @see AuthComponent::$authenticate
|
||||
* @since CakePHP(tm) v 2.3
|
||||
* @see AuthComponent::$authenticate
|
||||
* @deprecated Since 2.4. Just use FormAuthenticate with 'passwordHasher' setting set to 'Blowfish'
|
||||
*/
|
||||
class BlowfishAuthenticate extends FormAuthenticate {
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ App::uses('BasicAuthenticate', 'Controller/Component/Auth');
|
|||
* password using `DigestAuthenticate::password()`. If you wish to use digest authentication alongside other
|
||||
* authentication methods, its recommended that you store the digest authentication separately.
|
||||
*
|
||||
* Clients using Digest Authentication must support cookies. Since AuthComponent identifies users based
|
||||
* Clients using Digest Authentication must support cookies. Since AuthComponent identifies users based
|
||||
* on Session contents, clients without support for cookies will not function properly.
|
||||
*
|
||||
* ### Using Digest auth
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ class CookieComponent extends Component {
|
|||
* $this->Cookie->path = '/';
|
||||
*
|
||||
* The path on the server in which the cookie will be available on.
|
||||
* If public $cookiePath is set to '/foo/', the cookie will only be available
|
||||
* If public $cookiePath is set to '/foo/', the cookie will only be available
|
||||
* within the /foo/ directory and all sub-directories such as /foo/bar/ of domain.
|
||||
* The default value is the entire domain.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -29,9 +29,9 @@ App::uses('CakeEmail', 'Network/Email');
|
|||
* based on the standard outlined in http://www.rfc-editor.org/rfc/rfc2822.txt
|
||||
*
|
||||
* @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
|
||||
* @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 Will be removed in 3.0. Use Network/CakeEmail instead
|
||||
*/
|
||||
class EmailComponent extends Component {
|
||||
|
||||
|
|
|
|||
|
|
@ -112,9 +112,9 @@ class Object {
|
|||
* Calls a method on this object with the given parameters. Provides an OO wrapper
|
||||
* for `call_user_func_array`
|
||||
*
|
||||
* @param string $method Name of the method to call
|
||||
* @param array $params Parameter list to use when calling $method
|
||||
* @return mixed Returns the result of the method call
|
||||
* @param string $method Name of the method to call
|
||||
* @param array $params Parameter list to use when calling $method
|
||||
* @return mixed Returns the result of the method call
|
||||
*/
|
||||
public function dispatchMethod($method, $params = array()) {
|
||||
switch (count($params)) {
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ App::uses('Router', 'Routing');
|
|||
*
|
||||
* ### Uncaught exceptions
|
||||
*
|
||||
* When debug < 1 a CakeException will render 404 or 500 errors. If an uncaught exception is thrown
|
||||
* When debug < 1 a CakeException will render 404 or 500 errors. If an uncaught exception is thrown
|
||||
* and it is a type that ErrorHandler does not know about it will be treated as a 500 error.
|
||||
*
|
||||
* ### Implementing application specific exception handling
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ App::uses('Controller', 'Controller');
|
|||
* Exception Renderer.
|
||||
*
|
||||
* Captures and handles all unhandled exceptions. Displays helpful framework errors when debug > 1.
|
||||
* When debug < 1 a CakeException will render 404 or 500 errors. If an uncaught exception is thrown
|
||||
* When debug < 1 a CakeException will render 404 or 500 errors. If an uncaught exception is thrown
|
||||
* and it is a type that ExceptionHandler does not know about it will be treated as a 500 error.
|
||||
*
|
||||
* ### Implementing application specific exception rendering
|
||||
|
|
|
|||
|
|
@ -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)) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ class ContainableBehavior extends ModelBehavior {
|
|||
* )));
|
||||
* }}}
|
||||
*
|
||||
* @param Model $Model Model using the behavior
|
||||
* @param Model $Model Model using the behavior
|
||||
* @param array $query Query parameters as set by cake
|
||||
* @return array
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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])) {
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ class TreeBehavior extends ModelBehavior {
|
|||
/**
|
||||
* Runs before a find() operation
|
||||
*
|
||||
* @param Model $Model Model using the behavior
|
||||
* @param Model $Model Model using the behavior
|
||||
* @param array $query Query parameters as set by cake
|
||||
* @return array
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@ class DataSource extends Object {
|
|||
/**
|
||||
* Converts column types to basic types
|
||||
*
|
||||
* @param string $real Real column type (i.e. "varchar(255)")
|
||||
* @param string $real Real column type (i.e. "varchar(255)")
|
||||
* @return string Abstract column type (i.e. "string")
|
||||
*/
|
||||
public function column($real) {
|
||||
|
|
|
|||
|
|
@ -333,7 +333,7 @@ class Postgres extends DboSource {
|
|||
* @param string|Model $table A string or model class representing the table to be truncated
|
||||
* @param boolean $reset true for resetting the sequence, false to leave it as is.
|
||||
* and if 1, sequences are not modified
|
||||
* @return boolean SQL TRUNCATE TABLE statement, false if not applicable.
|
||||
* @return boolean SQL TRUNCATE TABLE statement, false if not applicable.
|
||||
*/
|
||||
public function truncate($table, $reset = false) {
|
||||
$table = $this->fullTableName($table, false, false);
|
||||
|
|
|
|||
|
|
@ -227,7 +227,7 @@ class Sqlite extends DboSource {
|
|||
* primary key, where applicable.
|
||||
*
|
||||
* @param string|Model $table A string or model class representing the table to be truncated
|
||||
* @return boolean SQL TRUNCATE TABLE statement, false if not applicable.
|
||||
* @return boolean SQL TRUNCATE TABLE statement, false if not applicable.
|
||||
*/
|
||||
public function truncate($table) {
|
||||
$this->_execute('DELETE FROM sqlite_sequence where name=' . $this->startQuote . $this->fullTableName($table, false, false) . $this->endQuote);
|
||||
|
|
|
|||
|
|
@ -2031,7 +2031,7 @@ class DboSource extends DataSource {
|
|||
* primary key, where applicable.
|
||||
*
|
||||
* @param Model|string $table A string or model class representing the table to be truncated
|
||||
* @return boolean SQL TRUNCATE TABLE statement, false if not applicable.
|
||||
* @return boolean SQL TRUNCATE TABLE statement, false if not applicable.
|
||||
*/
|
||||
public function truncate($table) {
|
||||
return $this->execute('TRUNCATE TABLE ' . $this->fullTableName($table));
|
||||
|
|
|
|||
|
|
@ -948,7 +948,7 @@ class Model extends Object implements CakeEventListener {
|
|||
* unbound models that are not made permanent will reset with the next call to Model::find()
|
||||
*
|
||||
* @param array $params Set of bindings to unbind (indexed by binding type)
|
||||
* @param boolean $reset Set to false to make the unbinding permanent
|
||||
* @param boolean $reset Set to false to make the unbinding permanent
|
||||
* @return boolean Success
|
||||
* @link http://book.cakephp.org/2.0/en/models/associations-linking-models-together.html#creating-and-destroying-associations-on-the-fly
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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]);
|
||||
|
|
@ -579,7 +579,7 @@ class CakeRequest implements ArrayAccess {
|
|||
* e.g `addDetector('post', array('param' => 'requested', 'value' => 1)`
|
||||
*
|
||||
* @param string $name The name of the detector.
|
||||
* @param array $options The options for the detector definition. See above.
|
||||
* @param array $options The options for the detector definition. See above.
|
||||
* @return void
|
||||
*/
|
||||
public function addDetector($name, $options) {
|
||||
|
|
@ -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());
|
||||
|
|
|
|||
|
|
@ -776,9 +776,9 @@ 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
|
||||
* 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 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
|
||||
* @return boolean
|
||||
*/
|
||||
|
|
@ -856,7 +856,7 @@ class CakeResponse {
|
|||
* If called with no parameters, this function will return whether must-revalidate is present.
|
||||
*
|
||||
* @param integer $seconds if null, the method will return the current
|
||||
* must-revalidate value
|
||||
* must-revalidate value
|
||||
* @return boolean
|
||||
*/
|
||||
public function mustRevalidate($enable = null) {
|
||||
|
|
@ -966,7 +966,7 @@ class CakeResponse {
|
|||
* value is returned
|
||||
*
|
||||
* @param string|array $cacheVariances a single Vary string or a array
|
||||
* containing the list for variances.
|
||||
* containing the list for variances.
|
||||
* @return array
|
||||
*/
|
||||
public function vary($cacheVariances = null) {
|
||||
|
|
@ -998,7 +998,7 @@ class CakeResponse {
|
|||
*
|
||||
* @param string $hash the unique has that identifies this response
|
||||
* @param boolean $weak whether the response is semantically the same as
|
||||
* other with the same hash or not
|
||||
* other with the same hash or not
|
||||
* @return string
|
||||
*/
|
||||
public function etag($tag = null, $weak = false) {
|
||||
|
|
|
|||
|
|
@ -186,6 +186,7 @@ class CakeSocket {
|
|||
*
|
||||
* @param int $code
|
||||
* @param string $message
|
||||
* @return void
|
||||
*/
|
||||
protected function _connectionErrorHandler($code, $message) {
|
||||
$this->_connectionErrors[] = $message;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -578,7 +578,7 @@ class PaginatorComponentTest extends CakeTestCase {
|
|||
}
|
||||
|
||||
/**
|
||||
* test paginate() and model default order
|
||||
* test paginate() and model default order
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -813,7 +813,7 @@ class AppTest extends CakeTestCase {
|
|||
}
|
||||
|
||||
/**
|
||||
* Tests that App::location() returns the defined path for a class
|
||||
* Tests that App::location() returns the defined path for a class
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@ class I18nTest extends CakeTestCase {
|
|||
/**
|
||||
* Assertions for rules zero.
|
||||
*
|
||||
* @return
|
||||
* @return void
|
||||
*/
|
||||
public function assertRulesZero() {
|
||||
$singular = $this->__singular();
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
|
|
|
|||
|
|
@ -738,7 +738,7 @@ class PostgresTest extends CakeTestCase {
|
|||
}
|
||||
|
||||
/**
|
||||
* Test the alterSchema RENAME statements
|
||||
* Test the alterSchema RENAME statements
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -861,7 +861,7 @@ class DboSourceTest extends CakeTestCase {
|
|||
$Comment->find('all', array('recursive' => 2)); // ensure Model descriptions are saved
|
||||
$this->db->getLog();
|
||||
|
||||
// case: Comment belongsTo User and Article
|
||||
// case: Comment belongsTo User and Article
|
||||
$Comment->unbindModel(array(
|
||||
'hasOne' => array('Attachment')
|
||||
));
|
||||
|
|
|
|||
|
|
@ -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
|
||||
*
|
||||
|
|
|
|||
|
|
@ -4595,7 +4595,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$result = $model->saveAll(array(
|
||||
'Article' => array(
|
||||
'title' => 'Post with Author',
|
||||
'body' => 'This post will be saved author'
|
||||
'body' => 'This post will be saved author'
|
||||
),
|
||||
'Comment' => array(
|
||||
array('comment' => 'First new comment'),
|
||||
|
|
@ -5999,7 +5999,7 @@ class ModelWriteTest extends BaseModelTest {
|
|||
$result = $model->saveAssociated(array(
|
||||
'Article' => array(
|
||||
'title' => 'Post with Author',
|
||||
'body' => 'This post will be saved author'
|
||||
'body' => 'This post will be saved author'
|
||||
),
|
||||
'Comment' => array(
|
||||
array('comment' => 'First new comment'),
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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';
|
||||
|
|
|
|||
|
|
@ -543,7 +543,7 @@ class FileTest extends CakeTestCase {
|
|||
/**
|
||||
* getTmpFile method
|
||||
*
|
||||
* @param bool $paintSkip
|
||||
* @param boolean $paintSkip
|
||||
* @return void
|
||||
*/
|
||||
protected function _getTmpFile($paintSkip = true) {
|
||||
|
|
|
|||
|
|
@ -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'));
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
0
lib/Cake/Test/test_app/tmp/empty
Normal file
|
|
@ -73,7 +73,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
|
|||
* If no TestResult object is passed a new one will be created.
|
||||
* This method is run for each test method in this class
|
||||
*
|
||||
* @param PHPUnit_Framework_TestResult $result
|
||||
* @param PHPUnit_Framework_TestResult $result
|
||||
* @return PHPUnit_Framework_TestResult
|
||||
* @throws InvalidArgumentException
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -372,7 +372,8 @@ class CakeHtmlReporter extends CakeBaseReporter {
|
|||
/**
|
||||
* A test suite started.
|
||||
*
|
||||
* @param PHPUnit_Framework_TestSuite $suite
|
||||
* @param PHPUnit_Framework_TestSuite $suite
|
||||
* @return void
|
||||
*/
|
||||
public function startTestSuite(PHPUnit_Framework_TestSuite $suite) {
|
||||
if (!$this->_headerSent) {
|
||||
|
|
|
|||
|
|
@ -384,7 +384,7 @@ class CakeNumber {
|
|||
/**
|
||||
* Getter/setter for default currency
|
||||
*
|
||||
* @param string $currency Default currency string used by currency() if $currency argument is not provided
|
||||
* @param string $currency Default currency string used by currency() if $currency argument is not provided
|
||||
* @return string Currency
|
||||
*/
|
||||
public static function defaultCurrency($currency = null) {
|
||||
|
|
|
|||
|
|
@ -203,8 +203,8 @@ class ClassRegistry {
|
|||
/**
|
||||
* Add $object to the registry, associating it with the name $key.
|
||||
*
|
||||
* @param string $key Key for the object in registry
|
||||
* @param object $object Object to store
|
||||
* @param string $key Key for the object in registry
|
||||
* @param object $object Object to store
|
||||
* @return boolean True if the object was written, false if $key already exists
|
||||
*/
|
||||
public static function addObject($key, $object) {
|
||||
|
|
@ -220,7 +220,7 @@ class ClassRegistry {
|
|||
/**
|
||||
* Remove object which corresponds to given key.
|
||||
*
|
||||
* @param string $key Key of object to remove from registry
|
||||
* @param string $key Key of object to remove from registry
|
||||
* @return void
|
||||
*/
|
||||
public static function removeObject($key) {
|
||||
|
|
|
|||
|
|
@ -701,7 +701,7 @@ class Debugger {
|
|||
* straight HTML output, or 'txt' for unformatted text.
|
||||
* @param array $strings Template strings to be used for the output format.
|
||||
* @return string
|
||||
* @deprecated Use Debugger::outputAs() and Debugger::addFormat(). Will be removed
|
||||
* @deprecated Use Debugger::outputAs() and Debugger::addFormat(). Will be removed
|
||||
* in 3.0
|
||||
*/
|
||||
public function output($format = null, $strings = array()) {
|
||||
|
|
|
|||
|
|
@ -457,7 +457,7 @@ class Set {
|
|||
* This function can be used to see if a single item or a given xpath match certain conditions.
|
||||
*
|
||||
* @param string|array $conditions An array of condition strings or an XPath expression
|
||||
* @param array $data An array of data to execute the match on
|
||||
* @param array $data An array of data to execute the match on
|
||||
* @param integer $i Optional: The 'nth'-number of the item being matched.
|
||||
* @param integer $length
|
||||
* @return boolean
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -247,7 +247,7 @@ class Helper extends Object {
|
|||
* an array of url parameters. Using an array for URLs will allow you to leverage
|
||||
* the reverse routing features of CakePHP.
|
||||
* @param boolean $full If true, the full base URL will be prepended to the result
|
||||
* @return string Full translated URL with base path.
|
||||
* @return string Full translated URL with base path.
|
||||
* @link http://book.cakephp.org/2.0/en/views/helpers.html
|
||||
*/
|
||||
public function url($url = null, $full = false) {
|
||||
|
|
|
|||
|
|
@ -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,14 +649,14 @@ 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.
|
||||
* If array contains `attributes` key it will be used as options for error container
|
||||
* If array contains `attributes` key it will be used as options for error container
|
||||
* @param array $options Rendering options for <div /> wrapper tag
|
||||
* @return string If there are errors this method returns an error message, otherwise null.
|
||||
* @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::error
|
||||
|
|
@ -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
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ class NumberHelper extends AppHelper {
|
|||
/**
|
||||
* @see CakeNumber::precision()
|
||||
*
|
||||
* @param float $number A floating point number.
|
||||
* @param float $number A floating point number.
|
||||
* @param integer $precision The precision of the returned number.
|
||||
* @return float Formatted float.
|
||||
* @link http://book.cakephp.org/2.0/en/core-libraries/helpers/number.html#NumberHelper::precision
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
*/
|
||||
|
|
@ -128,7 +129,7 @@ if (!function_exists('sortByKey')) {
|
|||
*
|
||||
* @param array $array Array to sort
|
||||
* @param string $sortby Sort by this key
|
||||
* @param string $order Sort order asc/desc (ascending or descending).
|
||||
* @param string $order Sort order asc/desc (ascending or descending).
|
||||
* @param integer $type Type of sorting to perform
|
||||
* @return mixed Sorted array
|
||||
* @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#sortByKey
|
||||
|
|
@ -236,8 +237,9 @@ if (!function_exists('pr')) {
|
|||
* In terminals this will act the same as using print_r() directly, when not run on cli
|
||||
* print_r() will wrap <PRE> tags around the output of given array. Similar to debug().
|
||||
*
|
||||
* @see debug()
|
||||
* @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) {
|
||||
|
|
@ -283,7 +285,7 @@ if (!function_exists('env')) {
|
|||
* IIS, or SCRIPT_NAME in CGI mode). Also exposes some additional custom
|
||||
* environment information.
|
||||
*
|
||||
* @param string $key Environment variable name.
|
||||
* @param string $key Environment variable name.
|
||||
* @return string Environment variable setting.
|
||||
* @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#env
|
||||
*/
|
||||
|
|
@ -384,11 +386,11 @@ if (!function_exists('cache')) {
|
|||
/**
|
||||
* Reads/writes temporary data to cache files or session.
|
||||
*
|
||||
* @param string $path File path within /tmp to save the file.
|
||||
* @param mixed $data The data to save to the temporary file.
|
||||
* @param mixed $expires A valid strtotime string when the data expires.
|
||||
* @param string $target The target of the cached data; either 'cache' or 'public'.
|
||||
* @return mixed The contents of the temporary file.
|
||||
* @param string $path File path within /tmp to save the file.
|
||||
* @param mixed $data The data to save to the temporary file.
|
||||
* @param mixed $expires A valid strtotime string when the data expires.
|
||||
* @param string $target The target of the cached data; either 'cache' or 'public'.
|
||||
* @return mixed The contents of the temporary file.
|
||||
* @deprecated Please use Cache::write() instead
|
||||
*/
|
||||
function cache($path, $data = null, $expires = '+1 day', $target = 'cache') {
|
||||
|
|
|
|||
Loading…
Reference in a new issue