mirror of
https://github.com/brmlab/brmsklad.git
synced 2025-08-02 22:23:38 +02:00
Upgrade CakePHP from 2.2.5 to 2.9.5
This commit is contained in:
parent
5a580df460
commit
235a541597
793 changed files with 60746 additions and 23753 deletions
|
@ -1,20 +1,22 @@
|
|||
<?php
|
||||
/**
|
||||
* 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.Core
|
||||
* @since CakePHP(tm) v 1.0.0.2363
|
||||
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
|
||||
* @license http://www.opensource.org/licenses/mit-license.php MIT License
|
||||
*/
|
||||
|
||||
App::uses('Hash', 'Utility');
|
||||
App::uses('ConfigReaderInterface', 'Configure');
|
||||
|
||||
/**
|
||||
* Compatibility with 2.1, which expects Configure to load Set.
|
||||
*/
|
||||
|
@ -60,24 +62,22 @@ class Configure {
|
|||
* - Include app/Config/bootstrap.php.
|
||||
* - Setup error/exception handlers.
|
||||
*
|
||||
* @param boolean $boot
|
||||
* @param bool $boot Whether to do bootstrapping.
|
||||
* @return void
|
||||
*/
|
||||
public static function bootstrap($boot = true) {
|
||||
if ($boot) {
|
||||
self::write('App', array(
|
||||
'base' => false,
|
||||
'baseUrl' => false,
|
||||
'dir' => APP_DIR,
|
||||
'webroot' => WEBROOT_DIR,
|
||||
'www_root' => WWW_ROOT
|
||||
));
|
||||
static::_appDefaults();
|
||||
|
||||
if (!include APP . 'Config' . DS . 'core.php') {
|
||||
trigger_error(__d('cake_dev', "Can't find application core file. Please create %score.php, and make sure it is readable by PHP.", APP . 'Config' . DS), E_USER_ERROR);
|
||||
trigger_error(__d('cake_dev',
|
||||
"Can't find application core file. Please create %s, and make sure it is readable by PHP.",
|
||||
APP . 'Config' . DS . 'core.php'),
|
||||
E_USER_ERROR
|
||||
);
|
||||
}
|
||||
App::$bootstrapping = false;
|
||||
App::init();
|
||||
App::$bootstrapping = false;
|
||||
App::build();
|
||||
|
||||
$exception = array(
|
||||
|
@ -87,31 +87,56 @@ class Configure {
|
|||
'handler' => 'ErrorHandler::handleError',
|
||||
'level' => E_ALL & ~E_DEPRECATED,
|
||||
);
|
||||
self::_setErrorHandlers($error, $exception);
|
||||
if (PHP_SAPI === 'cli') {
|
||||
App::uses('ConsoleErrorHandler', 'Console');
|
||||
$console = new ConsoleErrorHandler();
|
||||
$exception['handler'] = array($console, 'handleException');
|
||||
$error['handler'] = array($console, 'handleError');
|
||||
}
|
||||
static::_setErrorHandlers($error, $exception);
|
||||
|
||||
if (!include APP . 'Config' . DS . 'bootstrap.php') {
|
||||
trigger_error(__d('cake_dev', "Can't find application bootstrap file. Please create %sbootstrap.php, and make sure it is readable by PHP.", APP . 'Config' . DS), E_USER_ERROR);
|
||||
trigger_error(__d('cake_dev',
|
||||
"Can't find application bootstrap file. Please create %s, and make sure it is readable by PHP.",
|
||||
APP . 'Config' . DS . 'bootstrap.php'),
|
||||
E_USER_ERROR
|
||||
);
|
||||
}
|
||||
restore_error_handler();
|
||||
|
||||
self::_setErrorHandlers(
|
||||
self::$_values['Error'],
|
||||
self::$_values['Exception']
|
||||
static::_setErrorHandlers(
|
||||
static::$_values['Error'],
|
||||
static::$_values['Exception']
|
||||
);
|
||||
|
||||
// Preload Debugger + String in case of E_STRICT errors when loading files.
|
||||
if (self::$_values['debug'] > 0) {
|
||||
// Preload Debugger + CakeText in case of E_STRICT errors when loading files.
|
||||
if (static::$_values['debug'] > 0) {
|
||||
class_exists('Debugger');
|
||||
class_exists('String');
|
||||
class_exists('CakeText');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Set app's default configs
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
protected static function _appDefaults() {
|
||||
static::write('App', (array)static::read('App') + array(
|
||||
'base' => false,
|
||||
'baseUrl' => false,
|
||||
'dir' => APP_DIR,
|
||||
'webroot' => WEBROOT_DIR,
|
||||
'www_root' => WWW_ROOT
|
||||
));
|
||||
}
|
||||
|
||||
/**
|
||||
* Used to store a dynamic variable in Configure.
|
||||
*
|
||||
* Usage:
|
||||
* {{{
|
||||
* ```
|
||||
* Configure::write('One.key1', 'value of the Configure::One[key1]');
|
||||
* Configure::write(array('One.key1' => 'value of the Configure::One[key1]'));
|
||||
* Configure::write('One', array(
|
||||
|
@ -123,12 +148,13 @@ class Configure {
|
|||
* 'One.key1' => 'value of the Configure::One[key1]',
|
||||
* 'One.key2' => 'value of the Configure::One[key2]'
|
||||
* ));
|
||||
* }}}
|
||||
* ```
|
||||
*
|
||||
* @link http://book.cakephp.org/2.0/en/development/configuration.html#Configure::write
|
||||
* @param array $config Name of var to write
|
||||
* @param string|array $config The key to write, can be a dot notation value.
|
||||
* Alternatively can be an array containing key(s) and value(s).
|
||||
* @param mixed $value Value to set for var
|
||||
* @return boolean True if write was successful
|
||||
* @return bool True if write was successful
|
||||
* @link http://book.cakephp.org/2.0/en/development/configuration.html#Configure::write
|
||||
*/
|
||||
public static function write($config, $value = null) {
|
||||
if (!is_array($config)) {
|
||||
|
@ -136,11 +162,11 @@ class Configure {
|
|||
}
|
||||
|
||||
foreach ($config as $name => $value) {
|
||||
self::$_values = Hash::insert(self::$_values, $name, $value);
|
||||
static::$_values = Hash::insert(static::$_values, $name, $value);
|
||||
}
|
||||
|
||||
if (isset($config['debug']) && function_exists('ini_set')) {
|
||||
if (self::$_values['debug']) {
|
||||
if (static::$_values['debug']) {
|
||||
ini_set('display_errors', 1);
|
||||
} else {
|
||||
ini_set('display_errors', 0);
|
||||
|
@ -150,92 +176,128 @@ class Configure {
|
|||
}
|
||||
|
||||
/**
|
||||
* Used to read information stored in Configure. Its not
|
||||
* Used to read information stored in Configure. It's not
|
||||
* possible to store `null` values in Configure.
|
||||
*
|
||||
* Usage:
|
||||
* {{{
|
||||
* ```
|
||||
* Configure::read('Name'); will return all values for Name
|
||||
* Configure::read('Name.key'); will return only the value of Configure::Name[key]
|
||||
* }}}
|
||||
* ```
|
||||
*
|
||||
* @linkhttp://book.cakephp.org/2.0/en/development/configuration.html#Configure::read
|
||||
* @param string $var Variable to obtain. Use '.' to access array elements.
|
||||
* @param string|null $var Variable to obtain. Use '.' to access array elements.
|
||||
* @return mixed value stored in configure, or null.
|
||||
* @link http://book.cakephp.org/2.0/en/development/configuration.html#Configure::read
|
||||
*/
|
||||
public static function read($var = null) {
|
||||
if ($var === null) {
|
||||
return self::$_values;
|
||||
return static::$_values;
|
||||
}
|
||||
return Hash::get(self::$_values, $var);
|
||||
return Hash::get(static::$_values, $var);
|
||||
}
|
||||
|
||||
/**
|
||||
* Used to read and delete a variable from Configure.
|
||||
*
|
||||
* This is primarily used during bootstrapping to move configuration data
|
||||
* out of configure into the various other classes in CakePHP.
|
||||
*
|
||||
* @param string $var The key to read and remove.
|
||||
* @return array|null
|
||||
*/
|
||||
public static function consume($var) {
|
||||
$simple = strpos($var, '.') === false;
|
||||
if ($simple && !isset(static::$_values[$var])) {
|
||||
return null;
|
||||
}
|
||||
if ($simple) {
|
||||
$value = static::$_values[$var];
|
||||
unset(static::$_values[$var]);
|
||||
return $value;
|
||||
}
|
||||
$value = Hash::get(static::$_values, $var);
|
||||
static::$_values = Hash::remove(static::$_values, $var);
|
||||
return $value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if given variable is set in Configure.
|
||||
*
|
||||
* @param string $var Variable name to check for
|
||||
* @return bool True if variable is there
|
||||
*/
|
||||
public static function check($var) {
|
||||
if (empty($var)) {
|
||||
return false;
|
||||
}
|
||||
return Hash::get(static::$_values, $var) !== null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Used to delete a variable from Configure.
|
||||
*
|
||||
* Usage:
|
||||
* {{{
|
||||
* ```
|
||||
* Configure::delete('Name'); will delete the entire Configure::Name
|
||||
* Configure::delete('Name.key'); will delete only the Configure::Name[key]
|
||||
* }}}
|
||||
* ```
|
||||
*
|
||||
* @link http://book.cakephp.org/2.0/en/development/configuration.html#Configure::delete
|
||||
* @param string $var the var to be deleted
|
||||
* @return void
|
||||
* @link http://book.cakephp.org/2.0/en/development/configuration.html#Configure::delete
|
||||
*/
|
||||
public static function delete($var = null) {
|
||||
$keys = explode('.', $var);
|
||||
self::$_values = Hash::remove(self::$_values, $var);
|
||||
public static function delete($var) {
|
||||
static::$_values = Hash::remove(static::$_values, $var);
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a new reader to Configure. Readers allow you to read configuration
|
||||
* files in various formats/storage locations. CakePHP comes with two built-in readers
|
||||
* PhpReader and IniReader. You can also implement your own reader classes in your application.
|
||||
* Add a new reader to Configure. Readers allow you to read configuration
|
||||
* files in various formats/storage locations. CakePHP comes with two built-in readers
|
||||
* PhpReader and IniReader. You can also implement your own reader classes in your application.
|
||||
*
|
||||
* To add a new reader to Configure:
|
||||
*
|
||||
* `Configure::config('ini', new IniReader());`
|
||||
*
|
||||
* @param string $name The name of the reader being configured. This alias is used later to
|
||||
* @param string $name The name of the reader being configured. This alias is used later to
|
||||
* read values from a specific reader.
|
||||
* @param ConfigReaderInterface $reader The reader to append.
|
||||
* @return void
|
||||
*/
|
||||
public static function config($name, ConfigReaderInterface $reader) {
|
||||
self::$_readers[$name] = $reader;
|
||||
static::$_readers[$name] = $reader;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the names of the configured reader objects.
|
||||
*
|
||||
* @param string $name
|
||||
* @param string|null $name Name to check. If null returns all configured reader names.
|
||||
* @return array Array of the configured reader objects.
|
||||
*/
|
||||
public static function configured($name = null) {
|
||||
if ($name) {
|
||||
return isset(self::$_readers[$name]);
|
||||
return isset(static::$_readers[$name]);
|
||||
}
|
||||
return array_keys(self::$_readers);
|
||||
return array_keys(static::$_readers);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove a configured reader. This will unset the reader
|
||||
* Remove a configured reader. This will unset the reader
|
||||
* and make any future attempts to use it cause an Exception.
|
||||
*
|
||||
* @param string $name Name of the reader to drop.
|
||||
* @return boolean Success
|
||||
* @return bool Success
|
||||
*/
|
||||
public static function drop($name) {
|
||||
if (!isset(self::$_readers[$name])) {
|
||||
if (!isset(static::$_readers[$name])) {
|
||||
return false;
|
||||
}
|
||||
unset(self::$_readers[$name]);
|
||||
unset(static::$_readers[$name]);
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads stored configuration information from a resource. You can add
|
||||
* Loads stored configuration information from a resource. You can add
|
||||
* config file resource readers with `Configure::config()`.
|
||||
*
|
||||
* Loaded configuration information will be merged with the current
|
||||
|
@ -244,7 +306,7 @@ class Configure {
|
|||
*
|
||||
* `Configure::load('Users.user', 'default')`
|
||||
*
|
||||
* Would load the 'user' config file using the default config reader. You can load
|
||||
* Would load the 'user' config file using the default config reader. You can load
|
||||
* app config files by giving the name of the resource you want loaded.
|
||||
*
|
||||
* `Configure::load('setup', 'default');`
|
||||
|
@ -252,15 +314,15 @@ class Configure {
|
|||
* If using `default` config and no reader has been configured for it yet,
|
||||
* one will be automatically created using PhpReader
|
||||
*
|
||||
* @link http://book.cakephp.org/2.0/en/development/configuration.html#Configure::load
|
||||
* @param string $key name of configuration resource to load.
|
||||
* @param string $config Name of the configured reader to use to read the resource identified by $key.
|
||||
* @param boolean $merge if config files should be merged instead of simply overridden
|
||||
* @return mixed false if file not found, void if load successful.
|
||||
* @param bool $merge if config files should be merged instead of simply overridden
|
||||
* @return bool False if file not found, true if load successful.
|
||||
* @throws ConfigureException Will throw any exceptions the reader raises.
|
||||
* @link http://book.cakephp.org/2.0/en/development/configuration.html#Configure::load
|
||||
*/
|
||||
public static function load($key, $config = 'default', $merge = true) {
|
||||
$reader = self::_getReader($config);
|
||||
$reader = static::_getReader($config);
|
||||
if (!$reader) {
|
||||
return false;
|
||||
}
|
||||
|
@ -269,18 +331,18 @@ class Configure {
|
|||
if ($merge) {
|
||||
$keys = array_keys($values);
|
||||
foreach ($keys as $key) {
|
||||
if (($c = self::read($key)) && is_array($values[$key]) && is_array($c)) {
|
||||
if (($c = static::read($key)) && is_array($values[$key]) && is_array($c)) {
|
||||
$values[$key] = Hash::merge($c, $values[$key]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return self::write($values);
|
||||
return static::write($values);
|
||||
}
|
||||
|
||||
/**
|
||||
* Dump data currently in Configure into $filename. The serialization format
|
||||
* is decided by the config reader attached as $config. For example, if the
|
||||
* Dump data currently in Configure into $key. The serialization format
|
||||
* is decided by the config reader attached as $config. For example, if the
|
||||
* 'default' adapter is a PhpReader, the generated file will be a PHP
|
||||
* configuration file loadable by the PhpReader.
|
||||
*
|
||||
|
@ -300,18 +362,18 @@ class Configure {
|
|||
* @param string $config The name of the configured adapter to dump data with.
|
||||
* @param array $keys The name of the top-level keys you want to dump.
|
||||
* This allows you save only some data stored in Configure.
|
||||
* @return boolean success
|
||||
* @return bool success
|
||||
* @throws ConfigureException if the adapter does not implement a `dump` method.
|
||||
*/
|
||||
public static function dump($key, $config = 'default', $keys = array()) {
|
||||
$reader = self::_getReader($config);
|
||||
$reader = static::_getReader($config);
|
||||
if (!$reader) {
|
||||
throw new ConfigureException(__d('cake', 'There is no "%s" adapter.', $config));
|
||||
throw new ConfigureException(__d('cake_dev', 'There is no "%s" adapter.', $config));
|
||||
}
|
||||
if (!method_exists($reader, 'dump')) {
|
||||
throw new ConfigureException(__d('cake', 'The "%s" adapter, does not have a dump() method.', $config));
|
||||
throw new ConfigureException(__d('cake_dev', 'The "%s" adapter, does not have a %s method.', $config, 'dump()'));
|
||||
}
|
||||
$values = self::$_values;
|
||||
$values = static::$_values;
|
||||
if (!empty($keys) && is_array($keys)) {
|
||||
$values = array_intersect_key($values, array_flip($keys));
|
||||
}
|
||||
|
@ -326,14 +388,14 @@ class Configure {
|
|||
* @return mixed Reader instance or false
|
||||
*/
|
||||
protected static function _getReader($config) {
|
||||
if (!isset(self::$_readers[$config])) {
|
||||
if (!isset(static::$_readers[$config])) {
|
||||
if ($config !== 'default') {
|
||||
return false;
|
||||
}
|
||||
App::uses('PhpReader', 'Configure');
|
||||
self::config($config, new PhpReader());
|
||||
static::config($config, new PhpReader());
|
||||
}
|
||||
return self::$_readers[$config];
|
||||
return static::$_readers[$config];
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -344,42 +406,42 @@ class Configure {
|
|||
* @return string Current version of CakePHP
|
||||
*/
|
||||
public static function version() {
|
||||
if (!isset(self::$_values['Cake']['version'])) {
|
||||
if (!isset(static::$_values['Cake']['version'])) {
|
||||
require CAKE . 'Config' . DS . 'config.php';
|
||||
self::write($config);
|
||||
static::write($config);
|
||||
}
|
||||
return self::$_values['Cake']['version'];
|
||||
return static::$_values['Cake']['version'];
|
||||
}
|
||||
|
||||
/**
|
||||
* Used to write runtime configuration into Cache. Stored runtime configuration can be
|
||||
* restored using `Configure::restore()`. These methods can be used to enable configuration managers
|
||||
* Used to write runtime configuration into Cache. Stored runtime configuration can be
|
||||
* restored using `Configure::restore()`. These methods can be used to enable configuration managers
|
||||
* frontends, or other GUI type interfaces for configuration.
|
||||
*
|
||||
* @param string $name The storage name for the saved configuration.
|
||||
* @param string $cacheConfig The cache configuration to save into. Defaults to 'default'
|
||||
* @param string $cacheConfig The cache configuration to save into. Defaults to 'default'
|
||||
* @param array $data Either an array of data to store, or leave empty to store all values.
|
||||
* @return boolean Success
|
||||
* @return bool Success
|
||||
*/
|
||||
public static function store($name, $cacheConfig = 'default', $data = null) {
|
||||
if ($data === null) {
|
||||
$data = self::$_values;
|
||||
$data = static::$_values;
|
||||
}
|
||||
return Cache::write($name, $data, $cacheConfig);
|
||||
}
|
||||
|
||||
/**
|
||||
* Restores configuration data stored in the Cache into configure. Restored
|
||||
* Restores configuration data stored in the Cache into configure. Restored
|
||||
* values will overwrite existing ones.
|
||||
*
|
||||
* @param string $name Name of the stored config file to load.
|
||||
* @param string $cacheConfig Name of the Cache configuration to read from.
|
||||
* @return boolean Success.
|
||||
* @return bool Success.
|
||||
*/
|
||||
public static function restore($name, $cacheConfig = 'default') {
|
||||
$values = Cache::read($name, $cacheConfig);
|
||||
if ($values) {
|
||||
return self::write($values);
|
||||
return static::write($values);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -387,12 +449,13 @@ class Configure {
|
|||
/**
|
||||
* Clear all values stored in Configure.
|
||||
*
|
||||
* @return boolean success.
|
||||
* @return bool Success.
|
||||
*/
|
||||
public static function clear() {
|
||||
self::$_values = array();
|
||||
static::$_values = array();
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the error and exception handlers.
|
||||
*
|
||||
|
@ -413,4 +476,5 @@ class Configure {
|
|||
set_exception_handler($exception['handler']);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue