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

Moving more classes to the new layout, it is time to bring the debugger up

Browse source
This commit is contained in:
José Lorenzo Rodríguez 2010-12-04 02:16:51 -04:30
parent 3c23080dd2
commit 73ad5385eb
8 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/Cake/Cache/Cache.php
View file

@ -19,6 +19,8 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
App::uses('Inflector', 'Utility');
/** /**
* Caching for CakePHP. * Caching for CakePHP.
* *
@ -109,7 +111,8 @@ class Cache {
list($plugin, $class) = pluginSplit($config['engine']); list($plugin, $class) = pluginSplit($config['engine']);
$cacheClass = $class . 'Engine'; $cacheClass = $class . 'Engine';
if (!class_exists($cacheClass) && self::_loadEngine($class, $plugin) === false) { App::uses($cacheClass, 'Cache/Engine');
if (!class_exists($cacheClass)) {
return false; return false;
} }
$cacheClass = $class . 'Engine'; $cacheClass = $class . 'Engine';
@ -151,26 +154,6 @@ class Cache {
return true; return true;
} }
/**
* Tries to find and include a file for a cache engine and returns object instance
*
* @param $name Name of the engine (without 'Engine')
* @return mixed $engine object or null
*/
protected static function _loadEngine($name, $plugin = null) {
if ($plugin) {
return App::import('Lib', $plugin . '.cache' . DS . $name, false);
} else {
$core = App::core();
$path = $core['libs'][0] . 'cache' . DS . strtolower($name) . '.php';
if (file_exists($path)) {
require $path;
return true;
}
return App::import('Lib', 'cache' . DS . $name, false);
}
}
/** /**
* Temporarily change the settings on a cache config. The settings will persist for the next write * Temporarily change the settings on a cache config. The settings will persist for the next write
* operation (write, decrement, increment, clear). Any reads that are done before the write, will * operation (write, decrement, increment, clear). Any reads that are done before the write, will

0
cake/libs/cache/apc.php → lib/Cake/Cache/Engine/ApcEngine.php
View file

0
cake/libs/cache/file.php → lib/Cake/Cache/Engine/FileEngine.php
View file

0
cake/libs/cache/memcache.php → lib/Cake/Cache/Engine/MemcacheEngine.php
View file

0
cake/libs/cache/xcache.php → lib/Cake/Cache/Engine/XcacheEngine.php
View file

0
cake/libs/error/error_handler.php → lib/Cake/Error/ErrorHandler.php
View file

0
cake/libs/error/exceptions.php → lib/Cake/Error/exceptions.php
View file

7
lib/Cake/bootstrap.php
View file

@ -219,14 +219,15 @@ if (!defined('JS_URL')) {
require LIBS . 'basics.php'; require LIBS . 'basics.php';
require LIBS . 'Utility' . DS . 'Inflector.php';
require LIBS . 'Utility' . DS . 'Folder.php';
require LIBS . 'Core' . DS .'App.php'; require LIBS . 'Core' . DS .'App.php';
require LIBS . 'Error' . DS . 'exceptions.php';
App::uses('ErrorHandler', 'Error');
App::uses('Configure', 'Core'); App::uses('Configure', 'Core');
App::uses('Cache', 'Cache'); App::uses('Cache', 'Cache');
//require LIBS . 'error' . DS . 'exceptions.php';
//require LIBS . 'object.php'; //require LIBS . 'object.php';
//require LIBS . 'configure.php'; //require LIBS . 'configure.php';
//require LIBS . 'set.php'; //require LIBS . 'set.php';