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.6

Browse source 
Conflicts:
	lib/Cake/Core/App.php
	lib/Cake/VERSION.txt
This commit is contained in:
mark_story 2014-09-06 23:04:20 -04:00
commit 734bb9223b
35 changed files with 89 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/webroot/test.php
View file

@ -96,7 +96,7 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) {
} }
} }
if (!empty($failed)) { if (!empty($failed)) {
trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR); trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/test.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
} }
if (Configure::read('debug') < 1) { if (Configure::read('debug') < 1) {

2
lib/Cake/Cache/Engine/MemcacheEngine.php
View file

@ -22,7 +22,7 @@
* more information. * more information.
* *
* @package Cake.Cache.Engine * @package Cake.Cache.Engine
* @deprecated You should use the Memcached adapter instead. * @deprecated 3.0.0 You should use the Memcached adapter instead.
*/ */
class MemcacheEngine extends CacheEngine { class MemcacheEngine extends CacheEngine {

2
lib/Cake/Console/Command/ConsoleShell.php
View file

@ -19,7 +19,7 @@ App::uses('AppShell', 'Console/Command');
* Provides a very basic 'interactive' console for CakePHP apps. * Provides a very basic 'interactive' console for CakePHP apps.
* *
* @package Cake.Console.Command * @package Cake.Console.Command
* @deprecated Deprecated since version 2.4, will be removed in 3.0 * @deprecated 3.0.0 Deprecated since version 2.4, will be removed in 3.0
*/ */
class ConsoleShell extends AppShell { class ConsoleShell extends AppShell {

5
lib/Cake/Console/ConsoleOutput.php
View file

@ -161,7 +161,10 @@ class ConsoleOutput {
public function __construct($stream = 'php://stdout') { public function __construct($stream = 'php://stdout') {
$this->_output = fopen($stream, 'w'); $this->_output = fopen($stream, 'w');
if (DS === '\\' && !(bool)env('ANSICON')) { if (
(DS === '\\' && !(bool)env('ANSICON')) ||
(function_exists('posix_isatty') && !posix_isatty($this->_output))
) {
$this->_outputAs = self::PLAIN; $this->_outputAs = self::PLAIN;
} }
} }

4
lib/Cake/Controller/Component/AclComponent.php
View file

@ -156,7 +156,7 @@ class AclComponent extends Component {
* @param array|string|Model $aco ACO The controlled object identifier. See `AclNode::node()` for possible formats * @param array|string|Model $aco ACO The controlled object identifier. See `AclNode::node()` for possible formats
* @param string $action Action (defaults to *) * @param string $action Action (defaults to *)
* @return bool Success * @return bool Success
* @deprecated Will be removed in 3.0. * @deprecated 3.0.0 Will be removed in 3.0.
*/ */
public function grant($aro, $aco, $action = "*") { public function grant($aro, $aco, $action = "*") {
trigger_error(__d('cake_dev', '%s is deprecated, use %s instead', 'AclComponent::grant()', 'allow()'), E_USER_WARNING); trigger_error(__d('cake_dev', '%s is deprecated, use %s instead', 'AclComponent::grant()', 'allow()'), E_USER_WARNING);
@ -170,7 +170,7 @@ class AclComponent extends Component {
* @param array|string|Model $aco ACO The controlled object identifier. See `AclNode::node()` for possible formats * @param array|string|Model $aco ACO The controlled object identifier. See `AclNode::node()` for possible formats
* @param string $action Action (defaults to *) * @param string $action Action (defaults to *)
* @return bool Success * @return bool Success
* @deprecated Will be removed in 3.0. * @deprecated 3.0.0 Will be removed in 3.0.
*/ */
public function revoke($aro, $aco, $action = "*") { public function revoke($aro, $aco, $action = "*") {
trigger_error(__d('cake_dev', '%s is deprecated, use %s instead', 'AclComponent::revoke()', 'deny()'), E_USER_WARNING); trigger_error(__d('cake_dev', '%s is deprecated, use %s instead', 'AclComponent::revoke()', 'deny()'), E_USER_WARNING);

2
lib/Cake/Controller/Component/Auth/BaseAuthenticate.php
View file

@ -166,7 +166,7 @@ abstract class BaseAuthenticate {
* *
* @param string $password The plain text password. * @param string $password The plain text password.
* @return string The hashed form of the password. * @return string The hashed form of the password.
* @deprecated Since 2.4. Use a PasswordHasher class instead. * @deprecated 3.0.0 Since 2.4. Use a PasswordHasher class instead.
*/ */
protected function _password($password) { protected function _password($password) {
return Security::hash($password, null, true); return Security::hash($password, null, true);

2
lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
View file

@ -35,7 +35,7 @@ App::uses('FormAuthenticate', 'Controller/Component/Auth');
* @package Cake.Controller.Component.Auth * @package Cake.Controller.Component.Auth
* @since CakePHP(tm) v 2.3 * @since CakePHP(tm) v 2.3
* @see AuthComponent::$authenticate * @see AuthComponent::$authenticate
* @deprecated Since 2.4. Just use FormAuthenticate with 'passwordHasher' setting set to 'Blowfish' * @deprecated 3.0.0 Since 2.4. Just use FormAuthenticate with 'passwordHasher' setting set to 'Blowfish'
*/ */
class BlowfishAuthenticate extends FormAuthenticate { class BlowfishAuthenticate extends FormAuthenticate {

6
lib/Cake/Controller/Component/AuthComponent.php
View file

@ -697,7 +697,7 @@ class AuthComponent extends Component {
* *
* @param string|array $url Optional URL to write as the login redirect URL. * @param string|array $url Optional URL to write as the login redirect URL.
* @return string Redirect URL * @return string Redirect URL
* @deprecated 2.3 Use AuthComponent::redirectUrl() instead * @deprecated 3.0.0 Since 2.3.0, use AuthComponent::redirectUrl() instead
*/ */
public function redirect($url = null) { public function redirect($url = null) {
return $this->redirectUrl($url); return $this->redirectUrl($url);
@ -809,7 +809,7 @@ class AuthComponent extends Component {
* *
* @param string $password Password to hash * @param string $password Password to hash
* @return string Hashed password * @return string Hashed password
* @deprecated Since 2.4. Use Security::hash() directly or a password hasher object. * @deprecated 3.0.0 Since 2.4. Use Security::hash() directly or a password hasher object.
*/ */
public static function password($password) { public static function password($password) {
return Security::hash($password, null, true); return Security::hash($password, null, true);
@ -819,7 +819,7 @@ class AuthComponent extends Component {
* Check whether or not the current user has data in the session, and is considered logged in. * Check whether or not the current user has data in the session, and is considered logged in.
* *
* @return bool true if the user is logged in, false otherwise * @return bool true if the user is logged in, false otherwise
* @deprecated Since 2.5. Use AuthComponent::user() directly. * @deprecated 3.0.0 Since 2.5. Use AuthComponent::user() directly.
*/ */
public function loggedIn() { public function loggedIn() {
return (bool)$this->user(); return (bool)$this->user();

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

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

22
lib/Cake/Controller/Component/RequestHandlerComponent.php
View file

@ -292,7 +292,7 @@ class RequestHandlerComponent extends Component {
* Returns true if the current HTTP request is Ajax, false otherwise * Returns true if the current HTTP request is Ajax, false otherwise
* *
* @return bool True if call is Ajax * @return bool True if call is Ajax
* @deprecated use `$this->request->is('ajax')` instead. * @deprecated 3.0.0 Use `$this->request->is('ajax')` instead.
*/ */
public function isAjax() { public function isAjax() {
return $this->request->is('ajax'); return $this->request->is('ajax');
@ -302,7 +302,7 @@ class RequestHandlerComponent extends Component {
* Returns true if the current HTTP request is coming from a Flash-based client * Returns true if the current HTTP request is coming from a Flash-based client
* *
* @return bool True if call is from Flash * @return bool True if call is from Flash
* @deprecated use `$this->request->is('flash')` instead. * @deprecated 3.0.0 Use `$this->request->is('flash')` instead.
*/ */
public function isFlash() { public function isFlash() {
return $this->request->is('flash'); return $this->request->is('flash');
@ -312,7 +312,7 @@ class RequestHandlerComponent extends Component {
* Returns true if the current request is over HTTPS, false otherwise. * Returns true if the current request is over HTTPS, false otherwise.
* *
* @return bool True if call is over HTTPS * @return bool True if call is over HTTPS
* @deprecated use `$this->request->is('ssl')` instead. * @deprecated 3.0.0 Use `$this->request->is('ssl')` instead.
*/ */
public function isSSL() { public function isSSL() {
return $this->request->is('ssl'); return $this->request->is('ssl');
@ -368,7 +368,7 @@ class RequestHandlerComponent extends Component {
* Returns true if the current call a POST request * Returns true if the current call a POST request
* *
* @return bool True if call is a POST * @return bool True if call is a POST
* @deprecated Use $this->request->is('post'); from your controller. * @deprecated 3.0.0 Use $this->request->is('post'); from your controller.
*/ */
public function isPost() { public function isPost() {
return $this->request->is('post'); return $this->request->is('post');
@ -378,7 +378,7 @@ class RequestHandlerComponent extends Component {
* Returns true if the current call a PUT request * Returns true if the current call a PUT request
* *
* @return bool True if call is a PUT * @return bool True if call is a PUT
* @deprecated Use $this->request->is('put'); from your controller. * @deprecated 3.0.0 Use $this->request->is('put'); from your controller.
*/ */
public function isPut() { public function isPut() {
return $this->request->is('put'); return $this->request->is('put');
@ -388,7 +388,7 @@ class RequestHandlerComponent extends Component {
* Returns true if the current call a GET request * Returns true if the current call a GET request
* *
* @return bool True if call is a GET * @return bool True if call is a GET
* @deprecated Use $this->request->is('get'); from your controller. * @deprecated 3.0.0 Use $this->request->is('get'); from your controller.
*/ */
public function isGet() { public function isGet() {
return $this->request->is('get'); return $this->request->is('get');
@ -398,7 +398,7 @@ class RequestHandlerComponent extends Component {
* Returns true if the current call a DELETE request * Returns true if the current call a DELETE request
* *
* @return bool True if call is a DELETE * @return bool True if call is a DELETE
* @deprecated Use $this->request->is('delete'); from your controller. * @deprecated 3.0.0 Use $this->request->is('delete'); from your controller.
*/ */
public function isDelete() { public function isDelete() {
return $this->request->is('delete'); return $this->request->is('delete');
@ -425,7 +425,7 @@ class RequestHandlerComponent extends Component {
* @param string|array $type The Content-type or array of Content-types assigned to the name, * @param string|array $type The Content-type or array of Content-types assigned to the name,
* i.e. "text/html", or "application/xml" * i.e. "text/html", or "application/xml"
* @return void * @return void
* @deprecated use `$this->response->type()` instead. * @deprecated 3.0.0 Use `$this->response->type()` instead.
*/ */
public function setContent($name, $type = null) { public function setContent($name, $type = null) {
$this->response->type(array($name => $type)); $this->response->type(array($name => $type));
@ -435,7 +435,7 @@ class RequestHandlerComponent extends Component {
* Gets the server name from which this request was referred * Gets the server name from which this request was referred
* *
* @return string Server address * @return string Server address
* @deprecated use $this->request->referer() from your controller instead * @deprecated 3.0.0 Use $this->request->referer() from your controller instead
*/ */
public function getReferer() { public function getReferer() {
return $this->request->referer(false); return $this->request->referer(false);
@ -447,7 +447,7 @@ class RequestHandlerComponent extends Component {
* @param bool $safe Use safe = false when you think the user might manipulate * @param bool $safe Use safe = false when you think the user might manipulate
* their HTTP_CLIENT_IP header. Setting $safe = false will also look at HTTP_X_FORWARDED_FOR * their HTTP_CLIENT_IP header. Setting $safe = false will also look at HTTP_X_FORWARDED_FOR
* @return string Client IP address * @return string Client IP address
* @deprecated use $this->request->clientIp() from your, controller instead. * @deprecated 3.0.0 Use $this->request->clientIp() from your, controller instead.
*/ */
public function getClientIP($safe = true) { public function getClientIP($safe = true) {
return $this->request->clientIp($safe); return $this->request->clientIp($safe);
@ -714,7 +714,7 @@ class RequestHandlerComponent extends Component {
* *
* @param string|array $cType Either a string content type to map, or an array of types. * @param string|array $cType Either a string content type to map, or an array of types.
* @return string|array Aliases for the types provided. * @return string|array Aliases for the types provided.
* @deprecated Use $this->response->mapType() in your controller instead. * @deprecated 3.0.0 Use $this->response->mapType() in your controller instead.
*/ */
public function mapType($cType) { public function mapType($cType) {
return $this->response->mapType($cType); return $this->response->mapType($cType);

18
lib/Cake/Controller/Component/SecurityComponent.php
View file

@ -47,7 +47,7 @@ class SecurityComponent extends Component {
* List of controller actions for which a POST request is required * List of controller actions for which a POST request is required
* *
* @var array * @var array
* @deprecated Use CakeRequest::onlyAllow() instead. * @deprecated 3.0.0 Use CakeRequest::onlyAllow() instead.
* @see SecurityComponent::requirePost() * @see SecurityComponent::requirePost()
*/ */
public $requirePost = array(); public $requirePost = array();
@ -56,7 +56,7 @@ class SecurityComponent extends Component {
* List of controller actions for which a GET request is required * List of controller actions for which a GET request is required
* *
* @var array * @var array
* @deprecated Use CakeRequest::onlyAllow() instead. * @deprecated 3.0.0 Use CakeRequest::onlyAllow() instead.
* @see SecurityComponent::requireGet() * @see SecurityComponent::requireGet()
*/ */
public $requireGet = array(); public $requireGet = array();
@ -65,7 +65,7 @@ class SecurityComponent extends Component {
* List of controller actions for which a PUT request is required * List of controller actions for which a PUT request is required
* *
* @var array * @var array
* @deprecated Use CakeRequest::onlyAllow() instead. * @deprecated 3.0.0 Use CakeRequest::onlyAllow() instead.
* @see SecurityComponent::requirePut() * @see SecurityComponent::requirePut()
*/ */
public $requirePut = array(); public $requirePut = array();
@ -74,7 +74,7 @@ class SecurityComponent extends Component {
* List of controller actions for which a DELETE request is required * List of controller actions for which a DELETE request is required
* *
* @var array * @var array
* @deprecated Use CakeRequest::onlyAllow() instead. * @deprecated 3.0.0 Use CakeRequest::onlyAllow() instead.
* @see SecurityComponent::requireDelete() * @see SecurityComponent::requireDelete()
*/ */
public $requireDelete = array(); public $requireDelete = array();
@ -117,7 +117,7 @@ class SecurityComponent extends Component {
* Deprecated property, superseded by unlockedFields. * Deprecated property, superseded by unlockedFields.
* *
* @var array * @var array
* @deprecated * @deprecated 3.0.0 Superseded by unlockedFields.
* @see SecurityComponent::$unlockedFields * @see SecurityComponent::$unlockedFields
*/ */
public $disabledFields = array(); public $disabledFields = array();
@ -252,7 +252,7 @@ class SecurityComponent extends Component {
* Sets the actions that require a POST request, or empty for all actions * Sets the actions that require a POST request, or empty for all actions
* *
* @return void * @return void
* @deprecated Use CakeRequest::onlyAllow() instead. * @deprecated 3.0.0 Use CakeRequest::onlyAllow() instead.
* @link http://book.cakephp.org/2.0/en/core-libraries/components/security-component.html#SecurityComponent::requirePost * @link http://book.cakephp.org/2.0/en/core-libraries/components/security-component.html#SecurityComponent::requirePost
*/ */
public function requirePost() { public function requirePost() {
@ -263,7 +263,7 @@ class SecurityComponent extends Component {
/** /**
* Sets the actions that require a GET request, or empty for all actions * Sets the actions that require a GET request, or empty for all actions
* *
* @deprecated Use CakeRequest::onlyAllow() instead. * @deprecated 3.0.0 Use CakeRequest::onlyAllow() instead.
* @return void * @return void
*/ */
public function requireGet() { public function requireGet() {
@ -274,7 +274,7 @@ class SecurityComponent extends Component {
/** /**
* Sets the actions that require a PUT request, or empty for all actions * Sets the actions that require a PUT request, or empty for all actions
* *
* @deprecated Use CakeRequest::onlyAllow() instead. * @deprecated 3.0.0 Use CakeRequest::onlyAllow() instead.
* @return void * @return void
*/ */
public function requirePut() { public function requirePut() {
@ -285,7 +285,7 @@ class SecurityComponent extends Component {
/** /**
* Sets the actions that require a DELETE request, or empty for all actions * Sets the actions that require a DELETE request, or empty for all actions
* *
* @deprecated Use CakeRequest::onlyAllow() instead. * @deprecated 3.0.0 Use CakeRequest::onlyAllow() instead.
* @return void * @return void
*/ */
public function requireDelete() { public function requireDelete() {

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

@ -705,7 +705,7 @@ class Controller extends Object implements CakeEventListener {
* *
* @return array Associative array of the HTTP codes as keys, and the message * @return array Associative array of the HTTP codes as keys, and the message
* strings as values, or null of the given $code does not exist. * strings as values, or null of the given $code does not exist.
* @deprecated Since 2.4. Will be removed in 3.0. Use CakeResponse::httpCodes(). * @deprecated 3.0.0 Since 2.4. Will be removed in 3.0. Use CakeResponse::httpCodes().
*/ */
public function httpCodes($code = null) { public function httpCodes($code = null) {
return $this->response->httpCodes($code); return $this->response->httpCodes($code);
@ -820,7 +820,7 @@ class Controller extends Object implements CakeEventListener {
* *
* @param string $status The header message that is being set. * @param string $status The header message that is being set.
* @return void * @return void
* @deprecated Will be removed in 3.0. Use CakeResponse::header(). * @deprecated 3.0.0 Will be removed in 3.0. Use CakeResponse::header().
*/ */
public function header($status) { public function header($status) {
$this->response->header($status); $this->response->header($status);
@ -874,7 +874,7 @@ class Controller extends Object implements CakeEventListener {
* Returns number of errors in a submitted FORM. * Returns number of errors in a submitted FORM.
* *
* @return int Number of errors * @return int Number of errors
* @deprecated This method will be removed in 3.0 * @deprecated 3.0.0 This method will be removed in 3.0
*/ */
public function validate() { public function validate() {
$args = func_get_args(); $args = func_get_args();
@ -893,7 +893,7 @@ class Controller extends Object implements CakeEventListener {
* `$errors = $this->validateErrors($this->Article, $this->User);` * `$errors = $this->validateErrors($this->Article, $this->User);`
* *
* @return array Validation errors, or false if none * @return array Validation errors, or false if none
* @deprecated This method will be removed in 3.0 * @deprecated 3.0.0 This method will be removed in 3.0
*/ */
public function validateErrors() { public function validateErrors() {
$objects = func_get_args(); $objects = func_get_args();
@ -980,7 +980,7 @@ class Controller extends Object implements CakeEventListener {
* *
* @return void * @return void
* @link http://book.cakephp.org/2.0/en/controllers.html#Controller::disableCache * @link http://book.cakephp.org/2.0/en/controllers.html#Controller::disableCache
* @deprecated Will be removed in 3.0. Use CakeResponse::disableCache(). * @deprecated 3.0.0 Will be removed in 3.0. Use CakeResponse::disableCache().
*/ */
public function disableCache() { public function disableCache() {
$this->response->disableCache(); $this->response->disableCache();
@ -997,7 +997,7 @@ class Controller extends Object implements CakeEventListener {
* @param string $layout Layout you want to use, defaults to 'flash' * @param string $layout Layout you want to use, defaults to 'flash'
* @return void * @return void
* @link http://book.cakephp.org/2.0/en/controllers.html#Controller::flash * @link http://book.cakephp.org/2.0/en/controllers.html#Controller::flash
* @deprecated Will be removed in 3.0. Use Session::setFlash(). * @deprecated 3.0.0 Will be removed in 3.0. Use Session::setFlash().
*/ */
public function flash($message, $url, $pause = 1, $layout = 'flash') { public function flash($message, $url, $pause = 1, $layout = 'flash') {
$this->autoRender = false; $this->autoRender = false;
@ -1018,7 +1018,7 @@ class Controller extends Object implements CakeEventListener {
* @param bool $exclusive If true, and $op is an array, fields not included in $op will not be * @param bool $exclusive If true, and $op is an array, fields not included in $op will not be
* included in the returned conditions * included in the returned conditions
* @return array An array of model conditions * @return array An array of model conditions
* @deprecated Will be removed in 3.0. * @deprecated 3.0.0 Will be removed in 3.0.
*/ */
public function postConditions($data = array(), $op = null, $bool = 'AND', $exclusive = false) { public function postConditions($data = array(), $op = null, $bool = 'AND', $exclusive = false) {
if (!is_array($data) || empty($data)) { if (!is_array($data) || empty($data)) {
@ -1148,7 +1148,7 @@ class Controller extends Object implements CakeEventListener {
* @param string $method Method name. * @param string $method Method name.
* @return bool * @return bool
* @see Controller::beforeScaffold() * @see Controller::beforeScaffold()
* @deprecated Will be removed in 3.0. * @deprecated 3.0.0 Will be removed in 3.0.
*/ */
protected function _beforeScaffold($method) { protected function _beforeScaffold($method) {
return $this->beforeScaffold($method); return $this->beforeScaffold($method);
@ -1171,7 +1171,7 @@ class Controller extends Object implements CakeEventListener {
* @param string $method Method name. * @param string $method Method name.
* @return bool * @return bool
* @see Controller::afterScaffoldSave() * @see Controller::afterScaffoldSave()
* @deprecated Will be removed in 3.0. * @deprecated 3.0.0 Will be removed in 3.0.
*/ */
protected function _afterScaffoldSave($method) { protected function _afterScaffoldSave($method) {
return $this->afterScaffoldSave($method); return $this->afterScaffoldSave($method);
@ -1194,7 +1194,7 @@ class Controller extends Object implements CakeEventListener {
* @param string $method Method name. * @param string $method Method name.
* @return bool * @return bool
* @see Controller::afterScaffoldSaveError() * @see Controller::afterScaffoldSaveError()
* @deprecated Will be removed in 3.0. * @deprecated 3.0.0 Will be removed in 3.0.
*/ */
protected function _afterScaffoldSaveError($method) { protected function _afterScaffoldSaveError($method) {
return $this->afterScaffoldSaveError($method); return $this->afterScaffoldSaveError($method);
@ -1219,7 +1219,7 @@ class Controller extends Object implements CakeEventListener {
* @param string $method Method name. * @param string $method Method name.
* @return bool * @return bool
* @see Controller::scaffoldError() * @see Controller::scaffoldError()
* @deprecated Will be removed in 3.0. * @deprecated 3.0.0 Will be removed in 3.0.
*/ */
protected function _scaffoldError($method) { protected function _scaffoldError($method) {
return $this->scaffoldError($method); return $this->scaffoldError($method);

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

@ -27,7 +27,7 @@
* scaffolded actions with custom-made ones. * scaffolded actions with custom-made ones.
* *
* @package Cake.Controller * @package Cake.Controller
* @deprecated Dynamic scaffolding will be removed and replaced in 3.0 * @deprecated 3.0.0 Dynamic scaffolding will be removed and replaced in 3.0
*/ */
class Scaffold { class Scaffold {

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

@ -361,7 +361,7 @@ class App {
* @param string $plugin CamelCased/lower_cased plugin name to find the path of. * @param string $plugin CamelCased/lower_cased plugin name to find the path of.
* @return string full path to the plugin. * @return string full path to the plugin.
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::pluginPath * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::pluginPath
* @deprecated Use `CakePlugin::path()` instead. * @deprecated 3.0.0 Use `CakePlugin::path()` instead.
*/ */
public static function pluginPath($plugin) { public static function pluginPath($plugin) {
return CakePlugin::path($plugin); return CakePlugin::path($plugin);

5
lib/Cake/Log/Engine/ConsoleLog.php
View file

@ -48,7 +48,10 @@ class ConsoleLog extends BaseLog {
*/ */
public function __construct($config = array()) { public function __construct($config = array()) {
parent::__construct($config); parent::__construct($config);
if (DS === '\\' && !(bool)env('ANSICON')) { if (
(DS === '\\' && !(bool)env('ANSICON')) ||
(function_exists('posix_isatty') && !posix_isatty($this->_output))
) {
$outputAs = ConsoleOutput::PLAIN; $outputAs = ConsoleOutput::PLAIN;
} else { } else {
$outputAs = ConsoleOutput::COLOR; $outputAs = ConsoleOutput::COLOR;

4
lib/Cake/Model/BehaviorCollection.php
View file

@ -74,7 +74,7 @@ class BehaviorCollection extends ObjectCollection implements CakeEventListener {
* @param string $behavior Behavior name. * @param string $behavior Behavior name.
* @param array $config Configuration options. * @param array $config Configuration options.
* @return void * @return void
* @deprecated Will be removed in 3.0. Replaced with load(). * @deprecated 3.0.0 Will be removed in 3.0. Replaced with load().
*/ */
public function attach($behavior, $config = array()) { public function attach($behavior, $config = array()) {
return $this->load($behavior, $config); return $this->load($behavior, $config);
@ -201,7 +201,7 @@ class BehaviorCollection extends ObjectCollection implements CakeEventListener {
* *
* @param string $name Name of behavior * @param string $name Name of behavior
* @return void * @return void
* @deprecated Will be removed in 3.0. Use unload instead. * @deprecated 3.0.0 Will be removed in 3.0. Use unload instead.
*/ */
public function detach($name) { public function detach($name) {
return $this->unload($name); return $this->unload($name);

2
lib/Cake/Model/Datasource/CakeSession.php
View file

@ -267,7 +267,7 @@ class CakeSession {
* @return bool Success * @return bool Success
*/ */
public static function delete($name) { public static function delete($name) {
if (self::start() && self::check($name)) { if (self::check($name)) {
self::_overwrite($_SESSION, Hash::remove($_SESSION, $name)); self::_overwrite($_SESSION, Hash::remove($_SESSION, $name));
return !self::check($name); return !self::check($name);
} }

2
lib/Cake/Model/Datasource/DboSource.php
View file

@ -776,7 +776,7 @@ class DboSource extends DataSource {
return $value; return $value;
} }
if (!$this->_methodCacheChange && empty(self::$methodCache)) { if (!$this->_methodCacheChange && empty(self::$methodCache)) {
self::$methodCache = Cache::read('method_cache', '_cake_core_'); self::$methodCache = (array)Cache::read('method_cache', '_cake_core_');
} }
if ($value === null) { if ($value === null) {
return (isset(self::$methodCache[$method][$key])) ? self::$methodCache[$method][$key] : null; return (isset(self::$methodCache[$method][$key])) ? self::$methodCache[$method][$key] : null;

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

@ -965,7 +965,7 @@ class CakeRequest implements ArrayAccess {
* @return bool true * @return bool true
* @throws MethodNotAllowedException * @throws MethodNotAllowedException
* @see CakeRequest::allowMethod() * @see CakeRequest::allowMethod()
* @deprecated 2.5 Use CakeRequest::allowMethod() instead. * @deprecated 3.0.0 Since 2.5, use CakeRequest::allowMethod() instead.
*/ */
public function onlyAllow($methods) { public function onlyAllow($methods) {
if (!is_array($methods)) { if (!is_array($methods)) {

2
lib/Cake/Network/Http/HttpResponse.php
View file

@ -28,7 +28,7 @@ if (class_exists('HttpResponse')) {
* HTTP Response from HttpSocket. * HTTP Response from HttpSocket.
* *
* @package Cake.Network.Http * @package Cake.Network.Http
* @deprecated This class is deprecated as it has naming conflicts with pecl/http * @deprecated 3.0.0 This class is deprecated as it has naming conflicts with pecl/http
*/ */
class HttpResponse extends HttpSocketResponse { class HttpResponse extends HttpSocketResponse {

6
lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
View file

@ -365,12 +365,6 @@ class CakeSessionTest extends CakeTestCase {
* @return void * @return void
*/ */
public function testDelete() { public function testDelete() {
$this->assertTrue(TestCakeSession::write('Delete.me', 'Clearing out'));
session_write_close();
$this->assertTrue(TestCakeSession::delete('Delete.me'));
$this->assertFalse(TestCakeSession::check('Delete.me'));
$this->assertTrue(TestCakeSession::write('Delete.me', 'Clearing out')); $this->assertTrue(TestCakeSession::write('Delete.me', 'Clearing out'));
$this->assertTrue(TestCakeSession::delete('Delete.me')); $this->assertTrue(TestCakeSession::delete('Delete.me'));
$this->assertFalse(TestCakeSession::check('Delete.me')); $this->assertFalse(TestCakeSession::check('Delete.me'));

22
lib/Cake/TestSuite/CakeTestCase.php
View file

@ -544,7 +544,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param mixed $result * @param mixed $result
* @param mixed $expected * @param mixed $expected
* @param string $message the text to display if the assertion is not correct * @param string $message the text to display if the assertion is not correct
* @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0 * @deprecated 3.0.0 This is a compatiblity wrapper for 1.x. It will be removed in 3.0
* @return void * @return void
*/ */
protected static function assertEqual($result, $expected, $message = '') { protected static function assertEqual($result, $expected, $message = '') {
@ -557,7 +557,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param mixed $result * @param mixed $result
* @param mixed $expected * @param mixed $expected
* @param string $message the text to display if the assertion is not correct * @param string $message the text to display if the assertion is not correct
* @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0 * @deprecated 3.0.0 This is a compatiblity wrapper for 1.x. It will be removed in 3.0
* @return void * @return void
*/ */
protected static function assertNotEqual($result, $expected, $message = '') { protected static function assertNotEqual($result, $expected, $message = '') {
@ -570,7 +570,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param mixed $pattern a regular expression * @param mixed $pattern a regular expression
* @param string $string the text to be matched * @param string $string the text to be matched
* @param string $message the text to display if the assertion is not correct * @param string $message the text to display if the assertion is not correct
* @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0 * @deprecated 3.0.0 This is a compatiblity wrapper for 1.x. It will be removed in 3.0
* @return void * @return void
*/ */
protected static function assertPattern($pattern, $string, $message = '') { protected static function assertPattern($pattern, $string, $message = '') {
@ -583,7 +583,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param mixed $actual * @param mixed $actual
* @param mixed $expected * @param mixed $expected
* @param string $message the text to display if the assertion is not correct * @param string $message the text to display if the assertion is not correct
* @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0 * @deprecated 3.0.0 This is a compatiblity wrapper for 1.x. It will be removed in 3.0
* @return void * @return void
*/ */
protected static function assertIdentical($actual, $expected, $message = '') { protected static function assertIdentical($actual, $expected, $message = '') {
@ -596,7 +596,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param mixed $actual * @param mixed $actual
* @param mixed $expected * @param mixed $expected
* @param string $message the text to display if the assertion is not correct * @param string $message the text to display if the assertion is not correct
* @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0 * @deprecated 3.0.0 This is a compatiblity wrapper for 1.x. It will be removed in 3.0
* @return void * @return void
*/ */
protected static function assertNotIdentical($actual, $expected, $message = '') { protected static function assertNotIdentical($actual, $expected, $message = '') {
@ -609,7 +609,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param mixed $pattern a regular expression * @param mixed $pattern a regular expression
* @param string $string the text to be matched * @param string $string the text to be matched
* @param string $message the text to display if the assertion is not correct * @param string $message the text to display if the assertion is not correct
* @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0 * @deprecated 3.0.0 This is a compatiblity wrapper for 1.x. It will be removed in 3.0
* @return void * @return void
*/ */
protected static function assertNoPattern($pattern, $string, $message = '') { protected static function assertNoPattern($pattern, $string, $message = '') {
@ -619,7 +619,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
/** /**
* assert no errors * assert no errors
* *
* @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0 * @deprecated 3.0.0 This is a compatiblity wrapper for 1.x. It will be removed in 3.0
* @return void * @return void
*/ */
protected function assertNoErrors() { protected function assertNoErrors() {
@ -630,7 +630,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* *
* @param mixed $expected the name of the Exception or error * @param mixed $expected the name of the Exception or error
* @param string $message the text to display if the assertion is not correct * @param string $message the text to display if the assertion is not correct
* @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0 * @deprecated 3.0.0 This is a compatiblity wrapper for 1.x. It will be removed in 3.0
* @return void * @return void
*/ */
protected function expectError($expected = false, $message = '') { protected function expectError($expected = false, $message = '') {
@ -645,7 +645,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* *
* @param mixed $expected the name of the Exception * @param mixed $expected the name of the Exception
* @param string $message the text to display if the assertion is not correct * @param string $message the text to display if the assertion is not correct
* @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0 * @deprecated 3.0.0 This is a compatiblity wrapper for 1.x. It will be removed in 3.0
* @return void * @return void
*/ */
protected function expectException($name = 'Exception', $message = '') { protected function expectException($name = 'Exception', $message = '') {
@ -658,7 +658,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param mixed $first * @param mixed $first
* @param mixed $second * @param mixed $second
* @param string $message the text to display if the assertion is not correct * @param string $message the text to display if the assertion is not correct
* @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0 * @deprecated 3.0.0 This is a compatiblity wrapper for 1.x. It will be removed in 3.0
* @return void * @return void
*/ */
protected static function assertReference(&$first, &$second, $message = '') { protected static function assertReference(&$first, &$second, $message = '') {
@ -671,7 +671,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
* @param string $object * @param string $object
* @param string $type * @param string $type
* @param string $message * @param string $message
* @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0 * @deprecated 3.0.0 This is a compatiblity wrapper for 1.x. It will be removed in 3.0
* @return void * @return void
*/ */
protected static function assertIsA($object, $type, $message = '') { protected static function assertIsA($object, $type, $message = '') {

4
lib/Cake/Utility/Debugger.php
View file

@ -201,7 +201,7 @@ class Debugger {
* @param int $line Line that triggered the error * @param int $line Line that triggered the error
* @param array $context Context * @param array $context Context
* @return bool true if error was handled * @return bool true if error was handled
* @deprecated Will be removed in 3.0. This function is superseded by Debugger::outputError(). * @deprecated 3.0.0 Will be removed in 3.0. This function is superseded by Debugger::outputError().
*/ */
public static function showError($code, $description, $file = null, $line = null, $context = null) { public static function showError($code, $description, $file = null, $line = null, $context = null) {
$self = Debugger::getInstance(); $self = Debugger::getInstance();
@ -696,7 +696,7 @@ class Debugger {
* straight HTML output, or 'txt' for unformatted text. * straight HTML output, or 'txt' for unformatted text.
* @param array $strings Template strings to be used for the output format. * @param array $strings Template strings to be used for the output format.
* @return string * @return string
* @deprecated Use Debugger::outputAs() and Debugger::addFormat(). Will be removed * @deprecated 3.0.0 Use Debugger::outputAs() and Debugger::addFormat(). Will be removed
* in 3.0 * in 3.0
*/ */
public static function output($format = null, $strings = array()) { public static function output($format = null, $strings = array()) {

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

@ -268,7 +268,7 @@ abstract class ObjectCollection {
* returns an array of currently-attached objects * returns an array of currently-attached objects
* @return mixed If $name is specified, returns the boolean status of the corresponding object. * @return mixed If $name is specified, returns the boolean status of the corresponding object.
* Otherwise, returns an array of all attached objects. * Otherwise, returns an array of all attached objects.
* @deprecated Will be removed in 3.0. Use loaded instead. * @deprecated 3.0.0 Will be removed in 3.0. Use loaded instead.
*/ */
public function attached($name = null) { public function attached($name = null) {
return $this->loaded($name); return $this->loaded($name);

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

@ -27,7 +27,7 @@ App::uses('ConnectionManager', 'Model');
* and all of the above on arrays. * and all of the above on arrays.
* *
* @package Cake.Utility * @package Cake.Utility
* @deprecated Deprecated since version 2.4 * @deprecated 3.0.0 Deprecated since version 2.4
*/ */
class Sanitize { class Sanitize {

4
lib/Cake/Utility/Security.php
View file

@ -42,7 +42,7 @@ class Security {
/** /**
* Get allowed minutes of inactivity based on security level. * Get allowed minutes of inactivity based on security level.
* *
* @deprecated Exists for backwards compatibility only, not used by the core * @deprecated 3.0.0 Exists for backwards compatibility only, not used by the core
* @return int Allowed inactivity in minutes * @return int Allowed inactivity in minutes
*/ */
public static function inactiveMins() { public static function inactiveMins() {
@ -179,7 +179,7 @@ class Security {
* @param string $text Encrypted string to decrypt, normal string to encrypt * @param string $text Encrypted string to decrypt, normal string to encrypt
* @param string $key Key to use * @param string $key Key to use
* @return string Encrypted/Decrypted string * @return string Encrypted/Decrypted string
* @deprecated Will be removed in 3.0. * @deprecated 3.0.0 Will be removed in 3.0.
*/ */
public static function cipher($text, $key) { public static function cipher($text, $key) {
if (empty($key)) { if (empty($key)) {

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

@ -23,7 +23,7 @@ App::uses('Hash', 'Utility');
* Class used for manipulation of arrays. * Class used for manipulation of arrays.
* *
* @package Cake.Utility * @package Cake.Utility
* @deprecated Will be removed in 3.0. Use Hash instead. * @deprecated 3.0.0 Will be removed in 3.0. Use Hash instead.
*/ */
class Set { class Set {

12
lib/Cake/View/Helper.php
View file

@ -197,7 +197,7 @@ class Helper extends Object {
* *
* @param string $name Name of the property being accessed. * @param string $name Name of the property being accessed.
* @return mixed Helper or property found at $name * @return mixed Helper or property found at $name
* @deprecated Accessing request properties through this method is deprecated and will be removed in 3.0. * @deprecated 3.0.0 Accessing request properties through this method is deprecated and will be removed in 3.0.
*/ */
public function __get($name) { public function __get($name) {
if (isset($this->_helperMap[$name]) && !isset($this->{$name})) { if (isset($this->_helperMap[$name]) && !isset($this->{$name})) {
@ -226,7 +226,7 @@ class Helper extends Object {
* @param string $name Name of the property being accessed. * @param string $name Name of the property being accessed.
* @param mixed $value Value to set. * @param mixed $value Value to set.
* @return void * @return void
* @deprecated This method will be removed in 3.0 * @deprecated 3.0.0 This method will be removed in 3.0
*/ */
public function __set($name, $value) { public function __set($name, $value) {
switch ($name) { switch ($name) {
@ -407,7 +407,7 @@ class Helper extends Object {
* *
* @param string|array $output Either an array of strings to clean or a single string to clean. * @param string|array $output Either an array of strings to clean or a single string to clean.
* @return string|array cleaned content for output * @return string|array cleaned content for output
* @deprecated This method will be removed in 3.0 * @deprecated 3.0.0 This method will be removed in 3.0
*/ */
public function clean($output) { public function clean($output) {
$this->_reset(); $this->_reset();
@ -449,7 +449,7 @@ class Helper extends Object {
* @param string $insertBefore String to be inserted before options. * @param string $insertBefore String to be inserted before options.
* @param string $insertAfter String to be inserted after options. * @param string $insertAfter String to be inserted after options.
* @return string Composed attributes. * @return string Composed attributes.
* @deprecated This method will be moved to HtmlHelper in 3.0 * @deprecated 3.0.0 This method will be moved to HtmlHelper in 3.0
*/ */
protected function _parseAttributes($options, $exclude = null, $insertBefore = ' ', $insertAfter = null) { protected function _parseAttributes($options, $exclude = null, $insertBefore = ' ', $insertAfter = null) {
if (!is_string($options)) { if (!is_string($options)) {
@ -483,7 +483,7 @@ class Helper extends Object {
* @param string $value The value of the attribute to create. * @param string $value The value of the attribute to create.
* @param bool $escape Define if the value must be escaped * @param bool $escape Define if the value must be escaped
* @return string The composed attribute. * @return string The composed attribute.
* @deprecated This method will be moved to HtmlHelper in 3.0 * @deprecated 3.0.0 This method will be moved to HtmlHelper in 3.0
*/ */
protected function _formatAttribute($key, $value, $escape = true) { protected function _formatAttribute($key, $value, $escape = true) {
if (is_array($value)) { if (is_array($value)) {
@ -801,7 +801,7 @@ class Helper extends Object {
* *
* @param string $str String to be output. * @param string $str String to be output.
* @return string * @return string
* @deprecated This method will be removed in future versions. * @deprecated 3.0.0 This method will be removed in future versions.
*/ */
public function output($str) { public function output($str) {
return $str; return $str;

1
lib/Cake/View/Helper/PaginatorHelper.php
View file

@ -624,7 +624,6 @@ class PaginatorHelper extends AppHelper {
* *
* @param array $options Options for the counter string. See #options for list of keys. * @param array $options Options for the counter string. See #options for list of keys.
* @return string Counter string. * @return string Counter string.
* @deprecated The %page% style placeholders are deprecated.
* @link http://book.cakephp.org/2.0/en/core-libraries/helpers/paginator.html#PaginatorHelper::counter * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/paginator.html#PaginatorHelper::counter
*/ */
public function counter($options = array()) { public function counter($options = array()) {

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

@ -53,7 +53,7 @@ App::uses('CakeRequest', 'Network');
* }}} * }}}
* *
* @package Cake.View * @package Cake.View
* @deprecated Deprecated since version 2.3, use CakeResponse::file() instead * @deprecated 3.0.0 Deprecated since version 2.3, use CakeResponse::file() instead
*/ */
class MediaView extends View { class MediaView extends View {

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

@ -24,7 +24,7 @@ App::uses('View', 'View');
* ScaffoldView provides specific view file loading features for scaffolded views. * ScaffoldView provides specific view file loading features for scaffolded views.
* *
* @package Cake.View * @package Cake.View
* @deprecated Dynamic scaffolding will be removed and replaced in 3.0 * @deprecated 3.0.0 Dynamic scaffolding will be removed and replaced in 3.0
*/ */
class ScaffoldView extends View { class ScaffoldView extends View {

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

@ -24,7 +24,7 @@ App::uses('View', 'View');
* Stub class for 2.1 Compatibility * Stub class for 2.1 Compatibility
* *
* @package Cake.View * @package Cake.View
* @deprecated Deprecated since 2.1, use View class instead * @deprecated 3.0.0 Deprecated since 2.1, use View class instead
*/ */
class ThemeView extends View { class ThemeView extends View {

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

@ -590,7 +590,7 @@ class View extends Object {
* *
* @param string $var The view var you want the contents of. * @param string $var The view var you want the contents of.
* @return mixed The content of the named var if its set, otherwise null. * @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 3.0.0 Will be removed in 3.0. Use View::get() instead.
*/ */
public function getVar($var) { public function getVar($var) {
return $this->get($var); return $this->get($var);
@ -756,7 +756,7 @@ class View extends Object {
* update/replace a script element. * update/replace a script element.
* @param string $content The content of the script being added, optional. * @param string $content The content of the script being added, optional.
* @return void * @return void
* @deprecated Will be removed in 3.0. Superseded by blocks functionality. * @deprecated 3.0.0 Will be removed in 3.0. Superseded by blocks functionality.
* @see View::start() * @see View::start()
*/ */
public function addScript($name, $content = null) { public function addScript($name, $content = null) {

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

@ -164,7 +164,7 @@ class ViewBlock {
* @param string $name Name of the block * @param string $name Name of the block
* @param string $value The content for the block. * @param string $value The content for the block.
* @return void * @return void
* @deprecated As of 2.3 use ViewBlock::concat() instead. * @deprecated 3.0.0 As of 2.3 use ViewBlock::concat() instead.
*/ */
public function append($name, $value = null) { public function append($name, $value = null) {
$this->concat($name, $value); $this->concat($name, $value);

2
lib/Cake/basics.php
View file

@ -420,7 +420,7 @@ if (!function_exists('cache')) {
* @param mixed $expires A valid strtotime string when the data expires. * @param mixed $expires A valid strtotime string when the data expires.
* @param string $target The target of the cached data; either 'cache' or 'public'. * @param string $target The target of the cached data; either 'cache' or 'public'.
* @return mixed The contents of the temporary file. * @return mixed The contents of the temporary file.
* @deprecated Will be removed in 3.0. Please use Cache::write() instead. * @deprecated 3.0.0 Will be removed in 3.0. Please use Cache::write() instead.
*/ */
function cache($path, $data = null, $expires = '+1 day', $target = 'cache') { function cache($path, $data = null, $expires = '+1 day', $target = 'cache') {
if (Configure::read('Cache.disable')) { if (Configure::read('Cache.disable')) {