adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

moving path configuration to App class

Browse source
This commit is contained in:
gwoo 2009-06-07 15:24:10 -07:00
parent f84ed69780
commit 24d78dd671
28 changed files with 463 additions and 451 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cake/console/cake.php
View file

@ -198,7 +198,7 @@ class ShellDispatcher {
*/ */
function __buildPaths() { function __buildPaths() {
$paths = array(); $paths = array();
$pluginPaths = Configure::read('pluginPaths'); $pluginPaths = App::path('plugins');
if (!class_exists('Folder')) { if (!class_exists('Folder')) {
require LIBS . 'folder.php'; require LIBS . 'folder.php';
} }
@ -259,7 +259,7 @@ class ShellDispatcher {
Configure::getInstance(file_exists(CONFIGS . 'bootstrap.php')); Configure::getInstance(file_exists(CONFIGS . 'bootstrap.php'));
if (!file_exists(APP_PATH . 'config' . DS . 'core.php')) { if (!file_exists(APP_PATH . 'config' . DS . 'core.php')) {
include_once CORE_PATH . 'cake' . DS . 'console' . DS . 'libs' . DS . 'templates' . DS . 'skel' . DS . 'config' . DS . 'core.php'; include_once CORE_PATH . 'cake' . DS . 'console' . DS . 'templates' . DS . 'skel' . DS . 'config' . DS . 'core.php';
Configure::buildPaths(array()); Configure::buildPaths(array());
} }

2
cake/console/libs/testsuite.php
View file

@ -316,7 +316,7 @@ class TestSuiteShell extends Shell {
} else { } else {
$scoredCategory = Inflector::underscore($category); $scoredCategory = Inflector::underscore($category);
$folder = APP . 'plugins' . DS . $scoredCategory . DS; $folder = APP . 'plugins' . DS . $scoredCategory . DS;
$pluginPaths = Configure::read('pluginPaths'); $pluginPaths = App::path('plugins');
foreach ($pluginPaths as $path) { foreach ($pluginPaths as $path) {
if (file_exists($path . $scoredCategory . DS . 'tests')) { if (file_exists($path . $scoredCategory . DS . 'tests')) {
$folder = $path . $scoredCategory . DS . 'tests'; $folder = $path . $scoredCategory . DS . 'tests';

2
cake/dispatcher.php
View file

@ -620,7 +620,7 @@ class Dispatcher extends Object {
if ($pos > 0) { if ($pos > 0) {
$plugin = substr($url, 0, $pos - 1); $plugin = substr($url, 0, $pos - 1);
$url = str_replace($plugin . '/', '', $url); $url = str_replace($plugin . '/', '', $url);
$pluginPaths = Configure::read('pluginPaths'); $pluginPaths = App::path('plugins');
$count = count($pluginPaths); $count = count($pluginPaths);
for ($i = 0; $i < $count; $i++) { for ($i = 0; $i < $count; $i++) {
$paths[] = $pluginPaths[$i] . $plugin . DS . 'vendors' . DS; $paths[] = $pluginPaths[$i] . $plugin . DS . 'vendors' . DS;

632
cake/libs/configure.php
View file

@ -32,76 +32,6 @@
* @link http://book.cakephp.org/view/42/The-Configuration-Class * @link http://book.cakephp.org/view/42/The-Configuration-Class
*/ */
class Configure extends Object { class Configure extends Object {
/**
* List of additional path(s) where model files reside.
*
* @var array
* @access public
*/
var $modelPaths = array();
/**
* List of additional path(s) where behavior files reside.
*
* @var array
* @access public
*/
var $behaviorPaths = array();
/**
* List of additional path(s) where controller files reside.
*
* @var array
* @access public
*/
var $controllerPaths = array();
/**
* List of additional path(s) where component files reside.
*
* @var array
* @access public
*/
var $componentPaths = array();
/**
* List of additional path(s) where view files reside.
*
* @var array
* @access public
*/
var $viewPaths = array();
/**
* List of additional path(s) where helper files reside.
*
* @var array
* @access public
*/
var $helperPaths = array();
/**
* List of additional path(s) where plugins reside.
*
* @var array
* @access public
*/
var $pluginPaths = array();
/**
* List of additional path(s) where vendor packages reside.
*
* @var array
* @access public
*/
var $vendorPaths = array();
/**
* List of additional path(s) where locale files reside.
*
* @var array
* @access public
*/
var $localePaths = array();
/**
* List of additional path(s) where console shell files reside.
*
* @var array
* @access public
*/
var $shellPaths = array();
/** /**
* Current debug level. * Current debug level.
* *
@ -117,13 +47,6 @@ class Configure extends Object {
* @access private * @access private
*/ */
var $__cache = false; var $__cache = false;
/**
* Holds and key => value array of objects' types.
*
* @var array
* @access private
*/
var $__objects = array();
/** /**
* Returns a singleton instance of the Configure class. * Returns a singleton instance of the Configure class.
* *
@ -138,111 +61,6 @@ class Configure extends Object {
} }
return $instance[0]; return $instance[0];
} }
/**
* Returns an index of objects of the given type, with the physical path to each object.
*
* @param string $type Type of object, i.e. 'model', 'controller', 'helper', or 'plugin'
* @param mixed $path Optional
* @return Configure instance
* @access public
*/
function listObjects($type, $path = null, $cache = true) {
$objects = array();
$extension = false;
$name = $type;
if ($type === 'file' && !$path) {
return false;
} elseif ($type === 'file') {
$extension = true;
$name = $type . str_replace(DS, '', $path);
}
$_this =& Configure::getInstance();
if (empty($_this->__objects) && $cache === true) {
$_this->__objects = Cache::read('object_map', '_cake_core_');
}
if (empty($_this->__objects) || !isset($_this->__objects[$type]) || $cache !== true) {
$types = array(
'model' => array('suffix' => '.php', 'base' => 'AppModel', 'core' => false),
'behavior' => array('suffix' => '.php', 'base' => 'ModelBehavior'),
'controller' => array('suffix' => '_controller.php', 'base' => 'AppController'),
'component' => array('suffix' => '.php', 'base' => null),
'view' => array('suffix' => '.php', 'base' => null),
'helper' => array('suffix' => '.php', 'base' => 'AppHelper'),
'plugin' => array('suffix' => '', 'base' => null),
'vendor' => array('suffix' => '', 'base' => null),
'class' => array('suffix' => '.php', 'base' => null),
'file' => array('suffix' => '.php', 'base' => null)
);
if (!isset($types[$type])) {
return false;
}
$objects = array();
if (empty($path)) {
$path = $_this->{$type . 'Paths'};
if (isset($types[$type]['core']) && $types[$type]['core'] === false) {
array_pop($path);
}
}
$items = array();
foreach ((array)$path as $dir) {
if ($type === 'file' || $type === 'class' || strpos($dir, $type) !== false) {
$items = $_this->__list($dir, $types[$type]['suffix'], $extension);
$objects = array_merge($items, array_diff($objects, $items));
}
}
if ($type !== 'file') {
foreach ($objects as $key => $value) {
$objects[$key] = Inflector::camelize($value);
}
}
if ($cache === true && !empty($objects)) {
$_this->__objects[$name] = $objects;
$_this->__cache = true;
} else {
return $objects;
}
}
return $_this->__objects[$name];
}
/**
* Returns an array of filenames of PHP files in the given directory.
*
* @param string $path Path to scan for files
* @param string $suffix if false, return only directories. if string, match and return files
* @return array List of directories or files in directory
*/
function __list($path, $suffix = false, $extension = false) {
if (!class_exists('Folder')) {
require LIBS . 'folder.php';
}
$items = array();
$Folder =& new Folder($path);
$contents = $Folder->read(false, true);
if (is_array($contents)) {
if (!$suffix) {
return $contents[0];
} else {
foreach ($contents[1] as $item) {
if (substr($item, - strlen($suffix)) === $suffix) {
if ($extension) {
$items[] = $item;
} else {
$items[] = substr($item, 0, strlen($item) - strlen($suffix));
}
}
}
}
}
return $items;
}
/** /**
* Used to store a dynamic variable in the Configure instance. * Used to store a dynamic variable in the Configure instance.
* *
@ -403,7 +221,7 @@ class Configure extends Object {
include(CACHE . 'persistent' . DS . $fileName . '.php'); include(CACHE . 'persistent' . DS . $fileName . '.php');
$found = true; $found = true;
} else { } else {
foreach (Configure::corePaths('cake') as $key => $path) { foreach (App::core('cake') as $key => $path) {
if (file_exists($path . DS . 'config' . DS . $fileName . '.php')) { if (file_exists($path . DS . 'config' . DS . $fileName . '.php')) {
include($path . DS . 'config' . DS . $fileName . '.php'); include($path . DS . 'config' . DS . $fileName . '.php');
$found = true; $found = true;
@ -479,57 +297,6 @@ class Configure extends Object {
} }
Configure::__writeConfig($content, $name, $write); Configure::__writeConfig($content, $name, $write);
} }
/**
* Returns a key/value list of all paths where core libs are found.
* Passing $type only returns the values for a given value of $key.
*
* @param string $type valid values are: 'model', 'behavior', 'controller', 'component',
* 'view', 'helper', 'datasource', 'libs', and 'cake'
* @return array numeric keyed array of core lib paths
* @access public
*/
function corePaths($type = null) {
$paths = Cache::read('core_paths', '_cake_core_');
if (!$paths) {
$paths = array();
$openBasedir = ini_get('open_basedir');
if ($openBasedir) {
$all = explode(PATH_SEPARATOR, $openBasedir);
$all = array_flip(array_flip((array_merge(array(CAKE_CORE_INCLUDE_PATH), $all))));
} else {
$all = explode(PATH_SEPARATOR, ini_get('include_path'));
$all = array_flip(array_flip((array_merge(array(CAKE_CORE_INCLUDE_PATH), $all))));
}
foreach ($all as $path) {
if ($path !== DS) {
$path = rtrim($path, DS);
}
if (empty($path) || $path === '.') {
continue;
}
$cake = $path . DS . 'cake' . DS;
$libs = $cake . 'libs' . DS;
if (is_dir($libs)) {
$paths['libs'][] = $libs;
$paths['model'][] = $libs . 'model' . DS;
$paths['behavior'][] = $libs . 'model' . DS . 'behaviors' . DS;
$paths['controller'][] = $libs . 'controller' . DS;
$paths['component'][] = $libs . 'controller' . DS . 'components' . DS;
$paths['view'][] = $libs . 'view' . DS;
$paths['helper'][] = $libs . 'view' . DS . 'helpers' . DS;
$paths['cake'][] = $cake;
$paths['vendor'][] = $path . DS . 'vendors' . DS;
$paths['shell'][] = $cake . 'console' . DS . 'libs' . DS;
break;
}
}
Cache::write('core_paths', array_filter($paths), '_cake_core_');
}
if ($type && isset($paths[$type])) {
return $paths[$type];
}
return $paths;
}
/** /**
* Creates a cached version of a configuration file. * Creates a cached version of a configuration file.
* Appends values passed from Configure::store() to the cached file * Appends values passed from Configure::store() to the cached file
@ -582,56 +349,25 @@ class Configure extends Object {
return $name; return $name;
} }
/** /**
* Build path references. Merges the supplied $paths * @deprecated
* with the base paths and the default core paths. * @see App::objects()
* */
* @param array $paths paths defines in config/bootstrap.php function listObjects($type, $path = null, $cache = true) {
* @return void return App::objects($type, $path, $cache);
* @access public }
/**
* @deprecated
* @see App::core()
*/
function corePaths($type = null) {
return App::core($type);
}
/**
* @deprecated
* @see App::build()
*/ */
function buildPaths($paths) { function buildPaths($paths) {
$_this =& Configure::getInstance(); return App::build($paths);
$core = $_this->corePaths();
$basePaths = array(
'model' => array(MODELS),
'behavior' => array(BEHAVIORS),
'controller' => array(CONTROLLERS),
'component' => array(COMPONENTS),
'view' => array(VIEWS),
'helper' => array(HELPERS),
'plugin' => array(APP . 'plugins' . DS),
'vendor' => array(APP . 'vendors' . DS, VENDORS),
'locale' => array(APP . 'locale' . DS),
'shell' => array(),
'datasource' => array(MODELS . 'datasources')
);
foreach ($basePaths as $type => $default) {
$pathsVar = $type . 'Paths';
$merge = array();
if (isset($core[$type])) {
$merge = $core[$type];
}
if ($type === 'model' || $type === 'controller' || $type === 'helper') {
$merge = array_merge(array(APP), $merge);
}
if (!is_array($default)) {
$default = array($default);
}
$_this->{$pathsVar} = $default;
if (isset($paths[$pathsVar]) && !empty($paths[$pathsVar])) {
$path = array_flip(array_flip((array_merge(
$_this->{$pathsVar}, (array)$paths[$pathsVar], $merge
))));
$_this->{$pathsVar} = array_values($path);
} else {
$path = array_flip(array_flip((array_merge($_this->{$pathsVar}, $merge))));
$_this->{$pathsVar} = array_values($path);
}
}
} }
/** /**
* Loads app/config/bootstrap.php. * Loads app/config/bootstrap.php.
@ -692,9 +428,9 @@ class Configure extends Object {
} }
Cache::config('default'); Cache::config('default');
} }
Configure::buildPaths(compact( App::build(compact(
'modelPaths', 'viewPaths', 'controllerPaths', 'helperPaths', 'componentPaths', 'models', 'views', 'controllers', 'helpers', 'components',
'behaviorPaths', 'pluginPaths', 'vendorPaths', 'localePaths', 'shellPaths' 'behaviors', 'plugins', 'vendors', 'locales', 'shells'
)); ));
} }
} }
@ -718,6 +454,96 @@ class Configure extends Object {
* @subpackage cake.cake.libs * @subpackage cake.cake.libs
*/ */
class App extends Object { class App extends Object {
/**
* List of object types and their properties
*
* @var array
* @access public
*/
var $objects = array(
'model' => array('suffix' => '.php', 'base' => 'AppModel', 'core' => false),
'behavior' => array('suffix' => '.php', 'base' => 'ModelBehavior'),
'controller' => array('suffix' => '_controller.php', 'base' => 'AppController'),
'component' => array('suffix' => '.php', 'base' => null),
'view' => array('suffix' => '.php', 'base' => null),
'helper' => array('suffix' => '.php', 'base' => 'AppHelper'),
'plugin' => array('suffix' => '', 'base' => null),
'vendor' => array('suffix' => '', 'base' => null),
'shell' => array('suffix' => 'Shell', 'base' => 'Shell'),
'class' => array('suffix' => '.php', 'base' => null),
'file' => array('suffix' => '.php', 'base' => null)
);
/**
* List of additional path(s) where model files reside.
*
* @var array
* @access protected
*/
var $_models = array();
/**
* List of additional path(s) where behavior files reside.
*
* @var array
* @access protected
*/
var $_behaviors = array();
/**
* List of additional path(s) where controller files reside.
*
* @var array
* @access protected
*/
var $_controllers = array();
/**
* List of additional path(s) where component files reside.
*
* @var array
* @access protected
*/
var $_components = array();
/**
* List of additional path(s) where view files reside.
*
* @var array
* @access protected
*/
var $_views = array();
/**
* List of additional path(s) where helper files reside.
*
* @var array
* @access protected
*/
var $_helpers = array();
/**
* List of additional path(s) where plugins reside.
*
* @var array
* @access protected
*/
var $_plugins = array();
/**
* List of additional path(s) where vendor packages reside.
*
* @var array
* @access protected
*/
var $_vendors = array();
/**
* List of additional path(s) where locale files reside.
*
* @var array
* @access protected
*/
var $_locales = array();
/**
* List of additional path(s) where console shell files reside.
*
* @var array
* @access protected
*/
var $_shells = array();
/** /**
* Paths to search for files. * Paths to search for files.
* *
@ -760,6 +586,200 @@ class App extends Object {
* @access private * @access private
*/ */
var $__loaded = array(); var $__loaded = array();
/**
* Holds and key => value array of object types.
*
* @var array
* @access private
*/
var $__objects = array();
/**
* Used to read information stored path
*
* Usage
* App::path('models'); will return all paths for models
*
* @param string $type type of path
* @return string array
* @access public
*/
function path($type, $value = array()) {
$_this =& App::getInstance();
if (!isset($_this->{"_{$type}"})) {
return array();
}
if (empty($value)) {
return $_this->{"_{$type}"};
}
if (!empty($value)) {
return $_this->{"_{$type}"} = (array)$value;
}
}
/**
* Build path references. Merges the supplied $paths
* with the base paths and the default core paths.
*
* @param array $paths paths defines in config/bootstrap.php
* @return void
* @access public
*/
function build($paths = array()) {
$_this =& App::getInstance();
$core = $_this->core();
$basePaths = array(
'model' => array(MODELS),
'behavior' => array(BEHAVIORS),
'datasource' => array(MODELS . 'datasources'),
'controller' => array(CONTROLLERS),
'component' => array(COMPONENTS),
'view' => array(VIEWS),
'helper' => array(HELPERS),
'plugin' => array(APP . 'plugins' . DS),
'vendor' => array(APP . 'vendors' . DS, VENDORS),
'locale' => array(APP . 'locale' . DS),
'shell' => array()
);
foreach ($basePaths as $type => $default) {
$pathsVar = "_{$type}s";
$merge = array();
if (isset($core[$type])) {
$merge = $core[$type];
}
if ($type === 'model' || $type === 'controller' || $type === 'helper') {
$merge = array_merge(array(APP), $merge);
}
if (!is_array($default)) {
$default = array($default);
}
$_this->{$pathsVar} = $default;
if (isset($paths[$pathsVar]) && !empty($paths[$pathsVar])) {
$path = array_flip(array_flip((array_merge(
$_this->{$pathsVar}, (array)$paths[$pathsVar], $merge
))));
$_this->{$pathsVar} = array_values($path);
} else {
$path = array_flip(array_flip((array_merge($_this->{$pathsVar}, $merge))));
$_this->{$pathsVar} = array_values($path);
}
}
}
/**
* Returns a key/value list of all paths where core libs are found.
* Passing $type only returns the values for a given value of $key.
*
* @param string $type valid values are: 'model', 'behavior', 'controller', 'component',
* 'view', 'helper', 'datasource', 'libs', and 'cake'
* @return array numeric keyed array of core lib paths
* @access public
*/
function core($type = null) {
$paths = Cache::read('core_paths', '_cake_core_');
if (!$paths) {
$paths = array();
$openBasedir = ini_get('open_basedir');
if ($openBasedir) {
$all = explode(PATH_SEPARATOR, $openBasedir);
$all = array_flip(array_flip((array_merge(array(CAKE_CORE_INCLUDE_PATH), $all))));
} else {
$all = explode(PATH_SEPARATOR, ini_get('include_path'));
$all = array_flip(array_flip((array_merge(array(CAKE_CORE_INCLUDE_PATH), $all))));
}
foreach ($all as $path) {
if ($path !== DS) {
$path = rtrim($path, DS);
}
if (empty($path) || $path === '.') {
continue;
}
$cake = $path . DS . 'cake' . DS;
$libs = $cake . 'libs' . DS;
if (is_dir($libs)) {
$paths['libs'][] = $libs;
$paths['model'][] = $libs . 'model' . DS;
$paths['behavior'][] = $libs . 'model' . DS . 'behaviors' . DS;
$paths['controller'][] = $libs . 'controller' . DS;
$paths['component'][] = $libs . 'controller' . DS . 'components' . DS;
$paths['view'][] = $libs . 'view' . DS;
$paths['helper'][] = $libs . 'view' . DS . 'helpers' . DS;
$paths['cake'][] = $cake;
$paths['vendor'][] = $path . DS . 'vendors' . DS;
$paths['shell'][] = $cake . 'console' . DS . 'libs' . DS;
break;
}
}
Cache::write('core_paths', array_filter($paths), '_cake_core_');
}
if ($type && isset($paths[$type])) {
return $paths[$type];
}
return $paths;
}
/**
* Returns an index of objects of the given type, with the physical path to each object.
*
* @param string $type Type of object, i.e. 'model', 'controller', 'helper', or 'plugin'
* @param mixed $path Optional
* @return Configure instance
* @access public
*/
function objects($type, $path = null, $cache = true) {
$objects = array();
$extension = false;
$name = $type;
if ($type === 'file' && !$path) {
return false;
} elseif ($type === 'file') {
$extension = true;
$name = $type . str_replace(DS, '', $path);
}
$_this =& App::getInstance();
if (empty($_this->__objects) && $cache === true) {
$_this->__objects = Cache::read('object_map', '_cake_core_');
}
if (empty($_this->__objects) || !isset($_this->__objects[$type]) || $cache !== true) {
$types = $_this->objects;
if (!isset($types[$type])) {
return false;
}
$objects = array();
if (empty($path)) {
$path = $_this->{"_{$type}s"};
if (isset($types[$type]['core']) && $types[$type]['core'] === false) {
array_pop($path);
}
}
$items = array();
foreach ((array)$path as $dir) {
if ($type === 'file' || $type === 'class' || strpos($dir, $type) !== false) {
$items = $_this->__list($dir, $types[$type]['suffix'], $extension);
$objects = array_merge($items, array_diff($objects, $items));
}
}
if ($type !== 'file') {
foreach ($objects as $key => $value) {
$objects[$key] = Inflector::camelize($value);
}
}
if ($cache === true && !empty($objects)) {
$_this->__objects[$name] = $objects;
$_this->__cache = true;
} else {
return $objects;
}
}
return $_this->__objects[$name];
}
/** /**
* Finds classes based on $name or specific file(s) to search. * Finds classes based on $name or specific file(s) to search.
* *
@ -1057,10 +1077,10 @@ class App extends Object {
switch ($load) { switch ($load) {
case 'model': case 'model':
if (!class_exists('Model')) { if (!class_exists('Model')) {
App::import('Core', 'Model', false, Configure::corePaths('model')); App::import('Core', 'Model', false, App::core('model'));
} }
if (!class_exists('AppModel')) { if (!class_exists('AppModel')) {
App::import($type, 'AppModel', false, Configure::read('modelPaths')); App::import($type, 'AppModel', false, App::path('models'));
} }
if ($plugin) { if ($plugin) {
if (!class_exists($name . 'AppModel')) { if (!class_exists($name . 'AppModel')) {
@ -1128,7 +1148,7 @@ class App extends Object {
$type = strtolower($type); $type = strtolower($type);
if ($type === 'core') { if ($type === 'core') {
$path = Configure::corePaths(); $path = App::core();
$paths = array(); $paths = array();
foreach ($path as $key => $value) { foreach ($path as $key => $value) {
@ -1140,7 +1160,7 @@ class App extends Object {
return $paths; return $paths;
} }
if ($paths = Configure::read($type . 'Paths')) { if ($paths = App::path($type .'s')) {
return $paths; return $paths;
} }
@ -1174,6 +1194,38 @@ class App extends Object {
unset($this->__map[$type][$name]); unset($this->__map[$type][$name]);
} }
} }
/**
* Returns an array of filenames of PHP files in the given directory.
*
* @param string $path Path to scan for files
* @param string $suffix if false, return only directories. if string, match and return files
* @return array List of directories or files in directory
*/
function __list($path, $suffix = false, $extension = false) {
if (!class_exists('Folder')) {
require LIBS . 'folder.php';
}
$items = array();
$Folder =& new Folder($path);
$contents = $Folder->read(false, true);
if (is_array($contents)) {
if (!$suffix) {
return $contents[0];
} else {
foreach ($contents[1] as $item) {
if (substr($item, - strlen($suffix)) === $suffix) {
if ($extension) {
$items[] = $item;
} else {
$items[] = substr($item, 0, strlen($item) - strlen($suffix));
}
}
}
}
}
return $items;
}
/** /**
* Object destructor. * Object destructor.
* *
@ -1184,7 +1236,7 @@ class App extends Object {
*/ */
function __destruct() { function __destruct() {
if ($this->__cache) { if ($this->__cache) {
$core = Configure::corePaths('cake'); $core = App::core('cake');
unset($this->__paths[rtrim($core[0], DS)]); unset($this->__paths[rtrim($core[0], DS)]);
Cache::write('dir_map', array_filter($this->__paths), '_cake_core_'); Cache::write('dir_map', array_filter($this->__paths), '_cake_core_');
Cache::write('file_map', array_filter($this->__map), '_cake_core_'); Cache::write('file_map', array_filter($this->__map), '_cake_core_');

2
cake/libs/i18n.php
View file

@ -255,7 +255,7 @@ class I18n extends Object {
$plugins = Configure::listObjects('plugin'); $plugins = Configure::listObjects('plugin');
if (!empty($plugins)) { if (!empty($plugins)) {
$pluginPaths = Configure::read('pluginPaths'); $pluginPaths = App::path('plugins');
foreach ($plugins as $plugin) { foreach ($plugins as $plugin) {
$plugin = Inflector::underscore($plugin); $plugin = Inflector::underscore($plugin);

6
cake/libs/view/view.php
View file

@ -814,7 +814,7 @@ class View extends Object {
$defaultPath = $paths[0]; $defaultPath = $paths[0];
if ($this->plugin) { if ($this->plugin) {
$pluginPaths = Configure::read('pluginPaths'); $pluginPaths = App::path('plugins');
foreach ($paths as $path) { foreach ($paths as $path) {
if (strpos($path, $pluginPaths[0]) === 0) { if (strpos($path, $pluginPaths[0]) === 0) {
$defaultPath = $path; $defaultPath = $path;
@ -890,14 +890,14 @@ class View extends Object {
return $this->__paths; return $this->__paths;
} }
$paths = array(); $paths = array();
$viewPaths = Configure::read('viewPaths'); $viewPaths = App::path('views');
if ($plugin !== null) { if ($plugin !== null) {
$count = count($viewPaths); $count = count($viewPaths);
for ($i = 0; $i < $count; $i++) { for ($i = 0; $i < $count; $i++) {
$paths[] = $viewPaths[$i] . 'plugins' . DS . $plugin . DS; $paths[] = $viewPaths[$i] . 'plugins' . DS . $plugin . DS;
} }
$pluginPaths = Configure::read('pluginPaths'); $pluginPaths = App::path('plugins');
$count = count($pluginPaths); $count = count($pluginPaths);
for ($i = 0; $i < $count; $i++) { for ($i = 0; $i < $count; $i++) {

4
cake/tests/cases/basics.test.php
View file

@ -41,7 +41,7 @@ class BasicsTest extends CakeTestCase {
*/ */
function setUp() { function setUp() {
$this->_localePaths = Configure::read('localePaths'); $this->_localePaths = Configure::read('localePaths');
Configure::write('localePaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale')); App::path('locales', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale'));
$this->_language = Configure::read('Config.language'); $this->_language = Configure::read('Config.language');
} }
/** /**
@ -51,7 +51,7 @@ class BasicsTest extends CakeTestCase {
* @return void * @return void
*/ */
function tearDown() { function tearDown() {
Configure::write('localePaths', $this->_localePaths); App::path('locales', $this->_localePaths);
Configure::write('Config.language', $this->_language); Configure::write('Config.language', $this->_language);
} }
/** /**

6
cake/tests/cases/console/cake.test.php
View file

@ -123,10 +123,10 @@ class ShellDispatcherTest extends UnitTestCase {
* @return void * @return void
*/ */
function setUp() { function setUp() {
$this->_pluginPaths = Configure::read('pluginPaths'); $this->_pluginPaths = App::path('plugins');
$this->_shellPaths = Configure::read('shellPaths'); $this->_shellPaths = Configure::read('shellPaths');
Configure::write('pluginPaths', array( App::path('plugins', array(
TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
)); ));
Configure::write('shellPaths', array( Configure::write('shellPaths', array(
@ -141,7 +141,7 @@ class ShellDispatcherTest extends UnitTestCase {
* @return void * @return void
*/ */
function tearDown() { function tearDown() {
Configure::write('pluginPaths', $this->_pluginPaths); App::path('plugins', $this->_pluginPaths);
Configure::write('shellPaths', $this->_shellPaths); Configure::write('shellPaths', $this->_shellPaths);
} }
/** /**

8
cake/tests/cases/console/libs/shell.test.php
View file

@ -124,8 +124,8 @@ class ShellTest extends CakeTestCase {
'pluginPaths' => Configure::read('pluginPaths'), 'pluginPaths' => Configure::read('pluginPaths'),
'viewPaths' => Configure::read('viewPaths'), 'viewPaths' => Configure::read('viewPaths'),
); );
Configure::write('pluginPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)); App::path('plugins', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS));
Configure::write('modelPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS)); App::path('models', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS));
$this->Shell->uses = array('TestPlugin.TestPluginPost'); $this->Shell->uses = array('TestPlugin.TestPluginPost');
$this->Shell->initialize(); $this->Shell->initialize();
@ -144,8 +144,8 @@ class ShellTest extends CakeTestCase {
$this->assertTrue(isset($this->Shell->AppModel)); $this->assertTrue(isset($this->Shell->AppModel));
$this->assertIsA($this->Shell->AppModel, 'AppModel'); $this->assertIsA($this->Shell->AppModel, 'AppModel');
Configure::write('pluginPaths', $_back['pluginPaths']); App::path('plugins', $_back['pluginPaths']);
Configure::write('modelPaths', $_back['modelPaths']); App::path('models', $_back['modelPaths']);
} }
/** /**
* testOut method * testOut method

28
cake/tests/cases/dispatcher.test.php
View file

@ -509,14 +509,14 @@ class DispatcherTest extends CakeTestCase {
$this->_cache = Configure::read('Cache'); $this->_cache = Configure::read('Cache');
Configure::write('Cache.disable', true); Configure::write('Cache.disable', true);
$this->_vendorPaths = Configure::read('vendorPaths'); $this->_vendorPaths = App::path('vendors');
$this->_pluginPaths = Configure::read('pluginPaths'); $this->_pluginPaths = App::path('plugins');
$this->_viewPaths = Configure::read('viewPaths'); $this->_viewPaths = App::path('views');
$this->_controllerPaths = Configure::read('controllerPaths'); $this->_controllerPaths = App::path('controllers');
$this->_debug = Configure::read('debug'); $this->_debug = Configure::read('debug');
Configure::write('controllerPaths', Configure::corePaths('controller')); App::path('controllers', Configure::corePaths('controller'));
Configure::write('viewPaths', Configure::corePaths('view')); App::path('views', Configure::corePaths('view'));
} }
/** /**
* tearDown method * tearDown method
@ -532,9 +532,9 @@ class DispatcherTest extends CakeTestCase {
Configure::write('App', $this->_app); Configure::write('App', $this->_app);
Configure::write('Cache', $this->_cache); Configure::write('Cache', $this->_cache);
Configure::write('vendorPaths', $this->_vendorPaths); Configure::write('vendorPaths', $this->_vendorPaths);
Configure::write('pluginPaths', $this->_pluginPaths); App::path('plugins', $this->_pluginPaths);
Configure::write('viewPaths', $this->_viewPaths); App::path('views', $this->_viewPaths);
Configure::write('controllerPaths', $this->_controllerPaths); App::path('controllers', $this->_controllerPaths);
Configure::write('debug', $this->_debug); Configure::write('debug', $this->_debug);
} }
/** /**
@ -1623,8 +1623,8 @@ class DispatcherTest extends CakeTestCase {
**/ **/
function testTestPluginDispatch() { function testTestPluginDispatch() {
$Dispatcher =& new TestDispatcher(); $Dispatcher =& new TestDispatcher();
$_back = Configure::read('pluginPaths'); $_back = App::path('plugins');
Configure::write('pluginPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)); App::path('plugins', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS));
$url = '/test_plugin/tests/index'; $url = '/test_plugin/tests/index';
$result = $Dispatcher->dispatch($url, array('return' => 1)); $result = $Dispatcher->dispatch($url, array('return' => 1));
$this->assertTrue(class_exists('TestsController')); $this->assertTrue(class_exists('TestsController'));
@ -1632,7 +1632,7 @@ class DispatcherTest extends CakeTestCase {
$this->assertTrue(class_exists('OtherComponentComponent')); $this->assertTrue(class_exists('OtherComponentComponent'));
$this->assertTrue(class_exists('PluginsComponentComponent')); $this->assertTrue(class_exists('PluginsComponentComponent'));
Configure::write('pluginPaths', $_back); App::path('plugins', $_back);
} }
/** /**
* testChangingParamsFromBeforeFilter method * testChangingParamsFromBeforeFilter method
@ -1678,7 +1678,7 @@ class DispatcherTest extends CakeTestCase {
$Configure = Configure::getInstance(); $Configure = Configure::getInstance();
$Configure->__objects = null; $Configure->__objects = null;
Configure::write('pluginPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)); App::path('plugins', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS));
Configure::write('vendorPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'vendors'. DS)); Configure::write('vendorPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'vendors'. DS));
$Dispatcher =& new TestDispatcher(); $Dispatcher =& new TestDispatcher();
@ -1734,7 +1734,7 @@ class DispatcherTest extends CakeTestCase {
Router::reload(); Router::reload();
Router::connect('/', array('controller' => 'test_cached_pages', 'action' => 'index')); Router::connect('/', array('controller' => 'test_cached_pages', 'action' => 'index'));
Configure::write('viewPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)); App::path('views', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS));
$dispatcher =& new Dispatcher(); $dispatcher =& new Dispatcher();
$dispatcher->base = false; $dispatcher->base = false;

28
cake/tests/cases/libs/cake_test_case.test.php
View file

@ -244,10 +244,10 @@ class CakeTestCaseTest extends CakeTestCase {
'model' => Configure::read('modelPaths'), 'model' => Configure::read('modelPaths'),
'plugin' => Configure::read('pluginPaths') 'plugin' => Configure::read('pluginPaths')
); );
Configure::write('controllerPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'controllers' . DS)); App::path('controllers', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'controllers' . DS));
Configure::write('viewPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS)); App::path('views', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS));
Configure::write('modelPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS)); App::path('models', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS));
Configure::write('pluginPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)); App::path('plugins', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS));
$result = $this->Case->testAction('/tests_apps/index', array('return' => 'view')); $result = $this->Case->testAction('/tests_apps/index', array('return' => 'view'));
$this->assertPattern('/This is the TestsAppsController index view/', $result); $this->assertPattern('/This is the TestsAppsController index view/', $result);
@ -367,10 +367,10 @@ class CakeTestCaseTest extends CakeTestCase {
$fixture->drop($db); $fixture->drop($db);
Configure::write('modelPaths', $_back['model']); App::path('models', $_back['model']);
Configure::write('controllerPaths', $_back['controller']); App::path('controllers', $_back['controller']);
Configure::write('viewPaths', $_back['view']); App::path('views', $_back['view']);
Configure::write('pluginPaths', $_back['plugin']); App::path('plugins', $_back['plugin']);
} }
/** /**
* testSkipIf * testSkipIf
@ -393,9 +393,9 @@ class CakeTestCaseTest extends CakeTestCase {
'view' => Configure::read('viewPaths'), 'view' => Configure::read('viewPaths'),
'plugin' => Configure::read('pluginPaths') 'plugin' => Configure::read('pluginPaths')
); );
Configure::write('controllerPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'controllers' . DS)); App::path('controllers', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'controllers' . DS));
Configure::write('viewPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS)); App::path('views', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS));
Configure::write('pluginPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)); App::path('plugins', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS));
$Dispatcher =& new CakeTestDispatcher(); $Dispatcher =& new CakeTestDispatcher();
$Case =& new CakeDispatcherMockTestCase(); $Case =& new CakeDispatcherMockTestCase();
@ -408,9 +408,9 @@ class CakeTestCaseTest extends CakeTestCase {
$return = $Dispatcher->dispatch('/tests_apps/index', array('autoRender' => 0, 'return' => 1, 'requested' => 1)); $return = $Dispatcher->dispatch('/tests_apps/index', array('autoRender' => 0, 'return' => 1, 'requested' => 1));
Configure::write('controllerPaths', $_back['controller']); App::path('controllers', $_back['controller']);
Configure::write('viewPaths', $_back['view']); App::path('views', $_back['view']);
Configure::write('pluginPaths', $_back['plugin']); App::path('plugins', $_back['plugin']);
} }
} }
?> ?>

32
cake/tests/cases/libs/configure.test.php
View file

@ -248,17 +248,6 @@ class ConfigureTest extends CakeTestCase {
$result = Configure::version(); $result = Configure::version();
$this->assertTrue(version_compare($result, '1.2', '>=')); $this->assertTrue(version_compare($result, '1.2', '>='));
} }
/**
* testBuildPaths method
*
* @access public
* @return void
*/
function testBuildPaths() {
Configure::buildPaths(array());
$models = Configure::read('modelPaths');
$this->assertTrue(!empty($models));
}
} }
/** /**
* AppImportTest class * AppImportTest class
@ -267,6 +256,17 @@ class ConfigureTest extends CakeTestCase {
* @subpackage cake.tests.cases.libs * @subpackage cake.tests.cases.libs
*/ */
class AppImportTest extends UnitTestCase { class AppImportTest extends UnitTestCase {
/**
* testBuildPaths method
*
* @access public
* @return void
*/
function testBuild() {
App::build();
$models = App::path('models');
$this->assertTrue(!empty($models));
}
/** /**
* testClassLoading method * testClassLoading method
* *
@ -341,8 +341,8 @@ class AppImportTest extends UnitTestCase {
$this->assertFalse($file); $this->assertFalse($file);
} }
$_back = Configure::read('pluginPaths'); $_back = App::path('plugins');
Configure::write('pluginPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)); App::path('plugins', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS));
$result = App::import('Controller', 'TestPlugin.Tests'); $result = App::import('Controller', 'TestPlugin.Tests');
$this->assertTrue($result); $this->assertTrue($result);
@ -353,7 +353,7 @@ class AppImportTest extends UnitTestCase {
$this->assertTrue($result); $this->assertTrue($result);
$this->assertTrue(class_exists('OtherHelperHelper')); $this->assertTrue(class_exists('OtherHelperHelper'));
Configure::write('pluginPaths', $_back); App::path('plugins', $_back);
} }
/** /**
* testFileLoading method * testFileLoading method
@ -483,8 +483,8 @@ class AppImportTest extends UnitTestCase {
} }
*/ */
function testLoadingVendor() { function testLoadingVendor() {
Configure::write('pluginPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)); App::path('plugins', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS));
Configure::write('vendorPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'vendors'. DS)); App::path('vendors', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'vendors'. DS));
ob_start(); ob_start();
$result = App::import('Vendor', 'TestPlugin.TestPluginAsset', array('ext' => 'css')); $result = App::import('Vendor', 'TestPlugin.TestPluginAsset', array('ext' => 'css'));

6
cake/tests/cases/libs/controller/component.test.php
View file

@ -280,8 +280,8 @@ class ComponentTest extends CakeTestCase {
* @return void * @return void
*/ */
function setUp() { function setUp() {
$this->_pluginPaths = Configure::read('pluginPaths'); $this->_pluginPaths = App::path('plugins');
Configure::write('pluginPaths', array( App::path('plugins', array(
TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
)); ));
} }
@ -292,7 +292,7 @@ class ComponentTest extends CakeTestCase {
* @return void * @return void
*/ */
function tearDown() { function tearDown() {
Configure::write('pluginPaths', $this->_pluginPaths); App::path('plugins', $this->_pluginPaths);
ClassRegistry::flush(); ClassRegistry::flush();
} }
/** /**

2
cake/tests/cases/libs/controller/components/auth.test.php
View file

@ -1171,7 +1171,7 @@ class AuthTest extends CakeTestCase {
* @return void * @return void
*/ */
function testAjaxLogin() { function testAjaxLogin() {
Configure::write('viewPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)); App::path('views', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS));
$_SERVER['HTTP_X_REQUESTED_WITH'] = "XMLHttpRequest"; $_SERVER['HTTP_X_REQUESTED_WITH'] = "XMLHttpRequest";
if (!class_exists('dispatcher')) { if (!class_exists('dispatcher')) {

6
cake/tests/cases/libs/controller/components/email.test.php
View file

@ -181,8 +181,8 @@ class EmailComponentTest extends CakeTestCase {
$this->Controller->EmailTest->initialize($this->Controller, array()); $this->Controller->EmailTest->initialize($this->Controller, array());
ClassRegistry::addObject('view', new View($this->Controller)); ClassRegistry::addObject('view', new View($this->Controller));
$this->_viewPaths = Configure::read('viewPaths'); $this->_viewPaths = App::path('views');
Configure::write('viewPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)); App::path('views', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS));
} }
/** /**
@ -193,7 +193,7 @@ class EmailComponentTest extends CakeTestCase {
*/ */
function tearDown() { function tearDown() {
Configure::write('App.encoding', $this->_appEncoding); Configure::write('App.encoding', $this->_appEncoding);
Configure::write('viewPaths', $this->_viewPaths); App::path('views', $this->_viewPaths);
$this->Controller->Session->del('Message'); $this->Controller->Session->del('Message');
restore_error_handler(); restore_error_handler();
ClassRegistry::flush(); ClassRegistry::flush();

6
cake/tests/cases/libs/controller/components/request_handler.test.php
View file

@ -485,9 +485,9 @@ class RequestHandlerComponentTest extends CakeTestCase {
function testAjaxRedirectAsRequestAction() { function testAjaxRedirectAsRequestAction() {
$_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'; $_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest';
$this->_init(); $this->_init();
$_paths = Configure::read('viewPaths'); $_paths = App::path('views');
$testDir = array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS); $testDir = array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS);
Configure::write('viewPaths', array_merge($testDir, $_paths)); App::path('views', array_merge($testDir, $_paths));
$this->Controller->RequestHandler = new NoStopRequestHandler($this); $this->Controller->RequestHandler = new NoStopRequestHandler($this);
$this->Controller->RequestHandler->expectOnce('_stop'); $this->Controller->RequestHandler->expectOnce('_stop');
@ -499,7 +499,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
$result = ob_get_clean(); $result = ob_get_clean();
$this->assertPattern('/posts index/', $result, 'RequestAction redirect failed.'); $this->assertPattern('/posts index/', $result, 'RequestAction redirect failed.');
Configure::write('viewPaths', $_paths); App::path('views', $_paths);
unset($_SERVER['HTTP_X_REQUESTED_WITH']); unset($_SERVER['HTTP_X_REQUESTED_WITH']);
} }
/** /**

6
cake/tests/cases/libs/controller/controller.test.php
View file

@ -397,7 +397,7 @@ class ControllerTest extends CakeTestCase {
$_back = array( $_back = array(
'pluginPaths' => Configure::read('pluginPaths'), 'pluginPaths' => Configure::read('pluginPaths'),
); );
Configure::write('pluginPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)); App::path('plugins', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS));
$Controller =& new Controller(); $Controller =& new Controller();
$Controller->uses = array('TestPlugin.TestPluginPost'); $Controller->uses = array('TestPlugin.TestPluginPost');
@ -407,7 +407,7 @@ class ControllerTest extends CakeTestCase {
$this->assertTrue(isset($Controller->TestPluginPost)); $this->assertTrue(isset($Controller->TestPluginPost));
$this->assertTrue(is_a($Controller->TestPluginPost, 'TestPluginPost')); $this->assertTrue(is_a($Controller->TestPluginPost, 'TestPluginPost'));
Configure::write('pluginPaths', $_back['pluginPaths']); App::path('plugins', $_back['pluginPaths']);
unset($Controller); unset($Controller);
} }
/** /**
@ -706,7 +706,7 @@ class ControllerTest extends CakeTestCase {
* @return void * @return void
*/ */
function testRender() { function testRender() {
Configure::write('viewPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS, TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS)); App::path('views', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS, TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS));
$Controller =& new Controller(); $Controller =& new Controller();
$Controller->viewPath = 'posts'; $Controller->viewPath = 'posts';

6
cake/tests/cases/libs/controller/pages_controller.test.php
View file

@ -44,7 +44,7 @@ class PagesControllerTest extends CakeTestCase {
* @return void * @return void
*/ */
function setUp() { function setUp() {
$this->_viewPaths = Configure::read('viewPaths'); $this->_viewPaths = App::path('views');
} }
/** /**
* tearDown method * tearDown method
@ -53,7 +53,7 @@ class PagesControllerTest extends CakeTestCase {
* @return void * @return void
*/ */
function tearDown() { function tearDown() {
Configure::write('viewPaths', $this->_viewPaths); App::path('views', $this->_viewPaths);
} }
/** /**
* testDisplay method * testDisplay method
@ -66,7 +66,7 @@ class PagesControllerTest extends CakeTestCase {
return; return;
} }
Configure::write('viewPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS, TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS)); App::path('views', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS, TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS));
$Pages =& new PagesController(); $Pages =& new PagesController();
$Pages->viewPath = 'posts'; $Pages->viewPath = 'posts';

47
cake/tests/cases/libs/controller/scaffold.test.php
View file

@ -266,8 +266,8 @@ class ScaffoldViewTest extends CakeTestCase {
'viewPaths' => Configure::read('viewPaths'), 'viewPaths' => Configure::read('viewPaths'),
'pluginPaths' => Configure::read('pluginPaths'), 'pluginPaths' => Configure::read('pluginPaths'),
); );
Configure::write('viewPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS)); App::path('views', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS));
Configure::write('pluginPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)); App::path('plugins', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS));
$Controller =& new ScaffoldMockController(); $Controller =& new ScaffoldMockController();
$Controller->scaffold = 'admin'; $Controller->scaffold = 'admin';
@ -298,8 +298,8 @@ class ScaffoldViewTest extends CakeTestCase {
. DS .'test_plugin' . DS . 'views' . DS . 'tests' . DS . 'scaffold.edit.ctp'; . DS .'test_plugin' . DS . 'views' . DS . 'tests' . DS . 'scaffold.edit.ctp';
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
Configure::write('viewPaths', $_back['viewPaths']); App::path('views', $_back['viewPaths']);
Configure::write('pluginPaths', $_back['pluginPaths']); App::path('plugins', $_back['pluginPaths']);
Configure::write('Routing.admin', $_admin); Configure::write('Routing.admin', $_admin);
} }
/** /**
@ -580,44 +580,5 @@ class ScaffoldTest extends CakeTestCase {
$result = $Scaffold->getParams(); $result = $Scaffold->getParams();
$this->assertEqual($result['action'], 'admin_edit'); $this->assertEqual($result['action'], 'admin_edit');
} }
/**
* test that the proper names and variable values are set by Scaffold
*
* @return void
**/
function testScaffoldVariableSetting() {
$this->Controller->action = 'admin_edit';
$this->Controller->here = '/admin/scaffold_mock/edit';
$this->Controller->webroot = '/';
$params = array(
'plugin' => null,
'pass' => array(),
'form' => array(),
'named' => array(),
'url' => array('url' =>'admin/scaffold_mock/edit'),
'controller' => 'scaffold_mock',
'action' => 'admin_edit',
'admin' => true,
);
//set router.
Router::setRequestInfo(array($params, array('base' => '/', 'here' => 'admin/scaffold_mock', 'webroot' => '/')));
$this->Controller->params = $params;
$this->Controller->controller = 'scaffold_mock';
$this->Controller->base = '/';
$this->Controller->constructClasses();
$Scaffold =& new TestScaffoldMock($this->Controller, $params);
$result = $this->Controller->viewVars;
$this->assertEqual($result['singularHumanName'], 'Scaffold Mock');
$this->assertEqual($result['pluralHumanName'], 'Scaffold Mock');
$this->assertEqual($result['modelClass'], 'ScaffoldMock');
$this->assertEqual($result['primaryKey'], 'id');
$this->assertEqual($result['displayField'], 'title');
$this->assertEqual($result['singularVar'], 'scaffoldMock');
$this->assertEqual($result['pluralVar'], 'scaffoldMock');
$this->assertEqual($result['scaffoldFields'], array('id', 'user_id', 'title', 'body', 'published', 'created', 'updated'));
}
} }
?> ?>

10
cake/tests/cases/libs/i18n.test.php
View file

@ -40,7 +40,7 @@ class I18nTest extends CakeTestCase {
*/ */
function setUp() { function setUp() {
$this->_localePaths = Configure::read('localePaths'); $this->_localePaths = Configure::read('localePaths');
Configure::write('localePaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale')); App::path('locales', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale'));
} }
/** /**
* tearDown method * tearDown method
@ -49,7 +49,7 @@ class I18nTest extends CakeTestCase {
* @return void * @return void
*/ */
function tearDown() { function tearDown() {
Configure::write('localePaths', $this->_localePaths); App::path('locales', $this->_localePaths);
} }
/** /**
* testDefaultStrings method * testDefaultStrings method
@ -2353,8 +2353,8 @@ class I18nTest extends CakeTestCase {
* @return void * @return void
*/ */
function testPluginTranslation() { function testPluginTranslation() {
$pluginPaths = Configure::read('pluginPaths'); $pluginPaths = App::path('plugins');
Configure::write('pluginPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins')); App::path('plugins', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins'));
Configure::write('Config.language', 'po'); Configure::write('Config.language', 'po');
$singular = $this->__domainSingular(); $singular = $this->__domainSingular();
@ -2388,7 +2388,7 @@ class I18nTest extends CakeTestCase {
$this->assertTrue(in_array('24 = 0 or > 1 (from plugin)', $plurals)); $this->assertTrue(in_array('24 = 0 or > 1 (from plugin)', $plurals));
$this->assertTrue(in_array('25 = 0 or > 1 (from plugin)', $plurals)); $this->assertTrue(in_array('25 = 0 or > 1 (from plugin)', $plurals));
Configure::write('pluginPaths', $pluginPaths); App::path('plugins', $pluginPaths);
} }
/** /**
* testPoMultipleLineTranslation method * testPoMultipleLineTranslation method

20
cake/tests/cases/libs/object.test.php
View file

@ -424,8 +424,8 @@ class ObjectTest extends CakeTestCase {
$cacheDisable = Configure::read('Cache.disable'); $cacheDisable = Configure::read('Cache.disable');
Configure::write('Cache.disable', false); Configure::write('Cache.disable', false);
Configure::write('modelPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models'. DS)); App::path('models', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models'. DS));
Configure::write('behaviorPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models'. DS . 'behaviors' . DS)); App::path('behaviors', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models'. DS . 'behaviors' . DS));
$this->assertFalse(class_exists('PersisterOneBehaviorBehavior')); $this->assertFalse(class_exists('PersisterOneBehaviorBehavior'));
$this->assertFalse(class_exists('PersisterTwoBehaviorBehavior')); $this->assertFalse(class_exists('PersisterTwoBehaviorBehavior'));
@ -470,8 +470,8 @@ class ObjectTest extends CakeTestCase {
$this->assertFalse(class_exists('ContainableBehavior')); $this->assertFalse(class_exists('ContainableBehavior'));
Configure::write('modelPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models'. DS)); App::path('models', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models'. DS));
Configure::write('behaviorPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models'. DS . 'behaviors' . DS)); App::path('behaviors', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models'. DS . 'behaviors' . DS));
$this->assertFalse(class_exists('PersistOneBehaviorBehavior')); $this->assertFalse(class_exists('PersistOneBehaviorBehavior'));
$this->assertFalse(class_exists('PersistTwoBehaviorBehavior')); $this->assertFalse(class_exists('PersistTwoBehaviorBehavior'));
@ -617,9 +617,9 @@ class ObjectTest extends CakeTestCase {
'view' => Configure::read('viewPaths'), 'view' => Configure::read('viewPaths'),
'plugin' => Configure::read('pluginPaths') 'plugin' => Configure::read('pluginPaths')
); );
Configure::write('controllerPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'controllers' . DS)); App::path('controllers', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'controllers' . DS));
Configure::write('viewPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS)); App::path('views', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS));
Configure::write('pluginPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)); App::path('plugins', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS));
$result = $this->object->requestAction('/tests_apps/index', array('return')); $result = $this->object->requestAction('/tests_apps/index', array('return'));
$expected = 'This is the TestsAppsController index view'; $expected = 'This is the TestsAppsController index view';
@ -674,9 +674,9 @@ class ObjectTest extends CakeTestCase {
$result = $this->object->requestAction(array('controller'=>'request_action', 'action'=>'paginate_request_action'), array('pass' => array(5), 'named' => array('param' => 'value'))); $result = $this->object->requestAction(array('controller'=>'request_action', 'action'=>'paginate_request_action'), array('pass' => array(5), 'named' => array('param' => 'value')));
$this->assertTrue($result); $this->assertTrue($result);
Configure::write('controllerPaths', $_back['controller']); App::path('controllers', $_back['controller']);
Configure::write('viewPaths', $_back['view']); App::path('views', $_back['view']);
Configure::write('pluginPaths', $_back['plugin']); App::path('plugins', $_back['plugin']);
} }
/** /**
* Test that requestAction() is populating $this->params properly * Test that requestAction() is populating $this->params properly

6
cake/tests/cases/libs/view/helpers/cache.test.php
View file

@ -90,8 +90,8 @@ class CacheHelperTest extends CakeTestCase {
* @return void * @return void
*/ */
function startCase() { function startCase() {
$this->_viewPaths = Configure::read('viewPaths'); $this->_viewPaths = App::path('views');
Configure::write('viewPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)); App::path('views', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS));
} }
/** /**
* End Case - restore view Paths * End Case - restore view Paths
@ -100,7 +100,7 @@ class CacheHelperTest extends CakeTestCase {
* @return void * @return void
*/ */
function endCase() { function endCase() {
Configure::write('viewPaths', $this->_viewPaths); App::path('views', $this->_viewPaths);
} }
/** /**
* tearDown method * tearDown method

2
cake/tests/cases/libs/view/helpers/session.test.php
View file

@ -143,7 +143,7 @@ class SessionHelperTest extends CakeTestCase {
$result = ob_get_clean(); $result = ob_get_clean();
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
Configure::write('viewPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)); App::path('views', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS));
$controller = new Controller(); $controller = new Controller();
$this->Session->view = new View($controller); $this->Session->view = new View($controller);

8
cake/tests/cases/libs/view/theme.test.php
View file

@ -173,8 +173,8 @@ class ThemeViewTest extends CakeTestCase {
$this->Controller->theme = 'test_plugin_theme'; $this->Controller->theme = 'test_plugin_theme';
$ThemeView = new TestThemeView($this->Controller); $ThemeView = new TestThemeView($this->Controller);
Configure::write('pluginPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)); App::path('plugins', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS));
Configure::write('viewPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)); App::path('views', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS));
$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS .'test_plugin' . DS . 'views' . DS . 'themed' . DS . 'test_plugin_theme' . DS .'tests' . DS .'index.ctp'; $expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS .'test_plugin' . DS . 'views' . DS . 'themed' . DS . 'test_plugin_theme' . DS .'tests' . DS .'index.ctp';
$result = $ThemeView->getViewFileName('index'); $result = $ThemeView->getViewFileName('index');
@ -200,8 +200,8 @@ class ThemeViewTest extends CakeTestCase {
$ThemeView = new TestThemeView($this->Controller); $ThemeView = new TestThemeView($this->Controller);
$ThemeView->theme = 'test_theme'; $ThemeView->theme = 'test_theme';
Configure::write('pluginPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)); App::path('plugins', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS));
Configure::write('viewPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS, TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS)); App::path('views', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS, TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS));
$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS .'pages' . DS .'home.ctp'; $expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS .'pages' . DS .'home.ctp';
$result = $ThemeView->getViewFileName('home'); $result = $ThemeView->getViewFileName('home');

8
cake/tests/cases/libs/view/view.test.php
View file

@ -236,8 +236,8 @@ class ViewTest extends CakeTestCase {
$this->Controller->action = 'index'; $this->Controller->action = 'index';
$View = new TestView($this->Controller); $View = new TestView($this->Controller);
Configure::write('pluginPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)); App::path('plugins', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS));
Configure::write('viewPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)); App::path('views', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS));
$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS .'test_plugin' . DS . 'views' . DS .'tests' . DS .'index.ctp'; $expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS .'test_plugin' . DS . 'views' . DS .'tests' . DS .'index.ctp';
$result = $View->getViewFileName('index'); $result = $View->getViewFileName('index');
@ -261,8 +261,8 @@ class ViewTest extends CakeTestCase {
$this->Controller->params['pass'] = array('home'); $this->Controller->params['pass'] = array('home');
$View = new TestView($this->Controller); $View = new TestView($this->Controller);
Configure::write('pluginPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)); App::path('plugins', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS));
Configure::write('viewPaths', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS, TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS)); App::path('views', array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS, TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS));
$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS .'pages' . DS .'home.ctp'; $expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS .'pages' . DS .'home.ctp';
$result = $View->getViewFileName('home'); $result = $View->getViewFileName('home');

2
cake/tests/lib/cake_test_case.php
View file

@ -744,7 +744,7 @@ class CakeTestCase extends UnitTestCase {
TESTS . 'fixtures', TESTS . 'fixtures',
VENDORS . 'tests' . DS . 'fixtures' VENDORS . 'tests' . DS . 'fixtures'
); );
$pluginPaths = Configure::read('pluginPaths'); $pluginPaths = App::path('plugins');
foreach ($pluginPaths as $path) { foreach ($pluginPaths as $path) {
if (file_exists($path . $pluginName . DS . 'tests' . DS. 'fixtures')) { if (file_exists($path . $pluginName . DS . 'tests' . DS. 'fixtures')) {
$fixturePaths[0] = $path . $pluginName . DS . 'tests' . DS. 'fixtures'; $fixturePaths[0] = $path . $pluginName . DS . 'tests' . DS. 'fixtures';

7
cake/tests/lib/code_coverage_manager.php
View file

@ -467,8 +467,7 @@ class CodeCoverageManager {
$folderPrefixMap = array( $folderPrefixMap = array(
'behaviors' => 'models', 'behaviors' => 'models',
'components' => 'controllers', 'components' => 'controllers',
'helpers' => 'views', 'helpers' => 'views'
'datasources' => 'models'
); );
foreach ($folderPrefixMap as $dir => $prefix) { foreach ($folderPrefixMap as $dir => $prefix) {
@ -517,7 +516,7 @@ class CodeCoverageManager {
if (!!$manager->pluginTest) { if (!!$manager->pluginTest) {
$path = APP . 'plugins' . DS . $manager->pluginTest . DS . 'tests' . DS . 'groups'; $path = APP . 'plugins' . DS . $manager->pluginTest . DS . 'tests' . DS . 'groups';
$pluginPaths = Configure::read('pluginPaths'); $pluginPaths = App::path('plugins');
foreach ($pluginPaths as $pluginPath) { foreach ($pluginPaths as $pluginPath) {
$tmpPath = $pluginPath . $manager->pluginTest . DS . 'tests' . DS. 'groups'; $tmpPath = $pluginPath . $manager->pluginTest . DS . 'tests' . DS. 'groups';
if (file_exists($tmpPath)) { if (file_exists($tmpPath)) {
@ -721,7 +720,7 @@ class CodeCoverageManager {
} elseif (!!$manager->pluginTest) { } elseif (!!$manager->pluginTest) {
$pluginPath = APP . 'plugins' . DS . $manager->pluginTest . DS; $pluginPath = APP . 'plugins' . DS . $manager->pluginTest . DS;
$pluginPaths = Configure::read('pluginPaths'); $pluginPaths = App::path('plugins');
foreach ($pluginPaths as $tmpPath) { foreach ($pluginPaths as $tmpPath) {
$tmpPath = $tmpPath . $manager->pluginTest . DS; $tmpPath = $tmpPath . $manager->pluginTest . DS;
if (file_exists($tmpPath)) { if (file_exists($tmpPath)) {

2
cake/tests/lib/test_manager.php
View file

@ -335,7 +335,7 @@ class TestManager {
} }
} else if (!empty($this->pluginTest)) { } else if (!empty($this->pluginTest)) {
$_pluginBasePath = APP . 'plugins' . DS . $this->pluginTest . DS . 'tests'; $_pluginBasePath = APP . 'plugins' . DS . $this->pluginTest . DS . 'tests';
$pluginPaths = Configure::read('pluginPaths'); $pluginPaths = App::path('plugins');
foreach ($pluginPaths as $path) { foreach ($pluginPaths as $path) {
if (file_exists($path . $this->pluginTest . DS . 'tests')) { if (file_exists($path . $this->pluginTest . DS . 'tests')) {
$_pluginBasePath = $path . $this->pluginTest . DS . 'tests'; $_pluginBasePath = $path . $this->pluginTest . DS . 'tests';