Upgrade CakePHP from 2.2.5 to 2.9.5

This commit is contained in:
Brm Ko 2017-02-26 15:29:44 +01:00
parent 5a580df460
commit 235a541597
793 changed files with 60746 additions and 23753 deletions

View file

@ -4,43 +4,42 @@
*
* Log messages to text files.
*
* PHP 5
*
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
* Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
*
* Licensed under The MIT License
* For full copyright and license information, please see the LICENSE.txt
* Redistributions of files must retain the above copyright notice.
*
* @copyright Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
* @package Cake.Log
* @since CakePHP(tm) v 0.2.9
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
App::uses('LogEngineCollection', 'Log');
/**
* Logs messages to configured Log adapters. One or more adapters
* can be configured using CakeLogs's methods. If you don't
* configure any adapters, and write to the logs a default
* FileLog will be autoconfigured for you.
* Logs messages to configured Log adapters.
*
* One or more adapters
* can be configured using CakeLogs's methods.
*
* ### Configuring Log adapters
*
* You can configure log adapters in your applications `bootstrap.php` file.
* A sample configuration would look like:
*
* {{{
* CakeLog::config('my_log', array('engine' => 'FileLog'));
* }}}
* ```
* CakeLog::config('my_log', array('engine' => 'File'));
* ```
*
* See the documentation on CakeLog::config() for more detail.
*
* ### Writing to the log
*
* You write to the logs using CakeLog::write(). See its documentation for more
* You write to the logs using CakeLog::write(). See its documentation for more
* information.
*
* ### Logging Levels
@ -49,29 +48,29 @@ App::uses('LogEngineCollection', 'Log');
* RFC 5424. When logging messages you can either use the named methods,
* or the correct constants with `write()`:
*
* {{{
* ```
* CakeLog::error('Something horrible happened');
* CakeLog::write(LOG_ERR, 'Something horrible happened');
* }}}
* ```
*
* If you require custom logging levels, you can use CakeLog::levels() to
* append additoinal logging levels.
* append additional logging levels.
*
* ### Logging scopes
*
* When logging messages and configuring log adapters, you can specify
* 'scopes' that the logger will handle. You can think of scopes as subsystems
* in your application that may require different logging setups. For
* 'scopes' that the logger will handle. You can think of scopes as subsystems
* in your application that may require different logging setups. For
* example in an e-commerce application you may want to handle logged errors
* in the cart and ordering subsystems differently than the rest of the
* application. By using scopes you can control logging for each part
* application. By using scopes you can control logging for each part
* of your application and still keep standard log levels.
*
*
* See CakeLog::config() and CakeLog::write() for more information
* on scopes
*
* @package Cake.Log
* @link http://book.cakephp.org/2.0/en/core-libraries/logging.html#logging
*/
class CakeLog {
@ -85,6 +84,9 @@ class CakeLog {
/**
* Default log levels as detailed in RFC 5424
* http://tools.ietf.org/html/rfc5424
*
* Windows has fewer levels, thus notice, info and debug are the same.
* https://bugs.php.net/bug.php?id=18090
*
* @var array
*/
@ -119,8 +121,8 @@ class CakeLog {
* @return void
*/
protected static function _init() {
self::$_levels = self::defaultLevels();
self::$_Collection = new LogEngineCollection();
static::$_levels = static::defaultLevels();
static::$_Collection = new LogEngineCollection();
}
/**
@ -130,16 +132,16 @@ class CakeLog {
*
* ### Usage:
*
* {{{
* ```
* CakeLog::config('second_file', array(
* 'engine' => 'FileLog',
* 'engine' => 'File',
* 'path' => '/var/logs/my_app/'
* ));
* }}}
* ```
*
* Will configure a FileLog instance to use the specified path.
* All options that are not `engine` are passed onto the logging adapter,
* and handled there. Any class can be configured as a logging
* and handled there. Any class can be configured as a logging
* adapter as long as it implements the methods in CakeLogInterface.
*
* ### Logging levels
@ -147,13 +149,13 @@ class CakeLog {
* When configuring loggers, you can set which levels a logger will handle.
* This allows you to disable debug messages in production for example:
*
* {{{
* ```
* CakeLog::config('default', array(
* 'engine' => 'File',
* 'path' => LOGS,
* 'levels' => array('error', 'critical', 'alert', 'emergency')
* ));
* }}}
* ```
*
* The above logger would only log error messages or higher. Any
* other log messages would be discarded.
@ -161,16 +163,17 @@ class CakeLog {
* ### Logging scopes
*
* When configuring loggers you can define the active scopes the logger
* is for. If defined only the listed scopes will be handled by the
* logger. If you don't define any scopes an adapter will catch
* is for. If defined only the listed scopes will be handled by the
* logger. If you don't define any scopes an adapter will catch
* all scopes that match the handled levels.
*
* {{{
* ```
* CakeLog::config('payments', array(
* 'engine' => 'File',
* 'types' => array('info', 'error', 'warning'),
* 'scopes' => array('payment', 'order')
* ));
* }}}
* ```
*
* The above logger will only capture log entries made in the
* `payment` and `order` scopes. All other scopes including the
@ -182,20 +185,21 @@ class CakeLog {
* @param string $key The keyname for this logger, used to remove the
* logger later.
* @param array $config Array of configuration information for the logger
* @return boolean success of configuration.
* @return bool success of configuration.
* @throws CakeLogException
* @link http://book.cakephp.org/2.0/en/core-libraries/logging.html#creating-and-configuring-log-streams
*/
public static function config($key, $config) {
if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $key)) {
throw new CakeLogException(__d('cake_dev', 'Invalid key name'));
}
if (empty($config['engine'])) {
throw new CakeLogException(__d('cake_dev', 'Missing logger classname'));
throw new CakeLogException(__d('cake_dev', 'Missing logger class name'));
}
if (empty(self::$_Collection)) {
self::_init();
if (empty(static::$_Collection)) {
static::_init();
}
self::$_Collection->load($key, $config);
static::$_Collection->load($key, $config);
return true;
}
@ -205,10 +209,10 @@ class CakeLog {
* @return array Array of configured log streams.
*/
public static function configured() {
if (empty(self::$_Collection)) {
self::_init();
if (empty(static::$_Collection)) {
static::_init();
}
return self::$_Collection->attached();
return static::$_Collection->loaded();
}
/**
@ -219,15 +223,15 @@ class CakeLog {
*
* To append additional level 'user0' and 'user1' to to default log levels:
*
* {{{
* ```
* CakeLog::levels(array('user0, 'user1'));
* // or
* CakeLog::levels(array('user0, 'user1'), true);
* }}}
* ```
*
* will result in:
*
* {{{
* ```
* array(
* 0 => 'emergency',
* 1 => 'alert',
@ -235,89 +239,89 @@ class CakeLog {
* 8 => 'user0',
* 9 => 'user1',
* );
* }}}
* ```
*
* To set/replace existing configuration, pass an array with the second argument
* set to false.
*
* {{{
* ```
* CakeLog::levels(array('user0, 'user1'), false);
* }}}
* ```
*
* will result in:
*
* {{{
* ```
* array(
* 0 => 'user0',
* 1 => 'user1',
* );
* }}}
* ```
*
* @param array $levels array
* @param bool $append true to append, false to replace
* @return array active log levels
* @return array Active log levels
*/
public static function levels($levels = array(), $append = true) {
if (empty(self::$_Collection)) {
self::_init();
if (empty(static::$_Collection)) {
static::_init();
}
if (empty($levels)) {
return self::$_levels;
return static::$_levels;
}
$levels = array_values($levels);
if ($append) {
self::$_levels = array_merge(self::$_levels, $levels);
static::$_levels = array_merge(static::$_levels, $levels);
} else {
self::$_levels = $levels;
static::$_levels = $levels;
}
self::$_levelMap = array_flip(self::$_levels);
return self::$_levels;
static::$_levelMap = array_flip(static::$_levels);
return static::$_levels;
}
/**
* 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;
self::$_levels = array_flip(self::$_levelMap);
return self::$_levels;
static::$_levelMap = static::$_defaultLevels;
static::$_levels = array_flip(static::$_levelMap);
return static::$_levels;
}
/**
* Removes a stream from the active streams. Once a stream has been removed
* Removes a stream from the active streams. Once a stream has been removed
* it will no longer have messages sent to it.
*
* @param string $streamName Key name of a configured stream to remove.
* @return void
*/
public static function drop($streamName) {
if (empty(self::$_Collection)) {
self::_init();
if (empty(static::$_Collection)) {
static::_init();
}
self::$_Collection->unload($streamName);
static::$_Collection->unload($streamName);
}
/**
* Checks wether $streamName is enabled
* Checks whether $streamName is enabled
*
* @param string $streamName to check
* @return bool
* @throws CakeLogException
*/
public static function enabled($streamName) {
if (empty(self::$_Collection)) {
self::_init();
if (empty(static::$_Collection)) {
static::_init();
}
if (!isset(self::$_Collection->{$streamName})) {
if (!isset(static::$_Collection->{$streamName})) {
throw new CakeLogException(__d('cake_dev', 'Stream %s not found', $streamName));
}
return self::$_Collection->enabled($streamName);
return static::$_Collection->enabled($streamName);
}
/**
* Enable stream. Streams that were previously disabled
* Enable stream. Streams that were previously disabled
* can be re-enabled with this method.
*
* @param string $streamName to enable
@ -325,17 +329,17 @@ class CakeLog {
* @throws CakeLogException
*/
public static function enable($streamName) {
if (empty(self::$_Collection)) {
self::_init();
if (empty(static::$_Collection)) {
static::_init();
}
if (!isset(self::$_Collection->{$streamName})) {
if (!isset(static::$_Collection->{$streamName})) {
throw new CakeLogException(__d('cake_dev', 'Stream %s not found', $streamName));
}
self::$_Collection->enable($streamName);
static::$_Collection->enable($streamName);
}
/**
* Disable stream. Disabling a stream will
* Disable stream. Disabling a stream will
* prevent that log stream from receiving any messages until
* its re-enabled.
*
@ -344,44 +348,32 @@ class CakeLog {
* @throws CakeLogException
*/
public static function disable($streamName) {
if (empty(self::$_Collection)) {
self::_init();
if (empty(static::$_Collection)) {
static::_init();
}
if (!isset(self::$_Collection->{$streamName})) {
if (!isset(static::$_Collection->{$streamName})) {
throw new CakeLogException(__d('cake_dev', 'Stream %s not found', $streamName));
}
self::$_Collection->disable($streamName);
static::$_Collection->disable($streamName);
}
/**
* Gets the logging engine from the active streams.
*
* @see BaseLog
* @param string $streamName Key name of a configured stream to get.
* @return $mixed instance of BaseLog or false if not found
* @return mixed instance of BaseLog or false if not found
* @see BaseLog
*/
public static function stream($streamName) {
if (empty(self::$_Collection)) {
self::_init();
if (empty(static::$_Collection)) {
static::_init();
}
if (!empty(self::$_Collection->{$streamName})) {
return self::$_Collection->{$streamName};
if (!empty(static::$_Collection->{$streamName})) {
return static::$_Collection->{$streamName};
}
return false;
}
/**
* Configures the automatic/default stream a FileLog.
*
* @return void
*/
protected static function _autoConfig() {
self::$_Collection->load('default', array(
'engine' => 'FileLog',
'path' => LOGS,
));
}
/**
* Writes the given message and type to all of the configured log adapters.
* Configured adapters are passed both the $type and $message variables. $type
@ -404,30 +396,31 @@ class CakeLog {
*
* `CakeLog::write('warning', 'Stuff is broken here');`
*
* @param integer|string $type Type of message being written. When value is an integer
* @param int|string $type Type of message being written. When value is an integer
* or a string matching the recognized levels, then it will
* be treated log levels. Otherwise it's treated as scope.
* @param string $message Message content to log
* @param string|array $scope The scope(s) a log message is being created in.
* See CakeLog::config() for more information on logging scopes.
* @return boolean Success
* @return bool Success
* @link http://book.cakephp.org/2.0/en/core-libraries/logging.html#writing-to-logs
*/
public static function write($type, $message, $scope = array()) {
if (empty(self::$_Collection)) {
self::_init();
if (empty(static::$_Collection)) {
static::_init();
}
if (is_int($type) && isset(self::$_levels[$type])) {
$type = self::$_levels[$type];
if (is_int($type) && isset(static::$_levels[$type])) {
$type = static::$_levels[$type];
}
if (is_string($type) && empty($scope) && !in_array($type, self::$_levels)) {
if (is_string($type) && empty($scope) && !in_array($type, static::$_levels)) {
$scope = $type;
}
$logged = false;
foreach (self::$_Collection->enabled() as $streamName) {
$logger = self::$_Collection->{$streamName};
foreach (static::$_Collection->enabled() as $streamName) {
$logger = static::$_Collection->{$streamName};
$types = $scopes = $config = array();
if ($logger instanceof BaseLog) {
if (method_exists($logger, 'config')) {
$config = $logger->config();
}
if (isset($config['types'])) {
@ -453,11 +446,7 @@ class CakeLog {
$logged = true;
}
}
if (!$logged) {
self::_autoConfig();
self::stream('default')->write($type, $message);
}
return true;
return $logged;
}
/**
@ -466,10 +455,10 @@ class CakeLog {
* @param string $message log message
* @param string|array $scope The scope(s) a log message is being created in.
* See CakeLog::config() for more information on logging scopes.
* @return boolean Success
* @return bool Success
*/
public static function emergency($message, $scope = array()) {
return self::write(self::$_levelMap['emergency'], $message, $scope);
return static::write(static::$_levelMap['emergency'], $message, $scope);
}
/**
@ -478,10 +467,10 @@ class CakeLog {
* @param string $message log message
* @param string|array $scope The scope(s) a log message is being created in.
* See CakeLog::config() for more information on logging scopes.
* @return boolean Success
* @return bool Success
*/
public static function alert($message, $scope = array()) {
return self::write(self::$_levelMap['alert'], $message, $scope);
return static::write(static::$_levelMap['alert'], $message, $scope);
}
/**
@ -490,10 +479,10 @@ class CakeLog {
* @param string $message log message
* @param string|array $scope The scope(s) a log message is being created in.
* See CakeLog::config() for more information on logging scopes.
* @return boolean Success
* @return bool Success
*/
public static function critical($message, $scope = array()) {
return self::write(self::$_levelMap['critical'], $message, $scope);
return static::write(static::$_levelMap['critical'], $message, $scope);
}
/**
@ -502,10 +491,10 @@ class CakeLog {
* @param string $message log message
* @param string|array $scope The scope(s) a log message is being created in.
* See CakeLog::config() for more information on logging scopes.
* @return boolean Success
* @return bool Success
*/
public static function error($message, $scope = array()) {
return self::write(self::$_levelMap['error'], $message, $scope);
return static::write(static::$_levelMap['error'], $message, $scope);
}
/**
@ -514,10 +503,10 @@ class CakeLog {
* @param string $message log message
* @param string|array $scope The scope(s) a log message is being created in.
* See CakeLog::config() for more information on logging scopes.
* @return boolean Success
* @return bool Success
*/
public static function warning($message, $scope = array()) {
return self::write(self::$_levelMap['warning'], $message, $scope);
return static::write(static::$_levelMap['warning'], $message, $scope);
}
/**
@ -526,10 +515,10 @@ class CakeLog {
* @param string $message log message
* @param string|array $scope The scope(s) a log message is being created in.
* See CakeLog::config() for more information on logging scopes.
* @return boolean Success
* @return bool Success
*/
public static function notice($message, $scope = array()) {
return self::write(self::$_levelMap['notice'], $message, $scope);
return static::write(static::$_levelMap['notice'], $message, $scope);
}
/**
@ -538,10 +527,10 @@ class CakeLog {
* @param string $message log message
* @param string|array $scope The scope(s) a log message is being created in.
* See CakeLog::config() for more information on logging scopes.
* @return boolean Success
* @return bool Success
*/
public static function debug($message, $scope = array()) {
return self::write(self::$_levelMap['debug'], $message, $scope);
return static::write(static::$_levelMap['debug'], $message, $scope);
}
/**
@ -550,10 +539,10 @@ class CakeLog {
* @param string $message log message
* @param string|array $scope The scope(s) a log message is being created in.
* See CakeLog::config() for more information on logging scopes.
* @return boolean Success
* @return bool Success
*/
public static function info($message, $scope = array()) {
return self::write(self::$_levelMap['info'], $message, $scope);
return static::write(static::$_levelMap['info'], $message, $scope);
}
}