diff --git a/app/console/shells/empty b/app/Console/Command/Task/empty similarity index 100% rename from app/console/shells/empty rename to app/Console/Command/Task/empty diff --git a/app/console/shells/tasks/empty b/app/Console/Command/empty similarity index 100% rename from app/console/shells/tasks/empty rename to app/Console/Command/empty diff --git a/app/console/cake b/app/Console/cake similarity index 100% rename from app/console/cake rename to app/Console/cake diff --git a/app/console/cake.bat b/app/Console/cake.bat similarity index 100% rename from app/console/cake.bat rename to app/Console/cake.bat diff --git a/app/console/cake.php b/app/Console/cake.php old mode 100755 new mode 100644 similarity index 86% rename from app/console/cake.php rename to app/Console/cake.php index 9200fd36b..ef5e26816 --- a/app/console/cake.php +++ b/app/Console/cake.php @@ -19,6 +19,6 @@ * @since CakePHP(tm) v 1.2.0.5012 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -require_once(dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'cake' . DIRECTORY_SEPARATOR . 'console' . DIRECTORY_SEPARATOR . 'shell_dispatcher.php'); +require_once(dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'lib'. DIRECTORY_SEPARATOR . 'Cake' . DIRECTORY_SEPARATOR . 'Console' . DIRECTORY_SEPARATOR . 'ShellDispatcher.php'); return ShellDispatcher::run($argv); diff --git a/app/console/shells/templates/empty b/app/Console/templates/empty similarity index 100% rename from app/console/shells/templates/empty rename to app/Console/templates/empty diff --git a/app/controllers/components/empty b/app/Controller/Component/empty similarity index 100% rename from app/controllers/components/empty rename to app/Controller/Component/empty diff --git a/app/libs/empty b/app/Lib/empty similarity index 100% rename from app/libs/empty rename to app/Lib/empty diff --git a/app/models/behaviors/empty b/app/Model/Behavior/empty similarity index 100% rename from app/models/behaviors/empty rename to app/Model/Behavior/empty diff --git a/app/models/datasources/empty b/app/Model/Datasource/empty similarity index 100% rename from app/models/datasources/empty rename to app/Model/Datasource/empty diff --git a/app/tests/cases/behaviors/empty b/app/View/Helper/empty similarity index 100% rename from app/tests/cases/behaviors/empty rename to app/View/Helper/empty diff --git a/app/tests/cases/components/empty b/app/View/elements/email/html/empty similarity index 100% rename from app/tests/cases/components/empty rename to app/View/elements/email/html/empty diff --git a/app/tests/cases/controllers/empty b/app/View/elements/email/text/empty similarity index 100% rename from app/tests/cases/controllers/empty rename to app/View/elements/email/text/empty diff --git a/app/tests/cases/helpers/empty b/app/View/elements/empty similarity index 100% rename from app/tests/cases/helpers/empty rename to app/View/elements/empty diff --git a/app/tests/cases/models/empty b/app/View/errors/empty similarity index 100% rename from app/tests/cases/models/empty rename to app/View/errors/empty diff --git a/app/tests/fixtures/empty b/app/View/layouts/email/html/empty similarity index 100% rename from app/tests/fixtures/empty rename to app/View/layouts/email/html/empty diff --git a/app/tests/groups/empty b/app/View/layouts/email/text/empty similarity index 100% rename from app/tests/groups/empty rename to app/View/layouts/email/text/empty diff --git a/app/views/elements/email/html/empty b/app/View/layouts/js/empty similarity index 100% rename from app/views/elements/email/html/empty rename to app/View/layouts/js/empty diff --git a/app/views/elements/email/text/empty b/app/View/layouts/rss/empty similarity index 100% rename from app/views/elements/email/text/empty rename to app/View/layouts/rss/empty diff --git a/app/views/elements/empty b/app/View/layouts/xml/empty similarity index 100% rename from app/views/elements/empty rename to app/View/layouts/xml/empty diff --git a/app/views/errors/empty b/app/View/pages/empty similarity index 100% rename from app/views/errors/empty rename to app/View/pages/empty diff --git a/app/views/helpers/empty b/app/View/scaffolds/empty similarity index 100% rename from app/views/helpers/empty rename to app/View/scaffolds/empty diff --git a/app/config/database.php.default b/app/config/database.php.default index 9fb8e9e98..b7eb4bba2 100644 --- a/app/config/database.php.default +++ b/app/config/database.php.default @@ -28,15 +28,15 @@ * You can specify multiple configurations for production, development and testing. * * driver => The name of a supported driver; valid options are as follows: - * mysql - MySQL 4 & 5, - * sqlite - SQLite (PHP5 only), - * postgres - PostgreSQL 7 and higher, - * mssql - Microsoft SQL Server 2000 and higher, - * oracle - Oracle 8 and higher + * Datasabe/Mysql - MySQL 4 & 5, + * Datasabe/Sqlite - SQLite (PHP5 only), + * Datasabe/Postgres - PostgreSQL 7 and higher, + * Datasabe/Mssql - Microsoft SQL Server 2000 and higher, + * Datasabe/Oracle - Oracle 8 and higher * * You can add custom database drivers (or override existing drivers) by adding the - * appropriate file to app/models/datasources/dbo. Drivers should be named 'dbo_x.php', - * where 'x' is the name of the database. + * appropriate file to app/models/datasources/database. Drivers should be named 'MyDriver.php', + * * * persistent => true / false * Determines whether or not the database should use a persistent connection @@ -59,7 +59,7 @@ class DATABASE_CONFIG { public $default = array( - 'driver' => 'mysql', + 'datasource' => 'Database/Mysql', 'persistent' => false, 'host' => 'localhost', 'login' => 'user', @@ -69,7 +69,7 @@ class DATABASE_CONFIG { ); public $test = array( - 'driver' => 'mysql', + 'datasource' => 'Database/Mysql', 'persistent' => false, 'host' => 'localhost', 'login' => 'user', diff --git a/app/views/layouts/email/html/empty b/app/tests/Case/Controller/Component/empty similarity index 100% rename from app/views/layouts/email/html/empty rename to app/tests/Case/Controller/Component/empty diff --git a/app/views/layouts/email/text/empty b/app/tests/Case/Controller/empty similarity index 100% rename from app/views/layouts/email/text/empty rename to app/tests/Case/Controller/empty diff --git a/app/views/layouts/js/empty b/app/tests/Case/Model/Behavior/empty similarity index 100% rename from app/views/layouts/js/empty rename to app/tests/Case/Model/Behavior/empty diff --git a/app/views/layouts/rss/empty b/app/tests/Case/Model/empty similarity index 100% rename from app/views/layouts/rss/empty rename to app/tests/Case/Model/empty diff --git a/app/views/layouts/xml/empty b/app/tests/Case/View/Helper/empty similarity index 100% rename from app/views/layouts/xml/empty rename to app/tests/Case/View/Helper/empty diff --git a/app/views/pages/empty b/app/tests/Fixture/empty similarity index 100% rename from app/views/pages/empty rename to app/tests/Fixture/empty diff --git a/app/tmp/cache/models/empty b/app/tmp/cache/models/empty old mode 100755 new mode 100644 diff --git a/app/tmp/cache/views/empty b/app/tmp/cache/views/empty old mode 100755 new mode 100644 diff --git a/app/tmp/logs/empty b/app/tmp/logs/empty old mode 100755 new mode 100644 diff --git a/app/tmp/sessions/empty b/app/tmp/sessions/empty old mode 100755 new mode 100644 diff --git a/app/tmp/tests/empty b/app/tmp/tests/empty old mode 100755 new mode 100644 diff --git a/app/webroot/index.php b/app/webroot/index.php index f1ff8d197..3c5e71589 100644 --- a/app/webroot/index.php +++ b/app/webroot/index.php @@ -49,7 +49,7 @@ * */ if (!defined('CAKE_CORE_INCLUDE_PATH')) { - define('CAKE_CORE_INCLUDE_PATH', ROOT); + define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib'); } /** @@ -67,7 +67,7 @@ define('APP_PATH', ROOT . DS . APP_DIR . DS); define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS); } - if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) { + if (!include(CORE_PATH . 'Cake' . DS . 'bootstrap.php')) { trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR); } @@ -75,6 +75,6 @@ return; } - require LIBS . 'dispatcher.php'; + App::uses('Dispatcher', 'Routing'); $Dispatcher = new Dispatcher(); $Dispatcher->dispatch(new CakeRequest()); diff --git a/app/webroot/test.php b/app/webroot/test.php index c11aaac99..ffcedfe39 100644 --- a/app/webroot/test.php +++ b/app/webroot/test.php @@ -45,11 +45,11 @@ ini_set('display_errors', 1); define('APP_DIR', basename(dirname(dirname(__FILE__)))); } /** - * The absolute path to the "cake" directory, WITHOUT a trailing DS. + * The absolute path to the "Cake" directory, WITHOUT a trailing DS. * */ if (!defined('CAKE_CORE_INCLUDE_PATH')) { - define('CAKE_CORE_INCLUDE_PATH', ROOT); + define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib'); } /** @@ -67,21 +67,14 @@ if (!defined('CORE_PATH')) { define('APP_PATH', ROOT . DS . APP_DIR . DS); define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS); } -if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) { +if (!include(CORE_PATH . 'Cake' . DS . 'bootstrap.php')) { trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR); } -$corePath = App::core('cake'); -if (isset($corePath[0])) { - define('TEST_CAKE_CORE_INCLUDE_PATH', rtrim($corePath[0], DS) . DS); -} else { - define('TEST_CAKE_CORE_INCLUDE_PATH', CAKE_CORE_INCLUDE_PATH); -} - if (Configure::read('debug') < 1) { - die(__('Debug setting does not allow access to this url.')); + die(__d('cake', 'Debug setting does not allow access to this url.')); } -require_once CAKE_TESTS_LIB . 'cake_test_suite_dispatcher.php'; +require_once CAKE_TESTS_LIB . 'CakeTestSuiteDispatcher.php'; CakeTestSuiteDispatcher::run(); diff --git a/cake/bootstrap.php b/cake/bootstrap.php deleted file mode 100644 index aa30770fc..000000000 --- a/cake/bootstrap.php +++ /dev/null @@ -1,39 +0,0 @@ - array('suffix' => '.php', 'extends' => null, 'core' => true), - 'file' => array('suffix' => '.php', 'extends' => null, 'core' => true), - 'model' => array('suffix' => '.php', 'extends' => 'AppModel', 'core' => false), - 'behavior' => array('suffix' => '.php', 'extends' => 'ModelBehavior', 'core' => true), - 'controller' => array('suffix' => '_controller.php', 'extends' => 'AppController', 'core' => true), - 'component' => array('suffix' => '.php', 'extends' => null, 'core' => true), - 'lib' => array('suffix' => '.php', 'extends' => null, 'core' => true), - 'view' => array('suffix' => '.php', 'extends' => null, 'core' => true), - 'helper' => array('suffix' => '.php', 'extends' => 'AppHelper', 'core' => true), - 'vendor' => array('suffix' => '', 'extends' => null, 'core' => true), - 'shell' => array('suffix' => '.php', 'extends' => 'Shell', 'core' => true), - 'plugin' => array('suffix' => '', 'extends' => null, 'core' => true) - ); - -/** - * List of additional path(s) where model files reside. - * - * @var array - */ - public static $models = array(); - -/** - * List of additional path(s) where behavior files reside. - * - * @var array - */ - public static $behaviors = array(); - -/** - * List of additional path(s) where controller files reside. - * - * @var array - */ - public static $controllers = array(); - -/** - * List of additional path(s) where component files reside. - * - * @var array - */ - public static $components = array(); - -/** - * List of additional path(s) where datasource files reside. - * - * @var array - */ - public static $datasources = array(); - -/** - * List of additional path(s) where libs files reside. - * - * @var array - */ - public static $libs = array(); - -/** - * List of additional path(s) where view files reside. - * - * @var array - */ - public static $views = array(); - -/** - * List of additional path(s) where helper files reside. - * - * @var array - */ - public static $helpers = array(); - -/** - * List of additional path(s) where plugins reside. - * - * @var array - */ - public static $plugins = array(); - -/** - * List of additional path(s) where vendor packages reside. - * - * @var array - */ - public static $vendors = array(); - -/** - * List of additional path(s) where locale files reside. - * - * @var array - */ - public static $locales = array(); - -/** - * List of additional path(s) where console shell files reside. - * - * @var array - */ - public static $shells = array(); - -/** - * Paths to search for files. - * - * @var array - */ - public static $search = array(); - -/** - * Whether or not to return the file that is loaded. - * - * @var boolean - */ - public static $return = false; - -/** - * Determines if $__maps and $__paths cache should be written. - * - * @var boolean - */ - private static $__cache = false; - -/** - * Holds key/value pairs of $type => file path. - * - * @var array - */ - private static $__map = array(); - -/** - * Holds paths for deep searching of files. - * - * @var array - */ - private static $__paths = array(); - -/** - * Holds loaded files. - * - * @var array - */ - private static $__loaded = array(); - -/** - * Holds and key => value array of object types. - * - * @var array - */ - private static $__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 - */ - public static function path($type) { - if (!isset(self::${$type})) { - return array(); - } - return self::${$type}; - } - -/** - * 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 - * @param boolean $reset true will set paths, false merges paths [default] false - * @return void - */ - public static function build($paths = array(), $reset = false) { - $defaults = array( - 'models' => array(MODELS), - 'behaviors' => array(BEHAVIORS), - 'datasources' => array(MODELS . 'datasources'), - 'controllers' => array(CONTROLLERS), - 'components' => array(COMPONENTS), - 'libs' => array(APPLIBS), - 'views' => array(VIEWS), - 'helpers' => array(HELPERS), - 'locales' => array(APP . 'locale' . DS), - 'shells' => array( - APP . 'console' . DS . 'shells' . DS, - APP . 'vendors' . DS . 'shells' . DS, - VENDORS . 'shells' . DS - ), - 'vendors' => array(APP . 'vendors' . DS, VENDORS), - 'plugins' => array(APP . 'plugins' . DS) - ); - - if ($reset == true) { - foreach ($paths as $type => $new) { - self::${$type} = (array)$new; - } - return $paths; - } - - $core = self::core(); - $app = array('models' => true, 'controllers' => true, 'helpers' => true); - - foreach ($defaults as $type => $default) { - $merge = array(); - - if (isset($app[$type])) { - $merge = array(APP); - } - if (isset($core[$type])) { - $merge = array_merge($merge, (array)$core[$type]); - } - - if (empty(self::${$type}) || empty($paths)) { - self::${$type} = $default; - } - - if (!empty($paths[$type])) { - $path = array_flip(array_flip(array_merge( - (array)$paths[$type], self::${$type}, $merge - ))); - } else { - $path = array_flip(array_flip(array_merge(self::${$type}, $merge))); - } - self::${$type} = array_values($path); - } - } - -/** - * Get the path that a plugin is on. Searches through the defined plugin paths. - * - * @param string $plugin CamelCased/lower_cased plugin name to find the path of. - * @return string full path to the plugin. - */ - public static function pluginPath($plugin) { - $pluginDir = Inflector::underscore($plugin); - for ($i = 0, $length = count(self::$plugins); $i < $length; $i++) { - if (is_dir(self::$plugins[$i] . $pluginDir)) { - return self::$plugins[$i] . $pluginDir . DS ; - } - } - return self::$plugins[0] . $pluginDir . DS; - } - -/** - * Find the path that a theme is on. Search through the defined theme paths. - * - * @param string $theme lower_cased theme name to find the path of. - * @return string full path to the theme. - */ - public static function themePath($theme) { - $themeDir = 'themed' . DS . Inflector::underscore($theme); - for ($i = 0, $length = count(self::$views); $i < $length; $i++) { - if (is_dir(self::$views[$i] . $themeDir)) { - return self::$views[$i] . $themeDir . DS ; - } - } - return self::$views[0] . $themeDir . DS; - } - -/** - * 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 - */ - public static function core($type = null) { - static $paths = false; - if (!$paths) { - $paths = array(); - $libs = dirname(__FILE__) . DS; - $cake = dirname($libs) . DS; - $path = dirname($cake) . DS; - - $paths['cake'][] = $cake; - $paths['libs'][] = $libs; - $paths['models'][] = $libs . 'model' . DS; - $paths['datasources'][] = $libs . 'model' . DS . 'datasources' . DS; - $paths['behaviors'][] = $libs . 'model' . DS . 'behaviors' . DS; - $paths['controllers'][] = $libs . 'controller' . DS; - $paths['components'][] = $libs . 'controller' . DS . 'components' . DS; - $paths['views'][] = $libs . 'view' . DS; - $paths['helpers'][] = $libs . 'view' . DS . 'helpers' . DS; - $paths['plugins'][] = $path . 'plugins' . DS; - $paths['vendors'][] = $path . 'vendors' . DS; - $paths['shells'][] = $cake . 'console' . DS . 'shells' . DS; - // Provide BC path to vendors/shells - $paths['shells'][] = $path . 'vendors' . DS . 'shells' . DS; - } - if ($type && isset($paths[$type])) { - return $paths[$type]; - } - return $paths; - } - -/** - * Returns an array of objects of the given type. - * - * Example usage: - * - * `App::objects('plugin');` returns `array('DebugKit', 'Blog', 'User');` - * - * You can also search only within a plugin's objects by using the plugin dot - * syntax (these objects are not cached): - * - * `App::objects('MyPlugin.model');` returns `array('Post', 'Comment');` - * - * @param string $type Type of object, i.e. 'model', 'controller', 'helper', or 'plugin' - * @param mixed $path Optional Scan only the path given. If null, paths for the chosen - * type will be used. - * @param boolean $cache Set to false to rescan objects of the chosen type. Defaults to true. - * @return mixed Either false on incorrect / miss. Or an array of found objects. - */ - public static function objects($type, $path = null, $cache = true) { - $objects = array(); - $extension = false; - list($plugin, $type) = pluginSplit($type); - $name = $type; - - if ($plugin) { - $path = Inflector::pluralize($type); - if ($path == 'helpers') { - $path = 'views' . DS .$path; - } elseif ($path == 'behaviors') { - $path = 'models' . DS .$path; - } elseif ($path == 'components') { - $path = 'controllers' . DS .$path; - } - $path = self::pluginPath($plugin) . $path; - $cache = false; - } - - if ($type === 'file' && !$path) { - return false; - } elseif ($type === 'file') { - $extension = true; - $name = $type . str_replace(DS, '', $path); - } - - if (empty(self::$__objects) && $cache === true) { - self::$__objects = Cache::read('object_map', '_cake_core_'); - } - - if (!isset(self::$__objects[$name]) || $cache !== true) { - $types = self::$types; - - if (!isset($types[$type])) { - return false; - } - $objects = array(); - - if (empty($path)) { - $path = self::${"{$type}s"}; - if (isset($types[$type]['core']) && $types[$type]['core'] === false) { - array_pop($path); - } - } - $items = array(); - - foreach ((array)$path as $dir) { - if ($dir != APP) { - $items = self::__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) { - self::$__cache = true; - } - if ($plugin) { - return $objects; - } - self::$__objects[$name] = $objects; - } - - return self::$__objects[$name]; - } - -/** - * Allows you to modify the object listings that App maintains inside of it - * Useful for testing - * - * @param string $type Type of object listing you are changing - * @param array $values The values $type should be set to. - * @return void - */ - public static function setObjects($type, $values) { - self::$__objects[$type] = $values; - } - -/** - * Finds classes based on $name or specific file(s) to search. Calling App::import() will - * not construct any classes contained in the files. It will only find and require() the file. - * - * @link http://book.cakephp.org/view/934/Using-App-import - * @param mixed $type The type of Class if passed as a string, or all params can be passed as - * an single array to $type, - * @param string $name Name of the Class or a unique name for the file - * @param mixed $parent boolean true if Class Parent should be searched, accepts key => value - * array('parent' => $parent ,'file' => $file, 'search' => $search, 'ext' => '$ext'); - * $ext allows setting the extension of the file name - * based on Inflector::underscore($name) . ".$ext"; - * @param array $search paths to search for files, array('path 1', 'path 2', 'path 3'); - * @param string $file full name of the file to search for including extension - * @param boolean $return, return the loaded file, the file must have a return - * statement in it to work: return $variable; - * @return boolean true if Class is already in memory or if file is found and loaded, false if not - */ - public static function import($type = null, $name = null, $parent = true, $search = array(), $file = null, $return = false) { - $plugin = $directory = null; - - if (is_array($type)) { - extract($type, EXTR_OVERWRITE); - } - - if (is_array($parent)) { - extract($parent, EXTR_OVERWRITE); - } - - if ($name === null && $file === null) { - $name = $type; - $type = 'Core'; - } elseif ($name === null) { - $type = 'File'; - } - - if (is_array($name)) { - foreach ($name as $class) { - $tempType = $type; - $plugin = null; - - if (strpos($class, '.') !== false) { - $value = explode('.', $class); - $count = count($value); - - if ($count > 2) { - $tempType = $value[0]; - $plugin = $value[1] . '.'; - $class = $value[2]; - } elseif ($count === 2 && ($type === 'Core' || $type === 'File')) { - $tempType = $value[0]; - $class = $value[1]; - } else { - $plugin = $value[0] . '.'; - $class = $value[1]; - } - } - - if (!App::import($tempType, $plugin . $class, $parent)) { - return false; - } - } - return true; - } - - if ($name != null && strpos($name, '.') !== false) { - list($plugin, $name) = explode('.', $name); - $plugin = Inflector::camelize($plugin); - } - self::$return = $return; - - if (isset($ext)) { - $file = Inflector::underscore($name) . ".{$ext}"; - } - $ext = self::__settings($type, $plugin, $parent); - $className = $name; - if (strpos($className, '/') !== false) { - $className = substr($className, strrpos($className, '/') + 1); - } - if ($name != null && !class_exists($className . $ext['class'])) { - if ($load = self::__mapped($name . $ext['class'], $type, $plugin)) { - if (self::__load($load)) { - if (self::$return) { - return include($load); - } - return true; - } else { - self::__remove($name . $ext['class'], $type, $plugin); - self::$__cache = true; - } - } - if (!empty($search)) { - self::$search = $search; - } elseif ($plugin) { - self::$search = self::__paths('plugin'); - } else { - self::$search = self::__paths($type); - } - $find = $file; - - if ($find === null) { - $find = Inflector::underscore($name . $ext['suffix']).'.php'; - - if ($plugin) { - $paths = self::$search; - foreach ($paths as $key => $value) { - self::$search[$key] = $value . $ext['path']; - } - } - } - - if (strtolower($type) !== 'vendor' && empty($search) && self::__load($file)) { - $directory = false; - } else { - $file = $find; - $directory = self::__find($find, true); - } - - if ($directory !== null) { - self::$__cache = true; - self::__map($directory . $file, $name . $ext['class'], $type, $plugin); - - if (self::$return) { - return include($directory . $file); - } - return true; - } - return false; - } - return true; - } - -/** - * Initializes the cache for App, registers a shutdown function. - * - * @return void - */ - public static function init() { - self::$__map = (array)Cache::read('file_map', '_cake_core_'); - register_shutdown_function(array('App', 'shutdown')); - } - -/** - * Locates the $file in $__paths, searches recursively. - * - * @param string $file full file name - * @param boolean $recursive search $__paths recursively - * @return mixed boolean on fail, $file directory path on success - */ - private static function __find($file, $recursive = true) { - static $appPath = false; - - if (empty(self::$search)) { - return null; - } elseif (is_string(self::$search)) { - self::$search = array(self::$search); - } - - if (empty(self::$__paths)) { - self::$__paths = Cache::read('dir_map', '_cake_core_'); - } - - foreach (self::$search as $path) { - if ($appPath === false) { - $appPath = rtrim(APP, DS); - } - $path = rtrim($path, DS); - - if ($path === $appPath) { - $recursive = false; - } - if ($recursive === false) { - if (self::__load($path . DS . $file)) { - return $path . DS; - } - continue; - } - - if (!isset(self::$__paths[$path])) { - if (!class_exists('Folder')) { - require LIBS . 'folder.php'; - } - $Folder = new Folder(); - $directories = $Folder->tree($path, array('.svn', '.git', 'CVS', 'tests', 'templates'), 'dir'); - sort($directories); - self::$__paths[$path] = $directories; - } - - foreach (self::$__paths[$path] as $directory) { - if (self::__load($directory . DS . $file)) { - return $directory . DS; - } - } - } - return null; - } - -/** - * Attempts to load $file. - * - * @param string $file full path to file including file name - * @return boolean - * @access private - */ - private static function __load($file) { - if (empty($file)) { - return false; - } - if (!self::$return && isset(self::$__loaded[$file])) { - return true; - } - if (file_exists($file)) { - if (!self::$return) { - require($file); - self::$__loaded[$file] = true; - } - return true; - } - return false; - } - -/** - * Maps the $name to the $file. - * - * @param string $file full path to file - * @param string $name unique name for this map - * @param string $type type object being mapped - * @param string $plugin camelized if object is from a plugin, the name of the plugin - * @return void - * @access private - */ - private static function __map($file, $name, $type, $plugin) { - if ($plugin) { - self::$__map['Plugin'][$plugin][$type][$name] = $file; - } else { - self::$__map[$type][$name] = $file; - } - } - -/** - * Returns a file's complete path. - * - * @param string $name unique name - * @param string $type type object - * @param string $plugin camelized if object is from a plugin, the name of the plugin - * @return mixed, file path if found, false otherwise - * @access private - */ - private static function __mapped($name, $type, $plugin) { - if ($plugin) { - if (isset(self::$__map['Plugin'][$plugin][$type]) && isset(self::$__map['Plugin'][$plugin][$type][$name])) { - return self::$__map['Plugin'][$plugin][$type][$name]; - } - return false; - } - - if (isset(self::$__map[$type]) && isset(self::$__map[$type][$name])) { - return self::$__map[$type][$name]; - } - return false; - } - -/** - * Loads parent classes based on $type. - * Returns a prefix or suffix needed for loading files. - * - * @param string $type type of object - * @param string $plugin camelized name of plugin - * @param boolean $parent false will not attempt to load parent - * @return array - * @access private - */ - private static function __settings($type, $plugin, $parent) { - if (!$parent) { - return array('class' => null, 'suffix' => null, 'path' => null); - } - - if ($plugin) { - $pluginPath = Inflector::underscore($plugin); - } - $path = null; - $load = strtolower($type); - - switch ($load) { - case 'model': - if (!class_exists('Model')) { - require LIBS . 'model' . DS . 'model.php'; - } - if (!class_exists('AppModel')) { - App::import($type, 'AppModel', false); - } - if ($plugin) { - if (!class_exists($plugin . 'AppModel')) { - App::import($type, $plugin . '.' . $plugin . 'AppModel', false, array(), $pluginPath . DS . $pluginPath . '_app_model.php'); - } - $path = $pluginPath . DS . 'models' . DS; - } - return array('class' => null, 'suffix' => null, 'path' => $path); - break; - case 'behavior': - if ($plugin) { - $path = $pluginPath . DS . 'models' . DS . 'behaviors' . DS; - } - return array('class' => $type, 'suffix' => null, 'path' => $path); - break; - case 'datasource': - if ($plugin) { - $path = $pluginPath . DS . 'models' . DS . 'datasources' . DS; - } - return array('class' => $type, 'suffix' => null, 'path' => $path); - case 'controller': - App::import($type, 'AppController', false); - if ($plugin) { - App::import($type, $plugin . '.' . $plugin . 'AppController', false, array(), $pluginPath . DS . $pluginPath . '_app_controller.php'); - $path = $pluginPath . DS . 'controllers' . DS; - } - return array('class' => $type, 'suffix' => $type, 'path' => $path); - break; - case 'component': - App::import('Core', 'Component', false); - if ($plugin) { - $path = $pluginPath . DS . 'controllers' . DS . 'components' . DS; - } - return array('class' => $type, 'suffix' => null, 'path' => $path); - break; - case 'lib': - if ($plugin) { - $path = $pluginPath . DS . 'libs' . DS; - } - return array('class' => null, 'suffix' => null, 'path' => $path); - break; - case 'view': - App::import('View', 'View', false); - if ($plugin) { - $path = $pluginPath . DS . 'views' . DS; - } - return array('class' => $type, 'suffix' => null, 'path' => $path); - break; - case 'helper': - if (!class_exists('AppHelper')) { - App::import($type, 'AppHelper', false); - } - if ($plugin) { - $path = $pluginPath . DS . 'views' . DS . 'helpers' . DS; - } - return array('class' => $type, 'suffix' => null, 'path' => $path); - break; - case 'shell': - if (!class_exists('Shell')) { - App::import($type, 'Shell', false); - } - if (!class_exists('AppShell')) { - App::import($type, 'AppShell', false); - } - if ($plugin) { - $path = $pluginPath . DS . 'console' . DS . 'shells' . DS; - } - return array('class' => $type, 'suffix' => null, 'path' => $path); - break; - case 'vendor': - if ($plugin) { - $path = $pluginPath . DS . 'vendors' . DS; - } - return array('class' => null, 'suffix' => null, 'path' => $path); - break; - default: - $type = $suffix = $path = null; - break; - } - return array('class' => null, 'suffix' => null, 'path' => null); - } - -/** - * Returns default search paths. - * - * @param string $type type of object to be searched - * @return array list of paths - */ - private static function __paths($type) { - $type = strtolower($type); - $paths = array(); - - if ($type === 'core') { - return App::core('libs'); - } - if (isset(self::${$type . 's'})) { - return self::${$type . 's'}; - } - return $paths; - } - -/** - * Removes file location from map if the file has been deleted. - * - * @param string $name name of object - * @param string $type type of object - * @param string $plugin camelized name of plugin - * @return void - */ - private static function __remove($name, $type, $plugin) { - if ($plugin) { - unset(self::$__map['Plugin'][$plugin][$type][$name]); - } else { - unset(self::$__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 - */ - private static 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. - * - * Writes cache file if changes have been made to the $__map or $__paths - * - * @return void - */ - public static function shutdown() { - if (self::$__cache) { - $core = App::core('cake'); - unset(self::$__paths[rtrim($core[0], DS)]); - Cache::write('dir_map', array_filter(self::$__paths), '_cake_core_'); - Cache::write('file_map', array_filter(self::$__map), '_cake_core_'); - Cache::write('object_map', self::$__objects, '_cake_core_'); - } - } -} diff --git a/cake/libs/magic_db.php b/cake/libs/magic_db.php deleted file mode 100644 index 86a91d82d..000000000 --- a/cake/libs/magic_db.php +++ /dev/null @@ -1,291 +0,0 @@ -exists()) { - return false; - } - if ($File->ext() == 'php') { - include($File->pwd()); - $data = $magicDb; - } else { - // @TODO: Needs test coverage - $data = $File->read(); - } - } - - $magicDb = $this->toArray($data); - if (!$this->validates($magicDb)) { - return false; - } - return !!($this->db = $magicDb); - } - -/** - * Parses a MagicDb $data string into an array or returns the current MagicDb instance as an array - * - * @param string $data A MagicDb string to turn into an array - * @return array A parsed MagicDb array or an empty array if the $data param was invalid. Returns the db property if $data is not set. - */ - public function toArray($data = null) { - if (is_array($data)) { - return $data; - } - if ($data === null) { - return $this->db; - } - - if (strpos($data, '# FILE_ID DB') !== 0) { - return array(); - } - - $lines = explode("\r\n", $data); - $db = array(); - - $validHeader = count($lines) > 3 - && preg_match('/^# Date:([0-9]{4}-[0-9]{2}-[0-9]{2})$/', $lines[1], $date) - && preg_match('/^# Source:(.+)$/', $lines[2], $source) - && strlen($lines[3]) == 0; - if (!$validHeader) { - return $db; - } - - $db = array('header' => array('Date' => $date[1], 'Source' => $source[1]), 'database' => array()); - $lines = array_splice($lines, 3); - - $format = array(); - while (!empty($lines)) { - $line = array_shift($lines); - if (isset($line[0]) && $line[0] == '#' || empty($line)) { - continue; - } - - $columns = explode("\t", $line); - if (in_array($columns[0]{0}, array('>', '&'))) { - $format[] = $columns; - } elseif (!empty($format)) { - $db['database'][] = $format; - $format = array($columns); - } else { - $format = array($columns); - } - } - - return $db; - } - -/** - * Returns true if the MagicDb instance or the passed $magicDb is valid - * - * @param mixed $magicDb A $magicDb string / array to validate (optional) - * @return boolean True if the $magicDb / instance db validates, false if not - */ - public function validates($magicDb = null) { - if (is_null($magicDb)) { - $magicDb = $this->db; - } elseif (!is_array($magicDb)) { - $magicDb = $this->toArray($magicDb); - } - - return isset($magicDb['header'], $magicDb['database']) && is_array($magicDb['header']) && is_array($magicDb['database']); - } - -/** - * Analyzes a given $file using the currently loaded MagicDb information based on the desired $options - * - * @param string $file Absolute path to the file to analyze - * @param array $options TBT - * @return mixed - */ - public function analyze($file, $options = array()) { - if (!is_string($file)) { - return false; - } - - $matches = array(); - $MagicFileResource = new MagicFileResource($file); - foreach ($this->db['database'] as $format) { - $magic = $format[0]; - $match = $MagicFileResource->test($magic); - if ($match === false) { - continue; - } - $matches[] = $magic; - } - - return $matches; - } -} - -/** - * undocumented class - * - * @package cake.libs - */ -class MagicFileResource extends Object{ - -/** - * undocumented variable - * - * @var unknown - * @access public - */ - public $resource = null; - -/** - * undocumented variable - * - * @var unknown - * @access public - */ - public $offset = 0; - -/** - * undocumented function - * - * @param unknown $file - * @return void - */ - public function __construct($file) { - if (file_exists($file)) { - $this->resource = new File($file); - } else { - $this->resource = $file; - } - } - -/** - * undocumented function - * - * @param unknown $magic - * @return void - */ - public function test($magic) { - $offset = null; - $type = null; - $expected = null; - $comment = null; - if (isset($magic[0])) { - $offset = $magic[0]; - } - if (isset($magic[1])) { - $type = $magic[1]; - } - if (isset($magic[2])) { - $expected = $magic[2]; - } - if (isset($magic[3])) { - $comment = $magic[3]; - } - $val = $this->extract($offset, $type, $expected); - return $val == $expected; - } - -/** - * undocumented function - * - * @param unknown $type - * @param unknown $length - * @return void - */ - public function read($length = null) { - if (!is_object($this->resource)) { - return substr($this->resource, $this->offset, $length); - } - return $this->resource->read($length); - } - -/** - * undocumented function - * - * @param unknown $type - * @param unknown $expected - * @return void - */ - public function extract($offset, $type, $expected) { - switch ($type) { - case 'string': - $this->offset($offset); - $val = $this->read(strlen($expected)); - if ($val === $expected) { - return true; - } - break; - } - } - -/** - * undocumented function - * - * @param unknown $offset - * @param unknown $whence - * @return void - */ - public function offset($offset = null) { - if (is_null($offset)) { - if (!is_object($this->resource)) { - return $this->offset; - } - return $this->offset; - } - - if (!ctype_digit($offset)) { - return false; - } - if (is_object($this->resource)) { - $this->resource->offset($offset); - } else { - $this->offset = $offset; - } - } -} diff --git a/cake/libs/view/errors/missing_action.ctp b/cake/libs/view/errors/missing_action.ctp deleted file mode 100644 index 5b6fdb970..000000000 --- a/cake/libs/view/errors/missing_action.ctp +++ /dev/null @@ -1,44 +0,0 @@ - -

-

- : - ' . $action . '', '' . $controller . ''); ?> -

-

- : - ' . $controller . '::', '' . $action . '()', APP_DIR . DS . 'controllers' . DS . Inflector::underscore($controller) . '.php'); ?> -

-
-<?php
-class  extends AppController {
-
-
-	function  {
-
-	}
-
-}
-?>
-
-

- : - -

-element('exception_stack_trace'); ?> diff --git a/cake/libs/view/errors/missing_view.ctp b/cake/libs/view/errors/missing_view.ctp deleted file mode 100644 index 9d8c7cb91..000000000 --- a/cake/libs/view/errors/missing_view.ctp +++ /dev/null @@ -1,33 +0,0 @@ - -

-

- : - ' . Inflector::camelize($this->request->controller) . 'Controller::', '' . $this->request->action . '()'); ?> -

-

- : - -

-

- : - -

- -element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/cake/libs/view/pages/home.ctp b/cake/libs/view/pages/home.ctp deleted file mode 100644 index 400df888b..000000000 --- a/cake/libs/view/pages/home.ctp +++ /dev/null @@ -1,174 +0,0 @@ - -

- - 0): - Debugger::checkSecurityKeys(); -endif; -?> -

- '; - echo __('Your tmp directory is writable.'); - echo ''; - else: - echo ''; - echo __('Your tmp directory is NOT writable.'); - echo ''; - endif; - ?> -

-

- '; - echo __('The %s is being used for caching. To change the config edit APP/config/core.php ', ''. $settings['engine'] . 'Engine'); - echo ''; - else: - echo ''; - echo __('Your cache is NOT working. Please check the settings in APP/config/core.php'); - echo ''; - endif; - ?> -

-

- '; - echo __('Your database configuration file is present.'); - $filePresent = true; - echo ''; - else: - echo ''; - echo __('Your database configuration file is NOT present.'); - echo '
'; - echo __('Rename config/database.php.default to config/database.php'); - echo ''; - endif; - ?> -

-'; - __('PCRE has not been compiled with Unicode support.'); - echo '
'; - __('Recompile PCRE with Unicode support by adding --enable-unicode-properties when configuring'); - echo '

'; - } -?> -getDataSource('default'); - } catch (Exception $e) { - $connected = false; - } -?> -

- isConnected()): - echo ''; - echo __('Cake is able to connect to the database.'); - echo ''; - else: - echo ''; - echo __('Cake is NOT able to connect to the database.'); - echo ''; - endif; - ?> -

- -

-

- -To change its layout, create: APP/views/layouts/default.ctp.
-You can also add some CSS styles for your pages at: APP/webroot/css.'); -?> -

- -

-

- Html->link( - sprintf('%s %s', __('New'), __('CakePHP 1.3 Docs')), - 'http://book.cakephp.org/view/875/x1-3-Collection', - array('target' => '_blank', 'escape' => false) - ); - ?> -

-

- Html->link( - __('The 15 min Blog Tutorial'), - 'http://book.cakephp.org/view/1528/Blog', - array('target' => '_blank', 'escape' => false) - ); - ?> -

- -

-

- -

-

- -

- - diff --git a/cake/tests/cases/libs/all_libs.test.php b/cake/tests/cases/libs/all_libs.test.php deleted file mode 100644 index ba0388850..000000000 --- a/cake/tests/cases/libs/all_libs.test.php +++ /dev/null @@ -1,53 +0,0 @@ -addTestFile(CORE_TEST_CASES . DS . 'basics.test.php'); - $suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'cake_session.test.php'); - $suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'debugger.test.php'); - $suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'file.test.php'); - $suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'folder.test.php'); - $suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'inflector.test.php'); - $suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'log' . DS . 'file_log.test.php'); - $suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'cake_log.test.php'); - $suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'class_registry.test.php'); - $suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'sanitize.test.php'); - $suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'set.test.php'); - $suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'string.test.php'); - $suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'validation.test.php'); - $suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'object_collection.test.php'); - return $suite; - } -} \ No newline at end of file diff --git a/cake/tests/cases/libs/all_tests.test.php b/cake/tests/cases/libs/all_tests.test.php deleted file mode 100644 index f7bdc72d3..000000000 --- a/cake/tests/cases/libs/all_tests.test.php +++ /dev/null @@ -1,61 +0,0 @@ -addTestFile($console . 'all_console_libs.test.php'); - $suite->addTestFile($console . 'all_shells.test.php'); - $suite->addTestFile($console . 'all_tasks.test.php'); - - $suite->addTestFile($path . 'all_behaviors.test.php'); - $suite->addTestFile($path . 'all_cache_engines.test.php'); - $suite->addTestFile($path . 'all_components.test.php'); - $suite->addTestFile($path . 'all_configure.test.php'); - $suite->addTestFile($path . 'all_controllers.test.php'); - $suite->addTestFile($path . 'all_database.test.php'); - $suite->addTestFile($path . 'all_error.test.php'); - $suite->addTestFile($path . 'all_helpers.test.php'); - $suite->addTestFile($path . 'all_libs.test.php'); - $suite->addTestFile($path . 'all_localization.test.php'); - $suite->addTestFile($path . 'all_model.test.php'); - $suite->addTestFile($path . 'all_routing.test.php'); - $suite->addTestFile($path . 'all_socket.test.php'); - $suite->addTestFile($path . 'all_test_suite.test.php');; - $suite->addTestFile($path . 'all_views.test.php'); - $suite->addTestFile($path . 'all_xml.test.php'); - return $suite; - } -} diff --git a/cake/tests/cases/libs/app.test.php b/cake/tests/cases/libs/app.test.php deleted file mode 100644 index 701f32f60..000000000 --- a/cake/tests/cases/libs/app.test.php +++ /dev/null @@ -1,568 +0,0 @@ -assertEqual($expected, $old); - - App::build(array('models' => array('/path/to/models/'))); - - $new = App::path('models'); - - $expected = array( - '/path/to/models/', - APP . 'models' . DS, - APP, - LIBS . 'model' . DS - ); - $this->assertEqual($expected, $new); - - App::build(); //reset defaults - $defaults = App::path('models'); - $this->assertEqual($old, $defaults); - } - -/** - * testBuildWithReset method - * - * @access public - * @return void - */ - function testBuildWithReset() { - $old = App::path('models'); - $expected = array( - APP . 'models' . DS, - APP, - LIBS . 'model' . DS - ); - $this->assertEqual($expected, $old); - - App::build(array('models' => array('/path/to/models/')), true); - - $new = App::path('models'); - - $expected = array( - '/path/to/models/' - ); - $this->assertEqual($expected, $new); - - App::build(); //reset defaults - $defaults = App::path('models'); - $this->assertEqual($old, $defaults); - } - -/** - * testCore method - * - * @access public - * @return void - */ - function testCore() { - $model = App::core('models'); - $this->assertEqual(array(LIBS . 'model' . DS), $model); - - $view = App::core('views'); - $this->assertEqual(array(LIBS . 'view' . DS), $view); - - $controller = App::core('controllers'); - $this->assertEqual(array(LIBS . 'controller' . DS), $controller); - - } - -/** - * testListObjects method - * - * @access public - * @return void - */ - function testListObjects() { - $result = App::objects('class', TEST_CAKE_CORE_INCLUDE_PATH . 'libs', false); - $this->assertTrue(in_array('Xml', $result)); - $this->assertTrue(in_array('Cache', $result)); - $this->assertTrue(in_array('HttpSocket', $result)); - - $result = App::objects('behavior', null, false); - $this->assertTrue(in_array('Tree', $result)); - - $result = App::objects('controller', null, false); - $this->assertTrue(in_array('Pages', $result)); - - $result = App::objects('component', null, false); - $this->assertTrue(in_array('Auth', $result)); - - $result = App::objects('view', null, false); - $this->assertTrue(in_array('Media', $result)); - - $result = App::objects('helper', null, false); - $this->assertTrue(in_array('Html', $result)); - - $result = App::objects('model', null, false); - $notExpected = array('AppModel', 'ModelBehavior', 'ConnectionManager', 'DbAcl', 'Model', 'CakeSchema'); - foreach ($notExpected as $class) { - $this->assertFalse(in_array($class, $result)); - } - - $result = App::objects('file'); - $this->assertFalse($result); - - $result = App::objects('file', 'non_existing_configure'); - $expected = array(); - $this->assertEqual($result, $expected); - - $result = App::objects('NonExistingType'); - $this->assertFalse($result); - - App::build(array( - 'plugins' => array( - TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'libs' . DS - ) - )); - $result = App::objects('plugin', null, false); - $this->assertTrue(in_array('Cache', $result)); - $this->assertTrue(in_array('Log', $result)); - - App::build(); - } - -/** - * Tests listing objects within a plugin - * - * @return void - */ - function testListObjectsInPlugin() { - App::build(array( - 'models' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS), - 'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) - )); - - $oldCache = App::$models; - $result = App::objects('TestPlugin.model'); - $this->assertTrue(in_array('TestPluginPost', $result)); - $this->assertEquals($oldCache, App::$models); - - $result = App::objects('TestPlugin.behavior'); - $this->assertTrue(in_array('TestPluginPersisterOne', $result)); - - $result = App::objects('TestPlugin.helper'); - $expected = array('OtherHelper', 'PluggedHelper', 'TestPluginApp'); - $this->assertEquals($result, $expected); - - $result = App::objects('TestPlugin.component'); - $this->assertTrue(in_array('OtherComponent', $result)); - - $result = App::objects('TestPluginTwo.behavior'); - $this->assertEquals($result, array()); - - $result = App::objects('model', null, false); - $this->assertTrue(in_array('Comment', $result)); - $this->assertTrue(in_array('Post', $result)); - - App::build(); - } - -/** - * test that pluginPath can find paths for plugins. - * - * @return void - */ - function testPluginPath() { - App::build(array( - 'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) - )); - $path = App::pluginPath('test_plugin'); - $expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS; - $this->assertEqual($path, $expected); - - $path = App::pluginPath('TestPlugin'); - $expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS; - $this->assertEqual($path, $expected); - - $path = App::pluginPath('TestPluginTwo'); - $expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin_two' . DS; - $this->assertEqual($path, $expected); - App::build(); - } - -/** - * test that pluginPath can find paths for plugins. - * - * @return void - */ - function testThemePath() { - App::build(array( - 'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS) - )); - $path = App::themePath('test_theme'); - $expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS; - $this->assertEqual($path, $expected); - - $path = App::themePath('TestTheme'); - $expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS; - $this->assertEqual($path, $expected); - - App::build(); - } - -/** - * testClassLoading method - * - * @access public - * @return void - */ - function testClassLoading() { - $file = App::import(); - $this->assertTrue($file); - - $file = App::import('Model', 'Model', false); - $this->assertTrue($file); - $this->assertTrue(class_exists('Model')); - - $file = App::import('Controller', 'Controller', false); - $this->assertTrue($file); - $this->assertTrue(class_exists('Controller')); - - $file = App::import('Component', 'Component', false); - $this->assertTrue($file); - $this->assertTrue(class_exists('Component')); - - $file = App::import('Shell', 'Shell', false); - $this->assertTrue($file); - $this->assertTrue(class_exists('Shell')); - - $file = App::import('Lib', 'config/PhpReader'); - $this->assertTrue($file); - $this->assertTrue(class_exists('PhpReader')); - - $file = App::import('Model', 'SomeRandomModelThatDoesNotExist', false); - $this->assertFalse($file); - - $file = App::import('Model', 'AppModel', false); - $this->assertTrue($file); - $this->assertTrue(class_exists('AppModel')); - - $file = App::import('WrongType', null, true, array(), ''); - $this->assertTrue($file); - - $file = App::import('Model', 'NonExistingPlugin.NonExistingModel', false); - $this->assertFalse($file); - - $file = App::import('Core', 'NonExistingPlugin.NonExistingModel', false); - $this->assertFalse($file); - - $file = App::import('Model', array('NonExistingPlugin.NonExistingModel'), false); - $this->assertFalse($file); - - $file = App::import('Core', array('NonExistingPlugin.NonExistingModel'), false); - $this->assertFalse($file); - - $file = App::import('Core', array('NonExistingPlugin.NonExistingModel.AnotherChild'), false); - $this->assertFalse($file); - - if (!class_exists('AppController')) { - $classes = array_flip(get_declared_classes()); - - $this->assertFalse(isset($classes['PagesController'])); - $this->assertFalse(isset($classes['AppController'])); - - $file = App::import('Controller', 'Pages'); - $this->assertTrue($file); - $this->assertTrue(class_exists('PagesController')); - - $classes = array_flip(get_declared_classes()); - - $this->assertTrue(isset($classes['PagesController'])); - $this->assertTrue(isset($classes['AppController'])); - - $file = App::import('Behavior', 'Containable'); - $this->assertTrue($file); - $this->assertTrue(class_exists('ContainableBehavior')); - - $file = App::import('Component', 'RequestHandler'); - $this->assertTrue($file); - $this->assertTrue(class_exists('RequestHandlerComponent')); - - $file = App::import('Helper', 'Form'); - $this->assertTrue($file); - $this->assertTrue(class_exists('FormHelper')); - - $file = App::import('Model', 'NonExistingModel'); - $this->assertFalse($file); - - $file = App::import('Datasource', 'DboSource'); - $this->assertTrue($file); - $this->assertTrue(class_exists('DboSource')); - } - App::build(); - } - -/** - * test import() with plugins - * - * @return void - */ - function testPluginImporting() { - App::build(array( - 'libs' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'libs' . DS), - 'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) - )); - - $result = App::import('Controller', 'TestPlugin.Tests'); - $this->assertTrue($result); - $this->assertTrue(class_exists('TestPluginAppController')); - $this->assertTrue(class_exists('TestsController')); - - $result = App::import('Lib', 'TestPlugin.TestPluginLibrary'); - $this->assertTrue($result); - $this->assertTrue(class_exists('TestPluginLibrary')); - - $result = App::import('Lib', 'Library'); - $this->assertTrue($result); - $this->assertTrue(class_exists('Library')); - - $result = App::import('Helper', 'TestPlugin.OtherHelper'); - $this->assertTrue($result); - $this->assertTrue(class_exists('OtherHelperHelper')); - - $result = App::import('Helper', 'TestPlugin.TestPluginApp'); - $this->assertTrue($result); - $this->assertTrue(class_exists('TestPluginAppHelper')); - - $result = App::import('Datasource', 'TestPlugin.TestSource'); - $this->assertTrue($result); - $this->assertTrue(class_exists('TestSource')); - - App::build(); - } - -/** - * test that building helper paths actually works. - * - * @return void - * @link http://cakephp.lighthouseapp.com/projects/42648/tickets/410 - */ - function testImportingHelpersFromAlternatePaths() { - App::build(); - $this->assertFalse(class_exists('BananaHelper'), 'BananaHelper exists, cannot test importing it.'); - App::import('Helper', 'Banana'); - $this->assertFalse(class_exists('BananaHelper'), 'BananaHelper was not found because the path does not exist.'); - - App::build(array( - 'helpers' => array( - TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'helpers' . DS - ) - )); - App::build(array('vendors' => array(TEST_CAKE_CORE_INCLUDE_PATH))); - $this->assertFalse(class_exists('BananaHelper'), 'BananaHelper exists, cannot test importing it.'); - App::import('Helper', 'Banana'); - $this->assertTrue(class_exists('BananaHelper'), 'BananaHelper was not loaded.'); - - App::build(); - } - -/** - * testFileLoading method - * - * @access public - * @return void - */ - function testFileLoading () { - $file = App::import('File', 'RealFile', false, array(), TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'config.php'); - $this->assertTrue($file); - - $file = App::import('File', 'NoFile', false, array(), TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'cake' . DS . 'config.php'); - $this->assertFalse($file); - } - -/** - * testFileLoadingWithArray method - * - * @access public - * @return void - */ - function testFileLoadingWithArray() { - $type = array('type' => 'File', 'name' => 'SomeName', 'parent' => false, - 'file' => TEST_CAKE_CORE_INCLUDE_PATH . DS . 'config' . DS . 'config.php'); - $file = App::import($type); - $this->assertTrue($file); - - $type = array('type' => 'File', 'name' => 'NoFile', 'parent' => false, - 'file' => TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'cake' . DS . 'config.php'); - $file = App::import($type); - $this->assertFalse($file); - } - -/** - * testFileLoadingReturnValue method - * - * @access public - * @return void - */ - function testFileLoadingReturnValue () { - $file = App::import('File', 'Name', false, array(), TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'config.php', true); - $this->assertTrue(!empty($file)); - - $this->assertTrue(isset($file['Cake.version'])); - - $type = array('type' => 'File', 'name' => 'OtherName', 'parent' => false, - 'file' => TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'config.php', 'return' => true); - $file = App::import($type); - $this->assertTrue(!empty($file)); - - $this->assertTrue(isset($file['Cake.version'])); - } - -/** - * testLoadingWithSearch method - * - * @access public - * @return void - */ - function testLoadingWithSearch () { - $file = App::import('File', 'NewName', false, array(TEST_CAKE_CORE_INCLUDE_PATH ), 'config.php'); - $this->assertTrue($file); - - $file = App::import('File', 'AnotherNewName', false, array(LIBS), 'config.php'); - $this->assertFalse($file); - } - -/** - * testLoadingWithSearchArray method - * - * @access public - * @return void - */ - function testLoadingWithSearchArray () { - $type = array('type' => 'File', 'name' => 'RandomName', 'parent' => false, 'file' => 'config.php', 'search' => array(TEST_CAKE_CORE_INCLUDE_PATH )); - $file = App::import($type); - $this->assertTrue($file); - - $type = array('type' => 'File', 'name' => 'AnotherRandomName', 'parent' => false, 'file' => 'config.php', 'search' => array(LIBS)); - $file = App::import($type); - $this->assertFalse($file); - } - -/** - * testMultipleLoading method - * - * @access public - * @return void - */ - function testMultipleLoading() { - if (class_exists('I18n', false) || class_exists('CakeSocket', false)) { - $this->markTestSkipped('Cannot test loading of classes that exist.'); - } - $toLoad = array('I18n', 'CakeSocket'); - - $classes = array_flip(get_declared_classes()); - $this->assertFalse(isset($classes['i18n'])); - $this->assertFalse(isset($classes['CakeSocket'])); - - $load = App::import($toLoad); - $this->assertTrue($load); - - $classes = array_flip(get_declared_classes()); - - - $this->assertTrue(isset($classes['I18n'])); - - $load = App::import(array('I18n', 'SomeNotFoundClass', 'CakeSocket')); - $this->assertFalse($load); - - $load = App::import($toLoad); - $this->assertTrue($load); - } - -/** - * This test only works if you have plugins/my_plugin set up. - * plugins/my_plugin/models/my_plugin.php and other_model.php - */ - -/* - function testMultipleLoadingByType() { - $classes = array_flip(get_declared_classes()); - $this->assertFalse(isset($classes['OtherPlugin'])); - $this->assertFalse(isset($classes['MyPlugin'])); - - - $load = App::import('Model', array('MyPlugin.OtherPlugin', 'MyPlugin.MyPlugin')); - $this->assertTrue($load); - - $classes = array_flip(get_declared_classes()); - $this->assertTrue(isset($classes['OtherPlugin'])); - $this->assertTrue(isset($classes['MyPlugin'])); - } -*/ - function testLoadingVendor() { - App::build(array( - 'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), - 'vendors' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'vendors'. DS), - ), true); - - ob_start(); - $result = App::import('Vendor', 'TestPlugin.TestPluginAsset', array('ext' => 'css')); - $text = ob_get_clean(); - $this->assertTrue($result); - $this->assertEqual($text, 'this is the test plugin asset css file'); - - ob_start(); - $result = App::import('Vendor', 'TestAsset', array('ext' => 'css')); - $text = ob_get_clean(); - $this->assertTrue($result); - $this->assertEqual($text, 'this is the test asset css file'); - - $result = App::import('Vendor', 'TestPlugin.SamplePlugin'); - $this->assertTrue($result); - $this->assertTrue(class_exists('SamplePluginClassTestName')); - - $result = App::import('Vendor', 'ConfigureTestVendorSample'); - $this->assertTrue($result); - $this->assertTrue(class_exists('ConfigureTestVendorSample')); - - ob_start(); - $result = App::import('Vendor', 'SomeName', array('file' => 'some.name.php')); - $text = ob_get_clean(); - $this->assertTrue($result); - $this->assertEqual($text, 'This is a file with dot in file name'); - - ob_start(); - $result = App::import('Vendor', 'TestHello', array('file' => 'Test'.DS.'hello.php')); - $text = ob_get_clean(); - $this->assertTrue($result); - $this->assertEqual($text, 'This is the hello.php file in Test directory'); - - ob_start(); - $result = App::import('Vendor', 'MyTest', array('file' => 'Test'.DS.'MyTest.php')); - $text = ob_get_clean(); - $this->assertTrue($result); - $this->assertEqual($text, 'This is the MyTest.php file'); - - ob_start(); - $result = App::import('Vendor', 'Welcome'); - $text = ob_get_clean(); - $this->assertTrue($result); - $this->assertEqual($text, 'This is the welcome.php file in vendors directory'); - - ob_start(); - $result = App::import('Vendor', 'TestPlugin.Welcome'); - $text = ob_get_clean(); - $this->assertTrue($result); - $this->assertEqual($text, 'This is the welcome.php file in test_plugin/vendors directory'); - } -} diff --git a/cake/tests/cases/libs/magic_db.test.php b/cake/tests/cases/libs/magic_db.test.php deleted file mode 100644 index 80586925b..000000000 --- a/cake/tests/cases/libs/magic_db.test.php +++ /dev/null @@ -1,193 +0,0 @@ -Db = new MagicDb(); - } -/** - * MagicDb::analyze should properly detect the file type and output additional info as requested. - * - */ - public function testAnalyze() { - $r = $this->Db->read(MagicDbTestData::get('magic.db')); - $this->assertTrue($r === true); - - $r = $this->Db->analyze(array()); - $this->assertTrue($r === false); - - $r = $this->Db->analyze(WWW_ROOT.'img'.DS.'cake.icon.gif'); - // TODO: Check several serialized file samples for accurate detection - } -/** - * MagicDb::read should properly read MagicDb databases from .php-/.db-files and plain data arguments passed in and return false if the file wasn't found or - * if the readed data did not validate. - * - */ - public function testRead() { - $this->Db->db = array(); - - $r = $this->Db->read(true); - $this->assertTrue($r === false); - $r = $this->Db->read(5); - $this->assertTrue($r === false); - - $this->Db->db = array('a'); - $r = $this->Db->read(array('foo' => 'bar')); - $this->assertTrue($r === false); - $this->assertTrue($this->Db->db === array('a')); - - $magicDb = array('header' => array(), 'database' => array()); - $r = $this->Db->read($magicDb); - $this->assertTrue($r === true); - $this->assertTrue($this->Db->db === $magicDb); - - // @TODO: Test parsing an actual magic.db file - - $r = $this->Db->read('does-not-exist.db'); - $this->assertTrue($r === false); - $this->assertTrue($this->Db->db === $magicDb); - - if (file_exists(VENDORS.'magic.php')) { - $r = $this->Db->read(VENDORS.'magic.php'); - $this->assertTrue($r === true); - $this->assertTrue($this->Db->db === array('header' => array(), 'database' => array())); - } - - $r = $this->Db->read(MagicDbTestData::get('magic.snippet.db')); - $this->assertTrue($r === true); - } -/** - * MagicDb::toArray should either return the MagicDb::db property, or the parsed array data if a magic.db dump is passed in as the first argument - * - */ - public function testToArray() { - $this->Db->db = array(); - - $r = $this->Db->toArray(); - $this->assertTrue($r === array()); - $this->Db->db = array('foo' => 'bar'); - $r = $this->Db->toArray(); - $this->assertTrue($r === array('foo' => 'bar')); - - $r = $this->Db->toArray(array('yeah')); - $this->assertTrue($r === array('yeah')); - - $r = $this->Db->toArray("# FILE_ID DB\r\n# Date:2009-10-10\r\n# Source:xxx.php"); - $this->assertTrue($r === array()); - - $r = $this->Db->toArray('foo'); - $this->assertTrue($r === array()); - - $r = $this->Db->toArray(MagicDbTestData::get('magic.snippet.db')); - $this->assertTrue($r === MagicDbTestData::get('magic.snippet.db.result')); - } -/** - * The MagicDb::validates function should return if the array passed to it or the local db property contains a valid MagicDb record set - * - */ - public function testValidates() { - $r = $this->Db->validates(array()); - $this->assertTrue($r === false); - - $r = $this->Db->validates(array('header' => true, 'database' => true)); - $this->assertTrue($r === false); - $magicDb = array('header' => array(), 'database' => array()); - $r = $this->Db->validates($magicDb); - $this->assertTrue($r === true); - - $this->Db->db = array(); - $r = $this->Db->validates(); - $this->assertTrue($r === false); - - $this->Db->db = $magicDb; - $r = $this->Db->validates(); - $this->assertTrue($r === true); - } -} -/** - * Test data holding object for MagicDb tests - * - * @package cake.tests.cases.libs - */ -/** - * MagicDbTestData class - * - * @package cake.tests.cases.libs - */ -class MagicDbTestData extends Object { -/** - * Base64 encoded data - * - * @var array - * @access public - */ - public $data = array( - 'magic.snippet.db' => 'IyBGSUxFX0lEIERCDQojIERhdGU6MjAwNS0wMy0yOQ0KIyBTb3VyY2U6aHR0cDovL3d3dy5tYWdpY2RiLm9yZw0KDQojIE1hZ2ljIElEIGZvciBXb3JkcGVyZmVjdCBmaWxlcy4NCiMgU3VibWl0dGVkIG9uIDIwMDQtMDItMTQgYnkgQ2FybA0KMAlzdHJpbmcJXFx4RkZXUEMJW2ZpZD0wMDAwMDEwMDgtMDAtMDAwMDAwMTtleHQ9O21pbWU9O11Xb3JkcGVyZmVjdCBoZWxwIGZpbGUNCiY5CWJ5dGUJMHgwMgkNCj4xMCBieXRlCXgJLCB2ZXJzaW9uICVkDQo+MTEJYnl0ZQl4CS4lZA0KDQojIE1hZ2ljIElEIGZvciBXb3JkcGVyZmVjdCBmaWxlcy4NCiMgU3VibWl0dGVkIG9uIDIwMDQtMDItMTQgYnkgQ2FybA0KMAlzdHJpbmcJXFx4RkZXUEMJW2ZpZD0wMDAwMDEwMDgtMDAtMDAwMDAwMTtleHQ9O21pbWU9O11Xb3JkcGVyZmVjdCBhcHBsaWNhdGlvbiByZXNvdXJjZSBsaWJyYXJ5DQomOQlieXRlCTUxCQ0KPjEwCWJ5dGUJeAksIHZlcnNpb24gJWQNCj4xMQlieXRlCXgJLiVkDQoNCiMgTWFnaWMgSUQgZm9yIFdvcmRwZXJmZWN0IGZpbGVzLg0KIyBTdWJtaXR0ZWQgb24gMjAwNC0wMi0xNCBieSBDYXJsDQowCXN0cmluZwlcXHhGRldQQwlbZmlkPTAwMDAwMTAwOC0wMC0wMDAwMDAxO2V4dD07bWltZT07XVdvcmRwZXJmZWN0IGJsb2NrIGZpbGUNCiY5CWJ5dGUJMTMJDQo+MTAJYnl0ZQl4CSwgdmVyc2lvbiAlZA0KPjExCWJ5dGUJeAkuJWQ=', - 'magic.snippet.db.result' => 'YToyOntzOjY6ImhlYWRlciI7YToyOntzOjQ6IkRhdGUiO3M6MTA6IjIwMDUtMDMtMjkiO3M6NjoiU291cmNlIjtzOjIyOiJodHRwOi8vd3d3Lm1hZ2ljZGIub3JnIjt9czo4OiJkYXRhYmFzZSI7YToyOntpOjA7YTo0OntpOjA7YTo0OntpOjA7czoxOiIwIjtpOjE7czo2OiJzdHJpbmciO2k6MjtzOjg6IlxceEZGV1BDIjtpOjM7czo1OToiW2ZpZD0wMDAwMDEwMDgtMDAtMDAwMDAwMTtleHQ9O21pbWU9O11Xb3JkcGVyZmVjdCBoZWxwIGZpbGUiO31pOjE7YTo0OntpOjA7czoyOiImOSI7aToxO3M6NDoiYnl0ZSI7aToyO3M6NDoiMHgwMiI7aTozO3M6MDoiIjt9aToyO2E6Mzp7aTowO3M6ODoiPjEwIGJ5dGUiO2k6MTtzOjE6IngiO2k6MjtzOjEyOiIsIHZlcnNpb24gJWQiO31pOjM7YTo0OntpOjA7czozOiI+MTEiO2k6MTtzOjQ6ImJ5dGUiO2k6MjtzOjE6IngiO2k6MztzOjM6Ii4lZCI7fX1pOjE7YTo0OntpOjA7YTo0OntpOjA7czoxOiIwIjtpOjE7czo2OiJzdHJpbmciO2k6MjtzOjg6IlxceEZGV1BDIjtpOjM7czo3ODoiW2ZpZD0wMDAwMDEwMDgtMDAtMDAwMDAwMTtleHQ9O21pbWU9O11Xb3JkcGVyZmVjdCBhcHBsaWNhdGlvbiByZXNvdXJjZSBsaWJyYXJ5Ijt9aToxO2E6NDp7aTowO3M6MjoiJjkiO2k6MTtzOjQ6ImJ5dGUiO2k6MjtzOjI6IjUxIjtpOjM7czowOiIiO31pOjI7YTo0OntpOjA7czozOiI+MTAiO2k6MTtzOjQ6ImJ5dGUiO2k6MjtzOjE6IngiO2k6MztzOjEyOiIsIHZlcnNpb24gJWQiO31pOjM7YTo0OntpOjA7czozOiI+MTEiO2k6MTtzOjQ6ImJ5dGUiO2k6MjtzOjE6IngiO2k6MztzOjM6Ii4lZCI7fX19fQ==', - 'magic.db' => '# FILE_ID DB
# Date:2005-03-29
# Source:http://www.magicdb.org

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect help file
&9	byte	0x02	
>10 byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect application resource library
&9	byte	51	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect block file
&9	byte	13	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect column block
&9	byte	15	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect dictionary file
&9	byte	0x0B	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect dictionary rules file
&9	byte	34	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect external spell code module file
&9	byte	46	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect external spell dictionary file
&9	byte	47	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect Graphics screen driver file
&9	byte	26	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect hyphenation code module file
&9	byte	23	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect hyphenation data module file
&9	byte	24	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect hyphenation lex module
&9	byte	27	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect installation information file
&9	byte	41	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect keyboard definition file
&9	byte	0x03	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect macro data file
&9	byte	0x01	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect macro resource file
&9	byte	25	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect printer Q codes (used by VAX/DG)
&9	byte	28	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect rectangular block file
&9	byte	14	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect spell code module rules file
&9	byte	33	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect spell code module word list
&9	byte	29	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect thesarus file
&9	byte	12	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect VAX keyboard definition file
&9	byte	0x04	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000ALL;ext=all;mime=;]Wordperfect printer resource file
&9	byte	19	
>10	byte	x	, version %d
>11	byte	x	.%d

# Submitted on 2004-02-11 by Carl
0	string	RIFF	[fid=000001001-00-0000CON;ext=con;mime=;]Microsoft Animated cursor, little-endian
&8	string	ACON	

# Submitted on 2004-02-11 by Carl
0	string	RIFX	[fid=000001001-00-0000CON;ext=con;mime=;]Microsoft Animated cursor, big-endian
&8	string	ACON	

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000DOC;ext=doc;mime=;]Macintosh Wordperfect document file
&9	byte	44	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000DOC;ext=doc;mime=;]VAX Wordperfect document file
&9	byte	45	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000DRS;ext=drs;mime=;]Wordperfect display resource file
&9	byte	20	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000FIL;ext=fil;mime=;]Wordperfect overlay file
&9	byte	21	
>10	byte	x	, version %d
>11	byte	x	.%d

# Submitted on 2004-02-14 by Carl
0	string	PMCC	[fid=000001001-00-0000GRP;ext=grp;mime=;]Microsoft windows group file

# Submitted on 2004-02-14 by Carl
0	beshort	0xE310	[fid=000001007-00-000INFO;ext=info;mime=;]Amiga shortcut / icon file

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000INS;ext=ins;mime=;]Wordperfect installation information file
&9	byte	43	
>10	byte	x	, version %d
>11	byte	x	.%d

# Submitted on 2004-02-14 by Carl
0	lelong	0x0000004C	[fid=000001001-00-0000LNK;ext=lnk;mime=;]Microsoft Windows shortcut file
&4	string	\\x01\\x14\\x02	

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000PRS;ext=prs;mime=;]Wordperfect printer resource file
&9	byte	16	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000QRS;ext=qrs;mime=;]Wordperfect 5.1 equation resource file
&9	byte	30	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000SET;ext=set;mime=;]Wordperfect setup data
&9	byte	17	
>10	byte	x	, version %d
>11	byte	x	.%d

# Submitted on 2004-02-08 by Carl
0	string	RIFF	[fid=000001001-0E-0000PAL;ext=pal,riff;mime=;]Microsoft Palette, little-endian
&8	string	PAL	

# Submitted on 2004-02-08 by Carl
0	string	RIFX	[fid=000001001-0E-0000PAL;ext=pal,rifx;mime=;]Microsoft Palette, big-endian
&8	string	PAL	

# Submitted on 2004-03-04 by Carl
0	string	DOS	[fid=000001007-0F-0000ADF;ext=adf;mime=;]AmigaOS File system
&3	byte&0xf8	0	
>3	byte&1	0	, OFS
>3	byte&1	1	, FFS

# Submitted on 2004-05-11 by Carl
0	belong	0x03F3	[fid=000001007-10-LIBRARY;ext=,library;mime=;]Amiga Classic executable file (680x0 family)

# Submitted on 2004-02-11 by Carl
0	string	\\x7fELF	[fid=000000003-10-000000O;ext=,o,so,out;mime=;]Executable linkable file (ELF)
&4	byte	=1	, 32-bit

# Submitted on 2004-02-11 by Carl
0	string	\\x7fELF	[fid=000000003-10-000000O;ext=,o,so,out;mime=;]Executable linkable file (ELF)
&4	byte	=2	, 64-bit

# Submitted on 2004-04-14 by Carl
0	string	MZ	[fid=000001001-10-0000EXE;ext=exe,dll;mime=;]New executable file
&0x18	leshort	>0x3F	
&(60.l)	string	NE	

# Submitted on 2004-04-14 by Carl
0	string	ZM	[fid=000001001-10-0000EXE;ext=exe,dll;mime=;]New executable file
&0x18	leshort	>0x3F	
&(60.l)	string	NE	

# Submitted on 2004-04-14 by Carl
0	string	MZ	[fid=000001001-10-0000EXE;ext=exe,dll;mime=;]Microsoft Windows 3.x New Executable file
&0x18	leshort	>0x3F	
&(60.l)	string	NE	
&(60.l+54)	byte	0x02	

# Submitted on 2004-04-14 by Carl
0	string	ZM	[fid=000001001-10-0000EXE;ext=exe,dll;mime=;]Microsoft Windows 3.x New Executable file
&0x18	leshort	>0x3F	
&(60.l)	string	NE	
&(60.l+54)	byte	0x02	

# Submitted on 2004-04-14 by Carl
0	string	MZ	[fid=000001009-10-0000EXE;ext=exe,dll;mime=;]IBM OS/2 New Executable file
&0x18	leshort	>0x3F	
&(60.l)	string	NE	
&(60.l+54)	byte	0x01	

# Submitted on 2004-04-14 by Carl
0	string	ZM	[fid=000001009-10-0000EXE;ext=exe,dll;mime=;]IBM OS/2 New Executable file
&0x18	leshort	>0x3F	
&(60.l)	string	NE	
&(60.l+54)	byte	0x01	

# Magic ID for Microsoft Windows files.
# Submitted on 2004-04-13 by Carl
0	string	MZ	[fid=000001001-10-0000EXE;ext=exe,dll;mime=;]Microsoft Windows NT Portable Executable file
&0x18	leshort	0x40	
&(60.l)	string	PE\\x00\\x00	

# Magic ID for Microsoft Windows files.
# Submitted on 2004-04-13 by Carl
0	string	ZM	[fid=000001001-10-0000EXE;ext=exe,dll;mime=;]Microsoft Windows NT Portable Executable file
&0x18	leshort	0x40	
&(60.l)	string	PE\\x00\\x00	

# Magic ID for Microsoft Windows,DOS4GW files.
# Submitted on 2004-04-14 by Carl
0	string	MZ	[fid=000001001-10-0000EXE;ext=exe,dll,drv;mime=;]Microsoft Windows Linear executable
&0x18	leshort	>0x3F	
&(60.l)	string	LE	

# Magic ID for Microsoft Windows,DOS4GW files.
# Submitted on 2004-04-14 by Carl
0	string	ZM	[fid=000001001-10-0000EXE;ext=exe,dll,drv;mime=;]Microsoft Windows Linear executable
&0x18	leshort	>0x3F	
&(60.l)	string	LE	

# Magic ID for OS/2,DOS4GW files.
# Submitted on 2004-04-14 by Carl
0	string	MZ	[fid=000001009-10-0000EXE;ext=exe,dll,drv;mime=;]OS/2 Linear executable
&0x18	leshort	>0x3F	
&(60.l)	string	LX	

# Magic ID for OS/2,DOS4GW files.
# Submitted on 2004-04-14 by Carl
0	string	ZM	[fid=000001009-10-0000EXE;ext=exe,dll,drv;mime=;]OS/2 Linear executable
&0x18	leshort	>0x3F	
&(60.l)	string	LX	

# Submitted on 2004-07-30 by Carl
0	string	MSFT	[fid=000001001-10-0000TLB;ext=tlb;mime=;]Microsoft component type library

# Submitted on 2004-05-11 by Carl
0	beshort	0x601A	[fid=000001006-10-0000TTP;ext=ttp,gem,prg;mime=;]Atari MiNT executable/object file
&0x12	string	MiNT	

# Submitted on 2004-05-11 by Carl
0	beshort	0x601A	[fid=000001006-10-0000TTP;ext=ttp,gem,prg;mime=;]Atari TOS executable/object file
&0x12	belong	0x0000	

# Magic ID for Virtual Pascal files.
# Submitted on 2004-07-30 by Carl
0	string	VPI	[fid=000000000-10-0000VPI;ext=vpi;mime=;]Virtual pascal unit file
&0x03	byte	>47	
&0x03	byte	<58	

# Magic ID for Java compiler files.
# Submitted on 2004-05-11 by Carl
0	belong	0xCAFEBABE	[fid=000001011-11-00CLASS;ext=class;mime=;]Javal virtual machine class file
>6	beshort	x	, version %d
>4	beshort	x	.%d

# Magic ID for Borland Delphi files.
# Submitted on 2004-07-30 by Carl
0	string	PKG	[fid=000001005-11-0000DCP;ext=dcp;mime=;]Borland Delphi compiled package code file
&0x03	byte	>47	
&0x03	byte	<58	

# Magic ID for Borland Delphi files.
# Submitted on 2004-07-30 by Carl
0	string	\\xDF\\x00\\x00\\x0F	[fid=000001005-11-0000DCU;ext=dcu;mime=;]Borland Delphi code unit file

# Magic ID for Turbo Pascal files.
# Submitted on 2004-07-29 by Carl
0	string	TPU9	[fid=000001005-11-0000TPU;ext=tpu;mime=;]Turbo Pascal 6.0 code unit file

# Magic ID for Turbo Pascal, Borland Pascal files.
# Submitted on 2004-07-29 by Carl
0	string	TPUQ	[fid=000001005-11-0000TPU;ext=tpu,tpp,tpw;mime=;]Borland Pascal 7.0 code unit file

# Submitted on 2004-02-15 by Carl
2	string	ADLIB-	[fid=000001016-20-0000BNK;ext=bnk;mime=;]Adlib FM instrument bank file
>0	byte	x	, version %d
>1	byte	x	.%d

# Submitted on 2004-02-16 by Carl
0	string	IBK\\x1A	[fid=000001013-20-0000IBK;ext=ibk;mime=;]Creative Labs FM instrument bank file

# Magic ID for Microsoft Instrument Definition file files.
# Submitted on 2004-03-04 by Carl
0	string	RIFF	[fid=000001001-20-0000IDF;ext=idf;mime=;]Microsoft instrument definition file, little-endian
&8	string	IDF\\ 	

# Magic ID for Microsoft Instrument Definition file files.
# Submitted on 2004-03-04 by Carl
0	string	RIFX	[fid=000001001-20-0000IDF;ext=idf;mime=;]Microsoft instrument definition file, big-endian
&8	string	IDF\\ 	

# Magic ID for Digitrakker files.
# Submitted on 2004-03-04 by Carl
0	string	DIST	[fid=000100088-20-0000IST;ext=ist;mime=;]Digitrakker Instrument file
&4	byte	<2	

# Magic ID for Impulse tracker files.
# Submitted on 2004-03-04 by Carl
0	string	IMPI	[fid=000100032-20-0000ITI;ext=iti;mime=;]Impulse tracker instrument file
>0x20	string	x	[title=%.26s]

# Magic ID for Madtracker files.
# Submitted on 2004-03-05 by Carl
0	string	MI21	[fid=000100091-20-0000MTI;ext=mti;mime=;]Madtracker instrument file

# Magic ID for Gravis Ultrasound files.
# Submitted on 2004-02-15 by Carl
0	string	GF1PATCH100\\0ID#000002\\0	[fid=000001018-20-0000PAT;ext=pat;mime=;]Gravis Ultrasound Patch (old instrument data)

# Magic ID for Gravis Ultrasound files.
# Submitted on 2004-02-15 by Carl
0	string	GF1PATCH110\\0ID#000002\\0	[fid=000001018-20-0000PAT;ext=pat;mime=;]Gravis Ultrasound Patch (instrument data)

# Submitted on 2004-02-15 by Carl
0	string	SBI\\x1A	[fid=000001013-20-0000SBI;ext=sbi;mime=;]Creative Labs FM instrument data file
>4	string	>0	[title=%.32s]

# Magic ID for Sidplay files.
# Submitted on 2004-03-05 by Carl
0	string	SIDPLAY\\ INFOFILE	[fid=000000000-20-0000SID;ext=sid;mime=;]SIDPlayer music file

# Magic ID for Fasttracker 2.0 files.
# Submitted on 2004-02-15 by Carl
0	string	Extended\\ Instrument:\\ 	[fid=000100026-20-00000XI;ext=xi;mime=;]FastTracker II instrument file

# Submitted on 2004-02-15 by Carl
0	string	RIFF	[fid=000001001-21-0000000;ext=;mime=;]MIDI music file, little-endian
&8	string	RMID	

# Submitted on 2004-02-15 by Carl
0	string	RIFX	[fid=000001001-21-0000000;ext=;mime=;]MIDI music file, big-endian
&8	string	RMID	

# Magic ID for Abyss\'s highest experience (AHX) files.
# Submitted on 2004-02-15 by Carl
0	string	THX	[fid=000100029-21-0000AHX;ext=ahx;mime=;]AHX module music file

# Magic ID for Amusic files.
# Submitted on 2004-02-15 by Carl
1062	string	\\x3c\\x6f\\xef\\x51\\x55\\xEE\\x52\\x6F\\x52	[fid=000100034-21-0000AMD;ext=amd;mime=;]Amusic Adlib tracker music file
>0	string	>\\x00	[title=%.23s]
>24	string	>\\0	[creator=%.24s]

# Magic ID for Velvet Studio files.
# Submitted on 2004-02-15 by Carl
0	string	AMShdr\\x1a	[fid=000001276-21-0000AMS;ext=ams;mime=;]Velvet Studio module music file

# Magic ID for Audio visual research files.
# Submitted on 2004-03-04 by Carl
0	string	2BIT	[fid=000001301-21-0000AVR;ext=avr;mime=;]Audio visual research audio file
>4	string	x	[title=%.8s]

# Magic ID for Soundmon files.
# Submitted on 2004-02-15 by Carl
26	string	V.2	[fid=000100028-21-00000BP;ext=bp;mime=;]Soundmon module music file, version 2.x
>0	string	>\\0	[title=%.26s]

# Magic ID for Soundmon files.
# Submitted on 2004-02-15 by Carl
26	string	V.3	[fid=000100028-21-0000BP3;ext=bp3;mime=;]Soundmon module music file, version 3.x
>0	string	>\\0	[title=%.26s]

# Submitted on 2004-02-15 by Carl
0	string	CTMF	[fid=000001013-21-0000CMF;ext=cmf;mime=;]Creative Labs music file
>4	byte	x	, version %d
>5	byte	x	.%d

# Magic ID for Digibooster files.
# Submitted on 2004-03-04 by Carl
0	string	DIGI Booster module\\0	[fid=000001302-21-000DIGI;ext=digi;mime=;]Digibooster music file
>610	string	x	[title=%.32s]

# Magic ID for Delusion Xtracker files.
# Submitted on 2004-02-15 by Carl
0	string	DDMF	[fid=000000000-21-0000DMF;ext=dmf;mime=;]Delusion tracker module music file
>4	byte	x	, version %d.0
>13	string	>\\0	[title=%.30s]
>43	string	>\\0	[creator=%.20s]

# Magic ID for DOS Sound interface kit (DSIK) files.
# Submitted on 2004-02-15 by Carl
0	string	RIFF	[fid=000000000-21-0000DSM;ext=dsm;mime=;]DOS Sound interface kit module music file
&8	string	DSMF	

# Magic ID for Edlib files.
# Submitted on 2004-03-07 by Carl
0	string	\\x00\\x06\\xFE\\xFD	[fid=000100027-21-0000EDL;ext=edl;mime=;]Edlib FM tracker music file

# Magic ID for Quadra Composer files.
# Submitted on 2004-03-04 by Carl
0	string	FORM	[fid=000100085-21-0000EMD;ext=emd;mime=;]Enhanced module music file (IFF)
&8	string	EMOD	

# Magic ID for Farandole composer files.
# Submitted on 2004-02-15 by Carl
0	string	FAR\\xFE	[fid=000100087-21-0000FAR;ext=far;mime=;]Farandole composer module music file
>4	string	>\\0	[title=%.40s]

# Magic ID for Funktracker Gold files.
# Submitted on 2004-03-04 by Carl
0	string	Funk	[fid=000100086-21-0000FNK;ext=fnk;mime=;]Funktracker Gold music file

# Magic ID for Bells, Whistles, and Sound Boards files.
# Submitted on 2004-02-16 by Carl
0	string	GDM\\xFE	[fid=000001280-21-0000GDM;ext=gdm;mime=;]General DigiMusic module music file
>4	string	>\\x00	[title=%.32s]

# Magic ID for Graoumf Tracker 2 files.
# Submitted on 2004-02-15 by Carl
0	string	GT2	[fid=000100031-21-0000GT2;ext=gt2;mime=;]Graoumf Tracker module music file

# Magic ID for Imago Morpheus files.
# Submitted on 2004-03-04 by Carl
0x3C	string	IM10	[fid=000001279-21-0000IMF;ext=imf;mime=;]Imago morpheus music file, 32 channels
>0	string	x	[title=%.31s]

# Magic ID for Impulse tracker files.
# Submitted on 2004-02-15 by Carl
0	string	IMPM	[fid=000100032-21-00000IT;ext=it;mime=;]Impulse Tracker module music file
>4	string	>\\x00	[title=%.26s]

# Magic ID for Jamcracker files.
# Submitted on 2004-03-04 by Carl
0	string	BeEp	[fid=000000000-21-0000JAM;ext=jam;mime=;]Jamcracker tracker module music file

# Magic ID for Liquid tracker files.
# Submitted on 2004-03-04 by Carl
0	string	Liquid Module:	[fid=000100090-21-0000LIQ;ext=liq;mime=;]Liquid tracker module music file
&0x40	byte	0x1A	
>0x0E	string	>\\0	[title=%.30s]
>0x2c	string	>\\0	[creator=%.20s]

# Magic ID for Digitrakker files.
# Submitted on 2004-03-04 by Carl
0	string	DMDL	[fid=000100088-21-0000MDL;ext=mdl;mime=;]Digitrakker module music file
&4	byte	<0x12	

# Magic ID for MED Soundstudio / OctaMED files.
# Submitted on 2004-02-15 by Carl
0	string	MMD0	[fid=000001278-21-0000MED;ext=med;mime=;]Octamed tracker module music file

# Magic ID for MED Soundstudio / OctaMED files.
# Submitted on 2004-02-15 by Carl
0	string	MMD1	[fid=000001278-21-0000MED;ext=med;mime=;]Octamed Pro Tracker module music file

# Magic ID for MED Soundstudio / OctaMED files.
# Submitted on 2004-02-15 by Carl
0	string	MMD2	[fid=000001278-21-0000MED;ext=med;mime=;]Octamed Pro Tracker module music file

# Magic ID for MED Soundstudio / OctaMED files.
# Submitted on 2004-02-15 by Carl
0	string	MMD3	[fid=000001278-21-0000MED;ext=med;mime=;]Octamed Sound Studio module music file

# Magic ID for Musicline files.
# Submitted on 2004-03-05 by Carl
0	string	MLEDMODL	[fid=000001304-21-00000ML;ext=ml;mime=;]Musicline module music file

# Magic ID for Protracker files.
# Submitted on 2004-02-15 by Carl
1080	string	M!K!	[fid=000100022-21-0000MOD;ext=mod;mime=;]Protracker 2.3 module music file
>0	string	>\\0	[title=%.20s]

# Magic ID for Protracker files.
# Submitted on 2004-02-15 by Carl
1080	string	M.K.	[fid=000100022-21-0000MOD;ext=mod;mime=;]Protracker module music file
>0	string	>\\0	[title=%.20s]

# Magic ID for Protracker files.
# Submitted on 2004-03-05 by Carl
0	string	FORM	[fid=000100022-21-0000MOD;ext=mod;mime=;]Protracker module music file, version 3.x
&8	string	MODL	

# Magic ID for Startrekker files.
# Submitted on 2004-02-15 by Carl
1080	string	FLT4	[fid=000100024-21-0000MOD;ext=mod;mime=;]Startrekker module music file, 4 channels
>0	string	>\\0	[title=%.20s]

# Magic ID for Startrekker files.
# Submitted on 2004-02-15 by Carl
1080	string	FLT8	[fid=000100024-21-0000MOD;ext=mod;mime=;]Startrekker module music file, 8 channels
>0	string	>\\0	[title=%.20s]

# Magic ID for Fasttracker files.
# Submitted on 2004-02-15 by Carl
1080	string	6CHN	[fid=000001275-21-0000MOD;ext=mod;mime=;]Fasttracker module music file, 6 channels
>0	string	>\\0	[title=%.20s]

# Magic ID for Fasttracker files.
# Submitted on 2004-02-15 by Carl
1080	string	8CHN	[fid=000001275-21-0000MOD;ext=mod;mime=;]Fasttracker module music file, 6 channels
>0	string	>\\0	[title=%.20s]

# Magic ID for Madtracker files.
# Submitted on 2004-03-05 by Carl
0	string	MT20	[fid=000100091-21-0000MT2;ext=mt2;mime=;]Madtracker module music file
>42	string	x	[title=%.64s]
>112	leshort	x	[chn=%d]

# Magic ID for Multitracker Module editor files.
# Submitted on 2004-02-15 by Carl
0	string	MTM	[fid=000100089-21-0000MTM;ext=mtm;mime=;]MultiTracker module music file
>4	string	>\\x00	[title=%.20s]

# Magic ID for Madtracker files.
# Submitted on 2004-03-05 by Carl
0	string	MTP2	[fid=000100091-21-0000MTP;ext=mtp;mime=;]Madtracker pattern file

# Magic ID for A/NES files.
# Submitted on 2004-03-07 by Carl
0	string	NESA	[fid=000100094-21-0000NSA;ext=nsa;mime=;]A/NES ripped audio file

# Submitted on 2004-03-07 by Carl
0	string	NESM\\x1A	[fid=000100093-21-0000NSF;ext=nsf;mime=;]NES ripped audio file
>5	byte	x	, version %d.0
>0x0E	string	x	[title=%.32s]
>0x2E	string	x	[creator=%.32s]

# Magic ID for Noisetracker files.
# Submitted on 2004-02-15 by Carl
1080	string	M&K!	[fid=000100023-21-0000NST;ext=nst;mime=;]Noisetracker module music file
>0	string	>\\0	[title=%.20s]

# Magic ID for Oktalyzer tracker files.
# Submitted on 2004-02-15 by Carl
0	string	OKTASONG	[fid=000100030-21-0000OKT;ext=okt;mime=;]Oktalyzer module music file

# Magic ID for SBStudio sound files.
# Submitted on 2004-03-05 by Carl
0	string	PACG	[fid=000100020-21-0000PAC;ext=pac;mime=;]SBStudio module music file

# Magic ID for Polytracker files.
# Submitted on 2004-02-15 by Carl
44	string	PTMF	[fid=000000000-21-0000PTM;ext=ptm;mime=;]Poly Tracker module music file
>38	leshort	>0	[chn=%d]
>0	string	>\\0	[title=%.28s]

# Magic ID for Reality Adlib tracker files.
# Submitted on 2004-02-15 by Carl
0	string	RAD\\ by	[fid=000000000-21-0000RAD;ext=rad;mime=;]Reality Adlib tracker music file

# Submitted on 2004-02-15 by Carl
0	string	RIFF	[fid=000000000-21-0000RMI;ext=rmi;mime=application/vnd.music-niff;]Song notation data file, little-endian
&8	string	NIFF	

# Submitted on 2004-02-15 by Carl
0	string	RIFX	[fid=000000000-21-0000RMI;ext=rmi;mime=application/vnd.music-niff;]Song notation data file, big-endian
&8	string	NIFF	

# Magic ID for Adlib Visual Composer files.
# Submitted on 2004-02-15 by Carl
0	leshort	0x0000	[fid=000001016-21-0000ROL;ext=rol;mime=;]Adlib music file
&2	leshort	0x0004	

# Magic ID for Screamtracker 3 files.
# Submitted on 2004-02-15 by Carl
0x2C	string	SCRM	[fid=000100025-21-0000S3M;ext=s3m;mime=;]Scream tracker module music file
>0x2A	leshort	>0	, version %d.0
>0	string	>\\0	[title=%.28s]

# Magic ID for Surprise! Adlib Tracker files.
# Submitted on 2004-02-15 by Carl
0	string	SAdT	[fid=000100021-21-0000SA2;ext=sa2;mime=;]Surprise Productions Adlib tracker music file
>4	byte	x	, version 0.%d

# Magic ID for SoundFX files.
# Submitted on 2004-02-15 by Carl
60	string	SONG	[fid=000001277-21-0000SFX;ext=sfx;mime=;]SoundFX Tracker module music file

# Magic ID for PlaySID, Sidplay files.
# Submitted on 2004-03-05 by Carl
0	string	PSID	[fid=000000000-21-0000SID;ext=sid;mime=;]PlaySID music file
>16	string	x	[title=%.20s]
>36	string	x	[creator=%.20s]

# Submitted on 2004-02-15 by Carl
0	string	MThd	[fid=000001017-21-0000SMF;ext=smf,midi;mime=;]Standard MIDI music file
>10	beshort	>0	[chn=%d]

# Submitted on 2004-03-05 by Carl
0	string	FORM	[fid=000001010-21-000SMUS;ext=smus,mus;mime=;]IFF Simple Musical Score file
&8	string	SMUS	

# Magic ID for Sndtool2,nezplay files.
# Submitted on 2004-03-05 by Carl
0	string	SND\\x1A	[fid=000000000-21-0000SND;ext=snd;mime=;]Nintendo Entertainment System audio file (NES)
&4	byte	3	, version %3.0
>5	byte	x	[chn=%d]

# Magic ID for iNES files.
# Submitted on 2004-03-05 by Carl
0	string	SND\\x1A	[fid=000100092-21-0000SND;ext=snd;mime=;]iNES emulator audio file
&4	byte	1	, version %1.0
>5	byte	x	[chn=%d]

# Magic ID for STMIK files.
# Submitted on 2004-02-15 by Carl
0x15	string	Scream!	[fid=000100025-21-0000STX;ext=stx;mime=;]STMIK module music file

# Magic ID for The Final Musicsystem eXtended (TFMX) files.
# Submitted on 2004-03-07 by Carl
0	string	TFMX-SONG\\ 	[fid=000100096-21-0000TFX;ext=tfx,tfmx;mime=;]TFMX tracker module music file

# Magic ID for Ultra Tracker files.
# Submitted on 2004-03-07 by Carl
0	string	MAS_UTrack_V00	[fid=000100097-21-0000ULT;ext=ult;mime=;]Ultra Tracker module music file
>15	string	x	[title=%.32s]

# Magic ID for APlayer files.
# Submitted on 2004-02-15 by Carl
0	string	APUN\\x01	[fid=000000000-21-0000UNI;ext=uni;mime=;]APlayer module music file

# Magic ID for Mikmod files.
# Submitted on 2004-02-15 by Carl
0	string	UN0	[fid=000000000-21-0000UNI;ext=uni;mime=;]Mikmod module music file
>4	byte	x	[chn=%d]

# Magic ID for Fasttracker 2.0 files.
# Submitted on 2004-02-15 by Carl
0	string	Extended\\ Module:\\ 	[fid=000100026-21-00000XM;ext=xm;mime=;]FastTracker II module music file
>59	byte	x	, version %d
>58	byte	x	.0%d
>17	string	x	[title=%.20s]

# Submitted on 2004-02-11 by Carl
0	string	FORM	[fid=000001010-22-0008SVX;ext=8svx;mime=;]Amiga Sampled audio file
&8	string	8SVX	

# Submitted on 2004-02-11 by Carl
0	string	FORM	[fid=000001002-22-000AIFC;ext=aifc,aif;mime=;]Audio Compressed Interchange File Format
&8	string	AIFC	

# Submitted on 2004-02-11 by Carl
0	string	FORM	[fid=000001002-22-000AIFF;ext=aiff,aif;mime=;]Audio Interchange File Format
&8	string	AIFF	

# Magic ID for MonkeyAudio software files.
# Submitted on 2004-05-20 by Carl
0	string	MAC\\ 	[fid=000100120-22-0000APE;ext=ape;mime=;]MonkeyAudio compressed audio file

# Submitted on 2004-02-11 by Carl
0	string	.snd	[fid=000001011-22-00000AU;ext=au,snd;mime=;]Sun / NeXt sampled audio file
>16	belong	>0	[freq=%d]

# Magic ID for Sppack files.
# Submitted on 2004-03-04 by Carl
252	beshort	0x40C3	[fid=000001019-22-000000D;ext=d;mime=;]Sppack audio sample file
&254	beshort	0xFC0E	

# Magic ID for Flac files.
# Submitted on 2004-03-08 by Carl
0	string	fLaC	[fid=000100098-22-000FLAC;ext=flac;mime=;]Free Lossless Audio Codec raw audio file

# Magic ID for Farandole Composer files.
# Submitted on 2004-03-04 by Carl
0	string	FSM\\xFE	[fid=000100087-22-0000FSM;ext=fsm;mime=;]Farandole composer audio sample file
>4	string	x	[title=%.32s]

# Magic ID for MAUD files.
# Submitted on 2004-03-04 by Carl
0	string	FORM	[fid=000000000-22-000MAUD;ext=maud;mime=;]MAUD audio sample file
&4	string	MAUD	

# Submitted on 2004-05-04 by Carl
0	beshort&0xFFE0	0xffe0	[fid=000000001-22-0011172;ext=mp1,mp2,mp3;mime=audio/mpeg;]MP3 Audio stream file
&Z128	string	TAG	
>Z125	string	x	[title=%.30s]
>Z95	string	x	[creator=%.30s]

# Submitted on 2004-05-04 by Carl
0	string	ID3	[fid=000000001-22-0011172;ext=mp1,mp2,mp3;mime=audio/mpeg;]MP3 Audio stream file

# Submitted on 2004-02-11 by Carl
0	string	\\0\\001\\243\\144	[fid=000001014-22-00000SF;ext=sf;mime=;]IRCAM audio sample file

# Submitted on 2004-02-11 by Carl
0	string	\\0\\002\\243\\144	[fid=000001014-22-00000SF;ext=sf;mime=;]IRCAM audio sample file, little-endian

# Submitted on 2004-02-11 by Carl
0	string	\\0\\003\\243\\144	[fid=000001014-22-00000SF;ext=sf;mime=;]IRCAM audio sample file, big-endian

# Submitted on 2004-02-11 by Carl
0	string	\\144\\243\\001\\0	[fid=000001014-22-00000SF;ext=sf;mime=;]IRCAM audio sample file

# Submitted on 2004-02-11 by Carl
0	string	\\144\\243\\002\\0	[fid=000001014-22-00000SF;ext=sf;mime=;]IRCAM audio sample file, big-endian

# Submitted on 2004-02-11 by Carl
0	string	\\144\\243\\003\\0	[fid=000001014-22-00000SF;ext=sf;mime=;]IRCAM audio sample file, little-endian

# Submitted on 2004-02-11 by Carl
0	string	\\144\\243\\004\\0	[fid=000001014-22-00000SF;ext=sf;mime=;]IRCAM audio sample file, big-endian

# Magic ID for Screamtracker files.
# Submitted on 2004-03-05 by Carl
0x4C	string	SCRS	[fid=000100025-22-0000SMP;ext=smp;mime=;]Screamtracker audio sample
>0x30	string	x	[title=%.30s]

# Magic ID for SoundTool files.
# Submitted on 2004-03-07 by Carl
0	string	SOUND\\x1A	[fid=000100095-22-0000SND;ext=snd;mime=;]Sound tool audio data file
>14	leshort	x	[freq=%d]

# Magic ID for SBStudio files.
# Submitted on 2004-02-11 by Carl
0	string	SND\\ 	[fid=000100020-22-0000SOU;ext=sou;mime=;]SBStudio sampled audio file

# Submitted on 2004-05-18 by Carl
0	string	Speex	[fid=000000000-22-00SPEEX;ext=speex;mime=;]Speex Lossy Audio Codec raw audio file

# Magic ID for Sound Blaster SDK files.
# Submitted on 2004-02-11 by Carl
0	string	Creative\\ Voice\\ File\\x1A	[fid=000001013-22-0000VOC;ext=voc;mime=;]Creative Voice audio file

# Submitted on 2004-05-18 by Carl
0	string	vorbis	[fid=000000000-22-0VORBIS;ext=vorbis;mime=;]Vorbis Lossy Audio Codec raw audio file

# Submitted on 2004-02-11 by Carl
0	string	RIFF	[fid=000001001-22-0000WAV;ext=wav;mime=;]Microsoft Waveform Audio file, little-endian
&8	string	WAVE	
>24	lelong	>0	[freq=%d]

# Submitted on 2004-02-11 by Carl
0	string	RIFX	[fid=000001001-22-0000WAV;ext=wav;mime=;]Microsoft Waveform Audio file, big-endian
&8	string	WAVE	
>24	belong	>0	[freq=%d]

# Magic ID for Maya files.
# Submitted on 2004-04-12 by Carl
0	string	FOR4	[fid=000001312-31-0000000;ext=;mime=;]Maya image file
&8	string	CIMG	

# Magic ID for Maya files.
# Submitted on 2004-04-12 by Carl
0	string	FOR8	[fid=000001312-31-0000000;ext=;mime=;]Maya image file
&8	string	CIMG	

# Magic ID for AOL files.
# Submitted on 2004-04-02 by Carl
0	string	JG\\x04\\x0E	[fid=000001023-31-0000ART;ext=art;mime=;]AOL/Johnson-Grace image file, version 2.0
>0x0D	leshort	x	[res=%dx
>0x0F	leshort	x	%d]

# Magic ID for BMF image compressor files.
# Submitted on 2004-02-27 by Carl
0	string	\\x81\\x8A0	[fid=000100048-31-0000BMF;ext=bmf;mime=;]BMF image file
>2	string	x	, version %.1s
>3	string	x	.%.1s

# Magic ID for BMF image compressor files.
# Submitted on 2004-02-27 by Carl
0	string	\\x81\\x8A2	[fid=000100048-31-0000BMF;ext=bmf;mime=;]BMF image file
>2	string	x	, version %.1s
>3	string	x	.%.1s

# Magic ID for BMF image compressor files.
# Submitted on 2004-02-27 by Carl
0	string	\\x81\\x8A1	[fid=000100048-31-0000BMF;ext=bmf;mime=;]BMF image file
>2	string	x	, version %.1s
>3	string	x	.%.1s

# Submitted on 2004-02-14 by Carl
0	string	BM	[fid=000001001-31-0000BMP;ext=bmp;mime=;]Windows or OS/2 Bitmap image file
&6	lelong	0	

# Magic ID for Autodesk Animator files.
# Submitted on 2004-04-08 by Carl
0	leshort	0x9119	[fid=000001254-31-0000CEL;ext=cel,pic;mime=;]Autodesk animator image file
&10	byte	8	
&11	byte	0	
>2	leshort	x	[res=%d
>4	leshort	x	x%dx8bpp]

# Magic ID for Andrew User Interface System files.
# Submitted on 2004-04-02 by Carl
1	string	begindata{raster	[fid=000001315-31-0000CMU;ext=cmu;mime=;]Andrew toolkit raster image file

# Magic ID for Anivga toolkit files.
# Submitted on 2004-04-02 by Carl
38	string	KR\\x01\\x00	[fid=000100104-31-0000COD;ext=cod;mime=;]Anivga sprite image file

# Magic ID for Windows Cursor files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x02\\x00	[fid=000001001-31-0000CUR;ext=cur;mime=;]Microsoft windows cursor image file
&0x08	byte	0	
>4	leshort	x	, %d cursor(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx8bpp]

# Magic ID for Windows Cursor files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x02\\x00	[fid=000001001-31-0000CUR;ext=cur;mime=;]Microsoft windows cursor image file
&0x08	byte	16	
>4	leshort	x	, %d cursor(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx4bpp]

# Magic ID for Windows Cursor files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x02\\x00	[fid=000001001-31-0000CUR;ext=cur;mime=;]Microsoft windows cursor image file
&0x08	byte	2	
>4	leshort	x	, %d cursor(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx1bpp]

# Magic ID for Windows Cursor files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x02\\x00	[fid=000001001-31-0000CUR;ext=cur;mime=;]Microsoft windows cursor image file
&0x08	byte	32	
>4	leshort	x	, %d cursor(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx5bpp]

# Magic ID for Windows Cursor files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x02\\x00	[fid=000001001-31-0000CUR;ext=cur;mime=;]Microsoft windows cursor image file
&0x08	byte	64	
>4	leshort	x	, %d cursor(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx6bpp]

# Magic ID for Windows Cursor files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x02\\x00	[fid=000001001-31-0000CUR;ext=cur;mime=;]Microsoft windows cursor image file
&0x08	byte	8	
>4	leshort	x	, %d cursor(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx3bpp]

# Submitted on 2004-04-13 by Carl
128	string	DICM	[fid=000000004-31-000DICM;ext=dicm,dcm;mime=;]Digital imaging and communication in medecine img.

# Submitted on 2004-04-01 by Carl
0	string	SDPX	[fid=000001309-31-0000DPX;ext=dpx;mime=;]Digital Moving-Picture Exchange image file
>160	string	>\\x00	[creator=%.100s]
>260	string	>\\x00	[title=%.200s]

# Submitted on 2004-04-01 by Carl
0	string	XPDS	[fid=000001309-31-0000DPX;ext=dpx;mime=;]Digital Moving-Picture Exchange image file
>160	string	>\\x00	[creator=%.100s]
>260	string	>\\x00	[title=%.200s]

# Magic ID for Lightwave 3D files.
# Submitted on 2004-04-12 by Carl
0	string	FORM	[fid=000001251-31-000FPBM;ext=fpbm;mime=;]Flexible Precision Buffer Map image file
&8	string	FPBM	

# Submitted on 2004-02-14 by Carl
0	string	GIF8	[fid=000001274-31-0000GIF;ext=gif;mime=image/gif;]GIF image file
&10	byte&0x70	!0x70	
>4	string	x	, version 8%.2s
>6	leshort	>0	[res=%dx
>8	leshort	>0	%d]

# Submitted on 2004-02-14 by Carl
0	string	GIF8	[fid=000001274-31-0000GIF;ext=gif;mime=image/gif;]GIF image file
&10	byte&0x70	0x70	
>4	string	x	, version 8%.2s
>6	leshort	>0	[res=%dx
>8	leshort	>0	%dx8bpp]

# Magic ID for Windows Icon files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x01\\x00	[fid=000001001-31-0000ICO;ext=ico;mime=image/vnd.microsoft.icon;]Microsoft windows Icon image file
&0x08	byte	0	
>4	leshort	x	, %d icon(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx8bpp]

# Magic ID for Windows Icon files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x01\\x00	[fid=000001001-31-0000ICO;ext=ico;mime=image/vnd.microsoft.icon;]Microsoft windows Icon image file
&0x08	byte	16	
>4	leshort	x	, %d icon(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx4bpp]

# Magic ID for Windows Icon files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x01\\x00	[fid=000001001-31-0000ICO;ext=ico;mime=image/vnd.microsoft.icon;]Microsoft windows Icon image file
&0x08	byte	2	
>4	leshort	x	, %d icon(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx1bpp]

# Magic ID for Windows Icon files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x01\\x00	[fid=000001001-31-0000ICO;ext=ico;mime=image/vnd.microsoft.icon;]Microsoft windows Icon image file
&0x08	byte	32	
>4	leshort	x	, %d icon(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx5bpp]

# Magic ID for Windows Icon files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x01\\x00	[fid=000001001-31-0000ICO;ext=ico;mime=image/vnd.microsoft.icon;]Microsoft windows Icon image file
&0x08	byte	64	
>4	leshort	x	, %d icon(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx6bpp]

# Magic ID for Windows Icon files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x01\\x00	[fid=000001001-31-0000ICO;ext=ico;mime=image/vnd.microsoft.icon;]Microsoft windows Icon image file
&0x08	byte	8	
>4	leshort	x	, %d icon(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx3bpp]

# Magic ID for SunOS Icon files.
# Submitted on 2004-04-02 by Carl
0	string	/*\\ Format_version=1,\\ 	[fid=000001011-31-000ICON;ext=icon;mime=;]SunOS icon image file

# Submitted on 2004-03-31 by Carl
0	beshort	0x01	[fid=000001273-31-0000IMG;ext=img;mime=;]GEM Bit Image
&2	beshort	0x08	
>12	beshort	>0	[res=%dx
>14	beshort	>0	%d
>4	beshort	>0	x%dbpp]

# Submitted on 2004-04-02 by Carl
0	string	\\x8bJNG\\x0d\\x0a\\x1a\\x0a	[fid=000000000-31-0000JNG;ext=jng;mime=;]JPEG Network graphics image file
&12	string	JHDR	
>16	belong	x	[res=%d
>20	belong	x	x%d]

# Submitted on 2004-04-13 by Carl
0	string	\\x00\\x00\\x00\\x0cjP\\x20\\x20	[fid=000000001-31-0015444;ext=jp2;mime=image/jp2;]JPEG 2000 image file

# Submitted on 2004-04-13 by Carl
0	string	\\xff\\x4f\\xff\\x51	[fid=000000001-31-0015444;ext=jpc;mime=;]JPEG 2000 code stream image file
&Z2	beshort	0xFFD9	
>8	belong	x	[res=%dx
>12	belong	x	%d]

# Submitted on 2004-03-31 by Carl
0	belong	0xffd8ffe0	[fid=000001305-31-000JPEG;ext=jpeg,jpg;mime=image/jpeg;]Joint Photographic Experts Group JFIF image file
&6	string	JFIF\\x00	
>11	byte	x	, version %d
>12	byte	x	.0%d

# Submitted on 2004-04-13 by Carl
0	string	\\xff\\xd8\\xff\\xe1	[fid=000000005-31-000JPEG;ext=jpg,jpeg;mime=image/jpeg;]Digital still camera image file
&6	string	Exif	

# Magic ID for Deluxe Paint files.
# Submitted on 2004-03-31 by Carl
0	string	FORM	[fid=000001010-31-0000LBM;ext=lbm;mime=;]Interleaved bitmap image file
&8	string	ILBM	

# Submitted on 2004-04-13 by Carl
0	string	This\\ is\\ a\\ BitMap\\ file	[fid=000000000-31-000LISP;ext=lisp;mime=;]Lisp machine format image file

# Magic ID for Microdesign2, Microdesign3 files.
# Submitted on 2004-04-02 by Carl
0	string	.MDA	[fid=000001316-31-0000MDA;ext=mda;mime=;]Microdesign Area image file

# Magic ID for Microdesign2, Microdesign3 files.
# Submitted on 2004-04-02 by Carl
0	string	.MDP	[fid=000001316-31-0000MDP;ext=mdp;mime=;]Microdesign page image file

# Magic ID for Imagemagick files.
# Submitted on 2004-04-01 by Carl
0	string	id=ImageMagick	[fid=000100101-31-000MIFF;ext=miff,mif;mime=;]Imagemagick image file

# Magic ID for Netpbm files.
# Submitted on 2004-04-02 by Carl
0	string	MRF1	[fid=000100105-31-0000MRF;ext=mrf;mime=;]Monochrome recursive format image file
>4	belong	x	[res=%dx
>8	belong	x	%dx1bpp]

# Magic ID for Microsoft Paint files.
# Submitted on 2004-04-02 by Carl
0	leshort	0x6144	[fid=000001001-31-0000MSP;ext=msp;mime=;]Microsoft paint image file, version 1.0
&2	leshort	0x4d6e	
>4	leshort	x	[res=%dx
>6	leshort	x	%dx1bpp]

# Magic ID for Microsoft Paint files.
# Submitted on 2004-04-02 by Carl
0	leshort	0x694c	[fid=000001001-31-0000MSP;ext=msp;mime=;]Microsoft paint image file, version 2.0
&2	leshort	0x536e	
>4	leshort	x	[res=%dx
>6	leshort	x	%dx1bpp]

# Magic ID for Netpbm files.
# Submitted on 2004-03-31 by Carl
0	string	P7\\x0A	[fid=000100100-31-0000PAM;ext=pam;mime=;]Portable arbitrary map image file

# Magic ID for Netpbm files.
# Submitted on 2004-03-31 by Carl
0	string	P1	[fid=000100100-31-0000PBM;ext=pbm;mime=;]Portable bitmap image file, ascii

# Magic ID for Netpbm files.
# Submitted on 2004-03-31 by Carl
0	string	P4	[fid=000100100-31-0000PBM;ext=pbm;mime=;]Portable bitmap image file, binary

# Magic ID for PC-Paintbrush files.
# Submitted on 2004-03-31 by Carl
0	beshort	0x0A00	[fid=000001257-31-0000PCX;ext=pcx;mime=;]PC-Paintbrush image file, version 2.5
&2	byte	1	

# Magic ID for PC-Paintbrush files.
# Submitted on 2004-03-31 by Carl
0	beshort	0x0A02	[fid=000001257-31-0000PCX;ext=pcx;mime=;]PC-Paintbrush image file, version 2.8
&2	byte	1	

# Magic ID for PC-Paintbrush files.
# Submitted on 2004-03-31 by Carl
0	beshort	0x0A03	[fid=000001257-31-0000PCX;ext=pcx;mime=;]PC-Paintbrush image file, version 2.8
&2	byte	1	

# Magic ID for PC-Paintbrush files.
# Submitted on 2004-03-31 by Carl
0	beshort	0x0A04	[fid=000001257-31-0000PCX;ext=pcx;mime=;]PC-Paintbrush for windows image file
&2	byte	1	

# Magic ID for PC-Paintbrush files.
# Submitted on 2004-03-31 by Carl
0	beshort	0x0A05	[fid=000001257-31-0000PCX;ext=pcx;mime=;]PC-Paintbrush image file, version 3.0
&2	byte	1	

# Magic ID for Netpbm files.
# Submitted on 2004-03-31 by Carl
0	string	P2	[fid=000100100-31-0000PGM;ext=pgm;mime=;]Portable gray map image file, ascii

# Magic ID for Netpbm files.
# Submitted on 2004-03-31 by Carl
0	string	P5	[fid=000100100-31-0000PGM;ext=pgm;mime=;]Portable gray map image file, binary

# Magic ID for PC Paint files.
# Submitted on 2004-04-08 by Carl
0	leshort	0x1234	[fid=000001318-31-0000PIC;ext=pic;mime=;]Pictor PC Paint image file
&11	byte	0xFF	
&10	byte	0x02	
>2	leshort	x	[res=%d
>4	leshort	x	x%d]

# Magic ID for PC Paint files.
# Submitted on 2004-04-08 by Carl
0	leshort	0x1234	[fid=000001318-31-0000PIC;ext=pic;mime=;]Pictor PC Paint image file
&11	byte	0xFF	
&10	byte	0x08	
>2	leshort	x	[res=%d
>4	leshort	x	x%d]

# Magic ID for PC Paint files.
# Submitted on 2004-04-08 by Carl
0	leshort	0x1234	[fid=000001318-31-0000PIC;ext=pic;mime=;]Pictor PC Paint image file
&11	byte	0xFF	
&10	byte	0x31	
>2	leshort	x	[res=%d
>4	leshort	x	x%d]

# Magic ID for Softimage 3D files.
# Submitted on 2004-04-08 by Carl
0	belong	0x5380f634	[fid=000001321-31-0000PIC;ext=pic;mime=;]Softimage 3D image file
&88	string	PICT	
>8	string	>\\x00	[title=%.80s]
>92	beshort	x	[res=%d
>94	beshort	x	x%d]

# Magic ID for Bio-rad microscope files.
# Submitted on 2004-04-08 by Carl
54	leshort	12345	[fid=000001322-31-0000PIC;ext=pic;mime=;]Bio-rad confocal microscope image file
&16	leshort	0	
>0	leshort	>0	[res=%d
>2	leshort	>0	x%d]

# Submitted on 2004-02-06 by Carl
0	string	\\x89PNG\\x0d\\x0a\\x1a\\x0a	[fid=000000001-31-0015948;ext=png;mime=image/png;]Portable Network Graphic file
&12	string	IHDR	
>16	belong	>0	[res=%d
>20	belong	>0	x%d
>24	byte	x	x%dbpp]

# Magic ID for Netpbm files.
# Submitted on 2004-03-31 by Carl
0	string	P3	[fid=000100100-31-0000PPM;ext=ppm;mime=;]Portable pixel map image file, ascii

# Magic ID for Netpbm files.
# Submitted on 2004-03-31 by Carl
0	string	P6	[fid=000100100-31-0000PPM;ext=ppm;mime=;]Portable pixel map image file, binary

# Magic ID for Photoshop files.
# Submitted on 2004-04-01 by Carl
0	string	8BPS\\x00\\x01	[fid=000001003-31-0000PSD;ext=psd;mime=;]Adobe Photoshop image file
>18	belong	>0	[res=%dx
>14	belong	>0	%d]

# Magic ID for Paint shop pro files.
# Submitted on 2004-04-01 by Carl
0	string	Paint Shop Pro Image File\\x0a\\x1a	[fid=000001310-31-0000PSP;ext=psp;mime=;]Paintshop pro image file
>50	lelong	>0	[res=%dx
>54	lelong	>0	%d
>69	leshort	>0	x%dbpp]

# Submitted on 2004-02-08 by Carl
0	belong	0x59a66a95	[fid=000001011-31-0000RAS;ext=ras;mime=;]Sun raster image
>4	belong	>0	[res=%dx
>8	belong	>0	%d
>12	belong	>0	x%dbpp]

# Submitted on 2004-03-31 by Carl
0	string	\\0x01\\xDA	[fid=000001004-31-0000RGB;ext=rgb;mime=;]SGI Image file
>24	string	>\\x00	[title=%.80s]

# Submitted on 2004-03-31 by Carl
0	string	\\x01\\xDA\\x00\\x01	[fid=000001004-31-0000RGB;ext=rgb;mime=;]SGI Image file
&10	beshort	1	
>6	beshort	x	[res=%dx
>8	beshort	x	%dx8bpp]
>24	string	>\\x0	[title=%.80s]

# Submitted on 2004-03-31 by Carl
0	string	\\x01\\xDA\\x00\\x01	[fid=000001004-31-0000RGB;ext=rgb;mime=;]SGI Image file
&10	beshort	3	
>6	beshort	x	[res=%dx
>8	beshort	x	%dx24bpp]
>24	string	>\\x0	[title=%.80s]

# Submitted on 2004-03-31 by Carl
0	string	\\x01\\xDA\\x00\\x01	[fid=000001004-31-0000RGB;ext=rgb;mime=;]SGI Image file
&10	beshort	4	
>6	beshort	x	[res=%dx
>8	beshort	x	%dx24bpp]
>24	string	>\\x0	[title=%.80s]

# Submitted on 2004-03-31 by Carl
0	string	\\x01\\xDA\\x01\\x01	[fid=000001004-31-0000RGB;ext=rgb;mime=;]SGI Image file, compressed
&10	beshort	1	
>6	beshort	x	[res=%dx
>8	beshort	x	%dx8bpp]
>24	string	>\\x0	[title=%.80s]

# Submitted on 2004-03-31 by Carl
0	string	\\x01\\xDA\\x01\\x01	[fid=000001004-31-0000RGB;ext=rgb;mime=;]SGI Image file, compressed
&10	beshort	3	
>6	beshort	x	[res=%dx
>8	beshort	x	%dx24bpp]
>24	string	>\\x0	[title=%.80s]

# Submitted on 2004-03-31 by Carl
0	string	\\x01\\xDA\\x01\\x01	[fid=000001004-31-0000RGB;ext=rgb;mime=;]SGI Image file, compressed
&10	beshort	4	
>6	beshort	x	[res=%dx
>8	beshort	x	%dx24bpp]
>24	string	>\\x0	[title=%.80s]

# Magic ID for Turbo Silver files.
# Submitted on 2004-04-13 by Carl
0	string	FORM	[fid=000001252-31-000RGB8;ext=rgb8,rgb;mime=;]Turbo Silver 24-bit RGB image file
&8	string	RGB8	

# Magic ID for Turbo Silver files.
# Submitted on 2004-04-13 by Carl
0	string	FORM	[fid=000001252-31-000RGBN;ext=rgbn,rgb;mime=;]Turbo Silver 12-bit RGB image file
&8	string	RGBN	

# Magic ID for ColoRIX VGA Paint files.
# Submitted on 2004-04-08 by Carl
0	string	RIX3	[fid=000001320-31-0000SCZ;ext=scz;mime=;]ColorRIX VGA Paint image file
>4	leshort	x	[res=%d
>6	leshort	x	x%d]

# Submitted on 2004-04-13 by Bryan Henderson
0	string	\\117\\072	[fid=000000000-31-0000SIR;ext=sir;mime=;]Solitaire image recorder image file, MGI type 11
&4	string	\\013	

# Submitted on 2004-04-13 by Bryan Henderson
0	string	\\117\\072	[fid=000000000-31-0000SIR;ext=sir;mime=;]Solitaire image recorder image file, MGI type 17
&4	string	\\021	

# Submitted on 2004-04-01 by Carl
Z18	string	TRUEVISION-XFILE	[fid=000001306-31-0000TGA;ext=tga;mime=;]Truevision Targa image file
>12	leshort	x	[res=%dx
>14	leshort	x	%d
>16	byte	x	x%dbpp]

# Magic ID for Graphics Workshop files.
# Submitted on 2004-04-01 by Carl
0	string	THNL	[fid=000001258-31-0000THN;ext=thn;mime=;]Graphics workshop thumbnail image file

# Submitted on 2004-03-31 by Carl
0	string	II	[fid=000001003-31-0000TIF;ext=tif,tiff,dng;mime=image/tiff;]Tagged image file format image file, little-endian
&2	leshort	42	

# Submitted on 2004-03-31 by Carl
0	string	MM	[fid=000001003-31-0000TIF;ext=tif,tiff,dng;mime=image/tiff;]Tagged image file format image file, big-endian
&2	leshort		

# Magic ID for VICAR files.
# Submitted on 2004-04-01 by Carl
0	string	LBLSIZE=	[fid=000001022-31-0000VIC;ext=vic,vicar;mime=;]Vicar image file

# Magic ID for Khoros files.
# Submitted on 2004-04-01 by Carl
0	string	\\xAB\\x01\\x01\\x03	[fid=000001308-31-0000VIF;ext=vif,viff;mime=;]Khoros Visualization/Image File Format, version 1.3
&4	byte	2	
>520	belong	>0	[res=%dx
>524	belong	>0	%d]

# Submitted on 2004-04-02 by Carl
0	string	FIASCO	[fid=000100107-31-0000WFA;ext=wfa;mime=;]Fractal Image And Sequence Codec image file

# Magic ID for X-Windows files.
# Submitted on 2004-04-01 by Carl
0	string	/* XPM */	[fid=000001020-31-0000XPM;ext=xpm;mime=;]X-Windows pixel map image file

# Magic ID for XV files.
# Submitted on 2004-04-01 by Carl
0	string	P7\\ 332	[fid=000100103-31-00000XV;ext=xv;mime=;]XV Thumbnail image file

# Magic ID for XWindows files.
# Submitted on 2004-04-02 by Carl
0	belong	0x40	[fid=000001020-31-0000XWD;ext=xwd;mime=;]X10 XWindows dump image file
&4	belong	0x06	
>24	belong	x	[res=%d
>28	belong	x	x%d]

# Magic ID for XWindows files.
# Submitted on 2004-04-02 by Carl
0	lelong	0x40	[fid=000001020-31-0000XWD;ext=xwd;mime=;]X10 XWindows dump image file
&4	lelong	0x06	
>24	lelong	x	[res=%d
>28	lelong	x	x%d]

# Magic ID for Provector files.
# Submitted on 2004-04-08 by Carl
0	string	FORM	[fid=000001319-32-000DR2D;ext=dr2d;mime=;]Provector 2D image file
&8	string	DR2D	

# Magic ID for XFig, WinFig, jFig files.
# Submitted on 2004-02-08 by Carl
0	string	#FIG	[fid=000100011-32-0000FIG;ext=fig;mime=;]Facility for Interactive Generation file
>5	string	x	, version %.1s.
>7	string	x	%.1s

# Magic ID for Lotus 1-2-3 files.
# Submitted on 2004-04-02 by Carl
0	string	\\x01\\x00\\x00\\x00\\x01\\x00\\x08\\x00\\x44	[fid=000001009-32-0000PIC;ext=pic;mime=;]Lotus 1-2-3 image file

# Magic ID for Autocad files.
# Submitted on 2004-04-12 by Carl
0	string	AutoCAD Slide	[fid=000001254-32-0000SLD;ext=sld;mime=;]Autocad slide image file

# Magic ID for Wordperfect files.
# Submitted on 2004-02-08 by Carl
0	string	\\xffWPC	[fid=000001008-32-0000WPG;ext=wpg;mime=;]Wordperfect Graphics vectors
&8	byte	1	
&9	byte	0x16	
>10	byte	x	, version %d.
>11	byte	x	%d

# Submitted on 2004-02-11 by Carl
0	string	FORM	[fid=000100019-33-000AMFF;ext=amff;mime=;]Amiga metafile
&8	string	AMFF	

# Submitted on 2004-02-11 by Carl
0	lelong	0x9AC6CDD7	[fid=000001003-33-0000APM;ext=apm;mime=;]Aldus placeable Windows metafile
&4	leshort	0	

# Magic ID for CorelDRAW files.
# Submitted on 2004-02-11 by Carl
0	string	RIFF	[fid=000001008-33-0000CDR;ext=cdr;mime=;]Coreldraw  little-endian metafile
&8	string	CDR	

# Magic ID for CorelDRAW files.
# Submitted on 2004-02-11 by Carl
0	string	RIFX	[fid=000001008-33-0000CDR;ext=cdr;mime=;]Coreldraw  big-endian metafile
&8	string	CDR	

# Submitted on 2004-04-08 by Carl
0	beshort&0xFF20	0x0020	[fid=000000001-33-0008632;ext=cgm;mime=image/cgm;]Computer graphics metafile, binary encoded
&Z0x02	beshort&0xFF40	0x0040	

# Submitted on 2004-04-08 by Carl
0	string	BEGMF	[fid=000000001-33-0008632;ext=cgm;mime=image/cgm;]Computer graphics metafile, ascii encoded

# Magic ID for CorelDRAW files.
# Submitted on 2004-02-11 by Carl
0	string	RIFF	[fid=000001008-33-0000CMX;ext=cmx;mime=;]Corel little-endian metafile
&8	string	CMX1	

# Magic ID for CorelDRAW files.
# Submitted on 2004-02-11 by Carl
0	string	RIFX	[fid=000001008-33-0000CMX;ext=cmx;mime=;]Corel big-endian metafile
&8	string	CMX1	

# Submitted on 2004-02-11 by Carl
0	lelong	0x00000001	[fid=000001001-33-0000EMF;ext=emf;mime=;]Microsoft Windows Enhanced metafile
&40	lelong	0x464D4520	

# Submitted on 2004-02-11 by Carl
0	string	%!PS-Adobe-2.0\\ EPSF-1.2	[fid=000001003-33-000EPSF;ext=epsf;mime=application/postscript;]Adobe Encapsulated Postscript Level 2, version 1.2

# Submitted on 2004-02-11 by Carl
0	string	%!PS-Adobe-2.0\\ EPSF-2.0	[fid=000001003-33-000EPSF;ext=epsf;mime=application/postscript;]Adobe Encapsulated Postscript Level 2, version 2.0

# Submitted on 2004-02-11 by Carl
0	string	%!PS-Adobe-3.0\\ EPSF-3.0	[fid=000001003-33-000EPSF;ext=epsf;mime=application/postscript;]Adobe Encapsulated Postscript Level 3, version 3.0

# Submitted on 2004-02-11 by Carl
0	string	\\xC5\\xD0\\xD3\\xC6	[fid=000001003-33-000EPSF;ext=epsf,ai;mime=application/postscript;]Adobe Encapsulated Postscript, version 3.0, binary

# Magic ID for GEM Paint files.
# Submitted on 2004-03-31 by Carl
0	beshort	0xFFFF	[fid=000001273-33-0000GEM;ext=gem;mime=;]GemDOS Motorola Metafile, version 1.01
&4	beshort	101	

# Submitted on 2004-02-11 by http://www.seasip.info/Gem/ff_gem.html
0	leshort	0xFFFF	[fid=000001273-33-0000GEM;ext=gem;mime=;]GemDOS Metafile
&4	leshort	0	

# Magic ID for Artline files.
# Submitted on 2004-02-11 by http://www.seasip.info/Gem/ff_gem.html
0	leshort	0xFFFF	[fid=000001273-33-0000GEM;ext=gem;mime=;]GemDOS Intel Metafile, version 4.00
&4	leshort	400	

# Magic ID for Deskpress files.
# Submitted on 2004-02-11 by http://www.seasip.info/Gem/ff_gem.html
0	leshort	0xFFFF	[fid=000001273-33-0000GEM;ext=gem;mime=;]GemDOS Intel Metafile, version 3.10
&4	leshort	310	

# Magic ID for GEM Paint files.
# Submitted on 2004-02-11 by http://www.seasip.info/Gem/ff_gem.html
0	leshort	0xFFFF	[fid=000001273-33-0000GEM;ext=gem;mime=;]GemDOS Intel Metafile, version 1.01
&4	leshort	101	

# Magic ID for Quickdraw files.
# Submitted on 2004-04-01 by Carl
0x20A	belong	0x001102FF	[fid=000001002-33-0000PCT;ext=pct;mime=;]Macintosh Quickdraw metafile \'PICT\', version 2.0

# Submitted on 2004-02-11 by Carl
0	leshort	0x0001	[fid=000001001-33-0000WMF;ext=wmf;mime=;]Microsoft Windows metafile
&2	leshort	9	

# Magic ID for Cinema 4D Version 5.x files.
# Submitted on 2004-02-06 by Carl
0	string	MC50	[fid=000001255-40-0000000;ext=;mime=;]Maxon Cinema 4D version 5 3D data

# Magic ID for Quickdraw 3D files.
# Submitted on 2004-02-06 by Carl
0	string	3DMF	[fid=000001002-40-0003DMF;ext=3dmf;mime=;]Apple Quickdraw 3D metafile

# Magic ID for Rhino 3d files.
# Submitted on 2004-04-12 by Carl
0	string	3D Geometry File Format	[fid=000001330-40-0003DMF;ext=3dmf;mime=;]Rhino3d / OpenNurbs 3d model

# Magic ID for Quickdraw 3D files.
# Submitted on 2004-04-11 by Carl
0	string	3DMetafile	[fid=000001002-40-0003DMF;ext=3dmf,a3d;mime=;]Apple Quickdraw 3D metafile

# Magic ID for AC3d files.
# Submitted on 2004-04-12 by Carl
0	string	AC3D	[fid=000000000-40-00000AC;ext=ac;mime=;]Ac3d 3d model

# Magic ID for 3dStudio Max files.
# Submitted on 2004-04-12 by Carl
0	string	*3DSMAX_ASCIIEXPORT	[fid=000001326-40-0000ASE;ext=ase;mime=;]3d studio max ascii export 3D model

# Magic ID for Caligari Truespace Modeler files.
# Submitted on 2004-02-06 by Carl
0	string	Caligari\\ V	[fid=000001256-40-0000COB;ext=cob,scn;mime=;]Caligari Truespace2 3D model

# Magic ID for Tachyon parallel raytracer files.
# Submitted on 2004-04-12 by Carl
0	string	BEGIN_SCENE	[fid=000100116-40-0000DAT;ext=dat;mime=;]Tachyon ray-tracer 3d model

# Magic ID for Autocad files.
# Submitted on 2004-04-12 by Carl
0	string	AC10	[fid=000001254-40-0000DWG;ext=dwg;mime=image/vnd.dwg;]Autocad drawing format 3d model

# Magic ID for Autocad files.
# Submitted on 2004-04-12 by Carl
0	string	AutoCAD Binary DXF	[fid=000001254-40-0000DXF;ext=dxf;mime=image/vnd.dxf;]Autocad drawing interchange 3d model, binary

# Magic ID for Multigen creator files.
# Submitted on 2004-04-12 by Carl
0	beshort	1	[fid=000001332-40-0000FLT;ext=flt;mime=;]Openflight scene description 3d model
&4	string	db	

# Magic ID for Videoscape 3D files.
# Submitted on 2004-04-12 by Carl
0	string	GOUR	[fid=000001328-40-0000GEO;ext=geo;mime=;]Videoscape 3d model with colored vertices

# Magic ID for Videoscape 3D, Blender files.
# Submitted on 2004-04-12 by Carl
0	string	3DG1	[fid=000001328-40-0000GEO;ext=geo;mime=;]Videoscape 3d model with colored faces

# Magic ID for Videoscape 3D, Blender files.
# Submitted on 2004-04-12 by Carl
0	string	3DG2	[fid=000001328-40-0000GEO;ext=geo;mime=;]Videoscape 3d model light source

# Magic ID for Videoscape 3D, Blender files.
# Submitted on 2004-04-12 by Carl
0	string	3DG3	[fid=000001328-40-0000GEO;ext=geo;mime=;]Videoscape 3d model with gouraud curves

# Magic ID for Softimage 4D Creative environment files.
# Submitted on 2004-04-12 by Carl
0	string	HRCH:	[fid=000001321-40-0000HRC;ext=hrc;mime=;]Softimage 4d model, ascii encoded

# Magic ID for Open Inventor Toolkit files.
# Submitted on 2004-02-06 by Carl
0	string	#Inventor	[fid=000001004-40-00000IV;ext=iv;mime=;]Open Inventor 3d model
>11	string	x	, version %.1s.
>13	string	x	%.1s
>15	string	binary	, binary encoded
>15	string	ascii	, ascii encoded

# Magic ID for Geomview files.
# Submitted on 2004-04-12 by Carl
0	string	LIST	[fid=000100118-40-000LIST;ext=list;mime=;]Geomview list of 3D models and objects

# Magic ID for Lightwave 3D files.
# Submitted on 2004-04-12 by Carl
0	string	FORM	[fid=000001251-40-0000LWO;ext=lwo,lwob;mime=;]Lightwave 3D object
&8	string	LWO2	

# Magic ID for Lightwave 3D files.
# Submitted on 2004-02-06 by Carl
0	string	FORM	[fid=000001251-40-0000LWO;ext=lwob,lwo;mime=;]Lightwave 3D object
&8	string	LWOB	

# Magic ID for Lightwave 3D files.
# Submitted on 2004-02-06 by Carl
0	string	LWSC	[fid=000001251-40-0000LWS;ext=lwsc,lws;mime=;]Lightwave 3D scene

# Magic ID for Maya files.
# Submitted on 2004-04-12 by Carl
0	string	//Maya	[fid=000001312-40-00000MA;ext=ma;mime=;]Maya 3d model, ascii encoded

# Magic ID for Cinema 4D Version 4.x and earlier files.
# Submitted on 2004-02-06 by Carl
0	string	FORM	[fid=000001255-40-000MC4D;ext=mc4d;mime=;]Maxon Cinema 4D v4.x 3D data
&8	string	MC4D	

# Magic ID for Geomview files.
# Submitted on 2004-04-12 by Carl
0	string	CMESH	[fid=000100118-40-000MESH;ext=mesh;mime=;]Geomview polygon

# Magic ID for Geomview files.
# Submitted on 2004-04-12 by Carl
0	string	MESH	[fid=000100118-40-000MESH;ext=mesh;mime=;]Geomview polygon

# Magic ID for Milshape 3d files.
# Submitted on 2004-04-12 by Carl
0	string	MS3D000000	[fid=000100117-40-000MS3D;ext=ms3d;mime=;]Milkshape 3d model, binary encoded

# Magic ID for Worldtoolkit files.
# Submitted on 2004-02-06 by Carl
0	string	nff	[fid=000001253-40-0000NFF;ext=nff;mime=;]Sense8 Worldtoolkit 3D object

# Magic ID for Autodesk Animator files.
# Submitted on 2004-04-12 by Carl
2	lelong	0x0000	[fid=000001254-40-0000PLY;ext=ply;mime=;]Autodesk animator polygon file
&6	byte	0	
&7	byte	0x99	

# Magic ID for Autodesk Animator files.
# Submitted on 2004-04-12 by Carl
2	lelong	0x0000	[fid=000001254-40-0000PLY;ext=ply;mime=;]Autodesk animator polygon file
&6	byte	1	
&7	byte	0x99	

# Magic ID for Quick3d files.
# Submitted on 2004-04-12 by Carl
0	string	quick3Do	[fid=000001334-40-0000Q3O;ext=q3o;mime=;]Quick3d 3D object

# Magic ID for Quick3d files.
# Submitted on 2004-04-12 by Carl
0	string	quick3Ds	[fid=000001334-40-0000Q3S;ext=q3s;mime=;]Quick3d 3D scene

# Magic ID for Renderman files.
# Submitted on 2004-04-12 by Carl
0	string	##RenderMan\\ RIB-Structure	[fid=000001323-40-0000RIB;ext=rib;mime=;]Renderman bytestream 3D model

# Magic ID for Sculpt 3d files.
# Submitted on 2004-04-12 by Carl
0	string	FORM	[fid=000000000-40-00SCENE;ext=scene;mime=;]Sculpt 3d scene model
&8	string	SC3D	

# Magic ID for Imagine 3D Studio, Turbo Silver files.
# Submitted on 2004-02-06 by Carl
0	string	FORM	[fid=000001252-40-000TDDD;ext=tddd,obj;mime=;]Imagine 3D object
&8	string	TDDD	

# Magic ID for Macromedia Director files.
# Submitted on 2004-04-12 by Carl
0	string	IFX	[fid=000001259-40-0000W3D;ext=w3d;mime=;]Shockwave 3D model

# Submitted on 2004-02-06 by Carl
0	string	#VRML	[fid=000000001-40-0014772;ext=wrl;mime=model/vrml;]Virtual Reality modeling language
>7	string	x	, version %.1s.
>9	string	x	%.1s

# Submitted on 2004-04-12 by Carl
0	string	<WORLD>	[fid=000000000-40-0000XGL;ext=xgl;mime=;]XGL 3d model

# Magic ID for Direct3D files.
# Submitted on 2004-04-11 by Carl
0	string	xof\\ 	[fid=000001001-40-0000XIE;ext=xie;mime=;]Microsoft direct3d 3D model

# Magic ID for Softimage XSI files.
# Submitted on 2004-04-12 by Carl
0	string	xsi\\ 	[fid=000001321-40-0000XSI;ext=xsi;mime=;]Softimage 3d model

# Magic ID for Kaboom files.
# Submitted on 2004-02-08 by Carl
0	string	\\xA8MP\\xA8	[fid=000000000-50-0000000;ext=;mime=;]Kboom archive file

# Magic ID for CTW files.
# Submitted on 2004-03-04 by Carl
0	leshort	12	[fid=000100077-50-0000000;ext=;mime=;]Context tree weighing (CTW) archive file
&2	leshort	0	

# Magic ID for Microsoft Compress files.
# Submitted on 2004-03-04 by Carl
0	string	SZDD\\x88\\xF0\\x27\\x33	[fid=000001001-50-0000000;ext=;mime=;]Microsoft LZSS compressed file

# Magic ID for AAX files.
# Submitted on 2004-02-18 by Carl
0	string	\\x40\\xFE\\x00\\x00	[fid=000001281-50-0000AAX;ext=aax;mime=;]AAX archive file

# Magic ID for ABComp files.
# Submitted on 2004-02-18 by Carl
0	string	\\x03AB2	[fid=000001282-50-0000ABP;ext=abp;mime=;]ABComp archive file

# Magic ID for Ace / WinAce files.
# Submitted on 2004-02-08 by Carl
7	string	**ACE**	[fid=000001265-50-0000ACE;ext=ace;mime=;]Ace / WinACE archive file

# Magic ID for Ai Archiver files.
# Submitted on 2004-02-18 by Carl
0	string	Ai	[fid=000000000-50-00000AI;ext=ai;mime=;]Ai archive file

# Magic ID for Akt archiver files.
# Submitted on 2004-02-18 by Carl
0	string	AKT\\x0A	[fid=000000000-50-0000AKT;ext=akt;mime=;]AKT archive file

# Magic ID for AMG Archiver files.
# Submitted on 2004-02-18 by Carl
0	string	\\xAD\\x36	[fid=000001284-50-0000AMG;ext=amg;mime=;]AMG archive file
>2	byte	x	, version %bh.
>2	byte	x	%bl
&3	byte	0	

# Magic ID for ar files.
# Submitted on 2004-03-04 by Carl
0	string	\\x21<arch>\\x0A	[fid=000000003-50-00000AR;ext=ar;mime=;]UNIX archive file (ar)

# Magic ID for AR7 files.
# Submitted on 2004-02-18 by Carl
0	string	,AR7 e-mailable archive:	[fid=000100036-50-0000AR7;ext=ar7;mime=;]AR7 archive file

# Magic ID for Squash files.
# Submitted on 2004-02-18 by Carl
3	string	OctSqu	[fid=000100038-50-0000ARH;ext=arh;mime=;]Squash archive file

# Magic ID for Arj files.
# Submitted on 2004-02-18 by Carl
0	string	\\x60\\xEA	[fid=000001285-50-0000ARJ;ext=arj;mime=;]ARJ archive file
&10	byte	2	

# Magic ID for ASD files.
# Submitted on 2004-02-18 by Carl
0	string	ASD01\\x1A	[fid=000001287-50-0000ASD;ext=asd;mime=;]ASD archive file

# Magic ID for Boa constrictor files.
# Submitted on 2004-02-18 by Carl
0	string	BOA\\x00	[fid=000100040-50-0000B58;ext=b58;mime=;]BOA constrictor archive file

# Magic ID for BWC files.
# Submitted on 2004-02-18 by Carl
0	string	BWC	[fid=000100042-50-00000BC;ext=bc;mime=;]BWC archive file

# Magic ID for Bix files.
# Submitted on 2004-02-18 by Carl
0	string	BIX0	[fid=000100037-50-0000BIX;ext=bix;mime=;]BIX archive file

# Magic ID for Btoa files.
# Submitted on 2004-02-18 by Carl
0	string	xbtoa5	[fid=000100043-50-0000BOO;ext=boo;mime=;]Btoa encoded file

# Magic ID for Bsa files.
# Submitted on 2004-02-18 by Carl
0	string	\\xFFBSG\\x00\\x00\\xFFBSA	[fid=000001289-50-0000BSN;ext=bsn;mime=;]Bsa archive file

# Magic ID for BTPC files.
# Submitted on 2004-03-03 by Carl
0	string	btpc\\ 	[fid=000100074-50-000BTPC;ext=btpc;mime=;]BTPC compressed image file

# Magic ID for BTS files.
# Submitted on 2004-02-18 by Carl
0	string	\\x1A\\x03Descript	[fid=000100044-50-0000BTS;ext=bts;mime=;]BTSpk archive file
&0x521	string	BTSPK!	

# Magic ID for Bzip files.
# Submitted on 2004-02-18 by Carl
0	string	BZ0	[fid=000100008-50-00000BZ;ext=bz;mime=;]Bzip archive file

# Magic ID for Bzip2 files.
# Submitted on 2004-02-08 by Carl
0	string	BZh	[fid=000100008-50-0000BZ2;ext=bz2;mime=;]Bzip2 archive file

# Submitted on 2004-02-08 by Carl
0	string	MSCF	[fid=000001001-50-0000CAB;ext=cab;mime=;]Microsoft Cabinet file
>25	byte	x	, version %d.
>24	byte	x	%d

# Magic ID for Crush files.
# Submitted on 2004-02-23 by Carl
0	string	CRUSH\\ v1.8	[fid=000001290-50-0000CRU;ext=cru;mime=;]Crush archive file

# Magic ID for Ctxf files.
# Submitted on 2004-02-23 by Carl
0	string	CXF\\x1A	[fid=000100045-50-0000CXF;ext=cxf;mime=;]Ctx archive file

# Magic ID for DAXWav files.
# Submitted on 2004-03-04 by Carl
0	string	FORM	[fid=000000000-50-0000DAX;ext=dax;mime=;]DAX audio archive file
&8	string	daxA	

# Magic ID for Diskmasher files.
# Submitted on 2004-02-23 by Carl
0	string	DMS!	[fid=000000000-50-0000DMS;ext=dms;mime=;]Diskmasher archive file

# Magic ID for Dpae files.
# Submitted on 2004-02-23 by Carl
0	string	Dirk\\ Paehl(c)	[fid=000100046-50-0000DPA;ext=dpa;mime=;]Dpae archive file

# Magic ID for Disintegrator files.
# Submitted on 2004-02-23 by Carl
0	string	DSTb	[fid=000100047-50-0000DST;ext=dst;mime=;]Disintegrator archive file

# Magic ID for Enhanced compressor (ENC) files.
# Submitted on 2004-02-23 by Carl
0	string	Ench	[fid=000100051-50-0000ENC;ext=enc;mime=;]Enhanced compressor archive file

# Magic ID for ESP files.
# Submitted on 2004-02-08 by Carl
0	string	ESP>	[fid=000100002-50-0000ESP;ext=esp;mime=;]ESP archive file

# Magic ID for ESP files.
# Submitted on 2004-02-08 by Carl
0x53f	string	ESP	[fid=000100002-50-0000EXE;ext=exe;mime=;]ESP Self-extracting archivew (MS-DOS)

# Magic ID for Freeze files.
# Submitted on 2004-02-11 by Carl
0	string	\\x1F\\x9E	[fid=000000000-50-000000F;ext=f;mime=;]Freeze archive file, version 1.0

# Magic ID for Freeze files.
# Submitted on 2004-02-11 by Carl
0	string	\\x1F\\x9F	[fid=000000000-50-000000F;ext=f;mime=;]Freeze archive file, version 2.0

# Magic ID for Qlfc files.
# Submitted on 2004-02-23 by Carl
0	string	\\x47\\x68\\x69\\x64\\x6f	[fid=000100055-50-00000GQ;ext=gq;mime=;]Qlfc archive file

# Magic ID for Gzip files.
# Submitted on 2004-02-08 by Carl
0	string	\\x1F\\x8B	[fid=000000002-50-0001952;ext=gz;mime=;]Gzip archive file

# Magic ID for Ha files.
# Submitted on 2004-02-10 by Carl
0	string	HA	[fid=000100013-50-00000HA;ext=ha;mime=;]HA archive file

# Magic ID for HAP files.
# Submitted on 2004-02-23 by Carl
0	string	\\x913HF	[fid=000001291-50-0000HAP;ext=hap;mime=;]HAP archive file

# Magic ID for Hpack files.
# Submitted on 2004-02-11 by Carl
0	string	HPAK	[fid=000100016-50-0000HPK;ext=hpk;mime=;]Hpack archive file
&Z4	string	HPAK	

# Submitted on 2004-02-10 by Carl
11	string	must\\ be\\ converted\\ with\\ BinHex	[fid=000001002-50-0000HQX;ext=hqx;mime=;]BinHex archive

# Magic ID for HYP files.
# Submitted on 2004-02-23 by Carl
0	string	\\x1AHP\\x25	[fid=000100056-50-0000HYP;ext=hyp;mime=;]HYP archive file

# Magic ID for HYP files.
# Submitted on 2004-02-23 by Carl
0	string	\\x1AST\\x25	[fid=000100056-50-0000HYP;ext=hyp;mime=;]HYP archive file

# Magic ID for Winimp files.
# Submitted on 2004-02-08 by Carl
0	lelong	0xA504D49	[fid=000001270-50-0000IMP;ext=imp;mime=;]Winimp archive file

# Magic ID for JRchive files.
# Submitted on 2004-02-08 by Carl
0	string	JRchive	[fid=000001263-50-0000JRC;ext=jrc;mime=;]JRchive archive file

# Magic ID for Archive Handler files.
# Submitted on 2004-02-08 by Carl
0	string	LG	[fid=000100001-50-00000LG;ext=lg;mime=;]Arhangel archive file

# Magic ID for Limit files.
# Submitted on 2004-02-08 by Carl
0	string	LM\\x1A	[fid=000100003-50-0000LIM;ext=lim;mime=;]Limit archive file

# Magic ID for Larc files.
# Submitted on 2004-02-11 by Carl
2	string	-lz4-	[fid=000100017-50-0000LZH;ext=lzh;mime=;]Larc archive

# Magic ID for Larc files.
# Submitted on 2004-02-11 by Carl
2	string	-lz5-	[fid=000100017-50-0000LZH;ext=lzh;mime=;]Larc archive file

# Magic ID for Larc files.
# Submitted on 2004-02-11 by Carl
2	string	-lzs-	[fid=000100017-50-0000LZH;ext=lzh;mime=;]Larc archive file

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh\\ -	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh0-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 1.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh1-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 1.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh2-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh3-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh4-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh5-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh6-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh7-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lhd-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lzo files.
# Submitted on 2004-02-11 by Carl
0	string	\\x89\\x4c\\x5a\\x4f\\x00\\x0d\\x0a\\x1a\\x0a	[fid=000100018-50-0000LZO;ext=lzo;mime=;]LZOP archive file

# Magic ID for Lzx files.
# Submitted on 2004-02-23 by Carl
0	string	LZX	[fid=000100058-50-0000LZX;ext=lzx;mime=;]LZX archive file

# Magic ID for Mdcd (Mike Davenport compressor) files.
# Submitted on 2004-02-08 by Carl
0	string	MDmd	[fid=000100004-50-00000MD;ext=md;mime=;]Mike Davenport archive file
>4	byte	x	, version %d
&5	byte	1	

# Magic ID for Nashrink files.
# Submitted on 2004-02-23 by Carl
0	string	NSK	[fid=000001292-50-0000NSK;ext=nsk;mime=;]NaShrink archive file

# Magic ID for Semone archiver files.
# Submitted on 2004-02-27 by Carl
0	string	SEMh	[fid=000100068-50-0000ONE;ext=one;mime=;]Semone archive file

# Magic ID for Lpac files.
# Submitted on 2004-03-04 by Carl
0	string	LPAC	[fid=000100084-50-0000PAC;ext=pac;mime=;]LPAC audio archive file

# Magic ID for CrossePAC files.
# Submitted on 2004-02-08 by Carl
0	string	DSIGDCC	[fid=000001262-50-0000PAC;ext=pac;mime=;]CrossePAC archive file

# Magic ID for High Compression Markov Predictive Coder files.
# Submitted on 2004-02-23 by Carl
0	string	PPZ2	[fid=000100061-50-0000PMZ;ext=pmz;mime=;]PPMZ2 archive file

# Magic ID for Powerpacker files.
# Submitted on 2004-02-27 by Carl
0	string	PP20	[fid=000100062-50-00000PP;ext=pp;mime=;]Powerpacker archive file

# Magic ID for PAQ1 files.
# Submitted on 2004-02-27 by Carl
0	string	PAQ1\\x0D\\x0A	[fid=000100064-50-0000PQ1;ext=pq1;mime=;]PAQ1 archive file

# Magic ID for PAQ3 files.
# Submitted on 2004-02-27 by Carl
0	string	PAQ3\\x0D\\x0A	[fid=000100064-50-0000PQ3;ext=pq3;mime=;]PAQ3 archive file

# Magic ID for PAQ6 files.
# Submitted on 2004-02-27 by Carl
0	string	PAQ6	[fid=000100064-50-0000PQ6;ext=pq6;mime=;]PAQ6 archive file

# Magic ID for Pretty simple archiver files.
# Submitted on 2004-02-27 by Carl
0	string	PSA\\x01\\x03	[fid=000100065-50-0000PSA;ext=psa;mime=;]Pretty simple archiver archive file

# Magic ID for Quantum compressor files.
# Submitted on 2004-02-27 by Carl
0	string	DS	[fid=000001294-50-000000Q;ext=q;mime=;]Quantum archive file
&2	byte	<2	
>2	byte	x	, version %d
>3	byte	x	.%d

# Magic ID for Rar files.
# Submitted on 2004-02-08 by Carl
0	string	\\x52\\x61\\x72\\x21\\x1a\\x07\\x00	[fid=000001267-50-0000RAR;ext=rar;mime=;]RAR archive file

# Magic ID for Romanian archiver eXpert (RAX) files.
# Submitted on 2004-02-27 by Carl
0	string	ULEB	[fid=000001295-50-0000RAX;ext=rax;mime=;]RAX archive file

# Magic ID for Reduq files.
# Submitted on 2004-02-27 by Carl
0	string	rdqx	[fid=000100066-50-0000RDQ;ext=rdq;mime=;]Reduq archive file

# Magic ID for RPM files.
# Submitted on 2004-03-04 by Carl
0	string	\\xed\\xab\\xee\\xdb	[fid=000000000-50-0000RPM;ext=rpm;mime=;]RPM archive
>4	byte	x	, version %d
>5	byte	x	.%d

# Magic ID for rzip files.
# Submitted on 2004-03-04 by Carl
0	string	RZIP	[fid=000100076-50-00000RZ;ext=rz;mime=;]Rzip archive file
>4	byte	x	, version %d
>5	byte	x	.%d

# Magic ID for Streamline Archival Utility files.
# Submitted on 2004-02-08 by Carl
3	string	LH0	[fid=000001264-50-0000SAR;ext=sar;mime=;]Streaming Archiver Utility archive file

# Magic ID for Streamline Archival Utility files.
# Submitted on 2004-02-08 by Carl
3	string	LH4	[fid=000001264-50-0000SAR;ext=sar;mime=;]Streaming Archiver Utility archive file

# Magic ID for Streamline Archival Utility files.
# Submitted on 2004-02-08 by Carl
3	string	LH5	[fid=000001264-50-0000SAR;ext=sar;mime=;]Streaming Archiver Utility archive file

# Magic ID for SBX Archiver files.
# Submitted on 2004-02-27 by Carl
0	string	SB1\\x00	[fid=000001297-50-00000SB;ext=sb;mime=;]SBX archive file

# Magic ID for SBC Archiver files.
# Submitted on 2004-02-27 by Carl
0	string	SBC\\x1E	[fid=000100067-50-0000SBC;ext=sbc;mime=;]SBC archive file

# Submitted on 2004-02-10 by Carl
10	string	#\\ This\\ is\\ a\\ shell\\ archive	[fid=000000000-50-000SHAR;ext=shar;mime=;]UNIX shell archive

# Submitted on 2004-02-10 by Carl
11	string	#\\ This\\ is\\ a\\ shell\\ archive	[fid=000000000-50-000SHAR;ext=shar;mime=;]UNIX shell archive

# Magic ID for Nulib files.
# Submitted on 2004-02-08 by Carl
0	string	\\x4e\\xf5\\x46\\xd8	[fid=000100005-50-0000SHK;ext=shk;mime=;]Shrinkit/Nulib archive file

# Magic ID for Nulib files.
# Submitted on 2004-02-08 by Carl
0	string	\\x4e\\xf5\\x46\\xe9\\x6c\\xe5	[fid=000100005-50-0000SHK;ext=shk;mime=;]Shrinkit/Nulib archive file

# Magic ID for Stuffit files.
# Submitted on 2004-03-04 by Carl
0	string	StuffIt\\ 	[fid=000001272-50-0000SIT;ext=sit;mime=;]Stuffit archive file

# Magic ID for Stuffit files.
# Submitted on 2004-02-11 by Carl
0	string	SIT!	[fid=000001272-50-0000SIT;ext=sit;mime=;]Stuffit archive file
&10	string	rLau	
>14	byte	x	, version %d.0

# Magic ID for Stuffit Extended files.
# Submitted on 2004-03-04 by Carl
0	string	StuffIt!	[fid=000001272-50-000SITX;ext=sitx;mime=;]Stuffit extended archive file

# Magic ID for Sof files.
# Submitted on 2004-03-04 by Carl
0	string	PK\\x03\\x06	[fid=000000000-50-0000SOF;ext=sof;mime=;]SOF archive file

# Magic ID for Splint files.
# Submitted on 2004-02-08 by Carl
0	string	\\x93\\xB9\\x06	[fid=000100006-50-0000SPL;ext=spl;mime=;]Splint archive file

# Magic ID for Sqweez files.
# Submitted on 2004-02-10 by Carl
0	string	SQWEZ\\ 	[fid=000100014-50-0000SQZ;ext=sqz;mime=;]Sqwez archive file

# Magic ID for Sqz files.
# Submitted on 2004-02-10 by Carl
0	string	HLSQZ	[fid=000100015-50-0000SQZ;ext=sqz;mime=;]Squeeze archive file
>5	string	x	, version %.1s.0

# Magic ID for Stonecracker files.
# Submitted on 2004-02-27 by Carl
0	string	S401	[fid=000100063-50-0000STC;ext=stc;mime=;]Stonecracker archive file
>0	string	S401	, version 4.01

# Magic ID for Stonecracker files.
# Submitted on 2004-02-27 by Carl
0	string	S403	[fid=000100063-50-0000STC;ext=stc;mime=;]Stonecracker archive file
>0	string	S403	, version 4.03

# Magic ID for Stonecracker files.
# Submitted on 2004-02-27 by Carl
0	string	S404	[fid=000100063-50-0000STC;ext=stc;mime=;]Stonecracker archive file
>0	string	S404	, version 4.04

# Magic ID for Szip files.
# Submitted on 2004-02-08 by Carl
0	string	SZ\\x0A\\x04	[fid=000100009-50-00000SZ;ext=sz;mime=;]SZIP archive file
>4	byte	x	, version %d
>5	byte	x	.%d

# Magic ID for Tar,pax files.
# Submitted on 2004-02-10 by Carl
257	string	ustar\\040\\040\\0	[fid=000000000-50-0000TAR;ext=tar;mime=;]GNU tar archive

# Magic ID for Tar,pax files.
# Submitted on 2004-02-10 by Carl
257	string	ustar\\0\\x06	[fid=000000003-50-0001003;ext=tar;mime=;]Opengroup/POSIX tar archive

# Magic ID for uc2 files.
# Submitted on 2004-02-10 by Carl
0	string	UC2\\x1a	[fid=000001271-50-0000UC2;ext=uc2;mime=;]Ultra Compressor archive file

# Magic ID for Uharc files.
# Submitted on 2004-03-04 by Carl
0	string	UHA	[fid=000100083-50-0000UHA;ext=uha;mime=;]UHArc archive file

# Magic ID for YBS archiver files.
# Submitted on 2004-02-27 by Carl
0	string	YBS3	[fid=000100071-50-0000YBS;ext=ybs;mime=;]YBS archive file

# Submitted on 2004-02-11 by Carl
0	string	\\037\\235	[fid=000000000-50-000000Z;ext=z;mime=;]UNIX archive file

# Magic ID for Pkunzip, Info-zip Unzip files.
# Submitted on 2004-02-08 by Carl
0	lelong	0x04034b50	[fid=000001266-50-0000ZIP;ext=zip;mime=application/zip;]Pkzip archive file

# Magic ID for zoo files.
# Submitted on 2004-02-10 by Carl
0	string	ZOO	[fid=000100012-50-0000ZOO;ext=zoo;mime=;]Zoo archive file
&0x14	lelong	0x0FDC4A7DC	
>32	byte	x	, version %d
>33	byte	x	.%d

# Magic ID for Zzip files.
# Submitted on 2004-02-08 by Carl
0	string	ZZ	[fid=000100007-50-00000ZZ;ext=zz;mime=;]ZZip archive file
>2	byte	x	, version %d.0

# Magic ID for 624 files.
# Submitted on 2004-03-03 by Carl
0	string	[ESP]\\xB5\\x78	[fid=000100002-51-0000COM;ext=com;mime=;]624 executable compressed file (MS-DOS)

# Magic ID for 624 files.
# Submitted on 2004-03-03 by Carl
0	string	PULP\\x83	[fid=000100002-51-0000COM;ext=com;mime=;]624 executable compressed file (MS-DOS)

# Magic ID for Lzexe files.
# Submitted on 2004-02-23 by Carl
0x1C	string	LZ91	[fid=000100053-51-0000EXE;ext=exe;mime=;]Lzexe compressed executable file (MS-DOS)

# Magic ID for HTML Help Workshop files.
# Submitted on 2004-02-08 by Carl
0	string	ITSF	[fid=000001001-60-0000CHM;ext=chm;mime=;]Microsoft compiled hypertext document

# Magic ID for Borland Delphi files.
# Submitted on 2004-07-30 by Carl
2	string	DELPHI.DIAGRAM.PORTFOLIO	[fid=000001005-60-0000DDP;ext=ddp;mime=;]Delphi Diagram Portfolio file

# Magic ID for Pagestream files.
# Submitted on 2004-02-08 by Carl
0	string	FORM	[fid=000001268-60-0000DOC;ext=doc;mime=;]Pagestream document
&8	string	DOC\\ 	

# Submitted on 2004-02-08 by Carl
0	string	CAT\\ 	[fid=000001010-60-000FTXT;ext=ftxt;mime=;]Formatted text interchange file
&8	string	FTXT	

# Submitted on 2004-02-08 by Carl
0	string	FORM	[fid=000001010-60-000FTXT;ext=ftxt;mime=;]Formatted text interchange file
&8	string	FTXT	

# Submitted on 2004-02-08 by Carl
0	string	LIST	[fid=000001010-60-000FTXT;ext=ftxt;mime=;]Formatted text interchange file
&8	string	FTXT	

# Submitted on 2004-02-08 by Carl
0	string	@database	[fid=000001007-60-00GUIDE;ext=guide;mime=;]AmigaGuide hypertext document

# Submitted on 2004-02-14 by Carl
0	lelong	0x00035F3F	[fid=000001001-60-0000HLP;ext=hlp;mime=;]Microsoft Windows Help file

# Submitted on 2004-10-08 by Carl
0	string	<!DOCTYPE\\ 	[fid=000000001-60-0015445;ext=html,htm;mime=text/html;]HyperText Markup Language document (HTML)
&10	string/c	html	

# Submitted on 2004-02-08 by Carl
0	string	HDOC	[fid=000001006-60-0000HYP;ext=hyp;mime=;]Atari ST-Guide hypertext document

# Magic ID for OS/2 files.
# Submitted on 2004-02-08 by Carl
0	string	HSP	[fid=000001009-60-0000INF;ext=inf;mime=;]OS/2 Guide hypertext document

# Submitted on 2004-02-08 by Carl
0	string	This\\ is\\ Info\\ file	[fid=000100010-60-000INFO;ext=info;mime=;]GNU Info hypertext document

# Magic ID for Adobe Acrobat files.
# Submitted on 2004-10-08 by Carl
0	string	%PDF-	[fid=000000001-60-0015930;ext=pdf;mime=application/pdf;]Portable document format document file (PDF)
>5	string	x	, version %.1s
>7	string	x	.%.1s

# Magic ID for Microsoft Wordpad files.
# Submitted on 2004-02-08 by Carl
0	string	{\\\\rtf	[fid=000001001-60-0000RTF;ext=rtf;mime=text/rtf;]Rich Text Format document
>5	string	x	, version %.1s.x

# Magic ID for DocBook files.
# Submitted on 2004-10-08 by Carl
0	string	<!DOCTYPE\\ 	[fid=000000001-60-0008879;ext=sgml,sgm;mime=text/sgml;]Standard general markup language document (SGML)

# Magic ID for Turbo C files.
# Submitted on 2004-02-14 by Carl
0	string	TURBO\\ C\\ HELP\\ FILE\\x00	[fid=000001005-60-0000TCH;ext=tch;mime=;]Turbo C help file

# Magic ID for Turbo Pascal files.
# Submitted on 2004-02-08 by Carl
0	string	TURBO\\ PASCAL\\ HELP\\ FILE\\x00	[fid=000001005-60-0000TPH;ext=tph;mime=;]Borland Pascal help file

# Magic ID for Turbo Vision files.
# Submitted on 2004-02-08 by Carl
0	lelong	0x46484246	[fid=000001005-60-0000TVH;ext=tvh;mime=;]Borland Turbo Vision help file

# Magic ID for Wordperfect files.
# Submitted on 2004-02-08 by Carl
0	string	\\xFFWPC	[fid=000001008-60-0000WPD;ext=wpd,doc;mime=application/vnd.wordperfect;]Wordperfect document
&9	byte	0x0A	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Microsoft Write files.
# Submitted on 2004-02-08 by Carl
0	leshort	0137061	[fid=000001001-60-0000WRI;ext=wri;mime=;]Microsoft Write document
&2	leshort	0x0000	

# Magic ID for Microsoft Write files.
# Submitted on 2004-02-08 by Carl
0	leshort	0137062	[fid=000001001-60-0000WRI;ext=wri;mime=;]Microsoft Write document
&2	leshort	0x0000	

# Magic ID for X-Windows files.
# Submitted on 2004-09-01 by Carl
0	string	STARTFONT\\ 	[fid=000001003-70-0000BDF;ext=bdf;mime=;]Adobe glyph bitmap distribution format font file

# Magic ID for Deluxe Paint files.
# Submitted on 2004-09-01 by Carl
0	string	CF\\x01\\x00	[fid=000001010-70-000000C;ext=c;mime=;]Deluxe paint multi-colour font file

# Magic ID for Figlet files.
# Submitted on 2004-09-01 by Carl
0	string	flf2	[fid=000100122-70-0000FLF;ext=flf;mime=;]Figlet font file

# Magic ID for PCL 5 files.
# Submitted on 2004-09-01 by Carl
0	string	\\x00\\x44\\x00\\x01\\x00\\x00\\x00\\x1A	[fid=000001336-70-0000LIB;ext=lib,type;mime=;]Intellifont Scalable Typeface Format  file

# Magic ID for Deluxe Paint files.
# Submitted on 2004-09-01 by Carl
0	string	\\x1B\\x29\\x73\\x36\\x34\\x57\\x00\\x40	[fid=000001010-70-000000M;ext=m;mime=;]Deluxe paint mono colour font file

# Submitted on 2004-05-20 by Carl
0	belong	0x00010000	[fid=000001001-70-0000TTF;ext=otf,ttf;mime=;]Opentype font file

# Submitted on 2004-05-20 by Carl
0	string	OTTO	[fid=000001001-70-0000TTF;ext=otf,ttf;mime=;]Opentype font file, CFF type

# Magic ID for X-Windows files.
# Submitted on 2004-09-01 by Carl
0	belong	0x01666370	[fid=000000000-70-0000PCF;ext=pcf;mime=;]Portable compiled format (PCF) font file

# Submitted on 2004-05-20 by Carl
0	string	%!FontType1	[fid=000000001-70-0009541;ext=pfa;mime=;]Type 1 font file

# Submitted on 2004-05-20 by Carl
0	string	%!PS-AdobeFont-1.0	[fid=000000001-70-0009541;ext=pfa;mime=;]Type 1 font file

# Submitted on 2004-05-20 by Carl
6	string	%!FontType1	[fid=000001003-70-0000PFB;ext=pfb;mime=;]Type 1 printer font binary file
&0	byte	0x80	

# Submitted on 2004-05-20 by Carl
6	string	%!PS-AdobeFont-1.0	[fid=000001003-70-0000PFB;ext=pfb;mime=;]Type 1 printer font binary file
&0	byte	0x80	

# Magic ID for X-Windows, GemDOS files.
# Submitted on 2004-09-01 by Carl
2	string	\\x2E\\x30\\x0D\\x0A\\x00\\x00	[fid=000001337-70-0000SPD;ext=spd;mime=;]Bitstream Speedo font file
&0	string	D	
>24	string	x	[title=%.70s]
>1	string	x	,version %.1s.0

# Submitted on 2004-05-20 by Carl
0	string	true	[fid=000001002-70-0000TTF;ext=ttf;mime=;]Truetype font file

# Submitted on 2004-05-20 by Carl
0	string	typ1	[fid=000001002-70-0000TTF;ext=ttf;mime=;]Truetype font file

# Submitted on 2004-05-20 by Carl
0	string	StartCompFontMetrics	[fid=000001003-70-0000AFM;ext=afm;mime=;]Adobe composite font metrics file

# Submitted on 2004-05-20 by Carl
0	string	StartFontMetrics	[fid=000001003-70-0000AFM;ext=afm;mime=;]Adobe font metrics file

# Submitted on 2004-05-20 by Carl
0	string	StartMasterFontMetrics	[fid=000001003-70-0000AFM;ext=afm;mime=;]Adobe master font metrics file

# Submitted on 2004-05-20 by Carl
0	leshort	0x0100	[fid=000001001-70-0000PFM;ext=pfm;mime=;]Printer Font Metrics file for Type 1 fonts
&66	leshort	0x0081	

# Submitted on 2004-02-08 by Carl
0	lelong	0x75B22630	[fid=000001001-81-0000ASF;ext=asf,wma,wmv;mime=;]Microsoft Advanced Streaming format multimedia file
&6	leshort	0x11CF	

# Submitted on 2004-02-08 by Carl
0	string	RIFF	[fid=000001001-81-0000AVI;ext=avi;mime=;]Audio-video interleaved movie, little-endian
&8	string	AVI\\ 	

# Submitted on 2004-02-13 by Carl
0	string	RIFX	[fid=000001001-81-0000AVI;ext=avi;mime=;]Audio-video interleaved movie, big-endian
&8	string	AVI\\ 	

# Magic ID for Quicktime files.
# Submitted on 2004-02-08 by Carl
4	string	mdat	[fid=000001002-81-0000MOV;ext=mov,qt;mime=video/quicktime;]Apple QuickTime movie data (mdat)

# Magic ID for Quicktime files.
# Submitted on 2004-02-08 by Carl
4	string	moov	[fid=000001002-81-0000MOV;ext=mov,qt;mime=video/quicktime;]Apple QuickTime movie resource (moov)

# Submitted on 2004-05-20 by Carl
0	belong	0x1B3	[fid=000000001-81-000MPEG;ext=mpe,mpeg,mpg;mime=video/mpeg;]MPEG multimedia (audio/video) stream file
&Z4	belong	0x01B9	

# Submitted on 2004-05-20 by Carl
0	belong	0x1BA	[fid=000000001-81-000MPEG;ext=mpe,mpeg,mpg;mime=video/mpeg;]MPEG multimedia (audio/video) stream file
&Z4	belong	0x01B9	

# Submitted on 2004-05-20 by Carl
0	belong	0x1E0	[fid=000000001-81-000MPEG;ext=mpe,mpeg,mpg;mime=video/mpeg;]MPEG multimedia (audio/video) stream file
&Z4	belong	0x01B9	

# Magic ID for Alias/Wavefront files.
# Submitted on 2004-02-08 by Carl
0	string	MOVI	[fid=000001004-81-00000MV;ext=mv;mime=;]Alias/Wavefront movie file

# Submitted on 2004-05-18 by Carl
0	string	OggS	[fid=000000000-81-0000OGG;ext=ogg;mime=application/ogg;]OGG Multimedia container stream file

# Magic ID for Realplayer files.
# Submitted on 2004-05-19 by Carl
0	string	.RMF	[fid=000001027-81-00000RM;ext=rm,ra,rt,rp,rpa;mime=;]RealMedia multimedia container stream file

# Magic ID for Macromedia Flash files.
# Submitted on 2004-02-08 by Carl
0	string	FWS	[fid=000001259-81-0000SWF;ext=swf;mime=;]Shockwave Macromedia animation
>3	byte	x	, version %d.0

# Magic ID for Vivo player files.
# Submitted on 2004-05-20 by Carl
5	string	Version:Vivo	[fid=000000000-81-000VIVO;ext=viv,vivo;mime=video/vnd.vivo;]Vivo multimedia stream file

# Magic ID for Aegis Animator files.
# Submitted on 2004-02-08 by Carl
0	string	FORM	[fid=000001261-82-000ANIM;ext=anim;mime=;]Amiga / Sparta software animation
&8	string	ANIM	

# Magic ID for Fantavision movie maker files.
# Submitted on 2004-02-08 by Carl
0	string	FORM	[fid=000001260-82-000FANT;ext=fant;mime=;]Fantavision movie
&8	string	FANT	

# Magic ID for Autodesk Animator Pro files.
# Submitted on 2004-02-08 by Carl
4	leshort	0xAF12	[fid=000001254-82-0000FLC;ext=flc;mime=;]Autodesk Animator Pro animation
&12	leshort	0x08	
>8	leshort	x	[res=%dx
>10	leshort	x	%d
>12	leshort	x	x8bpp]

# Magic ID for Autodesk Animator files.
# Submitted on 2004-02-08 by Carl
4	leshort	0xAF11	[fid=000001254-82-0000FLI;ext=fli;mime=;]Autodesk Animator animation
&12	leshort	0x08	
>8	leshort	x	[res=%dx
>10	leshort	x	%d
>12	leshort	x	x8bpp]

# Submitted on 2004-04-13 by Carl
0	string	\\x8AMNG\\x0d\\x0A\\x1A\\x0A	[fid=000000000-82-0000MNG;ext=mng;mime=;]Multi-image network graphics animation file
>0x10	belong	x	[res=%dx
>0x14	belong	x	%d]

# Magic ID for Cyberpaint files.
# Submitted on 2004-02-08 by Carl
0	beshort	0xFEDB	[fid=000000000-82-0000SEQ;ext=seq;mime=;]Cyberpaint Animation Sequence
&2	beshort	0x0000	

# Magic ID for Quicken,Money files.
# Submitted on 2004-08-01 by Carl
0	string	OFXHEADER:	[fid=000000008-91-0000QFX;ext=qfx;mime=;]Open financial exchange file (SGML)

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Account	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Bank	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Cash	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Cat	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:CCard	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Class	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Invst	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Memorized	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Oth A	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Oth L	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Submitted on 2004-02-11 by Carl
0	string	RRG	[fid=000001001-B0-0000CRD;ext=crd;mime=;]Windows 3.x cardfile

# Submitted on 2004-02-11 by Carl
0	string	MGC	[fid=000001001-B0-0000CRD;ext=crd;mime=;]Windows NT 3.51 card file

# Submitted on 2004-02-14 by Carl
0	string	BEGIN:VCARD	[fid=000001015-B0-0000VCF;ext=vcf;mime=;]vCard Business Card file

# Submitted on 2004-02-14 by Carl
0	string	\\xb5\\xa2\\xb0\\xb3\\xb3\\xb0\\xa2\\xb5	[fid=000001001-B1-0000CAL;ext=cal;mime=;]Microsoft windows calendar file

# Submitted on 2004-02-14 by Carl
0	string	BEGIN:VCALENDAR	[fid=000001016-B1-0000VCS;ext=vcs;mime=;]vCalendar/iCalendar Agenda file

# Submitted on 2004-05-17 by Carl
0	string	\\x00\\x00\\x00\\x3C\\x00\\x00\\x00\\x3F	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-32BE encoded
&8	belong	0x00000078	
&12	belong	0x0000006d	

# Submitted on 2004-05-17 by Carl
0	string	\\x00\\x00\\xfe\\xff\\x00\\x00\\x00\\x3C	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-32BE encoded
&8	belong	0x0000003F	
&12	belong	0x00000078	

# Submitted on 2004-05-17 by Carl
0	string	\\x00\\x3C\\x00\\x3F\\x00\\x78\\x00\\x6D\\x00\\x6c	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-16BE encoded

# Submitted on 2004-05-17 by Carl
0	string	\\x3C\\x00\\x00\\x00\\x3F\\x00\\x00\\x00	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-32LE encoded
&8	beshort	0x00000078	
&12	beshort	0x0000006d	

# Submitted on 2004-05-17 by Carl
0	string	\\x3C\\x00\\x3F\\x00\\x78\\x00\\x6D\\x00\\x6c\\x00	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-16LE encoded

# Submitted on 2004-05-17 by Carl
0	string	\\xef\\xbb\\xbf<?xml	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-8 encoded

# Submitted on 2004-05-17 by Carl
0	string	\\xfe\\xff\\x00\\x3C\\x00\\x3F\\x00\\x78\\x00\\x6D	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-16BE encoded

# Submitted on 2004-05-17 by Carl
0	string	\\xff\\xfe\\x00\\x00\\x3C\\x00\\x00\\x00	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-32LE encoded
&8	beshort	0x3F000000	
&12	beshort	0x78000000	

# Submitted on 2004-05-17 by Carl
0	string	\\xff\\xfe\\x3C\\x00\\x3F\\x00\\x78\\x00\\x6D\\x00	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-16LE encoded

# Submitted on 2004-05-17 by Carl
0	string	<?xml	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file

# Submitted on 2004-04-20 by Carl
0	string	\\xd0\\xcf\\x11\\xe0\\xa1\\xb1\\x1a\\xe1	[fid=000001001-F4-0000OLE;ext=ole;mime=;]Microsoft OLE Compound file, big-endian
&0x1C	leshort	!0xFFFE	

# Submitted on 2004-04-20 by Carl
0	string	\\xd0\\xcf\\x11\\xe0\\xa1\\xb1\\x1a\\xe1	[fid=000001001-F4-0000OLE;ext=ole;mime=;]Microsoft OLE Compound file, little-endian
&0x1C	leshort	0xFFFE	
>0x1A	leshort	x	, version %d
>0x18	leshort	x	.%d

# Magic ID for Freepascal compiler files.
# Submitted on 2004-10-24 by Carl
0	string	PPU0	[fid=000100120-11-0000PPU;ext=ppu,ppl,ppo,ppw,ppa,ppt;mime=;]Freepascal unit file
>0x04	string	x	, version %.2s

# Magic ID for Smartcards files.
# Submitted on 2004-10-29 by Carl
0	belong	0x00FACADE	[fid=000001011-10-0000EXP;ext=exp;mime=;]Javacard API export file
>0x05	byte	x	, version %d
>4	byte	x	.%d

# Submitted on 2004-10-29 by Carl
0	string	-rom1fs-	[fid=000100121-0F-0000IMG;ext=img;mime=;]Simple ROM filesystem (ROMFS)
>16	string	x	[title=%s]

# Magic ID for Virtual PC files.
# Submitted on 2004-10-29 by Carl
0	string	conectix	[fid=000001001-0F-0000VHD;ext=vhd;mime=;]Virtual PC Hard drive

# Submitted on 2004-11-12 by Carl Eric Codere
0	string	%!PS-Adobe-	[fid=000001003-33-00000PS;ext=ps,eps;mime=application/postscript;]Postscript file
>11	string	x	, level %.1s
>13	string	x	.%.1s

# Submitted on 2004-11-12 by Carl Eric Codere
0	lelong	0x526f6d2e	[fid=000001338-0F-0000ROM;ext=rom,fs;mime=;]eCos ROM Filesystem image (ROMFS)
>16	string	x	[title=%.16s]

# Magic ID for PADGen files.
# Submitted on 2004-11-26 by Carl Eric Codere
0x29	string	<XML_DIZ_INFO>	[fid=000001339-A0-0000XML;ext=xml;mime=text/xml;]Portable application description file (XML)
&0	string	<?xml	

# Magic ID for PADGen files.
# Submitted on 2004-11-26 by Carl Eric Codere
0x28	string	<XML_DIZ_INFO>	[fid=000001339-A0-0000XML;ext=xml;mime=text/xml;]Portable application description file (XML)
&0	string	<?xml	

# Submitted on 2004-11-26 by Carl Eric Codere
0x29	string	<x:xmpmeta\\ 	[fid=000001003-A0-0000XMP;ext=xml,xmp;mime=text/xml;]Extensible metadata platform sidecar file (XML)
&0	string	<?xml	

# Submitted on 2004-11-26 by Carl Eric Codere
0x28	string	<x:xmpmeta\\ 	[fid=000001003-A0-0000XMP;ext=xml,xmp;mime=text/xml;]Extensible metadata platform sidecar file (XML)
&0	string	<?xml	

# Magic ID for Texinfo files.
# Submitted on 2004-11-26 by Carl Eric Codere
1	string	input texinfo	[fid=000001340-00-000TEXI;ext=texi;mime=;]Texinfo source file

# Magic ID for MS-DOS files.
# Submitted on 2004-11-26 by Carl Eric Codere
0	string	\\xFFFONT	[fid=000001001-70-0000CPI;ext=cpi;mime=;]MS-DOS code page raster font

# Magic ID for UNIX files.
# Submitted on 2004-11-26 by Carl Eric Codere
0	string	TZif	[fid=000000000-90-0000000;ext=;mime=;]Timezone information database file (compiled)

# Magic ID for Telix files.
# Submitted on 2005-03-04 by Carl Eric Codere
0	lelong	0x2e2b291a	[fid=000100126-B0-0000FON;ext=fon;mime=;]Telix phone book
&4	leshort	1	

# Magic ID for Microsoft Visual C++ files.
# Submitted on 2005-03-04 by Carl Eric Codere
0	string	VCPCH0\\x00\\x00	[fid=000001001-90-0000PCH;ext=pch;mime=;]Microsoft Visual C++ pre-compiled header(s)

# Magic ID for Microsoft Visual C++ files.
# Submitted on 2005-03-04 by Carl Eric Codere
0	string	Microsoft\\ C/C++\\ program\\ database	[fid=000001001-90-0000PDB;ext=pdb;mime=;]Microsoft Visual C++ debug information database
&0x25	string	\\x0D\\x0A\\x1A	
&0x28	string	JG\\x00	

# Magic ID for Microsoft Visual C++ files.
# Submitted on 2005-03-04 by Carl Eric Codere
0	string	Microsoft\\ Linker\\ Database\\x0A\\x07\\x1A	[fid=000001001-90-0000ILK;ext=ilk;mime=;]Microsoft Visual C++ linker database


# CRC32:8BC3BA46
' - ); -/** - * Returns the test data for a given key - * - * @param string $key - */ - public function get($key) { -/** - * data property - * - * @var array - * @access public - */ - static $data = array(); - - if (empty($data)) { - $vars = get_class_vars(__CLASS__); - foreach ($vars['data'] as $k => $v) { - $data[$k] = base64_decode($v); - if (preg_match('/^[ais]:[0-9]+/', $data[$k])) { - $data[$k] = unserialize($data[$k]); - } - } - } - - if (!isset($data[$key])) { - return false; - } - return $data[$key]; - } -} diff --git a/cake/tests/test_app/models/datasources/test/test_local_driver.php b/cake/tests/test_app/models/datasources/test/test_local_driver.php deleted file mode 100644 index e483cb303..000000000 --- a/cake/tests/test_app/models/datasources/test/test_local_driver.php +++ /dev/null @@ -1,5 +0,0 @@ -Sweet, "Test App" got Baked by CakePHP! -

-'; - echo __('Your tmp directory is writable.'); - echo ''; - else: - echo ''; - echo __('Your tmp directory is NOT writable.'); - echo ''; - endif; -?> -

-

-'; - echo __('The %s is being used for caching. To change the config edit APP/config/core.php ', ''. $settings['engine'] . 'Engine'); - echo ''; - else: - echo ''; - echo __('Your cache is NOT working. Please check the settings in APP/config/core.php'); - echo ''; - endif; -?> -

-

-'; - echo __('Your database configuration file is present.'); - $filePresent = true; - echo ''; - else: - echo ''; - echo __('Your database configuration file is NOT present.'); - echo '
'; - echo __('Rename config/database.php.default to config/database.php'); - echo ''; - endif; -?> -

- -

-'; - echo __('Cake is able to connect to the database.'); - echo ''; - else: - echo ''; - echo __('Cake is NOT able to connect to the database.'); - echo ''; - endif; -?> -

- -

-

-', APP . 'views' . DS . 'layouts' . DS . 'default.ctp.
', APP . 'webroot' . DS . 'css'); -?> -

\ No newline at end of file diff --git a/cake/tests/test_app/views/posts/test_nocache_tags.ctp b/cake/tests/test_app/views/posts/test_nocache_tags.ctp deleted file mode 100644 index 745ef4ad9..000000000 --- a/cake/tests/test_app/views/posts/test_nocache_tags.ctp +++ /dev/null @@ -1,143 +0,0 @@ - -

- - - - - -

-

- - ' . $settings['engine']; - echo __(' is being used to cache, to change this edit config/core.php '); - echo '

'; - - echo 'Settings: '; - - else: - echo __('NOT working.'); - echo '
'; - if (is_writable(TMP)): - echo __('Edit: config/core.php to insure you have the newset version of this file and the variable $cakeCache set properly'); - endif; - endif; - ?> - -

-

- - '; - echo __('Rename config/database.php.default to config/database.php'); - endif; - ?> - -

-getDataSource('default'); -?> -

- - isConnected()): - __(' is able to '); - else: - __(' is NOT able to '); - endif; - __('connect to the database.'); - ?> - -

- -

- -

-

-
-
-
- -

-

-

-
-
- -

-

-

- -

-

- -

- \ No newline at end of file diff --git a/cake/tests/test_app/views/scaffolds/empty b/cake/tests/test_app/views/scaffolds/empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/cake/libs/cache.php b/lib/Cake/Cache/Cache.php similarity index 93% rename from cake/libs/cache.php rename to lib/Cake/Cache/Cache.php index 0478d3bf4..2ffdeb007 100644 --- a/cake/libs/cache.php +++ b/lib/Cake/Cache/Cache.php @@ -18,14 +18,16 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +App::uses('Inflector', 'Utility'); + /** * Cache provides a consistent interface to Caching in your application. It allows you - * to use several different Cache engines, without coupling your application to a specific - * implementation. It also allows you to change out cache storage or configuration without effecting + * to use several different Cache engines, without coupling your application to a specific + * implementation. It also allows you to change out cache storage or configuration without effecting * the rest of your application. * - * You can configure Cache engines in your application's `bootstrap.php` file. A sample configuration would - * be + * You can configure Cache engines in your application's `bootstrap.php` file. A sample configuration would + * be * * {{{ * Cache::config('shared', array( @@ -35,7 +37,7 @@ * }}} * * This would configure an APC cache engine to the 'shared' alias. You could then read and write - * to that cache alias by using it for the `$config` parameter in the various Cache methods. In + * to that cache alias by using it for the `$config` parameter in the various Cache methods. In * general all Cache operations are supported by all cache engines. However, Cache::increment() and * Cache::decrement() are not supported by File caching. * @@ -148,14 +150,15 @@ class Cache { protected static function _buildEngine($name) { $config = self::$_config[$name]; - list($plugin, $class) = pluginSplit($config['engine']); + list($plugin, $class) = pluginSplit($config['engine'], true); $cacheClass = $class . 'Engine'; - if (!class_exists($cacheClass) && self::_loadEngine($class, $plugin) === false) { + App::uses($cacheClass, $plugin . 'Cache/Engine'); + if (!class_exists($cacheClass)) { return false; } $cacheClass = $class . 'Engine'; if (!is_subclass_of($cacheClass, 'CacheEngine')) { - throw new CacheException(__('Cache engines must use CacheEngine as a base class.')); + throw new CacheException(__d('cake_dev', 'Cache engines must use CacheEngine as a base class.')); } self::$_engines[$name] = new $cacheClass(); if (self::$_engines[$name]->init($config)) { @@ -192,35 +195,15 @@ class Cache { 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 - * operation (write, decrement, increment, clear). Any reads that are done before the write, will - * use the modified settings. If `$settings` is empty, the settings will be reset to the + * operation (write, decrement, increment, clear). Any reads that are done before the write, will + * use the modified settings. If `$settings` is empty, the settings will be reset to the * original configuration. * * Can be called with 2 or 3 parameters. To set multiple values at once. * - * `Cache::set(array('duration' => '+30 minutes'), 'my_config');` + * `Cache::set(array('duration' => '+30 minutes'), 'my_config');` * * Or to set one value. * @@ -315,7 +298,7 @@ class Cache { self::set(null, $config); if ($success === false && $value !== '') { trigger_error( - __("%s cache was unable to write '%s' to cache", $config, $key), + __d('cake_dev', "%s cache was unable to write '%s' to cache", $config, $key), E_USER_WARNING ); } @@ -389,7 +372,7 @@ class Cache { * * @param string $key Identifier for the data * @param integer $offset How much to substract - * @param string $config Optional string configuration name. Defaults to 'default' + * @param string $config Optional string configuration name. Defaults to 'default' * @return mixed new value, or false if the data doesn't exist, is not integer, * or if there was an error fetching it */ diff --git a/cake/libs/cache/apc.php b/lib/Cake/Cache/Engine/ApcEngine.php similarity index 100% rename from cake/libs/cache/apc.php rename to lib/Cake/Cache/Engine/ApcEngine.php diff --git a/cake/libs/cache/file.php b/lib/Cake/Cache/Engine/FileEngine.php similarity index 96% rename from cake/libs/cache/file.php rename to lib/Cake/Cache/Engine/FileEngine.php index f6db44d09..fd6286b9a 100644 --- a/cake/libs/cache/file.php +++ b/lib/Cake/Cache/Engine/FileEngine.php @@ -37,7 +37,7 @@ class FileEngine extends CacheEngine { /** * Settings - * + * * - path = absolute path to cache directory, default => CACHE * - prefix = string prefix for filename, default => cake_ * - lock = enable file locking on write, default => false @@ -162,7 +162,7 @@ class FileEngine extends CacheEngine { if ($cachetime !== false && ($cachetime < $time || ($time + $this->settings['duration']) < $cachetime)) { return false; } - + $data = ''; $this->_File->next(); while ($this->_File->valid()) { @@ -251,7 +251,7 @@ class FileEngine extends CacheEngine { * @throws CacheException */ public function decrement($key, $offset = 1) { - throw new CacheException(__('Files cannot be atomically decremented.')); + throw new CacheException(__d('cake_dev', 'Files cannot be atomically decremented.')); } /** @@ -261,7 +261,7 @@ class FileEngine extends CacheEngine { * @throws CacheException */ public function increment($key, $offset = 1) { - throw new CacheException(__('Files cannot be atomically incremented.')); + throw new CacheException(__d('cake_dev', 'Files cannot be atomically incremented.')); } /** @@ -297,9 +297,9 @@ class FileEngine extends CacheEngine { $dir = new SplFileInfo($this->settings['path']); if ($this->_init && !($dir->isDir() && $dir->isWritable())) { $this->_init = false; - trigger_error(__('%s is not writable', $this->settings['path']), E_USER_WARNING); + trigger_error(__d('cake_dev', '%s is not writable', $this->settings['path']), E_USER_WARNING); return false; } return true; } -} +} \ No newline at end of file diff --git a/cake/libs/cache/memcache.php b/lib/Cake/Cache/Engine/MemcacheEngine.php similarity index 94% rename from cake/libs/cache/memcache.php rename to lib/Cake/Cache/Engine/MemcacheEngine.php index 012eceba0..7b9aa5523 100644 --- a/cake/libs/cache/memcache.php +++ b/lib/Cake/Cache/Engine/MemcacheEngine.php @@ -19,7 +19,7 @@ */ /** - * Memcache storage engine for cache. Memcache has some limitations in the amount of + * Memcache storage engine for cache. Memcache has some limitations in the amount of * control you have over expire times far in the future. See MemcacheEngine::write() for * more information. * @@ -61,8 +61,8 @@ class MemcacheEngine extends CacheEngine { return false; } parent::init(array_merge(array( - 'engine'=> 'Memcache', - 'prefix' => Inflector::slug(APP_DIR) . '_', + 'engine'=> 'Memcache', + 'prefix' => Inflector::slug(APP_DIR) . '_', 'servers' => array('127.0.0.1'), 'compress'=> false ), $settings) @@ -115,7 +115,7 @@ class MemcacheEngine extends CacheEngine { /** * Write data for key into cache. When using memcache as your cache engine - * remember that the Memcache pecl extension does not support cache expiry times greater + * remember that the Memcache pecl extension does not support cache expiry times greater * than 30 days in the future. Any duration greater than 30 days will be treated as never expiring. * * @param string $key Identifier for the data @@ -153,7 +153,7 @@ class MemcacheEngine extends CacheEngine { public function increment($key, $offset = 1) { if ($this->settings['compress']) { throw new CacheException( - __('Method increment() not implemented for compressed cache in %s', __CLASS__) + __d('cake_dev', 'Method increment() not implemented for compressed cache in %s', __CLASS__) ); } return $this->_Memcache->increment($key, $offset); @@ -171,7 +171,7 @@ class MemcacheEngine extends CacheEngine { public function decrement($key, $offset = 1) { if ($this->settings['compress']) { throw new CacheException( - __('Method decrement() not implemented for compressed cache in %s', __CLASS__) + __d('cake_dev', 'Method decrement() not implemented for compressed cache in %s', __CLASS__) ); } return $this->_Memcache->decrement($key, $offset); @@ -212,4 +212,4 @@ class MemcacheEngine extends CacheEngine { } return true; } -} +} \ No newline at end of file diff --git a/cake/libs/cache/xcache.php b/lib/Cake/Cache/Engine/XcacheEngine.php similarity index 100% rename from cake/libs/cache/xcache.php rename to lib/Cake/Cache/Engine/XcacheEngine.php diff --git a/cake/libs/config/ini_reader.php b/lib/Cake/Configure/IniReader.php similarity index 95% rename from cake/libs/config/ini_reader.php rename to lib/Cake/Configure/IniReader.php index 7ab9694ce..d4eb8172d 100644 --- a/cake/libs/config/ini_reader.php +++ b/lib/Cake/Configure/IniReader.php @@ -27,7 +27,7 @@ * you to create nested arrays structures in an ini config file. For example: * * `db.password = secret` would turn into `array('db' => array('password' => 'secret'))` - * + * * You can nest properties as deeply as needed using .'s. IniReader also manipulates * how the special ini values of 'yes', 'no', 'on', 'off', 'null' are handled. * These values will be converted to their boolean equivalents. @@ -74,7 +74,7 @@ class IniReader implements ConfigReaderInterface { if (!file_exists($filename)) { $filename .= '.ini'; if (!file_exists($filename)) { - throw new ConfigureException(__('Could not load configuration files: %s or %s', substr($filename, 0, -4), $filename)); + throw new ConfigureException(__d('cake_dev', 'Could not load configuration files: %s or %s', substr($filename, 0, -4), $filename)); } } $contents = parse_ini_file($filename, true); diff --git a/cake/libs/config/php_reader.php b/lib/Cake/Configure/PhpReader.php similarity index 87% rename from cake/libs/config/php_reader.php rename to lib/Cake/Configure/PhpReader.php index acd0f94df..54f99dae1 100644 --- a/cake/libs/config/php_reader.php +++ b/lib/Cake/Configure/PhpReader.php @@ -18,7 +18,7 @@ */ /** - * PHP Reader allows Configure to load configuration values from + * PHP Reader allows Configure to load configuration values from * files containing simple PHP arrays. * * @package cake.libs.config @@ -55,13 +55,13 @@ class PhpReader implements ConfigReaderInterface { */ public function read($key) { if (strpos($key, '..') !== false) { - throw new ConfigureException(__('Cannot load configuration files with ../ in them.')); + throw new ConfigureException(__d('cake_dev', 'Cannot load configuration files with ../ in them.')); } if (substr($key, -4) === '.php') { $key = substr($key, 0, -4); } list($plugin, $key) = pluginSplit($key); - + if ($plugin) { $file = App::pluginPath($plugin) . 'config' . DS . $key; } else { @@ -70,13 +70,13 @@ class PhpReader implements ConfigReaderInterface { if (!file_exists($file)) { $file .= '.php'; if (!file_exists($file)) { - throw new ConfigureException(__('Could not load configuration files: %s or %s', substr($file, 0, -4), $file)); + throw new ConfigureException(__d('cake_dev', 'Could not load configuration files: %s or %s', substr($file, 0, -4), $file)); } } include $file; if (!isset($config)) { throw new ConfigureException( - sprintf(__('No variable $config found in %s.php'), $file) + sprintf(__d('cake_dev', 'No variable $config found in %s.php'), $file) ); } return $config; diff --git a/cake/console/shells/app_shell.php b/lib/Cake/Console/AppShell.php similarity index 93% rename from cake/console/shells/app_shell.php rename to lib/Cake/Console/AppShell.php index a624a31ad..ca3abc8ed 100644 --- a/cake/console/shells/app_shell.php +++ b/lib/Cake/Console/AppShell.php @@ -19,7 +19,7 @@ /** * This is a placeholder class. - * Create the same file in app/console/shells/app_shell.php + * Create the same file in app/console/shells/AppShell.php * * Add your application-wide methods in the class below, your shells * will inherit them. diff --git a/cake/console/shells/acl.php b/lib/Cake/Console/Command/AclShell.php similarity index 63% rename from cake/console/shells/acl.php rename to lib/Cake/Console/Command/AclShell.php index b4d458ba7..29312eaef 100644 --- a/cake/console/shells/acl.php +++ b/lib/Cake/Console/Command/AclShell.php @@ -16,8 +16,8 @@ * @since CakePHP(tm) v 1.2.0.5012 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Component', 'Acl'); -App::import('Model', 'DbAcl'); +App::uses('AclComponent', 'Controller/Component'); +App::uses('DbAcl', 'Model'); /** * Shell for ACL management. This console is known to have issues with zend.ze1_compatibility_mode @@ -71,12 +71,12 @@ class AclShell extends Shell { if (!in_array(Configure::read('Acl.classname'), array('DbAcl', 'DB_ACL'))) { $out = "--------------------------------------------------\n"; - $out .= __('Error: Your current Cake configuration is set to') . "\n"; - $out .= __('an ACL implementation other than DB. Please change') . "\n"; - $out .= __('your core config to reflect your decision to use') . "\n"; - $out .= __('DbAcl before attempting to use this script') . ".\n"; + $out .= __d('cake_console', 'Error: Your current Cake configuration is set to') . "\n"; + $out .= __d('cake_console', 'an ACL implementation other than DB. Please change') . "\n"; + $out .= __d('cake_console', 'your core config to reflect your decision to use') . "\n"; + $out .= __d('cake_console', 'DbAcl before attempting to use this script') . ".\n"; $out .= "--------------------------------------------------\n"; - $out .= __('Current ACL Classname: %s', Configure::read('Acl.classname')) . "\n"; + $out .= __d('cake_console', 'Current ACL Classname: %s', Configure::read('Acl.classname')) . "\n"; $out .= "--------------------------------------------------\n"; $this->err($out); $this->_stop(); @@ -84,7 +84,7 @@ class AclShell extends Shell { if ($this->command) { if (!config('database')) { - $this->out(__('Your database configuration was not found. Take a moment to create one.'), true); + $this->out(__d('cake_console', 'Your database configuration was not found. Take a moment to create one.'), true); $this->args = null; return $this->DbConfig->execute(); } @@ -127,15 +127,15 @@ class AclShell extends Shell { if (is_string($data) && $data != '/') { $data = array('alias' => $data); } elseif (is_string($data)) { - $this->error(__('/ can not be used as an alias!') . __(" / is the root, please supply a sub alias")); + $this->error(__d('cake_console', '/ can not be used as an alias!') . __d('cake_console', " / is the root, please supply a sub alias")); } $data['parent_id'] = $parent; $this->Acl->{$class}->create(); if ($this->Acl->{$class}->save($data)) { - $this->out(__("New %s '%s' created.", $class, $this->args[2]), 2); + $this->out(__d('cake_console', "New %s '%s' created.", $class, $this->args[2]), 2); } else { - $this->err(__("There was a problem creating a new %s '%s'.", $class, $this->args[2])); + $this->err(__d('cake_console', "There was a problem creating a new %s '%s'.", $class, $this->args[2])); } } @@ -150,9 +150,9 @@ class AclShell extends Shell { $nodeId = $this->_getNodeId($class, $identifier); if (!$this->Acl->{$class}->delete($nodeId)) { - $this->error(__('Node Not Deleted') . __('There was an error deleting the %s. Check that the node exists', $class) . ".\n"); + $this->error(__d('cake_console', 'Node Not Deleted') . __d('cake_console', 'There was an error deleting the %s. Check that the node exists', $class) . ".\n"); } - $this->out(__('%s deleted.', $class), 2); + $this->out(__d('cake_console', '%s deleted.', $class), 2); } /** @@ -172,9 +172,9 @@ class AclShell extends Shell { ); $this->Acl->{$class}->create(); if (!$this->Acl->{$class}->save($data)) { - $this->out(__('Error in setting new parent. Please make sure the parent node exists, and is not a descendant of the node specified.'), true); + $this->out(__d('cake_console', 'Error in setting new parent. Please make sure the parent node exists, and is not a descendant of the node specified.'), true); } else { - $this->out(__('Node parent set to %s', $this->args[2]) . "\n", true); + $this->out(__d('cake_console', 'Node parent set to %s', $this->args[2]) . "\n", true); } } @@ -191,11 +191,11 @@ class AclShell extends Shell { if (empty($nodes)) { $this->error( - __("Supplied Node '%s' not found", $this->args[1]), - __('No tree returned.') + __d('cake_console', "Supplied Node '%s' not found", $this->args[1]), + __d('cake_console', 'No tree returned.') ); } - $this->out(__('Path:')); + $this->out(__d('cake_console', 'Path:')); $this->hr(); for ($i = 0; $i < count($nodes); $i++) { $this->_outputNode($class, $nodes[$i], $i); @@ -228,9 +228,9 @@ class AclShell extends Shell { extract($this->__getParams()); if ($this->Acl->check($aro, $aco, $action)) { - $this->out(__('%s is allowed.', $aroName), true); + $this->out(__d('cake_console', '%s is allowed.', $aroName), true); } else { - $this->out(__('%s is not allowed.', $aroName), true); + $this->out(__d('cake_console', '%s is not allowed.', $aroName), true); } } @@ -242,9 +242,9 @@ class AclShell extends Shell { extract($this->__getParams()); if ($this->Acl->allow($aro, $aco, $action)) { - $this->out(__('Permission granted.'), true); + $this->out(__d('cake_console', 'Permission granted.'), true); } else { - $this->out(__('Permission was not granted.'), true); + $this->out(__d('cake_console', 'Permission was not granted.'), true); } } @@ -256,9 +256,9 @@ class AclShell extends Shell { extract($this->__getParams()); if ($this->Acl->deny($aro, $aco, $action)) { - $this->out(__('Permission denied.'), true); + $this->out(__d('cake_console', 'Permission denied.'), true); } else { - $this->out(__('Permission was not denied.'), true); + $this->out(__d('cake_console', 'Permission was not denied.'), true); } } @@ -270,9 +270,9 @@ class AclShell extends Shell { extract($this->__getParams()); if ($this->Acl->inherit($aro, $aco, $action)) { - $this->out(__('Permission inherited.'), true); + $this->out(__d('cake_console', 'Permission inherited.'), true); } else { - $this->out(__('Permission was not inherited.'), true); + $this->out(__d('cake_console', 'Permission was not inherited.'), true); } } @@ -303,9 +303,9 @@ class AclShell extends Shell { if (empty($nodes)) { if (isset($this->args[1])) { - $this->error(__('%s not found', $this->args[1]), __('No tree returned.')); + $this->error(__d('cake_console', '%s not found', $this->args[1]), __d('cake_console', 'No tree returned.')); } elseif (isset($this->args[0])) { - $this->error(__('%s not found', $this->args[0]), __('No tree returned.')); + $this->error(__d('cake_console', '%s not found', $this->args[0]), __d('cake_console', 'No tree returned.')); } } $this->out($class . " tree:"); @@ -354,140 +354,140 @@ class AclShell extends Shell { $type = array( 'choices' => array('aro', 'aco'), 'required' => true, - 'help' => __('Type of node to create.') + 'help' => __d('cake_console', 'Type of node to create.') ); $parser->description('A console tool for managing the DbAcl') ->addSubcommand('create', array( - 'help' => __('Create a new ACL node'), + 'help' => __d('cake_console', 'Create a new ACL node'), 'parser' => array( - 'description' => __('Creates a new ACL object under the parent'), + 'description' => __d('cake_console', 'Creates a new ACL object under the parent'), 'arguments' => array( 'type' => $type, 'parent' => array( - 'help' => __('The node selector for the parent.'), + 'help' => __d('cake_console', 'The node selector for the parent.'), 'required' => true ), 'alias' => array( - 'help' => __('The alias to use for the newly created node.'), + 'help' => __d('cake_console', 'The alias to use for the newly created node.'), 'required' => true ) ) ) ))->addSubcommand('delete', array( - 'help' => __('Deletes the ACL object with the given reference'), + 'help' => __d('cake_console', 'Deletes the ACL object with the given reference'), 'parser' => array( - 'description' => __('Delete an ACL node.'), + 'description' => __d('cake_console', 'Delete an ACL node.'), 'arguments' => array( 'type' => $type, 'node' => array( - 'help' => __('The node identifier to delete.'), + 'help' => __d('cake_console', 'The node identifier to delete.'), 'required' => true, ) ) ) ))->addSubcommand('setparent', array( - 'help' => __('Moves the ACL node under a new parent.'), + 'help' => __d('cake_console', 'Moves the ACL node under a new parent.'), 'parser' => array( - 'description' => __('Moves the ACL object specified by beneath '), + 'description' => __d('cake_console', 'Moves the ACL object specified by beneath '), 'arguments' => array( 'type' => $type, 'node' => array( - 'help' => __('The node to move'), + 'help' => __d('cake_console', 'The node to move'), 'required' => true, ), 'parent' => array( - 'help' => __('The new parent for .'), + 'help' => __d('cake_console', 'The new parent for .'), 'required' => true ) ) ) ))->addSubcommand('getpath', array( - 'help' => __('Print out the path to an ACL node.'), + 'help' => __d('cake_console', 'Print out the path to an ACL node.'), 'parser' => array( 'description' => array( - __("Returns the path to the ACL object specified by ."), - __("This command is useful in determining the inhertiance of permissions"), - __("for a certain object in the tree.") + __d('cake_console', "Returns the path to the ACL object specified by ."), + __d('cake_console', "This command is useful in determining the inhertiance of permissions"), + __d('cake_console', "for a certain object in the tree.") ), 'arguments' => array( 'type' => $type, 'node' => array( - 'help' => __('The node to get the path of'), + 'help' => __d('cake_console', 'The node to get the path of'), 'required' => true, ) ) ) ))->addSubcommand('check', array( - 'help' => __('Check the permissions between an ACO and ARO.'), + 'help' => __d('cake_console', 'Check the permissions between an ACO and ARO.'), 'parser' => array( 'description' => array( - __("Use this command to grant ACL permissions. Once executed, the ARO "), - __("specified (and its children, if any) will have ALLOW access to the"), - __("specified ACO action (and the ACO's children, if any).") + __d('cake_console', "Use this command to grant ACL permissions. Once executed, the ARO "), + __d('cake_console', "specified (and its children, if any) will have ALLOW access to the"), + __d('cake_console', "specified ACO action (and the ACO's children, if any).") ), 'arguments' => array( - 'aro' => array('help' => __('ARO to check.'), 'required' => true), - 'aco' => array('help' => __('ACO to check.'), 'required' => true), - 'action' => array('help' => __('Action to check'), 'default' => 'all') + 'aro' => array('help' => __d('cake_console', 'ARO to check.'), 'required' => true), + 'aco' => array('help' => __d('cake_console', 'ACO to check.'), 'required' => true), + 'action' => array('help' => __d('cake_console', 'Action to check'), 'default' => 'all') ) ) ))->addSubcommand('grant', array( - 'help' => __('Grant an ARO permissions to an ACO.'), + 'help' => __d('cake_console', 'Grant an ARO permissions to an ACO.'), 'parser' => array( 'description' => array( - __("Use this command to grant ACL permissions. Once executed, the ARO"), - __("specified (and its children, if any) will have ALLOW access to the"), - __("specified ACO action (and the ACO's children, if any).") + __d('cake_console', "Use this command to grant ACL permissions. Once executed, the ARO"), + __d('cake_console', "specified (and its children, if any) will have ALLOW access to the"), + __d('cake_console', "specified ACO action (and the ACO's children, if any).") ), 'arguments' => array( - 'aro' => array('help' => __('ARO to grant permission to.'), 'required' => true), - 'aco' => array('help' => __('ACO to grant access to.'), 'required' => true), - 'action' => array('help' => __('Action to grant'), 'default' => 'all') + 'aro' => array('help' => __d('cake_console', 'ARO to grant permission to.'), 'required' => true), + 'aco' => array('help' => __d('cake_console', 'ACO to grant access to.'), 'required' => true), + 'action' => array('help' => __d('cake_console', 'Action to grant'), 'default' => 'all') ) ) ))->addSubcommand('deny', array( - 'help' => __('Deny an ARO permissions to an ACO.'), + 'help' => __d('cake_console', 'Deny an ARO permissions to an ACO.'), 'parser' => array( 'description' => array( - __("Use this command to deny ACL permissions. Once executed, the ARO"), - __("specified (and its children, if any) will have DENY access to the"), - __("specified ACO action (and the ACO's children, if any).") + __d('cake_console', "Use this command to deny ACL permissions. Once executed, the ARO"), + __d('cake_console', "specified (and its children, if any) will have DENY access to the"), + __d('cake_console', "specified ACO action (and the ACO's children, if any).") ), 'arguments' => array( - 'aro' => array('help' => __('ARO to deny.'), 'required' => true), - 'aco' => array('help' => __('ACO to deny.'), 'required' => true), - 'action' => array('help' => __('Action to deny'), 'default' => 'all') + 'aro' => array('help' => __d('cake_console', 'ARO to deny.'), 'required' => true), + 'aco' => array('help' => __d('cake_console', 'ACO to deny.'), 'required' => true), + 'action' => array('help' => __d('cake_console', 'Action to deny'), 'default' => 'all') ) ) ))->addSubcommand('inherit', array( - 'help' => __('Inherit an ARO\'s parent permissions.'), + 'help' => __d('cake_console', 'Inherit an ARO\'s parent permissions.'), 'parser' => array( 'description' => array( - __("Use this command to force a child ARO object to inherit its"), - __("permissions settings from its parent.") + __d('cake_console', "Use this command to force a child ARO object to inherit its"), + __d('cake_console', "permissions settings from its parent.") ), 'arguments' => array( - 'aro' => array('help' => __('ARO to have permisssions inherit.'), 'required' => true), - 'aco' => array('help' => __('ACO to inherit permissions on.'), 'required' => true), - 'action' => array('help' => __('Action to inherit'), 'default' => 'all') + 'aro' => array('help' => __d('cake_console', 'ARO to have permisssions inherit.'), 'required' => true), + 'aco' => array('help' => __d('cake_console', 'ACO to inherit permissions on.'), 'required' => true), + 'action' => array('help' => __d('cake_console', 'Action to inherit'), 'default' => 'all') ) ) ))->addSubcommand('view', array( - 'help' => __('View a tree or a single node\'s subtree.'), + 'help' => __d('cake_console', 'View a tree or a single node\'s subtree.'), 'parser' => array( 'description' => array( - __("The view command will return the ARO or ACO tree."), - __("The optional node parameter allows you to return"), - __("only a portion of the requested tree.") + __d('cake_console', "The view command will return the ARO or ACO tree."), + __d('cake_console', "The optional node parameter allows you to return"), + __d('cake_console', "only a portion of the requested tree.") ), 'arguments' => array( 'type' => $type, - 'node' => array('help' => __('The optional node to view the subtree of.')) + 'node' => array('help' => __d('cake_console', 'The optional node to view the subtree of.')) ) ) ))->addSubcommand('initdb', array( - 'help' => __('Initialize the DbAcl tables. Uses this command : cake schema run create DbAcl') + 'help' => __d('cake_console', 'Initialize the DbAcl tables. Uses this command : cake schema run create DbAcl') ))->epilog( array( 'Node and parent arguments can be in one of the following formats:', @@ -520,7 +520,7 @@ class AclShell extends Shell { $conditions = array($class . '.' . $key => $this->args[1]); $possibility = $this->Acl->{$class}->find('all', compact('conditions')); if (empty($possibility)) { - $this->error(__('%s not found', $this->args[1]), __('No tree returned.')); + $this->error(__d('cake_console', '%s not found', $this->args[1]), __d('cake_console', 'No tree returned.')); } return $possibility; } @@ -556,7 +556,7 @@ class AclShell extends Shell { if (is_array($identifier)) { $identifier = var_export($identifier, true); } - $this->error(__('Could not find node using reference "%s"', $identifier)); + $this->error(__d('cake_console', 'Could not find node using reference "%s"', $identifier)); } return Set::extract($node, "0.{$class}.id"); } diff --git a/cake/console/shells/api.php b/lib/Cake/Console/Command/ApiShell.php similarity index 83% rename from cake/console/shells/api.php rename to lib/Cake/Console/Command/ApiShell.php index 05cf326b8..d37b6acd0 100644 --- a/cake/console/shells/api.php +++ b/lib/Cake/Console/Command/ApiShell.php @@ -18,7 +18,7 @@ * @since CakePHP(tm) v 1.2.0.5012 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Core', 'File'); +App::uses('File', 'Utility'); /** * API shell to show method signatures of CakePHP core classes. @@ -41,13 +41,13 @@ class ApiShell extends Shell { */ public function initialize() { $this->paths = array_merge($this->paths, array( - 'behavior' => LIBS . 'model' . DS . 'behaviors' . DS, - 'cache' => LIBS . 'cache' . DS, - 'controller' => LIBS . 'controller' . DS, - 'component' => LIBS . 'controller' . DS . 'components' . DS, - 'helper' => LIBS . 'view' . DS . 'helpers' . DS, - 'model' => LIBS . 'model' . DS, - 'view' => LIBS . 'view' . DS, + 'behavior' => LIBS . 'Model' . DS . 'Behavior' . DS, + 'cache' => LIBS . 'Cache' . DS, + 'controller' => LIBS . 'Controller' . DS, + 'component' => LIBS . 'Controller' . DS . 'Component' . DS, + 'helper' => LIBS . 'View' . DS . 'Helper' . DS, + 'model' => LIBS . 'Model' . DS, + 'view' => LIBS . 'View' . DS, 'core' => LIBS )); } @@ -74,7 +74,7 @@ class ApiShell extends Shell { $class = Inflector::camelize($type); } elseif (count($this->args) > 1) { $file = Inflector::underscore($this->args[1]); - $class = Inflector::camelize($file); + $class = Inflector::camelize($this->args[1]); } $objects = App::objects('class', $path); if (in_array($class, $objects)) { @@ -85,15 +85,15 @@ class ApiShell extends Shell { } } else { - $this->error(__('%s not found', $class)); + $this->error(__d('cake_console', '%s not found', $class)); } - $parsed = $this->__parseClass($path . $file .'.php', $class); + $parsed = $this->__parseClass($path . $class .'.php', $class); if (!empty($parsed)) { if (isset($this->params['method'])) { if (!isset($parsed[$this->params['method']])) { - $this->err(__('%s::%s() could not be found', $class, $this->params['method'])); + $this->err(__d('cake_console', '%s::%s() could not be found', $class, $this->params['method'])); $this->_stop(); } $method = $parsed[$this->params['method']]; @@ -110,9 +110,9 @@ class ApiShell extends Shell { $this->out($list); $methods = array_keys($parsed); - while ($number = strtolower($this->in(__('Select a number to see the more information about a specific method. q to quit. l to list.'), null, 'q'))) { + while ($number = strtolower($this->in(__d('cake_console', 'Select a number to see the more information about a specific method. q to quit. l to list.'), null, 'q'))) { if ($number === 'q') { - $this->out(__('Done')); + $this->out(__d('cake_console', 'Done')); return $this->_stop(); } @@ -145,8 +145,8 @@ class ApiShell extends Shell { 'help' => 'A CakePHP core class name (e.g: Component, HtmlHelper).' ))->addOption('method', array( 'short' => 'm', - 'help' => __('The specific method you want help on.') - ))->description(__('Lookup doc block comments for classes in CakePHP.')); + 'help' => __d('cake_console', 'The specific method you want help on.') + ))->description(__d('cake_console', 'Lookup doc block comments for classes in CakePHP.')); return $parser; } /** @@ -197,9 +197,12 @@ class ApiShell extends Shell { function __parseClass($path, $class) { $parsed = array(); - if (!include_once($path)) { - $this->err(__('%s could not be found', $path)); + if (!class_exists($class)) { + if (!include_once($path)) { + $this->err(__d('cake_console', '%s could not be found', $path)); + } } + $reflection = new ReflectionClass($class); foreach ($reflection->getMethods() as $method) { diff --git a/cake/console/shells/bake.php b/lib/Cake/Console/Command/BakeShell.php similarity index 78% rename from cake/console/shells/bake.php rename to lib/Cake/Console/Command/BakeShell.php index ec741ed3a..b4894dd78 100644 --- a/cake/console/shells/bake.php +++ b/lib/Cake/Console/Command/BakeShell.php @@ -21,6 +21,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +App::uses('Model', 'Model'); + /** * Bake is a command-line code generation utility for automating programmer chores. * @@ -73,7 +75,7 @@ class BakeShell extends Shell { } if (!config('database')) { - $this->out(__('Your database configuration was not found. Take a moment to create one.')); + $this->out(__d('cake_console', 'Your database configuration was not found. Take a moment to create one.')); $this->args = null; return $this->DbConfig->execute(); } @@ -88,7 +90,7 @@ class BakeShell extends Shell { $this->out('[T]est case'); $this->out('[Q]uit'); - $classToBake = strtoupper($this->in(__('What would you like to Bake?'), array('D', 'M', 'V', 'C', 'P', 'F', 'T', 'Q'))); + $classToBake = strtoupper($this->in(__d('cake_console', 'What would you like to Bake?'), array('D', 'M', 'V', 'C', 'P', 'F', 'T', 'Q'))); switch ($classToBake) { case 'D': $this->DbConfig->execute(); @@ -115,7 +117,7 @@ class BakeShell extends Shell { exit(0); break; default: - $this->out(__('You have made an invalid selection. Please choose a type of class to Bake by entering D, M, V, F, T, or C.')); + $this->out(__d('cake_console', 'You have made an invalid selection. Please choose a type of class to Bake by entering D, M, V, F, T, or C.')); } $this->hr(); $this->main(); @@ -149,11 +151,11 @@ class BakeShell extends Shell { $modelExists = false; $model = $this->_modelName($name); - if (App::import('Model', $model)) { + App::uses($model, 'Model'); + if (class_exists($model)) { $object = new $model(); $modelExists = true; } else { - App::import('Model', 'Model', false); $object = new Model(array('name' => $name, 'ds' => $this->connection)); } @@ -174,15 +176,16 @@ class BakeShell extends Shell { $this->Controller->bakeTest($controller); } } - if (App::import('Controller', $controller)) { + App::uses($controller . 'Controller', 'Controller'); + if (class_exists($controller . 'Controller')) { $this->View->args = array($controller); $this->View->execute(); } $this->out('', 1, Shell::QUIET); - $this->out(__('Bake All complete'), 1, Shell::QUIET); + $this->out(__d('cake_console', 'Bake All complete'), 1, Shell::QUIET); array_shift($this->args); } else { - $this->error(__('Bake All could not continue without a valid model')); + $this->error(__d('cake_console', 'Bake All could not continue without a valid model')); } return $this->_stop(); } @@ -200,33 +203,33 @@ class BakeShell extends Shell { 'creation process. You can customize the generation process by telling Bake' . 'where different parts of your application are using command line arguments.' )->addSubcommand('all', array( - 'help' => __('Bake a complete MVC. optional of a Model'), + 'help' => __d('cake_console', 'Bake a complete MVC. optional of a Model'), ))->addSubcommand('project', array( - 'help' => __('Bake a new app folder in the path supplied or in current directory if no path is specified'), + 'help' => __d('cake_console', 'Bake a new app folder in the path supplied or in current directory if no path is specified'), 'parser' => $this->Project->getOptionParser() ))->addSubcommand('plugin', array( - 'help' => __('Bake a new plugin folder in the path supplied or in current directory if no path is specified.'), + 'help' => __d('cake_console', 'Bake a new plugin folder in the path supplied or in current directory if no path is specified.'), 'parser' => $this->Plugin->getOptionParser() ))->addSubcommand('db_config', array( - 'help' => __('Bake a database.php file in config directory.'), + 'help' => __d('cake_console', 'Bake a database.php file in config directory.'), 'parser' => $this->DbConfig->getOptionParser() ))->addSubcommand('model', array( - 'help' => __('Bake a model.'), + 'help' => __d('cake_console', 'Bake a model.'), 'parser' => $this->Model->getOptionParser() ))->addSubcommand('view', array( - 'help' => __('Bake views for controllers.'), + 'help' => __d('cake_console', 'Bake views for controllers.'), 'parser' => $this->View->getOptionParser() ))->addSubcommand('controller', array( - 'help' => __('Bake a controller.'), + 'help' => __d('cake_console', 'Bake a controller.'), 'parser' => $this->Controller->getOptionParser() ))->addSubcommand('fixture', array( - 'help' => __('Bake a fixture.'), + 'help' => __d('cake_console', 'Bake a fixture.'), 'parser' => $this->Fixture->getOptionParser() ))->addSubcommand('test', array( - 'help' => __('Bake a unit test.'), + 'help' => __d('cake_console', 'Bake a unit test.'), 'parser' => $this->Test->getOptionParser() ))->addOption('connection', array( - 'help' => __('Database connection to use in conjunction with `bake all`.'), + 'help' => __d('cake_console', 'Database connection to use in conjunction with `bake all`.'), 'short' => 'c', 'default' => 'default' )); diff --git a/cake/console/shells/command_list.php b/lib/Cake/Console/Command/CommandListShell.php similarity index 84% rename from cake/console/shells/command_list.php rename to lib/Cake/Console/Command/CommandListShell.php index e9323c6f7..aa3d0d4ed 100644 --- a/cake/console/shells/command_list.php +++ b/lib/Cake/Console/Command/CommandListShell.php @@ -16,6 +16,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +App::uses('Inflector', 'Utility'); + /** * Shows a list of commands available from the console. * @@ -79,17 +81,18 @@ class CommandListShell extends Shell { protected function _getShellList() { $shellList = array(); - $corePaths = App::core('shells'); - $shellList = $this->_appendShells('CORE', $corePaths, $shellList); + $shells = App::objects('file', App::core('Console/Command')); + $shellList = $this->_appendShells('CORE', $shells, $shellList); - $appPaths = array_diff(App::path('shells'), $corePaths); - $shellList = $this->_appendShells('app', $appPaths, $shellList); + $appShells = App::objects('Console/Command', null, false); + $shellList = $this->_appendShells('app', $appShells, $shellList); $plugins = App::objects('plugin'); foreach ($plugins as $plugin) { - $pluginPath = App::pluginPath($plugin) . 'console' . DS . 'shells' . DS; - $shellList = $this->_appendShells($plugin, array($pluginPath), $shellList); + $pluginShells = App::objects($plugin . '.Console/Command'); + $shellList = $this->_appendShells($plugin, $pluginShells, $shellList); } + return $shellList; } @@ -98,22 +101,10 @@ class CommandListShell extends Shell { * * @return array */ - protected function _appendShells($type, $paths, $shellList) { - foreach ($paths as $path) { - if (!is_dir($path)) { - continue; - } - $shells = App::objects('file', $path); - - if (empty($shells)) { - continue; - } - foreach ($shells as $shell) { - if ($shell !== 'shell.php' && $shell !== 'app_shell.php') { - $shell = str_replace('.php', '', $shell); - $shellList[$shell][$type] = $type; - } - } + protected function _appendShells($type, $shells, $shellList) { + foreach ($shells as $shell) { + $shell = Inflector::underscore(str_replace('Shell', '', $shell)); + $shellList[$shell][$type] = $type; } return $shellList; } @@ -223,10 +214,10 @@ class CommandListShell extends Shell { $parser = parent::getOptionParser(); return $parser->description('Get the list of available shells for this CakePHP application.') ->addOption('xml', array( - 'help' => __('Get the listing as XML.'), + 'help' => __d('cake_console', 'Get the listing as XML.'), 'boolean' => true ))->addOption('sort', array( - 'help' => __('Sorts the commands by where they are located.'), + 'help' => __d('cake_console', 'Sorts the commands by where they are located.'), 'boolean' => true )); } diff --git a/cake/console/shells/console.php b/lib/Cake/Console/Command/ConsoleShell.php similarity index 96% rename from cake/console/shells/console.php rename to lib/Cake/Console/Command/ConsoleShell.php index 44cc13d45..1e00d7dd7 100644 --- a/cake/console/shells/console.php +++ b/lib/Cake/Console/Command/ConsoleShell.php @@ -51,14 +51,14 @@ class ConsoleShell extends Shell { * */ public function initialize() { - require_once CAKE . 'dispatcher.php'; + App::uses('Dispatcher', 'Routing'); $this->Dispatcher = new Dispatcher(); $this->models = App::objects('model'); - App::import('Model', $this->models); foreach ($this->models as $model) { $class = Inflector::camelize(str_replace('.php', '', $model)); $this->models[$model] = $class; + App::uses($class, 'Model'); $this->{$class} = new $class(); } $this->out('Model classes:'); @@ -333,21 +333,20 @@ class ConsoleShell extends Shell { * @return boolean True if config reload was a success, otherwise false */ protected function _loadRoutes() { - $router = Router::getInstance(); - - $router->reload(); - extract($router->getNamedExpressions()); + Router::reload(); + extract(Router::getNamedExpressions()); if (!@include(CONFIGS . 'routes.php')) { return false; } - $router->parse('/'); + Router::parse('/'); - foreach (array_keys($router->getNamedExpressions()) as $var) { + foreach (array_keys(Router::getNamedExpressions()) as $var) { unset(${$var}); } - for ($i = 0, $len = count($router->routes); $i < $len; $i++) { - $router->routes[$i]->compile(); + + foreach (Router::$routes as $route) { + $route->compile(); } return true; } diff --git a/cake/console/shells/i18n.php b/lib/Cake/Console/Command/I18nShell.php similarity index 69% rename from cake/console/shells/i18n.php rename to lib/Cake/Console/Command/I18nShell.php index 0a2bdeef6..3a3c5691e 100644 --- a/cake/console/shells/i18n.php +++ b/lib/Cake/Console/Command/I18nShell.php @@ -52,7 +52,7 @@ class I18nShell extends Shell { if ($this->command && !in_array($this->command, array('help'))) { if (!config('database')) { - $this->out(__('Your database configuration was not found. Take a moment to create one.'), true); + $this->out(__d('cake_console', 'Your database configuration was not found. Take a moment to create one.'), true); return $this->DbConfig->execute(); } } @@ -63,14 +63,14 @@ class I18nShell extends Shell { * */ public function main() { - $this->out(__('I18n Shell')); + $this->out(__d('cake_console', 'I18n Shell')); $this->hr(); - $this->out(__('[E]xtract POT file from sources')); - $this->out(__('[I]nitialize i18n database table')); - $this->out(__('[H]elp')); - $this->out(__('[Q]uit')); + $this->out(__d('cake_console', '[E]xtract POT file from sources')); + $this->out(__d('cake_console', '[I]nitialize i18n database table')); + $this->out(__d('cake_console', '[H]elp')); + $this->out(__d('cake_console', '[Q]uit')); - $choice = strtolower($this->in(__('What would you like to do?'), array('E', 'I', 'H', 'Q'))); + $choice = strtolower($this->in(__d('cake_console', 'What would you like to do?'), array('E', 'I', 'H', 'Q'))); switch ($choice) { case 'e': $this->Extract->execute(); @@ -85,7 +85,7 @@ class I18nShell extends Shell { exit(0); break; default: - $this->out(__('You have made an invalid selection. Please choose a command to execute by entering E, I, H, or Q.')); + $this->out(__d('cake_console', 'You have made an invalid selection. Please choose a command to execute by entering E, I, H, or Q.')); } $this->hr(); $this->main(); @@ -107,11 +107,11 @@ class I18nShell extends Shell { public function getOptionParser() { $parser = parent::getOptionParser(); return $parser->description( - __('I18n Shell initializes i18n database table for your application and generates .pot files(s) with translations.') + __d('cake_console', 'I18n Shell initializes i18n database table for your application and generates .pot files(s) with translations.') )->addSubcommand('initdb', array( - 'help' => __('Initialize the i18n table.') + 'help' => __d('cake_console', 'Initialize the i18n table.') ))->addSubcommand('extract', array( - 'help' => __('Extract the po translations from your application'), + 'help' => __d('cake_console', 'Extract the po translations from your application'), 'parser' => $this->Extract->getOptionParser() )); } diff --git a/cake/console/shells/schema.php b/lib/Cake/Console/Command/SchemaShell.php similarity index 77% rename from cake/console/shells/schema.php rename to lib/Cake/Console/Command/SchemaShell.php index 3c16edd81..f3faa5890 100644 --- a/cake/console/shells/schema.php +++ b/lib/Cake/Console/Command/SchemaShell.php @@ -19,8 +19,8 @@ * @since CakePHP(tm) v 1.2.0.5550 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Core', 'File', false); -App::import('Model', 'CakeSchema', false); +App::uses('File', 'Utility'); +App::uses('CakeSchema', 'Model'); /** * Schema is a command-line database management utility for automating programmer chores. @@ -112,7 +112,7 @@ class SchemaShell extends Shell { $this->_stop(); } else { $file = $this->Schema->path . DS . $this->params['file']; - $this->err(__('Schema file (%s) could not be found.', $file)); + $this->err(__d('cake_console', 'Schema file (%s) could not be found.', $file)); $this->_stop(); } } @@ -123,7 +123,7 @@ class SchemaShell extends Shell { * */ public function generate() { - $this->out(__('Generating Schema...')); + $this->out(__d('cake_console', 'Generating Schema...')); $options = array(); if (isset($this->params['force'])) { $options = array('models' => false); @@ -182,10 +182,10 @@ class SchemaShell extends Shell { } if ($this->Schema->write($content)) { - $this->out(__('Schema file: %s generated', $content['file'])); + $this->out(__d('cake_console', 'Schema file: %s generated', $content['file'])); $this->_stop(); } else { - $this->err(__('Schema file: %s generated')); + $this->err(__d('cake_console', 'Schema file: %s generated')); $this->_stop(); } } @@ -202,7 +202,7 @@ class SchemaShell extends Shell { $write = false; $Schema = $this->Schema->load(); if (!$Schema) { - $this->err(__('Schema could not be loaded')); + $this->err(__d('cake_console', 'Schema could not be loaded')); $this->_stop(); } if (!empty($this->params['write'])) { @@ -227,10 +227,10 @@ class SchemaShell extends Shell { } if ($File->write($contents)) { - $this->out(__('SQL dump file created in %s', $File->pwd())); + $this->out(__d('cake_console', 'SQL dump file created in %s', $File->pwd())); $this->_stop(); } else { - $this->err(__('SQL dump could not be created')); + $this->err(__d('cake_console', 'SQL dump could not be created')); $this->_stop(); } } @@ -274,7 +274,7 @@ class SchemaShell extends Shell { if (!empty($this->params['dry'])) { $this->__dry = true; - $this->out(__('Performing a dry run.')); + $this->out(__d('cake_console', 'Performing a dry run.')); } $options = array('name' => $name, 'plugin' => $plugin); @@ -286,7 +286,7 @@ class SchemaShell extends Shell { $Schema = $this->Schema->load($options); if (!$Schema) { - $this->err(__('%s could not be loaded', $this->Schema->path . DS . $this->Schema->file)); + $this->err(__d('cake_console', '%s could not be loaded', $this->Schema->path . DS . $this->Schema->file)); $this->_stop(); } $table = null; @@ -317,26 +317,26 @@ class SchemaShell extends Shell { $create[$table] = $db->createSchema($Schema, $table); } if (empty($drop) || empty($create)) { - $this->out(__('Schema is up to date.')); + $this->out(__d('cake_console', 'Schema is up to date.')); $this->_stop(); } - $this->out("\n" . __('The following table(s) will be dropped.')); + $this->out("\n" . __d('cake_console', 'The following table(s) will be dropped.')); $this->out(array_keys($drop)); - if ('y' == $this->in(__('Are you sure you want to drop the table(s)?'), array('y', 'n'), 'n')) { - $this->out(__('Dropping table(s).')); + if ('y' == $this->in(__d('cake_console', 'Are you sure you want to drop the table(s)?'), array('y', 'n'), 'n')) { + $this->out(__d('cake_console', 'Dropping table(s).')); $this->__run($drop, 'drop', $Schema); } - $this->out("\n" . __('The following table(s) will be created.')); + $this->out("\n" . __d('cake_console', 'The following table(s) will be created.')); $this->out(array_keys($create)); - if ('y' == $this->in(__('Are you sure you want to create the table(s)?'), array('y', 'n'), 'y')) { - $this->out(__('Creating table(s).')); + if ('y' == $this->in(__d('cake_console', 'Are you sure you want to create the table(s)?'), array('y', 'n'), 'y')) { + $this->out(__d('cake_console', 'Creating table(s).')); $this->__run($create, 'create', $Schema); } - $this->out(__('End create.')); + $this->out(__d('cake_console', 'End create.')); } /** @@ -348,7 +348,7 @@ class SchemaShell extends Shell { function __update(&$Schema, $table = null) { $db = ConnectionManager::getDataSource($this->Schema->connection); - $this->out(__('Comparing Database to Schema...')); + $this->out(__d('cake_console', 'Comparing Database to Schema...')); $options = array(); if (isset($this->params['force'])) { $options['models'] = false; @@ -367,19 +367,19 @@ class SchemaShell extends Shell { } if (empty($contents)) { - $this->out(__('Schema is up to date.')); + $this->out(__d('cake_console', 'Schema is up to date.')); $this->_stop(); } - $this->out("\n" . __('The following statements will run.')); + $this->out("\n" . __d('cake_console', 'The following statements will run.')); $this->out(array_map('trim', $contents)); - if ('y' == $this->in(__('Are you sure you want to alter the tables?'), array('y', 'n'), 'n')) { + if ('y' == $this->in(__d('cake_console', 'Are you sure you want to alter the tables?'), array('y', 'n'), 'n')) { $this->out(); - $this->out(__('Updating Database...')); + $this->out(__d('cake_console', 'Updating Database...')); $this->__run($contents, 'update', $Schema); } - $this->out(__('End update.')); + $this->out(__d('cake_console', 'End update.')); } /** @@ -389,7 +389,7 @@ class SchemaShell extends Shell { */ function __run($contents, $event, &$Schema) { if (empty($contents)) { - $this->err(__('Sql could not be run')); + $this->err(__d('cake_console', 'Sql could not be run')); return; } Configure::write('debug', 2); @@ -397,10 +397,10 @@ class SchemaShell extends Shell { foreach ($contents as $table => $sql) { if (empty($sql)) { - $this->out(__('%s is up to date.', $table)); + $this->out(__d('cake_console', '%s is up to date.', $table)); } else { if ($this->__dry === true) { - $this->out(__('Dry run for %s :', $table)); + $this->out(__d('cake_console', 'Dry run for %s :', $table)); $this->out($sql); } else { if (!$Schema->before(array($event => $table))) { @@ -416,7 +416,7 @@ class SchemaShell extends Shell { if (!empty($error)) { $this->out($error); } else { - $this->out(__('%s updated.', $table)); + $this->out(__d('cake_console', '%s updated.', $table)); } } } @@ -430,26 +430,26 @@ class SchemaShell extends Shell { */ public function getOptionParser() { $plugin = array( - 'help' => __('The plugin to use.'), + 'help' => __d('cake_console', 'The plugin to use.'), ); $connection = array( - 'help' => __('Set the db config to use.'), + 'help' => __d('cake_console', 'Set the db config to use.'), 'default' => 'default' ); $path = array( - 'help' => __('Path to read and write schema.php'), + 'help' => __d('cake_console', 'Path to read and write schema.php'), 'default' => CONFIGS . 'schema' ); $file = array( - 'help' => __('File name to read and write.'), + 'help' => __d('cake_console', 'File name to read and write.'), 'default' => 'schema.php' ); $name = array( - 'help' => __('Classname to use. If its Plugin.class, both name and plugin options will be set.') + 'help' => __d('cake_console', 'Classname to use. If its Plugin.class, both name and plugin options will be set.') ); $snapshot = array( 'short' => 's', - 'help' => __('Snapshot number to use/make.') + 'help' => __d('cake_console', 'Snapshot number to use/make.') ); $dry = array( 'help' => 'Perform a dry run on create and update commands. Queries will be output instead of run.', @@ -457,11 +457,11 @@ class SchemaShell extends Shell { ); $force = array( 'short' => 'f', - 'help' => __('Force "generate" to create a new schema'), + 'help' => __d('cake_console', 'Force "generate" to create a new schema'), 'boolean' => true ); $write = array( - 'help' => __('Write the dumped SQL to a file.') + 'help' => __d('cake_console', 'Write the dumped SQL to a file.') ); $parser = parent::getOptionParser(); @@ -475,42 +475,42 @@ class SchemaShell extends Shell { 'arguments' => compact('name') ) ))->addSubcommand('generate', array( - 'help' => __('Reads from --connection and writes to --path. Generate snapshots with -s'), + 'help' => __d('cake_console', 'Reads from --connection and writes to --path. Generate snapshots with -s'), 'parser' => array( 'options' => compact('plugin', 'path', 'file', 'name', 'connection', 'snapshot', 'force'), 'arguments' => array( - 'snapshot' => array('help' => __('Generate a snapshot.')) + 'snapshot' => array('help' => __d('cake_console', 'Generate a snapshot.')) ) ) ))->addSubcommand('dump', array( - 'help' => __('Dump database SQL based on a schema file to stdout.'), + 'help' => __d('cake_console', 'Dump database SQL based on a schema file to stdout.'), 'parser' => array( 'options' => compact('plugin', 'path', 'file', 'name', 'connection'), 'arguments' => compact('name') ) ))->addSubcommand('create', array( - 'help' => __('Drop and create tables based on the schema file.'), + 'help' => __d('cake_console', 'Drop and create tables based on the schema file.'), 'parser' => array( 'options' => compact('plugin', 'path', 'file', 'name', 'connection', 'dry', 'snapshot'), 'args' => array( 'name' => array( - 'help' => __('Name of schema to use.') + 'help' => __d('cake_console', 'Name of schema to use.') ), 'table' => array( - 'help' => __('Only create the specified table.') + 'help' => __d('cake_console', 'Only create the specified table.') ) ) ) ))->addSubcommand('update', array( - 'help' => __('Alter the tables based on the schema file.'), + 'help' => __d('cake_console', 'Alter the tables based on the schema file.'), 'parser' => array( 'options' => compact('plugin', 'path', 'file', 'name', 'connection', 'dry', 'snapshot'), 'args' => array( 'name' => array( - 'help' => __('Name of schema to use.') + 'help' => __d('cake_console', 'Name of schema to use.') ), 'table' => array( - 'help' => __('Only create the specified table.') + 'help' => __d('cake_console', 'Only create the specified table.') ) ) ) diff --git a/cake/console/shells/tasks/bake.php b/lib/Cake/Console/Command/Task/BakeTask.php similarity index 93% rename from cake/console/shells/tasks/bake.php rename to lib/Cake/Console/Command/Task/BakeTask.php index bd7f59e69..58fc783ef 100644 --- a/cake/console/shells/tasks/bake.php +++ b/lib/Cake/Console/Command/Task/BakeTask.php @@ -50,7 +50,7 @@ class BakeTask extends Shell { public function getPath() { $path = $this->path; if (isset($this->plugin)) { - $path = $this->_pluginPath($this->plugin) . Inflector::pluralize(Inflector::underscore($this->name)) . DS; + $path = $this->_pluginPath($this->plugin) . $this->name . DS; } return $path; } diff --git a/cake/console/shells/tasks/controller.php b/lib/Cake/Console/Command/Task/ControllerTask.php similarity index 78% rename from cake/console/shells/tasks/controller.php rename to lib/Cake/Console/Command/Task/ControllerTask.php index c3c4e2ea4..6f4723c64 100644 --- a/cake/console/shells/tasks/controller.php +++ b/lib/Cake/Console/Command/Task/ControllerTask.php @@ -17,7 +17,7 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -include_once dirname(__FILE__) . DS . 'bake.php'; +App::uses('BakeTask', 'Console/Command/Task'); /** * Task class for creating and updating controller files. @@ -71,13 +71,13 @@ class ControllerTask extends BakeTask { $actions = ''; if (!empty($this->params['public'])) { - $this->out(__('Baking basic crud methods for ') . $controller); + $this->out(__d('cake_console', 'Baking basic crud methods for ') . $controller); $actions .= $this->bakeActions($controller); } if (!empty($this->params['admin'])) { $admin = $this->Project->getPrefix(); if ($admin) { - $this->out(__('Adding %s methods', $admin)); + $this->out(__d('cake_console', 'Adding %s methods', $admin)); $actions .= "\n" . $this->bakeActions($controller, $admin); } } @@ -106,7 +106,8 @@ class ControllerTask extends BakeTask { foreach ($this->__tables as $table) { $model = $this->_modelName($table); $controller = $this->_controllerName($model); - if (App::import('Model', $model)) { + App::uses($model, 'Model'); + if (class_exists($model)) { $actions = $this->bakeActions($controller); if ($this->bake($controller, $actions) && $unitTestExists) { $this->bakeTest($controller); @@ -123,7 +124,7 @@ class ControllerTask extends BakeTask { protected function _interactive() { $this->interactive = true; $this->hr(); - $this->out(__("Bake Controller\nPath: %s", $this->path)); + $this->out(__d('cake_console', "Bake Controller\nPath: %s", $this->path)); $this->hr(); if (empty($this->connection)) { @@ -132,7 +133,7 @@ class ControllerTask extends BakeTask { $controllerName = $this->getName(); $this->hr(); - $this->out(__('Baking %sController', $controllerName)); + $this->out(__d('cake_console', 'Baking %sController', $controllerName)); $this->hr(); $helpers = $components = array(); @@ -142,18 +143,17 @@ class ControllerTask extends BakeTask { $useDynamicScaffold = 'n'; $wannaBakeCrud = 'y'; - $controllerFile = strtolower(Inflector::underscore($controllerName)); - $question[] = __("Would you like to build your controller interactively?"); - if (file_exists($this->path . $controllerFile .'_controller.php')) { - $question[] = __("Warning: Choosing no will overwrite the %sController.", $controllerName); + $question[] = __d('cake_console', "Would you like to build your controller interactively?"); + if (file_exists($this->path . $controllerName .'Controller.php')) { + $question[] = __d('cake_console', "Warning: Choosing no will overwrite the %sController.", $controllerName); } $doItInteractive = $this->in(implode("\n", $question), array('y','n'), 'y'); if (strtolower($doItInteractive) == 'y') { $this->interactive = true; $useDynamicScaffold = $this->in( - __("Would you like to use dynamic scaffolding?"), array('y','n'), 'n' + __d('cake_console', "Would you like to use dynamic scaffolding?"), array('y','n'), 'n' ); if (strtolower($useDynamicScaffold) == 'y') { @@ -166,7 +166,7 @@ class ControllerTask extends BakeTask { $components = $this->doComponents(); $wannaUseSession = $this->in( - __("Would you like to use Session flash messages?"), array('y','n'), 'y' + __d('cake_console', "Would you like to use Session flash messages?"), array('y','n'), 'y' ); } } else { @@ -184,7 +184,7 @@ class ControllerTask extends BakeTask { $baked = false; if ($this->interactive === true) { $this->confirmController($controllerName, $useDynamicScaffold, $helpers, $components); - $looksGood = $this->in(__('Look okay?'), array('y','n'), 'y'); + $looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y','n'), 'y'); if (strtolower($looksGood) == 'y') { $baked = $this->bake($controllerName, $actions, $helpers, $components); @@ -209,17 +209,17 @@ class ControllerTask extends BakeTask { public function confirmController($controllerName, $useDynamicScaffold, $helpers, $components) { $this->out(); $this->hr(); - $this->out(__('The following controller will be created:')); + $this->out(__d('cake_console', 'The following controller will be created:')); $this->hr(); - $this->out(__("Controller Name:\n\t%s", $controllerName)); + $this->out(__d('cake_console', "Controller Name:\n\t%s", $controllerName)); if (strtolower($useDynamicScaffold) == 'y') { $this->out("var \$scaffold;"); } $properties = array( - 'helpers' => __('Helpers:'), - 'components' => __('Components:'), + 'helpers' => __d('cake_console', 'Helpers:'), + 'components' => __d('cake_console', 'Components:'), ); foreach ($properties as $var => $title) { @@ -246,11 +246,11 @@ class ControllerTask extends BakeTask { */ protected function _askAboutMethods() { $wannaBakeCrud = $this->in( - __("Would you like to create some basic class methods \n(index(), add(), view(), edit())?"), + __d('cake_console', "Would you like to create some basic class methods \n(index(), add(), view(), edit())?"), array('y','n'), 'n' ); $wannaBakeAdminCrud = $this->in( - __("Would you like to create the basic class methods for admin routing?"), + __d('cake_console', "Would you like to create the basic class methods for admin routing?"), array('y','n'), 'n' ); return array($wannaBakeCrud, $wannaBakeAdminCrud); @@ -269,10 +269,11 @@ class ControllerTask extends BakeTask { $currentModelName = $modelImport = $this->_modelName($controllerName); $plugin = $this->plugin; if ($plugin) { - $modelImport = $plugin . '.' . $modelImport; + $plugin .= '.'; } - if (!App::import('Model', $modelImport)) { - $this->err(__('You must have a model for this class to build basic methods. Please try again.')); + App::uses($modelImport, $plugin . 'Model'); + if (!class_exists($modelImport)) { + $this->err(__d('cake_console', 'You must have a model for this class to build basic methods. Please try again.')); $this->_stop(); } @@ -286,7 +287,7 @@ class ControllerTask extends BakeTask { $primaryKey = $modelObj->primaryKey; $this->Template->set(compact('plugin', 'admin', 'controllerPath', 'pluralName', 'singularName', - 'singularHumanName', 'pluralHumanName', 'modelObj', 'wannaUseSession', 'currentModelName', + 'singularHumanName', 'pluralHumanName', 'modelObj', 'wannaUseSession', 'currentModelName', 'displayField', 'primaryKey' )); $actions = $this->Template->generate('actions', 'controller_actions'); @@ -313,7 +314,7 @@ class ControllerTask extends BakeTask { $contents = $this->Template->generate('classes', 'controller'); $path = $this->getPath(); - $filename = $path . $this->_controllerPath($controllerName) . '_controller.php'; + $filename = $path . $this->_controllerName($controllerName) . 'Controller.php'; if ($this->createFile($filename, $contents)) { return $contents; } @@ -340,8 +341,8 @@ class ControllerTask extends BakeTask { */ public function doHelpers() { return $this->_doPropertyChoices( - __("Would you like this controller to use other helpers\nbesides HtmlHelper and FormHelper?"), - __("Please provide a comma separated list of the other\nhelper names you'd like to use.\nExample: 'Ajax, Javascript, Time'") + __d('cake_console', "Would you like this controller to use other helpers\nbesides HtmlHelper and FormHelper?"), + __d('cake_console', "Please provide a comma separated list of the other\nhelper names you'd like to use.\nExample: 'Ajax, Javascript, Time'") ); } @@ -352,8 +353,8 @@ class ControllerTask extends BakeTask { */ public function doComponents() { return $this->_doPropertyChoices( - __("Would you like this controller to use any components?"), - __("Please provide a comma separated list of the component names you'd like to use.\nExample: 'Acl, Security, RequestHandler'") + __d('cake_console', "Would you like this controller to use any components?"), + __d('cake_console', "Please provide a comma separated list of the component names you'd like to use.\nExample: 'Acl, Security, RequestHandler'") ); } @@ -389,7 +390,7 @@ class ControllerTask extends BakeTask { $this->__tables = $this->Model->getAllTables($useDbConfig); if ($this->interactive == true) { - $this->out(__('Possible Controllers based on your current database:')); + $this->out(__d('cake_console', 'Possible Controllers based on your current database:')); $this->_controllerNames = array(); $count = count($this->__tables); for ($i = 0; $i < $count; $i++) { @@ -412,14 +413,14 @@ class ControllerTask extends BakeTask { $enteredController = ''; while ($enteredController == '') { - $enteredController = $this->in(__("Enter a number from the list above,\ntype in the name of another controller, or 'q' to exit"), null, 'q'); + $enteredController = $this->in(__d('cake_console', "Enter a number from the list above,\ntype in the name of another controller, or 'q' to exit"), null, 'q'); if ($enteredController === 'q') { - $this->out(__('Exit')); + $this->out(__d('cake_console', 'Exit')); return $this->_stop(); } if ($enteredController == '' || intval($enteredController) > count($controllers)) { - $this->err(__("The Controller name you supplied was empty,\nor the number you selected was not an option. Please try again.")); + $this->err(__d('cake_console', "The Controller name you supplied was empty,\nor the number you selected was not an option. Please try again.")); $enteredController = ''; } } @@ -440,24 +441,24 @@ class ControllerTask extends BakeTask { public function getOptionParser() { $parser = parent::getOptionParser(); return $parser->description( - __('Bake a controller for a model. Using options you can bake public, admin or both.') + __d('cake_console', 'Bake a controller for a model. Using options you can bake public, admin or both.') )->addArgument('name', array( - 'help' => __('Name of the controller to bake. Can use Plugin.name to bake controllers into plugins.') + 'help' => __d('cake_console', 'Name of the controller to bake. Can use Plugin.name to bake controllers into plugins.') ))->addOption('public', array( - 'help' => __('Bake a controller with basic crud actions (index, view, add, edit, delete).'), + 'help' => __d('cake_console', 'Bake a controller with basic crud actions (index, view, add, edit, delete).'), 'boolean' => true ))->addOption('admin', array( - 'help' => __('Bake a controller with crud actions for one of the Routing.prefixes.'), + 'help' => __d('cake_console', 'Bake a controller with crud actions for one of the Routing.prefixes.'), 'boolean' => true ))->addOption('plugin', array( 'short' => 'p', - 'help' => __('Plugin to bake the controller into.') + 'help' => __d('cake_console', 'Plugin to bake the controller into.') ))->addOption('connection', array( 'short' => 'c', - 'help' => __('The connection the controller\'s model is on.') + 'help' => __d('cake_console', 'The connection the controller\'s model is on.') ))->addSubcommand('all', array( - 'help' => __('Bake all controllers with CRUD methods.') - ))->epilog(__('Omitting all arguments and options will enter into an interactive mode.')); + 'help' => __d('cake_console', 'Bake all controllers with CRUD methods.') + ))->epilog(__d('cake_console', 'Omitting all arguments and options will enter into an interactive mode.')); } /** @@ -498,4 +499,4 @@ class ControllerTask extends BakeTask { $this->out(); $this->_stop(); } -} +} \ No newline at end of file diff --git a/cake/console/shells/tasks/db_config.php b/lib/Cake/Console/Command/Task/DbConfigTask.php similarity index 97% rename from cake/console/shells/tasks/db_config.php rename to lib/Cake/Console/Command/Task/DbConfigTask.php index 6aaa9bf5e..2ffdd4ada 100644 --- a/cake/console/shells/tasks/db_config.php +++ b/lib/Cake/Console/Command/Task/DbConfigTask.php @@ -351,7 +351,7 @@ class DbConfigTask extends Shell { * @return void */ public function getConfig() { - App::import('Model', 'ConnectionManager', false); + App::uses('ConnectionManager', 'Model'); $useDbConfig = 'default'; $configs = get_class_vars($this->databaseClassName); @@ -361,7 +361,7 @@ class DbConfigTask extends Shell { $connections = array_keys($configs); if (count($connections) > 1) { - $useDbConfig = $this->in(__('Use Database Config') .':', $connections, 'default'); + $useDbConfig = $this->in(__d('cake_console', 'Use Database Config') .':', $connections, 'default'); } return $useDbConfig; } @@ -374,7 +374,7 @@ class DbConfigTask extends Shell { public function getOptionParser() { $parser = parent::getOptionParser(); return $parser->description( - __('Bake new database configuration settings.') + __d('cake_console', 'Bake new database configuration settings.') ); } } diff --git a/cake/console/shells/tasks/extract.php b/lib/Cake/Console/Command/Task/ExtractTask.php similarity index 77% rename from cake/console/shells/tasks/extract.php rename to lib/Cake/Console/Command/Task/ExtractTask.php index 9965876e2..8e20fabe2 100644 --- a/cake/console/shells/tasks/extract.php +++ b/lib/Cake/Console/Command/Task/ExtractTask.php @@ -16,7 +16,7 @@ * @since CakePHP(tm) v 1.2.0.5012 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Core', 'File'); +App::uses('File', 'Utility'); /** * Language string extractor * @@ -112,11 +112,11 @@ class ExtractTask extends Shell { $this->__paths = explode(',', $this->params['paths']); } else { $defaultPath = APP_PATH; - $message = __("What is the full path you would like to extract?\nExample: %s\n[Q]uit [D]one", $this->Dispatch->params['root'] . DS . 'myapp'); + $message = __d('cake_console', "What is the full path you would like to extract?\nExample: %s\n[Q]uit [D]one", $defaultPath); while (true) { $response = $this->in($message, null, $defaultPath); if (strtoupper($response) === 'Q') { - $this->out(__('Extract Aborted')); + $this->out(__d('cake_console', 'Extract Aborted')); $this->_stop(); } elseif (strtoupper($response) === 'D') { $this->out(); @@ -125,7 +125,7 @@ class ExtractTask extends Shell { $this->__paths[] = $response; $defaultPath = 'D'; } else { - $this->err(__('The directory path you supplied was not found. Please try again.')); + $this->err(__d('cake_console', 'The directory path you supplied was not found. Please try again.')); } $this->out(); } @@ -134,17 +134,17 @@ class ExtractTask extends Shell { if (isset($this->params['output'])) { $this->__output = $this->params['output']; } else { - $message = __("What is the full path you would like to output?\nExample: %s\n[Q]uit", $this->__paths[0] . DS . 'locale'); + $message = __d('cake_console', "What is the full path you would like to output?\nExample: %s\n[Q]uit", $this->__paths[0] . DS . 'locale'); while (true) { $response = $this->in($message, null, $this->__paths[0] . DS . 'locale'); if (strtoupper($response) === 'Q') { - $this->out(__('Extract Aborted')); + $this->out(__d('cake_console', 'Extract Aborted')); $this->_stop(); } elseif (is_dir($response)) { $this->__output = $response . DS; break; } else { - $this->err(__('The directory path you supplied was not found. Please try again.')); + $this->err(__d('cake_console', 'The directory path you supplied was not found. Please try again.')); } $this->out(); } @@ -154,7 +154,7 @@ class ExtractTask extends Shell { $this->__merge = !(strtolower($this->params['merge']) === 'no'); } else { $this->out(); - $response = $this->in(__('Would you like to merge all domains strings into the default.pot file?'), array('y', 'n'), 'n'); + $response = $this->in(__d('cake_console', 'Would you like to merge all domains strings into the default.pot file?'), array('y', 'n'), 'n'); $this->__merge = strtolower($response) === 'y'; } @@ -173,13 +173,13 @@ class ExtractTask extends Shell { function __extract() { $this->out(); $this->out(); - $this->out(__('Extracting...')); + $this->out(__d('cake_console', 'Extracting...')); $this->hr(); - $this->out(__('Paths:')); + $this->out(__d('cake_console', 'Paths:')); foreach ($this->__paths as $path) { $this->out(' ' . $path); } - $this->out(__('Output Directory: ') . $this->__output); + $this->out(__d('cake_console', 'Output Directory: ') . $this->__output); $this->hr(); $this->__extractTokens(); $this->__buildFiles(); @@ -187,7 +187,7 @@ class ExtractTask extends Shell { $this->__paths = $this->__files = $this->__storage = array(); $this->__strings = $this->__tokens = array(); $this->out(); - $this->out(__('Done.')); + $this->out(__d('cake_console', 'Done.')); } /** @@ -197,17 +197,17 @@ class ExtractTask extends Shell { */ public function getOptionParser() { $parser = parent::getOptionParser(); - return $parser->description(__('CakePHP Language String Extraction:')) - ->addOption('app', array('help' => __('Directory where your application is located.'))) - ->addOption('paths', array('help' => __('Comma separted list of paths, full paths are needed.'))) + return $parser->description(__d('cake_console', 'CakePHP Language String Extraction:')) + ->addOption('app', array('help' => __d('cake_console', 'Directory where your application is located.'))) + ->addOption('paths', array('help' => __d('cake_console', 'Comma separted list of paths, full paths are needed.'))) ->addOption('merge', array( - 'help' => __('Merge all domain strings into the default.po file.'), + 'help' => __d('cake_console', 'Merge all domain strings into the default.po file.'), 'choices' => array('yes', 'no') )) - ->addOption('output', array('help' => __('Full path to output directory.'))) - ->addOption('files', array('help' => __('Comma separated list of files, full paths are needed.'))) + ->addOption('output', array('help' => __d('cake_console', 'Full path to output directory.'))) + ->addOption('files', array('help' => __d('cake_console', 'Comma separated list of files, full paths are needed.'))) ->addOption('exclude', array( - 'help' => __('Comma separated list of directories to exclude. Any path containing a path segment with the provided values will be skipped. E.g. test,vendors') + 'help' => __d('cake_console', 'Comma separated list of directories to exclude. Any path containing a path segment with the provided values will be skipped. E.g. test,vendors') )); } @@ -217,25 +217,25 @@ class ExtractTask extends Shell { * @return void */ public function help() { - $this->out(__('CakePHP Language String Extraction:')); + $this->out(__d('cake_console', 'CakePHP Language String Extraction:')); $this->hr(); - $this->out(__('The Extract script generates .pot file(s) with translations')); - $this->out(__('By default the .pot file(s) will be place in the locale directory of -app')); - $this->out(__('By default -app is ROOT/app')); + $this->out(__d('cake_console', 'The Extract script generates .pot file(s) with translations')); + $this->out(__d('cake_console', 'By default the .pot file(s) will be place in the locale directory of -app')); + $this->out(__d('cake_console', 'By default -app is ROOT/app')); $this->hr(); - $this->out(__('Usage: cake i18n extract ...')); + $this->out(__d('cake_console', 'Usage: cake i18n extract ...')); $this->out(); - $this->out(__('Params:')); - $this->out(__(' -app [path...]: directory where your application is located')); - $this->out(__(' -root [path...]: path to install')); - $this->out(__(' -core [path...]: path to cake directory')); - $this->out(__(' -paths [comma separated list of paths, full path is needed]')); - $this->out(__(' -merge [yes|no]: Merge all domains strings into the default.pot file')); - $this->out(__(' -output [path...]: Full path to output directory')); - $this->out(__(' -files: [comma separated list of files, full path to file is needed]')); + $this->out(__d('cake_console', 'Params:')); + $this->out(__d('cake_console', ' -app [path...]: directory where your application is located')); + $this->out(__d('cake_console', ' -root [path...]: path to install')); + $this->out(__d('cake_console', ' -core [path...]: path to cake directory')); + $this->out(__d('cake_console', ' -paths [comma separated list of paths, full path is needed]')); + $this->out(__d('cake_console', ' -merge [yes|no]: Merge all domains strings into the default.pot file')); + $this->out(__d('cake_console', ' -output [path...]: Full path to output directory')); + $this->out(__d('cake_console', ' -files: [comma separated list of files, full path to file is needed]')); $this->out(); - $this->out(__('Commands:')); - $this->out(__(' cake i18n extract help: Shows this help message.')); + $this->out(__d('cake_console', 'Commands:')); + $this->out(__d('cake_console', ' cake i18n extract help: Shows this help message.')); $this->out(); } @@ -248,7 +248,7 @@ class ExtractTask extends Shell { function __extractTokens() { foreach ($this->__files as $file) { $this->__file = $file; - $this->out(__('Processing %s...', $file)); + $this->out(__d('cake_console', 'Processing %s...', $file)); $code = file_get_contents($file); $allTokens = token_get_all($code); @@ -411,11 +411,11 @@ class ExtractTask extends Shell { $response = ''; while ($overwriteAll === false && $File->exists() && strtoupper($response) !== 'Y') { $this->out(); - $response = $this->in(__('Error: %s already exists in this location. Overwrite? [Y]es, [N]o, [A]ll', $filename), array('y', 'n', 'a'), 'y'); + $response = $this->in(__d('cake_console', 'Error: %s already exists in this location. Overwrite? [Y]es, [N]o, [A]ll', $filename), array('y', 'n', 'a'), 'y'); if (strtoupper($response) === 'N') { $response = ''; while ($response == '') { - $response = $this->in(__("What would you like to name this file?\nExample: %s", 'new_' . $filename), null, 'new_' . $filename); + $response = $this->in(__d('cake_console', "What would you like to name this file?\nExample: %s", 'new_' . $filename), null, 'new_' . $filename); $File = new File($this->__output . $response); $filename = $response; } @@ -483,7 +483,7 @@ class ExtractTask extends Shell { * @access private */ function __markerError($file, $line, $marker, $count) { - $this->out(__("Invalid marker content in %s:%s\n* %s(", $file, $line, $marker), true); + $this->out(__d('cake_console', "Invalid marker content in %s:%s\n* %s(", $file, $line, $marker), true); $count += 2; $tokenCount = count($this->__tokens); $parenthesis = 1; diff --git a/cake/console/shells/tasks/fixture.php b/lib/Cake/Console/Command/Task/FixtureTask.php similarity index 88% rename from cake/console/shells/tasks/fixture.php rename to lib/Cake/Console/Command/Task/FixtureTask.php index 6a527672c..daf3e412d 100644 --- a/cake/console/shells/tasks/fixture.php +++ b/lib/Cake/Console/Command/Task/FixtureTask.php @@ -16,7 +16,10 @@ * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -include_once dirname(__FILE__) . DS . 'bake.php'; + +App::uses('BakeTask', 'Console/Command/Task'); +App::uses('Model', 'Model'); + /** * Task class for creating and updating fixtures files. * @@ -54,7 +57,7 @@ class FixtureTask extends BakeTask { */ public function __construct($stdout = null, $stderr = null, $stdin = null) { parent::__construct($stdout, $stderr, $stdin); - $this->path = APP . 'tests' . DS . 'fixtures' . DS; + $this->path = APP . 'tests' . DS . 'Fixture' . DS; } /** @@ -65,25 +68,25 @@ class FixtureTask extends BakeTask { public function getOptionParser() { $parser = parent::getOptionParser(); return $parser->description( - __('Generate fixtures for use with the test suite. You can use `bake fixture all` to bake all fixtures.') + __d('cake_console', 'Generate fixtures for use with the test suite. You can use `bake fixture all` to bake all fixtures.') )->addArgument('name', array( - 'help' => __('Name of the fixture to bake. Can use Plugin.name to bake plugin fixtures.') + 'help' => __d('cake_console', 'Name of the fixture to bake. Can use Plugin.name to bake plugin fixtures.') ))->addOption('count', array( - 'help' => __('When using generated data, the number of records to include in the fixture(s).'), + 'help' => __d('cake_console', 'When using generated data, the number of records to include in the fixture(s).'), 'short' => 'n', 'default' => 10 ))->addOption('connection', array( - 'help' => __('Which database configuration to use for baking.'), + 'help' => __d('cake_console', 'Which database configuration to use for baking.'), 'short' => 'c', 'default' => 'default' ))->addOption('plugin', array( - 'help' => __('CamelCased name of the plugin to bake fixtures for.'), + 'help' => __d('cake_console', 'CamelCased name of the plugin to bake fixtures for.'), 'short' => 'p', ))->addOption('records', array( 'help' => 'Used with --count and /all commands to pull [n] records from the live tables, where [n] is either --count or the default of 10', 'short' => 'r', 'boolean' => true - ))->epilog(__('Omitting all arguments and options will enter into an interactive mode.'));; + ))->epilog(__d('cake_console', 'Omitting all arguments and options will enter into an interactive mode.'));; } /** @@ -155,16 +158,16 @@ class FixtureTask extends BakeTask { */ public function importOptions($modelName) { $options = array(); - $doSchema = $this->in(__('Would you like to import schema for this fixture?'), array('y', 'n'), 'n'); + $doSchema = $this->in(__d('cake_console', 'Would you like to import schema for this fixture?'), array('y', 'n'), 'n'); if ($doSchema == 'y') { $options['schema'] = $modelName; } - $doRecords = $this->in(__('Would you like to use record importing for this fixture?'), array('y', 'n'), 'n'); + $doRecords = $this->in(__d('cake_console', 'Would you like to use record importing for this fixture?'), array('y', 'n'), 'n'); if ($doRecords == 'y') { $options['records'] = true; } if ($doRecords == 'n') { - $prompt = __("Would you like to build this fixture with data from %s's table?", $modelName); + $prompt = __d('cake_console', "Would you like to build this fixture with data from %s's table?", $modelName); $fromTable = $this->in($prompt, array('y', 'n'), 'n'); if (strtolower($fromTable) == 'y') { $options['fromTable'] = true; @@ -182,9 +185,7 @@ class FixtureTask extends BakeTask { * @return string Baked fixture content */ public function bake($model, $useTable = false, $importOptions = array()) { - if (!class_exists('CakeSchema')) { - App::import('Model', 'CakeSchema', false); - } + App::uses('CakeSchema', 'Model'); $table = $schema = $records = $import = $modelImport = null; $importBits = array(); @@ -248,7 +249,7 @@ class FixtureTask extends BakeTask { $vars = array_merge($defaults, $otherVars); $path = $this->getPath(); - $filename = Inflector::underscore($model) . '_fixture.php'; + $filename = Inflector::camelize($model) . 'Fixture.php'; $this->Template->set('model', $model); $this->Template->set($vars); @@ -267,7 +268,7 @@ class FixtureTask extends BakeTask { public function getPath() { $path = $this->path; if (isset($this->plugin)) { - $path = $this->_pluginPath($this->plugin) . 'tests' . DS . 'fixtures' . DS; + $path = $this->_pluginPath($this->plugin) . 'tests' . DS . 'Fixture' . DS; } return $path; } @@ -386,14 +387,13 @@ class FixtureTask extends BakeTask { protected function _getRecordsFromTable($modelName, $useTable = null) { if ($this->interactive) { $condition = null; - $prompt = __("Please provide a SQL fragment to use as conditions\nExample: WHERE 1=1 LIMIT 10"); + $prompt = __d('cake_console', "Please provide a SQL fragment to use as conditions\nExample: WHERE 1=1 LIMIT 10"); while (!$condition) { $condition = $this->in($prompt, null, 'WHERE 1=1 LIMIT 10'); } } else { $condition = 'WHERE 1=1 LIMIT ' . (isset($this->params['count']) ? $this->params['count'] : 10); } - App::import('Model', 'Model', false); $modelObject = new Model(array('name' => $modelName, 'table' => $useTable, 'ds' => $this->connection)); $records = $modelObject->find('all', array( 'conditions' => $condition, diff --git a/cake/console/shells/tasks/model.php b/lib/Cake/Console/Command/Task/ModelTask.php similarity index 82% rename from cake/console/shells/tasks/model.php rename to lib/Cake/Console/Command/Task/ModelTask.php index ed8d0402c..1c63147fb 100644 --- a/cake/console/shells/tasks/model.php +++ b/lib/Cake/Console/Command/Task/ModelTask.php @@ -17,7 +17,10 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -include_once dirname(__FILE__) . DS . 'bake.php'; +App::uses('BakeTask', 'Console/Command/Task'); +App::uses('ConnectionManager', 'Model'); +App::uses('Model', 'Model'); +App::uses('Validation', 'Utility'); /** * Task class for creating and updating model files. @@ -71,7 +74,6 @@ class ModelTask extends BakeTask { * */ public function execute() { - App::import('Model', 'Model', false); parent::execute(); if (empty($this->args)) { @@ -110,7 +112,7 @@ class ModelTask extends BakeTask { continue; } $modelClass = Inflector::classify($table); - $this->out(__('Baking %s', $modelClass)); + $this->out(__d('cake_console', 'Baking %s', $modelClass)); $object = $this->_getModelObject($modelClass); if ($this->bake($object, false) && $unitTestExists) { $this->bakeFixture($modelClass); @@ -149,7 +151,7 @@ class ModelTask extends BakeTask { $this->out($i + 1 .'. ' . $option); } if (empty($prompt)) { - $prompt = __('Make a selection from the choices above'); + $prompt = __d('cake_console', 'Make a selection from the choices above'); } $choice = $this->in($prompt, null, $default); if (intval($choice) > 0 && intval($choice) <= $max) { @@ -188,7 +190,7 @@ class ModelTask extends BakeTask { $primaryKey = $this->findPrimaryKey($fields); } } else { - $this->err(__('Table %s does not exist, cannot bake a model without a table.', $useTable)); + $this->err(__d('cake_console', 'Table %s does not exist, cannot bake a model without a table.', $useTable)); $this->_stop(); return false; } @@ -197,13 +199,13 @@ class ModelTask extends BakeTask { $displayField = $this->findDisplayField($tempModel->schema()); } - $prompt = __("Would you like to supply validation criteria \nfor the fields in your model?"); + $prompt = __d('cake_console', "Would you like to supply validation criteria \nfor the fields in your model?"); $wannaDoValidation = $this->in($prompt, array('y','n'), 'y'); if (array_search($useTable, $this->_tables) !== false && strtolower($wannaDoValidation) == 'y') { $validate = $this->doValidation($tempModel); } - $prompt = __("Would you like to define model associations\n(hasMany, hasOne, belongsTo, etc.)?"); + $prompt = __d('cake_console', "Would you like to define model associations\n(hasMany, hasOne, belongsTo, etc.)?"); $wannaDoAssoc = $this->in($prompt, array('y','n'), 'y'); if (strtolower($wannaDoAssoc) == 'y') { $associations = $this->doAssociations($tempModel); @@ -211,24 +213,24 @@ class ModelTask extends BakeTask { $this->out(); $this->hr(); - $this->out(__('The following Model will be created:')); + $this->out(__d('cake_console', 'The following Model will be created:')); $this->hr(); $this->out("Name: " . $currentModelName); if ($this->connection !== 'default') { - $this->out(__("DB Config: %s", $this->connection)); + $this->out(__d('cake_console', "DB Config: %s", $this->connection)); } if ($fullTableName !== Inflector::tableize($currentModelName)) { - $this->out(__('DB Table: %s', $fullTableName)); + $this->out(__d('cake_console', 'DB Table: %s', $fullTableName)); } if ($primaryKey != 'id') { - $this->out(__('Primary Key: %s', $primaryKey)); + $this->out(__d('cake_console', 'Primary Key: %s', $primaryKey)); } if (!empty($validate)) { - $this->out(__('Validation: %s', print_r($validate, true))); + $this->out(__d('cake_console', 'Validation: %s', print_r($validate, true))); } if (!empty($associations)) { - $this->out(__('Associations:')); + $this->out(__d('cake_console', 'Associations:')); $assocKeys = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany'); foreach ($assocKeys as $assocKey) { $this->_printAssociation($currentModelName, $assocKey, $associations); @@ -236,7 +238,7 @@ class ModelTask extends BakeTask { } $this->hr(); - $looksGood = $this->in(__('Look okay?'), array('y','n'), 'y'); + $looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y','n'), 'y'); if (strtolower($looksGood) == 'y') { $vars = compact('associations', 'validate', 'primaryKey', 'useTable', 'displayField'); @@ -281,7 +283,7 @@ class ModelTask extends BakeTask { break; } } - return $this->in(__('What is the primaryKey?'), null, $name); + return $this->in(__d('cake_console', 'What is the primaryKey?'), null, $name); } /** @@ -292,12 +294,12 @@ class ModelTask extends BakeTask { */ public function findDisplayField($fields) { $fieldNames = array_keys($fields); - $prompt = __("A displayField could not be automatically detected\nwould you like to choose one?"); + $prompt = __d('cake_console', "A displayField could not be automatically detected\nwould you like to choose one?"); $continue = $this->in($prompt, array('y', 'n')); if (strtolower($continue) == 'n') { return false; } - $prompt = __('Choose a field from the options above:'); + $prompt = __d('cake_console', 'Choose a field from the options above:'); $choice = $this->inOptions($fieldNames, $prompt); return $fieldNames[$choice]; } @@ -365,10 +367,10 @@ class ModelTask extends BakeTask { while ($anotherValidator == 'y') { if ($this->interactive) { $this->out(); - $this->out(__('Field: %s', $fieldName)); - $this->out(__('Type: %s', $metaData['type'])); + $this->out(__d('cake_console', 'Field: %s', $fieldName)); + $this->out(__d('cake_console', 'Type: %s', $metaData['type'])); $this->hr(); - $this->out(__('Please select one of the following validation options:')); + $this->out(__d('cake_console', 'Please select one of the following validation options:')); $this->hr(); } @@ -376,8 +378,8 @@ class ModelTask extends BakeTask { for ($i = 1; $i < $defaultChoice; $i++) { $prompt .= $i . ' - ' . $this->_validations[$i] . "\n"; } - $prompt .= __("%s - Do not do any validation on this field.\n", $defaultChoice); - $prompt .= __("... or enter in a valid regex validation string.\n"); + $prompt .= __d('cake_console', "%s - Do not do any validation on this field.\n", $defaultChoice); + $prompt .= __d('cake_console', "... or enter in a valid regex validation string.\n"); $methods = array_flip($this->_validations); $guess = $defaultChoice; @@ -400,11 +402,11 @@ class ModelTask extends BakeTask { if ($this->interactive === true) { $choice = $this->in($prompt, null, $guess); if (in_array($choice, $alreadyChosen)) { - $this->out(__("You have already chosen that validation rule,\nplease choose again")); + $this->out(__d('cake_console', "You have already chosen that validation rule,\nplease choose again")); continue; } if (!isset($this->_validations[$choice]) && is_numeric($choice)) { - $this->out(__('Please make a valid selection.')); + $this->out(__d('cake_console', 'Please make a valid selection.')); continue; } $alreadyChosen[] = $choice; @@ -426,7 +428,7 @@ class ModelTask extends BakeTask { } } if ($this->interactive == true && $choice != $defaultChoice) { - $anotherValidator = $this->in(__('Would you like to add another validation rule?'), array('y', 'n'), 'n'); + $anotherValidator = $this->in(__d('cake_console', 'Would you like to add another validation rule?'), array('y', 'n'), 'n'); } else { $anotherValidator = 'n'; } @@ -445,7 +447,7 @@ class ModelTask extends BakeTask { return false; } if ($this->interactive === true) { - $this->out(__('One moment while the associations are detected.')); + $this->out(__d('cake_console', 'One moment while the associations are detected.')); } $fields = $model->schema(true); @@ -473,9 +475,9 @@ class ModelTask extends BakeTask { if ($this->interactive === true) { $this->hr(); if (empty($associations)) { - $this->out(__('None found.')); + $this->out(__d('cake_console', 'None found.')); } else { - $this->out(__('Please confirm the following associations:')); + $this->out(__d('cake_console', 'Please confirm the following associations:')); $this->hr(); $associations = $this->confirmAssociations($model, $associations); } @@ -632,19 +634,19 @@ class ModelTask extends BakeTask { * @return array Array of associations. */ public function doMoreAssociations($model, $associations) { - $prompt = __('Would you like to define some additional model associations?'); + $prompt = __d('cake_console', 'Would you like to define some additional model associations?'); $wannaDoMoreAssoc = $this->in($prompt, array('y','n'), 'n'); $possibleKeys = $this->_generatePossibleKeys(); while (strtolower($wannaDoMoreAssoc) == 'y') { $assocs = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany'); - $this->out(__('What is the association type?')); - $assocType = intval($this->inOptions($assocs, __('Enter a number'))); + $this->out(__d('cake_console', 'What is the association type?')); + $assocType = intval($this->inOptions($assocs, __d('cake_console', 'Enter a number'))); - $this->out(__("For the following options be very careful to match your setup exactly.\nAny spelling mistakes will cause errors.")); + $this->out(__d('cake_console', "For the following options be very careful to match your setup exactly.\nAny spelling mistakes will cause errors.")); $this->hr(); - $alias = $this->in(__('What is the alias for this association?')); - $className = $this->in(__('What className will %s use?', $alias), null, $alias ); + $alias = $this->in(__d('cake_console', 'What is the alias for this association?')); + $className = $this->in(__d('cake_console', 'What className will %s use?', $alias), null, $alias ); $suggestedForeignKey = null; if ($assocType == 0) { @@ -659,22 +661,22 @@ class ModelTask extends BakeTask { $showKeys = null; } } else { - $otherTable = $this->in(__('What is the table for this model?')); + $otherTable = $this->in(__d('cake_console', 'What is the table for this model?')); $showKeys = $possibleKeys[$otherTable]; } $suggestedForeignKey = $this->_modelKey($model->name); } if (!empty($showKeys)) { - $this->out(__('A helpful List of possible keys')); - $foreignKey = $this->inOptions($showKeys, __('What is the foreignKey?')); + $this->out(__d('cake_console', 'A helpful List of possible keys')); + $foreignKey = $this->inOptions($showKeys, __d('cake_console', 'What is the foreignKey?')); $foreignKey = $showKeys[intval($foreignKey)]; } if (!isset($foreignKey)) { - $foreignKey = $this->in(__('What is the foreignKey? Specify your own.'), null, $suggestedForeignKey); + $foreignKey = $this->in(__d('cake_console', 'What is the foreignKey? Specify your own.'), null, $suggestedForeignKey); } if ($assocType == 3) { - $associationForeignKey = $this->in(__('What is the associationForeignKey?'), null, $this->_modelKey($model->name)); - $joinTable = $this->in(__('What is the joinTable?')); + $associationForeignKey = $this->in(__d('cake_console', 'What is the associationForeignKey?'), null, $this->_modelKey($model->name)); + $joinTable = $this->in(__d('cake_console', 'What is the joinTable?')); } $associations[$assocs[$assocType]] = array_values((array)$associations[$assocs[$assocType]]); $count = count($associations[$assocs[$assocType]]); @@ -686,7 +688,7 @@ class ModelTask extends BakeTask { $associations[$assocs[$assocType]][$i]['associationForeignKey'] = $associationForeignKey; $associations[$assocs[$assocType]][$i]['joinTable'] = $joinTable; } - $wannaDoMoreAssoc = $this->in(__('Define another association?'), array('y','n'), 'y'); + $wannaDoMoreAssoc = $this->in(__d('cake_console', 'Define another association?'), array('y','n'), 'y'); } return $associations; } @@ -739,7 +741,7 @@ class ModelTask extends BakeTask { $out = $this->Template->generate('classes', 'model'); $path = $this->getPath(); - $filename = $path . Inflector::underscore($name) . '.php'; + $filename = $path . $name . '.php'; $this->out("\nBaking model class for $name...", 1, Shell::QUIET); $this->createFile($filename, $out); ClassRegistry::flush(); @@ -767,7 +769,7 @@ class ModelTask extends BakeTask { $this->_tables = $this->getAllTables($useDbConfig); if ($this->interactive === true) { - $this->out(__('Possible Models based on your current database:')); + $this->out(__d('cake_console', 'Possible Models based on your current database:')); $this->_modelNames = array(); $count = count($this->_tables); for ($i = 0; $i < $count; $i++) { @@ -789,7 +791,6 @@ class ModelTask extends BakeTask { if (!isset($useDbConfig)) { $useDbConfig = $this->connection; } - App::import('Model', 'ConnectionManager', false); $db = ConnectionManager::getDataSource($useDbConfig); $useTable = Inflector::tableize($modelName); @@ -798,11 +799,11 @@ class ModelTask extends BakeTask { if (array_search($useTable, $this->_tables) === false) { $this->out(); - $this->out(__("Given your model named '%s',\nCake would expect a database table named '%s'", $modelName, $fullTableName)); - $tableIsGood = $this->in(__('Do you want to use this table?'), array('y','n'), 'y'); + $this->out(__d('cake_console', "Given your model named '%s',\nCake would expect a database table named '%s'", $modelName, $fullTableName)); + $tableIsGood = $this->in(__d('cake_console', 'Do you want to use this table?'), array('y','n'), 'y'); } if (strtolower($tableIsGood) == 'n') { - $useTable = $this->in(__('What is the name of the table?')); + $useTable = $this->in(__d('cake_console', 'What is the name of the table?')); } return $useTable; } @@ -818,7 +819,6 @@ class ModelTask extends BakeTask { if (!isset($useDbConfig)) { $useDbConfig = $this->connection; } - App::import('Model', 'ConnectionManager', false); $tables = array(); $db = ConnectionManager::getDataSource($useDbConfig); @@ -834,7 +834,7 @@ class ModelTask extends BakeTask { $tables = $db->listSources(); } if (empty($tables)) { - $this->err(__('Your database does not have any tables.')); + $this->err(__d('cake_console', 'Your database does not have any tables.')); $this->_stop(); } return $tables; @@ -851,15 +851,15 @@ class ModelTask extends BakeTask { $enteredModel = ''; while ($enteredModel == '') { - $enteredModel = $this->in(__("Enter a number from the list above,\ntype in the name of another model, or 'q' to exit"), null, 'q'); + $enteredModel = $this->in(__d('cake_console', "Enter a number from the list above,\ntype in the name of another model, or 'q' to exit"), null, 'q'); if ($enteredModel === 'q') { - $this->out(__('Exit')); + $this->out(__d('cake_console', 'Exit')); $this->_stop(); } if ($enteredModel == '' || intval($enteredModel) > count($this->_modelNames)) { - $this->err(__("The model name you supplied was empty,\nor the number you selected was not an option. Please try again.")); + $this->err(__d('cake_console', "The model name you supplied was empty,\nor the number you selected was not an option. Please try again.")); $enteredModel = ''; } } @@ -879,18 +879,18 @@ class ModelTask extends BakeTask { public function getOptionParser() { $parser = parent::getOptionParser(); return $parser->description( - __('Bake models.') + __d('cake_console', 'Bake models.') )->addArgument('name', array( - 'help' => __('Name of the model to bake. Can use Plugin.name to bake plugin models.') + 'help' => __d('cake_console', 'Name of the model to bake. Can use Plugin.name to bake plugin models.') ))->addSubcommand('all', array( - 'help' => __('Bake all model files with associations and validation.') + 'help' => __d('cake_console', 'Bake all model files with associations and validation.') ))->addOption('plugin', array( 'short' => 'p', - 'help' => __('Plugin to bake the model into.') + 'help' => __d('cake_console', 'Plugin to bake the model into.') ))->addOption('connection', array( 'short' => 'c', - 'help' => __('The connection the model table is on.') - ))->epilog(__('Omitting all arguments and options will enter into an interactive mode.')); + 'help' => __d('cake_console', 'The connection the model table is on.') + ))->epilog(__d('cake_console', 'Omitting all arguments and options will enter into an interactive mode.')); } /** diff --git a/cake/console/shells/tasks/plugin.php b/lib/Cake/Console/Command/Task/PluginTask.php similarity index 82% rename from cake/console/shells/tasks/plugin.php rename to lib/Cake/Console/Command/Task/PluginTask.php index 118273d45..1b6033137 100644 --- a/cake/console/shells/tasks/plugin.php +++ b/lib/Cake/Console/Command/Task/PluginTask.php @@ -16,7 +16,9 @@ * @since CakePHP(tm) v 1.2 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Core', 'File'); + +App::uses('File', 'Utility'); +App::uses('Folder', 'Utility'); /** * Task class for creating a plugin @@ -54,8 +56,8 @@ class PluginTask extends Shell { $plugin = Inflector::camelize($this->args[0]); $pluginPath = $this->_pluginPath($plugin); if (is_dir($pluginPath)) { - $this->out(__('Plugin: %s', $plugin)); - $this->out(__('Path: %s', $pluginPath)); + $this->out(__d('cake_console', 'Plugin: %s', $plugin)); + $this->out(__d('cake_console', 'Path: %s', $pluginPath)); } else { $this->_interactive($plugin); } @@ -72,11 +74,11 @@ class PluginTask extends Shell { */ protected function _interactive($plugin = null) { while ($plugin === null) { - $plugin = $this->in(__('Enter the name of the plugin in CamelCase format')); + $plugin = $this->in(__d('cake_console', 'Enter the name of the plugin in CamelCase format')); } if (!$this->bake($plugin)) { - $this->error(__("An error occured trying to bake: %s in %s", $plugin, $this->path . Inflector::underscore($pluginPath))); + $this->error(__d('cake_console', "An error occured trying to bake: %s in %s", $plugin, $this->path . Inflector::underscore($pluginPath))); } } @@ -95,11 +97,11 @@ class PluginTask extends Shell { $this->findPath($pathOptions); } $this->hr(); - $this->out(__("Plugin Name: %s", $plugin)); - $this->out(__("Plugin Directory: %s", $this->path . $pluginPath)); + $this->out(__d('cake_console', "Plugin Name: %s", $plugin)); + $this->out(__d('cake_console', "Plugin Directory: %s", $this->path . $pluginPath)); $this->hr(); - $looksGood = $this->in(__('Look okay?'), array('y', 'n', 'q'), 'y'); + $looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y', 'n', 'q'), 'y'); if (strtolower($looksGood) == 'y') { $Folder = new Folder($this->path . $pluginPath); @@ -154,7 +156,7 @@ class PluginTask extends Shell { $this->createFile($this->path . $pluginPath . DS . $modelFileName, $out); $this->hr(); - $this->out(__('Created: %s in %s', $plugin, $this->path . $pluginPath), 2); + $this->out(__d('cake_console', 'Created: %s in %s', $plugin, $this->path . $pluginPath), 2); } return true; @@ -172,7 +174,7 @@ class PluginTask extends Shell { foreach ($pathOptions as $i => $option) { $this->out($i + 1 .'. ' . $option); } - $prompt = __('Choose a plugin path from the paths above.'); + $prompt = __d('cake_console', 'Choose a plugin path from the paths above.'); $choice = $this->in($prompt); if (intval($choice) > 0 && intval($choice) <= $max) { $valid = true; @@ -192,7 +194,7 @@ class PluginTask extends Shell { 'Create the directory structure, AppModel and AppController classes for a new plugin. ' . 'Can create plugins in any of your bootstrapped plugin paths.' )->addArgument('name', array( - 'help' => __('CamelCased name of the plugin to create.') + 'help' => __d('cake_console', 'CamelCased name of the plugin to create.') )); } diff --git a/cake/console/shells/tasks/project.php b/lib/Cake/Console/Command/Task/ProjectTask.php similarity index 69% rename from cake/console/shells/tasks/project.php rename to lib/Cake/Console/Command/Task/ProjectTask.php index ac9cd5b59..dd02e8170 100644 --- a/cake/console/shells/tasks/project.php +++ b/lib/Cake/Console/Command/Task/ProjectTask.php @@ -17,7 +17,10 @@ * @since CakePHP(tm) v 1.2 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Core', 'File'); + +App::uses('File', 'Utility'); +App::uses('String', 'Utility'); +App::uses('Security', 'Utility'); /** * Task class for creating new project apps and plugins @@ -49,16 +52,8 @@ class ProjectTask extends Shell { $project = $_SERVER['PWD'] . DS . $project; } - if (empty($this->params['skel'])) { - $core = App::core('shells'); - $skelPath = dirname($core[0]) . DS . 'templates' . DS . 'skel'; - if (is_dir($skelPath) === true) { - $this->params['skel'] = $skelPath; - } - } - while (!$project) { - $prompt = __("What is the full path for this app including the app directory name?\n Example:"); + $prompt = __d('cake_console', "What is the full path for this app including the app directory name?\n Example:"); $default = APP_PATH . 'myapp'; $project = $this->in($prompt . $default, null, $default); } @@ -66,7 +61,7 @@ class ProjectTask extends Shell { if ($project) { $response = false; while ($response == false && is_dir($project) === true && file_exists($project . 'config' . 'core.php')) { - $prompt = __('A project already exists in this location: %s Overwrite?', $project); + $prompt = __d('cake_console', 'A project already exists in this location: %s Overwrite?', $project); $response = $this->in($prompt, array('y','n'), 'n'); if (strtolower($response) === 'n') { $response = $project = false; @@ -78,51 +73,51 @@ class ProjectTask extends Shell { if ($this->bake($project)) { $path = Folder::slashTerm($project); if ($this->createHome($path)) { - $this->out(__(' * Welcome page created')); + $this->out(__d('cake_console', ' * Welcome page created')); } else { - $this->err(__('The Welcome page was NOT created')); + $this->err(__d('cake_console', 'The Welcome page was NOT created')); $success = false; } if ($this->securitySalt($path) === true) { - $this->out(__(' * Random hash key created for \'Security.salt\'')); + $this->out(__d('cake_console', ' * Random hash key created for \'Security.salt\'')); } else { - $this->err(__('Unable to generate random hash for \'Security.salt\', you should change it in %s', CONFIGS . 'core.php')); + $this->err(__d('cake_console', 'Unable to generate random hash for \'Security.salt\', you should change it in %s', CONFIGS . 'core.php')); $success = false; } if ($this->securityCipherSeed($path) === true) { - $this->out(__(' * Random seed created for \'Security.cipherSeed\'')); + $this->out(__d('cake_console', ' * Random seed created for \'Security.cipherSeed\'')); } else { - $this->err(__('Unable to generate random seed for \'Security.cipherSeed\', you should change it in %s', CONFIGS . 'core.php')); + $this->err(__d('cake_console', 'Unable to generate random seed for \'Security.cipherSeed\', you should change it in %s', CONFIGS . 'core.php')); $success = false; } if ($this->corePath($path) === true) { - $this->out(__(' * CAKE_CORE_INCLUDE_PATH set to %s in webroot/index.php', CAKE_CORE_INCLUDE_PATH)); - $this->out(__(' * CAKE_CORE_INCLUDE_PATH set to %s in webroot/test.php', CAKE_CORE_INCLUDE_PATH)); - $this->out(__(' * Remember to check these value after moving to production server')); + $this->out(__d('cake_console', ' * CAKE_CORE_INCLUDE_PATH set to %s in webroot/index.php', CAKE_CORE_INCLUDE_PATH)); + $this->out(__d('cake_console', ' * CAKE_CORE_INCLUDE_PATH set to %s in webroot/test.php', CAKE_CORE_INCLUDE_PATH)); + $this->out(__d('cake_console', ' * Remember to check these value after moving to production server')); } else { - $this->err(__('Unable to set CAKE_CORE_INCLUDE_PATH, you should change it in %s', $path . 'webroot' .DS .'index.php')); + $this->err(__d('cake_console', 'Unable to set CAKE_CORE_INCLUDE_PATH, you should change it in %s', $path . 'webroot' .DS .'index.php')); $success = false; } if ($this->consolePath($path) === true) { - $this->out(__(' * app/console/cake.php path set.')); + $this->out(__d('cake_console', ' * app/Console/cake.php path set.')); } else { - $this->err(__('Unable to set console path for app/console.')); + $this->err(__d('cake_console', 'Unable to set console path for app/Console.')); $success = false; } $Folder = new Folder($path); if (!$Folder->chmod($path . 'tmp', 0777)) { - $this->err(__('Could not set permissions on %s', $path . DS .'tmp')); - $this->out(__('chmod -R 0777 %s', $path . DS .'tmp')); + $this->err(__d('cake_console', 'Could not set permissions on %s', $path . DS .'tmp')); + $this->out(__d('cake_console', 'chmod -R 0777 %s', $path . DS .'tmp')); $success = false; } if ($success) { - $this->out(__('Project baked successfully!')); + $this->out(__d('cake_console', 'Project baked successfully!')); } else { - $this->out(__('Project baked but with some issues..')); + $this->out(__d('cake_console', 'Project baked but with some issues..')); } return $path; } @@ -144,23 +139,23 @@ class ProjectTask extends Shell { $skel = $this->params['skel']; } while (!$skel) { - $skel = $this->in(__("What is the path to the directory layout you wish to copy?\nExample: %s", APP, null, ROOT . DS . 'myapp' . DS)); + $skel = $this->in(__d('cake_console', "What is the path to the directory layout you wish to copy?\nExample: %s", APP, null, ROOT . DS . 'myapp' . DS)); if ($skel == '') { - $this->err(__('The directory path you supplied was empty. Please try again.')); + $this->err(__d('cake_console', 'The directory path you supplied was empty. Please try again.')); } else { while (is_dir($skel) === false) { - $skel = $this->in(__('Directory path does not exist please choose another:')); + $skel = $this->in(__d('cake_console', 'Directory path does not exist please choose another:')); } } } $app = basename($path); - $this->out(__('Skel Directory: ') . $skel); - $this->out(__('Will be copied to: ') . $path); + $this->out(__d('cake_console', 'Skel Directory: ') . $skel); + $this->out(__d('cake_console', 'Will be copied to: ') . $path); $this->hr(); - $looksGood = $this->in(__('Look okay?'), array('y', 'n', 'q'), 'y'); + $looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y', 'n', 'q'), 'y'); if (strtolower($looksGood) == 'y') { $Folder = new Folder($skel); @@ -170,10 +165,10 @@ class ProjectTask extends Shell { if ($Folder->copy(array('to' => $path, 'skip' => $skip))) { $this->hr(); - $this->out(__('Created: %s in %s', $app, $path)); + $this->out(__d('cake_console', 'Created: %s in %s', $app, $path)); $this->hr(); } else { - $this->err(__("Could not create '%s' properly.", $app)); + $this->err(__d('cake_console', "Could not create '%s' properly.", $app)); return false; } @@ -183,7 +178,7 @@ class ProjectTask extends Shell { return true; } elseif (strtolower($looksGood) == 'q') { - $this->out(__('Bake Aborted.')); + $this->out(__d('cake_console', 'Bake Aborted.')); } else { $this->execute(false); return false; @@ -199,7 +194,7 @@ class ProjectTask extends Shell { public function createHome($dir) { $app = basename($dir); $path = $dir . 'views' . DS . 'pages' . DS; - $source = CAKE . 'console' . DS . 'templates' . DS .'default' . DS . 'views' . DS . 'home.ctp'; + $source = LIBS . 'Console' . DS . 'templates' . DS .'default' . DS . 'views' . DS . 'home.ctp'; include($source); return $this->createFile($path.'home.ctp', $output); } @@ -212,10 +207,10 @@ class ProjectTask extends Shell { * @return boolean success */ public function consolePath($path) { - $File = new File($path . 'console' . DS . 'cake.php'); + $File = new File($path . 'Console' . DS . 'cake.php'); $contents = $File->read(); if (preg_match('/(__CAKE_PATH__)/', $contents, $match)) { - $path = CAKE_CORE_INCLUDE_PATH . DS . 'cake' . DS . 'console' . DS; + $path = LIBS . 'Console' . DS; $replacement = "'" . str_replace(DS, "' . DIRECTORY_SEPARATOR . '", $path) . "'"; $result = str_replace($match[0], $replacement, $contents); if ($File->write($result)) { @@ -236,9 +231,6 @@ class ProjectTask extends Shell { $File = new File($path . 'config' . DS . 'core.php'); $contents = $File->read(); if (preg_match('/([\s]*Configure::write\(\'Security.salt\',[\s\'A-z0-9]*\);)/', $contents, $match)) { - if (!class_exists('Security')) { - require LIBS . 'security.php'; - } $string = Security::generateAuthKey(); $result = str_replace($match[0], "\t" . 'Configure::write(\'Security.salt\', \''.$string.'\');', $contents); if ($File->write($result)) { @@ -260,7 +252,7 @@ class ProjectTask extends Shell { $contents = $File->read(); if (preg_match('/([\s]*Configure::write\(\'Security.cipherSeed\',[\s\'A-z0-9]*\);)/', $contents, $match)) { if (!class_exists('Security')) { - require LIBS . 'security.php'; + require LIBS . 'Utility' . DS . 'security.php'; } $string = substr(bin2hex(Security::generateAuthKey()), 0, 30); $result = str_replace($match[0], "\t" . 'Configure::write(\'Security.cipherSeed\', \''.$string.'\');', $contents); @@ -343,7 +335,7 @@ class ProjectTask extends Shell { } if ($this->interactive) { $this->out(); - $this->out(__('You have more than one routing prefix configured')); + $this->out(__d('cake_console', 'You have more than one routing prefix configured')); } $options = array(); foreach ($prefixes as $i => $prefix) { @@ -352,19 +344,19 @@ class ProjectTask extends Shell { $this->out($i + 1 . '. ' . $prefix); } } - $selection = $this->in(__('Please choose a prefix to bake with.'), $options, 1); + $selection = $this->in(__d('cake_console', 'Please choose a prefix to bake with.'), $options, 1); return $prefixes[$selection - 1] . '_'; } if ($this->interactive) { $this->hr(); $this->out('You need to enable Configure::write(\'Routing.prefixes\',array(\'admin\')) in /app/config/core.php to use prefix routing.'); - $this->out(__('What would you like the prefix route to be?')); - $this->out(__('Example: www.example.com/admin/controller')); + $this->out(__d('cake_console', 'What would you like the prefix route to be?')); + $this->out(__d('cake_console', 'Example: www.example.com/admin/controller')); while ($admin == '') { - $admin = $this->in(__('Enter a routing prefix:'), null, 'admin'); + $admin = $this->in(__d('cake_console', 'Enter a routing prefix:'), null, 'admin'); } if ($this->cakeAdmin($admin) !== true) { - $this->out(__('Unable to write to /app/config/core.php.')); + $this->out(__d('cake_console', 'Unable to write to /app/config/core.php.')); $this->out('You need to enable Configure::write(\'Routing.prefixes\',array(\'admin\')) in /app/config/core.php to use prefix routing.'); $this->_stop(); } @@ -381,13 +373,14 @@ class ProjectTask extends Shell { public function getOptionParser() { $parser = parent::getOptionParser(); return $parser->description( - __('Generate a new CakePHP project skeleton.') + __d('cake_console', 'Generate a new CakePHP project skeleton.') )->addArgument('name', array( - 'help' => __('Application directory to make, if it starts with "/" the path is absolute.') + 'help' => __d('cake_console', 'Application directory to make, if it starts with "/" the path is absolute.') ))->addOption('empty', array( - 'help' => __('Create empty files in each of the directories. Good if you are using git') + 'help' => __d('cake_console', 'Create empty files in each of the directories. Good if you are using git') ))->addOption('skel', array( - 'help' => __('The directory layout to use for the new application skeleton. Defaults to cake/console/templates/skel of CakePHP used to create the project.') + 'default' => current(App::core('Console')) . DS . 'templates' . DS . 'skel', + 'help' => __d('cake_console', 'The directory layout to use for the new application skeleton. Defaults to cake/console/templates/skel of CakePHP used to create the project.') )); } diff --git a/cake/console/shells/tasks/template.php b/lib/Cake/Console/Command/Task/TemplateTask.php similarity index 92% rename from cake/console/shells/tasks/template.php rename to lib/Cake/Console/Command/Task/TemplateTask.php index d23fc21d1..189cf7f83 100644 --- a/cake/console/shells/tasks/template.php +++ b/lib/Cake/Console/Command/Task/TemplateTask.php @@ -16,7 +16,8 @@ * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Core', 'Folder'); + +App::uses('Folder', 'Utility'); class TemplateTask extends Shell { @@ -53,8 +54,8 @@ class TemplateTask extends Shell { * @return array Array of bake themes that are installed. */ protected function _findThemes() { - $paths = App::path('shells'); - $core = array_pop($paths); + $paths = App::path('Console'); + $core = current(App::core('Console')); $separator = DS === '/' ? '/' : '\\\\'; $core = preg_replace('#shells' . $separator . '$#', '', $core); @@ -169,8 +170,8 @@ class TemplateTask extends Shell { } $this->hr(); - $this->out(__('You have more than one set of templates installed.')); - $this->out(__('Please choose the template set you wish to use:')); + $this->out(__d('cake_console', 'You have more than one set of templates installed.')); + $this->out(__d('cake_console', 'Please choose the template set you wish to use:')); $this->hr(); $i = 1; @@ -180,7 +181,7 @@ class TemplateTask extends Shell { $indexedPaths[$i] = $path; $i++; } - $index = $this->in(__('Which bake theme would you like to use?'), range(1, $i - 1), 1); + $index = $this->in(__d('cake_console', 'Which bake theme would you like to use?'), range(1, $i - 1), 1); $themeNames = array_keys($this->templatePaths); $this->params['theme'] = $themeNames[$index - 1]; return $indexedPaths[$index]; @@ -207,7 +208,7 @@ class TemplateTask extends Shell { return $templatePath; } } - $this->err(__('Could not find template for %s', $filename)); + $this->err(__d('cake_console', 'Could not find template for %s', $filename)); return false; } } diff --git a/cake/console/shells/tasks/test.php b/lib/Cake/Console/Command/Task/TestTask.php similarity index 79% rename from cake/console/shells/tasks/test.php rename to lib/Cake/Console/Command/Task/TestTask.php index 21b57b22a..56ecd502e 100644 --- a/cake/console/shells/tasks/test.php +++ b/lib/Cake/Console/Command/Task/TestTask.php @@ -17,8 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -include_once dirname(__FILE__) . DS . 'bake.php'; -App::import('Model', 'ClassRegistry'); +App::uses('BakeTask', 'Console/Command/Task'); +App::uses('ClassRegistry', 'Utility'); /** * Task class for creating and updating test files. @@ -49,7 +49,13 @@ class TestTask extends BakeTask { * @var array * @access public */ - public $classTypes = array('Model', 'Controller', 'Component', 'Behavior', 'Helper'); + public $classTypes = array( + 'Model' => 'Model', + 'Controller' => 'Controller', + 'Component' => 'Controller/Component', + 'Behavior' => 'Model/Behavior', + 'Helper' => 'View/Helper' + ); /** * Internal list of fixtures that have been added so far. @@ -89,14 +95,14 @@ class TestTask extends BakeTask { protected function _interactive($type = null) { $this->interactive = true; $this->hr(); - $this->out(__('Bake Tests')); - $this->out(__('Path: %s', $this->path)); + $this->out(__d('cake_console', 'Bake Tests')); + $this->out(__d('cake_console', 'Path: %s', $this->path)); $this->hr(); if ($type) { $type = Inflector::camelize($type); - if (!in_array($type, $this->classTypes)) { - $this->error(__('Incorrect type provided. Please choose one of %s', implode(', ', $this->classTypes))); + if (!isset($this->classTypes[$type])) { + $this->error(__d('cake_console', 'Incorrect type provided. Please choose one of %s', implode(', ', array_keys($this->classTypes)))); } } else { $type = $this->getObjectType(); @@ -113,13 +119,17 @@ class TestTask extends BakeTask { */ public function bake($type, $className) { if ($this->typeCanDetectFixtures($type) && $this->isLoadableClass($type, $className)) { - $this->out(__('Bake is detecting possible fixtures...')); + $this->out(__d('cake_console', 'Bake is detecting possible fixtures...')); $testSubject = $this->buildTestSubject($type, $className); $this->generateFixtureList($testSubject); } elseif ($this->interactive) { $this->getUserFixtures(); } - $fullClassName = $this->getRealClassName($type, $className); + $fullClassName = $className; + + if (!$this->interactive) { + $fullClassName = $this->getRealClassName($type, $className); + } $methods = array(); if (class_exists($fullClassName)) { @@ -154,20 +164,22 @@ class TestTask extends BakeTask { */ public function getObjectType() { $this->hr(); - $this->out(__('Select an object type:')); + $this->out(__d('cake_console', 'Select an object type:')); $this->hr(); $keys = array(); - foreach ($this->classTypes as $key => $option) { - $this->out(++$key . '. ' . $option); - $keys[] = $key; + $i = 0; + foreach ($this->classTypes as $option => $package) { + $this->out(++$i . '. ' . $option); + $keys[] = $i; } $keys[] = 'q'; - $selection = $this->in(__('Enter the type of object to bake a test for or (q)uit'), $keys, 'q'); + $selection = $this->in(__d('cake_console', 'Enter the type of object to bake a test for or (q)uit'), $keys, 'q'); if ($selection == 'q') { return $this->_stop(); } - return $this->classTypes[$selection - 1]; + $types = array_keys($this->classTypes); + return $types[$selection - 1]; } /** @@ -181,23 +193,24 @@ class TestTask extends BakeTask { if ($this->plugin) { $path = Inflector::pluralize($type); if ($type === 'helper') { - $path = 'views' . DS . $path; + $path = 'View/Helper'; } elseif ($type === 'component') { - $path = 'controllers' . DS . $path; + $path = 'Controller/Component'; } elseif ($type === 'behavior') { - $path = 'models' . DS . $path; + $path = 'Model/Behavior'; } - $options = App::objects($type, App::pluginPath($this->plugin) . $path, false); + $plugin = $this->plugin . '.'; + $options = App::objects($plugin . $type); } else { $options = App::objects($type); } - $this->out(__('Choose a %s class', $objectType)); + $this->out(__d('cake_console', 'Choose a %s class', $objectType)); $keys = array(); foreach ($options as $key => $option) { $this->out(++$key . '. ' . $option); $keys[] = $key; } - $selection = $this->in(__('Choose an existing class, or enter the name of a class that does not exist')); + $selection = $this->in(__d('cake_console', 'Choose an existing class, or enter the name of a class that does not exist')); if (isset($options[$selection - 1])) { return $options[$selection - 1]; } @@ -256,7 +269,7 @@ class TestTask extends BakeTask { * @return string Real classname */ public function getRealClassName($type, $class) { - if (strtolower($type) == 'model') { + if (strtolower($type) == 'model' || empty($this->classTypes[$type])) { return $class; } return $class . $type; @@ -365,10 +378,10 @@ class TestTask extends BakeTask { * @return array Array of fixtures the user wants to add. */ public function getUserFixtures() { - $proceed = $this->in(__('Bake could not detect fixtures, would you like to add some?'), array('y','n'), 'n'); + $proceed = $this->in(__d('cake_console', 'Bake could not detect fixtures, would you like to add some?'), array('y','n'), 'n'); $fixtures = array(); if (strtolower($proceed) == 'y') { - $fixtureList = $this->in(__("Please provide a comma separated list of the fixtures names you'd like to use.\nExample: 'app.comment, app.post, plugin.forums.post'")); + $fixtureList = $this->in(__d('cake_console', "Please provide a comma separated list of the fixtures names you'd like to use.\nExample: 'app.comment, app.post, plugin.forums.post'")); $fixtureListTrimmed = str_replace(' ', '', $fixtureList); $fixtures = explode(',', $fixtureListTrimmed); } @@ -416,12 +429,14 @@ class TestTask extends BakeTask { * @return string filename the test should be created on. */ public function testCaseFileName($type, $className) { - $path = $this->getPath();; - $path .= 'cases' . DS . strtolower($type) . 's' . DS; - if (strtolower($type) == 'controller') { + $path = $this->getPath() . 'Case' . DS; + if (isset($this->classTypes[$type])) { + $path .= $this->classTypes[$type] . DS; + } + if (!$this->interactive) { $className = $this->getRealClassName($type, $className); } - return $path . Inflector::underscore($className) . '.test.php'; + return $path . Inflector::camelize($className) . 'Test.php'; } /** @@ -431,15 +446,29 @@ class TestTask extends BakeTask { */ public function getOptionParser() { $parser = parent::getOptionParser(); - return $parser->description(__('Bake test case skeletons for classes.')) + return $parser->description(__d('cake_console', 'Bake test case skeletons for classes.')) ->addArgument('type', array( - 'help' => __('Type of class to bake, can be any of the following: controller, model, helper, component or behavior.'), + 'help' => __d('cake_console', 'Type of class to bake, can be any of the following: controller, model, helper, component or behavior.'), 'choices' => array('controller', 'model', 'helper', 'component', 'behavior') ))->addArgument('name', array( - 'help' => __('An existing class to bake tests for.') + 'help' => __d('cake_console', 'An existing class to bake tests for.') ))->addOption('plugin', array( 'short' => 'p', - 'help' => __('CamelCased name of the plugin to bake tests for.') - ))->epilog(__('Omitting all arguments and options will enter into an interactive mode.')); + 'help' => __d('cake_console', 'CamelCased name of the plugin to bake tests for.') + ))->epilog(__d('cake_console', 'Omitting all arguments and options will enter into an interactive mode.')); + } + +/** + * Gets the path for output. Checks the plugin property + * and returns the correct path. + * + * @return string Path to output. + */ + public function getPath() { + $path = $this->path; + if (isset($this->plugin)) { + $path = $this->_pluginPath($this->plugin) . 'tests' . DS; + } + return $path; } } diff --git a/cake/console/shells/tasks/view.php b/lib/Cake/Console/Command/Task/ViewTask.php similarity index 80% rename from cake/console/shells/tasks/view.php rename to lib/Cake/Console/Command/Task/ViewTask.php index c835735de..5e9a78c50 100644 --- a/cake/console/shells/tasks/view.php +++ b/lib/Cake/Console/Command/Task/ViewTask.php @@ -16,8 +16,9 @@ * @since CakePHP(tm) v 1.2 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Controller', 'Controller', false); -include_once dirname(__FILE__) . DS . 'bake.php'; + +App::uses('Controller', 'Controller'); +App::uses('BakeTask', 'Console/Command/Task'); /** * Task class for creating and updating view files. @@ -146,7 +147,7 @@ class ViewTask extends BakeTask { protected function _methodsToBake() { $methods = array_diff( array_map('strtolower', get_class_methods($this->controllerName . 'Controller')), - array_map('strtolower', get_class_methods('appcontroller')) + array_map('strtolower', get_class_methods('AppController')) ); $scaffoldActions = false; if (empty($methods)) { @@ -188,7 +189,8 @@ class ViewTask extends BakeTask { $model = $this->_modelName($table); $this->controllerName = $this->_controllerName($model); $this->controllerPath = Inflector::underscore($this->controllerName); - if (App::import('Model', $model)) { + App::uses($model, 'Model'); + if (class_exists($model)) { $vars = $this->__loadController(); if (!$actions) { $actions = $this->_methodsToBake(); @@ -219,17 +221,17 @@ class ViewTask extends BakeTask { $this->controllerPath = strtolower(Inflector::underscore($this->controllerName)); - $prompt = __("Would you like bake to build your views interactively?\nWarning: Choosing no will overwrite %s views if it exist.", $this->controllerName); + $prompt = __d('cake_console', "Would you like bake to build your views interactively?\nWarning: Choosing no will overwrite %s views if it exist.", $this->controllerName); $interactive = $this->in($prompt, array('y', 'n'), 'n'); if (strtolower($interactive) == 'n') { $this->interactive = false; } - $prompt = __("Would you like to create some CRUD views\n(index, add, view, edit) for this controller?\nNOTE: Before doing so, you'll need to create your controller\nand model classes (including associated models)."); + $prompt = __d('cake_console', "Would you like to create some CRUD views\n(index, add, view, edit) for this controller?\nNOTE: Before doing so, you'll need to create your controller\nand model classes (including associated models)."); $wannaDoScaffold = $this->in($prompt, array('y','n'), 'y'); - $wannaDoAdmin = $this->in(__("Would you like to create the views for admin routing?"), array('y','n'), 'n'); + $wannaDoAdmin = $this->in(__d('cake_console', "Would you like to create the views for admin routing?"), array('y','n'), 'n'); if (strtolower($wannaDoScaffold) == 'y' || strtolower($wannaDoAdmin) == 'y') { $vars = $this->__loadController(); @@ -248,7 +250,7 @@ class ViewTask extends BakeTask { } $this->hr(); $this->out(); - $this->out(__("View Scaffolding Complete.\n")); + $this->out(__d('cake_console', "View Scaffolding Complete.\n")); } else { $this->customAction(); } @@ -266,20 +268,21 @@ class ViewTask extends BakeTask { */ private function __loadController() { if (!$this->controllerName) { - $this->err(__('Controller not found')); + $this->err(__d('cake_console', 'Controller not found')); } - $import = $this->controllerName; + $plugin = null; if ($this->plugin) { - $import = $this->plugin . '.' . $this->controllerName; + $plugin = $this->plugin . '.'; } - if (!App::import('Controller', $import)) { - $file = $this->controllerPath . '_controller.php'; - $this->err(__("The file '%s' could not be found.\nIn order to bake a view, you'll need to first create the controller.", $file)); + $controllerClassName = $this->controllerName . 'Controller'; + App::uses($controllerClassName, $plugin . 'Controller'); + if (!class_exists($controllerClassName)) { + $file = $controllerClassName . '.php'; + $this->err(__d('cake_console', "The file '%s' could not be found.\nIn order to bake a view, you'll need to first create the controller.", $file)); $this->_stop(); } - $controllerClassName = $this->controllerName . 'Controller'; $controllerObj = new $controllerClassName(); $controllerObj->plugin = $this->plugin; $controllerObj->constructClasses(); @@ -328,25 +331,25 @@ class ViewTask extends BakeTask { public function customAction() { $action = ''; while ($action == '') { - $action = $this->in(__('Action Name? (use lowercase_underscored function name)')); + $action = $this->in(__d('cake_console', 'Action Name? (use lowercase_underscored function name)')); if ($action == '') { - $this->out(__('The action name you supplied was empty. Please try again.')); + $this->out(__d('cake_console', 'The action name you supplied was empty. Please try again.')); } } $this->out(); $this->hr(); - $this->out(__('The following view will be created:')); + $this->out(__d('cake_console', 'The following view will be created:')); $this->hr(); - $this->out(__('Controller Name: %s', $this->controllerName)); - $this->out(__('Action Name: %s', $action)); - $this->out(__('Path: %s', $this->params['app'] . DS . $this->controllerPath . DS . Inflector::underscore($action) . ".ctp")); + $this->out(__d('cake_console', 'Controller Name: %s', $this->controllerName)); + $this->out(__d('cake_console', 'Action Name: %s', $action)); + $this->out(__d('cake_console', 'Path: %s', $this->params['app'] . DS . $this->controllerPath . DS . Inflector::underscore($action) . ".ctp")); $this->hr(); - $looksGood = $this->in(__('Look okay?'), array('y','n'), 'y'); + $looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y','n'), 'y'); if (strtolower($looksGood) == 'y') { $this->bake($action, ' '); $this->_stop(); } else { - $this->out(__('Bake Aborted.')); + $this->out(__d('cake_console', 'Bake Aborted.')); } } @@ -428,25 +431,25 @@ class ViewTask extends BakeTask { public function getOptionParser() { $parser = parent::getOptionParser(); return $parser->description( - __('Bake views for a controller, using built-in or custom templates.') + __d('cake_console', 'Bake views for a controller, using built-in or custom templates.') )->addArgument('controller', array( - 'help' => __('Name of the controller views to bake. Can be Plugin.name as a shortcut for plugin baking.') + 'help' => __d('cake_console', 'Name of the controller views to bake. Can be Plugin.name as a shortcut for plugin baking.') ))->addArgument('action', array( - 'help' => __("Will bake a single action's file. core templates are (index, add, edit, view)") + 'help' => __d('cake_console', "Will bake a single action's file. core templates are (index, add, edit, view)") ))->addArgument('alias', array( - 'help' => __('Will bake the template in but create the filename after .') + 'help' => __d('cake_console', 'Will bake the template in but create the filename after .') ))->addOption('plugin', array( 'short' => 'p', - 'help' => __('Plugin to bake the view into.') + 'help' => __d('cake_console', 'Plugin to bake the view into.') ))->addOption('admin', array( - 'help' => __('Set to only bake views for a prefix in Routing.prefixes'), + 'help' => __d('cake_console', 'Set to only bake views for a prefix in Routing.prefixes'), 'boolean' => true ))->addOption('connection', array( 'short' => 'c', - 'help' => __('The connection the connected model is on.') + 'help' => __d('cake_console', 'The connection the connected model is on.') ))->addSubcommand('all', array( - 'help' => __('Bake all CRUD action views for all controllers. Requires models and controllers to exist.') - ))->epilog(__('Omitting all arguments and options will enter into an interactive mode.')); + 'help' => __d('cake_console', 'Bake all CRUD action views for all controllers. Requires models and controllers to exist.') + ))->epilog(__d('cake_console', 'Omitting all arguments and options will enter into an interactive mode.')); } /** diff --git a/cake/console/shells/testsuite.php b/lib/Cake/Console/Command/TestsuiteShell.php similarity index 65% rename from cake/console/shells/testsuite.php rename to lib/Cake/Console/Command/TestsuiteShell.php index b7b588e06..d0d778484 100644 --- a/cake/console/shells/testsuite.php +++ b/lib/Cake/Console/Command/TestsuiteShell.php @@ -18,7 +18,13 @@ * @since CakePHP(tm) v 1.2.0.4433 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -class TestSuiteShell extends Shell { + +App::uses('Shell', 'Console'); +App::uses('CakeTestSuiteDispatcher', 'TestSuite'); +App::uses('CakeTestSuiteCommand', 'TestSuite'); +App::uses('CakeTestLoader', 'TestSuite'); + +class TestsuiteShell extends Shell { /** * Dispatcher object for the run. @@ -38,113 +44,113 @@ class TestSuiteShell extends Shell { 'The CakePHP Testsuite allows you to run test cases from the command line', 'If run with no command line arguments, a list of available core test cases will be shown' ))->addArgument('category', array( - 'help' => __('app, core or name of a plugin.'), + 'help' => __d('cake_console', 'app, core or name of a plugin.'), 'required' => true ))->addArgument('file', array( - 'help' => __('file name with folder prefix and without the test.php suffix.'), + 'help' => __d('cake_console', 'file name with folder prefix and without the test.php suffix.'), 'required' => false, ))->addOption('log-junit', array( - 'help' => __(' Log test execution in JUnit XML format to file.'), + 'help' => __d('cake_console', ' Log test execution in JUnit XML format to file.'), 'default' => false ))->addOption('log-json', array( - 'help' => __(' Log test execution in TAP format to file.'), + 'help' => __d('cake_console', ' Log test execution in TAP format to file.'), 'default' => false ))->addOption('log-tap', array( - 'help' => __(' Log test execution in TAP format to file.'), + 'help' => __d('cake_console', ' Log test execution in TAP format to file.'), 'default' => false ))->addOption('log-dbus', array( - 'help' => __('Log test execution to DBUS.'), + 'help' => __d('cake_console', 'Log test execution to DBUS.'), 'default' => false ))->addOption('coverage-html', array( - 'help' => __(' Generate code coverage report in HTML format.'), + 'help' => __d('cake_console', ' Generate code coverage report in HTML format.'), 'default' => false ))->addOption('coverage-clover', array( - 'help' => __(' Write code coverage data in Clover XML format.'), + 'help' => __d('cake_console', ' Write code coverage data in Clover XML format.'), 'default' => false ))->addOption('testdox-html', array( - 'help' => __(' Write agile documentation in HTML format to file.'), + 'help' => __d('cake_console', ' Write agile documentation in HTML format to file.'), 'default' => false ))->addOption('testdox-text', array( - 'help' => __(' Write agile documentation in Text format to file.'), + 'help' => __d('cake_console', ' Write agile documentation in Text format to file.'), 'default' => false ))->addOption('filter', array( - 'help' => __(' Filter which tests to run.'), + 'help' => __d('cake_console', ' Filter which tests to run.'), 'default' => false ))->addOption('group', array( - 'help' => __(' Only runs tests from the specified group(s).'), + 'help' => __d('cake_console', ' Only runs tests from the specified group(s).'), 'default' => false ))->addOption('exclude-group', array( - 'help' => __(' Exclude tests from the specified group(s).'), + 'help' => __d('cake_console', ' Exclude tests from the specified group(s).'), 'default' => false ))->addOption('list-groups', array( - 'help' => __('List available test groups.'), + 'help' => __d('cake_console', 'List available test groups.'), 'boolean' => true ))->addOption('loader', array( - 'help' => __('TestSuiteLoader implementation to use.'), + 'help' => __d('cake_console', 'TestSuiteLoader implementation to use.'), 'default' => false ))->addOption('repeat', array( - 'help' => __(' Runs the test(s) repeatedly.'), + 'help' => __d('cake_console', ' Runs the test(s) repeatedly.'), 'default' => false ))->addOption('tap', array( - 'help' => __('Report test execution progress in TAP format.'), + 'help' => __d('cake_console', 'Report test execution progress in TAP format.'), 'boolean' => true ))->addOption('testdox', array( - 'help' => __('Report test execution progress in TestDox format.'), + 'help' => __d('cake_console', 'Report test execution progress in TestDox format.'), 'default' => false, 'boolean' => true ))->addOption('no-colors', array( - 'help' => __('Do not use colors in output.'), + 'help' => __d('cake_console', 'Do not use colors in output.'), 'boolean' => true ))->addOption('stderr', array( - 'help' => __('Write to STDERR instead of STDOUT.'), + 'help' => __d('cake_console', 'Write to STDERR instead of STDOUT.'), 'boolean' => true ))->addOption('stop-on-error', array( - 'help' => __('Stop execution upon first error or failure.'), + 'help' => __d('cake_console', 'Stop execution upon first error or failure.'), 'boolean' => true ))->addOption('stop-on-failure', array( - 'help' => __('Stop execution upon first failure.'), + 'help' => __d('cake_console', 'Stop execution upon first failure.'), 'boolean' => true ))->addOption('stop-on-skipped ', array( - 'help' => __('Stop execution upon first skipped test.'), + 'help' => __d('cake_console', 'Stop execution upon first skipped test.'), 'boolean' => true ))->addOption('stop-on-incomplete', array( - 'help' => __('Stop execution upon first incomplete test.'), + 'help' => __d('cake_console', 'Stop execution upon first incomplete test.'), 'boolean' => true ))->addOption('strict', array( - 'help' => __('Mark a test as incomplete if no assertions are made.'), + 'help' => __d('cake_console', 'Mark a test as incomplete if no assertions are made.'), 'boolean' => true ))->addOption('wait', array( - 'help' => __('Waits for a keystroke after each test.'), + 'help' => __d('cake_console', 'Waits for a keystroke after each test.'), 'boolean' => true ))->addOption('process-isolation', array( - 'help' => __('Run each test in a separate PHP process.'), + 'help' => __d('cake_console', 'Run each test in a separate PHP process.'), 'boolean' => true ))->addOption('no-globals-backup', array( - 'help' => __('Do not backup and restore $GLOBALS for each test.'), + 'help' => __d('cake_console', 'Do not backup and restore $GLOBALS for each test.'), 'boolean' => true ))->addOption('static-backup ', array( - 'help' => __('Backup and restore static attributes for each test.'), + 'help' => __d('cake_console', 'Backup and restore static attributes for each test.'), 'boolean' => true ))->addOption('syntax-check', array( - 'help' => __('Try to check source files for syntax errors.'), + 'help' => __d('cake_console', 'Try to check source files for syntax errors.'), 'boolean' => true ))->addOption('bootstrap', array( - 'help' => __(' A "bootstrap" PHP file that is run before the tests.'), + 'help' => __d('cake_console', ' A "bootstrap" PHP file that is run before the tests.'), 'default' => false - ))->addOption('configuraion', array( - 'help' => __(' Read configuration from XML file.'), + ))->addOption('configuration', array( + 'help' => __d('cake_console', ' Read configuration from XML file.'), 'default' => false ))->addOption('no-configuration', array( - 'help' => __('Ignore default configuration file (phpunit.xml).'), + 'help' => __d('cake_console', 'Ignore default configuration file (phpunit.xml).'), 'boolean' => true ))->addOption('include-path', array( - 'help' => __(' Prepend PHP include_path with given path(s).'), + 'help' => __d('cake_console', ' Prepend PHP include_path with given path(s).'), 'default' => false ))->addOption('directive', array( - 'help' => __('key[=value] Sets a php.ini value.'), + 'help' => __d('cake_console', 'key[=value] Sets a php.ini value.'), 'default' => false ))->addOption('fixture', array( - 'help' => __('Choose a custom fixture manager.'), + 'help' => __d('cake_console', 'Choose a custom fixture manager.'), )); return $parser; @@ -156,18 +162,8 @@ class TestSuiteShell extends Shell { * @return void */ public function initialize() { - require_once CAKE . 'tests' . DS . 'lib' . DS . 'cake_test_suite_dispatcher.php'; - - $corePath = App::core('cake'); - if (isset($corePath[0])) { - define('TEST_CAKE_CORE_INCLUDE_PATH', rtrim($corePath[0], DS) . DS); - } else { - define('TEST_CAKE_CORE_INCLUDE_PATH', CAKE_CORE_INCLUDE_PATH); - } - $this->_dispatcher = new CakeTestSuiteDispatcher(); $this->_dispatcher->loadTestFramework(); - require_once CAKE . 'tests' . DS . 'lib' . DS . 'cake_test_suite_command.php'; } /** @@ -197,7 +193,7 @@ class TestSuiteShell extends Shell { } if (isset($this->args[1])) { - $params['case'] = Inflector::underscore($this->args[1]); + $params['case'] = $this->args[1]; } return $params; } @@ -236,7 +232,7 @@ class TestSuiteShell extends Shell { * @return void */ public function main() { - $this->out(__('CakePHP Test Shell')); + $this->out(__d('cake_console', 'CakePHP Test Shell')); $this->hr(); $args = $this->parseArgs(); @@ -256,7 +252,6 @@ class TestSuiteShell extends Shell { * @return void */ protected function run($runnerArgs, $options = array()) { - restore_error_handler(); restore_error_handler(); @@ -286,7 +281,7 @@ class TestSuiteShell extends Shell { } if (empty($testCases)) { - $this->out(__("No test cases available \n\n")); + $this->out(__d('cake_console', "No test cases available \n\n")); return $this->out($this->OptionParser->help()); } @@ -294,15 +289,15 @@ class TestSuiteShell extends Shell { $i = 1; $cases = array(); foreach ($testCases as $testCaseFile => $testCase) { - $case = explode(DS, str_replace('.test.php', '', $testCase)); - $case[count($case) - 1] = Inflector::camelize($case[count($case) - 1]); + $case = explode(DS, str_replace('Test.php', '', $testCase)); + $case[count($case) - 1] = $case[count($case) - 1]; $case = implode('/', $case); $this->out("[$i] $case"); $cases[$i] = $case; $i++; } - while ($choice = $this->in(__('What test case would you like to run?'), null, 'q')) { + while ($choice = $this->in(__d('cake_console', 'What test case would you like to run?'), null, 'q')) { if (is_numeric($choice) && isset($cases[$choice])) { $this->args[0] = $category; $this->args[1] = $cases[$choice]; diff --git a/cake/console/libs/console_error_handler.php b/lib/Cake/Console/ConsoleErrorHandler.php similarity index 87% rename from cake/console/libs/console_error_handler.php rename to lib/Cake/Console/ConsoleErrorHandler.php index 80136bbcf..9020bd1be 100644 --- a/cake/console/libs/console_error_handler.php +++ b/lib/Cake/Console/ConsoleErrorHandler.php @@ -16,8 +16,9 @@ * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Core', 'ErrorHandler'); -require_once 'console_output.php'; +App::uses('ErrorHandler', 'Error'); +App::uses('ConsoleOutput', 'Console'); +App::uses('CakeLog', 'Log'); /** * Error Handler for Cake console. Does simple printing of the @@ -57,7 +58,7 @@ class ConsoleErrorHandler extends ErrorHandler { public static function handleException(Exception $exception) { $stderr = self::getStderr(); $stderr->write(sprintf( - __("Error: %s\n%s"), + __d('cake_console', "Error: %s\n%s"), $exception->getMessage(), $exception->getTraceAsString() )); @@ -79,11 +80,10 @@ class ConsoleErrorHandler extends ErrorHandler { } $stderr = self::getStderr(); list($name, $log) = self::_mapErrorCode($code); - $message = __('%s in [%s, line %s]', $description, $file, $line); - $stderr->write(__("%s Error: %s\n", $name, $message)); + $message = __d('cake_console', '%s in [%s, line %s]', $description, $file, $line); + $stderr->write(__d('cake_console', "%s Error: %s\n", $name, $message)); if (Configure::read('debug') == 0) { - App::import('Core', 'CakeLog'); CakeLog::write($log, $message); } } diff --git a/cake/console/libs/console_input.php b/lib/Cake/Console/ConsoleInput.php similarity index 100% rename from cake/console/libs/console_input.php rename to lib/Cake/Console/ConsoleInput.php diff --git a/cake/console/libs/console_input_argument.php b/lib/Cake/Console/ConsoleInputArgument.php similarity index 93% rename from cake/console/libs/console_input_argument.php rename to lib/Cake/Console/ConsoleInputArgument.php index 263475e9d..885ce2180 100644 --- a/cake/console/libs/console_input_argument.php +++ b/lib/Cake/Console/ConsoleInputArgument.php @@ -95,10 +95,10 @@ class ConsoleInputArgument { } $optional = ''; if (!$this->isRequired()) { - $optional = __(' (optional)'); + $optional = __d('cake_console', ' (optional)'); } if (!empty($this->_choices)) { - $optional .= __(' (choices: %s)', implode('|', $this->_choices)); + $optional .= __d('cake_console', ' (choices: %s)', implode('|', $this->_choices)); } return sprintf('%s%s%s', $name, $this->_help, $optional); } @@ -140,7 +140,7 @@ class ConsoleInputArgument { } if (!in_array($value, $this->_choices)) { throw new ConsoleException(sprintf( - __('"%s" is not a valid value for %s. Please use one of "%s"'), + __d('cake_console', '"%s" is not a valid value for %s. Please use one of "%s"'), $value, $this->_name, implode(', ', $this->_choices) )); } diff --git a/cake/console/libs/console_input_option.php b/lib/Cake/Console/ConsoleInputOption.php similarity index 94% rename from cake/console/libs/console_input_option.php rename to lib/Cake/Console/ConsoleInputOption.php index 3c9049248..61497e5e4 100644 --- a/cake/console/libs/console_input_option.php +++ b/lib/Cake/Console/ConsoleInputOption.php @@ -119,10 +119,10 @@ class ConsoleInputOption { public function help($width = 0) { $default = $short = ''; if (!empty($this->_default) && $this->_default !== true) { - $default = __(' (default: %s)', $this->_default); + $default = __d('cake_console', ' (default: %s)', $this->_default); } if (!empty($this->_choices)) { - $default .= __(' (choices: %s)', implode('|', $this->_choices)); + $default .= __d('cake_console', ' (choices: %s)', implode('|', $this->_choices)); } if (!empty($this->_short)) { $short = ', -' . $this->_short; @@ -180,7 +180,7 @@ class ConsoleInputOption { } if (!in_array($value, $this->_choices)) { throw new ConsoleException(sprintf( - __('"%s" is not a valid value for --%s. Please use one of "%s"'), + __d('cake_console', '"%s" is not a valid value for --%s. Please use one of "%s"'), $value, $this->_name, implode(', ', $this->_choices) )); } diff --git a/cake/console/libs/console_input_subcommand.php b/lib/Cake/Console/ConsoleInputSubcommand.php similarity index 100% rename from cake/console/libs/console_input_subcommand.php rename to lib/Cake/Console/ConsoleInputSubcommand.php diff --git a/cake/console/libs/console_option_parser.php b/lib/Cake/Console/ConsoleOptionParser.php similarity index 96% rename from cake/console/libs/console_option_parser.php rename to lib/Cake/Console/ConsoleOptionParser.php index a96a0759a..6c221502b 100644 --- a/cake/console/libs/console_option_parser.php +++ b/lib/Cake/Console/ConsoleOptionParser.php @@ -16,10 +16,15 @@ * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -require_once CONSOLE_LIBS . 'console_input_option.php'; -require_once CONSOLE_LIBS . 'console_input_argument.php'; -require_once CONSOLE_LIBS . 'console_input_subcommand.php'; -require_once CONSOLE_LIBS . 'help_formatter.php'; + +App::uses('TaskCollection', 'Console'); +App::uses('ConsoleOutput', 'Console'); +App::uses('ConsoleInput', 'Console'); +App::uses('ConsoleInputSubcommand', 'Console'); +App::uses('ConsoleInputOption', 'Console'); +App::uses('ConsoleInputArgument', 'Console'); +App::uses('ConsoleOptionParser', 'Console'); +App::uses('HelpFormatter', 'Console'); /** * Handles parsing the ARGV in the command line and provides support @@ -129,11 +134,11 @@ class ConsoleOptionParser { if ($defaultOptions) { $this->addOption('verbose', array( 'short' => 'v', - 'help' => __('Enable verbose output.'), + 'help' => __d('cake_console', 'Enable verbose output.'), 'boolean' => true ))->addOption('quiet', array( 'short' => 'q', - 'help' => __('Enable quiet output.'), + 'help' => __d('cake_console', 'Enable quiet output.'), 'boolean' => true )); } @@ -456,7 +461,7 @@ class ConsoleOptionParser { foreach ($this->_args as $i => $arg) { if ($arg->isRequired() && !isset($args[$i]) && empty($params['help'])) { throw new ConsoleException( - __('Missing required arguments. %s is required.', $arg->name()) + __d('cake_console', 'Missing required arguments. %s is required.', $arg->name()) ); } } @@ -550,7 +555,7 @@ class ConsoleOptionParser { */ protected function _parseOption($name, $params) { if (!isset($this->_options[$name])) { - throw new ConsoleException(__('Unknown option `%s`', $name)); + throw new ConsoleException(__d('cake_console', 'Unknown option `%s`', $name)); } $option = $this->_options[$name]; $isBoolean = $option->isBoolean(); @@ -584,7 +589,7 @@ class ConsoleOptionParser { } $next = count($args); if (!isset($this->_args[$next])) { - throw new ConsoleException(__('Too many arguments.')); + throw new ConsoleException(__d('cake_console', 'Too many arguments.')); } if ($this->_args[$next]->validChoice($argument)) { diff --git a/cake/console/libs/console_output.php b/lib/Cake/Console/ConsoleOutput.php similarity index 100% rename from cake/console/libs/console_output.php rename to lib/Cake/Console/ConsoleOutput.php diff --git a/cake/console/libs/help_formatter.php b/lib/Cake/Console/HelpFormatter.php similarity index 97% rename from cake/console/libs/help_formatter.php rename to lib/Cake/Console/HelpFormatter.php index f454fa8b2..94a32af88 100644 --- a/cake/console/libs/help_formatter.php +++ b/lib/Cake/Console/HelpFormatter.php @@ -14,7 +14,7 @@ * @link http://cakephp.org CakePHP(tm) Project * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Core', 'String', false); +App::uses('String', 'Utility'); /** * HelpFormatter formats help for console shells. Can format to either @@ -69,7 +69,7 @@ class HelpFormatter { } $out[] = ''; $out[] = sprintf( - __('To see help on a subcommand use `cake %s [subcommand] --help`'), + __d('cake_console', 'To see help on a subcommand use `cake %s [subcommand] --help`'), $parser->command() ); $out[] = ''; diff --git a/cake/console/shells/shell.php b/lib/Cake/Console/Shell.php similarity index 95% rename from cake/console/shells/shell.php rename to lib/Cake/Console/Shell.php index a143ba4e9..ad5b716fa 100644 --- a/cake/console/shells/shell.php +++ b/lib/Cake/Console/Shell.php @@ -16,10 +16,13 @@ * @since CakePHP(tm) v 1.2.0.5012 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -require_once CONSOLE_LIBS . 'task_collection.php'; -require_once CONSOLE_LIBS . 'console_output.php'; -require_once CONSOLE_LIBS . 'console_input.php'; -require_once CONSOLE_LIBS . 'console_option_parser.php'; + +App::uses('TaskCollection', 'Console'); +App::uses('ConsoleOutput', 'Console'); +App::uses('ConsoleInput', 'Console'); +App::uses('ConsoleInputSubcommand', 'Console'); +App::uses('ConsoleOptionParser', 'Console'); +App::uses('File', 'Utility'); /** * Base class for command-line utilities for automating programmer chores. @@ -557,7 +560,7 @@ class Shell extends Object { * @param string $message An optional error message */ public function error($title, $message = null) { - $this->err(__('Error: %s', $title)); + $this->err(__d('cake_console', 'Error: %s', $title)); if (!empty($message)) { $this->err($message); @@ -593,31 +596,27 @@ class Shell extends Object { $this->out(); if (is_file($path) && $this->interactive === true) { - $this->out(__('File `%s` exists', $path)); - $key = $this->in(__('Do you want to overwrite?'), array('y', 'n', 'q'), 'n'); + $this->out(__d('cake_console', 'File `%s` exists', $path)); + $key = $this->in(__d('cake_console', 'Do you want to overwrite?'), array('y', 'n', 'q'), 'n'); if (strtolower($key) == 'q') { - $this->out(__('Quitting.'), 2); + $this->out(__d('cake_console', 'Quitting.'), 2); $this->_stop(); } elseif (strtolower($key) != 'y') { - $this->out(__('Skip `%s`', $path), 2); + $this->out(__d('cake_console', 'Skip `%s`', $path), 2); return false; } } else { - $this->out(__('Creating file %s', $path)); - } - - if (!class_exists('File')) { - require LIBS . 'file.php'; + $this->out(__d('cake_console', 'Creating file %s', $path)); } if ($File = new File($path, true)) { $data = $File->prepare($contents); $File->write($data); - $this->out(__('Wrote `%s`', $path)); + $this->out(__d('cake_console', 'Wrote `%s`', $path)); return true; } else { - $this->err(__('Could not write to `%s`.', $path), 2); + $this->err(__d('cake_console', 'Could not write to `%s`.', $path), 2); return false; } } @@ -664,7 +663,7 @@ class Shell extends Object { * @return string Path to controller */ protected function _controllerPath($name) { - return strtolower(Inflector::underscore($name)); + return Inflector::underscore($name); } /** diff --git a/cake/console/shell_dispatcher.php b/lib/Cake/Console/ShellDispatcher.php similarity index 94% rename from cake/console/shell_dispatcher.php rename to lib/Cake/Console/ShellDispatcher.php index 45152b6cb..2bc41e66c 100644 --- a/cake/console/shell_dispatcher.php +++ b/lib/Cake/Console/ShellDispatcher.php @@ -105,7 +105,7 @@ class ShellDispatcher { if (!isset($this->args[0]) || !isset($this->params['working'])) { $message = "This file has been loaded incorrectly and cannot continue.\n" . - "Please make sure that " . DIRECTORY_SEPARATOR . "cake" . DIRECTORY_SEPARATOR . "console is in your system path,\n" . + "Please make sure that " . DIRECTORY_SEPARATOR . "cake" . DIRECTORY_SEPARATOR . "console is in your system path,\n" . "and check the cookbook for the correct usage of this command.\n" . "(http://book.cakephp.org/)"; throw new CakeException($message); @@ -127,17 +127,17 @@ class ShellDispatcher { define('APP_PATH', $this->params['working'] . DS); define('WWW_ROOT', APP_PATH . $this->params['webroot'] . DS); if (!is_dir(ROOT . DS . APP_DIR . DS . 'tmp')) { - define('TMP', CAKE_CORE_INCLUDE_PATH . DS . 'cake' . DS . 'console' . DS . 'templates' . DS . 'skel' . DS . 'tmp' . DS); + define('TMP', CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'Console' . DS . 'templates' . DS . 'skel' . DS . 'tmp' . DS); } $boot = file_exists(ROOT . DS . APP_DIR . DS . 'config' . DS . 'bootstrap.php'); - require CORE_PATH . 'cake' . DS . 'bootstrap.php'; + require CORE_PATH . 'Cake' . DS . 'bootstrap.php'; if (!file_exists(APP_PATH . 'config' . DS . 'core.php')) { - include_once CAKE_CORE_INCLUDE_PATH . DS . 'cake' . DS . 'console' . DS . 'templates' . DS . 'skel' . DS . 'config' . DS . 'core.php'; + include_once CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'Console' . DS . 'templates' . DS . 'skel' . DS . 'config' . DS . 'core.php'; App::build(); } - require_once CONSOLE_LIBS . 'console_error_handler.php'; + require_once CONSOLE_LIBS . 'ConsoleErrorHandler.php'; set_exception_handler(array('ConsoleErrorHandler', 'handleException')); set_error_handler(array('ConsoleErrorHandler', 'handleError'), Configure::read('Error.level')); @@ -207,14 +207,14 @@ class ShellDispatcher { protected function _getShell($shell) { list($plugin, $shell) = pluginSplit($shell, true); - $loaded = App::import('Shell', $plugin . $shell); + $class = Inflector::camelize($shell) . 'Shell'; - - if (!$loaded) { - throw new MissingShellFileException(array('shell' => $shell)); - } + + App::uses('Shell', 'Console'); + App::uses($class, $plugin . 'Console/Command'); + if (!class_exists($class)) { - throw new MissingShellClassException(array('shell' => $class)); + throw new MissingShellFileException(array('shell' => $shell)); } $Shell = new $class(); return $Shell; @@ -229,9 +229,9 @@ class ShellDispatcher { $this->_parsePaths($args); $defaults = array( - 'app' => 'app', + 'app' => 'app', 'root' => dirname(dirname(dirname(__FILE__))), - 'working' => null, + 'working' => null, 'webroot' => 'webroot' ); $params = array_merge($defaults, array_intersect_key($this->params, $defaults)); diff --git a/cake/console/libs/task_collection.php b/lib/Cake/Console/TaskCollection.php similarity index 94% rename from cake/console/libs/task_collection.php rename to lib/Cake/Console/TaskCollection.php index da476f220..3c911a2ce 100644 --- a/cake/console/libs/task_collection.php +++ b/lib/Cake/Console/TaskCollection.php @@ -15,6 +15,9 @@ * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ + +App::uses('ObjectCollection', 'Utility'); + class TaskCollection extends ObjectCollection { /** * Shell to use to set params to tasks. @@ -57,10 +60,8 @@ class TaskCollection extends ObjectCollection { } $taskFile = Inflector::underscore($name); $taskClass = $name . 'Task'; + App::uses($taskClass, $plugin . 'Console/Command/Task'); if (!class_exists($taskClass)) { - if (!App::import('Shell', $plugin . $this->taskPathPrefix . $name)) { - throw new MissingTaskFileException($taskFile . '.php'); - } if (!class_exists($taskClass)) { throw new MissingTaskClassException($taskClass); } diff --git a/cake/console/cake b/lib/Cake/Console/cake similarity index 100% rename from cake/console/cake rename to lib/Cake/Console/cake diff --git a/cake/console/cake.bat b/lib/Cake/Console/cake.bat similarity index 100% rename from cake/console/cake.bat rename to lib/Cake/Console/cake.bat diff --git a/cake/console/cake.php b/lib/Cake/Console/cake.php similarity index 90% rename from cake/console/cake.php rename to lib/Cake/Console/cake.php index cb2362c39..4c8188b2c 100644 --- a/cake/console/cake.php +++ b/lib/Cake/Console/cake.php @@ -19,6 +19,6 @@ * @since CakePHP(tm) v 1.2.0.5012 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR. 'shell_dispatcher.php'); +require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR. 'ShellDispatcher.php'); return ShellDispatcher::run($argv); diff --git a/cake/console/templates/default/actions/controller_actions.ctp b/lib/Cake/Console/templates/default/actions/controller_actions.ctp similarity index 100% rename from cake/console/templates/default/actions/controller_actions.ctp rename to lib/Cake/Console/templates/default/actions/controller_actions.ctp diff --git a/cake/console/templates/default/classes/controller.ctp b/lib/Cake/Console/templates/default/classes/controller.ctp similarity index 100% rename from cake/console/templates/default/classes/controller.ctp rename to lib/Cake/Console/templates/default/classes/controller.ctp diff --git a/cake/console/templates/default/classes/fixture.ctp b/lib/Cake/Console/templates/default/classes/fixture.ctp similarity index 100% rename from cake/console/templates/default/classes/fixture.ctp rename to lib/Cake/Console/templates/default/classes/fixture.ctp diff --git a/cake/console/templates/default/classes/model.ctp b/lib/Cake/Console/templates/default/classes/model.ctp similarity index 100% rename from cake/console/templates/default/classes/model.ctp rename to lib/Cake/Console/templates/default/classes/model.ctp diff --git a/cake/console/templates/default/classes/test.ctp b/lib/Cake/Console/templates/default/classes/test.ctp similarity index 96% rename from cake/console/templates/default/classes/test.ctp rename to lib/Cake/Console/templates/default/classes/test.ctp index 2bcce902b..331347099 100644 --- a/cake/console/templates/default/classes/test.ctp +++ b/lib/Cake/Console/templates/default/classes/test.ctp @@ -20,7 +20,7 @@ echo " -App::import('', ''); +App::uses('', ''); /** diff --git a/cake/console/templates/default/views/form.ctp b/lib/Cake/Console/templates/default/views/form.ctp similarity index 100% rename from cake/console/templates/default/views/form.ctp rename to lib/Cake/Console/templates/default/views/form.ctp diff --git a/cake/console/templates/default/views/home.ctp b/lib/Cake/Console/templates/default/views/home.ctp similarity index 67% rename from cake/console/templates/default/views/home.ctp rename to lib/Cake/Console/templates/default/views/home.ctp index 22217b2fb..b707e5eb3 100644 --- a/cake/console/templates/default/views/home.ctp +++ b/lib/Cake/Console/templates/default/views/home.ctp @@ -2,7 +2,7 @@ $output = "

Sweet, \"" . Inflector::humanize($app) . "\" got Baked by CakePHP!

\n"; $output .=" 0): Debugger::checkSecurityKeys(); endif; @@ -52,27 +52,38 @@ endif; ?>

getDataSource('default'); ?>

+ isConnected()): + echo ''; + echo __('Cake is able to connect to the database.'); + echo ''; + else: + echo ''; + echo __('Cake is NOT able to connect to the database.'); + echo ''; + endif; + ?> +

+ isConnected()): - echo ''; - echo __('Cake is able to connect to the database.'); - echo ''; - else: - echo ''; - echo __('Cake is NOT able to connect to the database.'); - echo ''; - endif; -?> -

\n"; -$output .= "\n"; + App::uses('Validation', 'Utility'); + if (!Validation::alphaNumeric('cakephp')) { + echo '

'; + __('PCRE has not been compiled with Unicode support.'); + echo '
'; + __('Recompile PCRE with Unicode support by adding --enable-unicode-properties when configuring'); + echo '

'; + } +?>\n"; $output .= "

\n"; $output .= "

\n"; $output .= " The name of a supported driver; valid options are as follows: - * mysql - MySQL 4 & 5, - * sqlite - SQLite (PHP5 only), - * postgres - PostgreSQL 7 and higher, - * mssql - Microsoft SQL Server 2000 and higher, - * oracle - Oracle 8 and higher + * Datasabe/Mysql - MySQL 4 & 5, + * Datasabe/Sqlite - SQLite (PHP5 only), + * Datasabe/Postgres - PostgreSQL 7 and higher, + * Datasabe/Mssql - Microsoft SQL Server 2000 and higher, + * Datasabe/Oracle - Oracle 8 and higher * * You can add custom database drivers (or override existing drivers) by adding the - * appropriate file to app/models/datasources/dbo. Drivers should be named 'dbo_x.php', - * where 'x' is the name of the database. + * appropriate file to app/models/datasources/database. Drivers should be named 'MyDriver.php', + * * * persistent => true / false * Determines whether or not the database should use a persistent connection * * host => - * the host you connect to the database. To add a socket or port number, use 'port' => # + * the host you connect to the database. To add a socket or port number, use 'port' => # * * prefix => * Uses the given prefix for all the tables in this database. This setting can be overridden * on a per-table basis with the Model::$tablePrefix property. * * schema => - * For Postgresspecifies which schema you would like to use the tables in. Postgres defaults to - * 'public', DB2 defaults to empty. + * For Postgres specifies which schema you would like to use the tables in. Postgres defaults to 'public'. * * encoding => - * For MySQL, Postgres and Sqlite, specifies the character encoding to use when connecting to the - * database. Uses database default. + * For MySQL, Postgres specifies the character encoding to use when connecting to the + * database. Uses database default not specified. * */ class DATABASE_CONFIG { public $default = array( - 'driver' => 'mysql', + 'datasource' => 'Database/Mysql', 'persistent' => false, 'host' => 'localhost', 'login' => 'user', @@ -70,7 +69,7 @@ class DATABASE_CONFIG { ); public $test = array( - 'driver' => 'mysql', + 'datasource' => 'Database/Mysql', 'persistent' => false, 'host' => 'localhost', 'login' => 'user', diff --git a/cake/console/templates/skel/config/routes.php b/lib/Cake/Console/templates/skel/config/routes.php similarity index 100% rename from cake/console/templates/skel/config/routes.php rename to lib/Cake/Console/templates/skel/config/routes.php diff --git a/cake/console/templates/skel/config/schema/db_acl.php b/lib/Cake/Console/templates/skel/config/schema/db_acl.php similarity index 100% rename from cake/console/templates/skel/config/schema/db_acl.php rename to lib/Cake/Console/templates/skel/config/schema/db_acl.php diff --git a/cake/console/templates/skel/config/schema/db_acl.sql b/lib/Cake/Console/templates/skel/config/schema/db_acl.sql similarity index 100% rename from cake/console/templates/skel/config/schema/db_acl.sql rename to lib/Cake/Console/templates/skel/config/schema/db_acl.sql diff --git a/cake/console/templates/skel/config/schema/i18n.php b/lib/Cake/Console/templates/skel/config/schema/i18n.php similarity index 100% rename from cake/console/templates/skel/config/schema/i18n.php rename to lib/Cake/Console/templates/skel/config/schema/i18n.php diff --git a/cake/console/templates/skel/config/schema/i18n.sql b/lib/Cake/Console/templates/skel/config/schema/i18n.sql similarity index 100% rename from cake/console/templates/skel/config/schema/i18n.sql rename to lib/Cake/Console/templates/skel/config/schema/i18n.sql diff --git a/cake/console/templates/skel/config/schema/sessions.php b/lib/Cake/Console/templates/skel/config/schema/sessions.php similarity index 100% rename from cake/console/templates/skel/config/schema/sessions.php rename to lib/Cake/Console/templates/skel/config/schema/sessions.php diff --git a/cake/console/templates/skel/config/schema/sessions.sql b/lib/Cake/Console/templates/skel/config/schema/sessions.sql similarity index 100% rename from cake/console/templates/skel/config/schema/sessions.sql rename to lib/Cake/Console/templates/skel/config/schema/sessions.sql diff --git a/cake/console/templates/skel/index.php b/lib/Cake/Console/templates/skel/index.php similarity index 100% rename from cake/console/templates/skel/index.php rename to lib/Cake/Console/templates/skel/index.php diff --git a/cake/console/templates/skel/tests/cases/controllers/empty b/lib/Cake/Console/templates/skel/locale/eng/LC_MESSAGES/empty similarity index 100% rename from cake/console/templates/skel/tests/cases/controllers/empty rename to lib/Cake/Console/templates/skel/locale/eng/LC_MESSAGES/empty diff --git a/cake/console/templates/skel/tests/cases/datasources/empty b/lib/Cake/Console/templates/skel/plugins/empty similarity index 100% rename from cake/console/templates/skel/tests/cases/datasources/empty rename to lib/Cake/Console/templates/skel/plugins/empty diff --git a/cake/console/templates/skel/tests/cases/helpers/empty b/lib/Cake/Console/templates/skel/tests/Case/Controller/Component/empty similarity index 100% rename from cake/console/templates/skel/tests/cases/helpers/empty rename to lib/Cake/Console/templates/skel/tests/Case/Controller/Component/empty diff --git a/cake/console/templates/skel/tests/cases/models/empty b/lib/Cake/Console/templates/skel/tests/Case/Controller/empty similarity index 100% rename from cake/console/templates/skel/tests/cases/models/empty rename to lib/Cake/Console/templates/skel/tests/Case/Controller/empty diff --git a/cake/console/templates/skel/tests/cases/shells/empty b/lib/Cake/Console/templates/skel/tests/Case/Model/Behavior/empty similarity index 100% rename from cake/console/templates/skel/tests/cases/shells/empty rename to lib/Cake/Console/templates/skel/tests/Case/Model/Behavior/empty diff --git a/cake/console/templates/skel/tests/fixtures/empty b/lib/Cake/Console/templates/skel/tests/Case/Model/empty similarity index 100% rename from cake/console/templates/skel/tests/fixtures/empty rename to lib/Cake/Console/templates/skel/tests/Case/Model/empty diff --git a/cake/console/templates/skel/tmp/cache/models/empty b/lib/Cake/Console/templates/skel/tests/Case/View/Helper/empty old mode 100755 new mode 100644 similarity index 100% rename from cake/console/templates/skel/tmp/cache/models/empty rename to lib/Cake/Console/templates/skel/tests/Case/View/Helper/empty diff --git a/cake/console/templates/skel/tmp/cache/persistent/empty b/lib/Cake/Console/templates/skel/tests/Fixture/empty old mode 100755 new mode 100644 similarity index 100% rename from cake/console/templates/skel/tmp/cache/persistent/empty rename to lib/Cake/Console/templates/skel/tests/Fixture/empty diff --git a/cake/console/templates/skel/tmp/cache/views/empty b/lib/Cake/Console/templates/skel/tmp/cache/models/empty old mode 100755 new mode 100644 similarity index 100% rename from cake/console/templates/skel/tmp/cache/views/empty rename to lib/Cake/Console/templates/skel/tmp/cache/models/empty diff --git a/cake/console/templates/skel/tmp/logs/empty b/lib/Cake/Console/templates/skel/tmp/cache/persistent/empty similarity index 100% rename from cake/console/templates/skel/tmp/logs/empty rename to lib/Cake/Console/templates/skel/tmp/cache/persistent/empty diff --git a/cake/console/templates/skel/tmp/sessions/empty b/lib/Cake/Console/templates/skel/tmp/cache/views/empty similarity index 100% rename from cake/console/templates/skel/tmp/sessions/empty rename to lib/Cake/Console/templates/skel/tmp/cache/views/empty diff --git a/cake/console/templates/skel/tmp/tests/empty b/lib/Cake/Console/templates/skel/tmp/logs/empty similarity index 100% rename from cake/console/templates/skel/tmp/tests/empty rename to lib/Cake/Console/templates/skel/tmp/logs/empty diff --git a/cake/console/templates/skel/vendors/empty b/lib/Cake/Console/templates/skel/tmp/sessions/empty similarity index 100% rename from cake/console/templates/skel/vendors/empty rename to lib/Cake/Console/templates/skel/tmp/sessions/empty diff --git a/cake/console/templates/skel/views/elements/empty b/lib/Cake/Console/templates/skel/tmp/tests/empty similarity index 100% rename from cake/console/templates/skel/views/elements/empty rename to lib/Cake/Console/templates/skel/tmp/tests/empty diff --git a/cake/console/templates/skel/views/errors/empty b/lib/Cake/Console/templates/skel/vendors/empty similarity index 100% rename from cake/console/templates/skel/views/errors/empty rename to lib/Cake/Console/templates/skel/vendors/empty diff --git a/cake/console/templates/skel/webroot/.htaccess b/lib/Cake/Console/templates/skel/webroot/.htaccess similarity index 100% rename from cake/console/templates/skel/webroot/.htaccess rename to lib/Cake/Console/templates/skel/webroot/.htaccess diff --git a/cake/console/templates/skel/webroot/css.php b/lib/Cake/Console/templates/skel/webroot/css.php similarity index 100% rename from cake/console/templates/skel/webroot/css.php rename to lib/Cake/Console/templates/skel/webroot/css.php diff --git a/cake/console/templates/skel/webroot/css/cake.generic.css b/lib/Cake/Console/templates/skel/webroot/css/cake.generic.css similarity index 100% rename from cake/console/templates/skel/webroot/css/cake.generic.css rename to lib/Cake/Console/templates/skel/webroot/css/cake.generic.css diff --git a/cake/console/templates/skel/webroot/favicon.ico b/lib/Cake/Console/templates/skel/webroot/favicon.ico similarity index 100% rename from cake/console/templates/skel/webroot/favicon.ico rename to lib/Cake/Console/templates/skel/webroot/favicon.ico diff --git a/cake/console/templates/skel/webroot/img/cake.icon.png b/lib/Cake/Console/templates/skel/webroot/img/cake.icon.png similarity index 100% rename from cake/console/templates/skel/webroot/img/cake.icon.png rename to lib/Cake/Console/templates/skel/webroot/img/cake.icon.png diff --git a/cake/console/templates/skel/webroot/img/cake.power.gif b/lib/Cake/Console/templates/skel/webroot/img/cake.power.gif similarity index 100% rename from cake/console/templates/skel/webroot/img/cake.power.gif rename to lib/Cake/Console/templates/skel/webroot/img/cake.power.gif diff --git a/cake/console/templates/skel/webroot/index.php b/lib/Cake/Console/templates/skel/webroot/index.php similarity index 93% rename from cake/console/templates/skel/webroot/index.php rename to lib/Cake/Console/templates/skel/webroot/index.php index f1ff8d197..77b9db786 100644 --- a/cake/console/templates/skel/webroot/index.php +++ b/lib/Cake/Console/templates/skel/webroot/index.php @@ -49,7 +49,7 @@ * */ if (!defined('CAKE_CORE_INCLUDE_PATH')) { - define('CAKE_CORE_INCLUDE_PATH', ROOT); + define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib'); } /** @@ -67,7 +67,7 @@ define('APP_PATH', ROOT . DS . APP_DIR . DS); define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS); } - if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) { + if (!include(CORE_PATH . 'Cake' . DS . 'bootstrap.php')) { trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR); } @@ -75,6 +75,6 @@ return; } - require LIBS . 'dispatcher.php'; + require LIBS . 'Routing' . DS .'Dispatcher.php'; $Dispatcher = new Dispatcher(); $Dispatcher->dispatch(new CakeRequest()); diff --git a/cake/console/templates/skel/views/helpers/empty b/lib/Cake/Console/templates/skel/webroot/js/empty similarity index 100% rename from cake/console/templates/skel/views/helpers/empty rename to lib/Cake/Console/templates/skel/webroot/js/empty diff --git a/cake/console/templates/skel/webroot/test.php b/lib/Cake/Console/templates/skel/webroot/test.php similarity index 87% rename from cake/console/templates/skel/webroot/test.php rename to lib/Cake/Console/templates/skel/webroot/test.php index c11aaac99..cb9180331 100644 --- a/cake/console/templates/skel/webroot/test.php +++ b/lib/Cake/Console/templates/skel/webroot/test.php @@ -67,21 +67,14 @@ if (!defined('CORE_PATH')) { define('APP_PATH', ROOT . DS . APP_DIR . DS); define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS); } -if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) { +if (!include(CORE_PATH . 'Cake' . DS . 'bootstrap.php')) { trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR); } -$corePath = App::core('cake'); -if (isset($corePath[0])) { - define('TEST_CAKE_CORE_INCLUDE_PATH', rtrim($corePath[0], DS) . DS); -} else { - define('TEST_CAKE_CORE_INCLUDE_PATH', CAKE_CORE_INCLUDE_PATH); -} - if (Configure::read('debug') < 1) { die(__('Debug setting does not allow access to this url.')); } -require_once CAKE_TESTS_LIB . 'cake_test_suite_dispatcher.php'; +require_once CAKE_TESTS_LIB . 'CakeTestSuiteDispatcher.php'; CakeTestSuiteDispatcher::run(); diff --git a/cake/libs/controller/app_controller.php b/lib/Cake/Controller/AppController.php similarity index 96% rename from cake/libs/controller/app_controller.php rename to lib/Cake/Controller/AppController.php index 07c117dff..383cca2be 100644 --- a/cake/libs/controller/app_controller.php +++ b/lib/Cake/Controller/AppController.php @@ -20,6 +20,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +App::uses('Controller', 'Controller'); + /** * This is a placeholder class. * Create the same file in app/app_controller.php diff --git a/cake/libs/controller/cake_error_controller.php b/lib/Cake/Controller/CakeErrorController.php similarity index 100% rename from cake/libs/controller/cake_error_controller.php rename to lib/Cake/Controller/CakeErrorController.php diff --git a/cake/libs/controller/component.php b/lib/Cake/Controller/Component.php similarity index 98% rename from cake/libs/controller/component.php rename to lib/Cake/Controller/Component.php index f55840d1f..0993c171b 100644 --- a/cake/libs/controller/component.php +++ b/lib/Cake/Controller/Component.php @@ -15,7 +15,7 @@ * @since CakePHP(tm) v 1.2 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Controller', 'ComponentCollection', false); +App::uses('ComponentCollection', 'Controller'); /** * Base class for an individual Component. Components provide resuable bits of diff --git a/cake/libs/controller/components/acl.php b/lib/Cake/Controller/Component/AclComponent.php similarity index 94% rename from cake/libs/controller/components/acl.php rename to lib/Cake/Controller/Component/AclComponent.php index 6795ab335..fde44da62 100644 --- a/cake/libs/controller/components/acl.php +++ b/lib/Cake/Controller/Component/AclComponent.php @@ -19,6 +19,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +App::uses('Component', 'Controller'); + /** * Access Control List factory class. * @@ -66,7 +68,7 @@ class AclComponent extends Component { list($plugin, $name) = pluginSplit($name); $name .= 'Component'; } else { - throw new CakeException(__('Could not find %s.', $name)); + throw new CakeException(__d('cake_dev', 'Could not find %s.', $name)); } } $this->adapter($name); @@ -90,7 +92,7 @@ class AclComponent extends Component { $adapter = new $adapter(); } if (!$adapter instanceof AclInterface) { - throw new CakeException(__('AclComponent adapters must implement AclInterface')); + throw new CakeException(__d('cake_dev', 'AclComponent adapters must implement AclInterface')); } $this->_Instance = $adapter; $this->_Instance->initialize($this); @@ -161,7 +163,7 @@ class AclComponent extends Component { * @deprecated */ public function grant($aro, $aco, $action = "*") { - trigger_error(__('AclComponent::grant() is deprecated, use allow() instead'), E_USER_WARNING); + trigger_error(__d('cake_dev', 'AclComponent::grant() is deprecated, use allow() instead'), E_USER_WARNING); return $this->_Instance->allow($aro, $aco, $action); } @@ -175,7 +177,7 @@ class AclComponent extends Component { * @deprecated */ public function revoke($aro, $aco, $action = "*") { - trigger_error(__('AclComponent::revoke() is deprecated, use deny() instead'), E_USER_WARNING); + trigger_error(__d('cake_dev', 'AclComponent::revoke() is deprecated, use deny() instead'), E_USER_WARNING); return $this->_Instance->deny($aro, $aco, $action); } } @@ -262,9 +264,7 @@ class DbAcl extends Object implements AclInterface { */ function __construct() { parent::__construct(); - if (!class_exists('AclNode')) { - require LIBS . 'model' . DS . 'db_acl.php'; - } + App::uses('AclNode', 'Model'); $this->Aro = ClassRegistry::init(array('class' => 'Aro', 'alias' => 'Aro')); $this->Aco = ClassRegistry::init(array('class' => 'Aco', 'alias' => 'Aco')); } @@ -299,12 +299,12 @@ class DbAcl extends Object implements AclInterface { $acoPath = $this->Aco->node($aco); if (empty($aroPath) || empty($acoPath)) { - trigger_error(__("DbAcl::check() - Failed ARO/ACO node lookup in permissions check. Node references:\nAro: ") . print_r($aro, true) . "\nAco: " . print_r($aco, true), E_USER_WARNING); + trigger_error(__d('cake_dev', "DbAcl::check() - Failed ARO/ACO node lookup in permissions check. Node references:\nAro: ") . print_r($aro, true) . "\nAco: " . print_r($aco, true), E_USER_WARNING); return false; } if ($acoPath == null || $acoPath == array()) { - trigger_error(__("DbAcl::check() - Failed ACO node lookup in permissions check. Node references:\nAro: ") . print_r($aro, true) . "\nAco: " . print_r($aco, true), E_USER_WARNING); + trigger_error(__d('cake_dev', "DbAcl::check() - Failed ACO node lookup in permissions check. Node references:\nAro: ") . print_r($aro, true) . "\nAco: " . print_r($aco, true), E_USER_WARNING); return false; } @@ -312,7 +312,7 @@ class DbAcl extends Object implements AclInterface { $acoNode = $acoPath[0]; if ($action != '*' && !in_array('_' . $action, $permKeys)) { - trigger_error(__("ACO permissions key %s does not exist in DbAcl::check()", $action), E_USER_NOTICE); + trigger_error(__d('cake_dev', "ACO permissions key %s does not exist in DbAcl::check()", $action), E_USER_NOTICE); return false; } @@ -386,7 +386,7 @@ class DbAcl extends Object implements AclInterface { $save = array(); if ($perms == false) { - trigger_error(__('DbAcl::allow() - Invalid node'), E_USER_WARNING); + trigger_error(__d('cake_dev', 'DbAcl::allow() - Invalid node'), E_USER_WARNING); return false; } if (isset($perms[0])) { @@ -657,7 +657,7 @@ class IniAcl extends Object implements AclInterface { * @return array INI section structure */ public function readConfigFile($filename) { - App::import('Core', 'config/IniReader'); + App::uses('IniReader', 'Configure'); $iniFile = new IniReader(dirname($filename) . DS); return $iniFile->read(basename($filename)); } diff --git a/cake/libs/controller/components/auth/actions_authorize.php b/lib/Cake/Controller/Component/Auth/ActionsAuthorize.php similarity index 95% rename from cake/libs/controller/components/auth/actions_authorize.php rename to lib/Cake/Controller/Component/Auth/ActionsAuthorize.php index c2f1f35d2..684fb47a0 100644 --- a/cake/libs/controller/components/auth/actions_authorize.php +++ b/lib/Cake/Controller/Component/Auth/ActionsAuthorize.php @@ -12,7 +12,8 @@ * @link http://cakephp.org CakePHP(tm) Project * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Component', 'auth/base_authorize'); + +App::uses('BaseAuthorize', 'Controller/Component/Auth'); /** * An authorization adapter for AuthComponent. Provides the ability to authorize using the AclComponent, diff --git a/cake/libs/controller/components/auth/base_authenticate.php b/lib/Cake/Controller/Component/Auth/BaseAuthenticate.php similarity index 98% rename from cake/libs/controller/components/auth/base_authenticate.php rename to lib/Cake/Controller/Component/Auth/BaseAuthenticate.php index 1cfcc8896..aba2a8328 100644 --- a/cake/libs/controller/components/auth/base_authenticate.php +++ b/lib/Cake/Controller/Component/Auth/BaseAuthenticate.php @@ -12,7 +12,8 @@ * @link http://cakephp.org CakePHP(tm) Project * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Core', 'Security'); + +App::uses('Security', 'Utility'); /** * Base Authentication class with common methods and properties. diff --git a/cake/libs/controller/components/auth/base_authorize.php b/lib/Cake/Controller/Component/Auth/BaseAuthorize.php similarity index 97% rename from cake/libs/controller/components/auth/base_authorize.php rename to lib/Cake/Controller/Component/Auth/BaseAuthorize.php index 911bbdb24..f4b7cad27 100644 --- a/cake/libs/controller/components/auth/base_authorize.php +++ b/lib/Cake/Controller/Component/Auth/BaseAuthorize.php @@ -87,7 +87,7 @@ abstract class BaseAuthorize { public function controller($controller = null) { if ($controller) { if (!$controller instanceof Controller) { - throw new CakeException(__('$controller needs to be an instance of Controller')); + throw new CakeException(__d('cake_dev', '$controller needs to be an instance of Controller')); } $this->_Controller = $controller; return true; diff --git a/cake/libs/controller/components/auth/basic_authenticate.php b/lib/Cake/Controller/Component/Auth/BasicAuthenticate.php similarity index 98% rename from cake/libs/controller/components/auth/basic_authenticate.php rename to lib/Cake/Controller/Component/Auth/BasicAuthenticate.php index 2ba467e98..148734629 100644 --- a/cake/libs/controller/components/auth/basic_authenticate.php +++ b/lib/Cake/Controller/Component/Auth/BasicAuthenticate.php @@ -12,7 +12,8 @@ * @link http://cakephp.org CakePHP(tm) Project * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Component', 'auth/base_authenticate'); + +App::uses('BaseAuthenticate', 'Controller/Component/Auth'); /** * Basic Authentication adapter for AuthComponent. diff --git a/cake/libs/controller/components/auth/controller_authorize.php b/lib/Cake/Controller/Component/Auth/ControllerAuthorize.php similarity index 91% rename from cake/libs/controller/components/auth/controller_authorize.php rename to lib/Cake/Controller/Component/Auth/ControllerAuthorize.php index 8fd66b10d..641eb6aff 100644 --- a/cake/libs/controller/components/auth/controller_authorize.php +++ b/lib/Cake/Controller/Component/Auth/ControllerAuthorize.php @@ -12,7 +12,8 @@ * @link http://cakephp.org CakePHP(tm) Project * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Component', 'auth/base_authorize'); + +App::uses('BaseAuthorize', 'Controller/Component/Auth'); /** * An authorization adapter for AuthComponent. Provides the ability to authorize using a controller callback. @@ -45,7 +46,7 @@ class ControllerAuthorize extends BaseAuthorize { public function controller($controller = null) { if ($controller) { if (!method_exists($controller, 'isAuthorized')) { - throw new CakeException(__('$controller does not implement an isAuthorized() method.')); + throw new CakeException(__d('cake_dev', '$controller does not implement an isAuthorized() method.')); } } return parent::controller($controller); diff --git a/cake/libs/controller/components/auth/crud_authorize.php b/lib/Cake/Controller/Component/Auth/CrudAuthorize.php similarity index 96% rename from cake/libs/controller/components/auth/crud_authorize.php rename to lib/Cake/Controller/Component/Auth/CrudAuthorize.php index be127f43a..91be83b79 100644 --- a/cake/libs/controller/components/auth/crud_authorize.php +++ b/lib/Cake/Controller/Component/Auth/CrudAuthorize.php @@ -12,7 +12,9 @@ * @link http://cakephp.org CakePHP(tm) Project * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Component', 'auth/base_authorize'); + +App::uses('BaseAuthorize', 'Controller/Component/Auth'); +App::uses('Router', 'Routing'); /** * An authorization adapter for AuthComponent. Provides the ability to authorize using CRUD mappings. @@ -79,7 +81,7 @@ class CrudAuthorize extends BaseAuthorize { */ public function authorize($user, CakeRequest $request) { if (!isset($this->settings['actionMap'][$request->params['action']])) { - trigger_error(__( + trigger_error(__d('cake_dev', 'CrudAuthorize::authorize() - Attempted access of un-mapped action "%1$s" in controller "%2$s"', $request->action, $request->controller diff --git a/cake/libs/controller/components/auth/digest_authenticate.php b/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php similarity index 99% rename from cake/libs/controller/components/auth/digest_authenticate.php rename to lib/Cake/Controller/Component/Auth/DigestAuthenticate.php index c27f293c0..69c3ae228 100644 --- a/cake/libs/controller/components/auth/digest_authenticate.php +++ b/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php @@ -12,7 +12,8 @@ * @link http://cakephp.org CakePHP(tm) Project * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Component', 'auth/base_authenticate'); + +App::uses('BaseAuthenticate', 'Controller/Component/Auth'); /** * Digest Authentication adapter for AuthComponent. diff --git a/cake/libs/controller/components/auth/form_authenticate.php b/lib/Cake/Controller/Component/Auth/FormAuthenticate.php similarity index 97% rename from cake/libs/controller/components/auth/form_authenticate.php rename to lib/Cake/Controller/Component/Auth/FormAuthenticate.php index d24d9acf2..f0f708088 100644 --- a/cake/libs/controller/components/auth/form_authenticate.php +++ b/lib/Cake/Controller/Component/Auth/FormAuthenticate.php @@ -12,7 +12,8 @@ * @link http://cakephp.org CakePHP(tm) Project * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Component', 'auth/base_authenticate'); + +App::uses('BaseAuthenticate', 'Controller/Component/Auth'); /** * An authentication adapter for AuthComponent. Provides the ability to authenticate using POST diff --git a/cake/libs/controller/components/auth.php b/lib/Cake/Controller/Component/AuthComponent.php similarity index 93% rename from cake/libs/controller/components/auth.php rename to lib/Cake/Controller/Component/AuthComponent.php index 19106aca3..28b7e1bea 100644 --- a/cake/libs/controller/components/auth.php +++ b/lib/Cake/Controller/Component/AuthComponent.php @@ -19,11 +19,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Core', 'Router', false); -App::import('Core', 'Security', false); -App::import('Core', 'CakeSession', false); -App::import('Component', 'auth/base_authorize'); -App::import('Component', 'auth/base_authenticate'); + +App::uses('Component', 'Controller'); +App::uses('Router', 'Routing'); +App::uses('Security', 'Utility'); +App::uses('Debugger', 'Utility'); +App::uses('CakeSession', 'Model/Datasource'); +App::uses('BaseAuthorize', 'Controller/Component/Auth'); +App::uses('BaseAuthenticate', 'Controller/Component/Auth'); /** * Authentication control component class @@ -253,7 +256,6 @@ class AuthComponent extends Component { $this->_methods = $controller->methods; if (Configure::read('debug') > 0) { - App::import('Debugger'); Debugger::checkSecurityKeys(); } } @@ -349,7 +351,7 @@ class AuthComponent extends Component { function __setDefaults() { $defaults = array( 'logoutRedirect' => $this->loginAction, - 'authError' => __('You are not authorized to access that location.') + 'authError' => __d('cake', 'You are not authorized to access that location.') ); foreach ($defaults as $key => $value) { if (empty($this->{$key})) { @@ -361,7 +363,7 @@ class AuthComponent extends Component { /** * Uses the configured Authorization adapters to check whether or not a user is authorized. - * Each adapter will be checked in sequence, if any of them return true, then the user will + * Each adapter will be checked in sequence, if any of them return true, then the user will * be authorized for the request. * * @param mixed $user The user to check the authorization of. If empty the user in the session will be used. @@ -405,12 +407,14 @@ class AuthComponent extends Component { unset($config[AuthComponent::ALL]); } foreach ($config as $class => $settings) { + list($plugin, $class) = pluginSplit($class, true); $className = $class . 'Authorize'; - if (!class_exists($className) && !App::import('Component', 'auth/' . $class . '_authorize')) { - throw new CakeException(__('Authorization adapter "%s" was not found.', $class)); + App::uses($className, $plugin . 'Controller/Component/Auth'); + if (!class_exists($className)) { + throw new CakeException(__d('cake_dev', 'Authorization adapter "%s" was not found.', $class)); } if (!method_exists($className, 'authorize')) { - throw new CakeException(__('Authorization objects must implement an authorize method.')); + throw new CakeException(__d('cake_dev', 'Authorization objects must implement an authorize method.')); } $settings = array_merge($global, (array)$settings); $this->_authorizeObjects[] = new $className($this->_Collection, $settings); @@ -424,7 +428,7 @@ class AuthComponent extends Component { * * You can use allow with either an array, or var args. * - * `$this->Auth->allow(array('edit', 'add'));` or + * `$this->Auth->allow(array('edit', 'add'));` or * `$this->Auth->allow('edit', 'add');` * * allow() also supports '*' as a wildcard to mean all actions. @@ -454,7 +458,7 @@ class AuthComponent extends Component { * * You can use deny with either an array, or var args. * - * `$this->Auth->deny(array('edit', 'add'));` or + * `$this->Auth->deny(array('edit', 'add'));` or * `$this->Auth->deny('edit', 'add');` * * @param mixed $action Controller action name or array of actions @@ -582,8 +586,8 @@ class AuthComponent extends Component { } /** - * If no parameter is passed, gets the authentication redirect URL. Pass a url in to - * set the destination a user should be redirected to upon logging in. Will fallback to + * If no parameter is passed, gets the authentication redirect URL. Pass a url in to + * set the destination a user should be redirected to upon logging in. Will fallback to * AuthComponent::$loginRedirect if there is no stored redirect value. * * @param mixed $url Optional URL to write as the login redirect URL. @@ -643,12 +647,14 @@ class AuthComponent extends Component { unset($config[AuthComponent::ALL]); } foreach ($config as $class => $settings) { + list($plugin, $class) = pluginSplit($class, true); $className = $class . 'Authenticate'; - if (!class_exists($className) && !App::import('Component', 'auth/' . $class . '_authenticate')) { - throw new CakeException(__('Authentication adapter "%s" was not found.', $class)); + App::uses($className, $plugin . 'Controller/Component/Auth'); + if (!class_exists($className)) { + throw new CakeException(__d('cake_dev', 'Authentication adapter "%s" was not found.', $class)); } if (!method_exists($className, 'authenticate')) { - throw new CakeException(__('Authentication objects must implement an authenticate method.')); + throw new CakeException(__d('cake_dev', 'Authentication objects must implement an authenticate method.')); } $settings = array_merge($global, (array)$settings); $this->_authenticateObjects[] = new $className($this->_Collection, $settings); diff --git a/cake/libs/controller/components/cookie.php b/lib/Cake/Controller/Component/CookieComponent.php similarity index 99% rename from cake/libs/controller/components/cookie.php rename to lib/Cake/Controller/Component/CookieComponent.php index bb614c0bc..cca49a5bf 100644 --- a/cake/libs/controller/components/cookie.php +++ b/lib/Cake/Controller/Component/CookieComponent.php @@ -17,10 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -/** - * Load Security class - */ -App::import('Core', 'Security'); +App::uses('Component', 'Controller'); +App::uses('Security', 'Utility'); /** * Cookie Component. diff --git a/cake/libs/controller/components/email.php b/lib/Cake/Controller/Component/EmailComponent.php old mode 100755 new mode 100644 similarity index 98% rename from cake/libs/controller/components/email.php rename to lib/Cake/Controller/Component/EmailComponent.php index 68972daf1..103ccafed --- a/cake/libs/controller/components/email.php +++ b/lib/Cake/Controller/Component/EmailComponent.php @@ -16,7 +16,9 @@ * @since CakePHP(tm) v 1.2.0.3467 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Core', 'Multibyte'); + +App::uses('Component', 'Controller'); +App::uses('Multibyte', 'I18n'); /** * EmailComponent @@ -456,9 +458,9 @@ class EmailComponent extends Component { $viewClass = $this->Controller->view; if ($viewClass != 'View') { - list($plugin, $viewClass) = pluginSplit($viewClass); + list($plugin, $viewClass) = pluginSplit($viewClass, true); $viewClass = $viewClass . 'View'; - App::import('View', $this->Controller->view); + App::uses($viewClass, $plugin . 'View'); } $View = new $viewClass($this->Controller); @@ -723,7 +725,7 @@ class EmailComponent extends Component { $formatted = array(); if ($this->_lineLength !== null) { - trigger_error(__('_lineLength cannot be accessed please use lineLength'), E_USER_WARNING); + trigger_error(__d('cake_dev', '_lineLength cannot be accessed please use lineLength'), E_USER_WARNING); $this->lineLength = $this->_lineLength; } @@ -850,7 +852,7 @@ class EmailComponent extends Component { * @access private */ function _smtp() { - App::import('Core', 'CakeSocket'); + App::uses('CakeSocket', 'Network'); $defaults = array( 'host' => 'localhost', diff --git a/cake/libs/controller/components/paginator.php b/lib/Cake/Controller/Component/PaginatorComponent.php similarity index 100% rename from cake/libs/controller/components/paginator.php rename to lib/Cake/Controller/Component/PaginatorComponent.php diff --git a/cake/libs/controller/components/request_handler.php b/lib/Cake/Controller/Component/RequestHandlerComponent.php similarity index 99% rename from cake/libs/controller/components/request_handler.php rename to lib/Cake/Controller/Component/RequestHandlerComponent.php index f818ef63b..56cf6c448 100644 --- a/cake/libs/controller/components/request_handler.php +++ b/lib/Cake/Controller/Component/RequestHandlerComponent.php @@ -19,6 +19,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +App::uses('Xml', 'Utility'); + /** * Request object for handling HTTP requests * @@ -171,9 +173,6 @@ class RequestHandlerComponent extends Component { } if ($this->requestedWith('xml')) { - if (!class_exists('Xml')) { - App::import('Core', 'Xml'); - } try { $xml = Xml::build(trim(file_get_contents('php://input'))); @@ -542,7 +541,8 @@ class RequestHandlerComponent extends Component { ); if (!$isAdded) { - if (App::import('Helper', $helper)) { + App::uses($helper . 'Helper', 'View/Helper'); + if (class_exists($helper . 'Helper')) { $controller->helpers[] = $helper; } } diff --git a/cake/libs/controller/components/security.php b/lib/Cake/Controller/Component/SecurityComponent.php similarity index 99% rename from cake/libs/controller/components/security.php rename to lib/Cake/Controller/Component/SecurityComponent.php index 7b1f6cac8..16cdc6413 100644 --- a/cake/libs/controller/components/security.php +++ b/lib/Cake/Controller/Component/SecurityComponent.php @@ -16,8 +16,10 @@ * @since CakePHP(tm) v 0.10.8.2156 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Core', 'String', false); -App::import('Core', 'Security', false); + +App::uses('Component', 'Controller'); +App::uses('String', 'Utility'); +App::uses('Security', 'Utility'); /** * SecurityComponent diff --git a/cake/libs/controller/components/session.php b/lib/Cake/Controller/Component/SessionComponent.php similarity index 98% rename from cake/libs/controller/components/session.php rename to lib/Cake/Controller/Component/SessionComponent.php index fefa7dbf7..9d2231150 100644 --- a/cake/libs/controller/components/session.php +++ b/lib/Cake/Controller/Component/SessionComponent.php @@ -16,9 +16,9 @@ * @since CakePHP(tm) v 0.10.0.1232 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -if (!class_exists('cakesession')) { - require LIBS . 'cake_session.php'; -} + +App::uses('Component', 'Controller'); +App::uses('CakeSession', 'Model/Datasource'); /** * Session Component. diff --git a/cake/libs/controller/component_collection.php b/lib/Cake/Controller/ComponentCollection.php similarity index 87% rename from cake/libs/controller/component_collection.php rename to lib/Cake/Controller/ComponentCollection.php index 07a2a6eef..909fd70e1 100644 --- a/cake/libs/controller/component_collection.php +++ b/lib/Cake/Controller/ComponentCollection.php @@ -15,6 +15,10 @@ * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ + +App::uses('ObjectCollection', 'Utility'); +App::uses('Component', 'Controller'); + class ComponentCollection extends ObjectCollection { /** @@ -76,7 +80,7 @@ class ComponentCollection extends ObjectCollection { $alias = $component; $component = $settings['className']; } - list($plugin, $name) = pluginSplit($component); + list($plugin, $name) = pluginSplit($component, true); if (!isset($alias)) { $alias = $name; } @@ -84,19 +88,12 @@ class ComponentCollection extends ObjectCollection { return $this->_loaded[$alias]; } $componentClass = $name . 'Component'; + App::uses($componentClass, $plugin . 'Controller/Component'); if (!class_exists($componentClass)) { - if (!App::import('Component', $component)) { - throw new MissingComponentFileException(array( - 'file' => Inflector::underscore($componentClass) . '.php', - 'class' => $componentClass - )); - } - if (!class_exists($componentClass)) { - throw new MissingComponentClassException(array( - 'file' => Inflector::underscore($componentClass) . '.php', - 'class' => $componentClass - )); - } + throw new MissingComponentClassException(array( + 'file' => Inflector::underscore($componentClass) . '.php', + 'class' => $componentClass + )); } $this->_loaded[$alias] = new $componentClass($this, $settings); $enable = isset($settings['enabled']) ? $settings['enabled'] : true; diff --git a/cake/libs/controller/controller.php b/lib/Cake/Controller/Controller.php similarity index 98% rename from cake/libs/controller/controller.php rename to lib/Cake/Controller/Controller.php index f09601c86..697629387 100644 --- a/cake/libs/controller/controller.php +++ b/lib/Cake/Controller/Controller.php @@ -20,10 +20,10 @@ /** * Include files */ -App::import('Core', 'CakeResponse', false); -App::import('Core', 'ClassRegistry', false); -App::import('Controller', 'Component', false); -App::import('View', 'View', false); +App::uses('CakeResponse', 'Network'); +App::uses('ClassRegistry', 'Utility'); +App::uses('ComponentCollection', 'Controller'); +App::uses('View', 'View'); /** * Application controller class for organization of business logic. @@ -311,18 +311,14 @@ class Controller extends Object { */ public function __construct($request = null) { if ($this->name === null) { - $r = null; - if (!preg_match('/(.*)Controller/i', get_class($this), $r)) { - echo __("Controller::__construct() : Can not get or parse my own class name, exiting."); - $this->_stop(); - } - $this->name = $r[1]; + $this->name = substr(get_class($this), 0, strlen(get_class($this)) -10); } if ($this->viewPath == null) { $this->viewPath = Inflector::underscore($this->name); } - $this->modelClass = Inflector::classify($this->name); + + $this->modelClass = Inflector::singularize($this->name); $this->modelKey = Inflector::underscore($this->modelClass); $this->Components = new ComponentCollection(); @@ -339,7 +335,7 @@ class Controller extends Object { } /** - * Provides backwards compatbility avoid problems with empty and isset to alias properties. + * Provides backwards compatibility to avoid problems with empty and isset to alias properties. * * @return void */ @@ -828,9 +824,9 @@ class Controller extends Object { $viewClass = $this->viewClass; if ($this->viewClass != 'View') { - list($plugin, $viewClass) = pluginSplit($viewClass); + list($plugin, $viewClass) = pluginSplit($viewClass, true); $viewClass = $viewClass . 'View'; - App::import('View', $this->viewClass); + App::uses($viewClass, $plugin . 'View'); } $this->request->params['models'] = $this->modelNames; diff --git a/cake/libs/controller/pages_controller.php b/lib/Cake/Controller/PagesController.php similarity index 97% rename from cake/libs/controller/pages_controller.php rename to lib/Cake/Controller/PagesController.php index 65e8b0465..c842bc9ca 100644 --- a/cake/libs/controller/pages_controller.php +++ b/lib/Cake/Controller/PagesController.php @@ -19,6 +19,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +App::uses('AppController', 'Controller'); + /** * Static content controller * diff --git a/cake/libs/controller/scaffold.php b/lib/Cake/Controller/Scaffold.php similarity index 94% rename from cake/libs/controller/scaffold.php rename to lib/Cake/Controller/Scaffold.php index ab66e137a..054e3a1a3 100644 --- a/cake/libs/controller/scaffold.php +++ b/lib/Cake/Controller/Scaffold.php @@ -18,7 +18,7 @@ * @since Cake v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('View', 'Scaffold'); +App::uses('Scaffold', 'View'); /** * Scaffolding is a set of automatic actions for starting web development work faster. @@ -127,7 +127,7 @@ class Scaffold { $this->ScaffoldModel = $this->controller->{$this->modelClass}; $this->scaffoldTitle = Inflector::humanize($this->viewPath); $this->scaffoldActions = $controller->scaffold; - $title_for_layout = __('Scaffold :: ') . Inflector::humanize($request->action) . ' :: ' . $this->scaffoldTitle; + $title_for_layout = __d('cake', 'Scaffold :: ') . Inflector::humanize($request->action) . ' :: ' . $this->scaffoldTitle; $modelClass = $this->controller->modelClass; $primaryKey = $this->ScaffoldModel->primaryKey; $displayField = $this->ScaffoldModel->displayField; @@ -174,7 +174,7 @@ class Scaffold { $this->ScaffoldModel->id = $request->params['pass'][0]; } if (!$this->ScaffoldModel->exists()) { - throw new NotFoundException(__('Invalid %s', Inflector::humanize($this->modelKey))); + throw new NotFoundException(__d('cake', 'Invalid %s', Inflector::humanize($this->modelKey))); } $this->ScaffoldModel->recursive = 1; $this->controller->request->data = $this->ScaffoldModel->read(); @@ -231,10 +231,10 @@ class Scaffold { */ protected function _scaffoldSave(CakeRequest $request, $action = 'edit') { $formAction = 'edit'; - $success = __('updated'); + $success = __d('cake', 'updated'); if ($action === 'add') { $formAction = 'add'; - $success = __('saved'); + $success = __d('cake', 'saved'); } if ($this->controller->_beforeScaffold($action)) { @@ -243,7 +243,7 @@ class Scaffold { $this->ScaffoldModel->id = $request['pass'][0]; } if (!$this->ScaffoldModel->exists()) { - throw new NotFoundException(__('Invalid %s', Inflector::humanize($this->modelKey))); + throw new NotFoundException(__d('cake', 'Invalid %s', Inflector::humanize($this->modelKey))); } } @@ -254,7 +254,7 @@ class Scaffold { if ($this->ScaffoldModel->save($request->data)) { if ($this->controller->_afterScaffoldSave($action)) { - $message = __( + $message = __d('cake', 'The %1$s has been %2$s', Inflector::humanize($this->modelKey), $success @@ -265,7 +265,7 @@ class Scaffold { } } else { if ($this->_validSession) { - $this->controller->Session->setFlash(__('Please correct errors below.')); + $this->controller->Session->setFlash(__d('cake', 'Please correct errors below.')); } } } @@ -312,13 +312,13 @@ class Scaffold { } $this->ScaffoldModel->id = $id; if (!$this->ScaffoldModel->exists()) { - throw new NotFoundException(__('Invalid %s', Inflector::humanize($this->modelClass))); + throw new NotFoundException(__d('cake', 'Invalid %s', Inflector::humanize($this->modelClass))); } if ($this->ScaffoldModel->delete()) { - $message = __('The %1$s with id: %2$d has been deleted.', Inflector::humanize($this->modelClass), $id); + $message = __d('cake', 'The %1$s with id: %2$d has been deleted.', Inflector::humanize($this->modelClass), $id); return $this->_sendMessage($message); } else { - $message = __( + $message = __d('cake', 'There was an error deleting the %1$s with id: %2$d', Inflector::humanize($this->modelClass), $id diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php new file mode 100644 index 000000000..014f812db --- /dev/null +++ b/lib/Cake/Core/App.php @@ -0,0 +1,820 @@ + array('extends' => null, 'core' => true), + 'file' => array('extends' => null, 'core' => true), + 'model' => array('extends' => 'AppModel', 'core' => false), + 'behavior' => array('extends' => 'ModelBehavior', 'core' => true), + 'controller' => array('suffix' => 'Controller', 'extends' => 'AppController', 'core' => true), + 'component' => array('suffix' => 'Component', 'extends' => null, 'core' => true), + 'lib' => array('extends' => null, 'core' => true), + 'view' => array('suffix' => 'View', 'extends' => null, 'core' => true), + 'helper' => array('suffix' => 'Helper', 'extends' => 'AppHelper', 'core' => true), + 'vendor' => array('extends' => null, 'core' => true), + 'shell' => array('suffix' => 'Shell', 'extends' => 'Shell', 'core' => true), + 'plugin' => array('extends' => null, 'core' => true) + ); + +/** + * Paths to search for files. + * + * @var array + */ + public static $search = array(); + +/** + * Whether or not to return the file that is loaded. + * + * @var boolean + */ + public static $return = false; + +/** + * Determines if $__maps and $__paths cache should be written. + * + * @var boolean + */ + private static $__cache = false; + +/** + * Holds key/value pairs of $type => file path. + * + * @var array + */ + private static $__map = array(); + +/** + * Holds paths for deep searching of files. + * + * @var array + */ + private static $__paths = array(); + +/** + * Holds loaded files. + * + * @var array + */ + private static $__loaded = array(); + +/** + * Holds and key => value array of object types. + * + * @var array + */ + private static $__objects = array(); + +/** + * Holds the location of each class + * + */ + private static $__classMap = array(); + +/** + * Holds the possible paths for each package name + * + */ + private static $__packages = array(); + +/** + * Holds the templates for each customizable package path in the application + * + */ + private static $__packageFormat = array(); + +/** + * Maps an old style CakePHP class type to the corresponding package + * + */ + public static $legacy = array( + 'models' => 'Model', + 'behaviors' => 'Model/Behavior', + 'datasources' => 'Model/Datasource', + 'controllers' => 'Controller', + 'components' => 'Controller/Component', + 'views' => 'View', + 'helpers' => 'View/Helper', + 'shells' => 'Console/Command', + 'libs' => 'Lib' + ); + +/** + * Inicates whether the class cache should be stored again because of an addition to it + * + */ + private static $_cacheChange = false; + +/** + * Inicates whether the object cache should be stored again because of an addition to it + * + */ + private static $_objectCacheChange = false; + +/** + * Used to read information stored path + * + * Usage: + * + * `App::path('Model'); will return all paths for models` + * + * `App::path('Model/Datasource', 'MyPlugin'); will return the path for datasources under the 'MyPlugin' plugin` + * + * @param string $type type of path + * @param string $plugin name of plugin + * @return string array + */ + public static function path($type, $plugin = null) { + if (!empty(self::$legacy[$type])) { + $type = self::$legacy[$type]; + } + + if (!empty($plugin)) { + $path = array(); + $pluginPath = self::pluginPath($plugin); + if (!empty(self::$__packageFormat[$type])) { + foreach (self::$__packageFormat[$type] as $f) { + $path[] = sprintf($f, $pluginPath); + } + } + $path[] = $pluginPath . 'Lib' . DS . $type . DS; + return $path; + } + + if (!isset(self::$__packages[$type])) { + return array(); + } + return self::$__packages[$type]; + } + +/** + * Sets up each package location on the file system. You can configure multiple search paths + * for each package, those will be used to look for files one folder at a time in the specified order + * All paths should be terminated with a Directory separator + * + * Usage: + * + * `App::build(array(Model' => array('/a/full/path/to/models/'))); will setup a new search path for the Model package` + * + * `App::build(array('Model' => array('/path/to/models/')), true); will setup the path as the only valid path for searching models` + * + * `App::build(array('View/Helper' => array('/path/to/models/', '/another/path/))); will setup multiple search paths for helpers` + * + * @param array $paths associative array with package names as keys and a list of directories for new search paths + * @param boolean $reset true will set paths, false merges paths [default] false + * @return void + */ + public static function build($paths = array(), $reset = false) { + if (empty(self::$__packageFormat)) { + self::$__packageFormat = array( + 'Model' => array( + '%s' . 'Model' . DS, + '%s' . 'models' . DS + ), + 'Model/Behavior' => array( + '%s' . 'Model' . DS . 'Behavior' . DS, + '%s' . 'models' . DS . 'behaviors' . DS + ), + 'Model/Datasource' => array( + '%s' . 'Model' . DS . 'Datasource' . DS, + '%s' . 'models' . DS . 'datasources' . DS + ), + 'Model/Datasource/Database' => array( + '%s' . 'Model' . DS . 'Datasource' . DS . 'Database' . DS, + '%s' . 'models' . DS . 'datasources' . DS . 'database' . DS + ), + 'Model/Datasource/Session' => array( + '%s' . 'Model' . DS . 'Datasource' . DS . 'Session' . DS, + '%s' . 'models' . DS . 'datasources' . DS . 'session' . DS + ), + 'Controller' => array( + '%s' . 'Controller' . DS, + '%s' . 'controllers' . DS + ), + 'Controller/Component' => array( + '%s' . 'Controller' . DS . 'Component' . DS, + '%s' . 'controllers' . DS . 'components' . DS + ), + 'View' => array( + '%s' . 'View' . DS, + '%s' . 'views' . DS + ), + 'View/Helper' => array( + '%s' . 'View' . DS . 'Helper' . DS, + '%s' . 'views' . DS . 'helpers' . DS + ), + 'Console' => array( + '%s' . 'Console' . DS, + '%s' . 'console' . DS + ), + 'Console/Command' => array( + '%s' . 'Console' . DS . 'Command' . DS, + '%s' . 'console' . DS . 'shells' . DS, + ), + 'Console/Command/Task' => array( + '%s' . 'Console' . DS . 'Command' . DS . 'Task' . DS, + '%s' . 'console' . DS . 'shells' . DS . 'tasks' . DS + ), + 'Lib' => array( + '%s' . 'Lib' . DS, + '%s' . 'libs' . DS + ), + 'locales' => array( + '%s' . 'locale' . DS + ), + 'vendors' => array('%s' . 'vendors' . DS, VENDORS), + 'plugins' => array(APP . 'plugins' . DS, CAKE_CORE_INCLUDE_PATH . DS . 'plugins' . DS) + ); + } + + if ($reset == true) { + foreach ($paths as $type => $new) { + if (!empty(self::$legacy[$type])) { + $type = self::$legacy[$type]; + } + self::$__packages[$type] = (array)$new; + } + return $paths; + } + + //Provides Backwards compatibility for old-style package names + $legacyPaths = array(); + foreach ($paths as $type => $path) { + if (!empty(self::$legacy[$type])) { + $type = self::$legacy[$type]; + } + $legacyPaths[$type] = $path; + } + + $paths = $legacyPaths; + $defaults = array(); + foreach (self::$__packageFormat as $package => $format) { + foreach ($format as $f) { + $defaults[$package][] = sprintf($f, APP); + } + } + + $mergeExclude = array('Lib', 'locales', 'vendors', 'plugins'); + $appLibs = empty($paths['Lib']) ? $defaults['Lib'] : $paths['Lib']; + + foreach ($defaults as $type => $default) { + if (empty(self::$__packages[$type]) || empty($paths)) { + self::$__packages[$type] = $default; + } + + if (!empty($paths[$type])) { + $path = array_merge((array)$paths[$type], self::$__packages[$type]); + } else { + $path = self::$__packages[$type]; + } + + self::$__packages[$type] = array_values(array_unique($path)); + } + } + +/** + * Gets the path that a plugin is on. Searches through the defined plugin paths. + * + * Usage: + * + * `App::pluginPath('MyPlugin'); will return the full path to 'MyPlugin' plugin'` + * + * @param string $plugin CamelCased/lower_cased plugin name to find the path of. + * @return string full path to the plugin. + */ + public static function pluginPath($plugin) { + $pluginDir = Inflector::underscore($plugin); + foreach (self::$__packages['plugins'] as $pluginPath) { + if (is_dir($pluginPath . $pluginDir)) { + return $pluginPath . $pluginDir . DS ; + } + } + return self::$__packages['plugins'][0] . $pluginDir . DS; + } + +/** + * Finds the path that a theme is on. Searches through the defined theme paths. + * + * Usage: + * + * `App::themePath('MyTheme'); will return the full path to the 'MyTheme' theme` + * + * @param string $theme lower_cased theme name to find the path of. + * @return string full path to the theme. + */ + public static function themePath($theme) { + $themeDir = 'themed' . DS . Inflector::underscore($theme); + foreach (self::$__packages['View'] as $path) { + if (is_dir($path . $themeDir)) { + return $path . $themeDir . DS ; + } + } + return self::$__packages['View'][0] . $themeDir . DS; + } + +/** + * Returns the full path to a package inside the CakePHP core + * + * Usage: + * + * `App::core('Cache/Engine'); will return the full path to the cache engines package` + * + * @param string $type + * @return string full path to package + */ + public static function core($type) { + if ($type) { + return isset($paths[$type]) ? $paths[$type] : array(LIBS . $type . DS); + } + } + +/** + * Returns an array of objects of the given type. + * + * Example usage: + * + * `App::objects('plugin');` returns `array('DebugKit', 'Blog', 'User');` + * + * `App::objects('Controller');` returns `array('PagesController', 'BlogController');` + * + * You can also search only within a plugin's objects by using the plugin dot + * syntax. + * + * `App::objects('MyPlugin.Model');` returns `array('MyPluginPost', 'MyPluginComment');` + * + * @param string $type Type of object, i.e. 'Model', 'Controller', 'View/Helper', 'file', 'class' or 'plugin' + * @param mixed $path Optional Scan only the path given. If null, paths for the chosen type will be used. + * @param boolean $cache Set to false to rescan objects of the chosen type. Defaults to true. + * @return mixed Either false on incorrect / miss. Or an array of found objects. + */ + public static function objects($type, $path = null, $cache = true) { + $objects = array(); + $extension = '/\.php$/'; + $includeDirectories = false; + $name = $type; + + if ($type === 'plugin') { + $type = 'plugins'; + } + + if ($type == 'plugins') { + $extension = '/.*/'; + $includeDirectories = true; + } + + list($plugin, $type) = pluginSplit($type); + + if (isset(self::$legacy[$type . 's'])) { + $type = self::$legacy[$type . 's']; + } + + if ($type === 'file' && !$path) { + return false; + } elseif ($type === 'file') { + $extension = '/\.php$/'; + $name = $type . str_replace(DS, '', $path); + } + + if (empty(self::$__objects) && $cache === true) { + self::$__objects = Cache::read('object_map', '_cake_core_'); + } + + $cacheLocation = empty($plugin) ? 'app' : $plugin; + + if ($cache !== true || !isset(self::$__objects[$cacheLocation][$name])) { + $objects = array(); + + if (empty($path)) { + $path = self::path($type, $plugin); + } + + $items = array(); + + foreach ((array)$path as $dir) { + if ($dir != APP && is_dir($dir)) { + $files = new RegexIterator(new DirectoryIterator($dir), $extension); + foreach ($files as $file) { + if (!$file->isDot()) { + $isDir = $file->isDir() ; + if ($isDir && $includeDirectories) { + $objects[] = basename($file); + } elseif (!$includeDirectories && !$isDir) { + $objects[] = substr(basename($file), 0, -4); + } + } + } + } + } + + if ($type !== 'file') { + foreach ($objects as $key => $value) { + $objects[$key] = Inflector::camelize($value); + } + } + + if ($cache === true) { + self::$__cache = true; + } + if ($plugin) { + return $objects; + } + self::$__objects[$cacheLocation][$name] = $objects; + self::$_objectCacheChange = true; + } + + return self::$__objects[$cacheLocation][$name]; + } + +/** + * Allows you to modify the object listings that App maintains inside of it + * Useful for testing + * + * @param string $type Type of object listing you are changing + * @param array $values The values $type should be set to. + * @return void + */ + public static function setObjects($type, $values) { + list($plugin, $type) = pluginSplit($type); + $cacheLocation = empty($plugin) ? 'app' : $plugin; + self::$__objects[$cacheLocation][$type] = $values; + } + +/** + * Declares a package for a class. This package location will be used + * by the automatic class loader if the class is tried to be used + * + * Usage: + * + * `App::uses('MyCustomController', 'Controller');` will setup the class to be found under Controller package + * + * `App::uses('MyHelper', 'MyPlugin.View/Helper');` will setup the helper class to be found in plugin's helper package + * + * @param string $className the name of the class to configure package for + * @param string $location the package name + */ + public static function uses($className, $location) { + self::$__classMap[$className] = $location; + } + +/** + * Method to handle the automatic class loading. It will look for each class' package + * defined using App::uses() and with this information it will resolve the package name to a full path + * to load the class from. File name for each class should follow the class name. For instance, + * if a class is name `MyCustomClass` the file name should be `MyCustomClass.php` + * + * @param string $className the name of the class to load + */ + public static function load($className) { + if (isset(self::$__classMap[$className])) { + if ($file = self::__mapped($className)) { + return include $file; + } + + $parts = explode('.', self::$__classMap[$className], 2); + list($plugin, $package) = count($parts) > 1 ? $parts : array(null, current($parts)); + $paths = self::path($package, $plugin); + + if (empty($plugin)) { + $appLibs = empty(self::$__packages['Lib']) ? APPLIBS : current(self::$__packages['Lib']); + $paths[] = $appLibs . $package . DS; + $paths[] = LIBS . $package . DS; + } + + foreach ($paths as $path) { + $file = $path . $className . '.php'; + if (file_exists($file)) { + self::__map($file, $className); + return include $file; + } + } + + //To help apps migrate to 2.0 old style file names are allowed + foreach ($paths as $path) { + $underscored = Inflector::underscore($className); + $tries = array($path . $underscored . '.php'); + $parts = explode('_', $underscored); + if (count($parts) > 1) { + array_pop($parts); + $tries[] = $path . implode('_', $parts) . '.php'; + } + foreach ($tries as $file) { + if (file_exists($file)) { + self::__map($file, $className); + return include $file; + } + } + } + } + + return false; + } + +/** + * Finds classes based on $name or specific file(s) to search. Calling App::import() will + * not construct any classes contained in the files. It will only find and require() the file. + * + * @link http://book.cakephp.org/view/934/Using-App-import + * @param mixed $type The type of Class if passed as a string, or all params can be passed as + * an single array to $type, + * @param string $name Name of the Class or a unique name for the file + * @param mixed $parent boolean true if Class Parent should be searched, accepts key => value + * array('parent' => $parent ,'file' => $file, 'search' => $search, 'ext' => '$ext'); + * $ext allows setting the extension of the file name + * based on Inflector::underscore($name) . ".$ext"; + * @param array $search paths to search for files, array('path 1', 'path 2', 'path 3'); + * @param string $file full name of the file to search for including extension + * @param boolean $return, return the loaded file, the file must have a return + * statement in it to work: return $variable; + * @return boolean true if Class is already in memory or if file is found and loaded, false if not + */ + public static function import($type = null, $name = null, $parent = true, $search = array(), $file = null, $return = false) { + $ext = $plugin = $directory = null; + + if (is_array($type)) { + extract($type, EXTR_OVERWRITE); + } + + if (is_array($parent)) { + extract($parent, EXTR_OVERWRITE); + } + + if ($name == null && $file == null) { + return false; + } + + if (is_array($name)) { + foreach ($name as $class) { + if (!App::import(compact('type', 'parent', 'search', 'file', 'return') + array('name' => $class))) { + return false; + } + } + return true; + } + + $originalType = $type = strtolower($type); + $specialPackage = in_array($type, array('file', 'vendor')); + if (!$specialPackage && isset(self::$legacy[$type . 's'])) { + $type = self::$legacy[$type . 's']; + } + list($plugin, $name) = pluginSplit($name); + if (!empty($plugin)) { + $plugin = Inflector::camelize($plugin); + } + + if (!$specialPackage) { + return self::_loadClass($name, $plugin, $type, $originalType, $parent); + } + + if ($type == 'file' && !empty($file)) { + return self::_loadFile($name, $plugin, $search, $file, $return); + } + + if ($type == 'vendor') { + return self::_loadVendor($name, $plugin, $file, $ext); + } + + return false; + } + +/** + * Helper function to include classes + * This is a compatibility wrapper around using App::uses() and automatic class loading + * + * @param string $name unique name of the file for identifying it inside the application + * @param string $plugin camel cased plugin name if any + * @param string $type name of the packed where the class is located + * @param string $file filename if known, the $name param will be used otherwise + * @param string $originalType type name as supplied initially by the user + * @param boolean $parent whether to load the class parent or not + * @return boolean true indicating the successful load and existence of the class + */ + private function _loadClass($name, $plugin, $type, $originalType, $parent) { + if ($type == 'Console/Command' && $name == 'Shell') { + $type = 'Console'; + } else if (isset(self::$types[$originalType]['suffix'])) { + $suffix = self::$types[$originalType]['suffix']; + $name .= ($suffix == $name) ? '' : $suffix; + } + + if ($parent && isset(self::$types[$originalType]['extends'])) { + $extends = self::$types[$originalType]['extends']; + App::uses($extends, $type); + if ($plugin && in_array($originalType, array('controller', 'model'))) { + App::uses($plugin . $extends, $plugin . '.' .$type); + } + } + if ($plugin) { + $plugin .= '.'; + } + $name = Inflector::camelize($name); + App::uses($name, $plugin . $type); + return class_exists($name); + } + +/** + * Helper function to include single files + * + * @param string $name unique name of the file for identifying it inside the application + * @param string $plugin camel cased plugin name if any + * @param array $search list of paths to search the file into + * @param string $file filename if known, the $name param will be used otherwise + * @param boolean $return whether this function should return the contents of the file after being parsed by php or just a success notice + * @return mixed, if $return contents of the file after php parses it, boolean indicating success otherwise + */ + private function _loadFile($name, $plugin, $search, $file, $return) { + $mapped = self::__mapped($name, $plugin); + if ($mapped) { + $file = $mapped; + } else if (!empty($search)) { + foreach ($search as $path) { + $found = false; + if (file_exists($path . $file)) { + $file = $path . $file; + $found = true; + break; + } + if (empty($found)) { + $file = false; + } + } + } + if (!empty($file) && file_exists($file)) { + self::__map($file, $name, $plugin); + $returnValue = include $file; + if ($return) { + return $returnValue; + } + return (bool) $returnValue; + } + return false; + } + +/** + * Helper function to load files from vendors folders + * + * @param string $name unique name of the file for identifying it inside the application + * @param string $plugin camel cased plugin name if any + * @param string $file file name if known + * @param string $ext file extension if known + * @return boolean true if the file was loaded successfully, false otherwise + */ + private function _loadVendor($name, $plugin, $file, $ext) { + if ($mapped = self::__mapped($name, $plugin)) { + return (bool) include_once($mapped); + } + $fileTries = array(); + $paths = ($plugin) ? App::path('vendors', $plugin) : App::path('vendors'); + if (empty($ext)) { + $ext = 'php'; + } + if (empty($file)) { + $fileTries[] = $name . '.' . $ext; + $fileTries[] = Inflector::underscore($name) . '.' . $ext; + } else { + $fileTries[] = $file; + } + + foreach ($fileTries as $file) { + foreach ($paths as $path) { + if (file_exists($path . $file)) { + self::__map($path . $file, $name, $plugin); + return (bool) include($path . $file); + } + } + } + return false; + } + +/** + * Initializes the cache for App, registers a shutdown function. + * + * @return void + */ + public static function init() { + self::$__map = (array)Cache::read('file_map', '_cake_core_'); + self::$__objects = (array)Cache::read('object_map', '_cake_core_'); + register_shutdown_function(array('App', 'shutdown')); + } + +/** + * Maps the $name to the $file. + * + * @param string $file full path to file + * @param string $name unique name for this map + * @param string $plugin camelized if object is from a plugin, the name of the plugin + * @return void + * @access private + */ + private static function __map($file, $name, $plugin = null) { + if ($plugin) { + self::$__map['Plugin'][$plugin][$name] = $file; + } else { + self::$__map[$name] = $file; + } + self::$_cacheChange = true; + } + +/** + * Returns a file's complete path. + * + * @param string $name unique name + * @param string $plugin camelized if object is from a plugin, the name of the plugin + * @return mixed, file path if found, false otherwise + * @access private + */ + private static function __mapped($name, $plugin = null) { + if ($plugin) { + if (isset(self::$__map['Plugin'][$plugin][$name])) { + return self::$__map['Plugin'][$plugin][$name]; + } + return false; + } + + if (isset(self::$__map[$name])) { + return self::$__map[$name]; + } + return false; + } + +/** + * Object destructor. + * + * Writes cache file if changes have been made to the $__map or $__paths + * + * @return void + */ + public static function shutdown() { + if (self::$__cache && self::$_cacheChange) { + Cache::write('file_map', array_filter(self::$__map), '_cake_core_'); + } + if (self::$__cache && self::$_objectCacheChange) { + Cache::write('object_map', self::$__objects, '_cake_core_'); + } + } +} \ No newline at end of file diff --git a/cake/libs/configure.php b/lib/Cake/Core/Configure.php similarity index 94% rename from cake/libs/configure.php rename to lib/Cake/Core/Configure.php index 97b54b3e9..ee139eb54 100644 --- a/cake/libs/configure.php +++ b/lib/Cake/Core/Configure.php @@ -21,7 +21,7 @@ * Configuration class. Used for managing runtime configuration information. * * Provides features for reading and writing to the runtime configuration, as well - * as methods for loading additional configuration files or storing runtime configuration + * as methods for loading additional configuration files or storing runtime configuration * for future use. * * @package cake.libs @@ -70,13 +70,13 @@ class Configure { )); if (!include(CONFIGS . 'core.php')) { - trigger_error(__("Can't find application core file. Please create %score.php, and make sure it is readable by PHP.", CONFIGS), E_USER_ERROR); + trigger_error(__d('cake_dev', "Can't find application core file. Please create %score.php, and make sure it is readable by PHP.", CONFIGS), E_USER_ERROR); } App::init(); App::build(); if (!include(CONFIGS . 'bootstrap.php')) { - trigger_error(__("Can't find application bootstrap file. Please create %sbootstrap.php, and make sure it is readable by PHP.", CONFIGS), E_USER_ERROR); + trigger_error(__d('cake_dev', "Can't find application bootstrap file. Please create %sbootstrap.php, and make sure it is readable by PHP.", CONFIGS), E_USER_ERROR); } $level = -1; if (isset(self::$_values['Error']['level'])) { @@ -224,7 +224,7 @@ class Configure { } /** - * Add a new reader to Configure. Readers allow you to read configuration + * 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. * @@ -232,7 +232,7 @@ class 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 @@ -254,7 +254,7 @@ class Configure { } /** - * 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. @@ -276,7 +276,7 @@ class Configure { * runtime configuration. You can load configuration files from plugins * by preceding the filename with the plugin name. * - * `Configure::load('Users.user', 'default')` + * `Configure::load('Users.user', 'default')` * * 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. @@ -318,7 +318,7 @@ class Configure { */ public static function version() { if (!isset(self::$_values['Cake']['version'])) { - require(CORE_PATH . 'cake' . DS . 'config' . DS . 'config.php'); + require(LIBS . 'config' . DS . 'config.php'); self::write($config); } return self::$_values['Cake']['version']; @@ -369,7 +369,7 @@ interface ConfigReaderInterface { * These sources can either be static resources like files, or dynamic ones like * a database, or other datasource. * - * @param string $key + * @param string $key * @return array An array of data to merge into the runtime configuration */ function read($key); diff --git a/cake/libs/object.php b/lib/Cake/Core/Object.php similarity index 99% rename from cake/libs/object.php rename to lib/Cake/Core/Object.php index 9096ae121..28a3d0d29 100644 --- a/cake/libs/object.php +++ b/lib/Cake/Core/Object.php @@ -20,6 +20,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +App::uses('Set', 'Utility'); + /** * Object class provides a few generic methods used in several subclasses. * @@ -64,9 +66,7 @@ class Object { if (empty($url)) { return false; } - if (!class_exists('dispatcher')) { - require LIBS . 'dispatcher.php'; - } + App::uses('Dispatcher', 'Routing'); if (in_array('return', $extra, true)) { $extra = array_merge($extra, array('return' => 0, 'autoRender' => 1)); } diff --git a/cake/libs/error/error_handler.php b/lib/Cake/Error/ErrorHandler.php similarity index 94% rename from cake/libs/error/error_handler.php rename to lib/Cake/Error/ErrorHandler.php index 775bd8d43..6787e23f7 100644 --- a/cake/libs/error/error_handler.php +++ b/lib/Cake/Error/ErrorHandler.php @@ -19,6 +19,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +App::uses('Debugger', 'Utility'); +App::uses('CakeLog', 'Log'); +App::uses('ExceptionRenderer', 'Error'); +App::uses('AppController', 'Controller'); + /** * * Error Handler provides basic error and exception handling for your application. It captures and @@ -102,12 +107,8 @@ class ErrorHandler { * @see http://php.net/manual/en/function.set-exception-handler.php */ public static function handleException(Exception $exception) { - App::import('Core', 'error/ExceptionRenderer'); $config = Configure::read('Exception'); if (!empty($config['log'])) { - if (!class_exists('CakeLog')) { - require LIBS . 'cake_log.php'; - } $message = sprintf("[%s] %s\n%s", get_class($exception), $exception->getMessage(), @@ -116,7 +117,7 @@ class ErrorHandler { CakeLog::write(LOG_ERR, $message); } if ($config['renderer'] !== 'ExceptionRenderer') { - App::import('Lib', $config['renderer']); + App::uses($config['renderer'], 'Error'); } $error = new $config['renderer']($exception); $error->render(); @@ -146,9 +147,6 @@ class ErrorHandler { $debug = Configure::read('debug'); if ($debug) { - if (!class_exists('Debugger')) { - require LIBS . 'debugger.php'; - } $data = array( 'level' => $log, 'code' => $code, @@ -162,14 +160,8 @@ class ErrorHandler { ); return Debugger::getInstance()->outputError($data); } else { - if (!class_exists('CakeLog')) { - require LIBS . 'cake_log.php'; - } $message = $error . ' (' . $code . '): ' . $description . ' in [' . $file . ', line ' . $line . ']'; if (!empty($errorConfig['trace'])) { - if (!class_exists('Debugger')) { - require LIBS . 'debugger.php'; - } $trace = Debugger::trace(array('start' => 1, 'format' => 'log')); $message .= "\nTrace:\n" . $trace . "\n"; } diff --git a/cake/libs/error/exception_renderer.php b/lib/Cake/Error/ExceptionRenderer.php similarity index 96% rename from cake/libs/error/exception_renderer.php rename to lib/Cake/Error/ExceptionRenderer.php index 328fffd8d..761aae0c4 100644 --- a/cake/libs/error/exception_renderer.php +++ b/lib/Cake/Error/ExceptionRenderer.php @@ -19,6 +19,10 @@ * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ + +App::uses('Sanitize', 'Utility'); +App::uses('Router', 'Routing'); + /** * Exception Renderer. * @@ -86,8 +90,6 @@ class ExceptionRenderer { * @param array $messages Error messages */ function __construct(Exception $exception) { - App::import('Core', 'Sanitize'); - $this->controller = $this->_getController($exception); if (method_exists($this->controller, 'apperror')) { @@ -142,7 +144,7 @@ class ExceptionRenderer { */ protected function _getController($exception) { static $__previousError = null; - App::import('Controller', 'CakeError'); + App::uses('CakeErrorController', 'Controller'); if ($__previousError != $exception) { $__previousError = $exception; @@ -193,7 +195,7 @@ class ExceptionRenderer { public function error400($error) { $message = $error->getMessage(); if (Configure::read('debug') == 0 && $error instanceof CakeException) { - $message = __('Not Found'); + $message = __d('cake', 'Not Found'); } $url = $this->controller->request->here(); $this->controller->response->statusCode($error->getCode()); @@ -215,7 +217,7 @@ class ExceptionRenderer { $code = ($error->getCode() > 500) ? $error->getCode() : 500; $this->controller->response->statusCode($code); $this->controller->set(array( - 'name' => __('An Internal Error Has Occurred'), + 'name' => __d('cake', 'An Internal Error Has Occurred'), 'message' => h($url), 'error' => $error, )); diff --git a/cake/libs/error/exceptions.php b/lib/Cake/Error/exceptions.php similarity index 88% rename from cake/libs/error/exceptions.php rename to lib/Cake/Error/exceptions.php index 7baa957c1..d178005b6 100644 --- a/cake/libs/error/exceptions.php +++ b/lib/Cake/Error/exceptions.php @@ -20,12 +20,14 @@ /** * Parent class for all of the HTTP related exceptions in CakePHP. - * All HTTP status/error related exceptions should extend this class so + * All HTTP status/error related exceptions should extend this class so * catch blocks can be specifically typed. * * @package cake.libs */ -class HttpException extends RuntimeException { } +if (!class_exists('HttpException')) { + class HttpException extends RuntimeException { } +} /** * Represents an HTTP 400 error. @@ -182,7 +184,7 @@ class CakeException extends RuntimeException { public function __construct($message, $code = 500) { if (is_array($message)) { $this->_attributes = $message; - $message = __($this->_messageTemplate, $message); + $message = __d('cake_dev', $this->_messageTemplate, $message); } parent::__construct($message, $code); } @@ -198,12 +200,12 @@ class CakeException extends RuntimeException { } /** - * Missing Controller exception - used when a controller + * Missing Controller exception - used when a controller * cannot be found. * * @package cake.libs */ -class MissingControllerException extends CakeException { +class MissingControllerException extends CakeException { protected $_messageTemplate = 'Controller class %s could not be found.'; public function __construct($message, $code = 404) { @@ -212,12 +214,12 @@ class MissingControllerException extends CakeException { } /** - * Missing Action exception - used when a controller action + * Missing Action exception - used when a controller action * cannot be found. * * @package cake.libs */ -class MissingActionException extends CakeException { +class MissingActionException extends CakeException { protected $_messageTemplate = 'Action %s::%s() could not be found.'; public function __construct($message, $code = 404) { @@ -225,12 +227,12 @@ class MissingActionException extends CakeException { } } /** - * Private Action exception - used when a controller action + * Private Action exception - used when a controller action * is protected, or starts with a `_`. * * @package cake.libs */ -class PrivateActionException extends CakeException { +class PrivateActionException extends CakeException { protected $_messageTemplate = 'Private Action %s::%s() is not directly accessible.'; public function __construct($message, $code = 404, Exception $previous = null) { @@ -243,7 +245,7 @@ class PrivateActionException extends CakeException { * * @package cake.libs */ -class MissingComponentFileException extends CakeException { +class MissingComponentFileException extends CakeException { protected $_messageTemplate = 'Component File "%s" is missing.'; } @@ -252,7 +254,7 @@ class MissingComponentFileException extends CakeException { * * @package cake.libs */ -class MissingComponentClassException extends CakeException { +class MissingComponentClassException extends CakeException { protected $_messageTemplate = 'Component class "%s" is missing.'; } @@ -275,7 +277,7 @@ class MissingBehaviorClassException extends CakeException { } * * @package cake.libs */ -class MissingViewException extends CakeException { +class MissingViewException extends CakeException { protected $_messageTemplate = 'View file "%s" is missing.'; } @@ -284,7 +286,7 @@ class MissingViewException extends CakeException { * * @package cake.libs */ -class MissingLayoutException extends CakeException { +class MissingLayoutException extends CakeException { protected $_messageTemplate = 'Layout file "%s" is missing.'; } @@ -293,7 +295,7 @@ class MissingLayoutException extends CakeException { * * @package cake.libs */ -class MissingHelperFileException extends CakeException { +class MissingHelperFileException extends CakeException { protected $_messageTemplate = 'Helper File "%s" is missing.'; } @@ -302,7 +304,7 @@ class MissingHelperFileException extends CakeException { * * @package cake.libs */ -class MissingHelperClassException extends CakeException { +class MissingHelperClassException extends CakeException { protected $_messageTemplate = 'Helper class "%s" is missing.'; } @@ -330,7 +332,7 @@ class MissingConnectionException extends CakeException { * * @package cake.libs */ -class MissingTaskFileException extends CakeException { +class MissingTaskFileException extends CakeException { protected $_messageTemplate = 'Task file "%s" is missing.'; } @@ -339,7 +341,7 @@ class MissingTaskFileException extends CakeException { * * @package cake.libs */ -class MissingTaskClassException extends CakeException { +class MissingTaskClassException extends CakeException { protected $_messageTemplate = 'Task class "%s" is missing.'; } @@ -348,7 +350,7 @@ class MissingTaskClassException extends CakeException { * * @package cake.libs */ -class MissingShellMethodException extends CakeException { +class MissingShellMethodException extends CakeException { protected $_messageTemplate = "Unknown command %1\$s %2\$s.\nFor usage try `cake %1\$s --help`"; } @@ -357,7 +359,7 @@ class MissingShellMethodException extends CakeException { * * @package cake.libs */ -class MissingShellClassException extends CakeException { +class MissingShellClassException extends CakeException { protected $_messageTemplate = "Shell class %s could not be loaded."; } @@ -366,7 +368,7 @@ class MissingShellClassException extends CakeException { * * @package cake.libs */ -class MissingShellFileException extends CakeException { +class MissingShellFileException extends CakeException { protected $_messageTemplate = "Shell file %s could not be loaded."; } @@ -406,6 +408,15 @@ class MissingModelException extends CakeException { protected $_messageTemplate = 'Model %s could not be found.'; } +/** + * Exception Raised when a test loader could not be found + * + * @package cake.libs + */ +class MissingTestLoaderException extends CakeException { + protected $_messageTemplate = 'Test loader %s could not be found.'; +} + /** * Exception class for Cache. This exception will be thrown from Cache when it @@ -470,4 +481,3 @@ class XmlException extends CakeException { } * @package cake.libs */ class ConsoleException extends CakeException { } - diff --git a/cake/libs/i18n.php b/lib/Cake/I18n/I18n.php similarity index 99% rename from cake/libs/i18n.php rename to lib/Cake/I18n/I18n.php index b140790d4..e05e1bcdc 100644 --- a/cake/libs/i18n.php +++ b/lib/Cake/I18n/I18n.php @@ -20,8 +20,8 @@ /** * Included libraries. */ -App::import('Core', 'L10n'); -App::import('Core', 'Multibyte'); +App::uses('L10n', 'I18n'); +App::uses('Multibyte', 'I18n'); /** * I18n handles translation of Text and time format strings. @@ -99,7 +99,7 @@ class I18n { /** * Used by the translation functions in basics.php - * Can also be used like I18n::translate(); but only if the App::import('I18n'); has been used to load the class. + * Returns a translated string based on current language and translation files stored in locale folder * * @param string $singular String to translate * @param string $plural Plural string (if any) diff --git a/cake/libs/l10n.php b/lib/Cake/I18n/L10n.php similarity index 99% rename from cake/libs/l10n.php rename to lib/Cake/I18n/L10n.php index 2da41af34..c9bef1e79 100644 --- a/cake/libs/l10n.php +++ b/lib/Cake/I18n/L10n.php @@ -16,7 +16,7 @@ * @since CakePHP(tm) v 1.2.0.4116 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Core', 'CakeRequest'); +App::uses('CakeRequest', 'Network'); /** * Localization diff --git a/cake/libs/multibyte.php b/lib/Cake/I18n/Multibyte.php similarity index 99% rename from cake/libs/multibyte.php rename to lib/Cake/I18n/Multibyte.php index 123d3d11b..9ad06c093 100644 --- a/cake/libs/multibyte.php +++ b/lib/Cake/I18n/Multibyte.php @@ -1076,7 +1076,7 @@ class Multibyte { return null; } if (!Configure::configured('_cake_core_')) { - App::import('Core', 'config/PhpReader'); + App::uses('PhpReader', 'Configure'); Configure::config('_cake_core_', new PhpReader(CAKE . 'config' . DS)); } Configure::load('unicode' . DS . 'casefolding' . DS . $range, '_cake_core_'); diff --git a/cake/LICENSE.txt b/lib/Cake/LICENSE.txt similarity index 100% rename from cake/LICENSE.txt rename to lib/Cake/LICENSE.txt diff --git a/cake/libs/cake_log.php b/lib/Cake/Log/CakeLog.php similarity index 85% rename from cake/libs/cake_log.php rename to lib/Cake/Log/CakeLog.php index 53b29af93..8305d4fba 100644 --- a/cake/libs/cake_log.php +++ b/lib/Cake/Log/CakeLog.php @@ -36,22 +36,6 @@ define('LOG_INFO', 6); } -/** - * CakeLogStreamInterface is the interface that should be implemented - * by all classes that are going to be used as Log streams. - * - * @package cake.libs - */ -interface CakeLogInterface { -/** - * Write method to handle writes being made to the Logger - * - * @param string $type - * @param string $message - * @return void - */ - public function write($type, $message); -} /** * Logs messages to configured Log adapters. One or more adapters can be configured @@ -98,7 +82,7 @@ class CakeLog { */ public static function config($key, $config) { if (empty($config['engine'])) { - throw new CakeLogException(__('Missing logger classname')); + throw new CakeLogException(__d('cake_dev', 'Missing logger classname')); } $loggerName = $config['engine']; unset($config['engine']); @@ -106,7 +90,7 @@ class CakeLog { $logger = new $className($config); if (!$logger instanceof CakeLogInterface) { throw new CakeLogException(sprintf( - __('logger class %s does not implement a write method.'), $loggerName + __d('cake_dev', 'logger class %s does not implement a write method.'), $loggerName )); } self::$_streams[$key] = $logger; @@ -121,17 +105,11 @@ class CakeLog { * @return mixed boolean false on any failures, string of classname to use if search was successful. */ protected static function _getLogger($loggerName) { - list($plugin, $loggerName) = pluginSplit($loggerName); + list($plugin, $loggerName) = pluginSplit($loggerName, true); - if ($plugin) { - App::import('Lib', $plugin . '.log/' . $loggerName); - } else { - if (!App::import('Lib', 'log/' . $loggerName)) { - App::import('Core', 'log/' . $loggerName); - } - } + App::uses($loggerName, $plugin . 'Log/Engine'); if (!class_exists($loggerName)) { - throw new CakeLogException(__('Could not load class %s', $loggerName)); + throw new CakeLogException(__d('cake_dev', 'Could not load class %s', $loggerName)); } return $loggerName; } @@ -162,9 +140,7 @@ class CakeLog { * @return void */ protected static function _autoConfig() { - if (!class_exists('FileLog')) { - App::import('Core', 'log/FileLog'); - } + self::_getLogger('FileLog'); self::$_streams['default'] = new FileLog(array('path' => LOGS)); } @@ -219,4 +195,4 @@ class CakeLog { } return true; } -} \ No newline at end of file +} diff --git a/lib/Cake/Log/CakeLogInterface.php b/lib/Cake/Log/CakeLogInterface.php new file mode 100644 index 000000000..0b2cd1a3c --- /dev/null +++ b/lib/Cake/Log/CakeLogInterface.php @@ -0,0 +1,18 @@ + $name, 'alias' => $name)); if (empty($model)) { - trigger_error(__("Model class '%s' not found in AclNode::node() when trying to bind %s object", $type, $this->alias), E_USER_WARNING); + trigger_error(__d('cake_dev', "Model class '%s' not found in AclNode::node() when trying to bind %s object", $type, $this->alias), E_USER_WARNING); return null; } @@ -181,141 +178,9 @@ class AclNode extends AppModel { $result = $db->read($this, $queryData, -1); if (!$result) { - trigger_error(__("AclNode::node() - Couldn't find %s node identified by \"%s\"", $type, print_r($ref, true)), E_USER_WARNING); + trigger_error(__d('cake_dev', "AclNode::node() - Couldn't find %s node identified by \"%s\"", $type, print_r($ref, true)), E_USER_WARNING); } } return $result; } } - -/** - * Access Control Object - * - * @package cake.libs.model - */ -class Aco extends AclNode { - -/** - * Model name - * - * @var string - * @access public - */ - public $name = 'Aco'; - -/** - * Binds to ARO nodes through permissions settings - * - * @var array - * @access public - */ - public $hasAndBelongsToMany = array('Aro' => array('with' => 'Permission')); -} - -/** - * Action for Access Control Object - * - * @package cake.libs.model - */ -class AcoAction extends AppModel { - -/** - * Model name - * - * @var string - * @access public - */ - public $name = 'AcoAction'; - -/** - * ACO Actions belong to ACOs - * - * @var array - * @access public - */ - public $belongsTo = array('Aco'); -} - -/** - * Access Request Object - * - * @package cake.libs.model - */ -class Aro extends AclNode { - -/** - * Model name - * - * @var string - * @access public - */ - public $name = 'Aro'; - -/** - * AROs are linked to ACOs by means of Permission - * - * @var array - * @access public - */ - public $hasAndBelongsToMany = array('Aco' => array('with' => 'Permission')); -} - -/** - * Permissions linking AROs with ACOs - * - * @package cake.libs.model - */ -class Permission extends AppModel { - -/** - * Model name - * - * @var string - * @access public - */ - public $name = 'Permission'; - -/** - * Explicitly disable in-memory query caching - * - * @var boolean - * @access public - */ - public $cacheQueries = false; - -/** - * Override default table name - * - * @var string - * @access public - */ - public $useTable = 'aros_acos'; - -/** - * Permissions link AROs with ACOs - * - * @var array - * @access public - */ - public $belongsTo = array('Aro', 'Aco'); - -/** - * No behaviors for this model - * - * @var array - * @access public - */ - public $actsAs = null; - -/** - * Constructor, used to tell this model to use the - * database configured for ACL - */ - function __construct() { - $config = Configure::read('Acl.database'); - if (!empty($config)) { - $this->useDbConfig = $config; - } - parent::__construct(); - } -} diff --git a/lib/Cake/Model/Aco.php b/lib/Cake/Model/Aco.php new file mode 100644 index 000000000..f8a92bcf4 --- /dev/null +++ b/lib/Cake/Model/Aco.php @@ -0,0 +1,48 @@ + array('with' => 'Permission')); +} \ No newline at end of file diff --git a/lib/Cake/Model/AcoAction.php b/lib/Cake/Model/AcoAction.php new file mode 100644 index 000000000..fe9734228 --- /dev/null +++ b/lib/Cake/Model/AcoAction.php @@ -0,0 +1,48 @@ + array('with' => 'Permission')); +} diff --git a/cake/libs/model/behaviors/acl.php b/lib/Cake/Model/Behavior/AclBehavior.php similarity index 97% rename from cake/libs/model/behaviors/acl.php rename to lib/Cake/Model/Behavior/AclBehavior.php index 6a347bba6..ae72d960e 100644 --- a/cake/libs/model/behaviors/acl.php +++ b/lib/Cake/Model/Behavior/AclBehavior.php @@ -58,7 +58,7 @@ class AclBehavior extends ModelBehavior { $model->{$type} = ClassRegistry::init($type); } if (!method_exists($model, 'parentNode')) { - trigger_error(__('Callback parentNode() not defined in %s', $model->alias), E_USER_WARNING); + trigger_error(__d('cake_dev', 'Callback parentNode() not defined in %s', $model->alias), E_USER_WARNING); } } diff --git a/cake/libs/model/behaviors/containable.php b/lib/Cake/Model/Behavior/ContainableBehavior.php similarity index 99% rename from cake/libs/model/behaviors/containable.php rename to lib/Cake/Model/Behavior/ContainableBehavior.php index 03963a723..3c76f2a73 100644 --- a/cake/libs/model/behaviors/containable.php +++ b/lib/Cake/Model/Behavior/ContainableBehavior.php @@ -359,7 +359,7 @@ class ContainableBehavior extends ModelBehavior { if (!isset($Model->{$name}) || !is_object($Model->{$name})) { if ($throwErrors) { - trigger_error(__('Model "%s" is not associated with model "%s"', $Model->alias, $name), E_USER_WARNING); + trigger_error(__d('cake_dev', 'Model "%s" is not associated with model "%s"', $Model->alias, $name), E_USER_WARNING); } continue; } diff --git a/cake/libs/model/behaviors/translate.php b/lib/Cake/Model/Behavior/TranslateBehavior.php similarity index 98% rename from cake/libs/model/behaviors/translate.php rename to lib/Cake/Model/Behavior/TranslateBehavior.php index ff7c9bdc5..48c3d36e3 100644 --- a/cake/libs/model/behaviors/translate.php +++ b/lib/Cake/Model/Behavior/TranslateBehavior.php @@ -17,6 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +App::uses('I18n', 'I18n'); + /** * Translate behavior * @@ -53,7 +55,7 @@ class TranslateBehavior extends ModelBehavior { $db = ConnectionManager::getDataSource($model->useDbConfig); if (!$db->connected) { trigger_error( - __('Datasource %s for TranslateBehavior of model %s is not connected', $model->useDbConfig, $model->alias), + __d('cake_dev', 'Datasource %s for TranslateBehavior of model %s is not connected', $model->useDbConfig, $model->alias), E_USER_ERROR ); return false; @@ -335,9 +337,6 @@ class TranslateBehavior extends ModelBehavior { */ protected function _getLocale($model) { if (!isset($model->locale) || is_null($model->locale)) { - if (!class_exists('I18n')) { - App::import('Core', 'i18n'); - } $I18n = I18n::getInstance(); $I18n->l10n->get(Configure::read('Config.language')); $model->locale = $I18n->l10n->locale; @@ -427,7 +426,7 @@ class TranslateBehavior extends ModelBehavior { foreach (array('hasOne', 'hasMany', 'belongsTo', 'hasAndBelongsToMany') as $type) { if (isset($model->{$type}[$association]) || isset($model->__backAssociation[$type][$association])) { trigger_error( - __('Association %s is already binded to model %s', $association, $model->alias), + __d('cake_dev', 'Association %s is already binded to model %s', $association, $model->alias), E_USER_ERROR ); return false; diff --git a/cake/libs/model/behaviors/tree.php b/lib/Cake/Model/Behavior/TreeBehavior.php similarity index 100% rename from cake/libs/model/behaviors/tree.php rename to lib/Cake/Model/Behavior/TreeBehavior.php diff --git a/cake/libs/model/behavior_collection.php b/lib/Cake/Model/BehaviorCollection.php similarity index 94% rename from cake/libs/model/behavior_collection.php rename to lib/Cake/Model/BehaviorCollection.php index 8bd92198f..82cb3ed77 100644 --- a/cake/libs/model/behavior_collection.php +++ b/lib/Cake/Model/BehaviorCollection.php @@ -18,6 +18,9 @@ * @since CakePHP(tm) v 1.2.0.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ + +App::uses('ObjectCollection', 'Utility'); + /** * Model behavior collection class. * @@ -94,26 +97,21 @@ class BehaviorCollection extends ObjectCollection { * @param string $behavior CamelCased name of the behavior to load * @param array $config Behavior configuration parameters * @return boolean True on success, false on failure - * @throws MissingBehaviorFileException or MissingBehaviorClassException when a behavior could not be found. + * @throws MissingBehaviorClassException when a behavior could not be found. */ public function load($behavior, $config = array()) { if (is_array($config) && isset($config['className'])) { $alias = $behavior; $behavior = $config['className']; } - list($plugin, $name) = pluginSplit($behavior); + list($plugin, $name) = pluginSplit($behavior, true); if (!isset($alias)) { $alias = $name; } $class = $name . 'Behavior'; - if (!App::import('Behavior', $behavior)) { - throw new MissingBehaviorFileException(array( - 'file' => Inflector::underscore($behavior) . '.php', - 'class' => $class - )); - } + App::uses($class, $plugin . 'Model/Behavior'); if (!class_exists($class)) { throw new MissingBehaviorClassException(array( 'file' => Inflector::underscore($behavior) . '.php', @@ -221,7 +219,7 @@ class BehaviorCollection extends ObjectCollection { $method = $this->hasMethod($method, true); if ($strict && empty($method)) { - trigger_error(__("BehaviorCollection::dispatchMethod() - Method %s not found in any attached behavior", $method), E_USER_WARNING); + trigger_error(__d('cake_dev', "BehaviorCollection::dispatchMethod() - Method %s not found in any attached behavior", $method), E_USER_WARNING); return null; } if (empty($method)) { diff --git a/cake/libs/model/cake_schema.php b/lib/Cake/Model/CakeSchema.php similarity index 96% rename from cake/libs/model/cake_schema.php rename to lib/Cake/Model/CakeSchema.php index 5579540b0..67f1cb87a 100644 --- a/cake/libs/model/cake_schema.php +++ b/lib/Cake/Model/CakeSchema.php @@ -16,8 +16,9 @@ * @since CakePHP(tm) v 1.2.0.5550 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Core', 'Model'); -App::import('Core', 'ConnectionManager'); +App::uses('Model', 'Model'); +App::uses('AppModel', 'Model'); +App::uses('ConnectionManager', 'Model'); /** * Base Class for Schema management @@ -204,9 +205,8 @@ class CakeSchema extends Object { )); $db = ConnectionManager::getDataSource($connection); - App::import('Model', 'AppModel'); if (isset($this->plugin)) { - App::import('Model', Inflector::camelize($this->plugin) . 'AppModel'); + App::uses(Inflector::camelize($this->plugin) . 'AppModel', $this->plugin . '.Model'); } $tables = array(); @@ -219,21 +219,29 @@ class CakeSchema extends Object { if (!is_array($models) && $models !== false) { if (isset($this->plugin)) { - $models = App::objects('model', App::pluginPath($this->plugin) . 'models' . DS, false); + $models = App::objects($this->plugin . '.Model', null, false); } else { - $models = App::objects('model'); + $models = App::objects('Model'); } } if (is_array($models)) { foreach ($models as $model) { $importModel = $model; + $plugin = null; if (isset($this->plugin)) { - $importModel = $this->plugin . '.' . $model; + if ($model == $this->plugin . 'AppModel') { + continue; + } + $importModel = $model; + $plugin = $this->plugin . '.'; } - if (!App::import('Model', $importModel)) { + + App::uses($importModel, $plugin . 'Model'); + if (!class_exists($importModel)) { continue; } + $vars = get_class_vars($model); if (empty($vars['useDbConfig']) || $vars['useDbConfig'] != $connection) { continue; @@ -584,7 +592,7 @@ class CakeSchema extends Object { $value['key'] = 'primary'; } if (!isset($db->columns[$value['type']])) { - trigger_error(__('Schema generation error: invalid column type %s does not exist in DBO', $value['type']), E_USER_NOTICE); + trigger_error(__d('cake_dev', 'Schema generation error: invalid column type %s does not exist in DBO', $value['type']), E_USER_NOTICE); continue; } else { $defaultCol = $db->columns[$value['type']]; diff --git a/cake/libs/model/connection_manager.php b/lib/Cake/Model/ConnectionManager.php similarity index 54% rename from cake/libs/model/connection_manager.php rename to lib/Cake/Model/ConnectionManager.php index 568b203a2..0f0ac3435 100644 --- a/cake/libs/model/connection_manager.php +++ b/lib/Cake/Model/ConnectionManager.php @@ -18,7 +18,8 @@ * @since CakePHP(tm) v 0.10.x.1402 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -require LIBS . 'model' . DS . 'datasources' . DS . 'datasource.php'; + +App::uses('DataSource', 'Model/Datasource'); config('database'); /** @@ -34,7 +35,7 @@ class ConnectionManager { * @var DATABASE_CONFIG * @access public */ - public $config = null; + public static $config = null; /** * Holds instances DataSource objects @@ -42,7 +43,7 @@ class ConnectionManager { * @var array * @access protected */ - protected $_dataSources = array(); + protected static $_dataSources = array(); /** * Contains a list of all file and class names used in Connection settings @@ -50,32 +51,26 @@ class ConnectionManager { * @var array * @access protected */ - protected $_connectionsEnum = array(); + protected static $_connectionsEnum = array(); /** - * Constructor. + * Indicates if the init code for this class has alredy been executed + * + * @var boolean + */ + private static $_init = false; + +/** + * Loads connections configuration. * */ - function __construct() { + private static function init() { + include_once CONFIGS . 'database.php'; if (class_exists('DATABASE_CONFIG')) { - $this->config = new DATABASE_CONFIG(); - $this->_getConnectionObjects(); + self::$config = new DATABASE_CONFIG(); } - } - -/** - * Gets a reference to the ConnectionManger object instance - * - * @return object Instance - */ - public static function &getInstance() { - static $instance = array(); - - if (!$instance) { - $instance[0] = new ConnectionManager(); - } - - return $instance[0]; + register_shutdown_function('ConnectionManager::shutdown'); + self::$_init = true; } /** @@ -87,23 +82,27 @@ class ConnectionManager { * @throws MissingDatasourceFileException */ public static function getDataSource($name) { - $_this = ConnectionManager::getInstance(); - - if (!empty($_this->_dataSources[$name])) { - return $_this->_dataSources[$name]; + if (empty(self::$_init)) { + self::init(); } - if (empty($_this->_connectionsEnum[$name])) { - throw new MissingDatasourceConfigException(array('config' => $name)); + if (!empty(self::$_dataSources[$name])) { + $return = self::$_dataSources[$name]; + return $return; } - $conn = $_this->_connectionsEnum[$name]; + + if (empty(self::$_connectionsEnum[$name])) { + self::_getConnectionObject($name); + } + + self::loadDataSource($name); + $conn = self::$_connectionsEnum[$name]; $class = $conn['classname']; - $_this->loadDataSource($name); - $_this->_dataSources[$name] = new $class($_this->config->{$name}); - $_this->_dataSources[$name]->configKeyName = $name; + self::$_dataSources[$name] = new $class(self::$config->{$name}); + self::$_dataSources[$name]->configKeyName = $name; - return $_this->_dataSources[$name]; + return self::$_dataSources[$name]; } /** @@ -112,8 +111,10 @@ class ConnectionManager { * @return array List of available connections */ public static function sourceList() { - $_this = ConnectionManager::getInstance(); - return array_keys($_this->_dataSources); + if (empty(self::$_init)) { + self::init(); + } + return array_keys(self::$_dataSources); } /** @@ -124,9 +125,11 @@ class ConnectionManager { * in the ConnectionManager. */ public static function getSourceName($source) { - $_this = ConnectionManager::getInstance(); - foreach ($_this->_dataSources as $name => $ds) { - if ($ds == $source) { + if (empty(self::$_init)) { + self::init(); + } + foreach (self::$_dataSources as $name => $ds) { + if ($ds === $source) { return $name; } } @@ -143,27 +146,31 @@ class ConnectionManager { * @throws MissingDatasourceFileException */ public static function loadDataSource($connName) { - $_this = ConnectionManager::getInstance(); + if (empty(self::$_init)) { + self::init(); + } if (is_array($connName)) { $conn = $connName; } else { - $conn = $_this->_connectionsEnum[$connName]; + $conn = self::$_connectionsEnum[$connName]; } - if (class_exists($conn['classname'])) { + if (class_exists($conn['classname'], false)) { return false; } - if (!empty($conn['parent'])) { - $_this->loadDataSource($conn['parent']); + $plugin = $package = null; + if (!empty($conn['plugin'])) { + $plugin = $conn['plugin'] . '.'; + } + if (!empty($conn['package'])) { + $package = '/' . $conn['package']; } - $conn = array_merge(array('plugin' => null, 'classname' => null, 'parent' => null), $conn); - $class = "{$conn['plugin']}.{$conn['classname']}"; - - if (!App::import('Datasource', $class, !is_null($conn['plugin']))) { - throw new MissingDatasourceFileException(array('class' => $conn['classname'], 'plugin' => $conn['plugin'])); + App::uses($conn['classname'], $plugin . 'Model/Datasource' . $package); + if (!class_exists($conn['classname'])) { + throw new MissingDatasourceFileException(array('class' => $conn['classname'], 'plugin' => $plugin)); } return true; } @@ -175,8 +182,10 @@ class ConnectionManager { * (as defined in Connections), and the value is an array with keys 'filename' and 'classname'. */ public static function enumConnectionObjects() { - $_this = ConnectionManager::getInstance(); - return $_this->_connectionsEnum; + if (empty(self::$_init)) { + self::init(); + } + return (array) self::$config; } /** @@ -186,16 +195,18 @@ class ConnectionManager { * @param array $config The DataSource configuration settings * @return object A reference to the DataSource object, or null if creation failed */ - public static function &create($name = '', $config = array()) { - $_this = ConnectionManager::getInstance(); + public static function create($name = '', $config = array()) { + if (empty(self::$_init)) { + self::init(); + } - if (empty($name) || empty($config) || array_key_exists($name, $_this->_connectionsEnum)) { + if (empty($name) || empty($config) || array_key_exists($name, self::$_connectionsEnum)) { $null = null; return $null; } - $_this->config->{$name} = $config; - $_this->_connectionsEnum[$name] = $_this->__connectionData($config); - $return = $_this->getDataSource($name); + self::$config->{$name} = $config; + self::$_connectionsEnum[$name] = self::_connectionData($config); + $return = self::getDataSource($name); return $return; } @@ -204,15 +215,11 @@ class ConnectionManager { * * @return void */ - protected function _getConnectionObjects() { - $connections = get_object_vars($this->config); - - if ($connections != null) { - foreach ($connections as $name => $config) { - $this->_connectionsEnum[$name] = $this->__connectionData($config); - } + protected static function _getConnectionObject($name) { + if (!empty(self::$config->{$name})) { + self::$_connectionsEnum[$name] = self::_connectionData(self::$config->{$name}); } else { - throw new MissingConnectionException(array('class' => 'ConnectionManager')); + throw new MissingDatasourceConfigException(array('config' => $name)); } } @@ -221,44 +228,22 @@ class ConnectionManager { * * @return array An indexed array with: filename, classname, plugin and parent */ - private function __connectionData($config) { - if (!isset($config['datasource'])) { - $config['datasource'] = 'dbo'; - } - $filename = $classname = $parent = $plugin = null; + private static function _connectionData($config) { + $package = $classname = $plugin = null; - if (!empty($config['driver'])) { - $parent = $this->__connectionData(array('datasource' => $config['datasource'])); - $parentSource = preg_replace('/_source$/', '', $parent['filename']); - - list($plugin, $classname) = pluginSplit($config['driver']); - if ($plugin) { - $source = Inflector::underscore($classname); - } else { - $source = $parentSource . '_' . $config['driver']; - $classname = Inflector::camelize(strtolower($source)); - } - $filename = $parentSource . DS . $source; - } else { - list($plugin, $classname) = pluginSplit($config['datasource']); - if ($plugin) { - $filename = Inflector::underscore($classname); - } else { - $filename = Inflector::underscore($config['datasource']); - } - if (substr($filename, -7) != '_source') { - $filename .= '_source'; - } - $classname = Inflector::camelize(strtolower($filename)); + list($plugin, $classname) = pluginSplit($config['datasource']); + if (strpos($classname, '/') !== false) { + $package = dirname($classname); + $classname = basename($classname); } - return compact('filename', 'classname', 'parent', 'plugin'); + return compact('package', 'classname', 'plugin'); } /** * Destructor. * */ - function __destruct() { + public static function shutdown() { if (Configure::read('Session.defaults') == 'database' && function_exists('session_write_close')) { session_write_close(); } diff --git a/cake/libs/cake_session.php b/lib/Cake/Model/Datasource/CakeSession.php similarity index 95% rename from cake/libs/cake_session.php rename to lib/Cake/Model/Datasource/CakeSession.php index ec7a86b27..d8219c448 100644 --- a/cake/libs/cake_session.php +++ b/lib/Cake/Model/Datasource/CakeSession.php @@ -21,9 +21,9 @@ * @since CakePHP(tm) v .0.10.0.1222 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -if (!class_exists('Security')) { - App::import('Core', 'Security'); -} + +App::uses('Set', 'Utility'); +App::uses('Security', 'Utility'); /** * Session class for Cake. @@ -254,7 +254,7 @@ class CakeSession { self::__overwrite($_SESSION, Set::remove($_SESSION, $name)); return (self::check($name) == false); } - self::__setError(2, __("%s doesn't exist", $name)); + self::__setError(2, __d('cake_dev', "%s doesn't exist", $name)); return false; } @@ -331,11 +331,12 @@ class CakeSession { * @return boolean */ protected static function _validAgentAndTime() { + $config = self::read('Config'); $validAgent = ( Configure::read('Session.checkAgent') === false || - self::$_userAgent == self::read('Config.userAgent') + self::$_userAgent == $config['userAgent'] ); - return ($validAgent && self::$time <= self::read('Config.time')); + return ($validAgent && self::$time <= $config['time']); } /** @@ -479,7 +480,7 @@ class CakeSession { foreach ($sessionConfig['ini'] as $setting => $value) { if (ini_set($setting, $value) === false) { throw new CakeSessionException(sprintf( - __('Unable to configure the session, setting %s failed.'), + __d('cake_dev', 'Unable to configure the session, setting %s failed.'), $setting )); } @@ -511,18 +512,15 @@ class CakeSession { */ protected static function _getHandler($handler) { list($plugin, $class) = pluginSplit($handler, true); - $found = App::import('Lib', $plugin . 'session/' . $class); - if (!$found) { - App::import('Core', 'session/' . $class); - } + App::uses($class, $plugin . 'Model/Datasource/Session'); if (!class_exists($class)) { - throw new CakeSessionException(__('Could not load %s to handle the session.', $class)); + throw new CakeSessionException(__d('cake_dev', 'Could not load %s to handle the session.', $class)); } $handler = new $class(); if ($handler instanceof CakeSessionHandlerInterface) { return $handler; } - throw new CakeSessionException(__('Chosen SessionHandler does not implement CakeSessionHandlerInterface it cannot be used with an engine key.')); + throw new CakeSessionException(__d('cake_dev', 'Chosen SessionHandler does not implement CakeSessionHandlerInterface it cannot be used with an engine key.')); } /** @@ -629,14 +627,14 @@ class CakeSession { self::$valid = false; return false; } - if (self::read('Config')) { + if ($config = self::read('Config')) { $sessionConfig = Configure::read('Session'); if (self::_validAgentAndTime()) { - $time = self::read('Config.time'); + $time = $config['time']; self::write('Config.time', self::$sessionTime); if (isset($sessionConfig['autoRegenerate']) && $sessionConfig['autoRegenerate'] === true) { - $check = self::read('Config.countdown'); + $check = $config['countdown']; $check -= 1; self::write('Config.countdown', $check); diff --git a/cake/libs/model/datasources/datasource.php b/lib/Cake/Model/Datasource/DataSource.php similarity index 100% rename from cake/libs/model/datasources/datasource.php rename to lib/Cake/Model/Datasource/DataSource.php diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/lib/Cake/Model/Datasource/Database/Mssql.php similarity index 99% rename from cake/libs/model/datasources/dbo/dbo_mssql.php rename to lib/Cake/Model/Datasource/Database/Mssql.php index 91db76c5f..b09e58a77 100644 --- a/cake/libs/model/datasources/dbo/dbo_mssql.php +++ b/lib/Cake/Model/Datasource/Database/Mssql.php @@ -116,7 +116,7 @@ class DboMssql extends DboSource { function __construct($config, $autoConnect = true) { if ($autoConnect) { if (!function_exists('mssql_min_message_severity')) { - trigger_error(__("PHP SQL Server interface is not installed, cannot continue. For troubleshooting information, see http://php.net/mssql/"), E_USER_WARNING); + trigger_error(__d('cake_dev', "PHP SQL Server interface is not installed, cannot continue. For troubleshooting information, see http://php.net/mssql/"), E_USER_WARNING); } mssql_min_message_severity(15); mssql_min_error_severity(2); diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/lib/Cake/Model/Datasource/Database/Mysql.php similarity index 99% rename from cake/libs/model/datasources/dbo/dbo_mysql.php rename to lib/Cake/Model/Datasource/Database/Mysql.php index 29c98c4a0..b7b9da0eb 100644 --- a/cake/libs/model/datasources/dbo/dbo_mysql.php +++ b/lib/Cake/Model/Datasource/Database/Mysql.php @@ -17,6 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +App::uses('DboSource', 'Model/Datasource'); + /** * MySQL DBO driver object * @@ -24,7 +26,7 @@ * * @package cake.libs.model.datasources.dbo */ -class DboMysql extends DboSource { +class Mysql extends DboSource { /** * Datasource description @@ -296,7 +298,7 @@ class DboMysql extends DboSource { $fields = false; $cols = $this->_execute('SHOW FULL COLUMNS FROM ' . $this->fullTableName($model)); if (!$cols) { - throw new CakeException(__('Could not describe table for %s', $model->name)); + throw new CakeException(__d('cake_dev', 'Could not describe table for %s', $model->name)); } foreach ($cols as $column) { diff --git a/cake/libs/model/datasources/dbo/dbo_oracle.php b/lib/Cake/Model/Datasource/Database/Oracle.php similarity index 99% rename from cake/libs/model/datasources/dbo/dbo_oracle.php rename to lib/Cake/Model/Datasource/Database/Oracle.php index 4b4444211..76dfe1e1c 100644 --- a/cake/libs/model/datasources/dbo/dbo_oracle.php +++ b/lib/Cake/Model/Datasource/Database/Oracle.php @@ -571,7 +571,7 @@ class DboOracle extends DboSource { */ function constraint($action, $table) { if (empty($table)) { - trigger_error(__('Must specify table to operate on constraints')); + trigger_error(__d('cake_dev', 'Must specify table to operate on constraints')); } $table = strtoupper($table); @@ -629,7 +629,7 @@ class DboOracle extends DboSource { return $constraints; break; default: - trigger_error(__('DboOracle::constraint() accepts only enable, disable, or list')); + trigger_error(__d('cake_dev', 'DboOracle::constraint() accepts only enable, disable, or list')); } } return true; @@ -976,7 +976,7 @@ class DboOracle extends DboSource { if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) { if (!isset($resultSet) || !is_array($resultSet)) { if (Configure::read('debug') > 0) { - echo '

' . __('SQL Error in model %s:', $model->alias) . ' '; + echo '
' . __d('cake_dev', 'SQL Error in model %s:', $model->alias) . ' '; if (isset($this->error) && $this->error != null) { echo $this->error; } diff --git a/cake/libs/model/datasources/dbo/dbo_postgres.php b/lib/Cake/Model/Datasource/Database/Postgres.php similarity index 99% rename from cake/libs/model/datasources/dbo/dbo_postgres.php rename to lib/Cake/Model/Datasource/Database/Postgres.php index 2b53aa1e5..b964d73ff 100644 --- a/cake/libs/model/datasources/dbo/dbo_postgres.php +++ b/lib/Cake/Model/Datasource/Database/Postgres.php @@ -17,6 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +App::uses('DboSource', 'Model/Datasource'); + /** * PostgreSQL layer for DBO. * @@ -24,7 +26,7 @@ * * @package cake.libs.model.datasources.dbo */ -class DboPostgres extends DboSource { +class Postgres extends DboSource { /** * Driver description diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/lib/Cake/Model/Datasource/Database/Sqlite.php similarity index 98% rename from cake/libs/model/datasources/dbo/dbo_sqlite.php rename to lib/Cake/Model/Datasource/Database/Sqlite.php index 6819adf9a..d4daa3aac 100644 --- a/cake/libs/model/datasources/dbo/dbo_sqlite.php +++ b/lib/Cake/Model/Datasource/Database/Sqlite.php @@ -17,6 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +App::uses('DboSource', 'Model/Datasource'); + /** * DBO implementation for the SQLite3 DBMS. * @@ -24,7 +26,7 @@ * * @package cake.libs.model.datasources.dbo */ -class DboSqlite extends DboSource { +class Sqlite extends DboSource { /** * Datasource Description @@ -229,7 +231,7 @@ class DboSqlite extends DboSource { */ function truncate($table) { $this->_execute('DELETE FROM sqlite_sequence where name=' . $this->fullTableName($table)); - return $this->execute('DELETE FROM ' . $this->fullTableName($table)); + return $this->execute('DELETE FROM ' . $this->fullTableName($table)); } /** @@ -385,12 +387,12 @@ class DboSqlite extends DboSource { extract($column); if (empty($name) || empty($type)) { - trigger_error('Column name or type not defined in schema', E_USER_WARNING); + trigger_error(__d('cake_dev', 'Column name or type not defined in schema'), E_USER_WARNING); return null; } if (!isset($this->columns[$type])) { - trigger_error(__('Column type %s does not exist', $type), E_USER_WARNING); + trigger_error(__d('cake_dev', 'Column type %s does not exist', $type), E_USER_WARNING); return null; } @@ -471,7 +473,7 @@ class DboSqlite extends DboSource { $table = $this->fullTableName($model); if ($table) { $indexes = $this->query('PRAGMA index_list(' . $table . ')'); - + if (is_bool($indexes)) { return array(); } @@ -552,4 +554,4 @@ class DboSqlite extends DboSource { } return $out; } -} +} \ No newline at end of file diff --git a/cake/libs/model/datasources/dbo_source.php b/lib/Cake/Model/Datasource/DboSource.php old mode 100755 new mode 100644 similarity index 99% rename from cake/libs/model/datasources/dbo_source.php rename to lib/Cake/Model/Datasource/DboSource.php index 1f85d0ac1..e46d77fff --- a/cake/libs/model/datasources/dbo_source.php +++ b/lib/Cake/Model/Datasource/DboSource.php @@ -16,7 +16,10 @@ * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Core', 'String'); + +App::uses('DataSource', 'Model/Datasource'); +App::uses('String', 'Utility'); +App::uses('View', 'View'); /** * DboSource @@ -889,7 +892,6 @@ class DboSource extends DataSource { return; } if (PHP_SAPI != 'cli') { - App::import('Core', 'View'); $controller = null; $View = new View($controller, false); $View->set('logs', array($this->configKeyName => $log)); @@ -939,11 +941,11 @@ class DboSource extends DataSource { if (Configure::read('debug') > 0) { $out = null; if ($error) { - trigger_error('' . __('SQL Error:') . " {$this->error}", E_USER_WARNING); + trigger_error('' . __d('cake_dev', 'SQL Error:') . " {$this->error}", E_USER_WARNING); } else { - $out = ('[' . __('Aff:%s Num:%s Took:%sms', $this->affected, $this->numRows, $this->took) . ']'); + $out = ('[' . __d('cake_dev', 'Aff:%s Num:%s Took:%sms', $this->affected, $this->numRows, $this->took) . ']'); } - pr(sprintf('

' . __('Query:') . ' %s %s

', $sql, $out)); + pr(sprintf('

' . __d('cake_dev', 'Query:') . ' %s %s

', $sql, $out)); } } @@ -1167,7 +1169,7 @@ class DboSource extends DataSource { if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) { if (!is_array($resultSet)) { if (Configure::read('debug') > 0) { - echo '
' . __('SQL Error in model %s:', $model->alias) . ' '; + echo '
' . __d('cake_dev', 'SQL Error in model %s:', $model->alias) . ' '; if (isset($this->error) && $this->error != null) { echo $this->error; } @@ -2723,7 +2725,7 @@ class DboSource extends DataSource { */ public function length($real) { if (!preg_match_all('/([\w\s]+)(?:\((\d+)(?:,(\d+))?\))?(\sunsigned)?(\szerofill)?/', $real, $result)) { - trigger_error(__("FIXME: Can't parse field: " . $real), E_USER_WARNING); + trigger_error(__d('cake_dev', "FIXME: Can't parse field: " . $real), E_USER_WARNING); $col = str_replace(array(')', 'unsigned'), '', $real); $limit = null; @@ -2831,7 +2833,7 @@ class DboSource extends DataSource { */ public function createSchema($schema, $tableName = null) { if (!is_a($schema, 'CakeSchema')) { - trigger_error(__('Invalid schema object'), E_USER_WARNING); + trigger_error(__d('cake_dev', 'Invalid schema object'), E_USER_WARNING); return null; } $out = ''; @@ -2913,12 +2915,12 @@ class DboSource extends DataSource { extract(array_merge(array('null' => true), $column)); if (empty($name) || empty($type)) { - trigger_error(__('Column name or type not defined in schema'), E_USER_WARNING); + trigger_error(__d('cake_dev', 'Column name or type not defined in schema'), E_USER_WARNING); return null; } if (!isset($this->columns[$type])) { - trigger_error(__('Column type %s does not exist', $type), E_USER_WARNING); + trigger_error(__d('cake_dev', 'Column type %s does not exist', $type), E_USER_WARNING); return null; } @@ -3144,4 +3146,4 @@ class DboSource extends DataSource { return false; } -} +} \ No newline at end of file diff --git a/cake/libs/session/cache_session.php b/lib/Cake/Model/Datasource/Session/CacheSession.php similarity index 100% rename from cake/libs/session/cache_session.php rename to lib/Cake/Model/Datasource/Session/CacheSession.php diff --git a/cake/libs/session/database_session.php b/lib/Cake/Model/Datasource/Session/DatabaseSession.php similarity index 100% rename from cake/libs/session/database_session.php rename to lib/Cake/Model/Datasource/Session/DatabaseSession.php diff --git a/cake/libs/model/model.php b/lib/Cake/Model/Model.php similarity index 99% rename from cake/libs/model/model.php rename to lib/Cake/Model/Model.php index 07863f79b..c1a1c5ae3 100644 --- a/cake/libs/model/model.php +++ b/lib/Cake/Model/Model.php @@ -22,12 +22,13 @@ /** * Included libs */ -App::import('Core', 'ClassRegistry', false); -App::import('Core', 'Validation', false); -App::import('Core', 'String', false); -App::import('Model', 'BehaviorCollection', false); -App::import('Model', 'ModelBehavior', false); -App::import('Model', 'ConnectionManager', false); +App::uses('ClassRegistry', 'Utility'); +App::uses('Validation', 'Utility'); +App::uses('String', 'Utility'); +App::uses('BehaviorCollection', 'Model'); +App::uses('ModelBehavior', 'Model'); +App::uses('ConnectionManager', 'Model'); +App::uses('Xml', 'Utility'); /** * Object-relational mapper. @@ -834,7 +835,6 @@ class Model extends Object { } if (is_object($one)) { if ($one instanceof SimpleXMLElement || $one instanceof DOMNode) { - App::import('Core', 'Xml'); $one = $this->_normalizeXmlData(Xml::toArray($one)); } else { $one = Set::reverse($one); @@ -1005,7 +1005,7 @@ class Model extends Object { public function getColumnTypes() { $columns = $this->schema(); if (empty($columns)) { - trigger_error(__('(Model::getColumnTypes) Unable to build model field data. If you are using a model without a database table, try implementing schema()'), E_USER_WARNING); + trigger_error(__d('cake_dev', '(Model::getColumnTypes) Unable to build model field data. If you are using a model without a database table, try implementing schema()'), E_USER_WARNING); } $cols = array(); foreach ($columns as $field => $values) { @@ -2602,7 +2602,7 @@ class Model extends Object { if (isset($validator['message'])) { $message = $validator['message']; } else { - $message = __('This field cannot be left blank'); + $message = __d('cake_dev', 'This field cannot be left blank'); } if ( @@ -2650,7 +2650,7 @@ class Model extends Object { } elseif (!is_array($validator['rule'])) { $valid = preg_match($rule, $data[$fieldName]); } elseif (Configure::read('debug') > 0) { - trigger_error(__('Could not find validation handler %s for %s', $rule, $fieldName), E_USER_WARNING); + trigger_error(__d('cake_dev', 'Could not find validation handler %s for %s', $rule, $fieldName), E_USER_WARNING); } if (!$valid || (is_string($valid) && strlen($valid) > 0)) { @@ -2957,7 +2957,7 @@ class Model extends Object { return array($with, array_unique(array_merge($assoc[$with], $keys))); } trigger_error( - __('Invalid join model settings in %s', $model->alias), + __d('cake_dev', 'Invalid join model settings in %s', $model->alias), E_USER_WARNING ); } diff --git a/cake/libs/model/model_behavior.php b/lib/Cake/Model/ModelBehavior.php similarity index 100% rename from cake/libs/model/model_behavior.php rename to lib/Cake/Model/ModelBehavior.php diff --git a/lib/Cake/Model/Permission.php b/lib/Cake/Model/Permission.php new file mode 100644 index 000000000..5ca0f0682 --- /dev/null +++ b/lib/Cake/Model/Permission.php @@ -0,0 +1,84 @@ +useDbConfig = $config; + } + parent::__construct(); + } +} \ No newline at end of file diff --git a/cake/libs/cake_request.php b/lib/Cake/Network/CakeRequest.php similarity index 99% rename from cake/libs/cake_request.php rename to lib/Cake/Network/CakeRequest.php index 90435ed8b..12dde4de8 100644 --- a/cake/libs/cake_request.php +++ b/lib/Cake/Network/CakeRequest.php @@ -16,6 +16,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +App::uses('Set', 'Utility'); + /** * A class that helps wrap Request information and particulars about a single request. * Provides methods commonly used to introspect on the request headers and request body. @@ -223,13 +225,14 @@ class CakeRequest implements ArrayAccess { $config = Configure::read('App'); extract($config); - if (!$base) { + if (empty($base)) { $base = $this->base; } if ($base !== false) { $this->webroot = $base . '/'; return $this->base = $base; } + if (!$baseUrl) { $base = dirname(env('SCRIPT_NAME')); @@ -377,7 +380,7 @@ class CakeRequest implements ArrayAccess { $type = strtolower(substr($name, 2)); return $this->is($type); } - throw new CakeException(__('Method %s does not exist', $name)); + throw new CakeException(__d('cake_dev', 'Method %s does not exist', $name)); } /** diff --git a/cake/libs/cake_response.php b/lib/Cake/Network/CakeResponse.php similarity index 99% rename from cake/libs/cake_response.php rename to lib/Cake/Network/CakeResponse.php index 9c200cbcb..e1abb8a3d 100644 --- a/cake/libs/cake_response.php +++ b/lib/Cake/Network/CakeResponse.php @@ -459,7 +459,7 @@ class CakeResponse { return $this->_status; } if (!isset($this->_statusCodes[$code])) { - throw new CakeException(__('Unknown status code')); + throw new CakeException(__d('cake_dev', 'Unknown status code')); } return $this->_status = $code; } diff --git a/cake/libs/cake_socket.php b/lib/Cake/Network/CakeSocket.php similarity index 98% rename from cake/libs/cake_socket.php rename to lib/Cake/Network/CakeSocket.php index 2a07a387a..4d6c2c720 100644 --- a/cake/libs/cake_socket.php +++ b/lib/Cake/Network/CakeSocket.php @@ -16,7 +16,7 @@ * @since CakePHP(tm) v 1.2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Core', 'Validation'); +App::uses('Validation', 'Utility'); /** * Cake network socket connection class. @@ -221,7 +221,7 @@ class CakeSocket { $buffer = fread($this->connection, $length); $info = stream_get_meta_data($this->connection); if ($info['timed_out']) { - $this->setLastError(E_WARNING, __('Connection timed out')); + $this->setLastError(E_WARNING, __d('cake_dev', 'Connection timed out')); return false; } return $buffer; diff --git a/cake/libs/http/basic_authentication.php b/lib/Cake/Network/Http/BasicAuthentication.php similarity index 100% rename from cake/libs/http/basic_authentication.php rename to lib/Cake/Network/Http/BasicAuthentication.php diff --git a/cake/libs/http/digest_authentication.php b/lib/Cake/Network/Http/DigestAuthentication.php similarity index 100% rename from cake/libs/http/digest_authentication.php rename to lib/Cake/Network/Http/DigestAuthentication.php diff --git a/cake/libs/http_response.php b/lib/Cake/Network/Http/HttpResponse.php similarity index 97% rename from cake/libs/http_response.php rename to lib/Cake/Network/Http/HttpResponse.php index 51aff7a78..04322547f 100644 --- a/cake/libs/http_response.php +++ b/lib/Cake/Network/Http/HttpResponse.php @@ -126,11 +126,11 @@ class HttpResponse implements ArrayAccess { */ public function parseResponse($message) { if (!is_string($message)) { - throw new SocketException(__('Invalid response.')); + throw new SocketException(__d('cake_dev', 'Invalid response.')); } if (!preg_match("/^(.+\r\n)(.*)(?<=\r\n)\r\n/Us", $message, $match)) { - throw new SocketException(__('Invalid HTTP response.')); + throw new SocketException(__d('cake_dev', 'Invalid HTTP response.')); } list(, $statusLine, $header) = $match; @@ -198,7 +198,7 @@ class HttpResponse implements ArrayAccess { while ($chunkLength !== 0) { if (!preg_match("/^([0-9a-f]+) *(?:;(.+)=(.+))?\r\n/iU", $body, $match)) { - throw new SocketException(__('HttpSocket::_decodeChunkedBody - Could not parse malformed chunk.')); + throw new SocketException(__d('cake_dev', 'HttpSocket::_decodeChunkedBody - Could not parse malformed chunk.')); } $chunkSize = 0; diff --git a/cake/libs/http_socket.php b/lib/Cake/Network/Http/HttpSocket.php similarity index 94% rename from cake/libs/http_socket.php rename to lib/Cake/Network/Http/HttpSocket.php index 9e820f921..926d70ee6 100644 --- a/cake/libs/http_socket.php +++ b/lib/Cake/Network/Http/HttpSocket.php @@ -16,8 +16,8 @@ * @since CakePHP(tm) v 1.2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Core', 'CakeSocket'); -App::import('Core', 'Router'); +App::uses('CakeSocket', 'Network'); +App::uses('Router', 'Routing'); /** * Cake network socket connection class. @@ -211,7 +211,7 @@ class HttpSocket extends CakeSocket { return; } if (!is_resource($resource)) { - throw new SocketException(__('Invalid resource.')); + throw new SocketException(__d('cake_dev', 'Invalid resource.')); } $this->_contentResource = $resource; } @@ -363,8 +363,10 @@ class HttpSocket extends CakeSocket { $this->disconnect(); } - if (!App::import('Lib', $this->responseClass)) { - throw new SocketException(__('Class %s not found.', $this->responseClass)); + list($plugin, $responseClass) = pluginSplit($this->responseClass, true); + App::uses($this->responseClass, $plugin . 'Network/Http'); + if (!class_exists($responseClass)) { + throw new SocketException(__d('cake_dev', 'Class %s not found.', $this->responseClass)); } $responseClass = $this->responseClass; $this->response = new $responseClass($response); @@ -530,12 +532,15 @@ class HttpSocket extends CakeSocket { return; } $method = key($this->_auth); - $authClass = Inflector::camelize($method) . 'Authentication'; - if (!App::import('Lib', 'http/' . $authClass)) { - throw new SocketException(__('Unknown authentication method.')); + list($plugin, $authClass) = pluginSplit($method, true); + $authClass = Inflector::camelize($authClass) . 'Authentication'; + App::uses($authClass, $plugin . 'Network/Http'); + + if (!class_exists($authClass)) { + throw new SocketException(__d('cake_dev', 'Unknown authentication method.')); } if (!method_exists($authClass, 'authentication')) { - throw new SocketException(sprintf(__('The %s do not support authentication.'), $authClass)); + throw new SocketException(sprintf(__d('cake_dev', 'The %s do not support authentication.'), $authClass)); } call_user_func_array("$authClass::authentication", array($this, &$this->_auth[$method])); } @@ -556,12 +561,15 @@ class HttpSocket extends CakeSocket { if (empty($this->_proxy['method']) || !isset($this->_proxy['user'], $this->_proxy['pass'])) { return; } - $authClass = Inflector::camelize($this->_proxy['method']) . 'Authentication'; - if (!App::import('Lib', 'http/' . $authClass)) { - throw new SocketException(__('Unknown authentication method for proxy.')); + list($plugin, $authClass) = pluginSplit($this->_proxy['method'], true); + $authClass = Inflector::camelize($authClass) . 'Authentication'; + App::uses($authClass, $plugin. 'Network/Http'); + + if (!class_exists($authClass)) { + throw new SocketException(__d('cake_dev', 'Unknown authentication method for proxy.')); } if (!method_exists($authClass, 'proxyAuthentication')) { - throw new SocketException(sprintf(__('The %s do not support proxy authentication.'), $authClass)); + throw new SocketException(sprintf(__d('cake_dev', 'The %s do not support proxy authentication.'), $authClass)); } call_user_func_array("$authClass::proxyAuthentication", array($this, &$this->_proxy)); } @@ -779,7 +787,7 @@ class HttpSocket extends CakeSocket { if (is_string($request)) { $isValid = preg_match("/(.+) (.+) (.+)\r\n/U", $request, $match); if (!$this->quirksMode && (!$isValid || ($match[2] == '*' && !in_array($match[3], $asteriskMethods)))) { - throw new SocketException(__('HttpSocket::_buildRequestLine - Passed an invalid request line string. Activate quirks mode to do this.')); + throw new SocketException(__d('cake_dev', 'HttpSocket::_buildRequestLine - Passed an invalid request line string. Activate quirks mode to do this.')); } return $request; } elseif (!is_array($request)) { @@ -797,7 +805,7 @@ class HttpSocket extends CakeSocket { } if (!$this->quirksMode && $request['uri'] === '*' && !in_array($request['method'], $asteriskMethods)) { - throw new SocketException(__('HttpSocket::_buildRequestLine - The "*" asterisk character is only allowed for the following methods: %s. Activate quirks mode to work outside of HTTP/1.1 specs.', implode(',', $asteriskMethods))); + throw new SocketException(__d('cake_dev', 'HttpSocket::_buildRequestLine - The "*" asterisk character is only allowed for the following methods: %s. Activate quirks mode to work outside of HTTP/1.1 specs.', implode(',', $asteriskMethods))); } return $request['method'] . ' ' . $request['uri'] . ' ' . $versionToken . "\r\n"; } diff --git a/cake/libs/dispatcher.php b/lib/Cake/Routing/Dispatcher.php similarity index 95% rename from cake/libs/dispatcher.php rename to lib/Cake/Routing/Dispatcher.php index 9d82935a8..be0ebe77e 100644 --- a/cake/libs/dispatcher.php +++ b/lib/Cake/Routing/Dispatcher.php @@ -23,10 +23,13 @@ /** * List of helpers to include */ -App::import('Core', 'Router', false); -App::import('Core', 'CakeRequest', false); -App::import('Core', 'CakeResponse', false); -App::import('Controller', 'Controller', false); +App::uses('Router', 'Routing'); +App::uses('CakeRequest', 'Network'); +App::uses('CakeResponse', 'Network'); +App::uses('Controller', 'Controller'); +App::uses('Scaffold', 'Controller'); +App::uses('View', 'View'); +App::uses('Debugger', 'Utility'); /** * Dispatcher converts Requests into controller actions. It uses the dispatched Request @@ -116,6 +119,7 @@ class Dispatcher { $privateAction = in_array($prefix, $prefixes); } } + return $privateAction; } @@ -137,7 +141,6 @@ class Dispatcher { if (!isset($methods[$request->params['action']])) { if ($controller->scaffold !== false) { - App::import('Controller', 'Scaffold', false); return new Scaffold($controller, $request); } throw new MissingActionException(array( @@ -197,10 +200,7 @@ class Dispatcher { if (!$ctrlClass) { return false; } - $ctrlClass .= 'Controller'; - if (class_exists($ctrlClass)) { - return new $ctrlClass($request); - } + return new $ctrlClass($request); } /** @@ -219,8 +219,12 @@ class Dispatcher { $controller = Inflector::camelize($request->params['controller']); } if ($pluginPath . $controller) { - if (App::import('Controller', $pluginPath . $controller)) { - return $controller; + $class = $controller . 'Controller'; + App::uses('AppController', 'Controller'); + App::uses($pluginName . 'AppController', $pluginPath . 'Controller'); + App::uses($class, $pluginPath . 'Controller'); + if (class_exists($class)) { + return $class; } } return false; @@ -254,9 +258,6 @@ class Dispatcher { } if (file_exists($filename)) { - if (!class_exists('View')) { - App::import('View', 'View', false); - } $controller = null; $view = new View($controller); return $view->renderCache($filename, microtime(true)); diff --git a/cake/libs/route/cake_route.php b/lib/Cake/Routing/Route/CakeRoute.php similarity index 100% rename from cake/libs/route/cake_route.php rename to lib/Cake/Routing/Route/CakeRoute.php diff --git a/cake/libs/route/plugin_short_route.php b/lib/Cake/Routing/Route/PluginShortRoute.php similarity index 97% rename from cake/libs/route/plugin_short_route.php rename to lib/Cake/Routing/Route/PluginShortRoute.php index 9509c5d32..a0f2d18a9 100644 --- a/cake/libs/route/plugin_short_route.php +++ b/lib/Cake/Routing/Route/PluginShortRoute.php @@ -1,5 +1,5 @@ $url); @@ -583,7 +583,7 @@ class Router { */ private static function __connectDefaultRoutes() { if ($plugins = App::objects('plugin')) { - App::import('Core', 'route/PluginShortRoute'); + App::uses('PluginShortRoute', 'Routing/Route'); foreach ($plugins as $key => $value) { $plugins[$key] = Inflector::underscore($value); } diff --git a/cake/tests/lib/cake_test_case.php b/lib/Cake/TestSuite/CakeTestCase.php similarity index 97% rename from cake/tests/lib/cake_test_case.php rename to lib/Cake/TestSuite/CakeTestCase.php index 7581bd6a8..b769ebdf0 100644 --- a/cake/tests/lib/cake_test_case.php +++ b/lib/Cake/TestSuite/CakeTestCase.php @@ -19,19 +19,18 @@ PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT'); -require_once CAKE_TESTS_LIB . 'cake_fixture_manager.php'; -require_once CAKE_TESTS_LIB . 'cake_test_model.php'; -require_once CAKE_TESTS_LIB . 'cake_test_fixture.php'; +App::uses('CakeFixtureManager', 'TestSuite/Fixture'); +App::uses('CakeTestFixture', 'TestSuite/Fixture'); /** * CakeTestCase class * * @package cake.tests.lib */ -class CakeTestCase extends PHPUnit_Framework_TestCase { +abstract class CakeTestCase extends PHPUnit_Framework_TestCase { /** - * The class responsible for managinf the creation, loading and removing of fixtures + * The class responsible for managing the creation, loading and removing of fixtures * * @var CakeFixtureManager * @access public @@ -185,7 +184,7 @@ class CakeTestCase extends PHPUnit_Framework_TestCase { */ function loadFixtures() { if (empty($this->fixtureManager)) { - throw new Exception(__('No fixture manager to load the test fixture')); + throw new Exception(__d('cake_dev', 'No fixture manager to load the test fixture')); } $args = func_get_args(); foreach ($args as $class) { diff --git a/cake/tests/lib/cake_test_loader.php b/lib/Cake/TestSuite/CakeTestLoader.php similarity index 92% rename from cake/tests/lib/cake_test_loader.php rename to lib/Cake/TestSuite/CakeTestLoader.php index 94ed036f9..e00b716f4 100644 --- a/cake/tests/lib/cake_test_loader.php +++ b/lib/Cake/TestSuite/CakeTestLoader.php @@ -38,7 +38,7 @@ class CakeTestLoader extends PHPUnit_Runner_StandardTestSuiteLoader { */ protected function _resolveTestFile($filePath, $params) { $basePath = $this->_basePath($params) . DS . $filePath; - $ending = '.test.php'; + $ending = 'Test.php'; return (strpos($basePath, $ending) === (strlen($basePath) - strlen($ending))) ? $basePath : $basePath . $ending; } @@ -56,7 +56,7 @@ class CakeTestLoader extends PHPUnit_Runner_StandardTestSuiteLoader { $result = APP_TEST_CASES; } else if (!empty($params['plugin'])) { $pluginPath = App::pluginPath($params['plugin']); - $result = $pluginPath . 'tests' . DS . 'cases'; + $result = $pluginPath . 'tests' . DS . 'Case'; } return $result; } @@ -72,7 +72,9 @@ class CakeTestLoader extends PHPUnit_Runner_StandardTestSuiteLoader { $testCases = array(); foreach ($fileList as $testCaseFile) { - $testCases[$testCaseFile] = str_replace($directory . DS, '', $testCaseFile); + $case = str_replace($directory . DS, '', $testCaseFile); + $case = str_replace('Test.php', '', $case); + $testCases[$testCaseFile] = $case; } return $testCases; } @@ -92,7 +94,7 @@ class CakeTestLoader extends PHPUnit_Runner_StandardTestSuiteLoader { $files = new RegexIterator( new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory)), - '/.*\.test.php$/' + '/.*Test.php$/' ); foreach ($files as $file) { diff --git a/cake/tests/lib/cake_test_runner.php b/lib/Cake/TestSuite/CakeTestRunner.php similarity index 88% rename from cake/tests/lib/cake_test_runner.php rename to lib/Cake/TestSuite/CakeTestRunner.php index f1d2c9eda..0de3880ce 100644 --- a/cake/tests/lib/cake_test_runner.php +++ b/lib/Cake/TestSuite/CakeTestRunner.php @@ -80,12 +80,14 @@ class CakeTestRunner extends PHPUnit_TextUI_TestRunner { */ protected function _getFixtureManager($arguments) { if (isset($arguments['fixtureManager'])) { - if (App::import('Lib', 'test_suite/' . Inflector::underscore($arguments['fixtureManager']))) { + App::uses($arguments['fixtureManager'], 'TestSuite'); + if (class_exists($arguments['fixtureManager'])) { return new $arguments['fixtureManager']; } - throw new RuntimeException(__('Could not find fixture manager %s.', $arguments['fixtureManager'])); + throw new RuntimeException(__d('cake_dev', 'Could not find fixture manager %s.', $arguments['fixtureManager'])); } - if (App::import('Lib', 'test_suite/AppFixtureManager')) { + App::uses('AppFixtureManager', 'TestSuite'); + if (class_exists('AppFixtureManager')) { return new AppFixtureManager(); } return new CakeFixtureManager(); diff --git a/cake/tests/lib/cake_test_suite.php b/lib/Cake/TestSuite/CakeTestSuite.php similarity index 100% rename from cake/tests/lib/cake_test_suite.php rename to lib/Cake/TestSuite/CakeTestSuite.php diff --git a/cake/tests/lib/cake_test_suite_command.php b/lib/Cake/TestSuite/CakeTestSuiteCommand.php similarity index 86% rename from cake/tests/lib/cake_test_suite_command.php rename to lib/Cake/TestSuite/CakeTestSuiteCommand.php index 2ed6eab0f..29dfd8f1d 100644 --- a/cake/tests/lib/cake_test_suite_command.php +++ b/lib/Cake/TestSuite/CakeTestSuiteCommand.php @@ -16,17 +16,15 @@ * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -define('CORE_TEST_CASES', TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'cases'); -define('APP_TEST_CASES', TESTS . 'cases'); require 'PHPUnit/TextUI/Command.php'; -require_once CAKE_TESTS_LIB . 'cake_test_runner.php'; -require_once CAKE_TESTS_LIB . 'cake_test_loader.php'; -require_once CAKE_TESTS_LIB . 'cake_test_suite.php'; -require_once CAKE_TESTS_LIB . 'cake_test_case.php'; -require_once CAKE_TESTS_LIB . 'controller_test_case.php'; - +App::uses('CakeTestRunner', 'TestSuite'); +App::uses('CakeTestLoader', 'TestSuite'); +App::uses('CakeTestSuite', 'TestSuite'); +App::uses('CakeTestCase', 'TestSuite'); +App::uses('ControllerTestCase', 'TestSuite'); +App::uses('CakeTestModel', 'TestSuite/Fixture'); PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT'); @@ -43,6 +41,9 @@ class CakeTestSuiteCommand extends PHPUnit_TextUI_Command { * @param array $params list of options to be used for this run */ public function __construct($loader, $params = array()) { + if ($loader && !class_exists($loader)) { + throw new MissingTestLoaderException(array('class' => $loader)); + } $this->arguments['loader'] = $loader; $this->arguments['test'] = $params['case']; $this->arguments['testFile'] = $params; @@ -161,13 +162,14 @@ class CakeTestSuiteCommand extends PHPUnit_TextUI_Command { $type = strtolower($reporter); $coreClass = 'Cake' . ucwords($reporter) . 'Reporter'; - $coreFile = CAKE_TESTS_LIB . 'reporter/cake_' . $type . '_reporter.php'; + App::uses($coreClass, 'TestSuite/Reporter'); $appClass = $reporter . 'Reporter'; - $appFile = APPLIBS . 'test_suite/reporter/' . $type . '_reporter.php'; - if (include_once $coreFile) { + App::uses($appClass, 'TestSuite/Reporter'); + + if (!class_exists($appClass)) { $object = new $coreClass(null, $this->_params); - } elseif (include_once $appFile) { + } else { $object = new $appClass(null, $this->_params); } return $this->arguments['printer'] = $object; diff --git a/cake/tests/lib/cake_test_suite_dispatcher.php b/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php similarity index 97% rename from cake/tests/lib/cake_test_suite_dispatcher.php rename to lib/Cake/TestSuite/CakeTestSuiteDispatcher.php index caae159cc..2fef24987 100644 --- a/cake/tests/lib/cake_test_suite_dispatcher.php +++ b/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php @@ -17,6 +17,11 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +define('CORE_TEST_CASES', LIBS . 'tests' . DS . 'Case'); +define('APP_TEST_CASES', TESTS . 'Case'); + +App::uses('CakeTestSuiteCommand', 'TestSuite'); + /** * CakeTestSuiteDispatcher handles web requests to the test suite and runs the correct action. * @@ -88,8 +93,6 @@ class CakeTestSuiteDispatcher { $this->_checkPHPUnit(); $this->_parseParams(); - require_once CAKE . 'tests' . DS . 'lib' . DS . 'cake_test_suite_command.php'; - if ($this->params['case']) { $value = $this->_runTestCase(); } else { diff --git a/cake/tests/lib/controller_test_case.php b/lib/Cake/TestSuite/ControllerTestCase.php similarity index 91% rename from cake/tests/lib/controller_test_case.php rename to lib/Cake/TestSuite/ControllerTestCase.php index 76d34f310..09ba4af67 100644 --- a/cake/tests/lib/controller_test_case.php +++ b/lib/Cake/TestSuite/ControllerTestCase.php @@ -19,9 +19,12 @@ PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT'); -require_once CAKE . 'libs' . DS . 'dispatcher.php'; -require_once CAKE_TESTS_LIB . 'cake_test_case.php'; -App::import('Core', array('Router', 'CakeRequest', 'CakeResponse', 'Helper')); +App::uses('Dispatcher', 'Routing'); +App::uses('CakeTestCase', 'TestSuite'); +App::uses('Router', 'Routing'); +App::uses('CakeRequest', 'Network'); +App::uses('CakeResponse', 'Network'); +App::uses('Helper', 'View'); /** * ControllerTestDispatcher class @@ -252,7 +255,13 @@ class ControllerTestCase extends CakeTestCase { * @return Controller Mocked controller */ public function generate($controller, $mocks = array()) { - if (!class_exists($controller.'Controller') && App::import('Controller', $controller) === false) { + list($plugin, $controller) = pluginSplit($controller); + if ($plugin) { + App::uses($plugin . 'AppController', $plugin . '.Controller'); + $plugin .= '.'; + } + App::uses($controller . 'Controller', $plugin . 'Controller'); + if (!class_exists($controller.'Controller')) { throw new MissingControllerException(array('controller' => $controller.'Controller')); } ClassRegistry::flush(); @@ -293,10 +302,11 @@ class ControllerTestCase extends CakeTestCase { if ($methods === true) { $methods = array(); } - list($plugin, $name) = pluginSplit($component); - if (!App::import('Component', $component)) { + list($plugin, $name) = pluginSplit($component, true); + App::uses($name . 'Component', $plugin . 'Controller/Component'); + if (!class_exists($name . 'Component')) { throw new MissingComponentFileException(array( - 'file' => Inflector::underscore($name) . '.php', + 'file' => $name . 'Component.php', 'class' => $name.'Component' )); } diff --git a/cake/tests/lib/coverage/base_coverage_report.php b/lib/Cake/TestSuite/Coverage/BaseCoverageReport.php similarity index 99% rename from cake/tests/lib/coverage/base_coverage_report.php rename to lib/Cake/TestSuite/Coverage/BaseCoverageReport.php index 7960a6e75..3a04a946c 100644 --- a/cake/tests/lib/coverage/base_coverage_report.php +++ b/lib/Cake/TestSuite/Coverage/BaseCoverageReport.php @@ -101,7 +101,7 @@ abstract class BaseCoverageReport { } elseif ($this->pluginTest) { $path = App::pluginPath($this->pluginTest); } else { - $path = TEST_CAKE_CORE_INCLUDE_PATH; + $path = LIBS; } return $path; } diff --git a/cake/tests/lib/coverage/html_coverage_report.php b/lib/Cake/TestSuite/Coverage/HtmlCoverageReport.php similarity index 98% rename from cake/tests/lib/coverage/html_coverage_report.php rename to lib/Cake/TestSuite/Coverage/HtmlCoverageReport.php index bdd18e972..e57e9e3de 100644 --- a/cake/tests/lib/coverage/html_coverage_report.php +++ b/lib/Cake/TestSuite/Coverage/HtmlCoverageReport.php @@ -16,10 +16,11 @@ * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -require_once dirname(__FILE__) . '/base_coverage_report.php'; PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT'); +App::uses('BaseCoverageReport', 'TestSuite/Coverage'); + class HtmlCoverageReport extends BaseCoverageReport { /** diff --git a/cake/tests/lib/coverage/text_coverage_report.php b/lib/Cake/TestSuite/Coverage/TextCoverageReport.php similarity index 100% rename from cake/tests/lib/coverage/text_coverage_report.php rename to lib/Cake/TestSuite/Coverage/TextCoverageReport.php diff --git a/cake/tests/lib/cake_fixture_manager.php b/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php similarity index 78% rename from cake/tests/lib/cake_fixture_manager.php rename to lib/Cake/TestSuite/Fixture/CakeFixtureManager.php index 2615847ca..51c0392d9 100644 --- a/cake/tests/lib/cake_fixture_manager.php +++ b/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php @@ -18,6 +18,9 @@ */ PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT'); +App::uses('ConnectionManager', 'Model'); +App::uses('ClassRegistry', 'Utility'); + class CakeFixtureManager { /** @@ -54,7 +57,7 @@ class CakeFixtureManager { * @param CakeTestCase $test the test case to inspect * @return void */ - public function fixturize(CakeTestCase $test) { + public function fixturize($test) { if (empty($test->fixtures) || !empty($this->_processed[get_class($test)])) { $test->db = $this->_db; return; @@ -80,22 +83,7 @@ class CakeFixtureManager { if ($this->_initialized) { return; } - $testDbAvailable = in_array('test', array_keys(ConnectionManager::enumConnectionObjects())); - - $_prefix = null; - - if ($testDbAvailable) { - // Try for test DB - @$db = ConnectionManager::getDataSource('test'); - $testDbAvailable = $db->isConnected(); - } else { - throw new MissingConnectionException(__('You need to create a $test datasource connection to start using fixtures')); - } - - if (!$testDbAvailable) { - throw new MissingConnectionException(__('Unable to connect to the $test datasource')); - } - + $db = ConnectionManager::getDataSource('test'); $this->_db = $db; ClassRegistry::config(array('ds' => 'test')); $this->_initialized = true; @@ -114,47 +102,41 @@ class CakeFixtureManager { if (isset($this->_loaded[$fixture])) { continue; } + if (strpos($fixture, 'core.') === 0) { $fixture = substr($fixture, strlen('core.')); - foreach (App::core('cake') as $key => $path) { - $fixturePaths[] = $path . 'tests' . DS . 'fixtures'; - } + $fixturePaths[] = LIBS . 'tests' . DS . 'Fixture'; } elseif (strpos($fixture, 'app.') === 0) { $fixture = substr($fixture, strlen('app.')); $fixturePaths = array( - TESTS . 'fixtures', - VENDORS . 'tests' . DS . 'fixtures' + TESTS . 'Fixture' ); } elseif (strpos($fixture, 'plugin.') === 0) { $parts = explode('.', $fixture, 3); $pluginName = $parts[1]; $fixture = $parts[2]; $fixturePaths = array( - App::pluginPath($pluginName) . 'tests' . DS . 'fixtures', - TESTS . 'fixtures', - VENDORS . 'tests' . DS . 'fixtures' + App::pluginPath($pluginName) . 'tests' . DS . 'Fixture', + TESTS . 'Fixture' ); } else { $fixturePaths = array( - TESTS . 'fixtures', - VENDORS . 'tests' . DS . 'fixtures', - TEST_CAKE_CORE_INCLUDE_PATH . DS . 'cake' . DS . 'tests' . DS . 'fixtures' + TESTS . 'Fixture', + LIBS . 'tests' . DS . 'Fixture' ); } foreach ($fixturePaths as $path) { - if (is_readable($path . DS . $fixture . '_fixture.php')) { - $fixtureFile = $path . DS . $fixture . '_fixture.php'; + $className = Inflector::camelize($fixture); + if (is_readable($path . DS . $className . 'Fixture.php')) { + $fixtureFile = $path . DS . $className . 'Fixture.php'; + require_once($fixtureFile); + $fixtureClass = $className . 'Fixture'; + $this->_loaded[$fixtureIndex] = new $fixtureClass($this->_db); + $this->_fixtureMap[$fixtureClass] = $this->_loaded[$fixtureIndex]; break; } } - - if (isset($fixtureFile)) { - require_once($fixtureFile); - $fixtureClass = Inflector::camelize($fixture) . 'Fixture'; - $this->_loaded[$fixtureIndex] = new $fixtureClass($this->_db); - $this->_fixtureMap[$fixtureClass] = $this->_loaded[$fixtureIndex]; - } } } @@ -252,7 +234,7 @@ class CakeFixtureManager { $fixture->truncate($db); $fixture->insert($db); } else { - throw new UnexpectedValueException(__('Referenced fixture class %s not found', $name)); + throw new UnexpectedValueException(__d('cake_dev', 'Referenced fixture class %s not found', $name)); } } diff --git a/cake/tests/lib/cake_test_fixture.php b/lib/Cake/TestSuite/Fixture/CakeTestFixture.php similarity index 95% rename from cake/tests/lib/cake_test_fixture.php rename to lib/Cake/TestSuite/Fixture/CakeTestFixture.php index 5e78671eb..a83854266 100644 --- a/cake/tests/lib/cake_test_fixture.php +++ b/lib/Cake/TestSuite/Fixture/CakeTestFixture.php @@ -19,6 +19,8 @@ PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT'); +App::uses('CakeSchema', 'Model'); + /** * Short description for class. * @@ -57,7 +59,6 @@ class CakeTestFixture { $this->name = get_class($this); } } - App::import('Model', 'CakeSchema'); $this->Schema = new CakeSchema(array('name' => 'TestSuite', 'connection' => 'test')); $this->init(); } @@ -73,9 +74,12 @@ class CakeTestFixture { is_array($this->import) ? $this->import : array('model' => $this->import) ); - if (isset($import['model']) && App::import('Model', $import['model'])) { - App::import('Model', $import['model']); - list(, $modelClass) = pluginSplit($import['model']); + if (isset($import['model'])) { + list($plugin, $modelClass) = pluginSplit($import['model'], true); + App::uses($modelClass, $plugin . 'Model'); + if (!class_exists($modelClass)) { + throw new MissingModelException(array('class' => $modelClass)); + } $model = new $modelClass(null, null, $import['connection']); $db = $model->getDataSource(); if (empty($model->tablePrefix)) { diff --git a/cake/tests/lib/cake_test_model.php b/lib/Cake/TestSuite/Fixture/CakeTestModel.php similarity index 95% rename from cake/tests/lib/cake_test_model.php rename to lib/Cake/TestSuite/Fixture/CakeTestModel.php index a896a50d9..39632a45b 100644 --- a/cake/tests/lib/cake_test_model.php +++ b/lib/Cake/TestSuite/Fixture/CakeTestModel.php @@ -16,7 +16,8 @@ * @since CakePHP(tm) v 1.2.0.4667 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -require_once LIBS.'model'.DS.'model.php'; + +App::uses('Model', 'Model'); /** * Short description for class. diff --git a/cake/tests/lib/reporter/cake_base_reporter.php b/lib/Cake/TestSuite/Reporter/CakeBaseReporter.php similarity index 98% rename from cake/tests/lib/reporter/cake_base_reporter.php rename to lib/Cake/TestSuite/Reporter/CakeBaseReporter.php index 8e48065c2..aba62fde5 100644 --- a/cake/tests/lib/reporter/cake_base_reporter.php +++ b/lib/Cake/TestSuite/Reporter/CakeBaseReporter.php @@ -187,7 +187,7 @@ class CakeBaseReporter extends PHPUnit_TextUI_ResultPrinter { if (!$this->_headerSent) { echo $this->paintHeader(); } - echo __('Running %s', $suite->getName()) . "\n"; + echo __d('cake_dev', 'Running %s', $suite->getName()) . "\n"; } /** @@ -217,4 +217,4 @@ class CakeBaseReporter extends PHPUnit_TextUI_ResultPrinter { $this->paintPass($test, $time); } -} +} \ No newline at end of file diff --git a/cake/tests/lib/reporter/cake_html_reporter.php b/lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php old mode 100755 new mode 100644 similarity index 94% rename from cake/tests/lib/reporter/cake_html_reporter.php rename to lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php index 6af5c6029..428b11d85 --- a/cake/tests/lib/reporter/cake_html_reporter.php +++ b/lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php @@ -16,7 +16,7 @@ * @since CakePHP(tm) v 1.2.0.4433 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -include_once dirname(__FILE__) . DS . 'cake_base_reporter.php'; +App::uses('CakeBaseReporter', 'TestSuite/Reporter'); PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT'); @@ -157,8 +157,7 @@ class CakeHtmlReporter extends CakeBaseReporter { * @return void */ public function paintCoverage(array $coverage) { - $file = dirname(dirname(__FILE__)) . '/coverage/html_coverage_report.php'; - include_once $file; + App::uses('HtmlCoverageReport', 'TestSuite/Coverage'); $reporter = new HtmlCoverageReport($coverage, $this); echo $reporter->report(); } @@ -235,8 +234,8 @@ class CakeHtmlReporter extends CakeBaseReporter { echo "
  • \n"; echo "Failed"; echo "
    " . $this->_htmlEntities($message->toString()) . "
    \n"; - echo "
    " . __('Test case: %s', $testName) . "
    \n"; - echo "
    " . __('Stack trace:') . '
    ' . $trace . "
    \n"; + echo "
    " . __d('cake_dev', 'Test case: %s', $testName) . "
    \n"; + echo "
    " . __d('cake_dev', 'Stack trace:') . '
    ' . $trace . "
    \n"; echo "
    • \n"; } @@ -273,8 +272,8 @@ class CakeHtmlReporter extends CakeBaseReporter { echo "" . get_class($message) . ""; echo "
    " . $this->_htmlEntities($message->getMessage()) . "
    \n"; - echo "
    " . __('Test case: %s', $testName) . "
    \n"; - echo "
    " . __('Stack trace:') . '
    ' . $trace . "
    \n"; + echo "
    " . __d('cake_dev', 'Test case: %s', $testName) . "
    \n"; + echo "
    " . __d('cake_dev', 'Stack trace:') . '
    ' . $trace . "
    \n"; echo "\n"; } @@ -342,6 +341,6 @@ class CakeHtmlReporter extends CakeBaseReporter { if (!$this->_headerSent) { echo $this->paintHeader(); } - echo '

    ' . __('Running %s', $suite->getName()) . '

    '; + echo '

    ' . __d('cake_dev', 'Running %s', $suite->getName()) . '

    '; } -} +} \ No newline at end of file diff --git a/cake/tests/lib/reporter/cake_text_reporter.php b/lib/Cake/TestSuite/Reporter/CakeTextReporter.php similarity index 100% rename from cake/tests/lib/reporter/cake_text_reporter.php rename to lib/Cake/TestSuite/Reporter/CakeTextReporter.php diff --git a/cake/tests/lib/templates/footer.php b/lib/Cake/TestSuite/templates/footer.php similarity index 96% rename from cake/tests/lib/templates/footer.php rename to lib/Cake/TestSuite/templates/footer.php index 0f6ab6a69..059077000 100644 --- a/cake/tests/lib/templates/footer.php +++ b/lib/Cake/TestSuite/templates/footer.php @@ -26,7 +26,7 @@

    element('sql_dump'); diff --git a/cake/tests/lib/templates/header.php b/lib/Cake/TestSuite/templates/header.php similarity index 100% rename from cake/tests/lib/templates/header.php rename to lib/Cake/TestSuite/templates/header.php diff --git a/cake/tests/lib/templates/menu.php b/lib/Cake/TestSuite/templates/menu.php similarity index 100% rename from cake/tests/lib/templates/menu.php rename to lib/Cake/TestSuite/templates/menu.php diff --git a/cake/tests/lib/templates/missing_connection.php b/lib/Cake/TestSuite/templates/missing_conenction.php similarity index 100% rename from cake/tests/lib/templates/missing_connection.php rename to lib/Cake/TestSuite/templates/missing_conenction.php diff --git a/cake/tests/lib/templates/phpunit.php b/lib/Cake/TestSuite/templates/phpunit.php similarity index 100% rename from cake/tests/lib/templates/phpunit.php rename to lib/Cake/TestSuite/templates/phpunit.php diff --git a/cake/tests/lib/templates/xdebug.php b/lib/Cake/TestSuite/templates/xdebug.php similarity index 100% rename from cake/tests/lib/templates/xdebug.php rename to lib/Cake/TestSuite/templates/xdebug.php diff --git a/cake/libs/class_registry.php b/lib/Cake/Utility/ClassRegistry.php similarity index 94% rename from cake/libs/class_registry.php rename to lib/Cake/Utility/ClassRegistry.php index 37b67b44f..f4181f02b 100644 --- a/cake/libs/class_registry.php +++ b/lib/Cake/Utility/ClassRegistry.php @@ -132,7 +132,11 @@ class ClassRegistry { return $model; } - if (class_exists($class) || App::import($type, $pluginPath . $class)) { + App::uses('Model', 'Model'); + App::uses('AppModel', 'Model'); + App::uses($plugin . 'AppModel', $pluginPath . $type); + App::uses($class, $pluginPath . $type); + if (class_exists($class)) { ${$class} = new $class($settings); } elseif ($type === 'Model') { if ($plugin && class_exists($plugin . 'AppModel')) { @@ -145,7 +149,7 @@ class ClassRegistry { } if (!isset(${$class})) { - trigger_error(__('(ClassRegistry::init() could not create instance of %1$s class %2$s ', $class, $type), E_USER_WARNING); + trigger_error(__d('cake_dev', '(ClassRegistry::init() could not create instance of %1$s class %2$s ', $class, $type), E_USER_WARNING); return $false; } @@ -155,7 +159,7 @@ class ClassRegistry { $_this->map($alias, $class); } } elseif (is_numeric($settings)) { - trigger_error(__('(ClassRegistry::init() Attempted to create instance of a class with a numeric name'), E_USER_WARNING); + trigger_error(__d('cake_dev', '(ClassRegistry::init() Attempted to create instance of a class with a numeric name'), E_USER_WARNING); return $false; } } diff --git a/cake/libs/debugger.php b/lib/Cake/Utility/Debugger.php similarity index 96% rename from cake/libs/debugger.php rename to lib/Cake/Utility/Debugger.php index 942aa1c63..295f11d65 100644 --- a/cake/libs/debugger.php +++ b/lib/Cake/Utility/Debugger.php @@ -23,12 +23,8 @@ * Included libraries. * */ -if (!class_exists('CakeLog')) { - require_once LIBS . 'cake_log.php'; -} -if (!class_exists('String')) { - require_once LIBS . 'string.php'; -} +App::uses('CakeLog', 'Log'); +App::uses('String', 'Utility'); /** * Provide custom logging and error handling. @@ -404,12 +400,9 @@ class Debugger { } elseif (strpos($path, ROOT) === 0) { return str_replace(ROOT, 'ROOT', $path); } - $corePaths = App::core('cake'); - - foreach ($corePaths as $corePath) { - if (strpos($path, $corePath) === 0) { - return str_replace($corePath, 'CORE' .DS . 'cake' .DS, $path); - } + + if (strpos($path, LIBS) === 0) { + return str_replace($corePath, 'CORE' . DS, $path); } return $path; } @@ -654,11 +647,11 @@ class Debugger { */ public static function checkSecurityKeys() { if (Configure::read('Security.salt') == 'DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi') { - trigger_error(__('Please change the value of \'Security.salt\' in app/config/core.php to a salt value specific to your application'), E_USER_NOTICE); + trigger_error(__d('cake_dev', 'Please change the value of \'Security.salt\' in app/config/core.php to a salt value specific to your application'), E_USER_NOTICE); } if (Configure::read('Security.cipherSeed') === '76859309657453542496749683645') { - trigger_error(__('Please change the value of \'Security.cipherSeed\' in app/config/core.php to a numeric (digits only) seed value specific to your application'), E_USER_NOTICE); + trigger_error(__d('cake_dev', 'Please change the value of \'Security.cipherSeed\' in app/config/core.php to a numeric (digits only) seed value specific to your application'), E_USER_NOTICE); } } diff --git a/cake/libs/file.php b/lib/Cake/Utility/File.php similarity index 99% rename from cake/libs/file.php rename to lib/Cake/Utility/File.php index 49d030e4d..ff0eadaa1 100644 --- a/cake/libs/file.php +++ b/lib/Cake/Utility/File.php @@ -21,9 +21,7 @@ * Included libraries. * */ -if (!class_exists('Folder')) { - require LIBS . 'folder.php'; -} +App::uses('Folder', 'Utility'); /** * Convenience class for reading, writing and appending to files. diff --git a/cake/libs/folder.php b/lib/Cake/Utility/Folder.php similarity index 93% rename from cake/libs/folder.php rename to lib/Cake/Utility/Folder.php index 02b097227..f8d8f283a 100644 --- a/cake/libs/folder.php +++ b/lib/Cake/Utility/Folder.php @@ -345,11 +345,11 @@ class Folder { if ($recursive === false && is_dir($path)) { if (@chmod($path, intval($mode, 8))) { - $this->__messages[] = __('%s changed to %s', $path, $mode); + $this->__messages[] = __d('cake_dev', '%s changed to %s', $path, $mode); return true; } - $this->__errors[] = __('%s NOT changed to %s', $path, $mode); + $this->__errors[] = __d('cake_dev', '%s NOT changed to %s', $path, $mode); return false; } @@ -366,9 +366,9 @@ class Folder { } if (@chmod($fullpath, intval($mode, 8))) { - $this->__messages[] = __('%s changed to %s', $fullpath, $mode); + $this->__messages[] = __d('cake_dev', '%s changed to %s', $fullpath, $mode); } else { - $this->__errors[] = __('%s NOT changed to %s', $fullpath, $mode); + $this->__errors[] = __d('cake_deverloper', '%s NOT changed to %s', $fullpath, $mode); } } } @@ -453,7 +453,7 @@ class Folder { } if (is_file($pathname)) { - $this->__errors[] = __('%s is a file', $pathname); + $this->__errors[] = __d('cake_dev', '%s is a file', $pathname); return false; } $pathname = rtrim($pathname, DS); @@ -464,11 +464,11 @@ class Folder { $old = umask(0); if (mkdir($pathname, $mode)) { umask($old); - $this->__messages[] = __('%s created', $pathname); + $this->__messages[] = __d('cake_dev', '%s created', $pathname); return true; } else { umask($old); - $this->__errors[] = __('%s NOT created', $pathname); + $this->__errors[] = __d('cake_dev', '%s NOT created', $pathname); return false; } } @@ -541,9 +541,9 @@ class Folder { } if (is_file($file) === true) { if (@unlink($file)) { - $this->__messages[] = __('%s removed', $file); + $this->__messages[] = __d('cake_dev', '%s removed', $file); } else { - $this->__errors[] = __('%s NOT removed', $file); + $this->__errors[] = __d('cake_dev', '%s NOT removed', $file); } } elseif (is_dir($file) === true && $this->delete($file) === false) { return false; @@ -552,10 +552,10 @@ class Folder { } $path = substr($path, 0, strlen($path) - 1); if (rmdir($path) === false) { - $this->__errors[] = __('%s NOT removed', $path); + $this->__errors[] = __d('cake_dev', '%s NOT removed', $path); return false; } else { - $this->__messages[] = __('%s removed', $path); + $this->__messages[] = __d('cake_dev', '%s removed', $path); } } return true; @@ -590,7 +590,7 @@ class Folder { $mode = $options['mode']; if (!$this->cd($fromDir)) { - $this->__errors[] = __('%s not found', $fromDir); + $this->__errors[] = __d('cake_dev', '%s not found', $fromDir); return false; } @@ -599,7 +599,7 @@ class Folder { } if (!is_writable($toDir)) { - $this->__errors[] = __('%s not writable', $toDir); + $this->__errors[] = __d('cake_dev', '%s not writable', $toDir); return false; } @@ -613,9 +613,9 @@ class Folder { if (copy($from, $to)) { chmod($to, intval($mode, 8)); touch($to, filemtime($from)); - $this->__messages[] = __('%s copied to %s', $from, $to); + $this->__messages[] = __d('cake_dev', '%s copied to %s', $from, $to); } else { - $this->__errors[] = __('%s NOT copied to %s', $from, $to); + $this->__errors[] = __d('cake_dev', '%s NOT copied to %s', $from, $to); } } @@ -626,11 +626,11 @@ class Folder { $old = umask(0); chmod($to, $mode); umask($old); - $this->__messages[] = __('%s created', $to); + $this->__messages[] = __d('cake_dev', '%s created', $to); $options = array_merge($options, array('to'=> $to, 'from'=> $from)); $this->copy($options); } else { - $this->__errors[] = __('%s not created', $to); + $this->__errors[] = __d('cake_dev', '%s not created', $to); } } } @@ -666,7 +666,7 @@ class Folder { $options = (array)$options; } $options = array_merge( - array('to' => $to, 'from' => $this->path, 'mode' => $this->mode, 'skip' => array()), + array('to' => $to, 'from' => $this->path, 'mode' => $this->mode, 'skip' => array()), $options ); @@ -746,4 +746,4 @@ class Folder { $lastChar = $path[strlen($path) - 1]; return $lastChar === '/' || $lastChar === '\\'; } -} +} \ No newline at end of file diff --git a/cake/libs/inflector.php b/lib/Cake/Utility/Inflector.php similarity index 100% rename from cake/libs/inflector.php rename to lib/Cake/Utility/Inflector.php diff --git a/cake/libs/object_collection.php b/lib/Cake/Utility/ObjectCollection.php similarity index 98% rename from cake/libs/object_collection.php rename to lib/Cake/Utility/ObjectCollection.php index fbff40ee0..73dfa79b3 100644 --- a/cake/libs/object_collection.php +++ b/lib/Cake/Utility/ObjectCollection.php @@ -105,7 +105,7 @@ abstract class ObjectCollection { $list = array_keys($this->_loaded); } if ($options['modParams'] !== false && !isset($params[$options['modParams']])) { - throw new CakeException(__('Cannot use modParams with indexes that do not exist.')); + throw new CakeException(__d('cake_dev', 'Cannot use modParams with indexes that do not exist.')); } foreach ($list as $name) { $result = call_user_func_array(array($this->_loaded[$name], $callback), $params); diff --git a/cake/libs/sanitize.php b/lib/Cake/Utility/Sanitize.php similarity index 100% rename from cake/libs/sanitize.php rename to lib/Cake/Utility/Sanitize.php diff --git a/cake/libs/security.php b/lib/Cake/Utility/Security.php similarity index 95% rename from cake/libs/security.php rename to lib/Cake/Utility/Security.php index e8b01e2b8..fb20e187c 100644 --- a/cake/libs/security.php +++ b/lib/Cake/Utility/Security.php @@ -17,6 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +App::uses('String', 'Utility'); + /** * Security Library contains utility methods related to security * @@ -57,9 +59,6 @@ class Security { * @return string Hash */ public static function generateAuthKey() { - if (!class_exists('String')) { - App::import('Core', 'String'); - } return Security::hash(String::uuid()); } @@ -137,7 +136,7 @@ class Security { */ public static function cipher($text, $key) { if (empty($key)) { - trigger_error(__('You cannot use an empty key for Security::cipher()'), E_USER_WARNING); + trigger_error(__d('cake_dev', 'You cannot use an empty key for Security::cipher()'), E_USER_WARNING); return ''; } diff --git a/cake/libs/set.php b/lib/Cake/Utility/Set.php similarity index 99% rename from cake/libs/set.php rename to lib/Cake/Utility/Set.php index b16aeb59a..839372f19 100644 --- a/cake/libs/set.php +++ b/lib/Cake/Utility/Set.php @@ -17,6 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +App::uses('String', 'Utility'); + /** * Class used for manipulation of arrays. * @@ -42,7 +44,7 @@ class Set { $r = (array)current($args); while (($arg = next($args)) !== false) { foreach ((array)$arg as $key => $val) { - if (is_array($val) && isset($r[$key]) && is_array($r[$key])) { + if (!empty($r[$key]) && is_array($r[$key]) && is_array($val)) { $r[$key] = Set::merge($r[$key], $val); } elseif (is_int($key)) { $r[] = $val; @@ -591,15 +593,14 @@ class Set { return $data; } - if (!is_array($path)) { - if (!class_exists('String')) { - App::import('Core', 'String'); - } + if (is_string($path) && strpos($path, '{') !== false) { $path = String::tokenize($path, '.', '{', '}'); + } elseif (is_string($path)) { + $path = explode('.', $path); } $tmp = array(); - if (!is_array($path) || empty($path)) { + if (empty($path)) { return null; } @@ -673,11 +674,12 @@ class Set { } $_list =& $list; + $count = count($path); foreach ($path as $i => $key) { if (is_numeric($key) && intval($key) > 0 || $key === '0') { $key = intval($key); } - if ($i === count($path) - 1) { + if ($i === $count - 1) { $_list[$key] = $data; } else { if (!isset($_list[$key])) { diff --git a/cake/libs/string.php b/lib/Cake/Utility/String.php similarity index 100% rename from cake/libs/string.php rename to lib/Cake/Utility/String.php diff --git a/cake/libs/validation.php b/lib/Cake/Utility/Validation.php similarity index 98% rename from cake/libs/validation.php rename to lib/Cake/Utility/Validation.php index bcb679e9f..e63342f86 100644 --- a/cake/libs/validation.php +++ b/lib/Cake/Utility/Validation.php @@ -16,9 +16,8 @@ * @since CakePHP(tm) v 1.2.0.3830 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -if (!class_exists('Multibyte')) { - App::import('Core', 'Multibyte', false); -} + +App::uses('Multibyte', 'I18n'); /** * Offers different validation methods. @@ -247,7 +246,7 @@ class Validation { } break; default: - self::$errors[] = __('You must define the $operator parameter for Validation::comparison()'); + self::$errors[] = __d('cake_dev', 'You must define the $operator parameter for Validation::comparison()'); break; } return false; @@ -266,7 +265,7 @@ class Validation { extract(self::_defaults($check)); } if ($regex === null) { - self::$errors[] = __('You must define a regular expression for Validation::custom()'); + self::$errors[] = __d('cake_dev', 'You must define a regular expression for Validation::custom()'); return false; } return self::_check($check, $regex); @@ -702,7 +701,7 @@ class Validation { /** * Checks that a value is a valid uuid - http://tools.ietf.org/html/rfc4122 - * + * * @param string $check Value to check * @return boolean Success * @access public @@ -725,11 +724,11 @@ class Validation { protected static function _pass($method, $check, $classPrefix) { $className = ucwords($classPrefix) . 'Validation'; if (!class_exists($className)) { - trigger_error(__('Could not find %s class, unable to complete validation.', $className), E_USER_WARNING); + trigger_error(__d('cake_dev', 'Could not find %s class, unable to complete validation.', $className), E_USER_WARNING); return false; } if (!method_exists($className, $method)) { - trigger_error(__('Method %s does not exist on %s unable to complete validation.', $method, $className), E_USER_WARNING); + trigger_error(__d('cake_dev', 'Method %s does not exist on %s unable to complete validation.', $method, $className), E_USER_WARNING); return false; } $check = (array)$check; @@ -845,4 +844,4 @@ class Validation { private static function __reset() { self::$errors = array(); } -} +} \ No newline at end of file diff --git a/cake/libs/xml.php b/lib/Cake/Utility/Xml.php similarity index 94% rename from cake/libs/xml.php rename to lib/Cake/Utility/Xml.php index d0efcc310..ab2f21e42 100644 --- a/cake/libs/xml.php +++ b/lib/Cake/Utility/Xml.php @@ -100,9 +100,9 @@ class Xml { $dom->load($input); return $dom; } elseif (!is_string($input)) { - throw new XmlException(__('Invalid input.')); + throw new XmlException(__d('cake_dev', 'Invalid input.')); } - throw new XmlException(__('XML cannot be read.')); + throw new XmlException(__d('cake_dev', 'XML cannot be read.')); } /** @@ -144,11 +144,11 @@ class Xml { */ public static function fromArray($input, $options = array()) { if (!is_array($input) || count($input) !== 1) { - throw new XmlException(__('Invalid input.')); + throw new XmlException(__d('cake_dev', 'Invalid input.')); } $key = key($input); if (is_integer($key)) { - throw new XmlException(__('The key of input must be alphanumeric')); + throw new XmlException(__d('cake_dev', 'The key of input must be alphanumeric')); } if (!is_array($options)) { @@ -212,7 +212,7 @@ class Xml { } } else { if ($key[0] === '@') { - throw new XmlException(__('Invalid array')); + throw new XmlException(__d('cake_dev', 'Invalid array')); } if (array_keys($value) === range(0, count($value) - 1)) { // List foreach ($value as $item) { @@ -225,7 +225,7 @@ class Xml { } } } else { - throw new XmlException(__('Invalid array')); + throw new XmlException(__d('cake_dev', 'Invalid array')); } } } @@ -277,7 +277,7 @@ class Xml { $obj = simplexml_import_dom($obj); } if (!($obj instanceof SimpleXMLElement)) { - throw new XmlException(__('The input is not instance of SimpleXMLElement, DOMDocument or DOMNode.')); + throw new XmlException(__d('cake_dev', 'The input is not instance of SimpleXMLElement, DOMDocument or DOMNode.')); } $result = array(); $namespaces = array_merge(array('' => ''), $obj->getNamespaces(true)); diff --git a/cake/VERSION.txt b/lib/Cake/VERSION.txt similarity index 100% rename from cake/VERSION.txt rename to lib/Cake/VERSION.txt diff --git a/cake/libs/view/helper.php b/lib/Cake/View/Helper.php similarity index 87% rename from cake/libs/view/helper.php rename to lib/Cake/View/Helper.php index dd9e6476c..cba5786ad 100644 --- a/cake/libs/view/helper.php +++ b/lib/Cake/View/Helper.php @@ -19,9 +19,7 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -if (!class_exists('Router')) { - App::import('Core', 'Router'); -} +App::uses('Router', 'Routing'); /** * Abstract base class for all other Helpers in CakePHP. @@ -126,7 +124,7 @@ class Helper extends Object { * @param array $params Array of params for the method. */ public function __call($method, $params) { - trigger_error(__('Method %1$s::%2$s does not exist', get_class($this), $method), E_USER_WARNING); + trigger_error(__d('cake_dev', 'Method %1$s::%2$s does not exist', get_class($this), $method), E_USER_WARNING); } /** @@ -240,11 +238,9 @@ class Helper extends Object { * @return string Path with a timestamp added, or not. */ public function assetTimestamp($path) { - $timestampEnabled = ( - (Configure::read('Asset.timestamp') === true && Configure::read('debug') > 0) || - Configure::read('Asset.timestamp') === 'force' - ); - if (strpos($path, '?') === false && $timestampEnabled) { + $stamp = Configure::read('Asset.timestamp'); + $timestampEnabled = $stamp === 'force' || ($stamp === true && Configure::read('debug') > 0); + if ($timestampEnabled && strpos($path, '?') === false) { $filepath = preg_replace('/^' . preg_quote($this->request->webroot, '/') . '/', '', $path); $webrootPath = WWW_ROOT . str_replace('/', DS, $filepath); if (file_exists($webrootPath)) { @@ -290,6 +286,96 @@ class Helper extends Object { return $this->__cleaned; } +/** +<<<<<<< HEAD:lib/Cake/View/Helper.php + * Returns a space-delimited string with items of the $options array. If a + * key of $options array happens to be one of: + * + * - 'compact' + * - 'checked' + * - 'declare' + * - 'readonly' + * - 'disabled' + * - 'selected' + * - 'defer' + * - 'ismap' + * - 'nohref' + * - 'noshade' + * - 'nowrap' + * - 'multiple' + * - 'noresize' + * + * And its value is one of: + * + * - '1' (string) + * - 1 (integer) + * - true (boolean) + * - 'true' (string) + * + * Then the value will be reset to be identical with key's name. + * If the value is not one of these 3, the parameter is not output. + * + * 'escape' is a special option in that it controls the conversion of + * attributes to their html-entity encoded equivalents. Set to false to disable html-encoding. + * + * If value for any option key is set to `null` or `false`, that option will be excluded from output. + * + * @param array $options Array of options. + * @param array $exclude Array of options to be excluded, the options here will not be part of the return. + * @param string $insertBefore String to be inserted before options. + * @param string $insertAfter String to be inserted after options. + * @return string Composed attributes. + */ + public function _parseAttributes($options, $exclude = null, $insertBefore = ' ', $insertAfter = null) { + if (!is_string($options)) { + $options = (array) $options + array('escape' => true); + + if (!is_array($exclude)) { + $exclude = array(); + } + + $exclude = array('escape' => true) + array_flip($exclude); + $escape = $options['escape']; + $attributes = array(); + + foreach ($options as $key => $value) { + if (!isset($exclude[$key]) && $value !== false && $value !== null) { + $attributes[] = $this->_formatAttribute($key, $value, $escape); + } + } + $out = implode(' ', $attributes); + } else { + $out = $options; + } + return $out ? $insertBefore . $out . $insertAfter : ''; + } + +/** + * Formats an individual attribute, and returns the string value of the composed attribute. + * Works with minimized attributes that have the same value as their name such as 'disabled' and 'checked' + * + * @param string $key The name of the attribute to create + * @param string $value The value of the attribute to create. + * @return string The composed attribute. + */ + protected function _formatAttribute($key, $value, $escape = true) { + $attribute = ''; + if (is_array($value)) { + $value = ''; + } + + if (is_numeric($key)) { + $attribute = sprintf($this->_minimizedAttributeFormat, $value, $value); + } elseif (in_array($key, $this->_minimizedAttributes)) { + if ($value === 1 || $value === true || $value === 'true' || $value === '1' || $value == $key) { + $attribute = sprintf($this->_minimizedAttributeFormat, $key, $key); + } + } else { + $attribute = sprintf($this->_attributeFormat, $key, ($escape ? h($value) : $value)); + } + return $attribute; + } + /** * Sets this helper's model and field properties to the dot-separated value-pair in $entity. * @@ -298,7 +384,7 @@ class Helper extends Object { * @return void */ public function setEntity($entity, $setScope = false) { - $view =& $this->_View; + $view = $this->_View; if ($setScope) { $view->modelScope = false; } elseif (!empty($view->entityPath) && $view->entityPath == $entity) { @@ -345,7 +431,7 @@ class Helper extends Object { } if (ClassRegistry::isKeySet($model)) { - $ModelObj =& ClassRegistry::getObject($model); + $ModelObj = ClassRegistry::getObject($model); for ($i = 0; $i < $count; $i++) { if ( is_a($ModelObj, 'Model') && diff --git a/cake/console/templates/skel/app_helper.php b/lib/Cake/View/Helper/AppHelper.php similarity index 96% rename from cake/console/templates/skel/app_helper.php rename to lib/Cake/View/Helper/AppHelper.php index 02955a34e..b293bfaba 100644 --- a/cake/console/templates/skel/app_helper.php +++ b/lib/Cake/View/Helper/AppHelper.php @@ -19,7 +19,7 @@ * @since CakePHP(tm) v 0.2.9 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Helper', 'Helper', false); +App::uses('Helper', 'View'); /** * This is a placeholder class. diff --git a/cake/libs/view/helpers/cache.php b/lib/Cake/View/Helper/CacheHelper.php similarity index 99% rename from cake/libs/view/helpers/cache.php rename to lib/Cake/View/Helper/CacheHelper.php index ef63994e1..5bd804474 100644 --- a/cake/libs/view/helpers/cache.php +++ b/lib/Cake/View/Helper/CacheHelper.php @@ -17,6 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +App::uses('AppHelper', 'View/Helper'); + /** * CacheHelper helps create full page view caching. * diff --git a/cake/libs/view/helpers/form.php b/lib/Cake/View/Helper/FormHelper.php similarity index 98% rename from cake/libs/view/helpers/form.php rename to lib/Cake/View/Helper/FormHelper.php index d8f11c877..5140257e9 100644 --- a/cake/libs/view/helpers/form.php +++ b/lib/Cake/View/Helper/FormHelper.php @@ -19,6 +19,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +App::uses('AppHelper', 'View/Helper'); + /** * Form helper library. * @@ -239,12 +241,12 @@ class FormHelper extends AppHelper { $options); $this->_inputDefaults = $options['inputDefaults']; unset($options['inputDefaults']); - + if (!isset($options['id'])) { $domId = isset($options['action']) ? $options['action'] : $this->request['action']; $options['id'] = $this->domId($domId . 'Form'); } - + if ($options['action'] === null && $options['url'] === null) { $options['action'] = $this->request->here(false); } elseif (empty($options['url']) || is_array($options['url'])) { @@ -504,7 +506,7 @@ class FormHelper extends AppHelper { if ($text != null) { $error = $text; } elseif (is_numeric($error)) { - $error = __('Error in field %s', Inflector::humanize($this->field())); + $error = __d('cake', 'Error in field %s', Inflector::humanize($this->field())); } if ($options['escape']) { $error = h($error); @@ -547,7 +549,7 @@ class FormHelper extends AppHelper { if (substr($text, -3) == '_id') { $text = substr($text, 0, strlen($text) - 3); } - $text = __(Inflector::humanize(Inflector::underscore($text))); + $text = __d('cake', Inflector::humanize(Inflector::underscore($text))); } if (is_string($options)) { @@ -616,13 +618,13 @@ class FormHelper extends AppHelper { } if ($legend === true) { - $actionName = __('New %s'); + $actionName = __d('cake', 'New %s'); $isEdit = ( strpos($this->request->params['action'], 'update') !== false || strpos($this->request->params['action'], 'edit') !== false ); if ($isEdit) { - $actionName = __('Edit %s'); + $actionName = __d('cake', 'Edit %s'); } $modelName = Inflector::humanize(Inflector::underscore($model)); $legend = sprintf($actionName, __($modelName)); @@ -1122,7 +1124,7 @@ class FormHelper extends AppHelper { } /** - * Missing method handler - implements various simple input types. Is used to create inputs + * Missing method handler - implements various simple input types. Is used to create inputs * of various types. e.g. `$this->Form->text();` will create `` while * `$this->Form->range();` will create `` * @@ -1145,7 +1147,7 @@ class FormHelper extends AppHelper { public function __call($method, $params) { $options = array(); if (empty($params)) { - throw new CakeException(__('Missing field name for FormHelper::%s', $method)); + throw new CakeException(__d('cake_dev', 'Missing field name for FormHelper::%s', $method)); } if (isset($params[1])) { $options = $params[1]; @@ -1361,7 +1363,7 @@ class FormHelper extends AppHelper { */ public function submit($caption = null, $options = array()) { if (!is_string($caption) && empty($caption)) { - $caption = __('Submit'); + $caption = __d('cake', 'Submit'); } $out = null; $div = true; @@ -2017,7 +2019,7 @@ class FormHelper extends AppHelper { function __selectOptions($elements = array(), $parents = array(), $showParents = null, $attributes = array()) { $select = array(); $attributes = array_merge( - array('escape' => true, 'style' => null, 'value' => null, 'class' => null), + array('escape' => true, 'style' => null, 'value' => null, 'class' => null), $attributes ); $selectedIsEmpty = ($attributes['value'] === '' || $attributes['value'] === null); @@ -2155,18 +2157,18 @@ class FormHelper extends AppHelper { break; case 'month': if ($options['monthNames'] === true) { - $data['01'] = __('January'); - $data['02'] = __('February'); - $data['03'] = __('March'); - $data['04'] = __('April'); - $data['05'] = __('May'); - $data['06'] = __('June'); - $data['07'] = __('July'); - $data['08'] = __('August'); - $data['09'] = __('September'); - $data['10'] = __('October'); - $data['11'] = __('November'); - $data['12'] = __('December'); + $data['01'] = __d('cake', 'January'); + $data['02'] = __d('cake', 'February'); + $data['03'] = __d('cake', 'March'); + $data['04'] = __d('cake', 'April'); + $data['05'] = __d('cake', 'May'); + $data['06'] = __d('cake', 'June'); + $data['07'] = __d('cake', 'July'); + $data['08'] = __d('cake', 'August'); + $data['09'] = __d('cake', 'September'); + $data['10'] = __d('cake', 'October'); + $data['11'] = __d('cake', 'November'); + $data['12'] = __d('cake', 'December'); } else if (is_array($options['monthNames'])) { $data = $options['monthNames']; } else { diff --git a/cake/libs/view/helpers/html.php b/lib/Cake/View/Helper/HtmlHelper.php similarity index 98% rename from cake/libs/view/helpers/html.php rename to lib/Cake/View/Helper/HtmlHelper.php index 52458329c..f10afa305 100644 --- a/cake/libs/view/helpers/html.php +++ b/lib/Cake/View/Helper/HtmlHelper.php @@ -16,6 +16,9 @@ * @since CakePHP(tm) v 0.9.1 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ + +App::uses('AppHelper', 'View/Helper'); + /** * Html Helper class for easy use of HTML widgets. * @@ -937,12 +940,13 @@ class HtmlHelper extends AppHelper { $reader = $configFile[1]; } } else { - throw new ConfigureException(__('Cannot load the configuration file. Wrong "configFile" configuration.')); + throw new ConfigureException(__d('cake_dev', 'Cannot load the configuration file. Wrong "configFile" configuration.')); } $readerClass = Inflector::camelize($reader) . 'Reader'; - if (!App::import('Lib', 'config/' . $readerClass)) { - throw new ConfigureException(__('Cannot load the configuration file. Unknown reader.')); + App::uses($readerClass, 'Configure'); + if (!class_exists($readerClass)) { + throw new ConfigureException(__d('cake_dev', 'Cannot load the configuration file. Unknown reader.')); } $readerObj = new $readerClass($path); diff --git a/cake/libs/view/helpers/jquery_engine.php b/lib/Cake/View/Helper/JqueryEngineHelper.php similarity index 99% rename from cake/libs/view/helpers/jquery_engine.php rename to lib/Cake/View/Helper/JqueryEngineHelper.php index 2644acadd..91e22d033 100644 --- a/cake/libs/view/helpers/jquery_engine.php +++ b/lib/Cake/View/Helper/JqueryEngineHelper.php @@ -21,7 +21,9 @@ * @package cake.libs.view.helpers * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Helper', 'Js'); + +App::uses('AppHelper', 'View/Helper'); +App::uses('JsBaseEngineHelper', 'View/Helper'); class JqueryEngineHelper extends JsBaseEngineHelper { /** diff --git a/cake/libs/view/helpers/js.php b/lib/Cake/View/Helper/JsBaseEngineHelper.php similarity index 58% rename from cake/libs/view/helpers/js.php rename to lib/Cake/View/Helper/JsBaseEngineHelper.php index 801d6a3cd..ade4ca558 100644 --- a/cake/libs/view/helpers/js.php +++ b/lib/Cake/View/Helper/JsBaseEngineHelper.php @@ -1,6 +1,6 @@ __engineName = $className . 'Engine'; - $engineClass = $engineName . 'Engine'; - $this->helpers[] = $engineClass; - parent::__construct($View, $settings); - } - -/** - * call__ Allows for dispatching of methods to the Engine Helper. - * methods in the Engines bufferedMethods list will be automatically buffered. - * You can control buffering with the buffer param as well. By setting the last parameter to - * any engine method to a boolean you can force or disable buffering. - * - * e.g. `$js->get('#foo')->effect('fadeIn', array('speed' => 'slow'), true);` - * - * Will force buffering for the effect method. If the method takes an options array you may also add - * a 'buffer' param to the options array and control buffering there as well. - * - * e.g. `$js->get('#foo')->event('click', $functionContents, array('buffer' => true));` - * - * The buffer parameter will not be passed onto the EngineHelper. - * - * @param string $method Method to be called - * @param array $params Parameters for the method being called. - * @return mixed Depends on the return of the dispatched method, or it could be an instance of the EngineHelper - */ - public function __call($method, $params) { - if ($this->{$this->__engineName} && method_exists($this->{$this->__engineName}, $method)) { - $buffer = false; - $engineHelper = $this->{$this->__engineName}; - if (in_array(strtolower($method), $engineHelper->bufferedMethods)) { - $buffer = true; - } - if (count($params) > 0) { - $lastParam = $params[count($params) - 1]; - $hasBufferParam = (is_bool($lastParam) || is_array($lastParam) && isset($lastParam['buffer'])); - if ($hasBufferParam && is_bool($lastParam)) { - $buffer = $lastParam; - unset($params[count($params) - 1]); - } elseif ($hasBufferParam && is_array($lastParam)) { - $buffer = $lastParam['buffer']; - unset($params['buffer']); - } - } - - $out = call_user_func_array(array(&$engineHelper, $method), $params); - if ($this->bufferScripts && $buffer && is_string($out)) { - $this->buffer($out); - return null; - } - if (is_object($out) && is_a($out, 'JsBaseEngineHelper')) { - return $this; - } - return $out; - } - if (method_exists($this, $method . '_')) { - return call_user_func(array(&$this, $method . '_'), $params); - } - trigger_error(__('JsHelper:: Missing Method %s is undefined', $method), E_USER_WARNING); - } - -/** - * Overwrite inherited Helper::value() - * See JsBaseEngineHelper::value() for more information on this method. - * - * @param mixed $val A PHP variable to be converted to JSON - * @param boolean $quoteStrings If false, leaves string values unquoted - * @return string a JavaScript-safe/JSON representation of $val - * @access public - **/ - function value($val, $quoteString = true) { - return $this->{$this->__engineName}->value($val, $quoteString); - } - -/** - * Writes all Javascript generated so far to a code block or - * caches them to a file and returns a linked script. If no scripts have been - * buffered this method will return null. If the request is an XHR(ajax) request - * onDomReady will be set to false. As the dom is already 'ready'. - * - * ### Options - * - * - `inline` - Set to true to have scripts output as a script block inline - * if `cache` is also true, a script link tag will be generated. (default true) - * - `cache` - Set to true to have scripts cached to a file and linked in (default false) - * - `clear` - Set to false to prevent script cache from being cleared (default true) - * - `onDomReady` - wrap cached scripts in domready event (default true) - * - `safe` - if an inline block is generated should it be wrapped in (default true) - * - * @param array $options options for the code block - * @return mixed Completed javascript tag if there are scripts, if there are no buffered - * scripts null will be returned. - */ - public function writeBuffer($options = array()) { - $domReady = $this->request->is('ajax'); - $defaults = array( - 'onDomReady' => $domReady, 'inline' => true, - 'cache' => false, 'clear' => true, 'safe' => true - ); - $options = array_merge($defaults, $options); - $script = implode("\n", $this->getBuffer($options['clear'])); - - if (empty($script)) { - return null; - } - - if ($options['onDomReady']) { - $script = $this->{$this->__engineName}->domReady($script); - } - $opts = $options; - unset($opts['onDomReady'], $opts['cache'], $opts['clear']); - - if (!$options['cache'] && $options['inline']) { - return $this->Html->scriptBlock($script, $opts); - } - - if ($options['cache'] && $options['inline']) { - $filename = md5($script); - if (!file_exists(JS . $filename . '.js')) { - cache(str_replace(WWW_ROOT, '', JS) . $filename . '.js', $script, '+999 days', 'public'); - } - return $this->Html->script($filename); - } - $this->Html->scriptBlock($script, $opts); - return null; - } - -/** - * Write a script to the buffered scripts. - * - * @param string $script Script string to add to the buffer. - * @param boolean $top If true the script will be added to the top of the - * buffered scripts array. If false the bottom. - * @return void - */ - public function buffer($script, $top = false) { - if ($top) { - array_unshift($this->__bufferedScripts, $script); - } else { - $this->__bufferedScripts[] = $script; - } - } - -/** - * Get all the buffered scripts - * - * @param boolean $clear Whether or not to clear the script caches (default true) - * @return array Array of scripts added to the request. - */ - public function getBuffer($clear = true) { - $this->_createVars(); - $scripts = $this->__bufferedScripts; - if ($clear) { - $this->__bufferedScripts = array(); - $this->__jsVars = array(); - } - return $scripts; - } - -/** - * Generates the object string for variables passed to javascript. - * - * @return string Generated JSON object of all set vars - */ - protected function _createVars() { - if (!empty($this->__jsVars)) { - $setVar = (strpos($this->setVariable, '.')) ? $this->setVariable : 'window.' . $this->setVariable; - $this->buffer($setVar . ' = ' . $this->object($this->__jsVars) . ';', true); - } - } - -/** - * Generate an 'Ajax' link. Uses the selected JS engine to create a link - * element that is enhanced with Javascript. Options can include - * both those for HtmlHelper::link() and JsBaseEngine::request(), JsBaseEngine::event(); - * - * ### Options - * - * - `confirm` - Generate a confirm() dialog before sending the event. - * - `id` - use a custom id. - * - `htmlAttributes` - additional non-standard htmlAttributes. Standard attributes are class, id, - * rel, title, escape, onblur and onfocus. - * - `buffer` - Disable the buffering and return a script tag in addition to the link. - * - * @param string $title Title for the link. - * @param mixed $url Mixed either a string URL or an cake url array. - * @param array $options Options for both the HTML element and Js::request() - * @return string Completed link. If buffering is disabled a script tag will be returned as well. - */ - public function link($title, $url = null, $options = array()) { - if (!isset($options['id'])) { - $options['id'] = 'link-' . intval(mt_rand()); - } - list($options, $htmlOptions) = $this->_getHtmlOptions($options); - $out = $this->Html->link($title, $url, $htmlOptions); - $this->get('#' . $htmlOptions['id']); - $requestString = $event = ''; - if (isset($options['confirm'])) { - $requestString = $this->confirmReturn($options['confirm']); - unset($options['confirm']); - } - $buffer = isset($options['buffer']) ? $options['buffer'] : null; - $safe = isset($options['safe']) ? $options['safe'] : true; - unset($options['buffer'], $options['safe']); - - $requestString .= $this->request($url, $options); - - if (!empty($requestString)) { - $event = $this->event('click', $requestString, $options + array('buffer' => $buffer)); - } - if (isset($buffer) && !$buffer) { - $opts = array('safe' => $safe); - $out .= $this->Html->scriptBlock($event, $opts); - } - return $out; - } - -/** - * Pass variables into Javascript. Allows you to set variables that will be - * output when the buffer is fetched with `JsHelper::getBuffer()` or `JsHelper::writeBuffer()` - * The Javascript variable used to output set variables can be controlled with `JsHelper::$setVariable` - * - * @param mixed $one Either an array of variables to set, or the name of the variable to set. - * @param mixed $two If $one is a string, $two is the value for that key. - * @return void - */ - public function set($one, $two = null) { - $data = null; - if (is_array($one)) { - if (is_array($two)) { - $data = array_combine($one, $two); - } else { - $data = $one; - } - } else { - $data = array($one => $two); - } - if ($data == null) { - return false; - } - $this->__jsVars = array_merge($this->__jsVars, $data); - } - -/** - * Uses the selected JS engine to create a submit input - * element that is enhanced with Javascript. Options can include - * both those for FormHelper::submit() and JsBaseEngine::request(), JsBaseEngine::event(); - * - * Forms submitting with this method, cannot send files. Files do not transfer over XmlHttpRequest - * and require an iframe or flash. - * - * ### Options - * - * - `url` The url you wish the XHR request to submit to. - * - `confirm` A string to use for a confirm() message prior to submitting the request. - * - `method` The method you wish the form to send by, defaults to POST - * - `buffer` Whether or not you wish the script code to be buffered, defaults to true. - * - Also see options for JsHelper::request() and JsHelper::event() - * - * @param string $title The display text of the submit button. - * @param array $options Array of options to use. See the options for the above mentioned methods. - * @return string Completed submit button. - */ - public function submit($caption = null, $options = array()) { - if (!isset($options['id'])) { - $options['id'] = 'submit-' . intval(mt_rand()); - } - $formOptions = array('div'); - list($options, $htmlOptions) = $this->_getHtmlOptions($options, $formOptions); - $out = $this->Form->submit($caption, $htmlOptions); - - $this->get('#' . $htmlOptions['id']); - - $options['data'] = $this->serializeForm(array('isForm' => false, 'inline' => true)); - $requestString = $url = ''; - if (isset($options['confirm'])) { - $requestString = $this->confirmReturn($options['confirm']); - unset($options['confirm']); - } - if (isset($options['url'])) { - $url = $options['url']; - unset($options['url']); - } - if (!isset($options['method'])) { - $options['method'] = 'post'; - } - $options['dataExpression'] = true; - - $buffer = isset($options['buffer']) ? $options['buffer'] : null; - $safe = isset($options['safe']) ? $options['safe'] : true; - unset($options['buffer'], $options['safe']); - - $requestString .= $this->request($url, $options); - if (!empty($requestString)) { - $event = $this->event('click', $requestString, $options + array('buffer' => $buffer)); - } - if (isset($buffer) && !$buffer) { - $opts = array('safe' => $safe); - $out .= $this->Html->scriptBlock($event, $opts); - } - return $out; - } - -/** - * Parse a set of Options and extract the Html options. - * Extracted Html Options are removed from the $options param. - * - * @param array $options Options to filter. - * @param array $additional Array of additional keys to extract and include in the return options array. - * @return array Array of js options and Htmloptions - */ - protected function _getHtmlOptions($options, $additional = array()) { - $htmlKeys = array_merge( - array('class', 'id', 'escape', 'onblur', 'onfocus', 'rel', 'title', 'style'), - $additional - ); - $htmlOptions = array(); - foreach ($htmlKeys as $key) { - if (isset($options[$key])) { - $htmlOptions[$key] = $options[$key]; - } - unset($options[$key]); - } - if (isset($options['htmlAttributes'])) { - $htmlOptions = array_merge($htmlOptions, $options['htmlAttributes']); - unset($options['htmlAttributes']); - } - return array($options, $htmlOptions); - } -} +App::uses('AppHelper', 'View/Helper'); /** * JsEngineBaseClass @@ -477,8 +73,6 @@ abstract class JsBaseEngineHelper extends AppHelper { /** * Constructor. * - * @param View $View The View this helper is attached to. - * @param array $settings An array of settings. */ function __construct($View, $settings = array()) { parent::__construct($View, $settings); @@ -653,7 +247,6 @@ abstract class JsBaseEngineHelper extends AppHelper { * @return string Escaped string. */ public function escape($string) { - App::import('Core', 'Multibyte'); return $this->_utf8ToHex($string); } @@ -1056,4 +649,4 @@ abstract class JsBaseEngineHelper extends AppHelper { } return $out; } -} +} \ No newline at end of file diff --git a/lib/Cake/View/Helper/JsHelper.php b/lib/Cake/View/Helper/JsHelper.php new file mode 100644 index 000000000..c9b3ecb4a --- /dev/null +++ b/lib/Cake/View/Helper/JsHelper.php @@ -0,0 +1,427 @@ +__engineName = $className . 'Engine'; + $engineClass = $engineName . 'Engine'; + $this->helpers[] = $engineClass; + parent::__construct($View, $settings); + } + +/** + * call__ Allows for dispatching of methods to the Engine Helper. + * methods in the Engines bufferedMethods list will be automatically buffered. + * You can control buffering with the buffer param as well. By setting the last parameter to + * any engine method to a boolean you can force or disable buffering. + * + * e.g. `$js->get('#foo')->effect('fadeIn', array('speed' => 'slow'), true);` + * + * Will force buffering for the effect method. If the method takes an options array you may also add + * a 'buffer' param to the options array and control buffering there as well. + * + * e.g. `$js->get('#foo')->event('click', $functionContents, array('buffer' => true));` + * + * The buffer parameter will not be passed onto the EngineHelper. + * + * @param string $method Method to be called + * @param array $params Parameters for the method being called. + * @return mixed Depends on the return of the dispatched method, or it could be an instance of the EngineHelper + */ + public function __call($method, $params) { + if ($this->{$this->__engineName} && method_exists($this->{$this->__engineName}, $method)) { + $buffer = false; + $engineHelper = $this->{$this->__engineName}; + if (in_array(strtolower($method), $engineHelper->bufferedMethods)) { + $buffer = true; + } + if (count($params) > 0) { + $lastParam = $params[count($params) - 1]; + $hasBufferParam = (is_bool($lastParam) || is_array($lastParam) && isset($lastParam['buffer'])); + if ($hasBufferParam && is_bool($lastParam)) { + $buffer = $lastParam; + unset($params[count($params) - 1]); + } elseif ($hasBufferParam && is_array($lastParam)) { + $buffer = $lastParam['buffer']; + unset($params['buffer']); + } + } + + $out = call_user_func_array(array(&$engineHelper, $method), $params); + if ($this->bufferScripts && $buffer && is_string($out)) { + $this->buffer($out); + return null; + } + if (is_object($out) && is_a($out, 'JsBaseEngineHelper')) { + return $this; + } + return $out; + } + if (method_exists($this, $method . '_')) { + return call_user_func(array(&$this, $method . '_'), $params); + } + trigger_error(__d('cake_dev', 'JsHelper:: Missing Method %s is undefined', $method), E_USER_WARNING); + } + +/** + * Overwrite inherited Helper::value() + * See JsBaseEngineHelper::value() for more information on this method. + * + * @param mixed $val A PHP variable to be converted to JSON + * @param boolean $quoteStrings If false, leaves string values unquoted + * @return string a JavaScript-safe/JSON representation of $val + * @access public + **/ + function value($val, $quoteString = true) { + return $this->{$this->__engineName}->value($val, $quoteString); + } + +/** + * Writes all Javascript generated so far to a code block or + * caches them to a file and returns a linked script. If no scripts have been + * buffered this method will return null. If the request is an XHR(ajax) request + * onDomReady will be set to false. As the dom is already 'ready'. + * + * ### Options + * + * - `inline` - Set to true to have scripts output as a script block inline + * if `cache` is also true, a script link tag will be generated. (default true) + * - `cache` - Set to true to have scripts cached to a file and linked in (default false) + * - `clear` - Set to false to prevent script cache from being cleared (default true) + * - `onDomReady` - wrap cached scripts in domready event (default true) + * - `safe` - if an inline block is generated should it be wrapped in (default true) + * + * @param array $options options for the code block + * @return mixed Completed javascript tag if there are scripts, if there are no buffered + * scripts null will be returned. + */ + public function writeBuffer($options = array()) { + $domReady = $this->request->is('ajax'); + $defaults = array( + 'onDomReady' => $domReady, 'inline' => true, + 'cache' => false, 'clear' => true, 'safe' => true + ); + $options = array_merge($defaults, $options); + $script = implode("\n", $this->getBuffer($options['clear'])); + + if (empty($script)) { + return null; + } + + if ($options['onDomReady']) { + $script = $this->{$this->__engineName}->domReady($script); + } + $opts = $options; + unset($opts['onDomReady'], $opts['cache'], $opts['clear']); + + if (!$options['cache'] && $options['inline']) { + return $this->Html->scriptBlock($script, $opts); + } + + if ($options['cache'] && $options['inline']) { + $filename = md5($script); + if (!file_exists(JS . $filename . '.js')) { + cache(str_replace(WWW_ROOT, '', JS) . $filename . '.js', $script, '+999 days', 'public'); + } + return $this->Html->script($filename); + } + $this->Html->scriptBlock($script, $opts); + return null; + } + +/** + * Write a script to the buffered scripts. + * + * @param string $script Script string to add to the buffer. + * @param boolean $top If true the script will be added to the top of the + * buffered scripts array. If false the bottom. + * @return void + */ + public function buffer($script, $top = false) { + if ($top) { + array_unshift($this->__bufferedScripts, $script); + } else { + $this->__bufferedScripts[] = $script; + } + } + +/** + * Get all the buffered scripts + * + * @param boolean $clear Whether or not to clear the script caches (default true) + * @return array Array of scripts added to the request. + */ + public function getBuffer($clear = true) { + $this->_createVars(); + $scripts = $this->__bufferedScripts; + if ($clear) { + $this->__bufferedScripts = array(); + $this->__jsVars = array(); + } + return $scripts; + } + +/** + * Generates the object string for variables passed to javascript. + * + * @return string Generated JSON object of all set vars + */ + protected function _createVars() { + if (!empty($this->__jsVars)) { + $setVar = (strpos($this->setVariable, '.')) ? $this->setVariable : 'window.' . $this->setVariable; + $this->buffer($setVar . ' = ' . $this->object($this->__jsVars) . ';', true); + } + } + +/** + * Generate an 'Ajax' link. Uses the selected JS engine to create a link + * element that is enhanced with Javascript. Options can include + * both those for HtmlHelper::link() and JsBaseEngine::request(), JsBaseEngine::event(); + * + * ### Options + * + * - `confirm` - Generate a confirm() dialog before sending the event. + * - `id` - use a custom id. + * - `htmlAttributes` - additional non-standard htmlAttributes. Standard attributes are class, id, + * rel, title, escape, onblur and onfocus. + * - `buffer` - Disable the buffering and return a script tag in addition to the link. + * + * @param string $title Title for the link. + * @param mixed $url Mixed either a string URL or an cake url array. + * @param array $options Options for both the HTML element and Js::request() + * @return string Completed link. If buffering is disabled a script tag will be returned as well. + */ + public function link($title, $url = null, $options = array()) { + if (!isset($options['id'])) { + $options['id'] = 'link-' . intval(mt_rand()); + } + list($options, $htmlOptions) = $this->_getHtmlOptions($options); + $out = $this->Html->link($title, $url, $htmlOptions); + $this->get('#' . $htmlOptions['id']); + $requestString = $event = ''; + if (isset($options['confirm'])) { + $requestString = $this->confirmReturn($options['confirm']); + unset($options['confirm']); + } + $buffer = isset($options['buffer']) ? $options['buffer'] : null; + $safe = isset($options['safe']) ? $options['safe'] : true; + unset($options['buffer'], $options['safe']); + + $requestString .= $this->request($url, $options); + + if (!empty($requestString)) { + $event = $this->event('click', $requestString, $options + array('buffer' => $buffer)); + } + if (isset($buffer) && !$buffer) { + $opts = array('safe' => $safe); + $out .= $this->Html->scriptBlock($event, $opts); + } + return $out; + } + +/** + * Pass variables into Javascript. Allows you to set variables that will be + * output when the buffer is fetched with `JsHelper::getBuffer()` or `JsHelper::writeBuffer()` + * The Javascript variable used to output set variables can be controlled with `JsHelper::$setVariable` + * + * @param mixed $one Either an array of variables to set, or the name of the variable to set. + * @param mixed $two If $one is a string, $two is the value for that key. + * @return void + */ + public function set($one, $two = null) { + $data = null; + if (is_array($one)) { + if (is_array($two)) { + $data = array_combine($one, $two); + } else { + $data = $one; + } + } else { + $data = array($one => $two); + } + if ($data == null) { + return false; + } + $this->__jsVars = array_merge($this->__jsVars, $data); + } + +/** + * Uses the selected JS engine to create a submit input + * element that is enhanced with Javascript. Options can include + * both those for FormHelper::submit() and JsBaseEngine::request(), JsBaseEngine::event(); + * + * Forms submitting with this method, cannot send files. Files do not transfer over XmlHttpRequest + * and require an iframe or flash. + * + * ### Options + * + * - `url` The url you wish the XHR request to submit to. + * - `confirm` A string to use for a confirm() message prior to submitting the request. + * - `method` The method you wish the form to send by, defaults to POST + * - `buffer` Whether or not you wish the script code to be buffered, defaults to true. + * - Also see options for JsHelper::request() and JsHelper::event() + * + * @param string $title The display text of the submit button. + * @param array $options Array of options to use. See the options for the above mentioned methods. + * @return string Completed submit button. + */ + public function submit($caption = null, $options = array()) { + if (!isset($options['id'])) { + $options['id'] = 'submit-' . intval(mt_rand()); + } + $formOptions = array('div'); + list($options, $htmlOptions) = $this->_getHtmlOptions($options, $formOptions); + $out = $this->Form->submit($caption, $htmlOptions); + + $this->get('#' . $htmlOptions['id']); + + $options['data'] = $this->serializeForm(array('isForm' => false, 'inline' => true)); + $requestString = $url = ''; + if (isset($options['confirm'])) { + $requestString = $this->confirmReturn($options['confirm']); + unset($options['confirm']); + } + if (isset($options['url'])) { + $url = $options['url']; + unset($options['url']); + } + if (!isset($options['method'])) { + $options['method'] = 'post'; + } + $options['dataExpression'] = true; + + $buffer = isset($options['buffer']) ? $options['buffer'] : null; + $safe = isset($options['safe']) ? $options['safe'] : true; + unset($options['buffer'], $options['safe']); + + $requestString .= $this->request($url, $options); + if (!empty($requestString)) { + $event = $this->event('click', $requestString, $options + array('buffer' => $buffer)); + } + if (isset($buffer) && !$buffer) { + $opts = array('safe' => $safe); + $out .= $this->Html->scriptBlock($event, $opts); + } + return $out; + } + +/** + * Parse a set of Options and extract the Html options. + * Extracted Html Options are removed from the $options param. + * + * @param array $options Options to filter. + * @param array $additional Array of additional keys to extract and include in the return options array. + * @return array Array of js options and Htmloptions + */ + protected function _getHtmlOptions($options, $additional = array()) { + $htmlKeys = array_merge( + array('class', 'id', 'escape', 'onblur', 'onfocus', 'rel', 'title', 'style'), + $additional + ); + $htmlOptions = array(); + foreach ($htmlKeys as $key) { + if (isset($options[$key])) { + $htmlOptions[$key] = $options[$key]; + } + unset($options[$key]); + } + if (isset($options['htmlAttributes'])) { + $htmlOptions = array_merge($htmlOptions, $options['htmlAttributes']); + unset($options['htmlAttributes']); + } + return array($options, $htmlOptions); + } +} \ No newline at end of file diff --git a/cake/libs/view/helpers/mootools_engine.php b/lib/Cake/View/Helper/MootoolsEngineHelper.php similarity index 98% rename from cake/libs/view/helpers/mootools_engine.php rename to lib/Cake/View/Helper/MootoolsEngineHelper.php index 0b3e50af8..726ca624b 100644 --- a/cake/libs/view/helpers/mootools_engine.php +++ b/lib/Cake/View/Helper/MootoolsEngineHelper.php @@ -24,7 +24,8 @@ * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Helper', 'Js'); + +App::uses('JsBaseEngineHelper', 'View/Helper'); class MootoolsEngineHelper extends JsBaseEngineHelper { /** @@ -306,7 +307,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper { function drop($options = array()) { if (empty($options['drag'])) { trigger_error( - __('MootoolsEngine::drop() requires a "drag" option to properly function'), E_USER_WARNING + __d('cake_dev', 'MootoolsEngine::drop() requires a "drag" option to properly function'), E_USER_WARNING ); return false; } diff --git a/cake/libs/view/helpers/number.php b/lib/Cake/View/Helper/NumberHelper.php similarity index 94% rename from cake/libs/view/helpers/number.php rename to lib/Cake/View/Helper/NumberHelper.php index 8c9a2e665..011d5d9eb 100644 --- a/cake/libs/view/helpers/number.php +++ b/lib/Cake/View/Helper/NumberHelper.php @@ -19,6 +19,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +App::uses('AppHelper', 'View/Helper'); + /** * Number helper library. * @@ -86,15 +88,15 @@ class NumberHelper extends AppHelper { public function toReadableSize($size) { switch (true) { case $size < 1024: - return __n('%d Byte', '%d Bytes', $size, $size); + return __dn('cake', '%d Byte', '%d Bytes', $size, $size); case round($size / 1024) < 1024: - return __('%d KB', $this->precision($size / 1024, 0)); + return __d('cake', '%d KB', $this->precision($size / 1024, 0)); case round($size / 1024 / 1024, 2) < 1024: - return __('%.2f MB', $this->precision($size / 1024 / 1024, 2)); + return __d('cake', '%.2f MB', $this->precision($size / 1024 / 1024, 2)); case round($size / 1024 / 1024 / 1024, 2) < 1024: - return __('%.2f GB', $this->precision($size / 1024 / 1024 / 1024, 2)); + return __d('cake', '%.2f GB', $this->precision($size / 1024 / 1024 / 1024, 2)); default: - return __('%.2f TB', $this->precision($size / 1024 / 1024 / 1024 / 1024, 2)); + return __d('cake', '%.2f TB', $this->precision($size / 1024 / 1024 / 1024 / 1024, 2)); } } @@ -162,7 +164,7 @@ class NumberHelper extends AppHelper { * ### Options * * - `before` - The currency symbol to place before whole numbers ie. '$' - * - `after` - The currency symbol to place after decimal numbers ie. 'c'. Set to boolean false to + * - `after` - The currency symbol to place after decimal numbers ie. 'c'. Set to boolean false to * use no decimal symbol. eg. 0.35 => $0.35. * - `zero` - The text to use for zero values, can be a string or a number. ie. 0, 'Free!' * - `places` - Number of decimal places to use. ie. 2 @@ -213,7 +215,7 @@ class NumberHelper extends AppHelper { } } - $position = $options[$symbolKey.'Position'] != 'after' ? 'before' : 'after'; + $position = $options[$symbolKey.'Position'] != 'after' ? 'before' : 'after'; $options[$position] = $options[$symbolKey.'Symbol']; $abs = abs($number); @@ -234,7 +236,7 @@ class NumberHelper extends AppHelper { * currency formats easier. * * {{{ $number->addFormat('NOK', array('before' => 'Kr. ')); }}} - * + * * You can now use `NOK` as a shortform when formatting currency amounts. * * {{{ $number->currency($value, 'NOK'); }}} @@ -257,4 +259,4 @@ class NumberHelper extends AppHelper { $this->_currencies[$formatName] = $options + $this->_currencyDefaults; } -} +} \ No newline at end of file diff --git a/cake/libs/view/helpers/paginator.php b/lib/Cake/View/Helper/PaginatorHelper.php old mode 100755 new mode 100644 similarity index 98% rename from cake/libs/view/helpers/paginator.php rename to lib/Cake/View/Helper/PaginatorHelper.php index e84ed1a74..fc8650e31 --- a/cake/libs/view/helpers/paginator.php +++ b/lib/Cake/View/Helper/PaginatorHelper.php @@ -17,6 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +App::uses('AppHelper', 'View/Helper'); + /** * Pagination Helper class for easy generation of pagination links. * @@ -67,7 +69,7 @@ class PaginatorHelper extends AppHelper { * - `escape` Defines if the title field for the link should be escaped (default: true). * - `update` DOM id of the element updated with the results of the AJAX call. * If this key isn't specified Paginator will use plain HTML links. - * - `paging['paramType']` The type of parameters to use when creating links. Valid options are + * - `paging['paramType']` The type of parameters to use when creating links. Valid options are * 'querystring', 'named', and 'route'. See PaginatorComponent::$settings for more information. * - `convertKeys` - A list of keys in url arrays that should be converted to querysting params * if paramType == 'querystring'. @@ -96,13 +98,11 @@ class PaginatorHelper extends AppHelper { $ajaxProvider = isset($settings['ajax']) ? $settings['ajax'] : 'Js'; $this->helpers[] = $ajaxProvider; $this->_ajaxHelperClass = $ajaxProvider; - if (!class_exists($ajaxProvider . 'Helper')) { - App::import('Helper', $ajaxProvider); - } + App::uses($ajaxProvider . 'Helper', 'View/Helper'); $classname = $ajaxProvider . 'Helper'; if (!method_exists($classname, 'link')) { throw new CakeException(sprintf( - __('%s does not implement a link() method, it is incompatible with PaginatorHelper'), $classname + __d('cake_dev', '%s does not implement a link() method, it is incompatible with PaginatorHelper'), $classname )); } parent::__construct($View, $settings); @@ -314,7 +314,7 @@ class PaginatorHelper extends AppHelper { $sortKey = $this->sortKey($options['model']); $defaultModel = $this->defaultModel(); $isSorted = ( - $sortKey === $key || + $sortKey === $key || $sortKey === $defaultModel . '.' . $key || $key === $defaultModel . '.' . $sortKey ); @@ -553,7 +553,7 @@ class PaginatorHelper extends AppHelper { array( 'model' => $this->defaultModel(), 'format' => 'pages', - 'separator' => __(' of ') + 'separator' => __d('cake', ' of ') ), $options); @@ -603,12 +603,12 @@ class PaginatorHelper extends AppHelper { /** * Returns a set of numbers for the paged result set - * uses a modulus to decide how many numbers to show on each side of the current page (default: 8). + * uses a modulus to decide how many numbers to show on each side of the current page (default: 8). * * `$this->Paginator->numbers(array('first' => 2, 'last' => 2));` * * Using the first and last options you can create links to the beginning and end of the page set. - * + * * * ### Options * @@ -862,4 +862,4 @@ class PaginatorHelper extends AppHelper { } return $out; } -} +} \ No newline at end of file diff --git a/cake/libs/view/helpers/prototype_engine.php b/lib/Cake/View/Helper/PrototypeEngineHelper.php similarity index 99% rename from cake/libs/view/helpers/prototype_engine.php rename to lib/Cake/View/Helper/PrototypeEngineHelper.php index 17706d8e1..79c5ac17a 100644 --- a/cake/libs/view/helpers/prototype_engine.php +++ b/lib/Cake/View/Helper/PrototypeEngineHelper.php @@ -19,7 +19,8 @@ * @since CakePHP(tm) v 1.3 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Helper', 'Js'); + +App::uses('JsBaseEngineHelper', 'View/Helper'); class PrototypeEngineHelper extends JsBaseEngineHelper { /** diff --git a/cake/libs/view/helpers/rss.php b/lib/Cake/View/Helper/RssHelper.php similarity index 99% rename from cake/libs/view/helpers/rss.php rename to lib/Cake/View/Helper/RssHelper.php index c1b7d219d..890e7c603 100644 --- a/cake/libs/view/helpers/rss.php +++ b/lib/Cake/View/Helper/RssHelper.php @@ -16,7 +16,9 @@ * @since CakePHP(tm) v 1.2 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('Core', 'Xml'); + +App::uses('AppHelper', 'View/Helper'); +App::uses('Xml', 'Utility'); /** * RSS Helper class for easy output RSS structures. diff --git a/cake/libs/view/helpers/session.php b/lib/Cake/View/Helper/SessionHelper.php similarity index 98% rename from cake/libs/view/helpers/session.php rename to lib/Cake/View/Helper/SessionHelper.php index 6dcf90294..eaa5260af 100644 --- a/cake/libs/view/helpers/session.php +++ b/lib/Cake/View/Helper/SessionHelper.php @@ -16,9 +16,10 @@ * @since CakePHP(tm) v 1.1.7.3328 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -if (!class_exists('CakeSession')) { - require LIBS . 'cake_session.php'; -} + +App::uses('AppHelper', 'View/Helper'); +App::uses('CakeSession', 'Model/Datasource'); + /** * Session Helper. * diff --git a/cake/libs/view/helpers/text.php b/lib/Cake/View/Helper/TextHelper.php similarity index 98% rename from cake/libs/view/helpers/text.php rename to lib/Cake/View/Helper/TextHelper.php index 307859513..4195c3ac0 100644 --- a/cake/libs/view/helpers/text.php +++ b/lib/Cake/View/Helper/TextHelper.php @@ -23,12 +23,9 @@ * Included libraries. * */ -if (!class_exists('HtmlHelper')) { - App::import('Helper', 'Html'); -} -if (!class_exists('Multibyte')) { - App::import('Core', 'Multibyte'); -} +App::uses('AppHelper', 'View/Helper'); +App::uses('HtmlHelper', 'Helper'); +App::uses('Multibyte', 'I18n'); /** * Text helper library. diff --git a/cake/libs/view/helpers/time.php b/lib/Cake/View/Helper/TimeHelper.php similarity index 93% rename from cake/libs/view/helpers/time.php rename to lib/Cake/View/Helper/TimeHelper.php index 901c0a074..64781b79e 100644 --- a/cake/libs/view/helpers/time.php +++ b/lib/Cake/View/Helper/TimeHelper.php @@ -17,6 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ +App::uses('AppHelper', 'View/Helper'); + /** * Time Helper class for easy use of time data. * @@ -80,19 +82,19 @@ class TimeHelper extends AppHelper { private function __translateSpecifier($specifier) { switch ($specifier[1]) { case 'a': - $abday = __c('abday', 5); + $abday = __dc('cake', 'abday', 5); if (is_array($abday)) { return $abday[date('w', $this->__time)]; } break; case 'A': - $day = __c('day', 5); + $day = __dc('cake', 'day', 5); if (is_array($day)) { return $day[date('w', $this->__time)]; } break; case 'c': - $format = __c('d_t_fmt', 5); + $format = __dc('cake', 'd_t_fmt', 5); if ($format != 'd_t_fmt') { return $this->convertSpecifiers($format, $this->__time); } @@ -114,13 +116,13 @@ class TimeHelper extends AppHelper { return date('jS', $this->__time); case 'b': case 'h': - $months = __c('abmon', 5); + $months = __dc('cake', 'abmon', 5); if (is_array($months)) { return $months[date('n', $this->__time) -1]; } return '%b'; case 'B': - $months = __c('mon', 5); + $months = __dc('cake', 'mon', 5); if (is_array($months)) { return $months[date('n', $this->__time) -1]; } @@ -131,14 +133,14 @@ class TimeHelper extends AppHelper { case 'P': $default = array('am' => 0, 'pm' => 1); $meridiem = $default[date('a',$this->__time)]; - $format = __c('am_pm', 5); + $format = __dc('cake', 'am_pm', 5); if (is_array($format)) { $meridiem = $format[$meridiem]; return ($specifier[1] == 'P') ? strtolower($meridiem) : strtoupper($meridiem); } break; case 'r': - $complete = __c('t_fmt_ampm', 5); + $complete = __dc('cake', 't_fmt_ampm', 5); if ($complete != 't_fmt_ampm') { return str_replace('%p',$this->__translateSpecifier(array('%p', 'p')),$complete); } @@ -152,13 +154,13 @@ class TimeHelper extends AppHelper { case 'u': return ($weekDay = date('w', $this->__time)) ? $weekDay : 7; case 'x': - $format = __c('d_fmt', 5); + $format = __dc('cake', 'd_fmt', 5); if ($format != 'd_fmt') { return $this->convertSpecifiers($format, $this->__time); } break; case 'X': - $format = __c('t_fmt', 5); + $format = __dc('cake', 't_fmt', 5); if ($format != 't_fmt') { return $this->convertSpecifiers($format, $this->__time); } @@ -263,9 +265,9 @@ class TimeHelper extends AppHelper { $y = $this->isThisYear($date) ? '' : ' %Y'; if ($this->isToday($dateString, $userOffset)) { - $ret = __('Today, %s', strftime("%H:%M", $date)); + $ret = __d('cake', 'Today, %s', strftime("%H:%M", $date)); } elseif ($this->wasYesterday($dateString, $userOffset)) { - $ret = __('Yesterday, %s', strftime("%H:%M", $date)); + $ret = __d('cake', 'Yesterday, %s', strftime("%H:%M", $date)); } else { $format = $this->convertSpecifiers("%b %eS{$y}, %H:%M", $date); $ret = strftime($format, $date); @@ -612,41 +614,41 @@ class TimeHelper extends AppHelper { $diff = $futureTime - $pastTime; if ($diff > abs($now - $this->fromString($end))) { - $relativeDate = __('on %s', date($format, $inSeconds)); + $relativeDate = __d('cake', 'on %s', date($format, $inSeconds)); } else { if ($years > 0) { // years and months and days - $relativeDate .= ($relativeDate ? ', ' : '') . $years . ' ' . __n('year', 'years', $years); - $relativeDate .= $months > 0 ? ($relativeDate ? ', ' : '') . $months . ' ' . __n('month', 'months', $months) : ''; - $relativeDate .= $weeks > 0 ? ($relativeDate ? ', ' : '') . $weeks . ' ' . __n('week', 'weeks', $weeks) : ''; - $relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' ' . __n('day', 'days', $days) : ''; + $relativeDate .= ($relativeDate ? ', ' : '') . $years . ' ' . __dn('cake', 'year', 'years', $years); + $relativeDate .= $months > 0 ? ($relativeDate ? ', ' : '') . $months . ' ' . __dn('cake', 'month', 'months', $months) : ''; + $relativeDate .= $weeks > 0 ? ($relativeDate ? ', ' : '') . $weeks . ' ' . __dn('cake', 'week', 'weeks', $weeks) : ''; + $relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' ' . __dn('cake', 'day', 'days', $days) : ''; } elseif (abs($months) > 0) { // months, weeks and days - $relativeDate .= ($relativeDate ? ', ' : '') . $months . ' ' . __n('month', 'months', $months); - $relativeDate .= $weeks > 0 ? ($relativeDate ? ', ' : '') . $weeks . ' ' . __n('week', 'weeks', $weeks) : ''; - $relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' ' . __n('day', 'days', $days) : ''; + $relativeDate .= ($relativeDate ? ', ' : '') . $months . ' ' . __dn('cake', 'month', 'months', $months); + $relativeDate .= $weeks > 0 ? ($relativeDate ? ', ' : '') . $weeks . ' ' . __dn('cake', 'week', 'weeks', $weeks) : ''; + $relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' ' . __dn('cake', 'day', 'days', $days) : ''; } elseif (abs($weeks) > 0) { // weeks and days - $relativeDate .= ($relativeDate ? ', ' : '') . $weeks . ' ' . __n('week', 'weeks', $weeks); - $relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' ' . __n('day', 'days', $days) : ''; + $relativeDate .= ($relativeDate ? ', ' : '') . $weeks . ' ' . __dn('cake', 'week', 'weeks', $weeks); + $relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' ' . __dn('cake', 'day', 'days', $days) : ''; } elseif (abs($days) > 0) { // days and hours - $relativeDate .= ($relativeDate ? ', ' : '') . $days . ' ' . __n('day', 'days', $days); - $relativeDate .= $hours > 0 ? ($relativeDate ? ', ' : '') . $hours . ' ' . __n('hour', 'hours', $hours) : ''; + $relativeDate .= ($relativeDate ? ', ' : '') . $days . ' ' . __dn('cake', 'day', 'days', $days); + $relativeDate .= $hours > 0 ? ($relativeDate ? ', ' : '') . $hours . ' ' . __dn('cake', 'hour', 'hours', $hours) : ''; } elseif (abs($hours) > 0) { // hours and minutes - $relativeDate .= ($relativeDate ? ', ' : '') . $hours . ' ' . __n('hour', 'hours', $hours); - $relativeDate .= $minutes > 0 ? ($relativeDate ? ', ' : '') . $minutes . ' ' . __n('minute', 'minutes', $minutes) : ''; + $relativeDate .= ($relativeDate ? ', ' : '') . $hours . ' ' . __dn('cake', 'hour', 'hours', $hours); + $relativeDate .= $minutes > 0 ? ($relativeDate ? ', ' : '') . $minutes . ' ' . __dn('cake', 'minute', 'minutes', $minutes) : ''; } elseif (abs($minutes) > 0) { // minutes only - $relativeDate .= ($relativeDate ? ', ' : '') . $minutes . ' ' . __n('minute', 'minutes', $minutes); + $relativeDate .= ($relativeDate ? ', ' : '') . $minutes . ' ' . __dn('cake', 'minute', 'minutes', $minutes); } else { // seconds only - $relativeDate .= ($relativeDate ? ', ' : '') . $seconds . ' ' . __n('second', 'seconds', $seconds); + $relativeDate .= ($relativeDate ? ', ' : '') . $seconds . ' ' . __dn('cake', 'second', 'seconds', $seconds); } if (!$backwards) { - $relativeDate = __('%s ago', $relativeDate); + $relativeDate = __d('cake', '%s ago', $relativeDate); } } return $relativeDate; @@ -666,7 +668,7 @@ class TimeHelper extends AppHelper { public function wasWithinLast($timeInterval, $dateString, $userOffset = null) { $tmp = str_replace(' ', '', $timeInterval); if (is_numeric($tmp)) { - $timeInterval = $tmp . ' ' . __('days'); + $timeInterval = $tmp . ' ' . __d('cake', 'days'); } $date = $this->fromString($dateString, $userOffset); @@ -750,4 +752,4 @@ class TimeHelper extends AppHelper { $format = $this->convertSpecifiers($format, $date); return strftime($format, $date); } -} +} \ No newline at end of file diff --git a/cake/libs/view/helper_collection.php b/lib/Cake/View/HelperCollection.php similarity index 86% rename from cake/libs/view/helper_collection.php rename to lib/Cake/View/HelperCollection.php index 4a6fd5d88..ee291525b 100644 --- a/cake/libs/view/helper_collection.php +++ b/lib/Cake/View/HelperCollection.php @@ -15,6 +15,9 @@ * @since CakePHP(tm) v 2.0 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ + +App::uses('ObjectCollection', 'Utility'); + class HelperCollection extends ObjectCollection { /** @@ -59,7 +62,7 @@ class HelperCollection extends ObjectCollection { $alias = $helper; $helper = $settings['className']; } - list($plugin, $name) = pluginSplit($helper); + list($plugin, $name) = pluginSplit($helper, true); if (!isset($alias)) { $alias = $name; } @@ -68,19 +71,12 @@ class HelperCollection extends ObjectCollection { return $this->_loaded[$alias]; } $helperClass = $name . 'Helper'; + App::uses($helperClass, $plugin . 'View/Helper'); if (!class_exists($helperClass)) { - if (!App::import('Helper', $helper)) { - throw new MissingHelperFileException(array( - 'class' => $helperClass, - 'file' => Inflector::underscore($name) . '.php' - )); - } - if (!class_exists($helperClass)) { - throw new MissingHelperClassException(array( - 'class' => $helperClass, - 'file' => Inflector::underscore($name) . '.php' - )); - } + throw new MissingHelperClassException(array( + 'class' => $helperClass, + 'file' => $helperClass . '.php' + )); } $this->_loaded[$alias] = new $helperClass($this->_View, $settings); diff --git a/cake/libs/view/media.php b/lib/Cake/View/MediaView.php similarity index 98% rename from cake/libs/view/media.php rename to lib/Cake/View/MediaView.php index a2b9c1cff..70e92979c 100644 --- a/cake/libs/view/media.php +++ b/lib/Cake/View/MediaView.php @@ -16,7 +16,8 @@ * @since CakePHP(tm) v 1.2.0.5714 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('View', 'View', false); +App::uses('View', 'View'); +App::uses('CakeRequest', 'Network'); /** * Media View provides a custom view implementation for sending files to visitors. Its great @@ -78,7 +79,6 @@ class MediaView extends View { if (is_object($controller) && isset($controller->response)) { $this->response = $controller->response; } else { - App::import('Core', 'CakeRequest'); $this->response = new CakeResponse; } } diff --git a/cake/libs/view/scaffold.php b/lib/Cake/View/ScaffoldView.php similarity index 95% rename from cake/libs/view/scaffold.php rename to lib/Cake/View/ScaffoldView.php index 6f051a211..746e84eea 100644 --- a/cake/libs/view/scaffold.php +++ b/lib/Cake/View/ScaffoldView.php @@ -18,7 +18,7 @@ * @since Cake v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('View', 'Theme'); +App::uses('ThemeView', 'View'); /** * ScaffoldView provides specific view file loading features for scaffolded views. @@ -80,7 +80,7 @@ class ScaffoldView extends ThemeView { } if ($name === 'scaffolds' . DS . $subDir . 'error') { - return LIBS . 'view' . DS . 'errors' . DS . 'scaffold_error.ctp'; + return LIBS . 'View' . DS . 'errors' . DS . 'scaffold_error.ctp'; } throw new MissingViewException($paths[0] . $name . $this->ext); diff --git a/cake/libs/view/theme.php b/lib/Cake/View/ThemeView.php similarity index 96% rename from cake/libs/view/theme.php rename to lib/Cake/View/ThemeView.php index 544aacdc3..df85282b7 100644 --- a/cake/libs/view/theme.php +++ b/lib/Cake/View/ThemeView.php @@ -16,7 +16,7 @@ * @since CakePHP(tm) v 0.10.0.1076 * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -App::import('View', 'View'); +App::uses('View', 'View'); /** * Theme view class @@ -58,7 +58,7 @@ class ThemeView extends View { $count = count($paths); for ($i = 0; $i < $count; $i++) { if (strpos($paths[$i], DS . 'plugins' . DS) === false - && strpos($paths[$i], DS . 'libs' . DS . 'view') === false) { + && strpos($paths[$i], DS . 'Cake' . DS . 'View') === false) { if ($plugin) { $themePaths[] = $paths[$i] . 'themed'. DS . $this->theme . DS . 'plugins' . DS . $plugin . DS; } diff --git a/cake/libs/view/view.php b/lib/Cake/View/View.php similarity index 97% rename from cake/libs/view/view.php rename to lib/Cake/View/View.php index 89d5ae5d5..05e3c9a6f 100644 --- a/cake/libs/view/view.php +++ b/lib/Cake/View/View.php @@ -20,8 +20,8 @@ /** * Included libraries. */ -App::import('View', 'HelperCollection', false); -App::import('View', 'Helper', false); +App::uses('HelperCollection', 'View'); +App::uses('Router', 'Routing'); /** * View, the V in the MVC triad. View interacts with Helpers and view variables passed @@ -396,7 +396,7 @@ class View extends Object { $layout = $this->layout; } if ($this->output === false) { - throw new CakeException(__("Error in view %s, got no content.", $viewFileName)); + throw new CakeException(__d('cake_dev', "Error in view %s, got no content.", $viewFileName)); } if ($layout && $this->autoLayout) { $this->output = $this->renderLayout($this->output, $layout); @@ -439,7 +439,7 @@ class View extends Object { $this->output = $this->_render($layoutFileName); if ($this->output === false) { - throw new CakeException(__("Error in layout %s, got no content.", $layoutFileName)); + throw new CakeException(__d('cake_dev', "Error in layout %s, got no content.", $layoutFileName)); } $this->Helpers->trigger('afterLayout', array($layoutFileName)); @@ -687,7 +687,7 @@ class View extends Object { if (strpos($name, DS) === false && $name[0] !== '.') { $name = $this->viewPath . DS . $subDir . Inflector::underscore($name); } elseif (strpos($name, DS) !== false) { - if ($name{0} === DS || $name{1} === ':') { + if ($name[0] === DS || $name[1] === ':') { if (is_file($name)) { return $name; } @@ -799,8 +799,8 @@ class View extends Object { return $this->__paths; } $paths = array(); - $viewPaths = App::path('views'); - $corePaths = array_flip(App::core('views')); + $viewPaths = App::path('View'); + $corePaths = array_flip(App::core('View')); if (!empty($plugin)) { $count = count($viewPaths); @@ -809,9 +809,10 @@ class View extends Object { $paths[] = $viewPaths[$i] . 'plugins' . DS . $plugin . DS; } } - $paths[] = App::pluginPath($plugin) . 'views' . DS; + $paths = array_merge($paths, App::path('View', $plugin)); } - $this->__paths = array_merge($paths, $viewPaths); + + $this->__paths = array_unique(array_merge($paths, $viewPaths, array_keys($corePaths))); return $this->__paths; } } diff --git a/cake/libs/view/elements/email/html/default.ctp b/lib/Cake/View/elements/email/html/default.ctp similarity index 100% rename from cake/libs/view/elements/email/html/default.ctp rename to lib/Cake/View/elements/email/html/default.ctp diff --git a/cake/libs/view/elements/email/text/default.ctp b/lib/Cake/View/elements/email/text/default.ctp similarity index 100% rename from cake/libs/view/elements/email/text/default.ctp rename to lib/Cake/View/elements/email/text/default.ctp diff --git a/cake/libs/view/elements/exception_stack_trace.ctp b/lib/Cake/View/elements/exception_stack_trace.ctp similarity index 100% rename from cake/libs/view/elements/exception_stack_trace.ctp rename to lib/Cake/View/elements/exception_stack_trace.ctp diff --git a/cake/libs/view/elements/sql_dump.ctp b/lib/Cake/View/elements/sql_dump.ctp similarity index 100% rename from cake/libs/view/elements/sql_dump.ctp rename to lib/Cake/View/elements/sql_dump.ctp diff --git a/cake/libs/view/errors/error400.ctp b/lib/Cake/View/errors/error400.ctp similarity index 85% rename from cake/libs/view/errors/error400.ctp rename to lib/Cake/View/errors/error400.ctp index b6487ee91..38e1aedaa 100644 --- a/cake/libs/view/errors/error400.ctp +++ b/lib/Cake/View/errors/error400.ctp @@ -18,13 +18,13 @@ ?>

    - : + : '{$url}'" ); ?>

    - 0 ): echo $this->element('exception_stack_trace'); endif; diff --git a/cake/libs/view/errors/error500.ctp b/lib/Cake/View/errors/error500.ctp similarity index 85% rename from cake/libs/view/errors/error500.ctp rename to lib/Cake/View/errors/error500.ctp index f7b648ff6..247f2db78 100644 --- a/cake/libs/view/errors/error500.ctp +++ b/lib/Cake/View/errors/error500.ctp @@ -18,11 +18,11 @@ ?>

    - : - + : +

    - 0 ): echo $this->element('exception_stack_trace'); endif; -?> +?> \ No newline at end of file diff --git a/lib/Cake/View/errors/missing_action.ctp b/lib/Cake/View/errors/missing_action.ctp new file mode 100644 index 000000000..cac7d2e9b --- /dev/null +++ b/lib/Cake/View/errors/missing_action.ctp @@ -0,0 +1,43 @@ + +

    + : + ' . $action . '', '' . $controller . ''); ?> +

    +

    + : + ' . $controller . '::', '' . $action . '()', APP_DIR . DS . 'controllers' . DS . Inflector::underscore($controller) . '.php'); ?> +

    +
    +<?php
+class  extends AppController {
+
+
+	function  {
+
+	}
+
+}
+?>
+
    +

    + : + +

    +element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/cake/libs/view/errors/missing_behavior_class.ctp b/lib/Cake/View/errors/missing_behavior_class.ctp similarity index 52% rename from cake/libs/view/errors/missing_behavior_class.ctp rename to lib/Cake/View/errors/missing_behavior_class.ctp index e7c454069..3bc4dcb67 100644 --- a/cake/libs/view/errors/missing_behavior_class.ctp +++ b/lib/Cake/View/errors/missing_behavior_class.ctp @@ -16,14 +16,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

    +

    - : - %s can not be found or does not exist.', $class); ?> + : + %s can not be found or does not exist.', $class); ?>

    - : - + : + 

     <?php
@@ -33,8 +33,8 @@ class  extends ModelBehavior {
 ?>

    - : - + : +

    -element('exception_stack_trace'); ?> +element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/cake/libs/view/errors/missing_behavior_file.ctp b/lib/Cake/View/errors/missing_behavior_file.ctp similarity index 50% rename from cake/libs/view/errors/missing_behavior_file.ctp rename to lib/Cake/View/errors/missing_behavior_file.ctp index 09e90b350..aa3e314c2 100644 --- a/cake/libs/view/errors/missing_behavior_file.ctp +++ b/lib/Cake/View/errors/missing_behavior_file.ctp @@ -16,14 +16,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

    +

    - : - + : +

    - : - + : + 

     <?php
@@ -33,8 +33,8 @@ class  extends ModelBehavior {
 ?>

    - : - + : +

    -element('exception_stack_trace'); ?> +element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/cake/libs/view/errors/missing_component_class.ctp b/lib/Cake/View/errors/missing_component_class.ctp similarity index 51% rename from cake/libs/view/errors/missing_component_class.ctp rename to lib/Cake/View/errors/missing_component_class.ctp index cf06671dc..4465edba2 100644 --- a/cake/libs/view/errors/missing_component_class.ctp +++ b/lib/Cake/View/errors/missing_component_class.ctp @@ -16,14 +16,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

    +

    - : - ' . $class . ''); ?> + : + ' . $class . ''); ?>

    - : - ' . $class . '', APP_DIR . DS . 'controllers' . DS . 'components' . DS . $file); ?> + : + ' . $class . '', APP_DIR . DS . 'controllers' . DS . 'components' . DS . $file); ?> 

     <?php
@@ -33,8 +33,8 @@ class  extends Component {
    
 ?>

    - : - + : +

    element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/cake/libs/view/errors/missing_component_file.ctp b/lib/Cake/View/errors/missing_component_file.ctp similarity index 52% rename from cake/libs/view/errors/missing_component_file.ctp rename to lib/Cake/View/errors/missing_component_file.ctp index 527afc9c3..aeb8c3269 100644 --- a/cake/libs/view/errors/missing_component_file.ctp +++ b/lib/Cake/View/errors/missing_component_file.ctp @@ -16,14 +16,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

    +

    - : - + : +

    - : - ' . $class . '', APP_DIR . DS . 'controllers' . DS . 'components' . DS . $file); ?> + : + ' . $class . '', APP_DIR . DS . 'controllers' . DS . 'components' . DS . $file); ?> 

     <?php
@@ -33,8 +33,8 @@ class  extends Component {
    
 ?>

    - : - + : +

    element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/cake/libs/view/errors/missing_connection.ctp b/lib/Cake/View/errors/missing_connection.ctp similarity index 51% rename from cake/libs/view/errors/missing_connection.ctp rename to lib/Cake/View/errors/missing_connection.ctp index dfda66e3a..ae4887b8a 100644 --- a/cake/libs/view/errors/missing_connection.ctp +++ b/lib/Cake/View/errors/missing_connection.ctp @@ -16,18 +16,18 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

    +

    - : - + : +

    - : - + : +

    - : - + : +

    element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/cake/libs/view/errors/missing_controller.ctp b/lib/Cake/View/errors/missing_controller.ctp similarity index 51% rename from cake/libs/view/errors/missing_controller.ctp rename to lib/Cake/View/errors/missing_controller.ctp index 7f9e7d27f..b57193943 100644 --- a/cake/libs/view/errors/missing_controller.ctp +++ b/lib/Cake/View/errors/missing_controller.ctp @@ -16,14 +16,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

    +

    - : - ' . $controller . ''); ?> + : + ' . $controller . ''); ?>

    - : - ' . $controller . '', APP_DIR . DS . 'controllers' . DS . Inflector::underscore($controller) . '.php'); ?> + : + ' . $controller . '', APP_DIR . DS . 'controllers' . DS . Inflector::underscore($controller) . '.php'); ?> 

     <?php
@@ -33,8 +33,8 @@ class  extends AppController {
 ?>

    - : - + : +

    -element('exception_stack_trace'); ?> +element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/cake/libs/view/errors/missing_database.ctp b/lib/Cake/View/errors/missing_database.ctp similarity index 51% rename from cake/libs/view/errors/missing_database.ctp rename to lib/Cake/View/errors/missing_database.ctp index 7aa2d5e80..e7764506f 100644 --- a/cake/libs/view/errors/missing_database.ctp +++ b/lib/Cake/View/errors/missing_database.ctp @@ -16,18 +16,18 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

    +

    - : - + : +

    - : - + : +

    - : - + : +

    element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/cake/libs/view/errors/missing_datasource_config.ctp b/lib/Cake/View/errors/missing_datasource_config.ctp similarity index 54% rename from cake/libs/view/errors/missing_datasource_config.ctp rename to lib/Cake/View/errors/missing_datasource_config.ctp index 64c7d4c13..de6503a5a 100644 --- a/cake/libs/view/errors/missing_datasource_config.ctp +++ b/lib/Cake/View/errors/missing_datasource_config.ctp @@ -16,14 +16,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

    +

    - : - ' . $config . ''); ?> + : + ' . $config . ''); ?>

    - : - + : +

    element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/cake/libs/view/errors/missing_datasource_file.ctp b/lib/Cake/View/errors/missing_datasource_file.ctp similarity index 56% rename from cake/libs/view/errors/missing_datasource_file.ctp rename to lib/Cake/View/errors/missing_datasource_file.ctp index 0d53072fb..3833504be 100644 --- a/cake/libs/view/errors/missing_datasource_file.ctp +++ b/lib/Cake/View/errors/missing_datasource_file.ctp @@ -16,14 +16,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

    +

    - : - ' . $class . ''); ?> + : + ' . $class . ''); ?>

    - : - + : +

    element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/cake/libs/view/errors/missing_helper_class.ctp b/lib/Cake/View/errors/missing_helper_class.ctp similarity index 52% rename from cake/libs/view/errors/missing_helper_class.ctp rename to lib/Cake/View/errors/missing_helper_class.ctp index 842ded905..9117c87d5 100644 --- a/cake/libs/view/errors/missing_helper_class.ctp +++ b/lib/Cake/View/errors/missing_helper_class.ctp @@ -16,14 +16,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

    +

    - : - %s can not be found or does not exist.', $class); ?> + : + %s can not be found or does not exist.', $class); ?>

    - : - + : + 

     <?php
@@ -33,8 +33,8 @@ class  extends AppHelper {
 ?>

    - : - + : +

    element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/cake/libs/view/errors/missing_helper_file.ctp b/lib/Cake/View/errors/missing_helper_file.ctp similarity index 51% rename from cake/libs/view/errors/missing_helper_file.ctp rename to lib/Cake/View/errors/missing_helper_file.ctp index 6ba0e9b6f..94f90f1e2 100644 --- a/cake/libs/view/errors/missing_helper_file.ctp +++ b/lib/Cake/View/errors/missing_helper_file.ctp @@ -16,14 +16,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

    +

    - : - + : +

    - : - + : + 

     <?php
@@ -33,8 +33,8 @@ class  extends AppHelper {
 ?>

    - : - + : +

    element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/cake/libs/view/errors/missing_layout.ctp b/lib/Cake/View/errors/missing_layout.ctp similarity index 50% rename from cake/libs/view/errors/missing_layout.ctp rename to lib/Cake/View/errors/missing_layout.ctp index 011e59a64..ed35e35ab 100644 --- a/cake/libs/view/errors/missing_layout.ctp +++ b/lib/Cake/View/errors/missing_layout.ctp @@ -16,18 +16,18 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

    +

    - : - ' . $file . ''); ?> + : + ' . $file . ''); ?>

    - : - ' . $file . ''); ?> + : + ' . $file . ''); ?>

    - : - + : +

    element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/cake/libs/view/errors/missing_table.ctp b/lib/Cake/View/errors/missing_table.ctp similarity index 55% rename from cake/libs/view/errors/missing_table.ctp rename to lib/Cake/View/errors/missing_table.ctp index 1288dd06a..572579e0c 100644 --- a/cake/libs/view/errors/missing_table.ctp +++ b/lib/Cake/View/errors/missing_table.ctp @@ -16,14 +16,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

    +

    - : - ' . $table . '', '' . $class . ''); ?> + : + ' . $table . '', '' . $class . ''); ?>

    - : - + : +

    element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/lib/Cake/View/errors/missing_view.ctp b/lib/Cake/View/errors/missing_view.ctp new file mode 100644 index 000000000..1e9727719 --- /dev/null +++ b/lib/Cake/View/errors/missing_view.ctp @@ -0,0 +1,33 @@ + +

    +

    + : + ' . Inflector::camelize($this->request->controller) . 'Controller::', '' . $this->request->action . '()'); ?> +

    +

    + : + +

    +

    + : + +

    + +element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/cake/libs/view/errors/private_action.ctp b/lib/Cake/View/errors/private_action.ctp similarity index 55% rename from cake/libs/view/errors/private_action.ctp rename to lib/Cake/View/errors/private_action.ctp index 833f42112..e36a784eb 100644 --- a/cake/libs/view/errors/private_action.ctp +++ b/lib/Cake/View/errors/private_action.ctp @@ -16,14 +16,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

    +

    - : - ' . $controller . '::', '' . $action . '()'); ?> + : + ' . $controller . '::', '' . $action . '()'); ?>

    - : - + : +

    element('exception_stack_trace'); ?> \ No newline at end of file diff --git a/cake/libs/view/errors/scaffold_error.ctp b/lib/Cake/View/errors/scaffold_error.ctp similarity index 60% rename from cake/libs/view/errors/scaffold_error.ctp rename to lib/Cake/View/errors/scaffold_error.ctp index 40f09c90a..2df21dcc1 100644 --- a/cake/libs/view/errors/scaffold_error.ctp +++ b/lib/Cake/View/errors/scaffold_error.ctp @@ -16,14 +16,14 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ ?> -

    +

    - : - + : +

    - : - + : + 

     <?php
diff --git a/cake/libs/view/layouts/ajax.ctp b/lib/Cake/View/layouts/ajax.ctp
similarity index 100%
rename from cake/libs/view/layouts/ajax.ctp
rename to lib/Cake/View/layouts/ajax.ctp
diff --git a/cake/libs/view/layouts/default.ctp b/lib/Cake/View/layouts/default.ctp
similarity index 81%
rename from cake/libs/view/layouts/default.ctp
rename to lib/Cake/View/layouts/default.ctp
index 5575c7329..944b2f48c 100644
--- a/cake/libs/view/layouts/default.ctp
+++ b/lib/Cake/View/layouts/default.ctp
@@ -15,13 +15,15 @@
  * @since         CakePHP(tm) v 0.10.0.1076
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+
+$cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework');
 ?>
 
 
 
 	Html->charset(); ?>
 	
-		<?php echo __('CakePHP: the rapid development php framework:'); ?>
+		<?php echo $cakeDescription ?>:
 		<?php echo $title_for_layout; ?>
 	
 	
 	
    
 		
 		
    
 
@@ -46,7 +48,7 @@
 		
    
 		
 
    
-	
    
+	
    
 	
      
 request->action != 'add'): ?>
 		
    • Form->postLink(
-			__('Delete'),
+			__d('cake', 'Delete'),
 			array('action' => 'delete', $this->Form->value($modelClass . '.' . $primaryKey)),
 			null,
-			__('Are you sure you want to delete # %s?', $this->Form->value($modelClass . '.' . $primaryKey)));
+			__d('cake', 'Are you sure you want to delete # %s?', $this->Form->value($modelClass . '.' . $primaryKey)));
 		?>
      • 
 
-		
    • Html->link(__('List') . ' ' . $pluralHumanName, array('action' => 'index'));?>
      • 
+		
    • Html->link(__d('cake', 'List') . ' ' . $pluralHumanName, array('action' => 'index'));?>
      • 
  $_data) {
 			foreach ($_data as $_alias => $_details) {
 				if ($_details['controller'] != $this->name && !in_array($_details['controller'], $done)) {
-					echo "\t\t
    • " . $this->Html->link(__('List %s', Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' =>'index')) . "
      • \n";
-					echo "\t\t
    • " . $this->Html->link(__('New %s', Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' =>'add')) . "
      • \n";
+					echo "\t\t
    • " . $this->Html->link(__d('cake', 'List %s', Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' =>'index')) . "
      • \n";
+					echo "\t\t
    • " . $this->Html->link(__d('cake', 'New %s', Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' =>'add')) . "
      • \n";
 					$done[] = $_details['controller'];
 				}
 			}
diff --git a/cake/libs/view/scaffolds/index.ctp b/lib/Cake/View/scaffolds/index.ctp
similarity index 63%
rename from cake/libs/view/scaffolds/index.ctp
rename to lib/Cake/View/scaffolds/index.ctp
index c3da1d4d8..d0def968e 100644
--- a/cake/libs/view/scaffolds/index.ctp
+++ b/lib/Cake/View/scaffolds/index.ctp
@@ -23,7 +23,7 @@
 
 	Paginator->sort($_field);?>
 
-	
+	
 
 ';
-		echo $this->Html->link(__('View'), array('action' => 'view', ${$singularVar}[$modelClass][$primaryKey]));
-		echo $this->Html->link(__('Edit'), array('action' => 'edit', ${$singularVar}[$modelClass][$primaryKey]));
+		echo $this->Html->link(__d('cake', 'View'), array('action' => 'view', ${$singularVar}[$modelClass][$primaryKey]));
+		echo $this->Html->link(__d('cake', 'Edit'), array('action' => 'edit', ${$singularVar}[$modelClass][$primaryKey]));
 		echo $this->Form->postLink(
-			__('Delete'), 
+			__d('cake', 'Delete'), 
 			array('action' => 'delete', ${$singularVar}[$modelClass][$primaryKey]), 
 			null,
-			__('Are you sure you want to delete').' #' . ${$singularVar}[$modelClass][$primaryKey]
+			__d('cake', 'Are you sure you want to delete').' #' . ${$singularVar}[$modelClass][$primaryKey]
 		);
 		echo '';
 	echo '';
@@ -67,26 +67,26 @@ endforeach;
 
 	
      Paginator->counter(array(
-		'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%')
+		'format' => __d('cake', 'Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%')
 	));
 	?>
      
 	
      
-	Paginator->prev('<< ' . __('previous'), array(), null, array('class' => 'disabled')); ?>
+	Paginator->prev('<< ' . __d('cake', 'previous'), array(), null, array('class' => 'disabled')); ?>
 	 | Paginator->numbers(); ?>
-	Paginator->next(__('next') .' >>', array(), null, array('class' => 'disabled')); ?>
+	Paginator->next(__d('cake', 'next') .' >>', array(), null, array('class' => 'disabled')); ?>
 	
      
 
    
 
    
-	
    
+	
    
 	
      
-		
    • Html->link(__('New %s', $singularHumanName), array('action' => 'add')); ?>
      • 
+		
    • Html->link(__d('cake', 'New %s', $singularHumanName), array('action' => 'add')); ?>
      • 
  $_data) {
 			foreach ($_data as $_alias => $_details) {
 				if ($_details['controller'] != $this->name && !in_array($_details['controller'], $done)) {
-					echo "
    • " . $this->Html->link(__('List %s', Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index')) . "
      • ";
-					echo "
    • " . $this->Html->link(__('New %s', Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add')) . "
      • ";
+					echo "
    • " . $this->Html->link(__d('cake', 'List %s', Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index')) . "
      • ";
+					echo "
    • " . $this->Html->link(__d('cake', 'New %s', Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add')) . "
      • ";
 					$done[] = $_details['controller'];
 				}
 			}
diff --git a/cake/libs/view/scaffolds/view.ctp b/lib/Cake/View/scaffolds/view.ctp
similarity index 60%
rename from cake/libs/view/scaffolds/view.ctp
rename to lib/Cake/View/scaffolds/view.ctp
index 010450a15..ef2fe7006 100644
--- a/cake/libs/view/scaffolds/view.ctp
+++ b/lib/Cake/View/scaffolds/view.ctp
@@ -17,7 +17,7 @@
  */
 ?>
 
      
-
      
+
      
 	
      
 
 
      
 
      
-	
      
+	
      
 	
        
 " .$this->Html->link(__('Edit %s', $singularHumanName),   array('action' => 'edit', ${$singularVar}[$modelClass][$primaryKey])). " \n";
-	echo "\t\t
      • " .$this->Html->link(__('Delete %s', $singularHumanName), array('action' => 'delete', ${$singularVar}[$modelClass][$primaryKey]), null, __('Are you sure you want to delete').' #' . ${$singularVar}[$modelClass][$primaryKey] . '?'). " 
        • \n";
-	echo "\t\t
      • " .$this->Html->link(__('List %s', $pluralHumanName), array('action' => 'index')). " 
        • \n";
-	echo "\t\t
      • " .$this->Html->link(__('New %s', $singularHumanName), array('action' => 'add')). " 
        • \n";
+	echo "\t\t
      • " .$this->Html->link(__d('cake', 'Edit %s', $singularHumanName),   array('action' => 'edit', ${$singularVar}[$modelClass][$primaryKey])). " 
        • \n";
+	echo "\t\t
      • " .$this->Html->link(__d('cake', 'Delete %s', $singularHumanName), array('action' => 'delete', ${$singularVar}[$modelClass][$primaryKey]), null, __d('cake', 'Are you sure you want to delete').' #' . ${$singularVar}[$modelClass][$primaryKey] . '?'). " 
        • \n";
+	echo "\t\t
      • " .$this->Html->link(__d('cake', 'List %s', $pluralHumanName), array('action' => 'index')). " 
        • \n";
+	echo "\t\t
      • " .$this->Html->link(__d('cake', 'New %s', $singularHumanName), array('action' => 'add')). " 
        • \n";
 
 	$done = array();
 	foreach ($associations as $_type => $_data) {
 		foreach ($_data as $_alias => $_details) {
 			if ($_details['controller'] != $this->name && !in_array($_details['controller'], $done)) {
-				echo "\t\t
      • " . $this->Html->link(__('List %s', Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index')) . "
        • \n";
-				echo "\t\t
      • " . $this->Html->link(__('New %s', Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add')) . "
        • \n";
+				echo "\t\t
      • " . $this->Html->link(__d('cake', 'List %s', Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index')) . "
        • \n";
+				echo "\t\t
      • " . $this->Html->link(__d('cake', 'New %s', Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add')) . "
        • \n";
 				$done[] = $_details['controller'];
 			}
 		}
@@ -71,7 +71,7 @@ foreach ($scaffoldFields as $_field) {
 if (!empty($associations['hasOne'])) :
 foreach ($associations['hasOne'] as $_alias => $_details): ?>
 
        
-	
        
+	
        
 
 	
        
  $_details): ?>
 
 	
        
 		
          
-			
        • Html->link(__('Edit %s', Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'edit', ${$singularVar}[$_alias][$_details['primaryKey']]))."
          • \n";?>
+			
        • Html->link(__d('cake', 'Edit %s', Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'edit', ${$singularVar}[$_alias][$_details['primaryKey']]))."
          • \n";?>
 		
        
 	
        
 
        
@@ -110,7 +110,7 @@ foreach ($relations as $_alias => $_details):
 $otherSingularVar = Inflector::variable($_alias);
 ?>
 
        
-	
        
+	
        
 
 	
@@ -140,9 +140,9 @@ $otherSingularVar = Inflector::variable($_alias);
 			}
 
 			echo "\t\t\t\n";
 		echo "\t\t\n";
 		endforeach;
@@ -151,7 +151,7 @@ $otherSingularVar = Inflector::variable($_alias);
 
        
 		
          
-			
        • Html->link(__("New %s", Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add'));?> 
          • 
+			
        • Html->link(__d('cake', "New %s", Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add'));?> 
          • 
 		
        
 	
        
diff --git a/cake/basics.php b/lib/Cake/basics.php
similarity index 97%
rename from cake/basics.php
rename to lib/Cake/basics.php
index ae14bb2cf..74f3690b3 100644
--- a/cake/basics.php
+++ b/lib/Cake/basics.php
@@ -464,9 +464,8 @@ if (!function_exists('sortByKey')) {
 		if (!$singular) {
 			return;
 		}
-		if (!class_exists('I18n')) {
-			App::import('Core', 'i18n');
-		}
+
+		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($singular);
 		if ($args === null) {
 			return $translated;
@@ -490,9 +489,8 @@ if (!function_exists('sortByKey')) {
 		if (!$singular) {
 			return;
 		}
-		if (!class_exists('I18n')) {
-			App::import('Core', 'i18n');
-		}
+
+		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($singular, $plural, null, 6, $count);
 		if ($args === null) {
 			return $translated;
@@ -514,9 +512,7 @@ if (!function_exists('sortByKey')) {
 		if (!$msg) {
 			return;
 		}
-		if (!class_exists('I18n')) {
-			App::import('Core', 'i18n');
-		}
+		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($msg, null, $domain);
 		if ($args === null) {
 			return $translated;
@@ -542,9 +538,7 @@ if (!function_exists('sortByKey')) {
 		if (!$singular) {
 			return;
 		}
-		if (!class_exists('I18n')) {
-			App::import('Core', 'i18n');
-		}
+		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($singular, $plural, $domain, 6, $count);
 		if ($args === null) {
 			return $translated;
@@ -581,9 +575,7 @@ if (!function_exists('sortByKey')) {
 		if (!$msg) {
 			return;
 		}
-		if (!class_exists('I18n')) {
-			App::import('Core', 'i18n');
-		}
+		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($msg, null, $domain, $category);
 		if ($args === null) {
 			return $translated;
@@ -624,9 +616,7 @@ if (!function_exists('sortByKey')) {
 		if (!$singular) {
 			return;
 		}
-		if (!class_exists('I18n')) {
-			App::import('Core', 'i18n');
-		}
+		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($singular, $plural, $domain, $category, $count);
 		if ($args === null) {
 			return $translated;
@@ -659,9 +649,7 @@ if (!function_exists('sortByKey')) {
 		if (!$msg) {
 			return;
 		}
-		if (!class_exists('I18n')) {
-			App::import('Core', 'i18n');
-		}
+		App::uses('I18n', 'I18n');
 		$translated = I18n::translate($msg, null, null, $category);
 		if ($args === null) {
 			return $translated;
@@ -677,9 +665,7 @@ if (!function_exists('sortByKey')) {
  * @param string $message Message to write to log
  */
 	function LogError($message) {
-		if (!class_exists('CakeLog')) {
-			App::import('Core', 'CakeLog');
-		}
+		App::uses('CakeLog', 'Log');
 		$bad = array("\n", "\r", "\t");
 		$good = ' ';
 		CakeLog::write('error', str_replace($bad, $good, $message));
diff --git a/cake/config/paths.php b/lib/Cake/bootstrap.php
similarity index 73%
rename from cake/config/paths.php
rename to lib/Cake/bootstrap.php
index 365cdb4c1..6d4acee64 100644
--- a/cake/config/paths.php
+++ b/lib/Cake/bootstrap.php
@@ -1,8 +1,8 @@
 addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'behavior_collection.test.php');
+		$path = CORE_TEST_CASES . DS . 'Model' . DS . 'Behavior' . DS;
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'Model' . DS . 'BehaviorCollectionTest.php');
 
-		$suite->addTestFile($path . 'acl.test.php');
-		$suite->addTestFile($path . 'containable.test.php');
-		$suite->addTestFile($path . 'translate.test.php');
-		$suite->addTestFile($path . 'tree.test.php');
+		$suite->addTestDirectory($path);
 		return $suite;
 	}
 }
diff --git a/cake/tests/cases/libs/all_cache_engines.test.php b/lib/Cake/tests/Case/AllCacheEnginesTest.php
similarity index 86%
rename from cake/tests/cases/libs/all_cache_engines.test.php
rename to lib/Cake/tests/Case/AllCacheEnginesTest.php
index 5c03437cd..29cf33a19 100644
--- a/cake/tests/cases/libs/all_cache_engines.test.php
+++ b/lib/Cake/tests/Case/AllCacheEnginesTest.php
@@ -33,9 +33,7 @@ class AllCacheEnginesTest extends PHPUnit_Framework_TestSuite {
  */
 	public static function suite() {
 		$suite = new CakeTestSuite('All Cache related class tests');
-
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'cache.test.php');
-		$suite->addTestDirectory(CORE_TEST_CASES . DS . 'libs' . DS . 'cache');
+		$suite->addTestDirectory(CORE_TEST_CASES . DS . 'Cache');
 		return $suite;
 	}
 }
diff --git a/cake/tests/cases/libs/all_components.test.php b/lib/Cake/tests/Case/AllComponentsTest.php
similarity index 70%
rename from cake/tests/cases/libs/all_components.test.php
rename to lib/Cake/tests/Case/AllComponentsTest.php
index 480c93219..f9d7358eb 100644
--- a/cake/tests/cases/libs/all_components.test.php
+++ b/lib/Cake/tests/Case/AllComponentsTest.php
@@ -34,10 +34,10 @@ class AllComponentsTest extends PHPUnit_Framework_TestSuite {
 	public static function suite() {
 		$suite = new CakeTestSuite('All component class tests');
 
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'component.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'component_collection.test.php');
-		$suite->addTestDirectory(CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'components');
-		$suite->addTestDirectory(CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'components' . DS . 'auth');
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'Controller' . DS . 'ComponentTest.php');
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'Controller' . DS . 'ComponentCollectionTest.php');
+		$suite->addTestDirectory(CORE_TEST_CASES . DS . 'Controller' . DS . 'Component');
+		$suite->addTestDirectory(CORE_TEST_CASES . DS . 'Controller' . DS . 'Component' . DS . 'Auth');
 		return $suite;
 	}
 }
diff --git a/cake/tests/cases/libs/all_configure.test.php b/lib/Cake/tests/Case/AllConfigureTest.php
similarity index 69%
rename from cake/tests/cases/libs/all_configure.test.php
rename to lib/Cake/tests/Case/AllConfigureTest.php
index 6e35aef74..22c6f216e 100644
--- a/cake/tests/cases/libs/all_configure.test.php
+++ b/lib/Cake/tests/Case/AllConfigureTest.php
@@ -32,12 +32,10 @@ class AllConfigureTest extends PHPUnit_Framework_TestSuite {
  * @return void
  */
 	public static function suite() {
-		$suite = new CakeTestSuite('All Configure, App and ClassRegistry related tests');
+		$suite = new CakeTestSuite('All Configure and Core related tests');
 
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'configure.test.php');
-		$suite->addTestDirectory(CORE_TEST_CASES . DS . 'libs' . DS . 'config');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'app.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'class_registry.test.php');
+		$suite->addTestDirectory(CORE_TEST_CASES . DS . 'Core');
+		$suite->addTestDirectory(CORE_TEST_CASES . DS . 'Configure');
 		return $suite;
 	}
 }
diff --git a/cake/tests/cases/libs/all_controllers.test.php b/lib/Cake/tests/Case/AllControllersTest.php
similarity index 60%
rename from cake/tests/cases/libs/all_controllers.test.php
rename to lib/Cake/tests/Case/AllControllersTest.php
index 8164896d9..71f2bec62 100644
--- a/cake/tests/cases/libs/all_controllers.test.php
+++ b/lib/Cake/tests/Case/AllControllersTest.php
@@ -32,13 +32,13 @@ class AllControllersTest extends PHPUnit_Framework_TestSuite {
  * @return void
  */
 	public static function suite() {
-		$suite = new PHPUnit_Framework_TestSuite('All Controller related class tests');
+		$suite = new CakeTestSuite('All Controller related class tests');
 
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'controller.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'scaffold.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'pages_controller.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'component.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'controller_merge_vars.test.php');
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'Controller' . DS . 'ControllerTest.php');
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'Controller' . DS . 'ScaffoldTest.php');
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'Controller' . DS . 'PagesControllerTest.php');
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'Controller' . DS . 'ComponentTest.php');
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'Controller' . DS . 'ControllerMergeVarsTest.php');
 		return $suite;
 	}
 }
\ No newline at end of file
diff --git a/cake/tests/cases/libs/all_database.test.php b/lib/Cake/tests/Case/AllDatabaseTest.php
similarity index 75%
rename from cake/tests/cases/libs/all_database.test.php
rename to lib/Cake/tests/Case/AllDatabaseTest.php
index 21cef27b6..d4f0ba82f 100644
--- a/cake/tests/cases/libs/all_database.test.php
+++ b/lib/Cake/tests/Case/AllDatabaseTest.php
@@ -34,18 +34,18 @@ class AllDatabaseTest extends PHPUnit_Framework_TestSuite {
 	public static function suite() {
 		$suite = new PHPUnit_Framework_TestSuite('Datasources, Schema and DbAcl tests');
 
-		$path = CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS;
+		$path = CORE_TEST_CASES . DS . 'Model' . DS;
 		$tasks = array(
-			'db_acl',
-			'cake_schema',
-			'connection_manager',
-			'datasources' . DS . 'dbo_source',
-			'datasources' . DS . 'dbo' . DS . 'dbo_mysql',
-			'datasources' . DS . 'dbo' . DS . 'dbo_postgres',
-			'datasources' . DS . 'dbo' . DS . 'dbo_sqlite'
+			'DbAcl',
+			'CakeSchema',
+			'ConnectionManager',
+			'Datasource' . DS . 'DboSource',
+			'Datasource' . DS . 'Database' . DS . 'MySql',
+			'Datasource' . DS . 'Database' . DS . 'Postgres',
+			'Datasource' . DS . 'Database' . DS . 'Sqlite'
 		);
 		foreach ($tasks as $task) {
-			$suite->addTestFile($path . $task . '.test.php');
+			$suite->addTestFile($path . $task . 'Test.php');
 		}
 		return $suite;
 	}
diff --git a/cake/tests/cases/libs/all_error.test.php b/lib/Cake/tests/Case/AllErrorTest.php
similarity index 83%
rename from cake/tests/cases/libs/all_error.test.php
rename to lib/Cake/tests/Case/AllErrorTest.php
index b64c87542..4d18079d1 100644
--- a/cake/tests/cases/libs/all_error.test.php
+++ b/lib/Cake/tests/Case/AllErrorTest.php
@@ -34,10 +34,10 @@ class AllErrorTest extends PHPUnit_Framework_TestSuite {
 	public static function suite() {
 		$suite = new PHPUnit_Framework_TestSuite('All Error handling tests');
 
-		$libs = CORE_TEST_CASES . DS . 'libs' . DS;
+		$libs = CORE_TEST_CASES . DS;
 
-		$suite->addTestFile($libs . 'error' . DS . 'error_handler.test.php');
-		$suite->addTestFile($libs . 'error' . DS . 'exception_renderer.test.php');
+		$suite->addTestFile($libs . 'Error' . DS . 'ErrorHandlerTest.php');
+		$suite->addTestFile($libs . 'Error' . DS . 'ExceptionRendererTest.php');
 		return $suite;
 	}
 }
diff --git a/cake/tests/cases/libs/all_helpers.test.php b/lib/Cake/tests/Case/AllHelpersTest.php
similarity index 77%
rename from cake/tests/cases/libs/all_helpers.test.php
rename to lib/Cake/tests/Case/AllHelpersTest.php
index 247a10deb..460fce9ee 100644
--- a/cake/tests/cases/libs/all_helpers.test.php
+++ b/lib/Cake/tests/Case/AllHelpersTest.php
@@ -35,9 +35,9 @@ class AllHelpersTest extends PHPUnit_Framework_TestSuite {
 	public static function suite() {
 		$suite = new CakeTestSuite('All Helper tests');
 
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'view' . DS . 'helper.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'view' . DS . 'helper_collection.test.php');
-		$suite->addTestDirectory(CORE_TEST_CASES . DS . 'libs' . DS . 'view' . DS . 'helpers' . DS);
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'View' . DS . 'HelperTest.php');
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'View' . DS . 'HelperCollectionTest.php');
+		$suite->addTestDirectory(CORE_TEST_CASES . DS . 'View' . DS . 'Helper' . DS);
 		return $suite;
 	}
 }
diff --git a/cake/tests/cases/libs/all_js_helpers.test.php b/lib/Cake/tests/Case/AllJsHelpersTest.php
similarity index 75%
rename from cake/tests/cases/libs/all_js_helpers.test.php
rename to lib/Cake/tests/Case/AllJsHelpersTest.php
index 9dd0ab750..820291bbb 100644
--- a/cake/tests/cases/libs/all_js_helpers.test.php
+++ b/lib/Cake/tests/Case/AllJsHelpersTest.php
@@ -34,11 +34,11 @@ class AllJavascriptHelpersTest extends PHPUnit_Framework_TestSuite {
 	public static function suite() {
 		$suite = new PHPUnit_Framework_TestSuite('Js Helper and all Engine Helpers');
 
-		$helperTestPath = CORE_TEST_CASES . DS . 'libs' . DS . 'view' . DS . 'helpers' . DS;
-		$suite->addTestFile($helperTestPath . 'js.test.php');
-		$suite->addTestFile($helperTestPath . 'jquery_engine.test.php');
-		$suite->addTestFile($helperTestPath . 'mootools_engine.test.php');
-		$suite->addTestFile($helperTestPath . 'prototype_engine.test.php');
+		$helperTestPath = CORE_TEST_CASES . DS .  'View' . DS . 'Helper' . DS;
+		$suite->addTestFile($helperTestPath . 'JsHelperTest.php');
+		$suite->addTestFile($helperTestPath . 'JqueryEngineHelperTest.php');
+		$suite->addTestFile($helperTestPath . 'MootoolsEngineHelperTest.php');
+		$suite->addTestFile($helperTestPath . 'PrototypeEngineHelperTest.php');
 		return $suite;
 	}
 }
diff --git a/lib/Cake/tests/Case/AllLibsTest.php b/lib/Cake/tests/Case/AllLibsTest.php
new file mode 100644
index 000000000..73a331385
--- /dev/null
+++ b/lib/Cake/tests/Case/AllLibsTest.php
@@ -0,0 +1,44 @@
+addTestFile(CORE_TEST_CASES . DS . 'BasicsTest.php');
+		$suite->addTestDirectory(CORE_TEST_CASES . DS . 'Utility');
+		$suite->addTestDirectory(CORE_TEST_CASES . DS . 'Log');
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'Model' . DS . 'Datasource' . DS . 'CakeSessionTest.php');
+		//$suite->addTestDirectory(CORE_TEST_CASES . DS . 'Model' . DS . 'Datasource' . DS . 'Session');
+		return $suite;
+	}
+}
\ No newline at end of file
diff --git a/cake/tests/cases/libs/all_localization.test.php b/lib/Cake/tests/Case/AllLocalizationTest.php
similarity index 75%
rename from cake/tests/cases/libs/all_localization.test.php
rename to lib/Cake/tests/Case/AllLocalizationTest.php
index d30ab86b0..47bfe6a79 100644
--- a/cake/tests/cases/libs/all_localization.test.php
+++ b/lib/Cake/tests/Case/AllLocalizationTest.php
@@ -32,11 +32,9 @@ class AllLocalizationTest extends PHPUnit_Framework_TestSuite {
  * @return void
  */
 	public static function suite() {
-		$suite = new PHPUnit_Framework_TestSuite('All localization class tests');
+		$suite = new CakeTestSuite('All localization class tests');
 
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'i18n.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'l10n.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'multibyte.test.php');
+		$suite->addTestDirectory(CORE_TEST_CASES . DS . 'I18n');
 		return $suite;
 	}
 }
diff --git a/cake/tests/cases/libs/all_model.test.php b/lib/Cake/tests/Case/AllModelTest.php
similarity index 66%
rename from cake/tests/cases/libs/all_model.test.php
rename to lib/Cake/tests/Case/AllModelTest.php
index bf968b0c3..e9c9f8184 100644
--- a/cake/tests/cases/libs/all_model.test.php
+++ b/lib/Cake/tests/Case/AllModelTest.php
@@ -34,11 +34,10 @@ class AllModelTest extends PHPUnit_Framework_TestSuite {
 	public static function suite() {
 		$suite = new PHPUnit_Framework_TestSuite('All Model related class tests');
 
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'behavior_collection.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model_read.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model_write.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model_validation.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model_integration.test.php');
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'Model' . DS . 'ModelReadTest.php');
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'Model' . DS . 'ModelWriteTest.php');
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'Model' . DS . 'ModelValidationTest.php');
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'Model' . DS . 'ModelIntegrationTest.php');
 		return $suite;
 	}
 }
\ No newline at end of file
diff --git a/cake/tests/cases/libs/all_routing.test.php b/lib/Cake/tests/Case/AllRoutingTest.php
similarity index 76%
rename from cake/tests/cases/libs/all_routing.test.php
rename to lib/Cake/tests/Case/AllRoutingTest.php
index 68f0520f9..a8e7f0707 100644
--- a/cake/tests/cases/libs/all_routing.test.php
+++ b/lib/Cake/tests/Case/AllRoutingTest.php
@@ -34,13 +34,11 @@ class AllRoutingTest extends PHPUnit_Framework_TestSuite {
 	public static function suite() {
 		$suite = new CakeTestSuite('All Router and Dispatcher class tests');
 
-		$libs = CORE_TEST_CASES . DS . 'libs' . DS;
+		$libs = CORE_TEST_CASES . DS;
 
-		$suite->addTestFile($libs . 'dispatcher.test.php');
-		$suite->addTestFile($libs . 'router.test.php');
-		$suite->addTestDirectory($libs . 'route' . DS);
-		$suite->addTestFile($libs . 'cake_response.test.php');
-		$suite->addTestFile($libs . 'cake_request.test.php');
+		$suite->addTestDirectory($libs . 'Routing');
+		$suite->addTestFile($libs . 'Network' . DS . 'CakeResponseTest.php');
+		$suite->addTestFile($libs . 'Network' . DS . 'CakeRequestTest.php');
 		return $suite;
 	}
 }
diff --git a/cake/tests/cases/libs/all_socket.test.php b/lib/Cake/tests/Case/AllSocketTest.php
similarity index 75%
rename from cake/tests/cases/libs/all_socket.test.php
rename to lib/Cake/tests/Case/AllSocketTest.php
index 811822f9e..522a129b2 100644
--- a/cake/tests/cases/libs/all_socket.test.php
+++ b/lib/Cake/tests/Case/AllSocketTest.php
@@ -34,10 +34,8 @@ class AllSocketTest extends PHPUnit_Framework_TestSuite {
 	public static function suite() {
 		$suite = new CakeTestSuite('All Socket related class tests');
 
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'cake_socket.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'http_socket.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'http_response.test.php');
-		$suite->addTestDirectory(CORE_TEST_CASES . DS . 'libs' . DS . 'http');
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'Network' . DS . 'CakeSocketTest.php');
+		$suite->addTestDirectory(CORE_TEST_CASES . DS . 'Network' . DS . 'Http');
 		return $suite;
 	}
 }
\ No newline at end of file
diff --git a/cake/tests/cases/libs/all_test_suite.test.php b/lib/Cake/tests/Case/AllTestSuiteTest.php
similarity index 68%
rename from cake/tests/cases/libs/all_test_suite.test.php
rename to lib/Cake/tests/Case/AllTestSuiteTest.php
index 6740003b7..9ce3e2aa6 100644
--- a/cake/tests/cases/libs/all_test_suite.test.php
+++ b/lib/Cake/tests/Case/AllTestSuiteTest.php
@@ -32,12 +32,9 @@ class AllTestSuiteTest extends PHPUnit_Framework_TestSuite {
  * @return void
  */
 	public static function suite() {
-		$suite = new PHPUnit_Framework_TestSuite('All Test Suite classes tests');
+		$suite = new CakeTestSuite('All Test Suite classes tests');
 
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'cake_test_case.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'cake_test_fixture.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'html_coverage_report.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'controller_test_case.test.php');
+		$suite->addTestDirectory(CORE_TEST_CASES . DS . 'TestSuite');
 		return $suite;
 	}
 }
\ No newline at end of file
diff --git a/lib/Cake/tests/Case/AllTestsTest.php b/lib/Cake/tests/Case/AllTestsTest.php
new file mode 100644
index 000000000..a663781b9
--- /dev/null
+++ b/lib/Cake/tests/Case/AllTestsTest.php
@@ -0,0 +1,58 @@
+addTestFile($console . 'AllConsoleTest.php');
+		$suite->addTestFile($path . 'AllBehaviorsTest.php');
+		$suite->addTestFile($path . 'AllCacheEnginesTest.php');
+		$suite->addTestFile($path . 'AllComponentsTest.php');
+		$suite->addTestFile($path . 'AllConfigureTest.php');
+		$suite->addTestFile($path . 'AllControllersTest.php');
+		$suite->addTestFile($path . 'AllDatabaseTest.php');
+		$suite->addTestFile($path . 'AllErrorTest.php');
+		$suite->addTestFile($path . 'AllHelpersTest.php');
+		$suite->addTestFile($path . 'AllLibsTest.php');
+		$suite->addTestFile($path . 'AllLocalizationTest.php');
+		$suite->addTestFile($path . 'AllModelTest.php');
+		$suite->addTestFile($path . 'AllRoutingTest.php');
+		$suite->addTestFile($path . 'AllSocketTest.php');
+		$suite->addTestFile($path . 'AllTestSuiteTest.php');;
+		$suite->addTestFile($path . 'AllViewsTest.php');
+		$suite->addTestFile($path . 'AllXmlTest.php');
+		return $suite;
+	}
+}
diff --git a/cake/tests/cases/libs/all_views.test.php b/lib/Cake/tests/Case/AllViewsTest.php
similarity index 78%
rename from cake/tests/cases/libs/all_views.test.php
rename to lib/Cake/tests/Case/AllViewsTest.php
index 0201426e4..46a094625 100644
--- a/cake/tests/cases/libs/all_views.test.php
+++ b/lib/Cake/tests/Case/AllViewsTest.php
@@ -32,10 +32,9 @@ class AllViewsTest extends PHPUnit_Framework_TestSuite {
  * @return void
  */
 	public static function suite() {
-		$suite = new PHPUnit_Framework_TestSuite('All View class tests');
+		$suite = new CakeTestSuite('All View class tests');
 
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'view' . DS . 'view.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'view' . DS . 'theme.test.php');
+		$suite->addTestDirectory(CORE_TEST_CASES . DS . 'View');
 		return $suite;
 	}
 }
diff --git a/cake/tests/cases/libs/all_xml.test.php b/lib/Cake/tests/Case/AllXmlTest.php
similarity index 84%
rename from cake/tests/cases/libs/all_xml.test.php
rename to lib/Cake/tests/Case/AllXmlTest.php
index e56714ab0..69f7a0986 100644
--- a/cake/tests/cases/libs/all_xml.test.php
+++ b/lib/Cake/tests/Case/AllXmlTest.php
@@ -34,8 +34,8 @@ class AllXmlTest extends PHPUnit_Framework_TestSuite {
 	public static function suite() {
 		$suite = new PHPUnit_Framework_TestSuite('All Xml related class tests');
 
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'xml.test.php');
-		$suite->addTestFile(CORE_TEST_CASES . DS . 'libs' . DS . 'view' . DS . 'helpers' . DS . 'rss.test.php');
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'Utility' . DS . 'XmlTest.php');
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'View' . DS . 'Helper' . DS . 'RssHelperTest.php');
 		return $suite;
 	}
 }
\ No newline at end of file
diff --git a/cake/tests/cases/basics.test.php b/lib/Cake/tests/Case/BasicsTest.php
similarity index 98%
rename from cake/tests/cases/basics.test.php
rename to lib/Cake/tests/Case/BasicsTest.php
index 2c0282cb2..48da9c85b 100644
--- a/cake/tests/cases/basics.test.php
+++ b/lib/Cake/tests/Case/BasicsTest.php
@@ -16,8 +16,9 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+
 require_once CAKE . 'basics.php';
-App::import('Core', 'Folder');
+App::uses('Folder', 'Utility');
 
 /**
  * BasicsTest class
@@ -33,7 +34,7 @@ class BasicsTest extends CakeTestCase {
  */
 	public function setUp() {
 		App::build(array(
-			'locales' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale' . DS)
+			'locales' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'locale' . DS)
 		));
 		$this->_language = Configure::read('Config.language');
 	}
@@ -677,7 +678,7 @@ class BasicsTest extends CakeTestCase {
 		ob_start();
 			debug('this-is-a-test');
 		$result = ob_get_clean();
-		$pattern = '/(.+?tests(\/|\\\)cases(\/|\\\)basics\.test\.php|';
+		$pattern = '/(.+?tests(\/|\\\)Case(\/|\\\)BasicsTest\.php|';
 		$pattern .= preg_quote(substr(__FILE__, 1), '/') . ')';
 		$pattern .= '.*line.*' . (__LINE__ - 4) . '.*this-is-a-test.*/s';
 		$this->assertPattern($pattern, $result);
@@ -685,7 +686,7 @@ class BasicsTest extends CakeTestCase {
 		ob_start();
 			debug('
        this-is-a-test
        ', true);
 		$result = ob_get_clean();
-		$pattern = '/(.+?tests(\/|\\\)cases(\/|\\\)basics\.test\.php|';
+		$pattern = '/(.+?tests(\/|\\\)Case(\/|\\\)BasicsTest\.php|';
 		$pattern .= preg_quote(substr(__FILE__, 1), '/') . ')';
 		$pattern .=	'.*line.*' . (__LINE__ - 4) . '.*<div>this-is-a-test<\/div>.*/s';
 		$this->assertPattern($pattern, $result);
@@ -693,7 +694,7 @@ class BasicsTest extends CakeTestCase {
 		ob_start();
 			debug('
        this-is-a-test
        ', false);
 		$result = ob_get_clean();
-		$pattern = '/(.+?tests(\/|\\\)cases(\/|\\\)basics\.test\.php|';
+		$pattern = '/(.+?tests(\/|\\\)Case(\/|\\\)BasicsTest\.php|';
 		$pattern .= preg_quote(substr(__FILE__, 1), '/') . ')';
 		$pattern .=	'.*line.*' . (__LINE__ - 4) . '.*\this-is-a-test\<\/div\>.*/s';
 		$this->assertPattern($pattern, $result);
diff --git a/cake/tests/cases/libs/cache.test.php b/lib/Cake/tests/Case/Cache/CacheTest.php
similarity index 91%
rename from cake/tests/cases/libs/cache.test.php
rename to lib/Cake/tests/Case/Cache/CacheTest.php
index 61c183ea4..238707361 100644
--- a/cake/tests/cases/libs/cache.test.php
+++ b/lib/Cake/tests/Case/Cache/CacheTest.php
@@ -16,9 +16,8 @@
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-if (!class_exists('Cache')) {
-	require LIBS . 'cache.php';
-}
+
+App::uses('Cache', 'Cache');
 
 /**
  * CacheTest class
@@ -90,8 +89,8 @@ class CacheTest extends CakeTestCase {
  */
 	function testConfigWithLibAndPluginEngines() {
 		App::build(array(
-			'libs' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'Lib' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Lib' . DS),
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		), true);
 
 		$settings = array('engine' => 'TestAppCache', 'path' => TMP, 'prefix' => 'cake_test_');
@@ -234,19 +233,12 @@ class CacheTest extends CakeTestCase {
  * @return void
  */
 	function testInitSettings() {
-		Cache::config('default', array('engine' => 'File', 'path' => TMP . 'tests'));
+		$initial = Cache::settings();
+		$override = array('engine' => 'File', 'path' => TMP . 'tests');
+		Cache::config('default', $override);
 
 		$settings = Cache::settings();
-		$expecting = array(
-			'engine' => 'File',
-			'duration'=> 3600,
-			'probability' => 100,
-			'path'=> TMP . 'tests',
-			'prefix'=> 'cake_',
-			'lock' => false,
-			'serialize'=> true,
-			'isWindows' => DIRECTORY_SEPARATOR == '\\'
-		);
+		$expecting = $override + $initial;
 		$this->assertEqual($settings, $expecting);
 	}
 
@@ -258,8 +250,8 @@ class CacheTest extends CakeTestCase {
  */
 	function testDrop() {
 		App::build(array(
-			'libs' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		), true);
 
 		$result = Cache::drop('some_config_that_does_not_exist');
@@ -311,8 +303,8 @@ class CacheTest extends CakeTestCase {
  */
 	function testWriteTriggerError() {
 		App::build(array(
-			'libs' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		), true);
 	
 		Cache::config('test_trigger', array('engine' => 'TestAppCache', 'prefix' => ''));
diff --git a/cake/tests/cases/libs/cache/apc.test.php b/lib/Cake/tests/Case/Cache/Engine/ApcEngineTest.php
similarity index 98%
rename from cake/tests/cases/libs/cache/apc.test.php
rename to lib/Cake/tests/Case/Cache/Engine/ApcEngineTest.php
index 0abd07778..28043b908 100644
--- a/cake/tests/cases/libs/cache/apc.test.php
+++ b/lib/Cake/tests/Case/Cache/Engine/ApcEngineTest.php
@@ -16,9 +16,8 @@
  * @since         CakePHP(tm) v 1.2.0.5434
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-if (!class_exists('Cache')) {
-	require LIBS . 'cache.php';
-}
+
+App::uses('Cache', 'Cache');
 
 /**
  * ApcEngineTest class
diff --git a/cake/tests/cases/libs/cache/file.test.php b/lib/Cake/tests/Case/Cache/Engine/FileEngineTest.php
similarity index 99%
rename from cake/tests/cases/libs/cache/file.test.php
rename to lib/Cake/tests/Case/Cache/Engine/FileEngineTest.php
index e38a09872..5395ac025 100644
--- a/cake/tests/cases/libs/cache/file.test.php
+++ b/lib/Cake/tests/Case/Cache/Engine/FileEngineTest.php
@@ -16,9 +16,8 @@
  * @since         CakePHP(tm) v 1.2.0.5434
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-if (!class_exists('Cache')) {
-	require LIBS . 'cache.php';
-}
+
+App::uses('Cache', 'Cache');
 
 /**
  * FileEngineTest class
diff --git a/cake/tests/cases/libs/cache/memcache.test.php b/lib/Cake/tests/Case/Cache/Engine/MemcacheTest.php
similarity index 98%
rename from cake/tests/cases/libs/cache/memcache.test.php
rename to lib/Cake/tests/Case/Cache/Engine/MemcacheTest.php
index 61bcec550..ada9c52bc 100644
--- a/cake/tests/cases/libs/cache/memcache.test.php
+++ b/lib/Cake/tests/Case/Cache/Engine/MemcacheTest.php
@@ -16,10 +16,9 @@
  * @since         CakePHP(tm) v 1.2.0.5434
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-if (!class_exists('Cache')) {
-	require LIBS . 'cache.php';
-}
-require_once LIBS . 'cache' . DS . 'memcache.php';
+
+App::uses('Cache', 'Cache');
+App::uses('MemcacheEngine', 'Cache/Engine');
 
 class TestMemcacheEngine extends MemcacheEngine {
 /**
diff --git a/cake/tests/cases/libs/cache/xcache.test.php b/lib/Cake/tests/Case/Cache/Engine/XcacheTest.php
similarity index 98%
rename from cake/tests/cases/libs/cache/xcache.test.php
rename to lib/Cake/tests/Case/Cache/Engine/XcacheTest.php
index eea1c4b2c..5788118c3 100644
--- a/cake/tests/cases/libs/cache/xcache.test.php
+++ b/lib/Cake/tests/Case/Cache/Engine/XcacheTest.php
@@ -16,9 +16,8 @@
  * @since         CakePHP(tm) v 1.2.0.5434
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-if (!class_exists('Cache')) {
-	require LIBS . 'cache.php';
-}
+
+App::uses('Cache', 'Cache');
 
 /**
  * XcacheEngineTest class
diff --git a/cake/tests/cases/libs/config/ini_reader.test.php b/lib/Cake/tests/Case/Configure/IniReaderTest.php
similarity index 95%
rename from cake/tests/cases/libs/config/ini_reader.test.php
rename to lib/Cake/tests/Case/Configure/IniReaderTest.php
index 4f077873a..dcc5a3f68 100644
--- a/cake/tests/cases/libs/config/ini_reader.test.php
+++ b/lib/Cake/tests/Case/Configure/IniReaderTest.php
@@ -16,7 +16,7 @@
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'config/IniReader');
+App::uses('IniReader', 'Configure');
 
 class IniReaderTest extends CakeTestCase {
 
@@ -34,7 +34,7 @@ class IniReaderTest extends CakeTestCase {
  */
 	function setup() {
 		parent::setup();
-		$this->path = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'config'. DS;
+		$this->path = LIBS . 'tests' . DS . 'test_app' . DS . 'config'. DS;
 	}
 
 /**
diff --git a/cake/tests/cases/libs/config/php_reader.test.php b/lib/Cake/tests/Case/Configure/PhpReaderTest.php
similarity index 90%
rename from cake/tests/cases/libs/config/php_reader.test.php
rename to lib/Cake/tests/Case/Configure/PhpReaderTest.php
index a1d3034fc..e66fed473 100644
--- a/cake/tests/cases/libs/config/php_reader.test.php
+++ b/lib/Cake/tests/Case/Configure/PhpReaderTest.php
@@ -16,7 +16,7 @@
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'config/PhpReader');
+App::uses('PhpReader', 'Configure');
 
 class PhpReaderTest extends CakeTestCase {
 /**
@@ -26,7 +26,7 @@ class PhpReaderTest extends CakeTestCase {
  */
 	function setUp() {
 		parent::setUp();
-		$this->path = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'config'. DS;
+		$this->path = LIBS . 'tests' . DS . 'test_app' . DS . 'config'. DS;
 	}
 /**
  * test reading files
@@ -83,7 +83,7 @@ class PhpReaderTest extends CakeTestCase {
  */
 	function testReadPluginValue() {
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		), true);
 		$reader = new PhpReader($this->path);
 		$result = $reader->read('TestPlugin.load');
diff --git a/cake/tests/cases/console/all_console_libs.test.php b/lib/Cake/tests/Case/Console/AllConsoleLibsTest.php
similarity index 81%
rename from cake/tests/cases/console/all_console_libs.test.php
rename to lib/Cake/tests/Case/Console/AllConsoleLibsTest.php
index ad1f60fbd..708482c7a 100644
--- a/cake/tests/cases/console/all_console_libs.test.php
+++ b/lib/Cake/tests/Case/Console/AllConsoleLibsTest.php
@@ -34,9 +34,13 @@ class AllConsoleLibsTest extends PHPUnit_Framework_TestSuite {
 	public static function suite() {
 		$suite = new CakeTestSuite('All console lib classes');
 
-		$path = CORE_TEST_CASES . DS . 'console' . DS . 'libs' . DS;
-
-		$suite->addTestDirectory($path);
+		$path = CORE_TEST_CASES . DS . 'Console';
+		foreach (new DirectoryIterator(dirname(__FILE__)) as $file) {
+			if (!$file->isFile() || strpos($file, 'All') === 0) {
+				continue;
+			}
+			$suite->addTestFile($file->getRealPath());
+		}
 		return $suite;
 	}
 }
\ No newline at end of file
diff --git a/cake/tests/cases/console/all_console.test.php b/lib/Cake/tests/Case/Console/AllConsoleTest.php
similarity index 82%
rename from cake/tests/cases/console/all_console.test.php
rename to lib/Cake/tests/Case/Console/AllConsoleTest.php
index 305ebbfc3..a83159d4f 100644
--- a/cake/tests/cases/console/all_console.test.php
+++ b/lib/Cake/tests/Case/Console/AllConsoleTest.php
@@ -34,11 +34,11 @@ class AllConsoleTest extends PHPUnit_Framework_TestSuite {
 	public static function suite() {
 		$suite = new CakeTestSuite('All console classes');
 
-		$path = CORE_TEST_CASES . DS . 'console' . DS;
+		$path = CORE_TEST_CASES . DS . 'Console' . DS;
 
-		$suite->addTestFile($path . 'all_console_libs.test.php');
-		$suite->addTestFile($path . 'all_shells.test.php');
-		$suite->addTestFile($path . 'all_tasks.test.php');
+		$suite->addTestFile($path . 'AllConsoleLibsTest.php');
+		$suite->addTestFile($path . 'AllTasksTest.php');
+		$suite->addTestFile($path . 'AllShellsTest.php');
 		return $suite;
 	}
 }
\ No newline at end of file
diff --git a/cake/tests/cases/console/all_shells.test.php b/lib/Cake/tests/Case/Console/AllShellsTest.php
similarity index 93%
rename from cake/tests/cases/console/all_shells.test.php
rename to lib/Cake/tests/Case/Console/AllShellsTest.php
index e8ca96ac5..3288c53ff 100644
--- a/cake/tests/cases/console/all_shells.test.php
+++ b/lib/Cake/tests/Case/Console/AllShellsTest.php
@@ -34,7 +34,7 @@ class AllShellsTest extends PHPUnit_Framework_TestSuite {
 	public static function suite() {
 		$suite = new CakeTestSuite('All shell classes');
 
-		$path = CORE_TEST_CASES . DS . 'console' . DS . 'shells' . DS;
+		$path = CORE_TEST_CASES . DS . 'Console' . DS . 'Command' . DS;
 
 		$suite->addTestDirectory($path);
 		return $suite;
diff --git a/cake/tests/cases/console/all_tasks.test.php b/lib/Cake/tests/Case/Console/AllTasksTest.php
similarity index 92%
rename from cake/tests/cases/console/all_tasks.test.php
rename to lib/Cake/tests/Case/Console/AllTasksTest.php
index 91ca6abdc..5e15c276d 100644
--- a/cake/tests/cases/console/all_tasks.test.php
+++ b/lib/Cake/tests/Case/Console/AllTasksTest.php
@@ -34,7 +34,7 @@ class AllTasksTest extends PHPUnit_Framework_TestSuite {
 	public static function suite() {
 		$suite = new CakeTestSuite('All Tasks tests');
 
-		$path = CORE_TEST_CASES . DS . 'console' . DS . 'shells' . DS . 'tasks' . DS;
+		$path = CORE_TEST_CASES . DS . 'Console' . DS . 'Command' . DS . 'Task' . DS;
 		$suite->addTestDirectory($path);
 		return $suite;
 	}
diff --git a/cake/tests/cases/console/shells/acl.test.php b/lib/Cake/tests/Case/Console/Command/AclShellTest.php
similarity index 98%
rename from cake/tests/cases/console/shells/acl.test.php
rename to lib/Cake/tests/Case/Console/Command/AclShellTest.php
index b13d593b4..7f03ae7d8 100644
--- a/cake/tests/cases/console/shells/acl.test.php
+++ b/lib/Cake/tests/Case/Console/Command/AclShellTest.php
@@ -16,10 +16,11 @@
  * @since         CakePHP v 1.2.0.7726
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Shell', 'Shell', false);
-App::import('Shell', 'Acl');
 
-require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
+App::uses('ShellDispatcher', 'Console');
+App::uses('Shell', 'Console');
+App::uses('AclShell', 'Console/Command');
+App::uses('ComponentCollection', 'Controller');
 
 /**
  * AclShellTest class
diff --git a/cake/tests/cases/console/shells/api.test.php b/lib/Cake/tests/Case/Console/Command/ApiShellTest.php
similarity index 95%
rename from cake/tests/cases/console/shells/api.test.php
rename to lib/Cake/tests/Case/Console/Command/ApiShellTest.php
index 99e5abf33..03576ddb7 100644
--- a/cake/tests/cases/console/shells/api.test.php
+++ b/lib/Cake/tests/Case/Console/Command/ApiShellTest.php
@@ -16,11 +16,10 @@
  * @since         CakePHP v 1.2.0.7726
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Shell', 'Shell', false);
-App::import('Shell', 'Api');
-
-require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
 
+App::uses('ShellDispatcher', 'Console');
+App::uses('Shell', 'Console');
+App::uses('ApiShell', 'Console/Command');
 
 /**
  * ApiShellTest class
diff --git a/cake/tests/cases/console/shells/bake.test.php b/lib/Cake/tests/Case/Console/Command/BakeShellTest.php
similarity index 89%
rename from cake/tests/cases/console/shells/bake.test.php
rename to lib/Cake/tests/Case/Console/Command/BakeShellTest.php
index 7b2767389..a4c90203f 100644
--- a/cake/tests/cases/console/shells/bake.test.php
+++ b/lib/Cake/tests/Case/Console/Command/BakeShellTest.php
@@ -17,14 +17,14 @@
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Shell', 'Shell', false);
-App::import('Shell', 'Bake', false);
-App::import('Shell', 'tasks/model');
-App::import('Shell', 'tasks/controller');
-App::import('Shell', 'tasks/db_config');
 
-App::import('Core', 'Controller');
-require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
+App::uses('ShellDispatcher', 'Console');
+App::uses('Shell', 'Console');
+App::uses('BakeShell', 'Console/Command');
+App::uses('ModelTask', 'Console/Command/Task');
+App::uses('ControllerTask', 'Console/Command/Task');
+App::uses('DbConfigTask', 'Console/Command/Task');
+App::uses('Controller', 'Controller');
 
 if (!class_exists('UsersController')) {
 	class UsersController extends Controller {
@@ -75,7 +75,7 @@ class BakeShellTest extends CakeTestCase {
  * @return void
  */
 	public function testAllWithModelName() {
-		App::import('Model', 'User');
+		App::uses('User', 'Model');
 		$userExists = class_exists('User');
 		if ($this->skipIf($userExists, 'User class exists, cannot test `bake all [param]`. %s')) {
 			return;
diff --git a/cake/tests/cases/console/shells/command_list.test.php b/lib/Cake/tests/Case/Console/Command/CommandListShellTest.php
similarity index 89%
rename from cake/tests/cases/console/shells/command_list.test.php
rename to lib/Cake/tests/Case/Console/Command/CommandListShellTest.php
index 7b518730a..57a0cbd90 100644
--- a/cake/tests/cases/console/shells/command_list.test.php
+++ b/lib/Cake/tests/Case/Console/Command/CommandListShellTest.php
@@ -16,7 +16,11 @@
  * @since         CakePHP v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Shell', 'CommandList', false);
+
+App::uses('CommandListShell', 'Console/Command');
+App::uses('ConsoleOutput', 'Console');
+App::uses('ConsoleInput', 'Console');
+App::uses('Shell', 'Console');
 
 
 class TestStringOutput extends ConsoleOutput {
@@ -37,13 +41,10 @@ class CommandListTest extends CakeTestCase {
 		parent::setUp();
 		App::build(array(
 			'plugins' => array(
-				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
+				LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
 			),
-			'shells' => array(
-				CORE_PATH ? 
-					CORE_PATH . CAKE . 'console' . DS . 'shells' . DS : 
-					CAKE_CORE_INCLUDE_PATH . DS . 'cake' . DS . 'console' . DS . 'shells' .DS, 
-				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'console' . DS . 'shells' . DS
+			'Console/Command' => array(
+				LIBS . 'tests' . DS . 'test_app' . DS . 'Console' . DS . 'Command' . DS
 			)
 		), true);
 		App::objects('plugin', null, false);
@@ -83,6 +84,7 @@ class CommandListTest extends CakeTestCase {
 		$expected = "/welcome \[.*TestPluginTwo.*\]/";
 		$this->assertPattern($expected, $output);
 
+
 		$expected = "/acl \[.*CORE.*\]/";
 		$this->assertPattern($expected, $output);
 
diff --git a/cake/tests/cases/console/shells/schema.test.php b/lib/Cake/tests/Case/Console/Command/SchemaShellTest.php
similarity index 94%
rename from cake/tests/cases/console/shells/schema.test.php
rename to lib/Cake/tests/Case/Console/Command/SchemaShellTest.php
index d18b7a478..ce48e0626 100644
--- a/cake/tests/cases/console/shells/schema.test.php
+++ b/lib/Cake/tests/Case/Console/Command/SchemaShellTest.php
@@ -16,13 +16,13 @@
  * @since         CakePHP v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Shell', 'Shell', false);
-App::import('Shell', 'Schema', false);
-App::import('Model', 'CakeSchema', false);
-
-require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
-
 
+App::uses('ShellDispatcher', 'Console');
+App::uses('ConsoleOutput', 'Console');
+App::uses('ConsoleInput', 'Console');
+App::uses('Shell', 'Console');
+App::uses('CakeSchema', 'Model');
+App::uses('SchemaShell', 'Console/Command');
 
 /**
  * Test for Schema database management
@@ -187,7 +187,7 @@ class SchemaShellTest extends CakeTestCase {
  */
 	public function testViewWithPlugins() {
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
 		$this->Shell->args = array('TestPlugin.schema');
 		$this->Shell->startup();
@@ -236,7 +236,7 @@ class SchemaShellTest extends CakeTestCase {
  */
 	public function testDumpFileWritingWithPlugins() {
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
 		$this->Shell->args = array('TestPlugin.TestPluginApp');
 		$this->Shell->params = array(
@@ -332,7 +332,7 @@ class SchemaShellTest extends CakeTestCase {
  */
 	public function testGenerateWithPlugins() {
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		), true);
 		App::objects('plugin', null, false);
 
@@ -445,14 +445,14 @@ class SchemaShellTest extends CakeTestCase {
  */
 	public function testPluginParam() {
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
 		$this->Shell->params = array(
 			'plugin' => 'TestPlugin',
 			'connection' => 'test'
 		);
 		$this->Shell->startup();
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'config' . DS . 'schema';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'config' . DS . 'schema';
 		$this->assertEqual($this->Shell->Schema->path, $expected);
 	}
 
@@ -463,7 +463,7 @@ class SchemaShellTest extends CakeTestCase {
  */
 	public function testPluginDotSyntaxWithCreate() {
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
 		$this->Shell->params = array(
 			'connection' => 'test'
diff --git a/cake/tests/cases/console/shells/shell.test.php b/lib/Cake/tests/Case/Console/Command/ShellTest.php
similarity index 98%
rename from cake/tests/cases/console/shells/shell.test.php
rename to lib/Cake/tests/Case/Console/Command/ShellTest.php
index ac5d77faf..fbbab30b1 100644
--- a/cake/tests/cases/console/shells/shell.test.php
+++ b/lib/Cake/tests/Case/Console/Command/ShellTest.php
@@ -18,10 +18,10 @@
  * @since         CakePHP v 1.2.0.7726
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'Folder');
-App::import('Shell', 'Shell', false);
 
-require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
+App::uses('ShellDispatcher', 'Console');
+App::uses('Shell', 'Console');
+App::uses('Folder', 'Utility');
 
 /**
  * ShellTestShell class
@@ -169,8 +169,8 @@ class ShellTest extends CakeTestCase {
  */
 	public function testInitialize() {
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
-			'models' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'models' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'models' . DS)
 		), true);
 
 		$this->Shell->uses = array('TestPlugin.TestPluginPost');
diff --git a/cake/tests/cases/console/shells/tasks/controller.test.php b/lib/Cake/tests/Case/Console/Command/Task/ControllerTaskTest.php
similarity index 92%
rename from cake/tests/cases/console/shells/tasks/controller.test.php
rename to lib/Cake/tests/Case/Console/Command/Task/ControllerTaskTest.php
index 5abda16c9..a34b44397 100644
--- a/cake/tests/cases/console/shells/tasks/controller.test.php
+++ b/lib/Cake/tests/Case/Console/Command/Task/ControllerTaskTest.php
@@ -16,33 +16,32 @@
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'ClassRegistry');
-App::import('View', 'Helper', false);
-App::import('Shell', 'Shell', false);
-App::import('Shell', array(
-	'tasks/project',
-	'tasks/controller',
-	'tasks/model',
-	'tasks/template',
-	'tasks/test'
-));
 
-require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
+App::uses('ShellDispatcher', 'Console');
+App::uses('Shell', 'Console');
+App::uses('CakeSchema', 'Model');
+App::uses('ClassRegistry', 'Utility');
+App::uses('Helper', 'View/Helper');
+App::uses('ProjectTask', 'Console/Command/Task');
+App::uses('ControllerTask', 'Console/Command/Task');
+App::uses('ModelTask', 'Console/Command/Task');
+App::uses('TemplateTask', 'Console/Command/Task');
+App::uses('TestTask', 'Console/Command/Task');
+App::uses('Model', 'Model');
 
-$imported = App::import('Model', 'BakeArticle');
-$imported = $imported || App::import('Model', 'BakeComment');
-$imported = $imported || App::import('Model', 'BakeTag');
+App::uses('BakeArticle', 'Model');
+App::uses('BakeComment', 'Model');
+App::uses('BakeTags', 'Model');
+$imported = class_exists('BakeArticle') || class_exists('BakeComment') || class_exists('BakeTag');
 
 if (!$imported) {
 	define('ARTICLE_MODEL_CREATED', true);
-	App::import('Core', 'Model');
 
 	class BakeArticle extends Model {
 		public $name = 'BakeArticle';
 		public $hasMany = array('BakeComment');
 		public $hasAndBelongsToMany = array('BakeTag');
 	}
-
 }
 
 /**
@@ -68,7 +67,7 @@ class ControllerTaskTest extends CakeTestCase {
 	public function setUp() {
 		$out = $this->getMock('ConsoleOutput', array(), array(), '', false);
 		$in = $this->getMock('ConsoleInput', array(), array(), '', false);
-		$this->Task = $this->getMock('ControllerTask', 
+		$this->Task = $this->getMock('ControllerTask',
 			array('in', 'out', 'err', 'hr', 'createFile', '_stop', '_checkUnitTest'),
 			array($out, $out, $in)
 		);
@@ -76,12 +75,12 @@ class ControllerTaskTest extends CakeTestCase {
 		$this->Task->Template = new TemplateTask($out, $out, $in);
 		$this->Task->Template->params['theme'] = 'default';
 
-		$this->Task->Model = $this->getMock('ModelTask', 
-			array('in', 'out', 'err', 'createFile', '_stop', '_checkUnitTest'), 
+		$this->Task->Model = $this->getMock('ModelTask',
+			array('in', 'out', 'err', 'createFile', '_stop', '_checkUnitTest'),
 			array($out, $out, $in)
 		);
-		$this->Task->Project = $this->getMock('ProjectTask', 
-			array('in', 'out', 'err', 'createFile', '_stop', '_checkUnitTest', 'getPrefix'), 
+		$this->Task->Project = $this->getMock('ProjectTask',
+			array('in', 'out', 'err', 'createFile', '_stop', '_checkUnitTest', 'getPrefix'),
 			array($out, $out, $in)
 		);
 		$this->Task->Test = $this->getMock('TestTask', array(), array($out, $out, $in));
@@ -140,11 +139,11 @@ class ControllerTaskTest extends CakeTestCase {
 		$this->Task->expects($this->any())->method('in')->will(
 			$this->onConsecutiveCalls(3, 1)
 		);
-		
+
 		$result = $this->Task->getName('test');
 		$expected = 'BakeComments';
 		$this->assertEqual($result, $expected);
-	
+
 		$result = $this->Task->getName('test');
 		$expected = 'BakeArticles';
 		$this->assertEqual($result, $expected);
@@ -300,7 +299,7 @@ class ControllerTaskTest extends CakeTestCase {
 		$components = array('Acl', 'Auth');
 		$uses = array('Comment', 'User');
 
-		$path = APP . 'plugins' . DS . 'controller_test' . DS . 'controllers' . DS . 'articles_controller.php';
+		$path = APP . 'plugins' . DS . 'controller_test' . DS . 'Controller' . DS . 'ArticlesController.php';
 
 		$this->Task->expects($this->at(1))->method('createFile')->with(
 			$path,
@@ -310,11 +309,11 @@ class ControllerTaskTest extends CakeTestCase {
 			$path,
 			new PHPUnit_Framework_Constraint_PCREMatch('/ArticlesController extends ControllerTestAppController/')
 		);
-		
+
 		$this->Task->bake('Articles', '--actions--', array(), array(), array());
 
 		$this->Task->plugin = 'controllerTest';
-		$path = APP . 'plugins' . DS . 'controller_test' . DS . 'controllers' . DS . 'articles_controller.php';
+		$path = APP . 'plugins' . DS . 'controller_test' . DS . 'Controller' . DS . 'ArticlesController.php';
 		$this->Task->bake('Articles', '--actions--', array(), array(), array());
 
 		$this->assertEqual($this->Task->Template->templateVars['plugin'], 'ControllerTest');
@@ -429,7 +428,7 @@ class ControllerTaskTest extends CakeTestCase {
 
 		$this->Task->connection = 'test';
 		$this->Task->path = '/my/path/';
-		
+
 		$this->Task->expects($this->any())->method('in')
 			->will($this->onConsecutiveCalls(
 				'1',
@@ -443,9 +442,9 @@ class ControllerTaskTest extends CakeTestCase {
 				'y' // looks good?
 			));
 
-		$filename = '/my/path/bake_articles_controller.php';
+		$filename = '/my/path/BakeArticlesController.php';
 		$this->Task->expects($this->once())->method('createFile')->with(
-			$filename, 
+			$filename,
 			new PHPUnit_Framework_Constraint_PCREMatch('/class BakeArticlesController/')
 		);
 		$this->Task->execute();
@@ -483,9 +482,9 @@ class ControllerTaskTest extends CakeTestCase {
 			->method('getPrefix')
 			->will($this->returnValue('admin_'));
 
-		$filename = '/my/path/bake_articles_controller.php';
+		$filename = '/my/path/BakeArticlesController.php';
 		$this->Task->expects($this->once())->method('createFile')->with(
-			$filename, 
+			$filename,
 			new PHPUnit_Framework_Constraint_PCREMatch('/class BakeArticlesController/')
 		)->will($this->returnValue(true));
 
@@ -513,9 +512,9 @@ class ControllerTaskTest extends CakeTestCase {
 		$this->Task->expects($this->any())->method('_checkUnitTest')->will($this->returnValue(true));
 		$this->Task->Test->expects($this->once())->method('bake');
 
-		$filename = '/my/path/bake_articles_controller.php';
+		$filename = '/my/path/BakeArticlesController.php';
 		$this->Task->expects($this->once())->method('createFile')->with(
-			$filename, 
+			$filename,
 			new PHPUnit_Framework_Constraint_PCREMatch('/class BakeArticlesController/')
 		)->will($this->returnValue(true));
 
@@ -535,9 +534,9 @@ class ControllerTaskTest extends CakeTestCase {
 		$this->Task->path = '/my/path/';
 		$this->Task->args = array('BakeArticles');
 
-		$filename = '/my/path/bake_articles_controller.php';
+		$filename = '/my/path/BakeArticlesController.php';
 		$this->Task->expects($this->once())->method('createFile')->with(
-			$filename, 
+			$filename,
 			new PHPUnit_Framework_Constraint_PCREMatch('/\$scaffold/')
 		);
 
@@ -569,7 +568,7 @@ class ControllerTaskTest extends CakeTestCase {
 		$this->Task->path = '/my/path/';
 		$this->Task->args = array($name);
 
-		$filename = '/my/path/bake_articles_controller.php';
+		$filename = '/my/path/BakeArticlesController.php';
 		$this->Task->expects($this->once())->method('createFile')->with(
 			$filename, new PHPUnit_Framework_Constraint_PCREMatch('/\$scaffold/')
 		);
@@ -590,7 +589,7 @@ class ControllerTaskTest extends CakeTestCase {
 		$this->Task->args = array('BakeArticles');
 		$this->Task->params = array('public' => true);
 
-		$filename = '/my/path/bake_articles_controller.php';
+		$filename = '/my/path/BakeArticlesController.php';
 		$expected = new PHPUnit_Framework_Constraint_Not(new PHPUnit_Framework_Constraint_PCREMatch('/\$scaffold/'));
 		$this->Task->expects($this->once())->method('createFile')->with(
 			$filename, $expected
@@ -613,7 +612,7 @@ class ControllerTaskTest extends CakeTestCase {
 		$this->Task->args = array('BakeArticles');
 		$this->Task->params = array('public' => true, 'admin' => true);
 
-		$filename = '/my/path/bake_articles_controller.php';
+		$filename = '/my/path/BakeArticlesController.php';
 		$this->Task->expects($this->once())->method('createFile')->with(
 			$filename, new PHPUnit_Framework_Constraint_PCREMatch('/admin_index/')
 		);
@@ -635,10 +634,10 @@ class ControllerTaskTest extends CakeTestCase {
 		$this->Task->args = array('BakeArticles');
 		$this->Task->params = array('admin' => true);
 
-		$filename = '/my/path/bake_articles_controller.php';
+		$filename = '/my/path/BakeArticlesController.php';
 		$this->Task->expects($this->once())->method('createFile')->with(
 			$filename, new PHPUnit_Framework_Constraint_PCREMatch('/admin_index/')
 		);
 		$this->Task->execute();
 	}
-}
+}
\ No newline at end of file
diff --git a/cake/tests/cases/console/shells/tasks/db_config.test.php b/lib/Cake/tests/Case/Console/Command/Task/DbConfigTaskTest.php
similarity index 95%
rename from cake/tests/cases/console/shells/tasks/db_config.test.php
rename to lib/Cake/tests/Case/Console/Command/Task/DbConfigTaskTest.php
index 6d37ffbb8..e00e31249 100644
--- a/cake/tests/cases/console/shells/tasks/db_config.test.php
+++ b/lib/Cake/tests/Case/Console/Command/Task/DbConfigTaskTest.php
@@ -16,11 +16,12 @@
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Shell', 'Shell', false);
-App::import('Shell', 'tasks/DbConfig');
-
-require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
 
+App::uses('ShellDispatcher', 'Console');
+App::uses('ConsoleOutput', 'Console');
+App::uses('ConsoleInput', 'Console');
+App::uses('Shell', 'Console');
+App::uses('DbConfigTask', 'Console/Command/Task');
 
 class TEST_DATABASE_CONFIG {
 	public $default = array(
diff --git a/cake/tests/cases/console/shells/tasks/extract.test.php b/lib/Cake/tests/Case/Console/Command/Task/ExtractTaskTest.php
similarity index 88%
rename from cake/tests/cases/console/shells/tasks/extract.test.php
rename to lib/Cake/tests/Case/Console/Command/Task/ExtractTaskTest.php
index 0b2fbf4bc..c401bbd09 100644
--- a/cake/tests/cases/console/shells/tasks/extract.test.php
+++ b/lib/Cake/tests/Case/Console/Command/Task/ExtractTaskTest.php
@@ -18,11 +18,11 @@
  * @since         CakePHP v 1.2.0.7726
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'Folder');
-App::import('Shell', 'Shell', false);
-App::import('Shell', 'tasks/Extract', false);
 
-require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
+App::uses('Folder', 'Utility');
+App::uses('ShellDispatcher', 'Console');
+App::uses('Shell', 'Console');
+App::uses('ExtractTask', 'Console/Command/Task');
 
 /**
  * ExtractTaskTest class
@@ -70,7 +70,7 @@ class ExtractTaskTest extends CakeTestCase {
 	public function testExecute() {
 		$this->Task->interactive = false;
 
-		$this->Task->params['paths'] = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'pages';
+		$this->Task->params['paths'] = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'pages';
 		$this->Task->params['output'] = $this->path . DS;
 		$this->Task->expects($this->never())->method('err');
 		$this->Task->expects($this->any())->method('in')
@@ -112,10 +112,13 @@ class ExtractTaskTest extends CakeTestCase {
 		$this->assertPattern($pattern, $result);
 		$pattern = '/msgid "Editing this Page"\nmsgstr ""\n/';
 		$this->assertPattern($pattern, $result);
-		$pattern = '/msgid "To change the content of this page, edit: %s.*To change its layout, ';
-		$pattern .= 'edit: %s.*You can also add some CSS styles for your pages at: %s"\nmsgstr ""/s';
+		$pattern = '/msgid "To change the content of this page, create: APP\/views\/pages\/home\.ctp/';
 		$this->assertPattern($pattern, $result);
 
+		$pattern = '/To change its layout, create: APP\/views\/layouts\/default\.ctp\./s';
+		$this->assertPattern($pattern, $result);
+		
+
 		// extract.ctp
 		$pattern = '/\#: (\\\\|\/)extract\.ctp:6\n';
 		$pattern .= 'msgid "You have %d new message."\nmsgid_plural "You have %d new messages."/';
@@ -126,10 +129,12 @@ class ExtractTaskTest extends CakeTestCase {
 		$this->assertPattern($pattern, $result);
 
 		$pattern = '/\#: (\\\\|\/)extract\.ctp:14\n';
-		$pattern .= '\#: (\\\\|\/)home\.ctp:66\n';
+		$pattern .= '\#: (\\\\|\/)home\.ctp:99\n';
 		$pattern .= 'msgid "Editing this Page"\nmsgstr ""/';
+
 		$this->assertPattern($pattern, $result);
 
+
 		// extract.ctp - reading the domain.pot
 		$result = file_get_contents($this->path . DS . 'domain.pot');
 
@@ -152,7 +157,7 @@ class ExtractTaskTest extends CakeTestCase {
 	function testExtractWithExclude() {
 		$this->Task->interactive = false;
 
-		$this->Task->params['paths'] = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views';
+		$this->Task->params['paths'] = LIBS . 'tests' . DS . 'test_app' . DS . 'View';
 		$this->Task->params['output'] = $this->path . DS;
 		$this->Task->params['exclude'] = 'pages,layouts';
 
@@ -179,8 +184,8 @@ class ExtractTaskTest extends CakeTestCase {
 		$this->Task->interactive = false;
 
 		$this->Task->params['paths'] = 
-			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'pages,' .
-			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'posts';
+			LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'pages,' .
+			LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'posts';
 	
 		$this->Task->params['output'] = $this->path . DS;
 		$this->Task->expects($this->never())->method('err');
diff --git a/cake/tests/cases/console/shells/tasks/fixture.test.php b/lib/Cake/tests/Case/Console/Command/Task/FixtureTaskTest.php
similarity index 93%
rename from cake/tests/cases/console/shells/tasks/fixture.test.php
rename to lib/Cake/tests/Case/Console/Command/Task/FixtureTaskTest.php
index febd38ff8..a22631d99 100644
--- a/cake/tests/cases/console/shells/tasks/fixture.test.php
+++ b/lib/Cake/tests/Case/Console/Command/Task/FixtureTaskTest.php
@@ -16,14 +16,14 @@
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Shell', 'Shell', false);
-App::import('Shell', array(
-	'tasks/fixture',
-	'tasks/template',
-	'tasks/db_config'
-));
 
-require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
+App::uses('ShellDispatcher', 'Console');
+App::uses('Shell', 'Console');
+App::uses('ConsoleOutput', 'Console');
+App::uses('ConsoleInput', 'Console');
+App::uses('FixtureTask', 'Console/Command/Task');
+App::uses('TemplateTask', 'Console/Command/Task');
+App::uses('DbConfigTask', 'Console/Command/Task');
 
 /**
  * FixtureTaskTest class
@@ -83,7 +83,7 @@ class FixtureTaskTest extends CakeTestCase {
 		$in = $this->getMock('ConsoleInput', array(), array(), '', false);
 
 		$Task = new FixtureTask($out, $out, $in);
-		$this->assertEqual($Task->path, APP . 'tests' . DS . 'fixtures' . DS);
+		$this->assertEqual($Task->path, APP . 'tests' . DS . 'Fixture' . DS);
 	}
 
 /**
@@ -174,7 +174,7 @@ class FixtureTaskTest extends CakeTestCase {
 		$this->Task->connection = 'test';
 		$this->Task->path = '/my/path/';
 		$this->Task->args = array('article');
-		$filename = '/my/path/article_fixture.php';
+		$filename = '/my/path/ArticleFixture.php';
 
 		$this->Task->expects($this->at(0))->method('createFile')
 			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/class ArticleFixture/'));
@@ -204,7 +204,7 @@ class FixtureTaskTest extends CakeTestCase {
 		$this->Task->path = '/my/path/';
 
 		$this->Task->args = array($modelName);
-		$filename = '/my/path/article_fixture.php';
+		$filename = '/my/path/ArticleFixture.php';
 		$this->Task->expects($this->once())->method('createFile')
 			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/class ArticleFixture/'));
 
@@ -223,11 +223,11 @@ class FixtureTaskTest extends CakeTestCase {
 		$this->Task->Model->expects($this->any())->method('listAll')
 			->will($this->returnValue(array('articles', 'comments')));
 
-		$filename = '/my/path/article_fixture.php';
+		$filename = '/my/path/ArticleFixture.php';
 		$this->Task->expects($this->at(0))->method('createFile')
 			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/class ArticleFixture/'));
 
-		$filename = '/my/path/comment_fixture.php';
+		$filename = '/my/path/CommentFixture.php';
 		$this->Task->expects($this->at(1))->method('createFile')
 			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/class CommentFixture/'));
 
@@ -248,11 +248,11 @@ class FixtureTaskTest extends CakeTestCase {
 		$this->Task->Model->expects($this->any())->method('listAll')
 			->will($this->returnValue(array('articles', 'comments')));
 
-		$filename = '/my/path/article_fixture.php';
+		$filename = '/my/path/ArticleFixture.php';
 		$this->Task->expects($this->at(0))->method('createFile')
 			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/title\' => \'Third Article\'/'));
 
-		$filename = '/my/path/comment_fixture.php';
+		$filename = '/my/path/CommentFixture.php';
 		$this->Task->expects($this->at(1))->method('createFile')
 			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/comment\' => \'First Comment for First Article/'));
 		$this->Task->expects($this->exactly(2))->method('createFile');
@@ -275,7 +275,7 @@ class FixtureTaskTest extends CakeTestCase {
 			->with('Article')
 			->will($this->returnValue('articles'));
 
-		$filename = '/my/path/article_fixture.php';
+		$filename = '/my/path/ArticleFixture.php';
 		$this->Task->expects($this->once())->method('createFile')
 			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/class ArticleFixture/'));
 
@@ -340,7 +340,7 @@ class FixtureTaskTest extends CakeTestCase {
 	public function testGenerateFixtureFile() {
 		$this->Task->connection = 'test';
 		$this->Task->path = '/my/path/';
-		$filename = '/my/path/article_fixture.php';
+		$filename = '/my/path/ArticleFixture.php';
 
 		$this->Task->expects($this->at(0))->method('createFile')
 			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/ArticleFixture/'));
@@ -362,7 +362,7 @@ class FixtureTaskTest extends CakeTestCase {
 		$this->Task->connection = 'test';
 		$this->Task->path = '/my/path/';
 		$this->Task->plugin = 'TestFixture';
-		$filename = APP . 'plugins' . DS . 'test_fixture' . DS . 'tests' . DS . 'fixtures' . DS . 'article_fixture.php';
+		$filename = APP . 'plugins' . DS . 'test_fixture' . DS . 'tests' . DS . 'Fixture' . DS . 'ArticleFixture.php';
 
 		$this->Task->expects($this->at(0))->method('createFile')
 			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/Article/'));
diff --git a/cake/tests/cases/console/shells/tasks/model.test.php b/lib/Cake/tests/Case/Console/Command/Task/ModelTaskTest.php
similarity index 96%
rename from cake/tests/cases/console/shells/tasks/model.test.php
rename to lib/Cake/tests/Case/Console/Command/Task/ModelTaskTest.php
index 0927dd981..48ae20ed6 100644
--- a/cake/tests/cases/console/shells/tasks/model.test.php
+++ b/lib/Cake/tests/Case/Console/Command/Task/ModelTaskTest.php
@@ -18,14 +18,14 @@
  * @since         CakePHP v 1.2.6
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Shell', 'Shell', false);
-App::import('Shell', array(
-	'tasks/model',
-	'tasks/fixture',
-	'tasks/template'
-));
 
-require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
+App::uses('ShellDispatcher', 'Console');
+App::uses('Shell', 'Console');
+App::uses('ConsoleOutput', 'Console');
+App::uses('ConsoleInput', 'Console');
+App::uses('FixtureTask', 'Console/Command/Task');
+App::uses('TemplateTask', 'Console/Command/Task');
+App::uses('ModelTask', 'Console/Command/Task');
 
 /**
  * ModelTaskTest class
@@ -745,7 +745,7 @@ STRINGEND;
 	public function testBakeWithPlugin() {
 		$this->Task->plugin = 'controllerTest';
 
-		$path = APP . 'plugins' . DS . 'controller_test' . DS . 'models' . DS . 'bake_article.php';
+		$path = APP . 'plugins' . DS . 'controller_test' . DS . 'Model' . DS . 'BakeArticle.php';
 		$this->Task->expects($this->once())->method('createFile')
 			->with($path, new PHPUnit_Framework_Constraint_PCREMatch('/BakeArticle extends ControllerTestAppModel/'));
 	
@@ -763,8 +763,8 @@ STRINGEND;
 	public function testExecuteWithNamedModel() {
 		$this->Task->connection = 'test';
 		$this->Task->path = '/my/path/';
-		$this->Task->args = array('bake_article');
-		$filename = '/my/path/bake_article.php';
+		$this->Task->args = array('BakeArticle');
+		$filename = '/my/path/BakeArticle.php';
 		
 		$this->Task->expects($this->once())->method('_checkUnitTest')->will($this->returnValue(1));
 		$this->Task->expects($this->once())->method('createFile')
@@ -799,7 +799,7 @@ STRINGEND;
 		$this->Task->expects($this->once())->method('_checkUnitTest')->will($this->returnValue(1));
 
 		$this->Task->args = array($name);
-		$filename = '/my/path/bake_article.php';
+		$filename = '/my/path/BakeArticle.php';
 
 		$this->Task->expects($this->at(0))->method('createFile')
 			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/class BakeArticle extends AppModel/'));
@@ -814,8 +814,8 @@ STRINGEND;
 	public function testExecuteWithNamedModelHasManyCreated() {
 		$this->Task->connection = 'test';
 		$this->Task->path = '/my/path/';
-		$this->Task->args = array('bake_article');
-		$filename = '/my/path/bake_article.php';
+		$this->Task->args = array('BakeArticle');
+		$filename = '/my/path/BakeArticle.php';
 	
 		$this->Task->expects($this->once())->method('_checkUnitTest')->will($this->returnValue(1));
 		$this->Task->expects($this->at(0))->method('createFile')
@@ -843,23 +843,23 @@ STRINGEND;
 		$this->Task->Fixture->expects($this->exactly(5))->method('bake');
 		$this->Task->Test->expects($this->exactly(5))->method('bake');
 
-		$filename = '/my/path/bake_article.php';
+		$filename = '/my/path/BakeArticle.php';
 		$this->Task->expects($this->at(1))->method('createFile')
 			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/class BakeArticle/'));
 
-		$filename = '/my/path/bake_articles_bake_tag.php';
+		$filename = '/my/path/BakeArticlesBakeTag.php';
 		$this->Task->expects($this->at(2))->method('createFile')
 			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/class BakeArticlesBakeTag/'));
 
-		$filename = '/my/path/bake_comment.php';
+		$filename = '/my/path/BakeComment.php';
 		$this->Task->expects($this->at(3))->method('createFile')
 			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/class BakeComment/'));
 
-		$filename = '/my/path/bake_tag.php';
+		$filename = '/my/path/BakeTag.php';
 		$this->Task->expects($this->at(4))
 			->method('createFile')->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/class BakeTag/'));
 		
-		$filename = '/my/path/category_thread.php';
+		$filename = '/my/path/CategoryThread.php';
 		$this->Task->expects($this->at(5))->method('createFile')
 			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/class CategoryThread/'));
 
@@ -889,19 +889,19 @@ STRINGEND;
 		$this->Task->Fixture->expects($this->exactly(4))->method('bake');
 		$this->Task->Test->expects($this->exactly(4))->method('bake');
 
-		$filename = '/my/path/bake_article.php';
+		$filename = '/my/path/BakeArticle.php';
 		$this->Task->expects($this->at(1))->method('createFile')
 			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/class BakeArticle/'));
 
-		$filename = '/my/path/bake_articles_bake_tag.php';
+		$filename = '/my/path/BakeArticlesBakeTag.php';
 		$this->Task->expects($this->at(2))->method('createFile')
 			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/class BakeArticlesBakeTag/'));
 
-		$filename = '/my/path/bake_comment.php';
+		$filename = '/my/path/BakeComment.php';
 		$this->Task->expects($this->at(3))->method('createFile')
 			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/class BakeComment/'));
 
-		$filename = '/my/path/category_thread.php';
+		$filename = '/my/path/CategoryThread.php';
 		$this->Task->expects($this->at(4))->method('createFile')
 			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/class CategoryThread/'));
 
@@ -939,7 +939,7 @@ STRINGEND;
 		$this->Task->Test->expects($this->once())->method('bake');
 		$this->Task->Fixture->expects($this->once())->method('bake');
 
-		$filename = '/my/path/bake_article.php';
+		$filename = '/my/path/BakeArticle.php';
 
 		$this->Task->expects($this->once())->method('createFile')
 			->with($filename, new PHPUnit_Framework_Constraint_PCREMatch('/class BakeArticle/'));
diff --git a/cake/tests/cases/console/shells/tasks/plugin.test.php b/lib/Cake/tests/Case/Console/Command/Task/PluginTaskTest.php
similarity index 93%
rename from cake/tests/cases/console/shells/tasks/plugin.test.php
rename to lib/Cake/tests/Case/Console/Command/Task/PluginTaskTest.php
index 22131744e..a46465857 100644
--- a/cake/tests/cases/console/shells/tasks/plugin.test.php
+++ b/lib/Cake/tests/Case/Console/Command/Task/PluginTaskTest.php
@@ -18,15 +18,15 @@
  * @since         CakePHP v 1.3.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Shell', 'Shell', false);
-App::import('Shell', array(
-	'tasks/plugin',
-	'tasks/model'
-));
 
-App::import('Core', array('File'));
-
-require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
+App::uses('ShellDispatcher', 'Console');
+App::uses('ConsoleOutput', 'Console');
+App::uses('ConsoleInput', 'Console');
+App::uses('Shell', 'Console');
+App::uses('PluginTask', 'Console/Command/Task');
+App::uses('ModelTask', 'Console/Command/Task');
+App::uses('Folder', 'Utility');
+App::uses('File', 'Utility');
 
 /**
  * PluginTaskPlugin class
diff --git a/cake/tests/cases/console/shells/tasks/project.test.php b/lib/Cake/tests/Case/Console/Command/Task/ProjectTaskTest.php
similarity index 80%
rename from cake/tests/cases/console/shells/tasks/project.test.php
rename to lib/Cake/tests/Case/Console/Command/Task/ProjectTaskTest.php
index 65a5b4a52..ebf29913b 100644
--- a/cake/tests/cases/console/shells/tasks/project.test.php
+++ b/lib/Cake/tests/Case/Console/Command/Task/ProjectTaskTest.php
@@ -18,12 +18,14 @@
  * @since         CakePHP v 1.3.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Shell', 'Shell', false);
-App::import('Shell', 'tasks/project');
 
-App::import('Core', 'File');
-
-require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
+App::uses('ShellDispatcher', 'Console');
+App::uses('ConsoleOutput', 'Console');
+App::uses('ConsoleInput', 'Console');
+App::uses('Shell', 'Console');
+App::uses('ProjectTask', 'Console/Command/Task');
+App::uses('Folder', 'Utility');
+App::uses('File', 'Utility');
 
 /**
  * ProjectTask Test class
@@ -68,7 +70,7 @@ class ProjectTaskTest extends CakeTestCase {
  * @return void
  */
 	protected function _setupTestProject() {
-		$skel = CAKE . 'console' . DS . 'templates' . DS . 'skel';
+		$skel = LIBS . 'Console' . DS . 'templates' . DS . 'skel';
 		$this->Task->expects($this->at(0))->method('in')->will($this->returnValue('y'));
 		$this->Task->bake($this->Task->path . 'bake_test_app', $skel);
 	}
@@ -86,18 +88,17 @@ class ProjectTaskTest extends CakeTestCase {
 		$dirs = array(
 			'config',
 			'config' . DS . 'schema',
-			'console',
-			'console' . DS . 'shells',
-			'console' . DS . 'shells' . DS . 'tasks',
-			'controllers', 
-			'models', 
-			'views',
-			'views' . DS . 'helpers',
+			'Console',
+			'Console' . DS . 'Command',
+			'Console' . DS . 'Command' . DS . 'Task',
+			'Controller', 
+			'Model', 
+			'View',
+			'View' . DS . 'Helper',
 			'tests',
-			'tests' . DS . 'cases', 
-			'tests' . DS . 'cases' . DS . 'models', 
-			'tests' . DS . 'cases', 
-			'tests' . DS . 'fixtures',
+			'tests' . DS . 'Case', 
+			'tests' . DS . 'Case' . DS . 'Model',
+			'tests' . DS . 'Fixture',
 			'tmp',
 			'webroot',
 			'webroot' . DS . 'js',
@@ -119,16 +120,16 @@ class ProjectTaskTest extends CakeTestCase {
 		$path = $this->Task->path . 'bake_test_app';
 	
 		$empty = array(
-			'console' . DS . 'shells' . DS . 'tasks',
-			'controllers' . DS . 'components', 
-			'models' . DS . 'behaviors', 
-			'views' . DS . 'helpers',
-			'views' . DS . 'errors',
-			'views' . DS . 'scaffolds',
-			'tests' . DS . 'cases' . DS . 'models', 
-			'tests' . DS . 'cases' . DS . 'controllers',
-			'tests' . DS . 'cases' . DS . 'helpers',
-			'tests' . DS . 'fixtures',
+			'Console' . DS . 'Command' . DS . 'Task',
+			'Controller' . DS . 'Component', 
+			'Model' . DS . 'Behavior', 
+			'View' . DS . 'Helper',
+			'View' . DS . 'errors',
+			'View' . DS . 'scaffolds',
+			'tests' . DS . 'Case' . DS . 'Model', 
+			'tests' . DS . 'Case' . DS . 'Controller',
+			'tests' . DS . 'Case' . DS . 'View' . DS . 'Helper',
+			'tests' . DS . 'Fixture',
 			'webroot' . DS . 'js'
 		);
 	
@@ -254,7 +255,7 @@ class ProjectTaskTest extends CakeTestCase {
  * @return void
  */
 	public function testExecute() {
-		$this->Task->params['skel'] = CAKE . DS . 'console' . DS. 'templates' . DS . 'skel';
+		$this->Task->params['skel'] = LIBS . 'Console' . DS. 'templates' . DS . 'skel';
 		$this->Task->params['working'] = TMP . 'tests' . DS;
 
 		$path = $this->Task->path . 'bake_test_app';
@@ -263,14 +264,14 @@ class ProjectTaskTest extends CakeTestCase {
 
 		$this->Task->execute();
 		$this->assertTrue(is_dir($path), 'No project dir');
-		$this->assertTrue(is_dir($path . DS . 'controllers'), 'No controllers dir ');
-		$this->assertTrue(is_dir($path . DS . 'controllers' . DS .'components'), 'No components dir ');
-		$this->assertTrue(is_dir($path . DS . 'models'), 'No models dir');
-		$this->assertTrue(is_dir($path . DS . 'views'), 'No views dir');
-		$this->assertTrue(is_dir($path . DS . 'views' . DS . 'helpers'), 'No helpers dir');
+		$this->assertTrue(is_dir($path . DS . 'Controller'), 'No controllers dir ');
+		$this->assertTrue(is_dir($path . DS . 'Controller' . DS .'Component'), 'No components dir ');
+		$this->assertTrue(is_dir($path . DS . 'Model'), 'No models dir');
+		$this->assertTrue(is_dir($path . DS . 'View'), 'No views dir');
+		$this->assertTrue(is_dir($path . DS . 'View' . DS . 'Helper'), 'No helpers dir');
 		$this->assertTrue(is_dir($path . DS . 'tests'), 'No tests dir');
-		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'cases'), 'No cases dir');
-		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'fixtures'), 'No fixtures dir');
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'Case'), 'No cases dir');
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'Fixture'), 'No fixtures dir');
 	}
 
 /**
@@ -285,7 +286,7 @@ class ProjectTaskTest extends CakeTestCase {
 		$result = $this->Task->consolePath($path);
 		$this->assertTrue($result);
 
-		$file = new File($path . 'console' . DS . 'cake.php');
+		$file = new File($path . 'Console' . DS . 'cake.php');
 		$contents = $file->read();
 		$this->assertNoPattern('/__CAKE_PATH__/', $contents, 'Console path placeholder left behind.');
 	}
diff --git a/cake/tests/cases/console/shells/tasks/template.test.php b/lib/Cake/tests/Case/Console/Command/Task/TemplateTaskTest.php
similarity index 89%
rename from cake/tests/cases/console/shells/tasks/template.test.php
rename to lib/Cake/tests/Case/Console/Command/Task/TemplateTaskTest.php
index d33006cac..693637fb4 100644
--- a/cake/tests/cases/console/shells/tasks/template.test.php
+++ b/lib/Cake/tests/Case/Console/Command/Task/TemplateTaskTest.php
@@ -19,11 +19,12 @@
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Shell', 'Shell', false);
-App::import('Shell', 'tasks/template');
-
-require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
 
+App::uses('ShellDispatcher', 'Console');
+App::uses('ConsoleOutput', 'Console');
+App::uses('ConsoleInput', 'Console');
+App::uses('Shell', 'Console');
+App::uses('TemplateTask', 'Console/Command/Task');
 /**
  * TemplateTaskTest class
  *
@@ -86,7 +87,7 @@ class TemplateTaskTest extends CakeTestCase {
  * @return void
  */
 	public function testFindingInstalledThemesForBake() {
-		$consoleLibs = CAKE . 'console' . DS;
+		$consoleLibs = LIBS . 'Console' . DS;
 		$this->Task->initialize();
 		$this->assertEqual($this->Task->templatePaths['default'], $consoleLibs . 'templates' . DS . 'default' . DS);
 	}
@@ -98,7 +99,7 @@ class TemplateTaskTest extends CakeTestCase {
  * @return void
  */
 	public function testGetThemePath() {
-		$defaultTheme = CAKE_CORE_INCLUDE_PATH . DS . dirname(CONSOLE_LIBS) . 'templates' . DS . 'default' .DS;
+		$defaultTheme = LIBS . dirname(CONSOLE_LIBS) . 'templates' . DS . 'default' .DS;
 		$this->Task->templatePaths = array('default' => $defaultTheme);
 
 		$this->Task->expects($this->exactly(1))->method('in')->will($this->returnValue('1'));
@@ -124,8 +125,8 @@ class TemplateTaskTest extends CakeTestCase {
  */
 	public function testGenerate() {
 		App::build(array(
-			'shells' => array(
-				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS .  'test_app' . DS . 'console' . DS
+			'Console' => array(
+				LIBS . 'tests' . DS .  'test_app' . DS . 'console' . DS
 			)
 		));
 		$this->Task->initialize();
@@ -144,8 +145,8 @@ class TemplateTaskTest extends CakeTestCase {
  */
 	public function testGenerateWithTemplateFallbacks() {
 		App::build(array(
-			'shells' => array(
-				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS .  'test_app' . DS . 'console' . DS,
+			'Console' => array(
+				LIBS . 'tests' . DS .  'test_app' . DS . 'console' . DS,
 				CAKE_CORE_INCLUDE_PATH . DS . 'console' . DS
 			)
 		));
@@ -161,4 +162,4 @@ class TemplateTaskTest extends CakeTestCase {
 		$result = $this->Task->generate('classes', 'fixture');
 		$this->assertPattern('/ArticleFixture extends CakeTestFixture/', $result);
 	}
-}
\ No newline at end of file
+}
diff --git a/cake/tests/cases/console/shells/tasks/test.test.php b/lib/Cake/tests/Case/Console/Command/Task/TestTaskTest.php
similarity index 91%
rename from cake/tests/cases/console/shells/tasks/test.test.php
rename to lib/Cake/tests/Case/Console/Command/Task/TestTaskTest.php
index 5b25fb0b0..6810f6e27 100644
--- a/cake/tests/cases/console/shells/tasks/test.test.php
+++ b/lib/Cake/tests/Case/Console/Command/Task/TestTaskTest.php
@@ -18,16 +18,15 @@
  * @since         CakePHP v 1.2.0.7726
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Shell', 'Shell', false);
-App::import('Shell', array(
-	'tasks/test',
-	'tasks/template'
-));
 
-App::import('Controller', 'Controller', false);
-App::import('Model', 'Model', false);
-
-require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
+App::uses('ShellDispatcher', 'Console');
+App::uses('ConsoleOutput', 'Console');
+App::uses('ConsoleInput', 'Console');
+App::uses('Shell', 'Console');
+App::uses('TestTask', 'Console/Command/Task');
+App::uses('TemplateTask', 'Console/Command/Task');
+App::uses('Controller', 'Controller');
+App::uses('Model', 'Model');
 
 /**
  * Test Article model
@@ -270,7 +269,7 @@ class TestTaskTest extends CakeTestCase {
 		$this->Task->expects($this->never())->method('err');
 		$this->Task->expects($this->never())->method('_stop');
 
-		$file = TESTS . 'cases' . DS . 'models' . DS . 'my_class.test.php';
+		$file = TESTS . 'Case' . DS . 'Model' . DS . 'MyClassTest.php';
 
 		$this->Task->expects($this->at(1))->method('createFile')
 			->with($file, new PHPUnit_Framework_Constraint_IsAnything());
@@ -278,7 +277,7 @@ class TestTaskTest extends CakeTestCase {
 		$this->Task->expects($this->at(3))->method('createFile')
 			->with($file, new PHPUnit_Framework_Constraint_IsAnything());
 
-		$file = TESTS . 'cases' . DS . 'controllers' . DS . 'comments_controller.test.php';
+		$file = TESTS . 'Case' . DS . 'Controller' . DS . 'CommentsControllerTest.php';
 		$this->Task->expects($this->at(5))->method('createFile')
 			->with($file, new PHPUnit_Framework_Constraint_IsAnything());
 
@@ -340,7 +339,7 @@ class TestTaskTest extends CakeTestCase {
 		$this->Task->getObjectType();
 
 		$result = $this->Task->getObjectType();
-		$this->assertEqual($result, $this->Task->classTypes[1]);
+		$this->assertEqual($result, $this->Task->classTypes['Controller']);
 	}
 
 /**
@@ -374,7 +373,7 @@ class TestTaskTest extends CakeTestCase {
  */
 	public function testGetClassName() {
 		$objects = App::objects('model');
-		$skip = $this->skipIf(empty($objects), 'No models in app, this test will fail. %s');
+		$skip = $this->skipIf(empty($objects), 'No models in app, this test will fail.');
 		if ($skip) {
 			return;
 		}
@@ -438,7 +437,7 @@ class TestTaskTest extends CakeTestCase {
 
 		$result = $this->Task->bake('Model', 'TestTaskArticle');
 
-		$this->assertContains("App::import('Model', 'TestTaskArticle')", $result);
+		$this->assertContains("App::uses('TestTaskArticle', 'Model')", $result);
 		$this->assertContains('class TestTaskArticleTestCase extends CakeTestCase', $result);
 
 		$this->assertContains('function setUp()', $result);
@@ -469,7 +468,7 @@ class TestTaskTest extends CakeTestCase {
 
 		$result = $this->Task->bake('Controller', 'TestTaskComments');
 
-		$this->assertContains("App::import('Controller', 'TestTaskComments')", $result);
+		$this->assertContains("App::uses('TestTaskCommentsController', 'Controller')", $result);
 		$this->assertContains('class TestTaskCommentsControllerTestCase extends CakeTestCase', $result);
 
 		$this->assertContains('class TestTestTaskCommentsController extends TestTaskCommentsController', $result);
@@ -526,7 +525,7 @@ class TestTaskTest extends CakeTestCase {
 	public function testBakeWithPlugin() {
 		$this->Task->plugin = 'TestTest';
 
-		$path = APP . 'plugins' . DS . 'test_test' . DS . 'tests' . DS . 'cases' . DS . 'helpers' . DS . 'form.test.php';
+		$path = APP . 'plugins' . DS . 'test_test' . DS . 'tests' . DS . 'Case' . DS . 'View' . DS . 'Helper' . DS  .'FormHelperTest.php';
 		$this->Task->expects($this->once())->method('createFile')
 			->with($path, new PHPUnit_Framework_Constraint_IsAnything());
 
@@ -539,13 +538,13 @@ class TestTaskTest extends CakeTestCase {
  * @return void
  */
 	function testInteractiveWithPlugin() {
-		$testApp = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS;
+		$testApp = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS;
 		App::build(array(
 			'plugins' => array($testApp)
 		), true);
 
 		$this->Task->plugin = 'TestPlugin';
-		$path = $testApp . 'test_plugin' . DS . 'tests' . DS . 'cases' . DS . 'helpers' . DS . 'other_helper.test.php';
+		$path = $testApp . 'test_plugin' . DS . 'tests' . DS . 'Case' . DS . 'View' . DS . 'Helper' . DS . 'OtherHelperHelperTest.php';
 		$this->Task->expects($this->any())
 			->method('in')
 			->will($this->onConsecutiveCalls(
@@ -559,7 +558,7 @@ class TestTaskTest extends CakeTestCase {
 
 		$this->Task->stdout->expects($this->at(21))
 			->method('write')
-			->with('1. OtherHelper');
+			->with('1. OtherHelperHelper');
 	
 		$this->Task->execute();
 	}
@@ -573,28 +572,28 @@ class TestTaskTest extends CakeTestCase {
 		$this->Task->path = '/my/path/tests/';
 
 		$result = $this->Task->testCaseFileName('Model', 'Post');
-		$expected = $this->Task->path . 'cases' . DS . 'models' . DS . 'post.test.php';
+		$expected = $this->Task->path . 'Case' . DS . 'Model' . DS . 'PostTest.php';
 		$this->assertEqual($result, $expected);
 
 		$result = $this->Task->testCaseFileName('Helper', 'Form');
-		$expected = $this->Task->path . 'cases' . DS . 'helpers' . DS . 'form.test.php';
+		$expected = $this->Task->path . 'Case' . DS . 'View' . DS . 'Helper' . DS . 'FormHelperTest.php';
 		$this->assertEqual($result, $expected);
 
 		$result = $this->Task->testCaseFileName('Controller', 'Posts');
-		$expected = $this->Task->path . 'cases' . DS . 'controllers' . DS . 'posts_controller.test.php';
+		$expected = $this->Task->path . 'Case' . DS . 'Controller' . DS . 'PostsControllerTest.php';
 		$this->assertEqual($result, $expected);
 
 		$result = $this->Task->testCaseFileName('Behavior', 'Containable');
-		$expected = $this->Task->path . 'cases' . DS . 'behaviors' . DS . 'containable.test.php';
+		$expected = $this->Task->path . 'Case' . DS . 'Model' . DS . 'Behavior' . DS . 'ContainableBehaviorTest.php';
 		$this->assertEqual($result, $expected);
 
 		$result = $this->Task->testCaseFileName('Component', 'Auth');
-		$expected = $this->Task->path . 'cases' . DS . 'components' . DS . 'auth.test.php';
+		$expected = $this->Task->path . 'Case' . DS . 'Controller' . DS  . 'Component' . DS . 'AuthComponentTest.php';
 		$this->assertEqual($result, $expected);
 
 		$this->Task->plugin = 'TestTest';
 		$result = $this->Task->testCaseFileName('Model', 'Post');
-		$expected = APP . 'plugins' . DS . 'test_test' . DS . 'tests' . DS . 'cases' . DS . 'models' . DS . 'post.test.php';
+		$expected = APP . 'plugins' . DS . 'test_test' . DS . 'tests' . DS . 'Case' . DS . 'Model' . DS . 'PostTest.php';
 		$this->assertEqual($result, $expected);
 	}
 
diff --git a/cake/tests/cases/console/shells/tasks/view.test.php b/lib/Cake/tests/Case/Console/Command/Task/ViewTaskTest.php
similarity index 96%
rename from cake/tests/cases/console/shells/tasks/view.test.php
rename to lib/Cake/tests/Case/Console/Command/Task/ViewTaskTest.php
index 99f1afdf9..a0e92952f 100644
--- a/cake/tests/cases/console/shells/tasks/view.test.php
+++ b/lib/Cake/tests/Case/Console/Command/Task/ViewTaskTest.php
@@ -18,16 +18,18 @@
  * @since         CakePHP v 1.2.0.7726
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Shell', 'Shell', false);
-App::import('Shell', array(
-	'tasks/view',
-	'tasks/controller',
-	'tasks/template',
-	'tasks/project',
-	'tasks/db_config'
-));
 
-require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
+App::uses('ShellDispatcher', 'Console');
+App::uses('ConsoleOutput', 'Console');
+App::uses('ConsoleInput', 'Console');
+App::uses('Shell', 'Console');
+App::uses('ViewTask', 'Console/Command/Task');
+App::uses('ControllerTask', 'Console/Command/Task');
+App::uses('TemplateTask', 'Console/Command/Task');
+App::uses('ProjectTask', 'Console/Command/Task');
+App::uses('DbConfigTask', 'Console/Command/Task');
+App::uses('Model', 'Model');
+App::uses('Controller', 'Controller');
 
 /**
  * Test View Task Comment Model
@@ -393,7 +395,7 @@ class ViewTaskTest extends CakeTestCase {
 		$this->Task->plugin = 'TestTest';
 		$this->Task->name = 'View';
 
-		$path = APP . 'plugins' . DS . 'test_test' . DS . 'views' . DS . 'view_task_comments' . DS  . 'view.ctp';
+		$path = APP . 'plugins' . DS . 'test_test' . DS . 'View' . DS . 'view_task_comments' . DS  . 'view.ctp';
 		$this->Task->expects($this->once())->method('createFile')
 			->with($path, new PHPUnit_Framework_Constraint_IsAnything());
 
diff --git a/cake/tests/cases/console/shells/testsuite.test.php b/lib/Cake/tests/Case/Console/Command/TestsuiteShellTest.php
similarity index 85%
rename from cake/tests/cases/console/shells/testsuite.test.php
rename to lib/Cake/tests/Case/Console/Command/TestsuiteShellTest.php
index 30ad6f8e9..ed13340c6 100644
--- a/cake/tests/cases/console/shells/testsuite.test.php
+++ b/lib/Cake/tests/Case/Console/Command/TestsuiteShellTest.php
@@ -17,13 +17,10 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::import('Shell', 'Shell', false);
-App::import('Shell', 'Testsuite');
+App::uses('ShellDispatcher', 'Console');
+App::uses('TestsuiteShell', 'Console/Command');
 
-require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
-
-
-class TestSuiteShellTest extends CakeTestCase {
+class TestsuiteShellTest extends CakeTestCase {
 
 
 /**
@@ -36,7 +33,7 @@ class TestSuiteShellTest extends CakeTestCase {
 		$in = $this->getMock('ConsoleInput', array(), array(), '', false);
 
 		$this->Shell = $this->getMock(
-			'TestSuiteShell',
+			'TestsuiteShell',
 			array('in', 'out', 'hr', 'help', 'error', 'err', '_stop', 'initialize', 'run', 'clear'),
 			array($out, $out, $in)
 		);
@@ -60,7 +57,7 @@ class TestSuiteShellTest extends CakeTestCase {
 	public function testAvailableWithEmptyList() {
 		$this->Shell->startup();
 		$this->Shell->args = array('unexistant-category');
-		$this->Shell->expects($this->at(0))->method('out')->with(__("No test cases available \n\n"));
+		$this->Shell->expects($this->at(0))->method('out')->with(__d('cake_console', "No test cases available \n\n"));
 		$this->Shell->OptionParser->expects($this->once())->method('help');
 		$this->Shell->available();
 	}
@@ -78,14 +75,14 @@ class TestSuiteShellTest extends CakeTestCase {
 			->with(new PHPUnit_Framework_Constraint_PCREMatch('/\[1\].*/'));
 		$this->Shell->expects($this->at(2))->method('out')
 			->with(new PHPUnit_Framework_Constraint_PCREMatch('/\[2\].*/'));
-		
+
 		$this->Shell->expects($this->once())->method('in')
-			->with(__('What test case would you like to run?'), null, 'q')
+			->with(__d('cake_console', 'What test case would you like to run?'), null, 'q')
 			->will($this->returnValue('1'));
 
 		$this->Shell->expects($this->once())->method('run');
 		$this->Shell->available();
-		$this->assertEquals($this->Shell->args, array('core', 'Basics'));
+		$this->assertEquals($this->Shell->args, array('core', 'AllBehaviors'));
 	}
 
 /**
@@ -100,9 +97,9 @@ class TestSuiteShellTest extends CakeTestCase {
 
 		$this->Shell->expects($this->once())->method('run')
 			->with(
-				array('app' => false, 'plugin' => null, 'core' => true, 'output' => 'text', 'case' => 'basics'),
+				array('app' => false, 'plugin' => null, 'core' => true, 'output' => 'text', 'case' => 'Basics'),
 				array('--filter', 'myFilter', '--colors', '--verbose')
 			);
 		$this->Shell->main();
 	}
-}
+}
\ No newline at end of file
diff --git a/cake/tests/cases/console/libs/console_error_handler.test.php b/lib/Cake/tests/Case/Console/ConsoleErrorHandlerTest.php
similarity index 98%
rename from cake/tests/cases/console/libs/console_error_handler.test.php
rename to lib/Cake/tests/Case/Console/ConsoleErrorHandlerTest.php
index 51d16ab0f..6b4538d41 100644
--- a/cake/tests/cases/console/libs/console_error_handler.test.php
+++ b/lib/Cake/tests/Case/Console/ConsoleErrorHandlerTest.php
@@ -16,7 +16,8 @@
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-require_once CONSOLE_LIBS . 'console_error_handler.php';
+
+App::uses('ConsoleErrorHandler', 'Console');
 
 /**
  * ConsoleErrorHandler Test case.
diff --git a/cake/tests/cases/console/libs/console_option_parser.test.php b/lib/Cake/tests/Case/Console/ConsoleOptionParserTest.php
similarity index 99%
rename from cake/tests/cases/console/libs/console_option_parser.test.php
rename to lib/Cake/tests/Case/Console/ConsoleOptionParserTest.php
index fac420ecd..1c60f414b 100644
--- a/cake/tests/cases/console/libs/console_option_parser.test.php
+++ b/lib/Cake/tests/Case/Console/ConsoleOptionParserTest.php
@@ -17,7 +17,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-require_once CONSOLE_LIBS . 'console_option_parser.php';
+App::uses('ConsoleOptionParser', 'Console');
 
 class ConsoleOptionParserTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/console/libs/console_output.test.php b/lib/Cake/tests/Case/Console/ConsoleOutputTest.php
similarity index 99%
rename from cake/tests/cases/console/libs/console_output.test.php
rename to lib/Cake/tests/Case/Console/ConsoleOutputTest.php
index d2af99d04..1063a2640 100644
--- a/cake/tests/cases/console/libs/console_output.test.php
+++ b/lib/Cake/tests/Case/Console/ConsoleOutputTest.php
@@ -17,7 +17,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-require_once CONSOLE_LIBS . 'console_output.php';
+App::uses('ConsoleOutput', 'Console');
 
 class ConsoleOutputTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/console/libs/help_formatter.test.php b/lib/Cake/tests/Case/Console/HelpFormatterTest.php
similarity index 98%
rename from cake/tests/cases/console/libs/help_formatter.test.php
rename to lib/Cake/tests/Case/Console/HelpFormatterTest.php
index 5caae1490..5b2ca8172 100644
--- a/cake/tests/cases/console/libs/help_formatter.test.php
+++ b/lib/Cake/tests/Case/Console/HelpFormatterTest.php
@@ -1,7 +1,7 @@
 description(__('This is fifteen This is fifteen This is fifteen'))
+		$parser->description('This is fifteen This is fifteen This is fifteen')
 			->addOption('four', array('help' => 'this is help text this is help text'))
 			->addArgument('four', array('help' => 'this is help text this is help text'))
 			->addSubcommand('four', array('help' => 'this is help text this is help text'));
@@ -437,4 +437,4 @@ TEXT;
 		$result = $formatter->xml(false);
 		$this->assertInstanceOf('SimpleXmlElement', $result);
 	}
-}
+}
\ No newline at end of file
diff --git a/cake/tests/cases/console/shell_dispatcher.test.php b/lib/Cake/tests/Case/Console/ShellDispatcherTest.php
similarity index 97%
rename from cake/tests/cases/console/shell_dispatcher.test.php
rename to lib/Cake/tests/Case/Console/ShellDispatcherTest.php
index eb6fd2bd6..7cb59e6e3 100644
--- a/cake/tests/cases/console/shell_dispatcher.test.php
+++ b/lib/Cake/tests/Case/Console/ShellDispatcherTest.php
@@ -16,7 +16,8 @@
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
+
+App::uses('ShellDispatcher', 'Console');
 
 /**
  * TestShellDispatcher class
@@ -116,11 +117,10 @@ class ShellDispatcherTest extends CakeTestCase {
 		parent::setUp();
 		App::build(array(
 			'plugins' => array(
-				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
+				LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
 			),
-			'shells' => array(
-				CORE_PATH ? CONSOLE_LIBS : ROOT . DS . CONSOLE_LIBS,
-				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'console' . DS . 'shells' . DS
+			'Console/Command' => array(
+				LIBS . 'tests' . DS . 'test_app' . DS . 'Console' . DS . 'Command' . DS
 			)
 		), true);
 	}
diff --git a/cake/tests/cases/console/libs/task_collection.test.php b/lib/Cake/tests/Case/Console/TaskCollectionTest.php
similarity index 93%
rename from cake/tests/cases/console/libs/task_collection.test.php
rename to lib/Cake/tests/Case/Console/TaskCollectionTest.php
index 74c0c61f2..bb961736f 100644
--- a/cake/tests/cases/console/libs/task_collection.test.php
+++ b/lib/Cake/tests/Case/Console/TaskCollectionTest.php
@@ -17,8 +17,8 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::import('Shell', 'TaskCollection', false);
-App::import('Shell', 'Shell', false);
+App::uses('TaskCollection', 'Console');
+App::uses('Shell', 'Console');
 
 class TaskCollectionTest extends CakeTestCase {
 /**
@@ -72,7 +72,7 @@ class TaskCollectionTest extends CakeTestCase {
 /**
  * test missinghelper exception
  *
- * @expectedException MissingTaskFileException
+ * @expectedException MissingTaskClassException
  * @return void
  */
 	function testLoadMissingTaskFile() {
@@ -88,7 +88,7 @@ class TaskCollectionTest extends CakeTestCase {
 		$dispatcher = $this->getMock('ShellDispatcher', array(), array(), '', false);
 		$shell = $this->getMock('Shell', array(), array(), '', false);
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
 		$this->Tasks = new TaskCollection($shell, $dispatcher);
 
diff --git a/cake/tests/cases/libs/controller/components/acl.test.php b/lib/Cake/tests/Case/Controller/Component/AclComponentTest.php
similarity index 98%
rename from cake/tests/cases/libs/controller/components/acl.test.php
rename to lib/Cake/tests/Case/Controller/Component/AclComponentTest.php
index 4e10cce48..102a040d4 100644
--- a/cake/tests/cases/libs/controller/components/acl.test.php
+++ b/lib/Cake/tests/Case/Controller/Component/AclComponentTest.php
@@ -16,8 +16,10 @@
  * @since         CakePHP(tm) v 1.2.0.5435
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Component', 'Acl');
-App::import('model' . DS . 'db_acl');
+ 
+App::uses('AclComponent', 'Controller/Component');
+App::uses('AclNode', 'Model');
+class_exists('AclComponent');
 
 /**
  * AclNodeTwoTestBase class
@@ -260,7 +262,7 @@ class IniAclTest extends CakeTestCase {
  * @return void
  */
 	function testCheck() {
-		$iniFile = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'config'. DS . 'acl.ini.php';
+		$iniFile = LIBS . 'tests' . DS . 'test_app' . DS . 'config'. DS . 'acl.ini.php';
 
 		$Ini = new IniAcl();
 		$Ini->config = $Ini->readConfigFile($iniFile);
@@ -283,7 +285,7 @@ class IniAclTest extends CakeTestCase {
  * @return void
  */
 	function testCheckArray() {
-		$iniFile = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'config'. DS . 'acl.ini.php';
+		$iniFile = LIBS . 'tests' . DS . 'test_app' . DS . 'config'. DS . 'acl.ini.php';
 
 		$Ini = new IniAcl();
 		$Ini->config = $Ini->readConfigFile($iniFile);
diff --git a/cake/tests/cases/libs/controller/components/auth/actions_authorize.test.php b/lib/Cake/tests/Case/Controller/Component/Auth/ActionsAuthorizeTest.php
similarity index 93%
rename from cake/tests/cases/libs/controller/components/auth/actions_authorize.test.php
rename to lib/Cake/tests/Case/Controller/Component/Auth/ActionsAuthorizeTest.php
index 242606416..d4d967214 100644
--- a/cake/tests/cases/libs/controller/components/auth/actions_authorize.test.php
+++ b/lib/Cake/tests/Case/Controller/Component/Auth/ActionsAuthorizeTest.php
@@ -13,11 +13,12 @@
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Component', 'auth/actions_authorize');
-App::import('Controller', 'ComponentCollection');
-App::import('Component', 'Acl');
-App::import('Core', 'CakeRequest');
-App::import('Core', 'Controller');
+
+App::uses('ActionsAuthorize', 'Controller/Component/Auth');
+App::uses('ComponentCollection', 'Controller');
+App::uses('AclComponent', 'Controller/Component');
+App::uses('CakeRequest', 'Network');
+App::uses('CakeResponse', 'Network');
 
 class ActionsAuthorizeTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/controller/components/auth/basic_authenticate.test.php b/lib/Cake/tests/Case/Controller/Component/Auth/BasicAuthenticateTest.php
similarity index 94%
rename from cake/tests/cases/libs/controller/components/auth/basic_authenticate.test.php
rename to lib/Cake/tests/Case/Controller/Component/Auth/BasicAuthenticateTest.php
index f310faac5..b43c50c22 100644
--- a/cake/tests/cases/libs/controller/components/auth/basic_authenticate.test.php
+++ b/lib/Cake/tests/Case/Controller/Component/Auth/BasicAuthenticateTest.php
@@ -14,14 +14,14 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::import('Component', 'Auth');
-App::import('Component', 'auth/basic_authenticate');
-App::import('Model', 'AppModel');
-App::import('Core', 'CakeRequest');
-App::import('Core', 'CakeResponse');
+App::uses('AuthComponent', 'Controller/Component');
+App::uses('BasicAuthenticate', 'Controller/Component/Auth');
+App::uses('AppModel', 'Model');
+App::uses('CakeRequest', 'Network');
+App::uses('CakeResponse', 'Network');
 
 
-require_once  CAKE_TESTS . 'cases' . DS . 'libs' . DS . 'model' . DS . 'models.php';
+require_once  CAKE_TESTS . 'Case' . DS . 'Model' . DS . 'models.php';
 
 /**
  * Test case for BasicAuthentication
diff --git a/cake/tests/cases/libs/controller/components/auth/controller_authorize.test.php b/lib/Cake/tests/Case/Controller/Component/Auth/ControllerAuthorizeTest.php
similarity index 91%
rename from cake/tests/cases/libs/controller/components/auth/controller_authorize.test.php
rename to lib/Cake/tests/Case/Controller/Component/Auth/ControllerAuthorizeTest.php
index a3f687f0d..09ef5c6f8 100644
--- a/cake/tests/cases/libs/controller/components/auth/controller_authorize.test.php
+++ b/lib/Cake/tests/Case/Controller/Component/Auth/ControllerAuthorizeTest.php
@@ -13,9 +13,11 @@
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Component', 'auth/controller_authorize');
-App::import('Core', 'CakeRequest');
-App::import('Core', 'Controller');
+
+App::uses('Controller', 'Controller');
+App::uses('ControllerAuthorize', 'Controller/Component/Auth');
+App::uses('CakeRequest', 'Network');
+App::uses('CakeResponse', 'Network');
 
 class ControllerAuthorizeTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/controller/components/auth/crud_authorize.test.php b/lib/Cake/tests/Case/Controller/Component/Auth/CrudAuthorizeTest.php
similarity index 94%
rename from cake/tests/cases/libs/controller/components/auth/crud_authorize.test.php
rename to lib/Cake/tests/Case/Controller/Component/Auth/CrudAuthorizeTest.php
index a78fb71ec..853b01e32 100644
--- a/cake/tests/cases/libs/controller/components/auth/crud_authorize.test.php
+++ b/lib/Cake/tests/Case/Controller/Component/Auth/CrudAuthorizeTest.php
@@ -13,11 +13,12 @@
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Component', 'auth/crud_authorize');
-App::import('Controller', 'ComponentCollection');
-App::import('Component', 'Acl');
-App::import('Core', 'CakeRequest');
-App::import('Core', 'Controller');
+
+App::uses('CrudAuthorize', 'Controller/Component/Auth');
+App::uses('ComponentCollection', 'Controller');
+App::uses('AclComponent', 'Controller/Component');
+App::uses('CakeRequest', 'Network');
+App::uses('CakeResponse', 'Network');
 
 class CrudAuthorizeTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/controller/components/auth/digest_authenticate.test.php b/lib/Cake/tests/Case/Controller/Component/Auth/DigestAuthenticateTest.php
similarity index 96%
rename from cake/tests/cases/libs/controller/components/auth/digest_authenticate.test.php
rename to lib/Cake/tests/Case/Controller/Component/Auth/DigestAuthenticateTest.php
index 5d81c0bf1..72047c5e8 100644
--- a/cake/tests/cases/libs/controller/components/auth/digest_authenticate.test.php
+++ b/lib/Cake/tests/Case/Controller/Component/Auth/DigestAuthenticateTest.php
@@ -14,13 +14,12 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::import('Component', 'auth/digest_authenticate');
-App::import('Model', 'AppModel');
-App::import('Core', 'CakeRequest');
-App::import('Core', 'CakeResponse');
+App::uses('DigestAuthenticate', 'Controller/Component/Auth');
+App::uses('AppModel', 'Model');
+App::uses('CakeRequest', 'Network');
+App::uses('CakeResponse', 'Network');
 
-
-require_once  CAKE_TESTS . 'cases' . DS . 'libs' . DS . 'model' . DS . 'models.php';
+require_once  CAKE_TESTS . 'Case' . DS . 'Model' . DS . 'models.php';
 
 /**
  * Test case for DigestAuthentication
diff --git a/cake/tests/cases/libs/controller/components/auth/form_authenticate.test.php b/lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php
similarity index 92%
rename from cake/tests/cases/libs/controller/components/auth/form_authenticate.test.php
rename to lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php
index 7e99b3b7b..e11150611 100644
--- a/cake/tests/cases/libs/controller/components/auth/form_authenticate.test.php
+++ b/lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php
@@ -14,13 +14,13 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::import('Component', 'Auth');
-App::import('Component', 'auth/form_authenticate');
-App::import('Model', 'AppModel');
-App::import('Core', 'CakeRequest');
-App::import('Core', 'CakeResponse');
+App::uses('AuthComponent', 'Controller/Component');
+App::uses('FormAuthenticate', 'Controller/Component/Auth');
+App::uses('AppModel', 'Model');
+App::uses('CakeRequest', 'Network');
+App::uses('CakeResponse', 'Network');
 
-require_once  CAKE_TESTS . 'cases' . DS . 'libs' . DS . 'model' . DS . 'models.php';
+require_once  CAKE_TESTS . 'Case' . DS . 'Model' . DS . 'models.php';
 
 /**
  * Test case for FormAuthentication
@@ -155,7 +155,7 @@ class FormAuthenticateTest extends CakeTestCase {
 	function testPluginModel() {
 		Cache::delete('object_map', '_cake_core_');
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
 		), true);
 		App::objects('plugin', null, false);
 
diff --git a/cake/tests/cases/libs/controller/components/auth.test.php b/lib/Cake/tests/Case/Controller/Component/AuthComponentTest.php
similarity index 99%
rename from cake/tests/cases/libs/controller/components/auth.test.php
rename to lib/Cake/tests/Case/Controller/Component/AuthComponentTest.php
index 9a448e386..e7f1709e8 100644
--- a/cake/tests/cases/libs/controller/components/auth.test.php
+++ b/lib/Cake/tests/Case/Controller/Component/AuthComponentTest.php
@@ -16,10 +16,11 @@
  * @since         CakePHP(tm) v 1.2.0.5347
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'Controller');
-App::import('Component', array('Auth', 'Acl'));
-App::import('Component', 'auth/form_authenticate');
-App::import('Model', 'DbAcl');
+
+App::uses('Controller', 'Controller');
+App::uses('AuthComponent', 'Controller/Component');
+App::uses('AclComponent', 'Controller/Component');
+App::uses('FormAuthenticate', 'Controller/Component/Auth');
 
 /**
 * TestAuthComponent class
@@ -950,11 +951,11 @@ class AuthTest extends CakeTestCase {
  */
 	function testAjaxLogin() {
 		App::build(array(
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		));
 		$_SERVER['HTTP_X_REQUESTED_WITH'] = "XMLHttpRequest";
 
-		App::import('Core', 'Dispatcher');
+		App::uses('Dispatcher', 'Routing');
 
 		ob_start();
 		$Dispatcher = new Dispatcher();
diff --git a/cake/tests/cases/libs/controller/components/cookie.test.php b/lib/Cake/tests/Case/Controller/Component/CookieComponentTest.php
similarity index 99%
rename from cake/tests/cases/libs/controller/components/cookie.test.php
rename to lib/Cake/tests/Case/Controller/Component/CookieComponentTest.php
index 0dc3ccd38..9254ef94c 100644
--- a/cake/tests/cases/libs/controller/components/cookie.test.php
+++ b/lib/Cake/tests/Case/Controller/Component/CookieComponentTest.php
@@ -16,8 +16,11 @@
  * @since         CakePHP(tm) v 1.2.0.5435
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Controller', array('Component', 'Controller'), false);
-App::import('Component', 'Cookie');
+
+App::uses('Component', 'Controller');
+App::uses('Controller', 'Controller');
+App::uses('CookieComponent', 'Controller/Component');
+
 
 /**
  * CookieComponentTestController class
diff --git a/cake/tests/cases/libs/controller/components/email.test.php b/lib/Cake/tests/Case/Controller/Component/EmailComponentTest.php
old mode 100755
new mode 100644
similarity index 98%
rename from cake/tests/cases/libs/controller/components/email.test.php
rename to lib/Cake/tests/Case/Controller/Component/EmailComponentTest.php
index 35b96c34b..949daf8c2
--- a/cake/tests/cases/libs/controller/components/email.test.php
+++ b/lib/Cake/tests/Case/Controller/Component/EmailComponentTest.php
@@ -18,9 +18,9 @@
  * @since         CakePHP(tm) v 1.2.0.5347
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'Controller');
-App::import('Component', 'Email');
-App::import('Core', 'CakeSocket');
+App::uses('Controller', 'Controller');
+App::uses('EmailComponent', 'Controller/Component');
+App::uses('CakeSocket', 'Network');
 
 /**
  * EmailTestComponent class
@@ -252,11 +252,10 @@ class EmailComponentTest extends CakeTestCase {
 		$this->Controller->Components->init($this->Controller);
 
 		$this->Controller->EmailTest->initialize($this->Controller, array());
-		$view = new View($this->Controller);
-		ClassRegistry::addObject('view', $view);
+		ClassRegistry::addObject('view', new View($this->Controller));
 
 		App::build(array(
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		));
 	}
 
@@ -806,7 +805,7 @@ HTMLBLOC;
  */
 	function testMessageRetrievalWithoutTemplate() {
 		App::build(array(
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		));
 
 		$this->Controller->EmailTest->to = 'postmaster@localhost';
@@ -844,7 +843,7 @@ HTMLBLOC;
  */
 	function testMessageRetrievalWithTemplate() {
 		App::build(array(
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		));
 
 		$this->Controller->set('value', 22091985);
@@ -1059,7 +1058,7 @@ HTMLBLOC;
 		$this->Controller->EmailTest->sendAs = 'text';
 		$this->assertTrue($this->Controller->EmailTest->send($body));
 		$msg = $this->Controller->Session->read('Message.email.message');
-		$this->assertPattern('/' . preg_quote('Content-Disposition: attachment; filename="email.test.php"') . '/', $msg);
+		$this->assertPattern('/' . preg_quote('Content-Disposition: attachment; filename="EmailComponentTest.php"') . '/', $msg);
 		$this->assertPattern('/' . preg_quote('Content-Disposition: attachment; filename="some-name.php"') . '/', $msg);
 	}
 
@@ -1176,8 +1175,8 @@ HTMLBLOC;
 
 	function testPluginCustomViewClass() {
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		));
 
 		$this->Controller->view = 'TestPlugin.Email';
diff --git a/cake/tests/cases/libs/controller/components/paginator.test.php b/lib/Cake/tests/Case/Controller/Component/PaginatorComponentTest.php
similarity index 99%
rename from cake/tests/cases/libs/controller/components/paginator.test.php
rename to lib/Cake/tests/Case/Controller/Component/PaginatorComponentTest.php
index cbaecb2b9..c286c0a67 100644
--- a/cake/tests/cases/libs/controller/components/paginator.test.php
+++ b/lib/Cake/tests/Case/Controller/Component/PaginatorComponentTest.php
@@ -18,9 +18,11 @@
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Controller', 'Controller', false);
-App::import('Component', 'Paginator');
-App::import('Core', array('CakeRequest', 'CakeResponse'));
+
+App::uses('Controller', 'Controller');
+App::uses('PaginatorComponent', 'Controller/Component');
+App::uses('CakeRequest', 'Network');
+App::uses('CakeResponse', 'Network');
 
 /**
  * PaginatorTestController class
diff --git a/cake/tests/cases/libs/controller/components/request_handler.test.php b/lib/Cake/tests/Case/Controller/Component/RequestHandlerComponentTest.php
similarity index 98%
rename from cake/tests/cases/libs/controller/components/request_handler.test.php
rename to lib/Cake/tests/Case/Controller/Component/RequestHandlerComponentTest.php
index 3ce9ccc4e..047db025e 100644
--- a/cake/tests/cases/libs/controller/components/request_handler.test.php
+++ b/lib/Cake/tests/Case/Controller/Component/RequestHandlerComponentTest.php
@@ -16,9 +16,11 @@
  * @since         CakePHP(tm) v 1.2.0.5435
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Controller', 'Controller', false);
-App::import('Component', array('RequestHandler'));
-App::import('Core', array('CakeRequest', 'CakeResponse'));
+App::uses('Controller', 'Controller');
+App::uses('RequestHandlerComponent', 'Controller/Component');
+App::uses('CakeRequest', 'Network');
+App::uses('CakeResponse', 'Network');
+App::uses('Router', 'Routing');
 
 /**
  * RequestHandlerTestController class
@@ -668,7 +670,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
  */
 	function testAjaxRedirectAsRequestAction() {
 		App::build(array(
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		), true);
 
 		$this->Controller->RequestHandler = $this->getMock('RequestHandlerComponent', array('_stop'), array(&$this->Controller->Components));
@@ -697,7 +699,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
  */
 	function testAjaxRedirectAsRequestActionStillRenderingLayout() {
 		App::build(array(
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		), true);
 
 		$this->Controller->RequestHandler = $this->getMock('RequestHandlerComponent', array('_stop'), array(&$this->Controller->Components));
diff --git a/cake/tests/cases/libs/controller/components/security.test.php b/lib/Cake/tests/Case/Controller/Component/SecurityComponentTest.php
similarity index 99%
rename from cake/tests/cases/libs/controller/components/security.test.php
rename to lib/Cake/tests/Case/Controller/Component/SecurityComponentTest.php
index f3d1240e6..4f2209070 100644
--- a/cake/tests/cases/libs/controller/components/security.test.php
+++ b/lib/Cake/tests/Case/Controller/Component/SecurityComponentTest.php
@@ -16,8 +16,9 @@
  * @since         CakePHP(tm) v 1.2.0.5435
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Controller', 'Controller', false);
-App::import('Component', 'Security');
+
+App::uses('SecurityComponent', 'Controller/Component');
+App::uses('Controller', 'Controller');
 
 /**
 * TestSecurityComponent
diff --git a/cake/tests/cases/libs/controller/components/session.test.php b/lib/Cake/tests/Case/Controller/Component/SessionComponentTest.php
similarity index 98%
rename from cake/tests/cases/libs/controller/components/session.test.php
rename to lib/Cake/tests/Case/Controller/Component/SessionComponentTest.php
index 938d8dd00..d0af41057 100644
--- a/cake/tests/cases/libs/controller/components/session.test.php
+++ b/lib/Cake/tests/Case/Controller/Component/SessionComponentTest.php
@@ -16,8 +16,8 @@
  * @since         CakePHP(tm) v 1.2.0.5436
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Controller', 'Controller', false);
-App::import('Component', 'Session');
+App::uses('Controller', 'Controller');
+App::uses('SessionComponent', 'Controller/Component');
 
 /**
  * SessionTestController class
diff --git a/cake/tests/cases/libs/controller/component_collection.test.php b/lib/Cake/tests/Case/Controller/ComponentCollectionTest.php
similarity index 92%
rename from cake/tests/cases/libs/controller/component_collection.test.php
rename to lib/Cake/tests/Case/Controller/ComponentCollectionTest.php
index 549e246a3..a6b779073 100644
--- a/cake/tests/cases/libs/controller/component_collection.test.php
+++ b/lib/Cake/tests/Case/Controller/ComponentCollectionTest.php
@@ -17,8 +17,9 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::import('Component', array('Cookie', 'Security'));
-App::import('Core', 'ComponentCollection');
+App::uses('CookieComponent', 'Controller/Component');
+App::uses('SecurityComponent', 'Controller/Component');
+App::uses('ComponentCollection', 'Controller');
 
 /**
  * Extended CookieComponent
@@ -83,7 +84,7 @@ class ComponentCollectionTest extends CakeTestCase {
 		$result = $this->Components->load('Cookie');
 		$this->assertInstanceOf('CookieAliasComponent', $result);
 
-		App::build(array('plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)));
+		App::build(array('plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)));
 		$result = $this->Components->load('SomeOther', array('className' => 'TestPlugin.OtherComponent'));
 		$this->assertInstanceOf('OtherComponentComponent', $result);
 		$this->assertInstanceOf('OtherComponentComponent', $this->Components->SomeOther);
@@ -108,7 +109,7 @@ class ComponentCollectionTest extends CakeTestCase {
 /**
  * test missingcomponent exception
  *
- * @expectedException MissingComponentFileException
+ * @expectedException MissingComponentClassException
  * @return void
  */
 	function testLoadMissingComponentFile() {
@@ -122,7 +123,7 @@ class ComponentCollectionTest extends CakeTestCase {
  */
 	function testLoadPluginComponent() {
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
 		));
 		$result = $this->Components->load('TestPlugin.OtherComponent');
 		$this->assertInstanceOf('OtherComponentComponent', $result, 'Component class is wrong.');
diff --git a/cake/tests/cases/libs/controller/component.test.php b/lib/Cake/tests/Case/Controller/ComponentTest.php
similarity index 94%
rename from cake/tests/cases/libs/controller/component.test.php
rename to lib/Cake/tests/Case/Controller/ComponentTest.php
index eb01dae61..e1685c25e 100644
--- a/cake/tests/cases/libs/controller/component.test.php
+++ b/lib/Cake/tests/Case/Controller/ComponentTest.php
@@ -16,8 +16,9 @@
  * @since         CakePHP(tm) v 1.2.0.5436
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Controller', 'Controller', false);
-App::import('Controller', 'Component', false);
+
+App::uses('Controller', 'Controller');
+App::uses('Component', 'Controller');
 
 /**
  * ParamTestComponent
@@ -50,7 +51,7 @@ class ParamTestComponent extends Component {
  * @access public
  * @return void
  */
-	function initialize($controllerz) {
+	function initialize(&$controller, $settings) {
 		foreach ($settings as $key => $value) {
 			if (is_numeric($key)) {
 				$this->{$value} = true;
@@ -116,7 +117,7 @@ class AppleComponent extends Component {
  * @access public
  * @return void
  */
-	function startup($controller) {
+	function startup(&$controller) {
 		$this->testName = $controller->name;
 	}
 }
@@ -143,7 +144,7 @@ class OrangeComponent extends Component {
  * @access public
  * @return void
  */
-	function initialize($controller) {
+	function initialize(&$controller) {
 		$this->Controller = $controller;
 		$this->Banana->testField = 'OrangeField';
 	}
@@ -154,7 +155,7 @@ class OrangeComponent extends Component {
  * @param Controller $controller
  * @return string
  */
-	public function startup($controller) {
+	public function startup(&$controller) {
 		$controller->foo = 'pass';
 	}
 }
@@ -180,7 +181,7 @@ class BananaComponent extends Component {
  * @param Controller $controller
  * @return string
  */
-	public function startup($controller) {
+	public function startup(&$controller) {
 		$controller->bar = 'fail';
 	}
 }
@@ -250,7 +251,7 @@ class ComponentTest extends CakeTestCase {
 	function setUp() {
 		$this->_pluginPaths = App::path('plugins');
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
 	}
 
diff --git a/cake/tests/cases/libs/controller/controller_merge_vars.test.php b/lib/Cake/tests/Case/Controller/ControllerMergeVarsTest.php
similarity index 99%
rename from cake/tests/cases/libs/controller/controller_merge_vars.test.php
rename to lib/Cake/tests/Case/Controller/ControllerMergeVarsTest.php
index 80e12d88c..dc4fb6130 100644
--- a/cake/tests/cases/libs/controller/controller_merge_vars.test.php
+++ b/lib/Cake/tests/Case/Controller/ControllerMergeVarsTest.php
@@ -18,7 +18,7 @@
  * @since         CakePHP(tm) v 1.2.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'Controller');
+App::uses('Controller', 'Controller');
 
 /**
  * Test case AppController
diff --git a/cake/tests/cases/libs/controller/controller.test.php b/lib/Cake/tests/Case/Controller/ControllerTest.php
similarity index 95%
rename from cake/tests/cases/libs/controller/controller.test.php
rename to lib/Cake/tests/Case/Controller/ControllerTest.php
index dd637e622..82ea88dbe 100644
--- a/cake/tests/cases/libs/controller/controller.test.php
+++ b/lib/Cake/tests/Case/Controller/ControllerTest.php
@@ -16,11 +16,12 @@
  * @since         CakePHP(tm) v 1.2.0.5436
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Controller', 'Controller', false);
-App::import('Core', array('CakeRequest', 'CakeResponse'));
-App::import('Component', 'Security');
-App::import('Component', 'Cookie');
-
+App::uses('Controller', 'Controller');
+App::uses('Router', 'Routing');
+App::uses('CakeRequest', 'Network');
+App::uses('CakeResponse', 'Network');
+App::uses('SecurityComponent', 'Controller/Component');
+App::uses('CookieComponent', 'Controller/Component');
 
 /**
  * AppController class
@@ -110,13 +111,13 @@ class ControllerPost extends CakeTestModel {
  * @access public
  * @return void
  */
-	function find($conditions = null, $fields = array(), $order = null, $recursive = null) {
-		if ($conditions == 'popular') {
+	function find($type, $options = array()) {
+		if ($type == 'popular') {
 			$conditions = array($this->name . '.' . $this->primaryKey .' > ' => '1');
-			$options = Set::merge($fields, compact('conditions'));
-			return parent::find('all', $fields);
+			$options = Set::merge($options, compact('conditions'));
+			return parent::find('all', $options);
 		}
-		return parent::find($conditions, $fields);
+		return parent::find($type, $options);
 	}
 }
 
@@ -317,7 +318,7 @@ class TestComponent extends Object {
  * @access public
  * @return void
  */
-	function initialize($controller) {
+	function initialize(&$controller) {
 	}
 
 /**
@@ -326,7 +327,7 @@ class TestComponent extends Object {
  * @access public
  * @return void
  */
-	function startup($controller) {
+	function startup(&$controller) {
 	}
 /**
  * shutdown method
@@ -334,14 +335,14 @@ class TestComponent extends Object {
  * @access public
  * @return void
  */
-	function shutdown($controller) {
+	function shutdown(&$controller) {
 	}
 /**
  * beforeRender callback
  *
  * @return void
  */
-	function beforeRender($controller) {
+	function beforeRender(&$controller) {
 		if ($this->viewclass) {
 			$controller->viewClass = $this->viewclass;
 		}
@@ -437,11 +438,12 @@ class ControllerTest extends CakeTestCase {
  */
 	function testLoadModelInPlugins() {
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
-			'controllers' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'controllers' . DS),
-			'models' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'Controller' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Controller' . DS),
+			'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS)
 		));
-		App::import('Controller', 'TestPlugin.TestPlugin');
+		App::uses('TestPluginAppController', 'TestPlugin.Controller');
+		App::uses('TestPluginController', 'TestPlugin.Controller');
 
 		$Controller = new TestPluginController();
 		$Controller->plugin = 'TestPlugin';
@@ -486,7 +488,7 @@ class ControllerTest extends CakeTestCase {
 
 		unset($Controller);
 
-		App::build(array('plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)));
+		App::build(array('plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)));
 
 		$Controller = new Controller($request);
 		$Controller->uses = array('TestPlugin.TestPluginPost');
@@ -576,7 +578,7 @@ class ControllerTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		App::build(array(
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		));
 		$Controller = new Controller($request);
 		$Controller->response = $this->getMock('CakeResponse', array('_sendHeader'));
@@ -638,7 +640,7 @@ class ControllerTest extends CakeTestCase {
  */
 	function testRender() {
 		App::build(array(
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		), true);
 		$request = new CakeRequest('controller_posts/index');
 		$request->params['action'] = 'index';
@@ -682,11 +684,9 @@ class ControllerTest extends CakeTestCase {
  * @return void
  */
 	function testComponentBeforeRenderChangingViewClass() {
-		$core = App::core('views');
 		App::build(array(
-			'views' => array(
-				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS,
-				$core[0]
+			'View' => array(
+				LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS
 			)
 		), true);
 		$Controller = new Controller($this->getMock('CakeRequest'));
diff --git a/cake/tests/cases/libs/controller/pages_controller.test.php b/lib/Cake/tests/Case/Controller/PagesControllerTest.php
similarity index 86%
rename from cake/tests/cases/libs/controller/pages_controller.test.php
rename to lib/Cake/tests/Case/Controller/PagesControllerTest.php
index 1d9d3febc..452e7db77 100644
--- a/cake/tests/cases/libs/controller/pages_controller.test.php
+++ b/lib/Cake/tests/Case/Controller/PagesControllerTest.php
@@ -16,7 +16,8 @@
  * @since         CakePHP(tm) v 1.2.0.5436
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Controller', 'Pages');
+
+App::uses('PagesController', 'Controller');
 
 /**
  * PagesControllerTest class
@@ -25,6 +26,16 @@ App::import('Controller', 'Pages');
  */
 class PagesControllerTest extends CakeTestCase {
 
+/**
+ * endTest method
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		App::build();
+	}
+
 /**
  * testDisplay method
  *
@@ -33,7 +44,9 @@ class PagesControllerTest extends CakeTestCase {
  */
 	function testDisplay() {
 		App::build(array(
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS, TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS)
+			'View' => array(
+				LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS
+			)
 		));
 		$Pages = new PagesController(new CakeRequest(null, false));
 
diff --git a/cake/tests/cases/libs/controller/scaffold.test.php b/lib/Cake/tests/Case/Controller/ScaffoldTest.php
similarity index 92%
rename from cake/tests/cases/libs/controller/scaffold.test.php
rename to lib/Cake/tests/Case/Controller/ScaffoldTest.php
index 568012371..f46a00a05 100644
--- a/cake/tests/cases/libs/controller/scaffold.test.php
+++ b/lib/Cake/tests/Case/Controller/ScaffoldTest.php
@@ -16,8 +16,10 @@
  * @since         CakePHP(tm) v 1.2.0.5436
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'Scaffold', false);
-App::import('Core', 'Controller', false);
+
+App::uses('Controller', 'Controller');
+App::uses('Scaffold', 'Controller');
+App::uses('ScaffoldView', 'View');
 
 /**
  * ScaffoldMockController class
@@ -89,8 +91,8 @@ class TestScaffoldMock extends Scaffold {
  *
  * @param unknown_type $params
  */
-    function _scaffold(CakeRequest $request) {
-        $this->_params = $request;
+    function _scaffold($params) {
+        $this->_params = $params;
     }
 
 /**
@@ -277,8 +279,8 @@ class ScaffoldViewTest extends CakeTestCase {
 		$this->Controller->response = $this->getMock('CakeResponse', array('_sendHeader'));
 
 		App::build(array(
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS),
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS),
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
 	}
 
@@ -305,39 +307,39 @@ class ScaffoldViewTest extends CakeTestCase {
 		$this->Controller->request->params['action'] = 'index';
 		$ScaffoldView = new TestScaffoldView($this->Controller);
 		$result = $ScaffoldView->testGetFilename('index');
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS . 'scaffolds' . DS . 'index.ctp';
+		$expected = LIBS . 'View' . DS . 'scaffolds' . DS . 'index.ctp';
 		$this->assertEqual($result, $expected);
 
 		$result = $ScaffoldView->testGetFilename('edit');
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS . 'scaffolds' . DS . 'form.ctp';
+		$expected = LIBS . 'View' . DS . 'scaffolds' . DS . 'form.ctp';
 		$this->assertEqual($result, $expected);
 
 		$result = $ScaffoldView->testGetFilename('add');
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS . 'scaffolds' . DS . 'form.ctp';
+		$expected = LIBS . 'View' . DS . 'scaffolds' . DS . 'form.ctp';
 		$this->assertEqual($result, $expected);
 
 		$result = $ScaffoldView->testGetFilename('view');
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS . 'scaffolds' . DS . 'view.ctp';
+		$expected = LIBS . 'View' . DS . 'scaffolds' . DS . 'view.ctp';
 		$this->assertEqual($result, $expected);
 
 		$result = $ScaffoldView->testGetFilename('admin_index');
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS . 'scaffolds' . DS . 'index.ctp';
+		$expected = LIBS . 'View' . DS . 'scaffolds' . DS . 'index.ctp';
 		$this->assertEqual($result, $expected);
 
 		$result = $ScaffoldView->testGetFilename('admin_view');
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS . 'scaffolds' . DS . 'view.ctp';
+		$expected = LIBS . 'View' . DS . 'scaffolds' . DS . 'view.ctp';
 		$this->assertEqual($result, $expected);
 
 		$result = $ScaffoldView->testGetFilename('admin_edit');
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS . 'scaffolds' . DS . 'form.ctp';
+		$expected =LIBS . 'View' . DS . 'scaffolds' . DS . 'form.ctp';
 		$this->assertEqual($result, $expected);
 
 		$result = $ScaffoldView->testGetFilename('admin_add');
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS . 'scaffolds' . DS . 'form.ctp';
+		$expected = LIBS . 'View' . DS . 'scaffolds' . DS . 'form.ctp';
 		$this->assertEqual($result, $expected);
 
 		$result = $ScaffoldView->testGetFilename('error');
-		$expected = CAKE . 'libs' . DS . 'view' . DS . 'errors' . DS . 'scaffold_error.ctp';
+		$expected = LIBS . 'View' . DS . 'errors' . DS . 'scaffold_error.ctp';
 		$this->assertEqual($result, $expected);
 
 		$Controller = new ScaffoldMockController($this->request);
@@ -347,11 +349,11 @@ class ScaffoldViewTest extends CakeTestCase {
 
 		$ScaffoldView = new TestScaffoldView($Controller);
 		$result = $ScaffoldView->testGetFilename('admin_edit');
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' .DS . 'views' . DS . 'posts' . DS . 'scaffold.form.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' .DS . 'View' . DS . 'posts' . DS . 'scaffold.form.ctp';
 		$this->assertEqual($result, $expected);
 
 		$result = $ScaffoldView->testGetFilename('edit');
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' .DS . 'views' . DS . 'posts' . DS . 'scaffold.form.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' .DS . 'View' . DS . 'posts' . DS . 'scaffold.form.ctp';
 		$this->assertEqual($result, $expected);
 
 		$Controller = new ScaffoldMockController($this->request);
@@ -366,13 +368,13 @@ class ScaffoldViewTest extends CakeTestCase {
 
 		$ScaffoldView = new TestScaffoldView($Controller);
 		$result = $ScaffoldView->testGetFilename('admin_add');
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins'
-			. DS .'test_plugin' . DS . 'views' . DS . 'tests' . DS . 'scaffold.form.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins'
+			. DS .'test_plugin' . DS . 'View' . DS . 'tests' . DS . 'scaffold.form.ctp';
 		$this->assertEqual($result, $expected);
 
 		$result = $ScaffoldView->testGetFilename('add');
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins'
-			. DS .'test_plugin' . DS . 'views' . DS . 'tests' . DS . 'scaffold.form.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins'
+			. DS .'test_plugin' . DS . 'View' . DS . 'tests' . DS . 'scaffold.form.ctp';
 		$this->assertEqual($result, $expected);
 
 		Configure::write('Routing.prefixes', $_admin);
@@ -390,7 +392,7 @@ class ScaffoldViewTest extends CakeTestCase {
 		$ScaffoldView = new TestScaffoldView($this->Controller);
 
 		$result = $ScaffoldView->testGetFilename('index');
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS 
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS 
 			. 'themed' . DS . 'test_theme' . DS . 'posts' . DS . 'scaffold.index.ctp';
 		$this->assertEqual($result, $expected);
 	}
diff --git a/lib/Cake/tests/Case/Core/AppTest.php b/lib/Cake/tests/Case/Core/AppTest.php
new file mode 100644
index 000000000..16d44cc7f
--- /dev/null
+++ b/lib/Cake/tests/Case/Core/AppTest.php
@@ -0,0 +1,690 @@
+assertEqual($expected, $old);
+
+		App::build(array('Model' => array('/path/to/models/')));
+
+		$new = App::path('Model');
+
+		$expected = array(
+			'/path/to/models/',
+			APP . 'Model' . DS,
+			APP . 'models' . DS
+		);
+		$this->assertEqual($expected, $new);
+
+		App::build(); //reset defaults
+		$defaults = App::path('Model');
+		$this->assertEqual($old, $defaults);
+	}
+
+/**
+ * tests that it is possible to set up paths using the cake 1.3 notation for them (models, behaviors, controllers...)
+ *
+ * @access public
+ * @return void
+ */
+	function testCompatibleBuild() {
+		$old = App::path('models');
+		$expected = array(
+			APP . 'Model' . DS,
+			APP . 'models' . DS
+		);
+		$this->assertEqual($expected, $old);
+
+		App::build(array('models' => array('/path/to/models/')));
+
+		$new = App::path('models');
+
+		$expected = array(
+			'/path/to/models/',
+			APP . 'Model' . DS,
+			APP . 'models' . DS
+		);
+		$this->assertEqual($expected, $new);
+		$this->assertEqual($expected, App::path('Model'));
+
+		App::build(array('datasources' => array('/path/to/datasources/')));
+		$expected = array(
+			'/path/to/datasources/',
+			APP . 'Model' . DS . 'Datasource' . DS,
+			APP . 'models' . DS . 'datasources' . DS
+		);
+		$result = App::path('datasources');
+		$this->assertEqual($expected, $result);
+		$this->assertEqual($expected, App::path('Model/Datasource'));
+
+		App::build(array('behaviors' => array('/path/to/behaviors/')));
+		$expected = array(
+			'/path/to/behaviors/',
+			APP . 'Model' . DS . 'Behavior' . DS,
+			APP . 'models' . DS . 'behaviors' . DS
+		);
+		$result = App::path('behaviors');
+		$this->assertEqual($expected, $result);
+		$this->assertEqual($expected, App::path('Model/Behavior'));
+
+		App::build(array('controllers' => array('/path/to/controllers/')));
+		$expected = array(
+			'/path/to/controllers/',
+			APP . 'Controller' . DS,
+			APP . 'controllers' . DS
+		);
+		$result = App::path('controllers');
+		$this->assertEqual($expected, $result);
+		$this->assertEqual($expected, App::path('Controller'));
+
+		App::build(array('components' => array('/path/to/components/')));
+		$expected = array(
+			'/path/to/components/',
+			APP . 'Controller' . DS . 'Component' . DS,
+			APP . 'controllers' . DS . 'components' . DS
+		);
+		$result = App::path('components');
+		$this->assertEqual($expected, $result);
+		$this->assertEqual($expected, App::path('Controller/Component'));
+
+		App::build(array('views' => array('/path/to/views/')));
+		$expected = array(
+			'/path/to/views/',
+			APP . 'View' . DS,
+			APP . 'views' . DS
+		);
+		$result = App::path('views');
+		$this->assertEqual($expected, $result);
+		$this->assertEqual($expected, App::path('View'));
+
+		App::build(array('helpers' => array('/path/to/helpers/')));
+		$expected = array(
+			'/path/to/helpers/',
+			APP . 'View' . DS . 'Helper' .DS,
+			APP . 'views' . DS . 'helpers' . DS
+		);
+		$result = App::path('helpers');
+		$this->assertEqual($expected, $result);
+		$this->assertEqual($expected, App::path('View/Helper'));
+
+		App::build(array('shells' => array('/path/to/shells/')));
+		$expected = array(
+			'/path/to/shells/',
+			APP . 'Console' . DS . 'Command' . DS,
+			APP . 'console' . DS . 'shells' . DS,
+		);
+		$result = App::path('shells');
+		$this->assertEqual($expected, $result);
+		$this->assertEqual($expected, App::path('Console/Command'));
+
+		App::build(); //reset defaults
+		$defaults = App::path('Model');
+		$this->assertEqual($old, $defaults);
+	}
+
+/**
+ * testBuildWithReset method
+ *
+ * @access public
+ * @return void
+ */
+	function testBuildWithReset() {
+		$old = App::path('Model');
+		$expected = array(
+			APP . 'Model' . DS,
+			APP . 'models' . DS
+		);
+		$this->assertEqual($expected, $old);
+
+		App::build(array('Model' => array('/path/to/models/')), true);
+
+		$new = App::path('Model');
+
+		$expected = array(
+			'/path/to/models/'
+		);
+		$this->assertEqual($expected, $new);
+
+		App::build(); //reset defaults
+		$defaults = App::path('Model');
+		$this->assertEqual($old, $defaults);
+	}
+
+/**
+ * testCore method
+ *
+ * @access public
+ * @return void
+ */
+	function testCore() {
+		$model = App::core('Model');
+		$this->assertEqual(array(LIBS . 'Model' . DS), $model);
+
+		$view = App::core('View');
+		$this->assertEqual(array(LIBS . 'View' . DS), $view);
+
+		$controller = App::core('Controller');
+		$this->assertEqual(array(LIBS . 'Controller' . DS), $controller);
+
+		$component = App::core('Controller/Component');
+		$this->assertEqual(array(LIBS . 'Controller' . DS . 'Component' . DS), $component);
+
+		$auth = App::core('Controller/Component/Auth');
+		$this->assertEqual(array(LIBS . 'Controller' . DS . 'Component' . DS . 'Auth' . DS), $auth);
+
+		$datasource = App::core('Model/Datasource');
+		$this->assertEqual(array(LIBS . 'Model' . DS . 'Datasource' . DS), $datasource);
+	}
+
+/**
+ * testListObjects method
+ *
+ * @access public
+ * @return void
+ */
+	function testListObjects() {
+		$result = App::objects('class',  LIBS . 'Routing', false);
+		$this->assertTrue(in_array('Dispatcher', $result));
+		$this->assertTrue(in_array('Router', $result));
+
+		App::build(array(
+			'Model/Behavior' => App::core('Model/Behavior'),
+			'Controller' => App::core('Controller'),
+			'Controller/Component' => App::core('Controller/Component'),
+			'View' => App::core('View'),
+			'Model' => App::core('Model'),
+			'View/Helper' => App::core('View/Helper'),
+		), true);
+		$result = App::objects('behavior', null, false);
+		$this->assertTrue(in_array('TreeBehavior', $result));
+		$result = App::objects('Model/Behavior', null, false);
+		$this->assertTrue(in_array('TreeBehavior', $result));
+
+		$result = App::objects('controller', null, false);
+		$this->assertTrue(in_array('PagesController', $result));
+		$result = App::objects('Controller', null, false);
+		$this->assertTrue(in_array('PagesController', $result));
+
+		$result = App::objects('component', null, false);
+		$this->assertTrue(in_array('AuthComponent', $result));
+		$result = App::objects('Controller/Component', null, false);
+		$this->assertTrue(in_array('AuthComponent', $result));
+
+		$result = App::objects('view', null, false);
+		$this->assertTrue(in_array('MediaView', $result));
+		$result = App::objects('View', null, false);
+		$this->assertTrue(in_array('MediaView', $result));
+
+		$result = App::objects('helper', null, false);
+		$this->assertTrue(in_array('HtmlHelper', $result));
+		$result = App::objects('View/Helper', null, false);
+		$this->assertTrue(in_array('HtmlHelper', $result));
+
+		$result = App::objects('model', null, false);
+		$this->assertTrue(in_array('AcoAction', $result));
+		$result = App::objects('Model', null, false);
+		$this->assertTrue(in_array('AcoAction', $result));
+
+		$result = App::objects('file');
+		$this->assertFalse($result);
+
+		$result = App::objects('file', 'non_existing_configure');
+		$expected = array();
+		$this->assertEqual($result, $expected);
+
+		$result = App::objects('NonExistingType');
+		$this->assertEqual($result, array());
+
+		App::build(array(
+			'plugins' => array(
+				LIBS . 'tests' . DS . 'test_app' . DS . 'Lib' . DS
+			)
+		));
+		$result = App::objects('plugin', null, false);
+		$this->assertTrue(in_array('Cache', $result));
+		$this->assertTrue(in_array('Log', $result));
+
+		App::build();
+	}
+
+/**
+ * Tests listing objects within a plugin
+ *
+ * @return void
+ */
+	function testListObjectsInPlugin() {
+		App::build(array(
+			'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS),
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		));
+
+		$result = App::objects('TestPlugin.model');
+		$this->assertTrue(in_array('TestPluginPost', $result));
+		$result = App::objects('TestPlugin.Model');
+		$this->assertTrue(in_array('TestPluginPost', $result));
+
+		$result = App::objects('TestPlugin.behavior');
+		$this->assertTrue(in_array('TestPluginPersisterOne', $result));
+		$result = App::objects('TestPlugin.Model/Behavior');
+		$this->assertTrue(in_array('TestPluginPersisterOne', $result));
+
+		$result = App::objects('TestPlugin.helper');
+		$expected = array('OtherHelperHelper', 'PluggedHelper', 'TestPluginApp');
+		$this->assertEquals($result, $expected);
+		$result = App::objects('TestPlugin.View/Helper');
+		$expected = array('OtherHelperHelper', 'PluggedHelper', 'TestPluginApp');
+		$this->assertEquals($result, $expected);
+
+		$result = App::objects('TestPlugin.component');
+		$this->assertTrue(in_array('OtherComponent', $result));
+		$result = App::objects('TestPlugin.Controller/Component');
+		$this->assertTrue(in_array('OtherComponent', $result));
+
+		$result = App::objects('TestPluginTwo.behavior');
+		$this->assertEquals($result, array());
+		$result = App::objects('TestPluginTwo.Model/Behavior');
+		$this->assertEquals($result, array());
+
+		$result = App::objects('model', null, false);
+		$this->assertTrue(in_array('Comment', $result));
+		$this->assertTrue(in_array('Post', $result));
+
+		$result = App::objects('Model', null, false);
+		$this->assertTrue(in_array('Comment', $result));
+		$this->assertTrue(in_array('Post', $result));
+
+		App::build();
+	}
+
+/**
+ * test that pluginPath can find paths for plugins.
+ *
+ * @return void
+ */
+	function testPluginPath() {
+		App::build(array(
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		));
+		$path = App::pluginPath('test_plugin');
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS;
+		$this->assertEqual($path, $expected);
+
+		$path = App::pluginPath('TestPlugin');
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS;
+		$this->assertEqual($path, $expected);
+
+		$path = App::pluginPath('TestPluginTwo');
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin_two' . DS;
+		$this->assertEqual($path, $expected);
+		App::build();
+	}
+
+/**
+ * test that pluginPath can find paths for plugins.
+ *
+ * @return void
+ */
+	function testThemePath() {
+		App::build(array(
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views' . DS)
+		));
+		$path = App::themePath('test_theme');
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS;
+		$this->assertEqual($path, $expected);
+
+		$path = App::themePath('TestTheme');
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS;
+		$this->assertEqual($path, $expected);
+
+		App::build();
+	}
+
+/**
+ * testClassLoading method
+ *
+ * @access public
+ * @return void
+ */
+	function testClassLoading() {
+		$file = App::import('Model', 'Model', false);
+		$this->assertTrue($file);
+		$this->assertTrue(class_exists('Model'));
+
+		$file = App::import('Controller', 'Controller', false);
+		$this->assertTrue($file);
+		$this->assertTrue(class_exists('Controller'));
+
+		$file = App::import('Component', 'Auth', false);
+		$this->assertTrue($file);
+		$this->assertTrue(class_exists('AuthComponent'));
+
+		$file = App::import('Shell', 'Shell', false);
+		$this->assertTrue($file);
+		$this->assertTrue(class_exists('Shell'));
+
+		$file = App::import('Configure', 'PhpReader');
+		$this->assertTrue($file);
+		$this->assertTrue(class_exists('PhpReader'));
+
+		$file = App::import('Model', 'SomeRandomModelThatDoesNotExist', false);
+		$this->assertFalse($file);
+
+		$file = App::import('Model', 'AppModel', false);
+		$this->assertTrue($file);
+		$this->assertTrue(class_exists('AppModel'));
+
+		$file = App::import('WrongType', null, true, array(), '');
+		$this->assertFalse($file);
+
+		$file = App::import('Model', 'NonExistingPlugin.NonExistingModel', false);
+		$this->assertFalse($file);
+
+		$file = App::import('Model', array('NonExistingPlugin.NonExistingModel'), false);
+		$this->assertFalse($file);
+
+		if (!class_exists('AppController')) {
+			$classes = array_flip(get_declared_classes());
+
+			$this->assertFalse(isset($classes['PagesController']));
+			$this->assertFalse(isset($classes['AppController']));
+
+			$file = App::import('Controller', 'Pages');
+			$this->assertTrue($file);
+			$this->assertTrue(class_exists('PagesController'));
+
+			$classes = array_flip(get_declared_classes());
+
+			$this->assertTrue(isset($classes['PagesController']));
+			$this->assertTrue(isset($classes['AppController']));
+
+			$file = App::import('Behavior', 'Containable');
+			$this->assertTrue($file);
+			$this->assertTrue(class_exists('ContainableBehavior'));
+
+			$file = App::import('Component', 'RequestHandler');
+			$this->assertTrue($file);
+			$this->assertTrue(class_exists('RequestHandlerComponent'));
+
+			$file = App::import('Helper', 'Form');
+			$this->assertTrue($file);
+			$this->assertTrue(class_exists('FormHelper'));
+
+			$file = App::import('Model', 'NonExistingModel');
+			$this->assertFalse($file);
+
+			$file = App::import('Datasource', 'DboSource');
+			$this->assertTrue($file);
+			$this->assertTrue(class_exists('DboSource'));
+		}
+		App::build();
+	}
+
+/**
+ * test import() with plugins
+ *
+ * @return void
+ */
+	function testPluginImporting() {
+		App::build(array(
+			'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Lib' . DS),
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		));
+
+		$result = App::import('Controller', 'TestPlugin.Tests');
+		$this->assertTrue($result);
+		$this->assertTrue(class_exists('TestPluginAppController'));
+		$this->assertTrue(class_exists('TestsController'));
+
+		$result = App::import('Lib', 'TestPlugin.TestPluginLibrary');
+		$this->assertTrue($result);
+		$this->assertTrue(class_exists('TestPluginLibrary'));
+
+		$result = App::import('Lib', 'Library');
+		$this->assertTrue($result);
+		$this->assertTrue(class_exists('Library'));
+
+		$result = App::import('Helper', 'TestPlugin.OtherHelper');
+		$this->assertTrue($result);
+		$this->assertTrue(class_exists('OtherHelperHelper'));
+		
+		$result = App::import('Helper', 'TestPlugin.TestPluginApp');
+		$this->assertTrue($result);
+		$this->assertTrue(class_exists('TestPluginAppHelper'));
+
+		$result = App::import('Datasource', 'TestPlugin.TestSource');
+		$this->assertTrue($result);
+		$this->assertTrue(class_exists('TestSource'));
+		
+		App::build();
+	}
+
+/**
+ * test that building helper paths actually works.
+ *
+ * @return void
+ * @link http://cakephp.lighthouseapp.com/projects/42648/tickets/410
+ */
+	function testImportingHelpersFromAlternatePaths() {
+
+		$this->assertFalse(class_exists('BananaHelper', false), 'BananaHelper exists, cannot test importing it.');
+		App::build(array(
+			'View/Helper' => array(
+				LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'Helper' . DS
+			)
+		));
+		$this->assertFalse(class_exists('BananaHelper', false), 'BananaHelper exists, cannot test importing it.');
+		App::import('Helper', 'Banana');
+		$this->assertTrue(class_exists('BananaHelper', false), 'BananaHelper was not loaded.');
+
+		App::build();
+	}
+
+/**
+ * testFileLoading method
+ *
+ * @access public
+ * @return void
+ */
+	function testFileLoading () {
+		$file = App::import('File', 'RealFile', false, array(), LIBS  . 'config' . DS . 'config.php');
+		$this->assertTrue($file);
+
+		$file = App::import('File', 'NoFile', false, array(), LIBS  . 'config' . DS . 'cake' . DS . 'config.php');
+		$this->assertFalse($file);
+	}
+
+/**
+ * testFileLoadingWithArray method
+ *
+ * @access public
+ * @return void
+ */
+	function testFileLoadingWithArray() {
+		$type = array('type' => 'File', 'name' => 'SomeName', 'parent' => false,
+				'file' => LIBS  . DS . 'config' . DS . 'config.php');
+		$file = App::import($type);
+		$this->assertTrue($file);
+
+		$type = array('type' => 'File', 'name' => 'NoFile', 'parent' => false,
+				'file' => LIBS  . 'config' . DS . 'cake' . DS . 'config.php');
+		$file = App::import($type);
+		$this->assertFalse($file);
+	}
+
+/**
+ * testFileLoadingReturnValue method
+ *
+ * @access public
+ * @return void
+ */
+	function testFileLoadingReturnValue () {
+		$file = App::import('File', 'Name', false, array(), LIBS  . 'config' . DS . 'config.php', true);
+		$this->assertTrue(!empty($file));
+
+		$this->assertTrue(isset($file['Cake.version']));
+
+		$type = array('type' => 'File', 'name' => 'OtherName', 'parent' => false,
+				'file' => LIBS  . 'config' . DS . 'config.php', 'return' => true);
+		$file = App::import($type);
+		$this->assertTrue(!empty($file));
+
+		$this->assertTrue(isset($file['Cake.version']));
+	}
+
+/**
+ * testLoadingWithSearch method
+ *
+ * @access public
+ * @return void
+ */
+	function testLoadingWithSearch () {
+		$file = App::import('File', 'NewName', false, array(LIBS . 'config' . DS), 'config.php');
+		$this->assertTrue($file);
+
+		$file = App::import('File', 'AnotherNewName', false, array(LIBS), 'config.php');
+		$this->assertFalse($file);
+	}
+
+/**
+ * testLoadingWithSearchArray method
+ *
+ * @access public
+ * @return void
+ */
+	function testLoadingWithSearchArray() {
+		$type = array(
+			'type' => 'File',
+			'name' => 'RandomName',
+			'parent' => false,
+			'file' => 'config.php',
+			'search' => array(LIBS . 'config' . DS)
+		);
+		$file = App::import($type);
+		$this->assertTrue($file);
+
+		$type = array(
+			'type' => 'File',
+			'name' => 'AnotherRandomName',
+			'parent' => false,
+			'file' => 'config.php',
+			'search' => array(LIBS)
+		);
+		$file = App::import($type);
+		$this->assertFalse($file);
+	}
+
+/**
+ * testMultipleLoading method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultipleLoading() {
+		if (class_exists('PersisterOne', false) || class_exists('PersisterTwo', false)) {
+			$this->markTestSkipped('Cannot test loading of classes that exist.');
+		}
+		App::build(array(
+			'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS)
+		));
+		$toLoad = array('PersisterOne', 'PersisterTwo');
+		$load = App::import('Model', $toLoad);
+		$this->assertTrue($load);
+
+		$classes = array_flip(get_declared_classes());
+
+
+		$this->assertTrue(isset($classes['PersisterOne']));
+		$this->assertTrue(isset($classes['PersisterTwo']));
+
+		$load = App::import('Model', array('PersisterOne', 'SomeNotFoundClass', 'PersisterTwo'));
+		$this->assertFalse($load);
+	}
+
+
+	function testLoadingVendor() {
+		App::build(array(
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'vendors' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'vendors'. DS),
+		), true);
+
+		ob_start();
+		$result = App::import('Vendor', 'css/TestAsset', array('ext' => 'css'));
+		$text = ob_get_clean();
+		$this->assertTrue($result);
+		$this->assertEqual($text, 'this is the test asset css file');
+
+		$result = App::import('Vendor', 'TestPlugin.sample/SamplePlugin');
+		$this->assertTrue($result);
+		$this->assertTrue(class_exists('SamplePluginClassTestName'));
+
+		$result = App::import('Vendor', 'sample/ConfigureTestVendorSample');
+		$this->assertTrue($result);
+		$this->assertTrue(class_exists('ConfigureTestVendorSample'));
+
+		ob_start();
+		$result = App::import('Vendor', 'SomeNameInSubfolder', array('file' => 'somename/some.name.php'));
+		$text = ob_get_clean();
+		$this->assertTrue($result);
+		$this->assertEqual($text, 'This is a file with dot in file name');
+
+		ob_start();
+		$result = App::import('Vendor', 'TestHello', array('file' => 'Test'.DS.'hello.php'));
+		$text = ob_get_clean();
+		$this->assertTrue($result);
+		$this->assertEqual($text, 'This is the hello.php file in Test directory');
+
+		ob_start();
+		$result = App::import('Vendor', 'MyTest', array('file' => 'Test'.DS.'MyTest.php'));
+		$text = ob_get_clean();
+		$this->assertTrue($result);
+		$this->assertEqual($text, 'This is the MyTest.php file');
+
+		ob_start();
+		$result = App::import('Vendor', 'Welcome');
+		$text = ob_get_clean();
+		$this->assertTrue($result);
+		$this->assertEqual($text, 'This is the welcome.php file in vendors directory');
+
+		ob_start();
+		$result = App::import('Vendor', 'TestPlugin.Welcome');
+		$text = ob_get_clean();
+		$this->assertTrue($result);
+		$this->assertEqual($text, 'This is the welcome.php file in test_plugin/vendors directory');
+	}
+
+/**
+ * Tests that the automatic class loader will also find in "libs" folder for both
+ * app and plugins if it does not find the class in other configured paths
+ *
+ */
+	public function testLoadClassInLibs() {
+		App::build(array(
+			'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		), true);
+
+		$this->assertFalse(class_exists('CustomLibClass', false));
+		App::uses('CustomLibClass', 'TestPlugin.Custom/Package');
+		$this->assertTrue(class_exists('CustomLibClass'));
+
+		$this->assertFalse(class_exists('TestUtilityClass', false));
+		App::uses('TestUtilityClass', 'Utility');
+		$this->assertTrue(class_exists('CustomLibClass'));
+	}
+}
diff --git a/cake/tests/cases/libs/configure.test.php b/lib/Cake/tests/Case/Core/ConfigureTest.php
similarity index 95%
rename from cake/tests/cases/libs/configure.test.php
rename to lib/Cake/tests/Case/Core/ConfigureTest.php
index 920eb15f7..d4ed6b634 100644
--- a/cake/tests/cases/libs/configure.test.php
+++ b/lib/Cake/tests/Case/Core/ConfigureTest.php
@@ -18,7 +18,7 @@
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'config/PhpReader');
+App::uses('PhpReader', 'Configure');
 
 /**
  * ConfigureTest
@@ -198,7 +198,7 @@ class ConfigureTest extends CakeTestCase {
  * @return void
  */
 	function testLoadWithMerge() {
-		Configure::config('test', new PhpReader(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'config' . DS));
+		Configure::config('test', new PhpReader(LIBS . 'tests' . DS . 'test_app' . DS . 'config' . DS));
 
 		$result = Configure::load('var_test', 'test');
 		$this->assertTrue($result);
@@ -219,7 +219,7 @@ class ConfigureTest extends CakeTestCase {
  * @return void
  */
 	function testLoadNoMerge() {
-		Configure::config('test', new PhpReader(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'config' . DS));
+		Configure::config('test', new PhpReader(LIBS . 'tests' . DS . 'test_app' . DS . 'config' . DS));
 
 		$result = Configure::load('var_test', 'test');
 		$this->assertTrue($result);
@@ -241,7 +241,7 @@ class ConfigureTest extends CakeTestCase {
  * @return void
  */
 	function testLoadPlugin() {
-		App::build(array('plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)), true);
+		App::build(array('plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)), true);
 		Configure::config('test', new PhpReader());
 
 		$result = Configure::load('test_plugin.load', 'test');
diff --git a/cake/tests/cases/libs/object.test.php b/lib/Cake/tests/Case/Core/ObjectTest.php
similarity index 94%
rename from cake/tests/cases/libs/object.test.php
rename to lib/Cake/tests/Case/Core/ObjectTest.php
index 45126a053..0c959065e 100644
--- a/cake/tests/cases/libs/object.test.php
+++ b/lib/Cake/tests/Case/Core/ObjectTest.php
@@ -16,7 +16,10 @@
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', array('Object', 'Controller', 'Model'));
+
+App::uses('Object', 'Core');
+App::uses('Controller', 'Controller');
+App::uses('Model', 'Model');
 
 /**
  * RequestActionPost class
@@ -475,9 +478,9 @@ class ObjectTest extends CakeTestCase {
 		Configure::write('Cache.disable', false);
 
 		App::build(array(
-			'models' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS),
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins'. DS),
-			'behaviors' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models'. DS . 'behaviors' . DS),
+			'models' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'models' . DS),
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins'. DS),
+			'behaviors' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'models'. DS . 'behaviors' . DS),
 		), true);
 
 		$this->assertFalse(class_exists('PersisterOneBehaviorBehavior'));
@@ -536,8 +539,8 @@ class ObjectTest extends CakeTestCase {
 		$this->assertFalse(class_exists('ContainableBehavior'));
 
 		App::build(array(
-			'models' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS),
-			'behaviors' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models'. DS . 'behaviors' . DS),
+			'models' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'models' . DS),
+			'behaviors' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'models'. DS . 'behaviors' . DS),
 		), true);
 
 		$this->assertFalse(class_exists('PersistOneBehaviorBehavior'));
@@ -680,9 +683,9 @@ class ObjectTest extends CakeTestCase {
  */
 	function testRequestAction() {
 		App::build(array(
-			'models' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS),
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS),
-			'controllers' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'controllers' . DS)
+			'models' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'models' . DS),
+			'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views' . DS),
+			'controllers' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'controllers' . DS)
 		));
 		$result = $this->object->requestAction('');
 		$this->assertFalse($result);
@@ -720,7 +723,7 @@ class ObjectTest extends CakeTestCase {
  */
 	function testRequestActionPlugins() {
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
 		));
 		App::objects('plugin', null, false);
 		Router::reload();
@@ -760,9 +763,9 @@ class ObjectTest extends CakeTestCase {
  */
 	function testRequestActionArray() {
 		App::build(array(
-			'models' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS),
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS),
-			'controllers' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'controllers' . DS)
+			'models' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'models' . DS),
+			'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views' . DS),
+			'controllers' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'controllers' . DS)
 		));
 	
 		$result = $this->object->requestAction(
diff --git a/cake/tests/cases/libs/error/error_handler.test.php b/lib/Cake/tests/Case/Error/ErrorHandlerTest.php
similarity index 96%
rename from cake/tests/cases/libs/error/error_handler.test.php
rename to lib/Cake/tests/Case/Error/ErrorHandlerTest.php
index ee5e43bca..fd76ac7d1 100644
--- a/cake/tests/cases/libs/error/error_handler.test.php
+++ b/lib/Cake/tests/Case/Error/ErrorHandlerTest.php
@@ -17,7 +17,9 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::import('Core', array('ErrorHandler', 'Controller', 'Router'));
+App::uses('ErrorHandler', 'Error');
+App::uses('Controller', 'Controller');
+App::uses('Router', 'Routing');
 
 /**
  * ErrorHandlerTest class
@@ -35,8 +37,8 @@ class ErrorHandlerTest extends CakeTestCase {
 	function setUp() {
 		App::build(array(
 			'views' => array(
-				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS,
-				TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS
+				LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS,
+				LIBS . 'libs' . DS . 'view' . DS
 			)
 		), true);
 		Router::reload();
diff --git a/cake/tests/cases/libs/error/exception_renderer.test.php b/lib/Cake/tests/Case/Error/ExceptionRendererTest.php
similarity index 97%
rename from cake/tests/cases/libs/error/exception_renderer.test.php
rename to lib/Cake/tests/Case/Error/ExceptionRendererTest.php
index b8a25ddfb..950caba78 100644
--- a/cake/tests/cases/libs/error/exception_renderer.test.php
+++ b/lib/Cake/tests/Case/Error/ExceptionRendererTest.php
@@ -17,7 +17,11 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::import('Core', array('ExceptionRenderer', 'Controller', 'Component'));
+App::uses('ExceptionRenderer', 'Error');
+App::uses('Controller', 'Controller');
+App::uses('AppController', 'Controller');
+App::uses('Component', 'Controller');
+App::uses('Router', 'Routing');
 
 /**
  * Short description for class.
@@ -64,7 +68,7 @@ class BlueberryComponent extends Component {
  * @access public
  * @return void
  */
-	function initialize($controller) {
+	function initialize(&$controller) {
 		$this->testName = 'BlueberryComponent';
 	}
 }
@@ -154,8 +158,8 @@ class ExceptionRendererTest extends CakeTestCase {
 	function setUp() {
 		App::build(array(
 			'views' => array(
-				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS,
-				TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS
+				LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS,
+				LIBS . 'libs' . DS . 'view' . DS
 			)
 		), true);
 		Router::reload();
diff --git a/cake/tests/cases/libs/i18n.test.php b/lib/Cake/tests/Case/I18n/I18nTest.php
similarity index 99%
rename from cake/tests/cases/libs/i18n.test.php
rename to lib/Cake/tests/Case/I18n/I18nTest.php
index 5fdf3a93a..a5de7dd49 100644
--- a/cake/tests/cases/libs/i18n.test.php
+++ b/lib/Cake/tests/Case/I18n/I18nTest.php
@@ -16,7 +16,7 @@
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'i18n');
+App::uses('I18n', 'I18n');
 
 /**
  * I18nTest class
@@ -34,8 +34,8 @@ class I18nTest extends CakeTestCase {
 	function setUp() {
 		Cache::delete('object_map', '_cake_core_');
 		App::build(array(
-			'locales' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale' . DS),
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'locales' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'locale' . DS),
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		), true);
 		App::objects('plugin', null, false);
 	}
@@ -2432,7 +2432,7 @@ class I18nTest extends CakeTestCase {
  */
 	function testPluginTranslation() {
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
 
 		Configure::write('Config.language', 'po');
diff --git a/cake/tests/cases/libs/l10n.test.php b/lib/Cake/tests/Case/I18n/L10nTest.php
similarity index 99%
rename from cake/tests/cases/libs/l10n.test.php
rename to lib/Cake/tests/Case/I18n/L10nTest.php
index dd7a5a79c..85a01f64a 100644
--- a/cake/tests/cases/libs/l10n.test.php
+++ b/lib/Cake/tests/Case/I18n/L10nTest.php
@@ -16,7 +16,7 @@
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'l10n');
+App::uses('L10n', 'I18n');
 
 /**
  * L10nTest class
diff --git a/cake/tests/cases/libs/multibyte.test.php b/lib/Cake/tests/Case/I18n/MultibyteTest.php
similarity index 99%
rename from cake/tests/cases/libs/multibyte.test.php
rename to lib/Cake/tests/Case/I18n/MultibyteTest.php
index f9998cdf9..692dd85bd 100644
--- a/cake/tests/cases/libs/multibyte.test.php
+++ b/lib/Cake/tests/Case/I18n/MultibyteTest.php
@@ -16,7 +16,7 @@
  * @since         CakePHP(tm) v 1.2.0.6833
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'Multibyte');
+App::uses('Multibyte', 'I18n');
 
 /**
  * MultibyteTest class
diff --git a/cake/tests/cases/libs/cake_log.test.php b/lib/Cake/tests/Case/Log/CakeLogTest.php
similarity index 93%
rename from cake/tests/cases/libs/cake_log.test.php
rename to lib/Cake/tests/Case/Log/CakeLogTest.php
index 0d21cb5b2..b5abcd119 100644
--- a/cake/tests/cases/libs/cake_log.test.php
+++ b/lib/Cake/tests/Case/Log/CakeLogTest.php
@@ -16,8 +16,9 @@
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'CakeLog');
-App::import('Core', 'log/FileLog');
+
+App::uses('CakeLog', 'Log');
+App::uses('FileLog', 'Log/Engine');
 
 /**
  * CakeLogTest class
@@ -46,8 +47,8 @@ class CakeLogTest extends CakeTestCase {
  */
 	function testImportingLoggers() {
 		App::build(array(
-			'libs' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Lib' . DS),
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		), true);
 
 		$result = CakeLog::config('libtest', array(
diff --git a/cake/tests/cases/libs/log/file_log.test.php b/lib/Cake/tests/Case/Log/Engine/FileLog.php
similarity index 98%
rename from cake/tests/cases/libs/log/file_log.test.php
rename to lib/Cake/tests/Case/Log/Engine/FileLog.php
index d861426b3..9dab415ea 100644
--- a/cake/tests/cases/libs/log/file_log.test.php
+++ b/lib/Cake/tests/Case/Log/Engine/FileLog.php
@@ -16,7 +16,7 @@
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'log/FileLog');
+App::uses('FileLog', 'Log/Engine');
 
 /**
  * CakeLogTest class
diff --git a/cake/tests/cases/libs/model/behaviors/acl.test.php b/lib/Cake/tests/Case/Model/Behavior/AclBehaviorTest.php
similarity index 98%
rename from cake/tests/cases/libs/model/behaviors/acl.test.php
rename to lib/Cake/tests/Case/Model/Behavior/AclBehaviorTest.php
index f047b946c..a6f29cfe6 100644
--- a/cake/tests/cases/libs/model/behaviors/acl.test.php
+++ b/lib/Cake/tests/Case/Model/Behavior/AclBehaviorTest.php
@@ -18,8 +18,13 @@
  * @since         CakePHP v 1.2.0.4487
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Behavior', 'Acl');
-App::import('Core', 'db_acl');
+
+App::uses('AclBehavior', 'Model/Behavior');
+App::uses('Aco', 'Model');
+App::uses('Aro', 'Model');
+App::uses('AclNode', 'Model');
+App::uses('DbAcl', 'Model');
+
 
 /**
 * Test Person class - self joined model
diff --git a/cake/tests/cases/libs/model/behaviors/containable.test.php b/lib/Cake/tests/Case/Model/Behavior/ContainableBehaviorTest.php
similarity index 99%
rename from cake/tests/cases/libs/model/behaviors/containable.test.php
rename to lib/Cake/tests/Case/Model/Behavior/ContainableBehaviorTest.php
index 9b6e223f5..0b60115ef 100644
--- a/cake/tests/cases/libs/model/behaviors/containable.test.php
+++ b/lib/Cake/tests/Case/Model/Behavior/ContainableBehaviorTest.php
@@ -16,7 +16,9 @@
  * @since         CakePHP(tm) v 1.2.0.5669
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', array('AppModel', 'Model'));
+
+App::uses('Model', 'Model');
+App::uses('AppModel', 'Model');
 require_once(dirname(dirname(__FILE__)) . DS . 'models.php');
 
 /**
diff --git a/cake/tests/cases/libs/model/behaviors/translate.test.php b/lib/Cake/tests/Case/Model/Behavior/TranslateBehaviorTest.php
similarity index 99%
rename from cake/tests/cases/libs/model/behaviors/translate.test.php
rename to lib/Cake/tests/Case/Model/Behavior/TranslateBehaviorTest.php
index 24f39807d..292f0cdf0 100644
--- a/cake/tests/cases/libs/model/behaviors/translate.test.php
+++ b/lib/Cake/tests/Case/Model/Behavior/TranslateBehaviorTest.php
@@ -20,7 +20,8 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
 	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
 }
 
-App::import('Core', array('AppModel', 'Model'));
+App::uses('Model', 'Model');
+App::uses('AppModel', 'Model');
 require_once(dirname(dirname(__FILE__)) . DS . 'models.php');
 
 /**
@@ -431,7 +432,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		// MSSQL trigger an error and stops the page even if the debug = 0
-		if ($this->db->config['driver'] != 'mssql') {
+		if ($this->db instanceof Mssql) {
 			$debug = Configure::read('debug');
 			Configure::write('debug', 0);
 
diff --git a/cake/tests/cases/libs/model/behaviors/tree.test.php b/lib/Cake/tests/Case/Model/Behavior/TreeBehaviorTest.php
similarity index 99%
rename from cake/tests/cases/libs/model/behaviors/tree.test.php
rename to lib/Cake/tests/Case/Model/Behavior/TreeBehaviorTest.php
index 8e8323df6..7d1f648f9 100644
--- a/cake/tests/cases/libs/model/behaviors/tree.test.php
+++ b/lib/Cake/tests/Case/Model/Behavior/TreeBehaviorTest.php
@@ -18,7 +18,9 @@
  * @since         CakePHP(tm) v 1.2.0.5330
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', array('AppModel', 'Model'));
+
+App::uses('Model', 'Model');
+App::uses('AppModel', 'Model');
 require_once(dirname(dirname(__FILE__)) . DS . 'models.php');
 
 /**
diff --git a/cake/tests/cases/libs/model/behavior_collection.test.php b/lib/Cake/tests/Case/Model/BehaviorCollectionTest.php
similarity index 99%
rename from cake/tests/cases/libs/model/behavior_collection.test.php
rename to lib/Cake/tests/Case/Model/BehaviorCollectionTest.php
index 8d653ced9..6724c2784 100644
--- a/cake/tests/cases/libs/model/behavior_collection.test.php
+++ b/lib/Cake/tests/Case/Model/BehaviorCollectionTest.php
@@ -18,7 +18,8 @@
  * @since         1.2
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Model', 'AppModel');
+
+App::uses('AppModel', 'Model');
 require_once dirname(__FILE__) . DS . 'models.php';
 
 /**
@@ -452,7 +453,7 @@ class BehaviorCollectionTest extends CakeTestCase {
 		$this->assertEquals($Apple->testMethod(true), 'working');
 		$this->assertEquals($Apple->Behaviors->dispatchMethod($Apple, 'testMethod'), 'working');
 
-		App::build(array('plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)));
+		App::build(array('plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)));
 		$this->assertTrue($Apple->Behaviors->load('SomeOther', array('className' => 'TestPlugin.TestPluginPersisterOne')));
 		$this->assertInstanceOf('TestPluginPersisterOneBehavior', $Apple->Behaviors->SomeOther);
 
@@ -552,7 +553,7 @@ class BehaviorCollectionTest extends CakeTestCase {
 /**
  * test that attaching a non existant Behavior triggers a cake error.
  *
- * @expectedException MissingBehaviorFileException
+ * @expectedException MissingBehaviorClassException
  * @return void
  */
 	function testInvalidBehaviorCausingCakeError() {
diff --git a/cake/tests/cases/libs/model/cake_schema.test.php b/lib/Cake/tests/Case/Model/CakeSchemaTest.php
similarity index 98%
rename from cake/tests/cases/libs/model/cake_schema.test.php
rename to lib/Cake/tests/Case/Model/CakeSchemaTest.php
index 78890fbf7..12dab45b0 100644
--- a/cake/tests/cases/libs/model/cake_schema.test.php
+++ b/lib/Cake/tests/Case/Model/CakeSchemaTest.php
@@ -17,7 +17,9 @@
  * @since         CakePHP(tm) v 1.2.0.5550
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Model', 'CakeSchema', false);
+
+App::uses('CakeSchema', 'Model');
+App::uses('CakeTestFixture', 'TestSuite/Fixture');
 
 /**
  * Test for Schema database management
@@ -646,7 +648,7 @@ class CakeSchemaTest extends CakeTestCase {
  * @return void
  */
 	function testSchemaReadWithConfigPrefix() {
-		$db =& ConnectionManager::getDataSource('test');
+		$db = ConnectionManager::getDataSource('test');
 		$config = $db->config;
 		$config['prefix'] = 'schema_test_prefix_';
 		ConnectionManager::create('schema_prefix', $config);
@@ -662,7 +664,7 @@ class CakeSchemaTest extends CakeTestCase {
 	function testSchemaReadWithPlugins() {
 		App::objects('model', null, false);
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
 
 		$Schema = new CakeSchema();
@@ -980,7 +982,7 @@ class CakeSchemaTest extends CakeTestCase {
  */
 	function testSchemaLoadingFromPlugin() {
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
 		$Other = $this->Schema->load(array('name' => 'TestPluginApp', 'plugin' => 'TestPlugin'));
 		$this->assertEqual($Other->name, 'TestPluginApp');
diff --git a/cake/tests/cases/libs/model/connection_manager.test.php b/lib/Cake/tests/Case/Model/ConnectionManagerTest.php
similarity index 76%
rename from cake/tests/cases/libs/model/connection_manager.test.php
rename to lib/Cake/tests/Case/Model/ConnectionManagerTest.php
index 66e93a207..2256a3696 100644
--- a/cake/tests/cases/libs/model/connection_manager.test.php
+++ b/lib/Cake/tests/Case/Model/ConnectionManagerTest.php
@@ -16,7 +16,7 @@
  * @since         CakePHP(tm) v 1.2.0.5550
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'ConnectionManager');
+App::uses('ConnectionManager', 'Model');
 
 /**
  * ConnectionManagerTest
@@ -25,36 +25,6 @@ App::import('Core', 'ConnectionManager');
  */
 class ConnectionManagerTest extends CakeTestCase {
 
-/**
- * setUp method
- *
- * @access public
- * @return void
- */
-	function setUp() {
-		$this->ConnectionManager = ConnectionManager::getInstance();
-	}
-
-/**
- * tearDown method
- *
- * @access public
- * @return void
- */
-	function tearDown() {
-		unset($this->ConnectionManager);
-	}
-
-/**
- * testInstantiation method
- *
- * @access public
- * @return void
- */
-	function testInstantiation() {
-		$this->assertTrue(is_a($this->ConnectionManager, 'ConnectionManager'));
-	}
-
 /**
  * testEnumConnectionObjects method
  *
@@ -101,7 +71,7 @@ class ConnectionManagerTest extends CakeTestCase {
  */
 	function testGetPluginDataSource() {
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
 
 		$name = 'test_source';
@@ -123,11 +93,11 @@ class ConnectionManagerTest extends CakeTestCase {
  */
 	function testGetPluginDataSourceAndPluginDriver() {
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
 
 		$name = 'test_plugin_source_and_driver';
-		$config = array('datasource' => 'TestPlugin.TestSource', 'driver' => 'TestPlugin.TestDriver');
+		$config = array('datasource' => 'TestPlugin.Database/TestDriver');
 
 		$connection = ConnectionManager::create($name, $config);
 
@@ -147,11 +117,11 @@ class ConnectionManagerTest extends CakeTestCase {
  */
 	function testGetLocalDataSourceAndPluginDriver() {
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
 
 		$name = 'test_local_source_and_plugin_driver';
-		$config = array('datasource' => 'dbo', 'driver' => 'TestPlugin.DboDummy');
+		$config = array('datasource' => 'TestPlugin.Database/DboDummy');
 
 		$connection = ConnectionManager::create($name, $config);
 
@@ -170,12 +140,14 @@ class ConnectionManagerTest extends CakeTestCase {
  */
 	function testGetPluginDataSourceAndLocalDriver() {
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
-			'datasources' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS . 'datasources' . DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'Model/Datasource/Database' => array(
+				LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS . 'Database' . DS
+			)
 		));
 
 		$name = 'test_plugin_source_and_local_driver';
-		$config = array('datasource' => 'TestPlugin.TestSource', 'driver' => 'local_driver');
+		$config = array('datasource' => 'Database/TestLocalDriver');
 
 		$connection = ConnectionManager::create($name, $config);
 
@@ -227,15 +199,15 @@ class ConnectionManagerTest extends CakeTestCase {
  */
 	function testLoadDataSource() {
 		$connections = array(
-			array('classname' => 'DboMysql', 'filename' => 'dbo' . DS . 'dbo_mysql'),
-			array('classname' => 'DboMssql', 'filename' => 'dbo' . DS . 'dbo_mssql'),
-			array('classname' => 'DboOracle', 'filename' => 'dbo' . DS . 'dbo_oracle'),
+			array('classname' => 'Mysql', 'filename' =>  'Mysql', 'package' => 'Database'),
+			array('classname' => 'Postgres', 'filename' =>  'Postgres', 'package' => 'Database'),
+			array('classname' => 'Sqlite', 'filename' => 'Sqlite', 'package' => 'Database'),
 		);
 
 		foreach ($connections as $connection) {
 			$exists = class_exists($connection['classname']);
 			$loaded = ConnectionManager::loadDataSource($connection);
-			$this->assertEqual($loaded, !$exists, "%s Failed loading the {$connection['classname']} datasource");
+			$this->assertEqual($loaded, !$exists, "Failed loading the {$connection['classname']} datasource");
 		}
 	}
 
@@ -291,18 +263,17 @@ class ConnectionManagerTest extends CakeTestCase {
  */
 	function testConnectionData() {
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
-			'datasources' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS . 'datasources' . DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'Model/Datasource' => array(
+				LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS
+			)
 		));
 
 		$expected = array(
-		    'filename' => 'test2_source',
-		    'classname' => 'Test2Source',
-		    'parent' => '',
-		    'plugin' => ''
+		    'datasource' => 'Test2Source'
 		);
 
-		ConnectionManager::create('connection1', array('datasource' => 'Test2'));
+		ConnectionManager::create('connection1', array('datasource' => 'Test2Source'));
 		$connections = ConnectionManager::enumConnectionObjects();
 		$this->assertEqual($expected, $connections['connection1']);
 
@@ -310,33 +281,29 @@ class ConnectionManagerTest extends CakeTestCase {
 		$connections = ConnectionManager::enumConnectionObjects();
 		$this->assertEqual($expected, $connections['connection2']);
 
-		ConnectionManager::create('connection3', array('datasource' => 'TestPlugin.Test'));
+		ConnectionManager::create('connection3', array('datasource' => 'TestPlugin.TestSource'));
 		$connections = ConnectionManager::enumConnectionObjects();
-		$expected['filename'] = 'test_source';
-		$expected['classname'] = 'TestSource';
-		$expected['plugin'] = 'TestPlugin';
+		$expected['datasource'] = 'TestPlugin.TestSource';
 		$this->assertEqual($expected, $connections['connection3']);
 
 		ConnectionManager::create('connection4', array('datasource' => 'TestPlugin.TestSource'));
 		$connections = ConnectionManager::enumConnectionObjects();
 		$this->assertEqual($expected, $connections['connection4']);
 
-		ConnectionManager::create('connection5', array('datasource' => 'Test2Other'));
+		ConnectionManager::create('connection5', array('datasource' => 'Test2OtherSource'));
 		$connections = ConnectionManager::enumConnectionObjects();
-		$expected['filename'] = 'test2_other_source';
-		$expected['classname'] = 'Test2OtherSource';
-		$expected['plugin'] = '';
+		$expected['datasource'] = 'Test2OtherSource';
+
 		$this->assertEqual($expected, $connections['connection5']);
 
 		ConnectionManager::create('connection6', array('datasource' => 'Test2OtherSource'));
 		$connections = ConnectionManager::enumConnectionObjects();
 		$this->assertEqual($expected, $connections['connection6']);
 
-		ConnectionManager::create('connection7', array('datasource' => 'TestPlugin.TestOther'));
+		ConnectionManager::create('connection7', array('datasource' => 'TestPlugin.TestOtherSource'));
 		$connections = ConnectionManager::enumConnectionObjects();
-		$expected['filename'] = 'test_other_source';
-		$expected['classname'] = 'TestOtherSource';
-		$expected['plugin'] = 'TestPlugin';
+		$expected['datasource'] = 'TestPlugin.TestOtherSource';
+
 		$this->assertEqual($expected, $connections['connection7']);
 
 		ConnectionManager::create('connection8', array('datasource' => 'TestPlugin.TestOtherSource'));
diff --git a/cake/tests/cases/libs/cake_session.test.php b/lib/Cake/tests/Case/Model/Datasource/CakeSessionTest.php
similarity index 97%
rename from cake/tests/cases/libs/cake_session.test.php
rename to lib/Cake/tests/Case/Model/Datasource/CakeSessionTest.php
index 3673121fd..88e4a5cca 100644
--- a/cake/tests/cases/libs/cake_session.test.php
+++ b/lib/Cake/tests/Case/Model/Datasource/CakeSessionTest.php
@@ -16,9 +16,8 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-if (!class_exists('CakeSession')) {
-	App::import('Core', 'CakeSession');
-}
+
+App::uses('CakeSession', 'Model/Datasource');
 
 class TestCakeSession extends CakeSession {
 	public static function setUserAgent($value) {
@@ -528,8 +527,10 @@ class CakeSessionTest extends CakeTestCase {
  */
 	function testUsingAppLibsHandler() {
 		App::build(array(
-			'libs' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'Model/Datasource/Session' => array(
+				LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS . 'Session' . DS
+			),
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		), true);
 		Configure::write('Session', array(
 			'defaults' => 'cake',
@@ -550,8 +551,7 @@ class CakeSessionTest extends CakeTestCase {
  */
 	function testUsingPluginHandler() {
 		App::build(array(
-			'libs' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		), true);
 		
 		Configure::write('Session', array(
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php b/lib/Cake/tests/Case/Model/Datasource/Database/MssqlTest.php
similarity index 100%
rename from cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
rename to lib/Cake/tests/Case/Model/Datasource/Database/MssqlTest.php
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php b/lib/Cake/tests/Case/Model/Datasource/Database/MysqlTest.php
similarity index 99%
rename from cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
rename to lib/Cake/tests/Case/Model/Datasource/Database/MysqlTest.php
index 438f7e078..6ad8c1cda 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
+++ b/lib/Cake/tests/Case/Model/Datasource/Database/MysqlTest.php
@@ -16,8 +16,11 @@
  * @since         CakePHP(tm) v 1.2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', array('Model', 'DataSource', 'DboSource', 'DboMysql'));
-App::import('Model', 'App');
+App::uses('Model', 'Model');
+App::uses('AppModel', 'Model');
+App::uses('Mysql', 'Model/Datasource/Database');
+App::uses('CakeSchema', 'Model');
+
 require_once dirname(dirname(dirname(__FILE__))) . DS . 'models.php';
 
 /**
@@ -60,8 +63,7 @@ class DboMysqlTest extends CakeTestCase {
  */
 	public function setUp() {
 		$this->Dbo = ConnectionManager::getDataSource('test');
-		$this->skipIf(!($this->Dbo instanceof DboMysql));
-		if ($this->Dbo->config['driver'] !== 'mysql') {
+		if (!($this->Dbo instanceof Mysql)) {
 			$this->markTestSkipped('The MySQL extension is not available.');
 		}
 		$this->_debug = Configure::read('debug');
@@ -306,7 +308,7 @@ class DboMysqlTest extends CakeTestCase {
 	function testIndexOnMySQL4Output() {
 		$name = $this->Dbo->fullTableName('simple');
 
-		$mockDbo = $this->getMock('DboMysql', array('connect', '_execute', 'getVersion'));
+		$mockDbo = $this->getMock('Mysql', array('connect', '_execute', 'getVersion'));
 		$columnData = array(
 			array('0' => array(
 				'Table' => 'with_compound_keys',
@@ -455,7 +457,6 @@ class DboMysqlTest extends CakeTestCase {
  * @return void
  */
 	function testAlterSchemaIndexes() {
-		App::import('Model', 'CakeSchema');
 		$this->Dbo->cacheSources = $this->Dbo->testing = false;
 		$table = $this->Dbo->fullTableName('altertest');
 
@@ -576,7 +577,6 @@ class DboMysqlTest extends CakeTestCase {
  * @return void
  */
 	function testAlteringTableParameters() {
-		App::import('Model', 'CakeSchema');
 		$this->Dbo->cacheSources = $this->Dbo->testing = false;
 
 		$schema1 = new CakeSchema(array(
@@ -778,7 +778,7 @@ class DboMysqlTest extends CakeTestCase {
  * @return void
  */
 	public function testListSources() {
-		$db = $this->getMock('DboMysql', array('connect', '_execute'));
+		$db = $this->getMock('Mysql', array('connect', '_execute'));
 		$queryResult = $this->getMock('PDOStatement');
 		$db->expects($this->once())
 			->method('_execute')
@@ -828,7 +828,7 @@ class DboMysqlTest extends CakeTestCase {
  * @return void
  */
 	public function testGetEncoding() {
-		$db = $this->getMock('DboMysql', array('connect', '_execute'));
+		$db = $this->getMock('Mysql', array('connect', '_execute'));
 		$queryResult = $this->getMock('PDOStatement');
 
 		$db->expects($this->once())
@@ -852,7 +852,7 @@ class DboMysqlTest extends CakeTestCase {
  * @return void
  */
 	function testFieldDoubleEscaping() {
-		$test = $this->getMock('DboMysql', array('connect', '_execute', 'execute'));
+		$test = $this->getMock('Mysql', array('connect', '_execute', 'execute'));
 		$this->Model = $this->getMock('Article2', array('getDataSource'));
 		$this->Model->alias = 'Article';
 		$this->Model->expects($this->any())
@@ -894,7 +894,7 @@ class DboMysqlTest extends CakeTestCase {
  * @return void
  */
 	function testGenerateAssociationQuerySelfJoin() {
-		$this->Dbo = $this->getMock('DboMysql', array('connect', '_execute', 'execute'));
+		$this->Dbo = $this->getMock('Mysql', array('connect', '_execute', 'execute'));
 		$this->startTime = microtime(true);
 		$this->Model = new Article2();
 		$this->_buildRelatedModels($this->Model);
@@ -1030,7 +1030,7 @@ class DboMysqlTest extends CakeTestCase {
  * @return void
  */
 	function testGenerateInnerJoinAssociationQuery() {
-		$test = $this->getMock('DboMysql', array('connect', '_execute', 'execute'));
+		$test = $this->getMock('Mysql', array('connect', '_execute', 'execute'));
 		$this->Model = $this->getMock('TestModel9', array('getDataSource'));
 		$this->Model->expects($this->any())
 			->method('getDataSource')
@@ -2848,7 +2848,7 @@ class DboMysqlTest extends CakeTestCase {
  * @return void
  */
 	function testHasAny() {
-		$this->Dbo = $this->getMock('DboMysql', array('connect', '_execute', 'execute', 'value'));
+		$this->Dbo = $this->getMock('Mysql', array('connect', '_execute', 'execute', 'value'));
 		$this->Model = $this->getMock('TestModel', array('getDataSource'));
 		$this->Model->expects($this->any())
 			->method('getDataSource')
@@ -3398,7 +3398,7 @@ class DboMysqlTest extends CakeTestCase {
  * @return void
  */
 	function testExceptionOnBrokenConnection() {
-		$dbo = new DboMysql(array(
+		$dbo = new Mysql(array(
 			'driver' => 'mysql',
 			'host' => 'imaginary_host',
 			'login' => 'mark',
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php b/lib/Cake/tests/Case/Model/Datasource/Database/OrcaleTest.php
similarity index 100%
rename from cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
rename to lib/Cake/tests/Case/Model/Datasource/Database/OrcaleTest.php
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php b/lib/Cake/tests/Case/Model/Datasource/Database/PostgresTest.php
similarity index 97%
rename from cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
rename to lib/Cake/tests/Case/Model/Datasource/Database/PostgresTest.php
index 7d18d0970..c4b5da022 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
+++ b/lib/Cake/tests/Case/Model/Datasource/Database/PostgresTest.php
@@ -16,8 +16,11 @@
  * @since         CakePHP(tm) v 1.2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', array('Model', 'DataSource', 'DboSource', 'DboPostgres'));
-App::import('Model', 'App');
+
+App::uses('Model', 'Model');
+App::uses('AppModel', 'Model');
+App::uses('Postgres', 'Model/Datasource/Database');
+
 require_once dirname(dirname(dirname(__FILE__))) . DS . 'models.php';
 
 /**
@@ -25,7 +28,7 @@ require_once dirname(dirname(dirname(__FILE__))) . DS . 'models.php';
  *
  * @package       cake.tests.cases.libs.model.datasources
  */
-class DboPostgresTestDb extends DboPostgres {
+class DboPostgresTestDb extends Postgres {
 
 /**
  * simulated property
@@ -240,9 +243,8 @@ class DboPostgresTest extends CakeTestCase {
 	public function setUp() {
 		Configure::write('Cache.disable', true);
 		$this->Dbo = ConnectionManager::getDataSource('test');
-		$this->skipIf(!($this->Dbo instanceof DboPostgres));
+		$this->skipIf(!($this->Dbo instanceof Postgres));
 		$this->Dbo2 = new DboPostgresTestDb($this->Dbo->config, false);
-		$this->skipUnless($this->Dbo->config['driver'] == 'postgres', 'PostgreSQL connection not available');
 		$this->model = new PostgresTestModel();
 	}
 
@@ -617,7 +619,6 @@ class DboPostgresTest extends CakeTestCase {
 			'PRIMARY' => array('unique' => true, 'column' => 'id'),
 			'pointless_bool' => array('unique' => false, 'column' => 'bool'),
 			'char_index' => array('unique' => true, 'column' => 'small_char'),
-
 		);
 		$result = $this->Dbo->index($name);
 		$this->Dbo->query('DROP TABLE ' . $name);
@@ -710,10 +711,10 @@ class DboPostgresTest extends CakeTestCase {
 			'name' => 'AlterTest2',
 			'connection' => 'test',
 			'altertest' => array(
-				'id' => array('type' => 'integer', 'null' => 0, 'default' => 0),
-				'name' => array('type' => 'string', 'null' => 0, 'length' => 50),
-				'group1' => array('type' => 'integer', 'null' => 1),
-				'group2' => array('type' => 'integer', 'null' => 1),
+				'id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+				'name' => array('type' => 'string', 'null' => false, 'length' => 50),
+				'group1' => array('type' => 'integer', 'null' => true),
+				'group2' => array('type' => 'integer', 'null' => true),
 				'indexes' => array(
 					'name_idx' => array('unique' => false, 'column' => 'name'),
 					'group_idx' => array('unique' => false, 'column' => 'group1'),
@@ -732,10 +733,10 @@ class DboPostgresTest extends CakeTestCase {
 			'name' => 'AlterTest3',
 			'connection' => 'test',
 			'altertest' => array(
-				'id' => array('type' => 'integer', 'null' => 0, 'default' => 0),
-				'name' => array('type' => 'string', 'null' => 0, 'length' => 50),
-				'group1' => array('type' => 'integer', 'null' => 1),
-				'group2' => array('type' => 'integer', 'null' => 1),
+				'id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+				'name' => array('type' => 'string', 'null' => false, 'length' => 50),
+				'group1' => array('type' => 'integer', 'null' => true),
+				'group2' => array('type' => 'integer', 'null' => true),
 				'indexes' => array(
 					'name_idx' => array('unique' => true, 'column' => 'name'),
 					'group_idx' => array('unique' => false, 'column' => 'group2'),
diff --git a/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php b/lib/Cake/tests/Case/Model/Datasource/Database/SqliteTest.php
similarity index 96%
rename from cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
rename to lib/Cake/tests/Case/Model/Datasource/Database/SqliteTest.php
index a1fc1cd4a..9bd875d2c 100644
--- a/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
+++ b/lib/Cake/tests/Case/Model/Datasource/Database/SqliteTest.php
@@ -16,14 +16,16 @@
  * @since         CakePHP(tm) v 1.2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', array('Model', 'DataSource', 'DboSource', 'DboSqlite'));
+App::uses('Model', 'Model');
+App::uses('AppModel', 'Model');
+App::uses('Sqlite', 'Model/Datasource/Database');
 
 /**
  * DboSqliteTestDb class
  *
  * @package       cake.tests.cases.libs.model.datasources
  */
-class DboSqliteTestDb extends DboSqlite {
+class DboSqliteTestDb extends Sqlite {
 
 /**
  * simulated property
@@ -94,7 +96,7 @@ class DboSqliteTest extends CakeTestCase {
 	public function setUp() {
 		Configure::write('Cache.disable', true);
 		$this->Dbo = ConnectionManager::getDataSource('test');
-		if ($this->Dbo->config['driver'] !== 'sqlite') {
+		if (!$this->Dbo instanceof Sqlite) {
 			$this->markTestSkipped('The Sqlite extension is not available.');
 		}
 	}
@@ -165,7 +167,7 @@ class DboSqliteTest extends CakeTestCase {
 		$this->assertFalse(file_exists(TMP . $dbName));
 
 		$config = $this->Dbo->config;
-		$db = new DboSqlite(array_merge($this->Dbo->config, array('database' => TMP . $dbName)));
+		$db = new Sqlite(array_merge($this->Dbo->config, array('database' => TMP . $dbName)));
 		$this->assertTrue(file_exists(TMP . $dbName));
 
 		$db->execute("CREATE TABLE test_list (id VARCHAR(255));");
diff --git a/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/lib/Cake/tests/Case/Model/Datasource/DboSourceTest.php
similarity index 99%
rename from cake/tests/cases/libs/model/datasources/dbo_source.test.php
rename to lib/Cake/tests/Case/Model/Datasource/DboSourceTest.php
index 027f1c43b..e6b8d5482 100644
--- a/cake/tests/cases/libs/model/datasources/dbo_source.test.php
+++ b/lib/Cake/tests/Case/Model/Datasource/DboSourceTest.php
@@ -17,9 +17,16 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::import('Model', array('Model', 'DataSource', 'DboSource', 'DboMysql', 'App'));
+App::uses('Model', 'Model');
+App::uses('AppModel', 'Model');
+App::uses('DataSource', 'Model/Datasource');
+App::uses('DboSource', 'Model/Datasource');
 require_once dirname(dirname(__FILE__)) . DS . 'models.php';
 
+class MockDataSource extends DataSource {
+	
+}
+
 /**
  * DboSourceTest class
  *
@@ -783,7 +790,7 @@ class DboSourceTest extends CakeTestCase {
 	function testReadOnlyCallingQueryAssociationWhenDefined() {
 		$this->loadFixtures('Article', 'User', 'ArticlesTag', 'Tag');
 		ConnectionManager::create('test_no_queryAssociation', array(
-			'datasource' => 'data'
+			'datasource' => 'MockDataSource'
 		));
 		$Article = ClassRegistry::init('Article');
 		$Article->Comment->useDbConfig = 'test_no_queryAssociation';
diff --git a/cake/tests/cases/libs/session/cache_session.test.php b/lib/Cake/tests/Case/Model/Datasource/Session/CacheSessionTest.php
similarity index 94%
rename from cake/tests/cases/libs/session/cache_session.test.php
rename to lib/Cake/tests/Case/Model/Datasource/Session/CacheSessionTest.php
index 9f0572cd0..0cb111929 100644
--- a/cake/tests/cases/libs/session/cache_session.test.php
+++ b/lib/Cake/tests/Case/Model/Datasource/Session/CacheSessionTest.php
@@ -17,8 +17,9 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::import('Core', 'CakeSession');
-App::import('Core', 'session/CacheSession');
+App::uses('CakeSession', 'Model/Datasource');
+App::uses('CacheSession', 'Model/Datasource/Session');
+class_exists('CakeSession');
 
 class CacheSessionTest extends CakeTestCase {
 
diff --git a/cake/tests/cases/libs/session/database_session.test.php b/lib/Cake/tests/Case/Model/Datasource/Session/DatabaseSessionTest.php
similarity index 95%
rename from cake/tests/cases/libs/session/database_session.test.php
rename to lib/Cake/tests/Case/Model/Datasource/Session/DatabaseSessionTest.php
index 657ce8159..4bf31d0bd 100644
--- a/cake/tests/cases/libs/session/database_session.test.php
+++ b/lib/Cake/tests/Case/Model/Datasource/Session/DatabaseSessionTest.php
@@ -17,9 +17,10 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::import('Core', 'Model');
-App::import('Core', 'CakeSession');
-App::import('Core', 'session/DatabaseSession');
+App::uses('Model', 'Model');
+App::uses('CakeSession', 'Model/Datasource');
+App::uses('DatabaseSession', 'Model/Datasource/Session');
+class_exists('CakeSession');
 
 class SessionTestModel extends Model {
 	var $name = 'SessionTestModel';
diff --git a/cake/tests/cases/libs/model/db_acl.test.php b/lib/Cake/tests/Case/Model/DbAclTest.php
similarity index 98%
rename from cake/tests/cases/libs/model/db_acl.test.php
rename to lib/Cake/tests/Case/Model/DbAclTest.php
index 07cff6748..fc0b3d2a5 100644
--- a/cake/tests/cases/libs/model/db_acl.test.php
+++ b/lib/Cake/tests/Case/Model/DbAclTest.php
@@ -16,8 +16,10 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Component', 'Acl');
-App::import('Core', 'db_acl');
+
+App::uses('AclComponent', 'Controller/Component');
+App::uses('AclNode', 'Model');
+class_exists('AclComponent');
 
 /**
  * DB ACL wrapper test class
diff --git a/cake/tests/cases/libs/model/model_delete.test.php b/lib/Cake/tests/Case/Model/ModelDeleteTest.php
similarity index 99%
rename from cake/tests/cases/libs/model/model_delete.test.php
rename to lib/Cake/tests/Case/Model/ModelDeleteTest.php
index 77c546fec..8ec9aaa1c 100644
--- a/cake/tests/cases/libs/model/model_delete.test.php
+++ b/lib/Cake/tests/Case/Model/ModelDeleteTest.php
@@ -16,7 +16,7 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-require_once dirname(__FILE__) . DS . 'model.test.php';
+require_once dirname(__FILE__) . DS . 'ModelTestBase.php';
 
 /**
  * ModelDeleteTest
diff --git a/cake/tests/cases/libs/model/model_integration.test.php b/lib/Cake/tests/Case/Model/ModelIntegrationTest.php
similarity index 99%
rename from cake/tests/cases/libs/model/model_integration.test.php
rename to lib/Cake/tests/Case/Model/ModelIntegrationTest.php
index 03cfc7077..e3540da6f 100644
--- a/cake/tests/cases/libs/model/model_integration.test.php
+++ b/lib/Cake/tests/Case/Model/ModelIntegrationTest.php
@@ -18,8 +18,9 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-require_once dirname(__FILE__) . DS . 'model.test.php';
-App::import('Core', 'DboSource');
+
+require_once dirname(__FILE__) . DS . 'ModelTestBase.php';
+App::uses('DboSource', 'Model/Datasource');
 
 /**
  * DboMock class
@@ -1999,7 +2000,7 @@ class ModelIntegrationTest extends BaseModelTest {
 		$expected = $db->name('Domain.DomainHandle');
 		$this->assertEqual($result, $expected);
 
-		ConnectionManager::create('mock', array('driver' => 'mock'));
+		ConnectionManager::create('mock', array('datasource' => 'DboMock'));
 		$TestModel->setDataSource('mock');
 		$db = $TestModel->getDataSource();
 
diff --git a/cake/tests/cases/libs/model/model_read.test.php b/lib/Cake/tests/Case/Model/ModelReadTest.php
old mode 100755
new mode 100644
similarity index 99%
rename from cake/tests/cases/libs/model/model_read.test.php
rename to lib/Cake/tests/Case/Model/ModelReadTest.php
index b74ee5632..0c19376bb
--- a/cake/tests/cases/libs/model/model_read.test.php
+++ b/lib/Cake/tests/Case/Model/ModelReadTest.php
@@ -16,7 +16,7 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-require_once dirname(__FILE__) . DS . 'model.test.php';
+require_once dirname(__FILE__) . DS . 'ModelTestBase.php';
 /**
  * ModelReadTest
  *
@@ -79,8 +79,8 @@ class ModelReadTest extends BaseModelTest {
  */
 	function testGroupBy() {
 		$db = ConnectionManager::getDataSource('test');
-		$isStrictGroupBy = in_array($db->config['driver'], array('postgres', 'oracle', 'sqlite'));
-		$message = '%s Postgres and Oracle have strict GROUP BY and are incompatible with this test.';
+		$isStrictGroupBy = $this->db instanceof Postgres || $this->db instanceof Sqlite || $this->db instanceof Oracle; 
+		$message = 'Postgres and Oracle have strict GROUP BY and are incompatible with this test.';
 
 		if ($this->skipIf($isStrictGroupBy, $message )) {
 			return;
@@ -367,10 +367,10 @@ class ModelReadTest extends BaseModelTest {
  * @return void
  */
 	function testVeryStrangeUseCase() {
-		$message = "%s skipping SELECT * FROM ? WHERE ? = ? AND ? = ?; prepared query.";
+		$message = "skipping SELECT * FROM ? WHERE ? = ? AND ? = ?; prepared query.";
 		$message .= " MSSQL is incompatible with this test.";
 
-		if ($this->skipIf($this->db->config['driver'] == 'mssql', $message)) {
+		if ($this->skipIf($this->db instanceof Mssql, $message)) {
 			return;
 		}
 
@@ -4019,7 +4019,7 @@ class ModelReadTest extends BaseModelTest {
 		$result = $TestModel->find('all', compact('conditions', 'recursive', 'order'));
 		$this->assertEqual($result, $expected);
 
-		if ($this->skipIf($this->db->config['driver'] == 'postgres', 'The rest of testFindAllWithConditionsHavingMixedDataTypes test is not compatible with Postgres')) {
+		if ($this->skipIf($this->db instanceof Postgres, 'The rest of testFindAllWithConditionsHavingMixedDataTypes test is not compatible with Postgres')) {
 			return;
 		}
 		$conditions = array('id' => array('1', 2, '3.0'));
@@ -6227,7 +6227,7 @@ class ModelReadTest extends BaseModelTest {
 
 		// These tests are expected to fail on SQL Server since the LIMIT/OFFSET
 		// hack can't handle small record counts.
-		if ($this->db->config['driver'] != 'mssql') {
+		if ($this->db instanceof Mssql) {
 			$result = $TestModel->find('all', array('limit' => 3, 'page' => 2));
 			$expected = array(
 				array(
@@ -6253,7 +6253,7 @@ class ModelReadTest extends BaseModelTest {
  * @return void
  */
 	function testGenerateFindList() {
-		$this->loadFixtures('Article', 'Apple', 'Post', 'Author', 'User');
+		$this->loadFixtures('Article', 'Apple', 'Post', 'Author', 'User', 'Comment');
 
 		$TestModel = new Article();
 		$TestModel->displayField = 'title';
@@ -6270,7 +6270,7 @@ class ModelReadTest extends BaseModelTest {
 		$this->assertEqual($result, $expected);
 
 		$db = ConnectionManager::getDataSource('test');
-		if ($db->config['driver'] == 'mysql') {
+		if ($db instanceof Mysql) {
 			$result = $TestModel->find('list', array(
 				'order' => array('FIELD(Article.id, 3, 2) ASC', 'Article.title ASC')
 			));
@@ -6622,7 +6622,7 @@ class ModelReadTest extends BaseModelTest {
  */
 	function testFindCountDistinct() {
 		$skip = $this->skipIf(
-			$this->db->config['driver'] == 'sqlite',
+			$this->db instanceof Sqlite,
 			'SELECT COUNT(DISTINCT field) is not compatible with SQLite'
 		);
 		if ($skip) {
@@ -6645,7 +6645,7 @@ class ModelReadTest extends BaseModelTest {
  * @return void
  */
 	function testFindCountWithDbExpressions() {
-		if ($this->skipIf($this->db->config['driver'] == 'postgres', '%s testFindCountWithExpressions is not compatible with Postgres')) {
+		if ($this->skipIf($this->db instanceof Postgres, 'testFindCountWithExpressions is not compatible with Postgres')) {
 			return;
 		}
 		$this->loadFixtures('Project');
@@ -7470,7 +7470,7 @@ class ModelReadTest extends BaseModelTest {
  *
  */
 	public function testVirtualFieldsMysql() {
-		if ($this->skipIf($this->db->config['driver'] != 'mysql', 'The rest of virtualFieds test is not compatible with Postgres')) {
+		if ($this->skipIf(!($this->db instanceof Mysql), 'The rest of virtualFieds test is not compatible with Postgres')) {
 			return;
 		}
 		$this->loadFixtures('Post', 'Author');
diff --git a/cake/tests/cases/libs/model/model.test.php b/lib/Cake/tests/Case/Model/ModelTestBase.php
similarity index 98%
rename from cake/tests/cases/libs/model/model.test.php
rename to lib/Cake/tests/Case/Model/ModelTestBase.php
index 3fa31afd6..9a069d74f 100644
--- a/cake/tests/cases/libs/model/model.test.php
+++ b/lib/Cake/tests/Case/Model/ModelTestBase.php
@@ -16,7 +16,9 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', array('AppModel', 'Model'));
+
+App::uses('Model', 'Model');
+App::uses('AppModel', 'Model');
 require_once dirname(__FILE__) . DS . 'models.php';
 
 PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'DEFAULT');
diff --git a/cake/tests/cases/libs/model/model_validation.test.php b/lib/Cake/tests/Case/Model/ModelValidationTest.php
similarity index 99%
rename from cake/tests/cases/libs/model/model_validation.test.php
rename to lib/Cake/tests/Case/Model/ModelValidationTest.php
index 5e146c9ea..8bec80494 100644
--- a/cake/tests/cases/libs/model/model_validation.test.php
+++ b/lib/Cake/tests/Case/Model/ModelValidationTest.php
@@ -18,7 +18,7 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-require_once dirname(__FILE__) . DS . 'model.test.php';
+require_once dirname(__FILE__) . DS . 'ModelTestBase.php';
 
 /**
  * ModelValidationTest
diff --git a/cake/tests/cases/libs/model/model_write.test.php b/lib/Cake/tests/Case/Model/ModelWriteTest.php
similarity index 99%
rename from cake/tests/cases/libs/model/model_write.test.php
rename to lib/Cake/tests/Case/Model/ModelWriteTest.php
index bacd77998..026ca90d3 100644
--- a/cake/tests/cases/libs/model/model_write.test.php
+++ b/lib/Cake/tests/Case/Model/ModelWriteTest.php
@@ -16,7 +16,7 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-require_once dirname(__FILE__) . DS . 'model.test.php';
+require_once dirname(__FILE__) . DS . 'ModelTestBase.php';
 /**
  * ModelWriteTest
  *
@@ -146,7 +146,7 @@ class ModelWriteTest extends BaseModelTest {
  */
 	function testAutoSaveUuid() {
 		// SQLite does not support non-integer primary keys
-		$this->skipIf($this->db->config['driver'] == 'sqlite');
+		$this->skipIf($this->db instanceof Sqlite);
 
 		$this->loadFixtures('Uuid');
 		$TestModel = new Uuid();
@@ -168,7 +168,7 @@ class ModelWriteTest extends BaseModelTest {
  */
 	public function testSaveUuidNull() {
 		// SQLite does not support non-integer primary keys
-		$this->skipIf($this->db->config['driver'] == 'sqlite');
+		$this->skipIf($this->db instanceof Sqlite);
 
 		$this->loadFixtures('Uuid');
 		$TestModel = new Uuid();
@@ -190,7 +190,7 @@ class ModelWriteTest extends BaseModelTest {
  */
 	function testZeroDefaultFieldValue() {
 		$this->skipIf(
-			$this->db->config['driver'] == 'sqlite',
+			$this->db instanceof Sqlite,
 			'%s SQLite uses loose typing, this operation is unsupported'
 		);
 		$this->loadFixtures('DataTest');
@@ -407,7 +407,7 @@ class ModelWriteTest extends BaseModelTest {
  */
 	public function testCounterCacheWithSelfJoin() {
 		$skip = $this->skipIf(
-			($this->db->config['driver'] == 'sqlite'),
+			($this->db instanceof Sqlite),
 			'SQLite 2.x does not support ALTER TABLE ADD COLUMN'
 		);
 		if ($skip) {
@@ -1014,7 +1014,7 @@ class ModelWriteTest extends BaseModelTest {
 	function testSaveFromXml() {
 		$this->markTestSkipped('This feature needs to be fixed or dropped');
 		$this->loadFixtures('Article');
-		App::import('Core', 'Xml');
+		App::uses('Xml', 'Utility');
 
 		$Article = new Article();
 		$result = $Article->save(Xml::build('
        '));
@@ -2986,7 +2986,7 @@ class ModelWriteTest extends BaseModelTest {
 
 		$this->getMock('DboSource', array(), array(), 'MockTransactionDboSource');
 		$db = ConnectionManager::create('mock_transaction', array(
-			'datasource' => 'MockTransactionDbo',
+			'datasource' => 'MockTransactionDboSource',
 		));
 
 		$db->expects($this->once())
@@ -3017,7 +3017,7 @@ class ModelWriteTest extends BaseModelTest {
 
 		$mock = $this->getMock('DboSource', array(), array(), 'MockTransactionAssociatedDboSource', false);
 		$db =& ConnectionManager::create('mock_transaction_assoc', array(
-			'datasource' => 'MockTransactionAssociatedDbo',
+			'datasource' => 'MockTransactionAssociatedDboSource',
 		));
 		$this->mockObjects[] = $db;
 		$db->columns = $testDb->columns;
@@ -3831,7 +3831,7 @@ class ModelWriteTest extends BaseModelTest {
  */
 	function testProductUpdateAll() {
 		$this->skipIf(
-			$this->db->config['driver'] != 'mysql',
+			!$this->db instanceof Mysql,
 			'%s Currently, there is no way of doing joins in an update statement in postgresql or sqlite'
 		);
 		$this->loadFixtures('ProductUpdateAll', 'GroupUpdateAll');
@@ -3881,7 +3881,7 @@ class ModelWriteTest extends BaseModelTest {
  */
     function testProductUpdateAllWithoutForeignKey() {
 		$this->skipIf(
-			$this->db->config['driver'] != 'mysql',
+			!$this->db instanceof Mysql,
 			'%s Currently, there is no way of doing joins in an update statement in postgresql'
 		);
 		$this->loadFixtures('ProductUpdateAll', 'GroupUpdateAll');
diff --git a/cake/tests/cases/libs/model/models.php b/lib/Cake/tests/Case/Model/models.php
similarity index 100%
rename from cake/tests/cases/libs/model/models.php
rename to lib/Cake/tests/Case/Model/models.php
diff --git a/cake/tests/cases/libs/cake_request.test.php b/lib/Cake/tests/Case/Network/CakeRequestTest.php
similarity index 99%
rename from cake/tests/cases/libs/cake_request.test.php
rename to lib/Cake/tests/Case/Network/CakeRequestTest.php
index 3df9a8713..65eb45042 100644
--- a/cake/tests/cases/libs/cake_request.test.php
+++ b/lib/Cake/tests/Case/Network/CakeRequestTest.php
@@ -16,8 +16,9 @@
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'Dispatcher');
-App::import('Core', 'CakeRequest');
+
+App::uses('Dispatcher', 'Routing');
+App::uses('CakeRequest', 'Network');
 
 class CakeRequestTestCase extends CakeTestCase {
 /**
diff --git a/cake/tests/cases/libs/cake_response.test.php b/lib/Cake/tests/Case/Network/CakeResponseTest.php
similarity index 99%
rename from cake/tests/cases/libs/cake_response.test.php
rename to lib/Cake/tests/Case/Network/CakeResponseTest.php
index d0d2a9e58..e38cfe513 100644
--- a/cake/tests/cases/libs/cake_response.test.php
+++ b/lib/Cake/tests/Case/Network/CakeResponseTest.php
@@ -1,6 +1,6 @@
 Socket = new CakeSocket($config);
 		$this->assertTrue($this->Socket->connect());
 		$this->assertFalse($this->Socket->read(1024 * 1024));
-		$this->assertEqual($this->Socket->lastError(), '2: ' . __('Connection timed out'));
+		$this->assertEqual($this->Socket->lastError(), '2: ' . __d('cake_dev', 'Connection timed out'));
 
 		$config = array('host' => 'cakephp.org', 'port' => 80, 'timeout' => 20);
 		$this->Socket = new CakeSocket($config);
diff --git a/cake/tests/cases/libs/http/basic_authentication.test.php b/lib/Cake/tests/Case/Network/Http/BasicAuthenticationTest.php
similarity index 94%
rename from cake/tests/cases/libs/http/basic_authentication.test.php
rename to lib/Cake/tests/Case/Network/Http/BasicAuthenticationTest.php
index 990ed0750..3989b6f37 100644
--- a/cake/tests/cases/libs/http/basic_authentication.test.php
+++ b/lib/Cake/tests/Case/Network/Http/BasicAuthenticationTest.php
@@ -17,8 +17,8 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::import('Core', 'HttpSocket');
-App::import('Lib', 'http/BasicAuthentication');
+App::uses('HttpSocket', 'Network/Http');
+App::uses('BasicAuthentication', 'Network/Http');
 
 /**
  * BasicMethodTest class
diff --git a/cake/tests/cases/libs/http/digest_authentication.test.php b/lib/Cake/tests/Case/Network/Http/DigestAuthenticationTest.php
similarity index 98%
rename from cake/tests/cases/libs/http/digest_authentication.test.php
rename to lib/Cake/tests/Case/Network/Http/DigestAuthenticationTest.php
index 17832ce45..0b9b6daea 100644
--- a/cake/tests/cases/libs/http/digest_authentication.test.php
+++ b/lib/Cake/tests/Case/Network/Http/DigestAuthenticationTest.php
@@ -17,8 +17,8 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::import('Core', 'HttpSocket');
-App::import('Lib', 'http/DigestAuthentication');
+App::uses('HttpSocket', 'Network/Http');
+App::uses('DigestAuthentication', 'Network/Http');
 
 class DigestHttpSocket extends HttpSocket {
 
diff --git a/cake/tests/cases/libs/http_response.test.php b/lib/Cake/tests/Case/Network/Http/HttpResponseTest.php
similarity index 99%
rename from cake/tests/cases/libs/http_response.test.php
rename to lib/Cake/tests/Case/Network/Http/HttpResponseTest.php
index 9155bb8a3..53afc8ed9 100644
--- a/cake/tests/cases/libs/http_response.test.php
+++ b/lib/Cake/tests/Case/Network/Http/HttpResponseTest.php
@@ -16,7 +16,8 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'HttpResponse');
+
+App::uses('HttpResponse', 'Network/Http');
 
 /**
  * TestHttpResponse class
diff --git a/cake/tests/cases/libs/http_socket.test.php b/lib/Cake/tests/Case/Network/Http/HttpSocketTest.php
similarity index 99%
rename from cake/tests/cases/libs/http_socket.test.php
rename to lib/Cake/tests/Case/Network/Http/HttpSocketTest.php
index 94de48389..d0f46de52 100644
--- a/cake/tests/cases/libs/http_socket.test.php
+++ b/lib/Cake/tests/Case/Network/Http/HttpSocketTest.php
@@ -16,7 +16,9 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'HttpSocket');
+
+App::uses('HttpSocket', 'Network/Http');
+App::uses('HttpResponse', 'Network/Http');
 
 /**
  * TestAuthentication class
diff --git a/cake/tests/cases/libs/dispatcher.test.php b/lib/Cake/tests/Case/Routing/DispatcherTest.php
similarity index 95%
rename from cake/tests/cases/libs/dispatcher.test.php
rename to lib/Cake/tests/Case/Routing/DispatcherTest.php
index 07823552a..e86431a45 100644
--- a/cake/tests/cases/libs/dispatcher.test.php
+++ b/lib/Cake/tests/Case/Routing/DispatcherTest.php
@@ -16,11 +16,11 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'Dispatcher', false);
-App::import('Core', 'CakeResponse', false);
+App::uses('Dispatcher', 'Routing');
+App::uses('CakeResponse', 'Network');
 
-if (!class_exists('AppController')) {
-	require_once LIBS . 'controller' . DS . 'app_controller.php';
+if (!class_exists('AppController', false)) {
+	require_once LIBS . 'Controller' . DS . 'AppController.php';
 } elseif (!defined('APP_CONTROLLER_EXISTS')){
 	define('APP_CONTROLLER_EXISTS', true);
 }
@@ -538,7 +538,7 @@ class DispatcherTest extends CakeTestCase {
 
 		$this->_debug = Configure::read('debug');
 
-		App::build(App::core());
+		App::build();
 		App::objects('plugin', null, false);
 	}
 
@@ -765,7 +765,7 @@ class DispatcherTest extends CakeTestCase {
  */
 	public function testDispatchBasic() {
 		App::build(array(
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		));
 		$Dispatcher = new TestDispatcher();
 		Configure::write('App.baseUrl', '/index.php');
@@ -1047,7 +1047,7 @@ class DispatcherTest extends CakeTestCase {
 		}
 		Router::reload();
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		), true);
 		App::objects('plugin', null, false);
 
@@ -1147,7 +1147,7 @@ class DispatcherTest extends CakeTestCase {
 	public function testTestPluginDispatch() {
 		$Dispatcher = new TestDispatcher();
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
 		));
 		App::objects('plugin', null, false);
 		Router::reload();
@@ -1205,9 +1205,9 @@ class DispatcherTest extends CakeTestCase {
 		Router::reload();
 
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
-			'vendors' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'vendors'. DS),
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'vendors' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'vendors'. DS),
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		));
 
 		$Dispatcher = new TestDispatcher();
@@ -1231,21 +1231,21 @@ class DispatcherTest extends CakeTestCase {
 		$Dispatcher->dispatch(new CakeRequest('theme/test_theme/flash/theme_test.swf'));
 		$result = ob_get_clean();
 
-		$file = file_get_contents(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS . 'webroot' . DS . 'flash' . DS . 'theme_test.swf');
+		$file = file_get_contents(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'themed' . DS . 'test_theme' . DS . 'webroot' . DS . 'flash' . DS . 'theme_test.swf');
 		$this->assertEqual($file, $result);
 		$this->assertEqual('this is just a test to load swf file from the theme.', $result);
 
 		ob_start();
 		$Dispatcher->dispatch(new CakeRequest('theme/test_theme/pdfs/theme_test.pdf'));
 		$result = ob_get_clean();
-		$file = file_get_contents(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS . 'webroot' . DS . 'pdfs' . DS . 'theme_test.pdf');
+		$file = file_get_contents(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'themed' . DS . 'test_theme' . DS . 'webroot' . DS . 'pdfs' . DS . 'theme_test.pdf');
 		$this->assertEqual($file, $result);
 		$this->assertEqual('this is just a test to load pdf file from the theme.', $result);
 
 		ob_start();
 		$Dispatcher->dispatch(new CakeRequest('theme/test_theme/img/test.jpg'));
 		$result = ob_get_clean();
-		$file = file_get_contents(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS . 'webroot' . DS . 'img' . DS . 'test.jpg');
+		$file = file_get_contents(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'themed' . DS . 'test_theme' . DS . 'webroot' . DS . 'img' . DS . 'test.jpg');
 		$this->assertEqual($file, $result);
 
 		ob_start();
@@ -1266,20 +1266,20 @@ class DispatcherTest extends CakeTestCase {
 		ob_start();
 		$Dispatcher->asset('test_plugin/root.js');
 		$result = ob_get_clean();
-		$expected = file_get_contents(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'webroot' . DS . 'root.js');
+		$expected = file_get_contents(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'webroot' . DS . 'root.js');
 		$this->assertEqual($result, $expected);
 
 		ob_start();
 		$Dispatcher->dispatch(new CakeRequest('test_plugin/flash/plugin_test.swf'));
 		$result = ob_get_clean();
-		$file = file_get_contents(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'webroot' . DS . 'flash' . DS . 'plugin_test.swf');
+		$file = file_get_contents(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'webroot' . DS . 'flash' . DS . 'plugin_test.swf');
 		$this->assertEqual($file, $result);
 		$this->assertEqual('this is just a test to load swf file from the plugin.', $result);
 
 		ob_start();
 		$Dispatcher->dispatch(new CakeRequest('test_plugin/pdfs/plugin_test.pdf'));
 		$result = ob_get_clean();
-		$file = file_get_contents(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'webroot' . DS . 'pdfs' . DS . 'plugin_test.pdf');
+		$file = file_get_contents(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'webroot' . DS . 'pdfs' . DS . 'plugin_test.pdf');
 		$this->assertEqual($file, $result);
 		 $this->assertEqual('this is just a test to load pdf file from the plugin.', $result);
 
@@ -1301,7 +1301,7 @@ class DispatcherTest extends CakeTestCase {
 		ob_start();
 		$Dispatcher->asset('test_plugin/img/cake.icon.gif');
 		$result = ob_get_clean();
-		$file = file_get_contents(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' .DS . 'webroot' . DS . 'img' . DS . 'cake.icon.gif');
+		$file = file_get_contents(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' .DS . 'webroot' . DS . 'img' . DS . 'cake.icon.gif');
 		$this->assertEqual($file, $result);
 
 		ob_start();
@@ -1392,7 +1392,7 @@ class DispatcherTest extends CakeTestCase {
 		Router::connect('/', array('controller' => 'test_cached_pages', 'action' => 'index'));
 
 		App::build(array(
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS),
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS),
 		), true);
 
 		$dispatcher = new TestDispatcher();
diff --git a/cake/tests/cases/libs/route/cake_route.test.php b/lib/Cake/tests/Case/Routing/Route/CakeRouteTest.php
similarity index 99%
rename from cake/tests/cases/libs/route/cake_route.test.php
rename to lib/Cake/tests/Case/Routing/Route/CakeRouteTest.php
index d70eed4e6..0eec8b3dd 100644
--- a/cake/tests/cases/libs/route/cake_route.test.php
+++ b/lib/Cake/tests/Case/Routing/Route/CakeRouteTest.php
@@ -1,7 +1,7 @@
   array(
-				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
+				LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
 			)
 		), true);
 		App::objects('plugin', null, false);
@@ -2200,7 +2201,7 @@ class RouterTest extends CakeTestCase {
 	function testConnectDefaultRoutes() {
 		App::build(array(
 			'plugins' =>  array(
-				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
+				LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
 			)
 		), true);
 		App::objects('plugin', null, false);
diff --git a/cake/tests/cases/libs/cake_test_case.test.php b/lib/Cake/tests/Case/TestSuite/CakeTestCaseTest.php
similarity index 91%
rename from cake/tests/cases/libs/cake_test_case.test.php
rename to lib/Cake/tests/Case/TestSuite/CakeTestCaseTest.php
index 505dd8a08..72743e3a9 100644
--- a/cake/tests/cases/libs/cake_test_case.test.php
+++ b/lib/Cake/tests/Case/TestSuite/CakeTestCaseTest.php
@@ -18,11 +18,12 @@
  * @since         CakePHP v 1.2.0.4487
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Controller', 'Controller', false);
-require_once TEST_CAKE_CORE_INCLUDE_PATH  . 'tests' . DS . 'lib' . DS . 'reporter' . DS . 'cake_html_reporter.php';
 
-if (!class_exists('AppController')) {
-	require_once LIBS . 'controller' . DS . 'app_controller.php';
+App::uses('Controller', 'Controller');
+App::uses('CakeHtmlReporter', 'TestSuite/Reporter');
+
+if (!class_exists('AppController', false)) {
+	require_once LIBS . 'Controller' . DS . 'AppController.php';
 } elseif (!defined('APP_CONTROLLER_EXISTS')) {
 	define('APP_CONTROLLER_EXISTS', true);
 }
@@ -35,8 +36,8 @@ if (!class_exists('AppController')) {
 class CakeTestCaseTest extends CakeTestCase {
 
 	public static function setUpBeforeClass() {
-		require_once TEST_CAKE_CORE_INCLUDE_PATH . DS . 'tests' . DS . 'fixtures' . DS . 'assert_tags_test_case.php';
-		require_once TEST_CAKE_CORE_INCLUDE_PATH . DS . 'tests' . DS . 'fixtures' . DS . 'fixturized_test_case.php';
+		require_once LIBS . 'tests' . DS . 'Fixture' . DS . 'AssertTagsTestCase.php';
+		require_once LIBS . 'tests' . DS . 'Fixture' . DS . 'FixturizedTestCase.php';
 	}
 
 /**
diff --git a/cake/tests/cases/libs/cake_test_fixture.test.php b/lib/Cake/tests/Case/TestSuite/CakeTestFixtureTest.php
similarity index 98%
rename from cake/tests/cases/libs/cake_test_fixture.test.php
rename to lib/Cake/tests/Case/TestSuite/CakeTestFixtureTest.php
index f329fc69c..edfe8e888 100644
--- a/cake/tests/cases/libs/cake_test_fixture.test.php
+++ b/lib/Cake/tests/Case/TestSuite/CakeTestFixtureTest.php
@@ -16,7 +16,9 @@
  * @since         CakePHP(tm) v 1.2.0.4667
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Datasource', 'DboSource', false);
+App::uses('DboSource', 'Model/Datasource');
+App::uses('Model', 'Model');
+App::uses('CakeTestFixture', 'TestSuite/Fixture');
 
 /**
  * CakeTestFixtureTestFixture class
diff --git a/cake/tests/cases/libs/controller_test_case.test.php b/lib/Cake/tests/Case/TestSuite/ControllerTestCaseTest.php
similarity index 92%
rename from cake/tests/cases/libs/controller_test_case.test.php
rename to lib/Cake/tests/Case/TestSuite/ControllerTestCaseTest.php
index 9e4feb4b7..1bf23d8d3 100644
--- a/cake/tests/cases/libs/controller_test_case.test.php
+++ b/lib/Cake/tests/Case/TestSuite/ControllerTestCaseTest.php
@@ -19,12 +19,20 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('Controller', 'Controller');
+App::uses('Model', 'Model');
+App::uses('AppModel', 'Model');
+App::uses('CakeHtmlReporter', 'TestSuite/Reporter');
+
+require_once dirname(dirname(__FILE__)) . DS . 'Model' . DS . 'models.php';
+
+
 /**
  * AppController class
  *
  * @package       cake.tests.cases.libs.controller
  */
-if (!class_exists('AppController')) {
+if (!class_exists('AppController', false)) {
 	/**
 	 * AppController class
 	 *
@@ -114,10 +122,10 @@ class ControllerTestCaseTest extends CakeTestCase {
 	function setUp() {
 		parent::setUp();
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
-			'controllers' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'controllers' . DS),
-			'models' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS),
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'Controller' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Controller' . DS),
+			'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS),
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS)
 		));
 		$this->Case = new ControllerTestCase();
 		Router::reload();
@@ -263,7 +271,7 @@ class ControllerTestCaseTest extends CakeTestCase {
  * Tests using loaded routes during tests
  */
 	function testUseRoutes() {
-		include TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'config' . DS . 'routes.php';
+		include LIBS . 'tests' . DS . 'test_app' . DS . 'config' . DS . 'routes.php';
 		$controller = $this->Case->generate('TestsApps');
 		$controller->Components->load('RequestHandler');
 		$result = $this->Case->testAction('/tests_apps/index.json', array('return' => 'view'));
@@ -271,16 +279,16 @@ class ControllerTestCaseTest extends CakeTestCase {
 		$expected = array('cakephp' => 'cool');
 		$this->assertEquals($result, $expected);
 
-		include TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'config' . DS . 'routes.php';
+		include LIBS . 'tests' . DS . 'test_app' . DS . 'config' . DS . 'routes.php';
 		$result = $this->Case->testAction('/some_alias');
 		$this->assertEquals($result, 5);
 
-		include TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'config' . DS . 'routes.php';
+		include LIBS . 'tests' . DS . 'test_app' . DS . 'config' . DS . 'routes.php';
 		$this->Case->testAction('/redirect_me_now');
 		$result = $this->Case->headers['Location'];
 		$this->assertEquals($result, 'http://cakephp.org');
 
-		include TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'config' . DS . 'routes.php';
+		include LIBS . 'tests' . DS . 'test_app' . DS . 'config' . DS . 'routes.php';
 		$this->Case->testAction('/redirect_me');
 		$result = $this->Case->headers['Location'];
 		$this->assertEquals($result, Router::url(array('controller' => 'tests_apps', 'action' => 'some_method'), true));		
@@ -292,7 +300,7 @@ class ControllerTestCaseTest extends CakeTestCase {
  * @expectedException MissingActionException
  */
 	function testSkipRoutes() {
-		include TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'config' . DS . 'routes.php';
+		include LIBS . 'tests' . DS . 'test_app' . DS . 'config' . DS . 'routes.php';
 
 		$this->Case->loadRoutes = false;
 		$result = $this->Case->testAction('/tests_apps/missing_action.json', array('return' => 'view'));
diff --git a/cake/tests/cases/libs/html_coverage_report.test.php b/lib/Cake/tests/Case/TestSuite/HtmlCoverageReportTest.php
similarity index 92%
rename from cake/tests/cases/libs/html_coverage_report.test.php
rename to lib/Cake/tests/Case/TestSuite/HtmlCoverageReportTest.php
index 90fe7f69a..a8d6ae7db 100644
--- a/cake/tests/cases/libs/html_coverage_report.test.php
+++ b/lib/Cake/tests/Case/TestSuite/HtmlCoverageReportTest.php
@@ -17,7 +17,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-require_once CAKE . 'tests' . DS . 'lib' . DS . 'coverage' . DS . 'html_coverage_report.php';
+App::uses('HtmlCoverageReport', 'TestSuite/Coverage');
 
 class HtmlCoverageReportTest extends CakeTestCase {
 /**
@@ -40,7 +40,7 @@ class HtmlCoverageReportTest extends CakeTestCase {
 	function testGetPathFilter() {
 		$this->Coverage->appTest = false;
 		$result = $this->Coverage->getPathFilter();
-		$this->assertEquals(TEST_CAKE_CORE_INCLUDE_PATH, $result);
+		$this->assertEquals(LIBS, $result);
 
 		$this->Coverage->appTest = true;
 		$result = $this->Coverage->getPathFilter();
@@ -59,7 +59,7 @@ class HtmlCoverageReportTest extends CakeTestCase {
  */
 	function testFilterCoverageDataByPathRemovingElements() {
 		$data = array(
-			TEST_CAKE_CORE_INCLUDE_PATH . 'dispatcher.php' => array(
+			LIBS . 'dispatcher.php' => array(
 				10 => -1,
 				12 => 1
 			),
@@ -69,8 +69,8 @@ class HtmlCoverageReportTest extends CakeTestCase {
 			)
 		);
 		$this->Coverage->setCoverage($data);
-		$result = $this->Coverage->filterCoverageDataByPath(TEST_CAKE_CORE_INCLUDE_PATH);
-		$this->assertTrue(isset($result[TEST_CAKE_CORE_INCLUDE_PATH . 'dispatcher.php']));
+		$result = $this->Coverage->filterCoverageDataByPath(LIBS);
+		$this->assertTrue(isset($result[LIBS . 'dispatcher.php']));
 		$this->assertFalse(isset($result[APP . 'app_model.php']));
 	}
 
diff --git a/cake/tests/cases/libs/class_registry.test.php b/lib/Cake/tests/Case/Utility/ClassRegistryTest.php
similarity index 99%
rename from cake/tests/cases/libs/class_registry.test.php
rename to lib/Cake/tests/Case/Utility/ClassRegistryTest.php
index 21aa081b1..7f6e4d54e 100644
--- a/cake/tests/cases/libs/class_registry.test.php
+++ b/lib/Cake/tests/Case/Utility/ClassRegistryTest.php
@@ -16,7 +16,7 @@
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'ClassRegistry');
+App::uses('ClassRegistry', 'Utility');
 
 /**
  * ClassRegisterModel class
diff --git a/cake/tests/cases/libs/debugger.test.php b/lib/Cake/tests/Case/Utility/DebuggerTest.php
similarity index 99%
rename from cake/tests/cases/libs/debugger.test.php
rename to lib/Cake/tests/Case/Utility/DebuggerTest.php
index e728fb5ea..ac1d51b25 100644
--- a/cake/tests/cases/libs/debugger.test.php
+++ b/lib/Cake/tests/Case/Utility/DebuggerTest.php
@@ -16,7 +16,7 @@
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'Debugger');
+App::uses('Debugger', 'Utility');
 
 /**
  * DebugggerTestCaseDebuggger class
@@ -214,7 +214,7 @@ class DebuggerTest extends CakeTestCase {
  * @return void
  */
 	function testExportVar() {
-		App::import('Controller');
+		App::uses('Controller', 'Controller');
 		$Controller = new Controller();
 		$Controller->helpers = array('Html', 'Form');
 		$View = new View($Controller);
diff --git a/cake/tests/cases/libs/file.test.php b/lib/Cake/tests/Case/Utility/FileTest.php
similarity index 98%
rename from cake/tests/cases/libs/file.test.php
rename to lib/Cake/tests/Case/Utility/FileTest.php
index d120ff8f3..5059816f3 100644
--- a/cake/tests/cases/libs/file.test.php
+++ b/lib/Cake/tests/Case/Utility/FileTest.php
@@ -16,7 +16,7 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'File');
+App::uses('File', 'Utility');
 
 /**
  * FileTest class
@@ -75,7 +75,7 @@ class FileTest extends CakeTestCase {
 		$result = $this->File->info();
 		$expecting = array(
 			'dirname' => dirname(__FILE__), 'basename' => basename(__FILE__),
-			'extension' => 'php', 'filename' =>'file.test'
+			'extension' => 'php', 'filename' =>'FileTest'
 		);
 		$this->assertEqual($result, $expecting);
 
@@ -84,7 +84,7 @@ class FileTest extends CakeTestCase {
 		$this->assertEqual($result, $expecting);
 
 		$result = $this->File->name();
-		$expecting = 'file.test';
+		$expecting = 'FileTest';
 		$this->assertEqual($result, $expecting);
 
 		$result = $this->File->md5();
@@ -482,9 +482,9 @@ class FileTest extends CakeTestCase {
 			$assertLine = $assertLine->traceMethod();
 			$shortPath = substr($tmpFile, strlen(ROOT));
 
-			$message = __('[FileTest] Skipping %s because "%s" not writeable!', $caller, $shortPath).$assertLine;
+			$message = __d('cake_dev', '[FileTest] Skipping %s because "%s" not writeable!', $caller, $shortPath).$assertLine;
 			$this->_reporter->paintSkip($message);
 		}
 		return false;
 	}
-}
+}
\ No newline at end of file
diff --git a/cake/tests/cases/libs/folder.test.php b/lib/Cake/tests/Case/Utility/FolderTest.php
similarity index 85%
rename from cake/tests/cases/libs/folder.test.php
rename to lib/Cake/tests/Case/Utility/FolderTest.php
index e1f27325a..08ef5dc14 100644
--- a/cake/tests/cases/libs/folder.test.php
+++ b/lib/Cake/tests/Case/Utility/FolderTest.php
@@ -16,7 +16,8 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'File');
+App::uses('Folder', 'Utility');
+App::uses('File', 'Utility');
 
 /**
  * FolderTest class
@@ -146,7 +147,7 @@ class FolderTest extends CakeTestCase {
  * @return void
  */
 	function testOperations() {
-		$path = TEST_CAKE_CORE_INCLUDE_PATH . 'console' . DS . 'templates' . DS . 'skel';
+		$path = LIBS . 'console' . DS . 'templates' . DS . 'skel';
 		$Folder = new Folder($path);
 
 		$result = is_dir($Folder->pwd());
@@ -219,7 +220,7 @@ class FolderTest extends CakeTestCase {
 	public function testChmod() {
 		$this->skipIf(DIRECTORY_SEPARATOR === '\\', '%s Folder permissions tests not supported on Windows');
 
-		$path = TEST_CAKE_CORE_INCLUDE_PATH . 'console' . DS . 'templates' . DS . 'skel';
+		$path = LIBS . 'console' . DS . 'templates' . DS . 'skel';
 		$Folder = new Folder($path);
 
 		$subdir = 'test_folder_new';
@@ -315,42 +316,41 @@ class FolderTest extends CakeTestCase {
 		$Folder = new Folder();
 		$expected = array(
 			array(
-				TEST_CAKE_CORE_INCLUDE_PATH . 'config',
-				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode',
-				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding'
+				LIBS . 'config',
+				LIBS . 'config' . DS . 'unicode',
+				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding'
 			),
 			array(
-				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'config.php',
-				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'paths.php',
-				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0080_00ff.php',
-				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0100_017f.php',
-				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0180_024F.php',
-				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0250_02af.php',
-				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0370_03ff.php',
-				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0400_04ff.php',
-				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0500_052f.php',
-				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0530_058f.php',
-				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '1e00_1eff.php',
-				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '1f00_1fff.php',
-				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2100_214f.php',
-				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2150_218f.php',
-				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2460_24ff.php',
-				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2c00_2c5f.php',
-				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2c60_2c7f.php',
-				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2c80_2cff.php',
-				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . 'ff00_ffef.php'
+				LIBS . 'config' . DS . 'config.php',
+				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0080_00ff.php',
+				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0100_017f.php',
+				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0180_024F.php',
+				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0250_02af.php',
+				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0370_03ff.php',
+				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0400_04ff.php',
+				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0500_052f.php',
+				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0530_058f.php',
+				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '1e00_1eff.php',
+				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '1f00_1fff.php',
+				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2100_214f.php',
+				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2150_218f.php',
+				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2460_24ff.php',
+				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2c00_2c5f.php',
+				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2c60_2c7f.php',
+				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2c80_2cff.php',
+				LIBS . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . 'ff00_ffef.php'
 			)
 		);
 
-		$result = $Folder->tree(TEST_CAKE_CORE_INCLUDE_PATH . 'config', false);
+		$result = $Folder->tree(LIBS . 'config', false);
 		$this->assertIdentical(array_diff($expected[0], $result[0]), array());
 		$this->assertIdentical(array_diff($result[0], $expected[0]), array());
 
-		$result = $Folder->tree(TEST_CAKE_CORE_INCLUDE_PATH . 'config', false, 'dir');
+		$result = $Folder->tree(LIBS . 'config', false, 'dir');
 		$this->assertIdentical(array_diff($expected[0], $result), array());
 		$this->assertIdentical(array_diff($result, $expected[0]), array());
 
-		$result = $Folder->tree(TEST_CAKE_CORE_INCLUDE_PATH . 'config', false, 'files');
+		$result = $Folder->tree(LIBS . 'config', false, 'files');
 		$this->assertIdentical(array_diff($expected[1], $result), array());
 		$this->assertIdentical(array_diff($result, $expected[1]), array());
 	}
@@ -472,9 +472,8 @@ class FolderTest extends CakeTestCase {
 		$result = $Folder->inCakePath($path);
 		$this->assertFalse($result);
 
-		// WHY DOES THIS FAIL ??
-		$path = DS . 'cake' . DS . 'config';
-		$Folder->cd(ROOT . DS . 'cake' . DS . 'config');
+		$path = DS . 'lib' . DS . 'Cake' . DS . 'config';
+		$Folder->cd(ROOT . DS . 'lib' . DS . 'Cake' . DS . 'config');
 		$result = $Folder->inCakePath($path);
 		$this->assertTrue($result);
 	}
@@ -487,31 +486,31 @@ class FolderTest extends CakeTestCase {
  */
 	function testFind() {
 		$Folder = new Folder();
-		$Folder->cd(TEST_CAKE_CORE_INCLUDE_PATH . 'config');
+		$Folder->cd(LIBS . 'config');
 		$result = $Folder->find();
-		$expected = array('config.php', 'paths.php');
+		$expected = array('config.php');
 		$this->assertIdentical(array_diff($expected, $result), array());
 		$this->assertIdentical(array_diff($result, $expected), array());
 
 		$result = $Folder->find('.*', true);
-		$expected = array('config.php', 'paths.php');
+		$expected = array('config.php');
 		$this->assertIdentical($result, $expected);
 
 		$result = $Folder->find('.*\.php');
-		$expected = array('config.php', 'paths.php');
+		$expected = array('config.php');
 		$this->assertIdentical(array_diff($expected, $result), array());
 		$this->assertIdentical(array_diff($result, $expected), array());
 
 		$result = $Folder->find('.*\.php', true);
-		$expected = array('config.php', 'paths.php');
+		$expected = array('config.php');
 		$this->assertIdentical($result, $expected);
 
 		$result = $Folder->find('.*ig\.php');
 		$expected = array('config.php');
 		$this->assertIdentical($result, $expected);
 
-		$result = $Folder->find('paths\.php');
-		$expected = array('paths.php');
+		$result = $Folder->find('config\.php');
+		$expected = array('config.php');
 		$this->assertIdentical($result, $expected);
 
 		$Folder->cd(TMP);
@@ -540,19 +539,17 @@ class FolderTest extends CakeTestCase {
  */
 	function testFindRecursive() {
 		$Folder = new Folder();
-		$Folder->cd(TEST_CAKE_CORE_INCLUDE_PATH);
+		$Folder->cd(LIBS);
 		$result = $Folder->findRecursive('(config|paths)\.php');
 		$expected = array(
-			TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'config.php',
-			TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'paths.php'
+			LIBS . 'config' . DS . 'config.php'
 		);
 		$this->assertIdentical(array_diff($expected, $result), array());
 		$this->assertIdentical(array_diff($result, $expected), array());
 
 		$result = $Folder->findRecursive('(config|paths)\.php', true);
 		$expected = array(
-			TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'config.php',
-			TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'paths.php'
+			LIBS . 'config' . DS . 'config.php'
 		);
 		$this->assertIdentical($result, $expected);
 
@@ -586,7 +583,7 @@ class FolderTest extends CakeTestCase {
 		);
 		$this->assertIdentical($result, $expected);
 
-		$Folder->cd(TEST_CAKE_CORE_INCLUDE_PATH . 'config');
+		$Folder->cd(LIBS . 'config');
 		$Folder->cd(TMP);
 		$Folder->delete($Folder->pwd() . DS . 'testme');
 		$File->delete();
diff --git a/cake/tests/cases/libs/inflector.test.php b/lib/Cake/tests/Case/Utility/InflectorTest.php
similarity index 99%
rename from cake/tests/cases/libs/inflector.test.php
rename to lib/Cake/tests/Case/Utility/InflectorTest.php
index a85453ace..e2b301e1b 100644
--- a/cake/tests/cases/libs/inflector.test.php
+++ b/lib/Cake/tests/Case/Utility/InflectorTest.php
@@ -24,7 +24,7 @@
  * Included libraries.
  *
  */
-App::import('Core', 'Inflector');
+App::uses('Inflector', 'Utility');
 
 /**
  * Short description for class.
diff --git a/cake/tests/cases/libs/object_collection.test.php b/lib/Cake/tests/Case/Utility/ObjectCollectionTest.php
similarity index 99%
rename from cake/tests/cases/libs/object_collection.test.php
rename to lib/Cake/tests/Case/Utility/ObjectCollectionTest.php
index e3a0f82ca..cdbab3bc0 100644
--- a/cake/tests/cases/libs/object_collection.test.php
+++ b/lib/Cake/tests/Case/Utility/ObjectCollectionTest.php
@@ -17,7 +17,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::import('Core', 'ObjectCollection');
+App::uses('ObjectCollection', 'Utility');
 
 /**
  * A generic object class
diff --git a/cake/tests/cases/libs/sanitize.test.php b/lib/Cake/tests/Case/Utility/SanitizeTest.php
similarity index 99%
rename from cake/tests/cases/libs/sanitize.test.php
rename to lib/Cake/tests/Case/Utility/SanitizeTest.php
index c3f420782..3bff7768d 100644
--- a/cake/tests/cases/libs/sanitize.test.php
+++ b/lib/Cake/tests/Case/Utility/SanitizeTest.php
@@ -16,7 +16,7 @@
  * @since         CakePHP(tm) v 1.2.0.5428
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'Sanitize');
+App::uses('Sanitize', 'Utility');
 
 /**
  * DataTest class
diff --git a/cake/tests/cases/libs/security.test.php b/lib/Cake/tests/Case/Utility/SecurityTest.php
similarity index 99%
rename from cake/tests/cases/libs/security.test.php
rename to lib/Cake/tests/Case/Utility/SecurityTest.php
index a1c7a18af..944cc7f37 100644
--- a/cake/tests/cases/libs/security.test.php
+++ b/lib/Cake/tests/Case/Utility/SecurityTest.php
@@ -16,7 +16,7 @@
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'Security');
+App::uses('Security', 'Utility');
 
 /**
  * SecurityTest class
diff --git a/cake/tests/cases/libs/set.test.php b/lib/Cake/tests/Case/Utility/SetTest.php
similarity index 99%
rename from cake/tests/cases/libs/set.test.php
rename to lib/Cake/tests/Case/Utility/SetTest.php
index b974bfe3d..59b83bf0a 100644
--- a/cake/tests/cases/libs/set.test.php
+++ b/lib/Cake/tests/Case/Utility/SetTest.php
@@ -16,7 +16,8 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'Set');
+App::uses('Set', 'Utility');
+App::uses('Model', 'Model');
 
 /**
  * SetTest class
@@ -2737,7 +2738,7 @@ class SetTest extends CakeTestCase {
  * @return void
  */
 	function testXmlSetReverse() {
-		App::import('Core', 'Xml');
+		App::uses('Xml', 'Utility');
 
 		$string = '
 		
diff --git a/cake/tests/cases/libs/string.test.php b/lib/Cake/tests/Case/Utility/StringTest.php
similarity index 99%
rename from cake/tests/cases/libs/string.test.php
rename to lib/Cake/tests/Case/Utility/StringTest.php
index 124e252d7..4c7da882e 100644
--- a/cake/tests/cases/libs/string.test.php
+++ b/lib/Cake/tests/Case/Utility/StringTest.php
@@ -16,7 +16,7 @@
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'String');
+App::uses('String', 'Utility');
 
 /**
  * StringTest class
diff --git a/cake/tests/cases/libs/validation.test.php b/lib/Cake/tests/Case/Utility/ValidationTest.php
similarity index 99%
rename from cake/tests/cases/libs/validation.test.php
rename to lib/Cake/tests/Case/Utility/ValidationTest.php
index 2766823b9..60b6dc1a2 100644
--- a/cake/tests/cases/libs/validation.test.php
+++ b/lib/Cake/tests/Case/Utility/ValidationTest.php
@@ -16,7 +16,7 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'Validation');
+App::uses('Validation', 'Utility');
 
 /**
  * CustomValidator class
diff --git a/cake/tests/cases/libs/xml.test.php b/lib/Cake/tests/Case/Utility/XmlTest.php
similarity index 97%
rename from cake/tests/cases/libs/xml.test.php
rename to lib/Cake/tests/Case/Utility/XmlTest.php
index 169c38933..ccc71f07e 100644
--- a/cake/tests/cases/libs/xml.test.php
+++ b/lib/Cake/tests/Case/Utility/XmlTest.php
@@ -16,7 +16,8 @@
  * @since         CakePHP(tm) v 1.2.0.5432
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'Xml');
+App::uses('Xml', 'Utility');
+App::uses('CakeTestModel', 'TestSuite/Fixture');
 
 /**
  * Article class
@@ -132,7 +133,7 @@ class XmlTest extends CakeTestCase {
 		$this->assertEqual($obj->firstChild->nodeName, 'tag');
 		$this->assertEqual($obj->firstChild->nodeValue, 'value');
 
-		$xml = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'fixtures' . DS . 'sample.xml';
+		$xml = LIBS . 'tests' . DS . 'Fixture' . DS . 'sample.xml';
 		$obj = Xml::build($xml);
 		$this->assertEqual($obj->getName(), 'tags');
 		$this->assertEqual(count($obj), 2);
@@ -373,7 +374,7 @@ class XmlTest extends CakeTestCase {
 		$obj = Xml::build($xml);
 		$this->assertEqual(Xml::toArray($obj), array('tag' => 'name'));
 
-		$xml = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'fixtures' . DS . 'sample.xml';
+		$xml = LIBS . 'tests' . DS . 'Fixture' . DS . 'sample.xml';
 		$obj = Xml::build($xml);
 		$expected = array(
 			'tags' => array(
@@ -515,7 +516,7 @@ class XmlTest extends CakeTestCase {
  * @return void
  */
 	public function testRss() {
-		$rss = file_get_contents(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'fixtures' . DS . 'rss.xml');
+		$rss = file_get_contents(LIBS . 'tests' . DS . 'Fixture' . DS . 'rss.xml');
 		$rssAsArray = Xml::toArray(Xml::build($rss));
 		$this->assertEqual($rssAsArray['rss']['@version'], '2.0');
 		$this->assertEqual(count($rssAsArray['rss']['channel']['item']), 2);
@@ -646,7 +647,7 @@ class XmlTest extends CakeTestCase {
  * @return void
  */
 	public function testSoap() {
-		$xmlRequest = Xml::build(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'fixtures' . DS . 'soap_request.xml');
+		$xmlRequest = Xml::build(LIBS . 'tests' . DS . 'Fixture' . DS . 'soap_request.xml');
 		$expected = array(
 			'Envelope' => array(
 				'@soap:encodingStyle' => 'http://www.w3.org/2001/12/soap-encoding',
@@ -659,7 +660,7 @@ class XmlTest extends CakeTestCase {
 		);
 		$this->assertEqual(Xml::toArray($xmlRequest), $expected);
 
-		$xmlResponse = Xml::build(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'fixtures' . DS . 'soap_response.xml');
+		$xmlResponse = Xml::build(LIBS . 'tests' . DS . 'Fixture' . DS . 'soap_response.xml');
 		$expected = array(
 			'Envelope' => array(
 				'@soap:encodingStyle' => 'http://www.w3.org/2001/12/soap-encoding',
diff --git a/cake/tests/cases/libs/view/helpers/cache.test.php b/lib/Cake/tests/Case/View/Helper/CacheHelperTest.php
similarity index 98%
rename from cake/tests/cases/libs/view/helpers/cache.test.php
rename to lib/Cake/tests/Case/View/Helper/CacheHelperTest.php
index ec8d8b068..cdecdee04 100644
--- a/cake/tests/cases/libs/view/helpers/cache.test.php
+++ b/lib/Cake/tests/Case/View/Helper/CacheHelperTest.php
@@ -16,8 +16,11 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', array('Controller', 'Model', 'View'));
-App::import('Helper', 'Cache');
+
+App::uses('Controller', 'Controller');
+App::uses('Model', 'Model');
+App::uses('View', 'View');
+App::uses('CacheHelper', 'View/Helper');
 
 /**
  * CacheTestController class
@@ -80,7 +83,7 @@ class CacheHelperTest extends CakeTestCase {
 		Configure::write('Cache.check', true);
 		Configure::write('Cache.disable', false);
 		App::build(array(
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		), true);
 	}
 
diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/lib/Cake/tests/Case/View/Helper/FormHelperTest.php
similarity index 99%
rename from cake/tests/cases/libs/view/helpers/form.test.php
rename to lib/Cake/tests/Case/View/Helper/FormHelperTest.php
index e5def54f1..ce553c3a3 100644
--- a/cake/tests/cases/libs/view/helpers/form.test.php
+++ b/lib/Cake/tests/Case/View/Helper/FormHelperTest.php
@@ -16,9 +16,15 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', array('ClassRegistry', 'Controller', 'View', 'Model', 'Security', 'CakeRequest'));
-App::import('Helper', 'Html');
-App::import('Helper', 'Form');
+App::uses('ClassRegistry', 'Utility');
+App::uses('Controller', 'Controller');
+App::uses('View', 'View');
+App::uses('Model', 'Model');
+App::uses('Security', 'Utility');
+App::uses('CakeRequest', 'Network');
+App::uses('HtmlHelper', 'View/Helper');
+App::uses('FormHelper', 'View/Helper');
+App::uses('Router', 'Routing');
 
 /**
  * ContactTestController class
diff --git a/cake/tests/cases/libs/view/helpers/html.test.php b/lib/Cake/tests/Case/View/Helper/HtmlHelperTest.php
similarity index 98%
rename from cake/tests/cases/libs/view/helpers/html.test.php
rename to lib/Cake/tests/Case/View/Helper/HtmlHelperTest.php
index b65e276ad..9fd4c390c 100644
--- a/cake/tests/cases/libs/view/helpers/html.test.php
+++ b/lib/Cake/tests/Case/View/Helper/HtmlHelperTest.php
@@ -16,8 +16,13 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', array('Helper', 'AppHelper', 'ClassRegistry', 'Controller'));
-App::import('Helper', array('Html', 'Form'));
+
+App::uses('Helper', 'View');
+App::uses('AppHelper', 'View/Helper');
+App::uses('ClassRegistry', 'Utility');
+App::uses('Controller', 'Controller');
+App::uses('HtmlHelper', 'View/Helper');
+App::uses('FomrHelper', 'View/Helper');
 
 if (!defined('FULL_BASE_URL')) {
 	define('FULL_BASE_URL', 'http://cakephp.org');
@@ -369,13 +374,13 @@ class HtmlHelperTest extends CakeTestCase {
 		if ($this->skipIf(!is_writable(WWW_ROOT . 'theme'), 'Cannot write to webroot/theme')) {
 			return;
 		}
-		App::import('Core', 'File');
+		App::uses('File', 'Utility');
 
 		$testfile = WWW_ROOT . 'theme' . DS . 'test_theme' . DS . 'img' . DS . '__cake_test_image.gif';
 		$file = new File($testfile, true);
 
 		App::build(array(
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS)
 		));
 		Configure::write('Asset.timestamp', true);
 		Configure::write('debug', 1);
@@ -410,10 +415,10 @@ class HtmlHelperTest extends CakeTestCase {
  */
 	function testThemeAssetsInMainWebrootPath() {
 		App::build(array(
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS)
 		));
 		$webRoot = Configure::read('App.www_root');
-		Configure::write('App.www_root', TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'webroot' . DS);
+		Configure::write('App.www_root', LIBS . 'tests' . DS . 'test_app' . DS . 'webroot' . DS);
 
 		$this->Html->theme = 'test_theme';
 		$result = $this->Html->css('webroot_test');
@@ -650,13 +655,13 @@ class HtmlHelperTest extends CakeTestCase {
 		if ($this->skipIf(!is_writable(WWW_ROOT . 'theme'), 'Cannot write to webroot/theme')) {
 			return;
 		}
-		App::import('Core', 'File');
+		App::uses('File', 'Utility');
 
 		$testfile = WWW_ROOT . 'theme' . DS . 'test_theme' . DS . 'js' . DS . '__test_js.js';
 		$file = new File($testfile, true);
 
 		App::build(array(
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS)
 		));
 
 		$this->Html->webroot = '/';
@@ -1377,7 +1382,7 @@ class HtmlHelperTest extends CakeTestCase {
  */
 
 	public function testLoadConfig() {
-		$path = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'config'. DS;
+		$path = LIBS . 'tests' . DS . 'test_app' . DS . 'config'. DS;
 
 		$result = $this->Html->loadConfig('htmlhelper_tags', $path);
 		$expected = array(
@@ -1417,7 +1422,7 @@ class HtmlHelperTest extends CakeTestCase {
  * @expectedException ConfigureException
  */
 	public function testLoadConfigWrongReader() {
-		$path = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'config'. DS;
+		$path = LIBS . 'tests' . DS . 'test_app' . DS . 'config'. DS;
 		$result = $this->Html->loadConfig(array('htmlhelper_tags', 'wrong_reader'), $path);
 	}
 
diff --git a/cake/tests/cases/libs/view/helpers/jquery_engine.test.php b/lib/Cake/tests/Case/View/Helper/JqueryEngineHelperTest.php
similarity index 98%
rename from cake/tests/cases/libs/view/helpers/jquery_engine.test.php
rename to lib/Cake/tests/Case/View/Helper/JqueryEngineHelperTest.php
index 784c81f2f..970836230 100644
--- a/cake/tests/cases/libs/view/helpers/jquery_engine.test.php
+++ b/lib/Cake/tests/Case/View/Helper/JqueryEngineHelperTest.php
@@ -18,8 +18,11 @@
  * @package         cake.tests.cases.views.helpers
  * @license         MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Helper', array('Html', 'Js', 'JqueryEngine'));
-App::import('Core', 'View');
+
+App::uses('HtmlHelper', 'View/Helper');
+App::uses('JsHelper', 'View/Helper');
+App::uses('JqueryEngineHelper', 'View/Helper');
+App::uses('View', 'View');
 
 class JqueryEngineHelperTest extends CakeTestCase {
 /**
diff --git a/cake/tests/cases/libs/view/helpers/js.test.php b/lib/Cake/tests/Case/View/Helper/JsHelperTest.php
similarity index 99%
rename from cake/tests/cases/libs/view/helpers/js.test.php
rename to lib/Cake/tests/Case/View/Helper/JsHelperTest.php
index f4f39408e..69d946054 100644
--- a/cake/tests/cases/libs/view/helpers/js.test.php
+++ b/lib/Cake/tests/Case/View/Helper/JsHelperTest.php
@@ -18,8 +18,12 @@
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Helper', array('Js', 'Html', 'Form'));
-App::import('Core', array('View', 'ClassRegistry'));
+App::uses('HtmlHelper', 'View/Helper');
+App::uses('JsHelper', 'View/Helper');
+App::uses('JsBaseEngineHelper', 'View/Helper');
+App::uses('FormHelper', 'View/Helper');
+App::uses('View', 'View');
+App::uses('ClassRegistry', 'Utility');
 
 class OptionEngineHelper extends JsBaseEngineHelper {
 	protected $_optionMap = array(
diff --git a/cake/tests/cases/libs/view/helpers/mootools_engine.test.php b/lib/Cake/tests/Case/View/Helper/MootoolsEngineHelperTest.php
similarity index 98%
rename from cake/tests/cases/libs/view/helpers/mootools_engine.test.php
rename to lib/Cake/tests/Case/View/Helper/MootoolsEngineHelperTest.php
index a708a72bd..d3cf5ac35 100644
--- a/cake/tests/cases/libs/view/helpers/mootools_engine.test.php
+++ b/lib/Cake/tests/Case/View/Helper/MootoolsEngineHelperTest.php
@@ -20,7 +20,11 @@
  * @package         cake.tests.cases.views.helpers
  * @license         MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Helper', array('Html', 'Js', 'MootoolsEngine'));
+
+App::uses('View', 'View');
+App::uses('HtmlHelper', 'View/Helper');
+App::uses('JsHelper', 'View/Helper');
+App::uses('MootoolsEngineHelper', 'View/Helper');
 
 class MooEngineHelperTest extends CakeTestCase {
 /**
diff --git a/cake/tests/cases/libs/view/helpers/number.test.php b/lib/Cake/tests/Case/View/Helper/NumberHelperTest.php
similarity index 99%
rename from cake/tests/cases/libs/view/helpers/number.test.php
rename to lib/Cake/tests/Case/View/Helper/NumberHelperTest.php
index 8bbd1eea6..12b220cc1 100644
--- a/cake/tests/cases/libs/view/helpers/number.test.php
+++ b/lib/Cake/tests/Case/View/Helper/NumberHelperTest.php
@@ -16,8 +16,9 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Helper', 'Number');
-App::import('View', 'View');
+
+App::uses('View', 'View');
+App::uses('NumberHelper', 'View/Helper');
 
 /**
  * NumberHelperTest class
diff --git a/cake/tests/cases/libs/view/helpers/paginator.test.php b/lib/Cake/tests/Case/View/Helper/PaginatorHelperTest.php
old mode 100755
new mode 100644
similarity index 99%
rename from cake/tests/cases/libs/view/helpers/paginator.test.php
rename to lib/Cake/tests/Case/View/Helper/PaginatorHelperTest.php
index d3115cc98..37c6a279c
--- a/cake/tests/cases/libs/view/helpers/paginator.test.php
+++ b/lib/Cake/tests/Case/View/Helper/PaginatorHelperTest.php
@@ -16,8 +16,11 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'View');
-App::import('Helper', array('Html', 'Paginator', 'Form', 'Js'));
+App::uses('View', 'View');
+App::uses('HtmlHelper', 'View/Helper');
+App::uses('JsHelper', 'View/Helper');
+App::uses('PaginatorHelper', 'View/Helper');
+App::uses('FormHelper', 'View/Helper');
 
 if (!defined('FULL_BASE_URL')) {
 	define('FULL_BASE_URL', 'http://cakephp.org');
diff --git a/cake/tests/cases/libs/view/helpers/prototype_engine.test.php b/lib/Cake/tests/Case/View/Helper/PrototypeEngineHelperTest.php
similarity index 98%
rename from cake/tests/cases/libs/view/helpers/prototype_engine.test.php
rename to lib/Cake/tests/Case/View/Helper/PrototypeEngineHelperTest.php
index b13da21fd..90b6462d6 100644
--- a/cake/tests/cases/libs/view/helpers/prototype_engine.test.php
+++ b/lib/Cake/tests/Case/View/Helper/PrototypeEngineHelperTest.php
@@ -18,7 +18,11 @@
  * @package         cake.tests.cases.views.helpers
  * @license         MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Helper', array('Html', 'Js', 'PrototypeEngine'));
+
+App::uses('View', 'View');
+App::uses('HtmlHelper', 'View/Helper');
+App::uses('JsHelper', 'View/Helper');
+App::uses('PrototypeEngineHelper', 'View/Helper');
 
 class PrototypeEngineHelperTest extends CakeTestCase {
 /**
diff --git a/cake/tests/cases/libs/view/helpers/rss.test.php b/lib/Cake/tests/Case/View/Helper/RssHelperTest.php
similarity index 99%
rename from cake/tests/cases/libs/view/helpers/rss.test.php
rename to lib/Cake/tests/Case/View/Helper/RssHelperTest.php
index 93c344d67..1a4ba25e0 100644
--- a/cake/tests/cases/libs/view/helpers/rss.test.php
+++ b/lib/Cake/tests/Case/View/Helper/RssHelperTest.php
@@ -16,8 +16,9 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('View', 'View');
-App::import('Helper', array('Rss', 'Time'));
+App::uses('View', 'View');
+App::uses('RssHelper', 'View/Helper');
+App::uses('TimeHelper', 'View/Helper');
 
 /**
  * RssHelperTest class
diff --git a/cake/tests/cases/libs/view/helpers/session.test.php b/lib/Cake/tests/Case/View/Helper/SessionHelperTest.php
similarity index 94%
rename from cake/tests/cases/libs/view/helpers/session.test.php
rename to lib/Cake/tests/Case/View/Helper/SessionHelperTest.php
index a282d0a5c..60ee8653d 100644
--- a/cake/tests/cases/libs/view/helpers/session.test.php
+++ b/lib/Cake/tests/Case/View/Helper/SessionHelperTest.php
@@ -16,8 +16,10 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', array('Controller', 'View'));
-App::import('Helper', array('Session'));
+
+App::uses('Controller', 'Controller');
+App::uses('View', 'View');
+App::uses('SessionHelper', 'View/Helper');
 
 /**
  * SessionHelperTest class
@@ -37,6 +39,7 @@ class SessionHelperTest extends CakeTestCase {
 		$controller = null;
 		$this->View = new View($controller);
 		$this->Session = new SessionHelper($this->View);
+		CakeSession::start();
 
 		if (!CakeSession::started()) {
 			CakeSession::start();
@@ -129,7 +132,7 @@ class SessionHelperTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		App::build(array(
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		));
 		$result = $this->Session->flash('notification');
 		$result = str_replace("\r\n", "\n", $result);
@@ -162,7 +165,7 @@ class SessionHelperTest extends CakeTestCase {
  */
 	function testFlashElementInAttrs() {
 		App::build(array(
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'views'. DS)
 		));
 		$result = $this->Session->flash('flash', array(
 			'element' => 'session_helper', 
diff --git a/cake/tests/cases/libs/view/helpers/text.test.php b/lib/Cake/tests/Case/View/Helper/TextHelperTest.php
similarity index 99%
rename from cake/tests/cases/libs/view/helpers/text.test.php
rename to lib/Cake/tests/Case/View/Helper/TextHelperTest.php
index f02549044..7b64a2de2 100644
--- a/cake/tests/cases/libs/view/helpers/text.test.php
+++ b/lib/Cake/tests/Case/View/Helper/TextHelperTest.php
@@ -16,8 +16,9 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', 'View');
-App::import('Helper', 'Text');
+
+App::uses('View', 'View');
+App::uses('TextHelper', 'View/Helper');
 
 /**
  * TextHelperTest class
diff --git a/cake/tests/cases/libs/view/helpers/time.test.php b/lib/Cake/tests/Case/View/Helper/TimeHelperTest.php
similarity index 99%
rename from cake/tests/cases/libs/view/helpers/time.test.php
rename to lib/Cake/tests/Case/View/Helper/TimeHelperTest.php
index b76527c0d..08bacf297 100644
--- a/cake/tests/cases/libs/view/helpers/time.test.php
+++ b/lib/Cake/tests/Case/View/Helper/TimeHelperTest.php
@@ -16,8 +16,8 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Helper', 'Time');
-App::import('Core', 'View');
+App::uses('TimeHelper', 'View/Helper');
+App::uses('View', 'View');
 
 /**
  * TimeHelperTest class
@@ -656,7 +656,7 @@ class TimeHelperTest extends CakeTestCase {
  */
 	function testConvertSpecifiers() {
 		App::build(array(
-			'locales' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale' . DS)
+			'locales' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'locale' . DS)
 		), true);
 		Configure::write('Config.language', 'time_test');
 		$time = strtotime('Thu Jan 14 11:43:39 2010');
@@ -765,7 +765,7 @@ class TimeHelperTest extends CakeTestCase {
  */
 	function testI18nFormat() {
 		App::build(array(
-			'locales' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale' . DS)
+			'locales' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'locale' . DS)
 		), true);
 		Configure::write('Config.language', 'time_test');
 		$time = strtotime('Thu Jan 14 13:59:28 2010');
diff --git a/cake/tests/cases/libs/view/helper_collection.test.php b/lib/Cake/tests/Case/View/HelperCollectionTest.php
similarity index 91%
rename from cake/tests/cases/libs/view/helper_collection.test.php
rename to lib/Cake/tests/Case/View/HelperCollectionTest.php
index 894f9d24a..a98fa88e2 100644
--- a/cake/tests/cases/libs/view/helper_collection.test.php
+++ b/lib/Cake/tests/Case/View/HelperCollectionTest.php
@@ -17,13 +17,13 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
-App::import('Core', 'HelperCollection');
-App::import('View', 'View');
+App::uses('HelperCollection', 'View');
+App::uses('HtmlHelper', 'View/Helper');
+App::uses('View', 'View');
 
 /**
  * Extended HtmlHelper
  */
-App::import('Helper', 'Html');
 class HtmlAliasHelper extends HtmlHelper {
 }
 
@@ -81,7 +81,7 @@ class HelperCollectionTest extends CakeTestCase {
 		$result = $this->Helpers->load('Html');
 		$this->assertInstanceOf('HtmlAliasHelper', $result);
 
-		App::build(array('plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)));
+		App::build(array('plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)));
 		$result = $this->Helpers->load('SomeOther', array('className' => 'TestPlugin.OtherHelper'));
 		$this->assertInstanceOf('OtherHelperHelper', $result);
 		$this->assertInstanceOf('OtherHelperHelper', $this->Helpers->SomeOther);
@@ -107,7 +107,7 @@ class HelperCollectionTest extends CakeTestCase {
 /**
  * test missinghelper exception
  *
- * @expectedException MissingHelperFileException
+ * @expectedException MissingHelperClassException
  * @return void
  */
 	function testLoadMissingHelperFile() {
@@ -121,7 +121,7 @@ class HelperCollectionTest extends CakeTestCase {
  */
 	function testLoadPluginHelper() {
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
 		));
 		$result = $this->Helpers->load('TestPlugin.OtherHelper');
 		$this->assertInstanceOf('OtherHelperHelper', $result, 'Helper class is wrong.');
diff --git a/cake/tests/cases/libs/view/helper.test.php b/lib/Cake/tests/Case/View/HelperTest.php
similarity index 98%
rename from cake/tests/cases/libs/view/helper.test.php
rename to lib/Cake/tests/Case/View/HelperTest.php
index 125e00ac1..641a32828 100644
--- a/cake/tests/cases/libs/view/helper.test.php
+++ b/lib/Cake/tests/Case/View/HelperTest.php
@@ -16,7 +16,11 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', array('View', 'Helper', 'Router'));
+
+App::uses('View', 'View');
+App::uses('Helper', 'View');
+App::uses('Model', 'Model');
+App::uses('Router', 'Routing');
 
 /**
  * HelperTestPost class
@@ -513,8 +517,8 @@ class HelperTest extends CakeTestCase {
 		$_timestamp = Configure::read('Asset.timestamp');
 		Configure::write('Asset.timestamp', 'force');
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS),
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS),
 		));
 
 		$result = $this->Helper->assetTimestamp('/test_plugin/css/test_plugin_asset.css');
@@ -753,7 +757,7 @@ class HelperTest extends CakeTestCase {
 		$this->Helper->theme = 'test_theme';
 
 		App::build(array(
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		));
 
 		$result = $this->Helper->webroot('/img/cake.power.gif');
@@ -765,7 +769,7 @@ class HelperTest extends CakeTestCase {
 		$this->assertEqual($result, $expected);
 
 		$webRoot = Configure::read('App.www_root');
-		Configure::write('App.www_root', TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'webroot' . DS);
+		Configure::write('App.www_root', LIBS . 'tests' . DS . 'test_app' . DS . 'webroot' . DS);
 
 		$result = $this->Helper->webroot('/img/cake.power.gif');
 		$expected = '/theme/test_theme/img/cake.power.gif';
@@ -793,7 +797,7 @@ class HelperTest extends CakeTestCase {
  */
 	function testLazyLoadingHelpers() {
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),	
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),	
 		));
 		$Helper = new TestHelper($this->View);
 		$this->assertInstanceOf('OtherHelperHelper', $Helper->OtherHelper);
diff --git a/cake/tests/cases/libs/view/media.test.php b/lib/Cake/tests/Case/View/MediaViewTest.php
similarity index 92%
rename from cake/tests/cases/libs/view/media.test.php
rename to lib/Cake/tests/Case/View/MediaViewTest.php
index fac9b4beb..242ec16ea 100644
--- a/cake/tests/cases/libs/view/media.test.php
+++ b/lib/Cake/tests/Case/View/MediaViewTest.php
@@ -16,7 +16,10 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', array('Media', 'Controller', 'CakeResponse'));
+
+App::uses('Controller', 'Controller');
+App::uses('MediaView', 'View');
+App::uses('CakeResponse', 'Network');
 
 /**
  * MediaViewTest class
@@ -69,7 +72,7 @@ class MediaViewTest extends CakeTestCase {
  */
 	function testRender() {
 		$this->MediaView->viewVars = array(
-			'path' =>  TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'vendors' . DS .'css' . DS,
+			'path' =>  LIBS . 'tests' . DS . 'test_app' . DS . 'vendors' . DS .'css' . DS,
 			'id' => 'test_asset.css',
 			'extension' => 'css',
 		);
@@ -115,7 +118,7 @@ class MediaViewTest extends CakeTestCase {
  */
 	function testRenderWithUnknownFileType() {
 		$this->MediaView->viewVars = array(
-			'path' =>  TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'config' . DS,
+			'path' =>  LIBS . 'tests' . DS . 'test_app' . DS . 'config' . DS,
 			'id' => 'no_section.ini',
 			'extension' => 'ini',
 		);
@@ -170,7 +173,7 @@ class MediaViewTest extends CakeTestCase {
  */
 	function testConnectionAborted() {
 		$this->MediaView->viewVars = array(
-			'path' =>  TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'vendors' . DS .'css' . DS,
+			'path' =>  LIBS . 'tests' . DS . 'test_app' . DS . 'vendors' . DS .'css' . DS,
 			'id' => 'test_asset.css',
 			'extension' => 'css',
 		);
@@ -194,7 +197,7 @@ class MediaViewTest extends CakeTestCase {
  */
 	function testConnectionAbortedOnBuffering() {
 		$this->MediaView->viewVars = array(
-			'path' =>  TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'vendors' . DS .'css' . DS,
+			'path' =>  LIBS . 'tests' . DS . 'test_app' . DS . 'vendors' . DS .'css' . DS,
 			'id' => 'test_asset.css',
 			'extension' => 'css',
 		);
diff --git a/cake/tests/cases/libs/view/theme.test.php b/lib/Cake/tests/Case/View/ThemeViewTest.php
similarity index 79%
rename from cake/tests/cases/libs/view/theme.test.php
rename to lib/Cake/tests/Case/View/ThemeViewTest.php
index dc03b6663..455f9ae86 100644
--- a/cake/tests/cases/libs/view/theme.test.php
+++ b/lib/Cake/tests/Case/View/ThemeViewTest.php
@@ -16,9 +16,9 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('View', 'View');
-App::import('View', 'Theme');
-App::import('Core', 'Controller');
+App::uses('View', 'View');
+App::uses('ThemeView', 'View');
+App::uses('Controller', 'Controller');
 
 
 /**
@@ -117,8 +117,8 @@ class ThemeViewTest extends CakeTestCase {
 		$this->PostsController->index();
 		$this->ThemeView = new ThemeView($this->PostsController);
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		));
 	}
 
@@ -150,15 +150,15 @@ class ThemeViewTest extends CakeTestCase {
 		$this->Controller->theme = 'test_theme';
 
 		$ThemeView = new TestThemeView($this->Controller);
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS . 'plugins' . DS . 'test_plugin' . DS . 'tests' . DS .'index.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'themed' . DS . 'test_theme' . DS . 'plugins' . DS . 'test_plugin' . DS . 'tests' . DS .'index.ctp';
 		$result = $ThemeView->getViewFileName('index');
 		$this->assertEqual($result, $expected);
 
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS . 'plugins' . DS . 'test_plugin' . DS . 'layouts' . DS .'plugin_default.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'themed' . DS . 'test_theme' . DS . 'plugins' . DS . 'test_plugin' . DS . 'layouts' . DS .'plugin_default.ctp';
 		$result = $ThemeView->getLayoutFileName('plugin_default');
 		$this->assertEqual($result, $expected);
 
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS . 'layouts' . DS .'default.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'themed' . DS . 'test_theme' . DS . 'layouts' . DS .'default.ctp';
 		$result = $ThemeView->getLayoutFileName('default');
 		$this->assertEqual($result, $expected);
 	}
@@ -178,25 +178,25 @@ class ThemeViewTest extends CakeTestCase {
 
 		$ThemeView = new TestThemeView($this->Controller);
 		$ThemeView->theme = 'test_theme';
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS .'pages' . DS .'home.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS .'pages' . DS .'home.ctp';
 		$result = $ThemeView->getViewFileName('home');
 		$this->assertEqual($result, $expected);
 
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS . 'posts' . DS .'index.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'themed' . DS . 'test_theme' . DS . 'posts' . DS .'index.ctp';
 		$result = $ThemeView->getViewFileName('/posts/index');
 		$this->assertEqual($result, $expected);
 
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS . 'layouts' . DS .'default.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'themed' . DS . 'test_theme' . DS . 'layouts' . DS .'default.ctp';
 		$result = $ThemeView->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 
 		$ThemeView->layoutPath = 'rss';
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'layouts' . DS . 'rss' . DS . 'default.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'layouts' . DS . 'rss' . DS . 'default.ctp';
 		$result = $ThemeView->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 
 		$ThemeView->layoutPath = 'email' . DS . 'html';
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'layouts' . DS . 'email' . DS . 'html' . DS . 'default.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'layouts' . DS . 'email' . DS . 'html' . DS . 'default.ctp';
 		$result = $ThemeView->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 	}
diff --git a/cake/tests/cases/libs/view/view.test.php b/lib/Cake/tests/Case/View/ViewTest.php
similarity index 91%
rename from cake/tests/cases/libs/view/view.test.php
rename to lib/Cake/tests/Case/View/ViewTest.php
index 3ccd8cce5..60976f772 100644
--- a/cake/tests/cases/libs/view/view.test.php
+++ b/lib/Cake/tests/Case/View/ViewTest.php
@@ -16,9 +16,12 @@
  * @since         CakePHP(tm) v 1.2.0.4206
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-App::import('Core', array('View', 'Controller'));
-App::import('Helper', 'Cache');
-App::import('Core', array('ErrorHandler'));
+
+App::uses('View', 'View');
+App::uses('Helper', 'View');
+App::uses('Controller', 'Controller');
+App::uses('CacheHelper', 'View/Helper');
+App::uses('ErrorHandler', 'Error');
 
 
 /**
@@ -192,10 +195,9 @@ class ViewTest extends CakeTestCase {
 		$this->PostsController->index();
 		$this->View = new View($this->PostsController);
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
-			'views' => array(
-				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS,
-				TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'View' => array(
+				LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS
 			)
 		), true);
 
@@ -229,11 +231,11 @@ class ViewTest extends CakeTestCase {
 
 		$View = new TestView($this->Controller);
 
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS .'test_plugin' . DS . 'views' . DS .'tests' . DS .'index.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS .'test_plugin' . DS . 'View' . DS .'tests' . DS .'index.ctp';
 		$result = $View->getViewFileName('index');
 		$this->assertEqual($result, $expected);
 
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS .'test_plugin' . DS . 'views' . DS . 'layouts' . DS .'default.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS .'test_plugin' . DS . 'View' . DS . 'layouts' . DS .'default.ctp';
 		$result = $View->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 	}
@@ -251,15 +253,18 @@ class ViewTest extends CakeTestCase {
 
 		$View = new TestView($this->Controller);
 		$paths = $View->paths();
-		$this->assertEqual($paths, App::path('views'));
+		$expected = array_merge(App::path('View'), App::core('View'));
+		$this->assertEqual($paths, $expected);
 
 		$paths = $View->paths('test_plugin');
 
 		$expected = array(
-			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'plugins' . DS . 'test_plugin' . DS,
-			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'views' . DS,
-			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS,
-			TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS
+			LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'plugins' . DS . 'test_plugin' . DS,
+			LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'View' . DS,
+			LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'views' . DS,
+			LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'Lib' . DS . 'View' . DS,
+			LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS,
+			LIBS . 'View' . DS
 		);
 		$this->assertEqual($paths, $expected);
 	}
@@ -277,15 +282,15 @@ class ViewTest extends CakeTestCase {
 
 		$View = new TestView($this->Controller);
 		App::build(array(
-			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
-			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+			'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
 		));
 
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS .'test_plugin' . DS . 'views' . DS .'tests' . DS .'index.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS .'test_plugin' . DS . 'View' . DS .'tests' . DS .'index.ctp';
 		$result = $View->getViewFileName('index');
 		$this->assertEqual($result, $expected);
 
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS .'test_plugin' . DS . 'views' . DS . 'layouts' . DS .'default.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS .'test_plugin' . DS . 'View' . DS . 'layouts' . DS .'default.ctp';
 		$result = $View->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 	}
@@ -305,29 +310,29 @@ class ViewTest extends CakeTestCase {
 
 		$View = new TestView($this->Controller);
 
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS .'pages' . DS .'home.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS .'pages' . DS .'home.ctp';
 		$result = $View->getViewFileName('home');
 		$this->assertEqual($result, $expected);
 
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS .'posts' . DS .'index.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS .'posts' . DS .'index.ctp';
 		$result = $View->getViewFileName('/posts/index');
 		$this->assertEqual($result, $expected);
 
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS .'posts' . DS .'index.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS .'posts' . DS .'index.ctp';
 		$result = $View->getViewFileName('../posts/index');
 		$this->assertEqual($result, $expected);
 
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'layouts' . DS .'default.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'layouts' . DS .'default.ctp';
 		$result = $View->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 
 		$View->layoutPath = 'rss';
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'layouts' . DS . 'rss' . DS . 'default.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'layouts' . DS . 'rss' . DS . 'default.ctp';
 		$result = $View->getLayoutFileName();
 		$this->assertEqual($result, $expected);
 
 		$View->layoutPath = 'email' . DS . 'html';
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'layouts' . DS . 'email' . DS . 'html' . DS . 'default.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS . 'layouts' . DS . 'email' . DS . 'html' . DS . 'default.ctp';
 		$result = $View->getLayoutFileName();
 
 		$this->assertEqual($result, $expected);
@@ -753,7 +758,7 @@ class ViewTest extends CakeTestCase {
 		$result = $View->getViewFileName('../themed/test_theme/posts/index');
 		$this->assertPattern('/themed(\/|\\\)test_theme(\/|\\\)posts(\/|\\\)index.ctp/', $result);
 
-		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS .'posts' . DS .'index.ctp';
+		$expected = LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS .'posts' . DS .'index.ctp';
 		$result = $View->getViewFileName('../posts/index');
 		$this->assertEqual($result, $expected);
 
diff --git a/cake/tests/fixtures/account_fixture.php b/lib/Cake/tests/Fixture/AccountFixture.php
similarity index 100%
rename from cake/tests/fixtures/account_fixture.php
rename to lib/Cake/tests/Fixture/AccountFixture.php
diff --git a/cake/tests/fixtures/aco_action_fixture.php b/lib/Cake/tests/Fixture/AcoActionFixture.php
similarity index 100%
rename from cake/tests/fixtures/aco_action_fixture.php
rename to lib/Cake/tests/Fixture/AcoActionFixture.php
diff --git a/cake/tests/fixtures/aco_fixture.php b/lib/Cake/tests/Fixture/AcoFixture.php
similarity index 100%
rename from cake/tests/fixtures/aco_fixture.php
rename to lib/Cake/tests/Fixture/AcoFixture.php
diff --git a/cake/tests/fixtures/aco_two_fixture.php b/lib/Cake/tests/Fixture/AcoTwoFixture.php
similarity index 100%
rename from cake/tests/fixtures/aco_two_fixture.php
rename to lib/Cake/tests/Fixture/AcoTwoFixture.php
diff --git a/cake/tests/fixtures/ad_fixture.php b/lib/Cake/tests/Fixture/AdFixture.php
similarity index 100%
rename from cake/tests/fixtures/ad_fixture.php
rename to lib/Cake/tests/Fixture/AdFixture.php
diff --git a/cake/tests/fixtures/advertisement_fixture.php b/lib/Cake/tests/Fixture/AdvertisementFixture.php
similarity index 100%
rename from cake/tests/fixtures/advertisement_fixture.php
rename to lib/Cake/tests/Fixture/AdvertisementFixture.php
diff --git a/cake/tests/fixtures/after_tree_fixture.php b/lib/Cake/tests/Fixture/AfterTreeFixture.php
similarity index 100%
rename from cake/tests/fixtures/after_tree_fixture.php
rename to lib/Cake/tests/Fixture/AfterTreeFixture.php
diff --git a/cake/tests/fixtures/another_article_fixture.php b/lib/Cake/tests/Fixture/AnotherArticleFixture.php
similarity index 100%
rename from cake/tests/fixtures/another_article_fixture.php
rename to lib/Cake/tests/Fixture/AnotherArticleFixture.php
diff --git a/cake/tests/fixtures/apple_fixture.php b/lib/Cake/tests/Fixture/AppleFixture.php
similarity index 100%
rename from cake/tests/fixtures/apple_fixture.php
rename to lib/Cake/tests/Fixture/AppleFixture.php
diff --git a/cake/tests/fixtures/aro_fixture.php b/lib/Cake/tests/Fixture/AroFixture.php
similarity index 100%
rename from cake/tests/fixtures/aro_fixture.php
rename to lib/Cake/tests/Fixture/AroFixture.php
diff --git a/cake/tests/fixtures/aro_two_fixture.php b/lib/Cake/tests/Fixture/AroTwoFixture.php
similarity index 100%
rename from cake/tests/fixtures/aro_two_fixture.php
rename to lib/Cake/tests/Fixture/AroTwoFixture.php
diff --git a/cake/tests/fixtures/aros_aco_fixture.php b/lib/Cake/tests/Fixture/ArosAcoFixture.php
similarity index 100%
rename from cake/tests/fixtures/aros_aco_fixture.php
rename to lib/Cake/tests/Fixture/ArosAcoFixture.php
diff --git a/cake/tests/fixtures/aros_aco_two_fixture.php b/lib/Cake/tests/Fixture/ArosAcoTwoFixture.php
similarity index 100%
rename from cake/tests/fixtures/aros_aco_two_fixture.php
rename to lib/Cake/tests/Fixture/ArosAcoTwoFixture.php
diff --git a/cake/tests/fixtures/article_featured_fixture.php b/lib/Cake/tests/Fixture/ArticleFeaturedFixture.php
similarity index 100%
rename from cake/tests/fixtures/article_featured_fixture.php
rename to lib/Cake/tests/Fixture/ArticleFeaturedFixture.php
diff --git a/cake/tests/fixtures/article_featureds_tags_fixture.php b/lib/Cake/tests/Fixture/ArticleFeaturedsTagsFixture.php
similarity index 100%
rename from cake/tests/fixtures/article_featureds_tags_fixture.php
rename to lib/Cake/tests/Fixture/ArticleFeaturedsTagsFixture.php
diff --git a/cake/tests/fixtures/article_fixture.php b/lib/Cake/tests/Fixture/ArticleFixture.php
similarity index 100%
rename from cake/tests/fixtures/article_fixture.php
rename to lib/Cake/tests/Fixture/ArticleFixture.php
diff --git a/cake/tests/fixtures/articles_tag_fixture.php b/lib/Cake/tests/Fixture/ArticlesTagFixture.php
similarity index 100%
rename from cake/tests/fixtures/articles_tag_fixture.php
rename to lib/Cake/tests/Fixture/ArticlesTagFixture.php
diff --git a/cake/tests/fixtures/assert_tags_test_case.php b/lib/Cake/tests/Fixture/AssertTagsTestCase.php
similarity index 100%
rename from cake/tests/fixtures/assert_tags_test_case.php
rename to lib/Cake/tests/Fixture/AssertTagsTestCase.php
diff --git a/cake/tests/fixtures/attachment_fixture.php b/lib/Cake/tests/Fixture/AttachmentFixture.php
similarity index 100%
rename from cake/tests/fixtures/attachment_fixture.php
rename to lib/Cake/tests/Fixture/AttachmentFixture.php
diff --git a/cake/tests/fixtures/auth_user_custom_field_fixture.php b/lib/Cake/tests/Fixture/AuthUserCustomFieldFixture.php
similarity index 100%
rename from cake/tests/fixtures/auth_user_custom_field_fixture.php
rename to lib/Cake/tests/Fixture/AuthUserCustomFieldFixture.php
diff --git a/cake/tests/fixtures/auth_user_fixture.php b/lib/Cake/tests/Fixture/AuthUserFixture.php
similarity index 100%
rename from cake/tests/fixtures/auth_user_fixture.php
rename to lib/Cake/tests/Fixture/AuthUserFixture.php
diff --git a/cake/tests/fixtures/author_fixture.php b/lib/Cake/tests/Fixture/AuthorFixture.php
similarity index 100%
rename from cake/tests/fixtures/author_fixture.php
rename to lib/Cake/tests/Fixture/AuthorFixture.php
diff --git a/cake/tests/fixtures/bake_article_fixture.php b/lib/Cake/tests/Fixture/BakeArticleFixture.php
similarity index 100%
rename from cake/tests/fixtures/bake_article_fixture.php
rename to lib/Cake/tests/Fixture/BakeArticleFixture.php
diff --git a/cake/tests/fixtures/bake_articles_bake_tag_fixture.php b/lib/Cake/tests/Fixture/BakeArticlesBakeTagFixture.php
similarity index 100%
rename from cake/tests/fixtures/bake_articles_bake_tag_fixture.php
rename to lib/Cake/tests/Fixture/BakeArticlesBakeTagFixture.php
diff --git a/cake/tests/fixtures/bake_comment_fixture.php b/lib/Cake/tests/Fixture/BakeCommentFixture.php
similarity index 100%
rename from cake/tests/fixtures/bake_comment_fixture.php
rename to lib/Cake/tests/Fixture/BakeCommentFixture.php
diff --git a/cake/tests/fixtures/bake_tag_fixture.php b/lib/Cake/tests/Fixture/BakeTagFixture.php
similarity index 100%
rename from cake/tests/fixtures/bake_tag_fixture.php
rename to lib/Cake/tests/Fixture/BakeTagFixture.php
diff --git a/cake/tests/fixtures/basket_fixture.php b/lib/Cake/tests/Fixture/BasketFixture.php
similarity index 100%
rename from cake/tests/fixtures/basket_fixture.php
rename to lib/Cake/tests/Fixture/BasketFixture.php
diff --git a/cake/tests/fixtures/bid_fixture.php b/lib/Cake/tests/Fixture/BidFixture.php
similarity index 100%
rename from cake/tests/fixtures/bid_fixture.php
rename to lib/Cake/tests/Fixture/BidFixture.php
diff --git a/cake/tests/fixtures/binary_test_fixture.php b/lib/Cake/tests/Fixture/BinaryTestFixture.php
similarity index 100%
rename from cake/tests/fixtures/binary_test_fixture.php
rename to lib/Cake/tests/Fixture/BinaryTestFixture.php
diff --git a/cake/tests/fixtures/book_fixture.php b/lib/Cake/tests/Fixture/BookFixture.php
similarity index 100%
rename from cake/tests/fixtures/book_fixture.php
rename to lib/Cake/tests/Fixture/BookFixture.php
diff --git a/cake/tests/fixtures/cache_test_model_fixture.php b/lib/Cake/tests/Fixture/CacheTestModelFixture.php
similarity index 100%
rename from cake/tests/fixtures/cache_test_model_fixture.php
rename to lib/Cake/tests/Fixture/CacheTestModelFixture.php
diff --git a/cake/tests/fixtures/callback_fixture.php b/lib/Cake/tests/Fixture/CallbackFixture.php
similarity index 100%
rename from cake/tests/fixtures/callback_fixture.php
rename to lib/Cake/tests/Fixture/CallbackFixture.php
diff --git a/cake/tests/fixtures/campaign_fixture.php b/lib/Cake/tests/Fixture/CampaignFixture.php
similarity index 100%
rename from cake/tests/fixtures/campaign_fixture.php
rename to lib/Cake/tests/Fixture/CampaignFixture.php
diff --git a/cake/tests/fixtures/category_fixture.php b/lib/Cake/tests/Fixture/CategoryFixture.php
similarity index 100%
rename from cake/tests/fixtures/category_fixture.php
rename to lib/Cake/tests/Fixture/CategoryFixture.php
diff --git a/cake/tests/fixtures/category_thread_fixture.php b/lib/Cake/tests/Fixture/CategoryThreadFixture.php
similarity index 100%
rename from cake/tests/fixtures/category_thread_fixture.php
rename to lib/Cake/tests/Fixture/CategoryThreadFixture.php
diff --git a/cake/tests/fixtures/cd_fixture.php b/lib/Cake/tests/Fixture/CdFixture.php
similarity index 100%
rename from cake/tests/fixtures/cd_fixture.php
rename to lib/Cake/tests/Fixture/CdFixture.php
diff --git a/cake/tests/fixtures/comment_fixture.php b/lib/Cake/tests/Fixture/CommentFixture.php
similarity index 100%
rename from cake/tests/fixtures/comment_fixture.php
rename to lib/Cake/tests/Fixture/CommentFixture.php
diff --git a/cake/tests/fixtures/content_account_fixture.php b/lib/Cake/tests/Fixture/ContentAccountFixture.php
similarity index 100%
rename from cake/tests/fixtures/content_account_fixture.php
rename to lib/Cake/tests/Fixture/ContentAccountFixture.php
diff --git a/cake/tests/fixtures/content_fixture.php b/lib/Cake/tests/Fixture/ContentFixture.php
similarity index 100%
rename from cake/tests/fixtures/content_fixture.php
rename to lib/Cake/tests/Fixture/ContentFixture.php
diff --git a/cake/tests/fixtures/counter_cache_post_fixture.php b/lib/Cake/tests/Fixture/CounterCachePostFixture.php
similarity index 100%
rename from cake/tests/fixtures/counter_cache_post_fixture.php
rename to lib/Cake/tests/Fixture/CounterCachePostFixture.php
diff --git a/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php b/lib/Cake/tests/Fixture/CounterCachePostNonstandardPrimaryKeyFixture.php
similarity index 100%
rename from cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
rename to lib/Cake/tests/Fixture/CounterCachePostNonstandardPrimaryKeyFixture.php
diff --git a/cake/tests/fixtures/counter_cache_user_fixture.php b/lib/Cake/tests/Fixture/CounterCacheUserFixture.php
similarity index 100%
rename from cake/tests/fixtures/counter_cache_user_fixture.php
rename to lib/Cake/tests/Fixture/CounterCacheUserFixture.php
diff --git a/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php b/lib/Cake/tests/Fixture/CounterCacheUserNonstandardPrimaryKeyFixture.php
similarity index 100%
rename from cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
rename to lib/Cake/tests/Fixture/CounterCacheUserNonstandardPrimaryKeyFixture.php
diff --git a/cake/tests/fixtures/data_test_fixture.php b/lib/Cake/tests/Fixture/DataTestFixture.php
similarity index 100%
rename from cake/tests/fixtures/data_test_fixture.php
rename to lib/Cake/tests/Fixture/DataTestFixture.php
diff --git a/cake/tests/fixtures/datatype_fixture.php b/lib/Cake/tests/Fixture/DatatypeFixture.php
similarity index 100%
rename from cake/tests/fixtures/datatype_fixture.php
rename to lib/Cake/tests/Fixture/DatatypeFixture.php
diff --git a/cake/tests/fixtures/dependency_fixture.php b/lib/Cake/tests/Fixture/DependencyFixture.php
similarity index 100%
rename from cake/tests/fixtures/dependency_fixture.php
rename to lib/Cake/tests/Fixture/DependencyFixture.php
diff --git a/cake/tests/fixtures/device_fixture.php b/lib/Cake/tests/Fixture/DeviceFixture.php
similarity index 100%
rename from cake/tests/fixtures/device_fixture.php
rename to lib/Cake/tests/Fixture/DeviceFixture.php
diff --git a/cake/tests/fixtures/device_type_category_fixture.php b/lib/Cake/tests/Fixture/DeviceTypeCategoryFixture.php
similarity index 100%
rename from cake/tests/fixtures/device_type_category_fixture.php
rename to lib/Cake/tests/Fixture/DeviceTypeCategoryFixture.php
diff --git a/cake/tests/fixtures/device_type_fixture.php b/lib/Cake/tests/Fixture/DeviceTypeFixture.php
similarity index 100%
rename from cake/tests/fixtures/device_type_fixture.php
rename to lib/Cake/tests/Fixture/DeviceTypeFixture.php
diff --git a/cake/tests/fixtures/document_directory_fixture.php b/lib/Cake/tests/Fixture/DocumentDirectoryFixture.php
similarity index 100%
rename from cake/tests/fixtures/document_directory_fixture.php
rename to lib/Cake/tests/Fixture/DocumentDirectoryFixture.php
diff --git a/cake/tests/fixtures/document_fixture.php b/lib/Cake/tests/Fixture/DocumentFixture.php
similarity index 100%
rename from cake/tests/fixtures/document_fixture.php
rename to lib/Cake/tests/Fixture/DocumentFixture.php
diff --git a/cake/tests/fixtures/exterior_type_category_fixture.php b/lib/Cake/tests/Fixture/ExteriorTypeCategoryFixture.php
similarity index 100%
rename from cake/tests/fixtures/exterior_type_category_fixture.php
rename to lib/Cake/tests/Fixture/ExteriorTypeCategoryFixture.php
diff --git a/cake/tests/fixtures/feature_set_fixture.php b/lib/Cake/tests/Fixture/FeatureSetFixture.php
similarity index 100%
rename from cake/tests/fixtures/feature_set_fixture.php
rename to lib/Cake/tests/Fixture/FeatureSetFixture.php
diff --git a/cake/tests/fixtures/featured_fixture.php b/lib/Cake/tests/Fixture/FeaturedFixture.php
similarity index 100%
rename from cake/tests/fixtures/featured_fixture.php
rename to lib/Cake/tests/Fixture/FeaturedFixture.php
diff --git a/cake/tests/fixtures/film_file_fixture.php b/lib/Cake/tests/Fixture/FilmFileFixture.php
similarity index 100%
rename from cake/tests/fixtures/film_file_fixture.php
rename to lib/Cake/tests/Fixture/FilmFileFixture.php
diff --git a/cake/tests/fixtures/fixturized_test_case.php b/lib/Cake/tests/Fixture/FixturizedTestCase.php
similarity index 100%
rename from cake/tests/fixtures/fixturized_test_case.php
rename to lib/Cake/tests/Fixture/FixturizedTestCase.php
diff --git a/cake/tests/fixtures/flag_tree_fixture.php b/lib/Cake/tests/Fixture/FlagTreeFixture.php
similarity index 100%
rename from cake/tests/fixtures/flag_tree_fixture.php
rename to lib/Cake/tests/Fixture/FlagTreeFixture.php
diff --git a/cake/tests/fixtures/fruit_fixture.php b/lib/Cake/tests/Fixture/FruitFixture.php
similarity index 100%
rename from cake/tests/fixtures/fruit_fixture.php
rename to lib/Cake/tests/Fixture/FruitFixture.php
diff --git a/cake/tests/fixtures/fruits_uuid_tag_fixture.php b/lib/Cake/tests/Fixture/FruitsUuidTagFixture.php
similarity index 100%
rename from cake/tests/fixtures/fruits_uuid_tag_fixture.php
rename to lib/Cake/tests/Fixture/FruitsUuidTagFixture.php
diff --git a/cake/tests/fixtures/group_update_all_fixture.php b/lib/Cake/tests/Fixture/GroupUpdateAllFixture.php
similarity index 100%
rename from cake/tests/fixtures/group_update_all_fixture.php
rename to lib/Cake/tests/Fixture/GroupUpdateAllFixture.php
diff --git a/cake/tests/fixtures/home_fixture.php b/lib/Cake/tests/Fixture/HomeFixture.php
similarity index 100%
rename from cake/tests/fixtures/home_fixture.php
rename to lib/Cake/tests/Fixture/HomeFixture.php
diff --git a/cake/tests/fixtures/image_fixture.php b/lib/Cake/tests/Fixture/ImageFixture.php
similarity index 100%
rename from cake/tests/fixtures/image_fixture.php
rename to lib/Cake/tests/Fixture/ImageFixture.php
diff --git a/cake/tests/fixtures/item_fixture.php b/lib/Cake/tests/Fixture/ItemFixture.php
similarity index 100%
rename from cake/tests/fixtures/item_fixture.php
rename to lib/Cake/tests/Fixture/ItemFixture.php
diff --git a/cake/tests/fixtures/items_portfolio_fixture.php b/lib/Cake/tests/Fixture/ItemsPortfolioFixture.php
similarity index 100%
rename from cake/tests/fixtures/items_portfolio_fixture.php
rename to lib/Cake/tests/Fixture/ItemsPortfolioFixture.php
diff --git a/cake/tests/fixtures/join_a_b_fixture.php b/lib/Cake/tests/Fixture/JoinABFixture.php
similarity index 100%
rename from cake/tests/fixtures/join_a_b_fixture.php
rename to lib/Cake/tests/Fixture/JoinABFixture.php
diff --git a/cake/tests/fixtures/join_a_c_fixture.php b/lib/Cake/tests/Fixture/JoinACFixture.php
similarity index 100%
rename from cake/tests/fixtures/join_a_c_fixture.php
rename to lib/Cake/tests/Fixture/JoinACFixture.php
diff --git a/cake/tests/fixtures/join_a_fixture.php b/lib/Cake/tests/Fixture/JoinAFixture.php
similarity index 100%
rename from cake/tests/fixtures/join_a_fixture.php
rename to lib/Cake/tests/Fixture/JoinAFixture.php
diff --git a/cake/tests/fixtures/join_b_fixture.php b/lib/Cake/tests/Fixture/JoinBFixture.php
similarity index 100%
rename from cake/tests/fixtures/join_b_fixture.php
rename to lib/Cake/tests/Fixture/JoinBFixture.php
diff --git a/cake/tests/fixtures/join_c_fixture.php b/lib/Cake/tests/Fixture/JoinCFixture.php
similarity index 100%
rename from cake/tests/fixtures/join_c_fixture.php
rename to lib/Cake/tests/Fixture/JoinCFixture.php
diff --git a/cake/tests/fixtures/join_thing_fixture.php b/lib/Cake/tests/Fixture/JoinThingFixture.php
similarity index 100%
rename from cake/tests/fixtures/join_thing_fixture.php
rename to lib/Cake/tests/Fixture/JoinThingFixture.php
diff --git a/cake/tests/fixtures/message_fixture.php b/lib/Cake/tests/Fixture/MessageFixture.php
similarity index 100%
rename from cake/tests/fixtures/message_fixture.php
rename to lib/Cake/tests/Fixture/MessageFixture.php
diff --git a/cake/tests/fixtures/my_categories_my_products_fixture.php b/lib/Cake/tests/Fixture/MyCategoriesMyProductsFixture.php
similarity index 100%
rename from cake/tests/fixtures/my_categories_my_products_fixture.php
rename to lib/Cake/tests/Fixture/MyCategoriesMyProductsFixture.php
diff --git a/cake/tests/fixtures/my_categories_my_users_fixture.php b/lib/Cake/tests/Fixture/MyCategoriesMyUsersFixture.php
similarity index 100%
rename from cake/tests/fixtures/my_categories_my_users_fixture.php
rename to lib/Cake/tests/Fixture/MyCategoriesMyUsersFixture.php
diff --git a/cake/tests/fixtures/my_category_fixture.php b/lib/Cake/tests/Fixture/MyCategoryFixture.php
similarity index 100%
rename from cake/tests/fixtures/my_category_fixture.php
rename to lib/Cake/tests/Fixture/MyCategoryFixture.php
diff --git a/cake/tests/fixtures/my_product_fixture.php b/lib/Cake/tests/Fixture/MyProductFixture.php
similarity index 100%
rename from cake/tests/fixtures/my_product_fixture.php
rename to lib/Cake/tests/Fixture/MyProductFixture.php
diff --git a/cake/tests/fixtures/my_user_fixture.php b/lib/Cake/tests/Fixture/MyUserFixture.php
similarity index 100%
rename from cake/tests/fixtures/my_user_fixture.php
rename to lib/Cake/tests/Fixture/MyUserFixture.php
diff --git a/cake/tests/fixtures/node_fixture.php b/lib/Cake/tests/Fixture/NodeFixture.php
similarity index 100%
rename from cake/tests/fixtures/node_fixture.php
rename to lib/Cake/tests/Fixture/NodeFixture.php
diff --git a/cake/tests/fixtures/number_tree_fixture.php b/lib/Cake/tests/Fixture/NumberTreeFixture.php
similarity index 100%
rename from cake/tests/fixtures/number_tree_fixture.php
rename to lib/Cake/tests/Fixture/NumberTreeFixture.php
diff --git a/cake/tests/fixtures/number_tree_two_fixture.php b/lib/Cake/tests/Fixture/NumberTreeTwoFixture.php
similarity index 100%
rename from cake/tests/fixtures/number_tree_two_fixture.php
rename to lib/Cake/tests/Fixture/NumberTreeTwoFixture.php
diff --git a/cake/tests/fixtures/numeric_article_fixture.php b/lib/Cake/tests/Fixture/NumericArticleFixture.php
similarity index 100%
rename from cake/tests/fixtures/numeric_article_fixture.php
rename to lib/Cake/tests/Fixture/NumericArticleFixture.php
diff --git a/cake/tests/fixtures/overall_favorite_fixture.php b/lib/Cake/tests/Fixture/OverallFavoriteFixture.php
similarity index 100%
rename from cake/tests/fixtures/overall_favorite_fixture.php
rename to lib/Cake/tests/Fixture/OverallFavoriteFixture.php
diff --git a/cake/tests/fixtures/person_fixture.php b/lib/Cake/tests/Fixture/PersonFixture.php
similarity index 100%
rename from cake/tests/fixtures/person_fixture.php
rename to lib/Cake/tests/Fixture/PersonFixture.php
diff --git a/cake/tests/fixtures/portfolio_fixture.php b/lib/Cake/tests/Fixture/PortfolioFixture.php
similarity index 100%
rename from cake/tests/fixtures/portfolio_fixture.php
rename to lib/Cake/tests/Fixture/PortfolioFixture.php
diff --git a/cake/tests/fixtures/post_fixture.php b/lib/Cake/tests/Fixture/PostFixture.php
similarity index 100%
rename from cake/tests/fixtures/post_fixture.php
rename to lib/Cake/tests/Fixture/PostFixture.php
diff --git a/cake/tests/fixtures/posts_tag_fixture.php b/lib/Cake/tests/Fixture/PostsTagFixture.php
similarity index 100%
rename from cake/tests/fixtures/posts_tag_fixture.php
rename to lib/Cake/tests/Fixture/PostsTagFixture.php
diff --git a/cake/tests/fixtures/primary_model_fixture.php b/lib/Cake/tests/Fixture/PrimaryModelFixture.php
similarity index 100%
rename from cake/tests/fixtures/primary_model_fixture.php
rename to lib/Cake/tests/Fixture/PrimaryModelFixture.php
diff --git a/cake/tests/fixtures/product_fixture.php b/lib/Cake/tests/Fixture/ProductFixture.php
similarity index 100%
rename from cake/tests/fixtures/product_fixture.php
rename to lib/Cake/tests/Fixture/ProductFixture.php
diff --git a/cake/tests/fixtures/product_update_all_fixture.php b/lib/Cake/tests/Fixture/ProductUpdateAllFixture.php
similarity index 100%
rename from cake/tests/fixtures/product_update_all_fixture.php
rename to lib/Cake/tests/Fixture/ProductUpdateAllFixture.php
diff --git a/cake/tests/fixtures/project_fixture.php b/lib/Cake/tests/Fixture/ProjectFixture.php
similarity index 100%
rename from cake/tests/fixtures/project_fixture.php
rename to lib/Cake/tests/Fixture/ProjectFixture.php
diff --git a/cake/tests/fixtures/sample_fixture.php b/lib/Cake/tests/Fixture/SampleFixture.php
similarity index 100%
rename from cake/tests/fixtures/sample_fixture.php
rename to lib/Cake/tests/Fixture/SampleFixture.php
diff --git a/cake/tests/fixtures/secondary_model_fixture.php b/lib/Cake/tests/Fixture/SecondaryModelFixture.php
similarity index 100%
rename from cake/tests/fixtures/secondary_model_fixture.php
rename to lib/Cake/tests/Fixture/SecondaryModelFixture.php
diff --git a/cake/tests/fixtures/session_fixture.php b/lib/Cake/tests/Fixture/SessionFixture.php
similarity index 100%
rename from cake/tests/fixtures/session_fixture.php
rename to lib/Cake/tests/Fixture/SessionFixture.php
diff --git a/cake/tests/fixtures/something_else_fixture.php b/lib/Cake/tests/Fixture/SomethingElseFixture.php
similarity index 100%
rename from cake/tests/fixtures/something_else_fixture.php
rename to lib/Cake/tests/Fixture/SomethingElseFixture.php
diff --git a/cake/tests/fixtures/something_fixture.php b/lib/Cake/tests/Fixture/SomethingFixture.php
similarity index 100%
rename from cake/tests/fixtures/something_fixture.php
rename to lib/Cake/tests/Fixture/SomethingFixture.php
diff --git a/cake/tests/fixtures/stories_tag_fixture.php b/lib/Cake/tests/Fixture/StoriesTagFixture.php
similarity index 100%
rename from cake/tests/fixtures/stories_tag_fixture.php
rename to lib/Cake/tests/Fixture/StoriesTagFixture.php
diff --git a/cake/tests/fixtures/story_fixture.php b/lib/Cake/tests/Fixture/StoryFixture.php
similarity index 100%
rename from cake/tests/fixtures/story_fixture.php
rename to lib/Cake/tests/Fixture/StoryFixture.php
diff --git a/cake/tests/fixtures/syfile_fixture.php b/lib/Cake/tests/Fixture/SyfileFixture.php
similarity index 100%
rename from cake/tests/fixtures/syfile_fixture.php
rename to lib/Cake/tests/Fixture/SyfileFixture.php
diff --git a/cake/tests/fixtures/tag_fixture.php b/lib/Cake/tests/Fixture/TagFixture.php
similarity index 100%
rename from cake/tests/fixtures/tag_fixture.php
rename to lib/Cake/tests/Fixture/TagFixture.php
diff --git a/cake/tests/fixtures/test_plugin_article_fixture.php b/lib/Cake/tests/Fixture/TestPluginArticleFixture.php
similarity index 100%
rename from cake/tests/fixtures/test_plugin_article_fixture.php
rename to lib/Cake/tests/Fixture/TestPluginArticleFixture.php
diff --git a/cake/tests/fixtures/test_plugin_comment_fixture.php b/lib/Cake/tests/Fixture/TestPluginCommentFixture.php
similarity index 100%
rename from cake/tests/fixtures/test_plugin_comment_fixture.php
rename to lib/Cake/tests/Fixture/TestPluginCommentFixture.php
diff --git a/cake/tests/fixtures/the_paper_monkies_fixture.php b/lib/Cake/tests/Fixture/ThePaperMonkiesFixture.php
similarity index 100%
rename from cake/tests/fixtures/the_paper_monkies_fixture.php
rename to lib/Cake/tests/Fixture/ThePaperMonkiesFixture.php
diff --git a/cake/tests/fixtures/thread_fixture.php b/lib/Cake/tests/Fixture/ThreadFixture.php
similarity index 100%
rename from cake/tests/fixtures/thread_fixture.php
rename to lib/Cake/tests/Fixture/ThreadFixture.php
diff --git a/cake/tests/fixtures/translate_article_fixture.php b/lib/Cake/tests/Fixture/TranslateArticleFixture.php
similarity index 100%
rename from cake/tests/fixtures/translate_article_fixture.php
rename to lib/Cake/tests/Fixture/TranslateArticleFixture.php
diff --git a/cake/tests/fixtures/translate_fixture.php b/lib/Cake/tests/Fixture/TranslateFixture.php
similarity index 100%
rename from cake/tests/fixtures/translate_fixture.php
rename to lib/Cake/tests/Fixture/TranslateFixture.php
diff --git a/cake/tests/fixtures/translate_table_fixture.php b/lib/Cake/tests/Fixture/TranslateTableFixture.php
similarity index 100%
rename from cake/tests/fixtures/translate_table_fixture.php
rename to lib/Cake/tests/Fixture/TranslateTableFixture.php
diff --git a/cake/tests/fixtures/translate_with_prefix_fixture.php b/lib/Cake/tests/Fixture/TranslateWithPrefixFixture.php
similarity index 100%
rename from cake/tests/fixtures/translate_with_prefix_fixture.php
rename to lib/Cake/tests/Fixture/TranslateWithPrefixFixture.php
diff --git a/cake/tests/fixtures/translated_article_fixture.php b/lib/Cake/tests/Fixture/TranslatedArticleFixture.php
similarity index 100%
rename from cake/tests/fixtures/translated_article_fixture.php
rename to lib/Cake/tests/Fixture/TranslatedArticleFixture.php
diff --git a/cake/tests/fixtures/translated_item_fixture.php b/lib/Cake/tests/Fixture/TranslatedItemFixture.php
similarity index 100%
rename from cake/tests/fixtures/translated_item_fixture.php
rename to lib/Cake/tests/Fixture/TranslatedItemFixture.php
diff --git a/cake/tests/fixtures/unconventional_tree_fixture.php b/lib/Cake/tests/Fixture/UnconventionalTreeFixture.php
similarity index 100%
rename from cake/tests/fixtures/unconventional_tree_fixture.php
rename to lib/Cake/tests/Fixture/UnconventionalTreeFixture.php
diff --git a/cake/tests/fixtures/underscore_field_fixture.php b/lib/Cake/tests/Fixture/UnderscoreFieldFixture.php
similarity index 100%
rename from cake/tests/fixtures/underscore_field_fixture.php
rename to lib/Cake/tests/Fixture/UnderscoreFieldFixture.php
diff --git a/cake/tests/fixtures/user_fixture.php b/lib/Cake/tests/Fixture/UserFixture.php
similarity index 100%
rename from cake/tests/fixtures/user_fixture.php
rename to lib/Cake/tests/Fixture/UserFixture.php
diff --git a/cake/tests/fixtures/uuid_fixture.php b/lib/Cake/tests/Fixture/UuidFixture.php
similarity index 100%
rename from cake/tests/fixtures/uuid_fixture.php
rename to lib/Cake/tests/Fixture/UuidFixture.php
diff --git a/cake/tests/fixtures/uuid_tag_fixture.php b/lib/Cake/tests/Fixture/UuidTagFixture.php
similarity index 100%
rename from cake/tests/fixtures/uuid_tag_fixture.php
rename to lib/Cake/tests/Fixture/UuidTagFixture.php
diff --git a/cake/tests/fixtures/uuid_tree_fixture.php b/lib/Cake/tests/Fixture/UuidTreeFixture.php
similarity index 100%
rename from cake/tests/fixtures/uuid_tree_fixture.php
rename to lib/Cake/tests/Fixture/UuidTreeFixture.php
diff --git a/cake/tests/fixtures/uuiditem_fixture.php b/lib/Cake/tests/Fixture/UuiditemFixture.php
similarity index 100%
rename from cake/tests/fixtures/uuiditem_fixture.php
rename to lib/Cake/tests/Fixture/UuiditemFixture.php
diff --git a/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php b/lib/Cake/tests/Fixture/UuiditemsUuidportfolioFixture.php
similarity index 100%
rename from cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
rename to lib/Cake/tests/Fixture/UuiditemsUuidportfolioFixture.php
diff --git a/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php b/lib/Cake/tests/Fixture/UuiditemsUuidportfolioNumericidFixture.php
similarity index 100%
rename from cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
rename to lib/Cake/tests/Fixture/UuiditemsUuidportfolioNumericidFixture.php
diff --git a/cake/tests/fixtures/uuidportfolio_fixture.php b/lib/Cake/tests/Fixture/UuidportfolioFixture.php
similarity index 100%
rename from cake/tests/fixtures/uuidportfolio_fixture.php
rename to lib/Cake/tests/Fixture/UuidportfolioFixture.php
diff --git a/cake/tests/fixtures/rss.xml b/lib/Cake/tests/Fixture/rss.xml
similarity index 100%
rename from cake/tests/fixtures/rss.xml
rename to lib/Cake/tests/Fixture/rss.xml
diff --git a/cake/tests/fixtures/sample.xml b/lib/Cake/tests/Fixture/sample.xml
similarity index 100%
rename from cake/tests/fixtures/sample.xml
rename to lib/Cake/tests/Fixture/sample.xml
diff --git a/cake/tests/fixtures/soap_request.xml b/lib/Cake/tests/Fixture/soap_request.xml
similarity index 100%
rename from cake/tests/fixtures/soap_request.xml
rename to lib/Cake/tests/Fixture/soap_request.xml
diff --git a/cake/tests/fixtures/soap_response.xml b/lib/Cake/tests/Fixture/soap_response.xml
similarity index 100%
rename from cake/tests/fixtures/soap_response.xml
rename to lib/Cake/tests/Fixture/soap_response.xml
diff --git a/cake/tests/test_app/console/shells/sample.php b/lib/Cake/tests/test_app/Console/Command/SampleShell.php
similarity index 100%
rename from cake/tests/test_app/console/shells/sample.php
rename to lib/Cake/tests/test_app/Console/Command/SampleShell.php
diff --git a/cake/console/templates/skel/views/pages/empty b/lib/Cake/tests/test_app/Console/Command/Task/empty
similarity index 100%
rename from cake/console/templates/skel/views/pages/empty
rename to lib/Cake/tests/test_app/Console/Command/Task/empty
diff --git a/cake/tests/test_app/console/templates/test/classes/test_object.ctp b/lib/Cake/tests/test_app/Console/templates/test/classes/test_object.ctp
similarity index 100%
rename from cake/tests/test_app/console/templates/test/classes/test_object.ctp
rename to lib/Cake/tests/test_app/Console/templates/test/classes/test_object.ctp
diff --git a/cake/console/templates/skel/views/scaffolds/empty b/lib/Cake/tests/test_app/Controller/Component/empty
similarity index 100%
rename from cake/console/templates/skel/views/scaffolds/empty
rename to lib/Cake/tests/test_app/Controller/Component/empty
diff --git a/cake/tests/test_app/controllers/tests_apps_controller.php b/lib/Cake/tests/test_app/Controller/tests_apps_controller.php
similarity index 100%
rename from cake/tests/test_app/controllers/tests_apps_controller.php
rename to lib/Cake/tests/test_app/Controller/tests_apps_controller.php
diff --git a/cake/tests/test_app/controllers/tests_apps_posts_controller.php b/lib/Cake/tests/test_app/Controller/tests_apps_posts_controller.php
similarity index 100%
rename from cake/tests/test_app/controllers/tests_apps_posts_controller.php
rename to lib/Cake/tests/test_app/Controller/tests_apps_posts_controller.php
diff --git a/cake/tests/test_app/libs/cache/test_app_cache.php b/lib/Cake/tests/test_app/Lib/Cache/Engine/TestAppCacheEngine.php
similarity index 100%
rename from cake/tests/test_app/libs/cache/test_app_cache.php
rename to lib/Cake/tests/test_app/Lib/Cache/Engine/TestAppCacheEngine.php
diff --git a/cake/tests/test_app/libs/log/test_app_log.php b/lib/Cake/tests/test_app/Lib/Log/Engine/TestAppLog.php
similarity index 94%
rename from cake/tests/test_app/libs/log/test_app_log.php
rename to lib/Cake/tests/test_app/Lib/Log/Engine/TestAppLog.php
index 129e1b65d..736be6cb6 100644
--- a/cake/tests/test_app/libs/log/test_app_log.php
+++ b/lib/Cake/tests/test_app/Lib/Log/Engine/TestAppLog.php
@@ -16,6 +16,9 @@
  * @since         CakePHP(tm) v 1.3
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+
+App::uses('CakeLogInterface', 'Log');
+
 class TestAppLog implements CakeLogInterface {
 
 	function write($type, $message) {
diff --git a/lib/Cake/tests/test_app/Lib/Utility/TestUtilityClass.php b/lib/Cake/tests/test_app/Lib/Utility/TestUtilityClass.php
new file mode 100644
index 000000000..6d4e021f6
--- /dev/null
+++ b/lib/Cake/tests/test_app/Lib/Utility/TestUtilityClass.php
@@ -0,0 +1,19 @@
+
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+class TestUtilityClass {}
diff --git a/cake/tests/test_app/libs/library.php b/lib/Cake/tests/test_app/Lib/library.php
similarity index 100%
rename from cake/tests/test_app/libs/library.php
rename to lib/Cake/tests/test_app/Lib/library.php
diff --git a/cake/console/templates/skel/webroot/js/empty b/lib/Cake/tests/test_app/Model/Behavior/empty
similarity index 100%
rename from cake/console/templates/skel/webroot/js/empty
rename to lib/Cake/tests/test_app/Model/Behavior/empty
diff --git a/cake/tests/test_app/models/behaviors/persister_one_behavior.php b/lib/Cake/tests/test_app/Model/Behavior/persister_one_behavior.php
similarity index 100%
rename from cake/tests/test_app/models/behaviors/persister_one_behavior.php
rename to lib/Cake/tests/test_app/Model/Behavior/persister_one_behavior.php
diff --git a/cake/tests/test_app/models/behaviors/persister_two_behavior.php b/lib/Cake/tests/test_app/Model/Behavior/persister_two_behavior.php
similarity index 100%
rename from cake/tests/test_app/models/behaviors/persister_two_behavior.php
rename to lib/Cake/tests/test_app/Model/Behavior/persister_two_behavior.php
diff --git a/lib/Cake/tests/test_app/Model/Datasource/Database/TestLocalDriver.php b/lib/Cake/tests/test_app/Model/Datasource/Database/TestLocalDriver.php
new file mode 100644
index 000000000..8375702d8
--- /dev/null
+++ b/lib/Cake/tests/test_app/Model/Datasource/Database/TestLocalDriver.php
@@ -0,0 +1,5 @@
+loadHelper('Html');
+
+$cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework');
 ?>
 
 
 
-	Html->charset();?>
+	Html->charset(); ?>
 	
-		<?php __('CakePHP: the rapid development php framework:'); ?>
-		<?php echo $title_for_layout;?>
+		<?php echo $cakeDescription ?>:
+		<?php echo $title_for_layout; ?>
 	
+	Html->meta('icon');
 
-	Html->css('cake.generic');?>
-	
+		echo $this->Html->css('cake.generic');
+
+		echo $scripts_for_layout;
+	?>
 
 
 	
        
 		
 		
        
 
-			
+			
 
 		
        
 		
 	
        
diff --git a/cake/tests/test_app/views/layouts/email/html/default.ctp b/lib/Cake/tests/test_app/View/layouts/email/html/default.ctp
similarity index 100%
rename from cake/tests/test_app/views/layouts/email/html/default.ctp
rename to lib/Cake/tests/test_app/View/layouts/email/html/default.ctp
diff --git a/cake/tests/test_app/views/layouts/email/html/thin.ctp b/lib/Cake/tests/test_app/View/layouts/email/html/thin.ctp
similarity index 100%
rename from cake/tests/test_app/views/layouts/email/html/thin.ctp
rename to lib/Cake/tests/test_app/View/layouts/email/html/thin.ctp
diff --git a/cake/tests/test_app/views/layouts/email/text/default.ctp b/lib/Cake/tests/test_app/View/layouts/email/text/default.ctp
similarity index 100%
rename from cake/tests/test_app/views/layouts/email/text/default.ctp
rename to lib/Cake/tests/test_app/View/layouts/email/text/default.ctp
diff --git a/cake/tests/test_app/views/layouts/flash.ctp b/lib/Cake/tests/test_app/View/layouts/flash.ctp
similarity index 100%
rename from cake/tests/test_app/views/layouts/flash.ctp
rename to lib/Cake/tests/test_app/View/layouts/flash.ctp
diff --git a/cake/tests/test_app/views/layouts/js/default.ctp b/lib/Cake/tests/test_app/View/layouts/js/default.ctp
similarity index 100%
rename from cake/tests/test_app/views/layouts/js/default.ctp
rename to lib/Cake/tests/test_app/View/layouts/js/default.ctp
diff --git a/cake/tests/test_app/views/layouts/json/default.ctp b/lib/Cake/tests/test_app/View/layouts/json/default.ctp
similarity index 100%
rename from cake/tests/test_app/views/layouts/json/default.ctp
rename to lib/Cake/tests/test_app/View/layouts/json/default.ctp
diff --git a/cake/tests/test_app/views/layouts/multi_cache.ctp b/lib/Cake/tests/test_app/View/layouts/multi_cache.ctp
similarity index 100%
rename from cake/tests/test_app/views/layouts/multi_cache.ctp
rename to lib/Cake/tests/test_app/View/layouts/multi_cache.ctp
diff --git a/cake/tests/test_app/views/layouts/rss/default.ctp b/lib/Cake/tests/test_app/View/layouts/rss/default.ctp
similarity index 100%
rename from cake/tests/test_app/views/layouts/rss/default.ctp
rename to lib/Cake/tests/test_app/View/layouts/rss/default.ctp
diff --git a/cake/tests/test_app/views/layouts/xml/default.ctp b/lib/Cake/tests/test_app/View/layouts/xml/default.ctp
similarity index 100%
rename from cake/tests/test_app/views/layouts/xml/default.ctp
rename to lib/Cake/tests/test_app/View/layouts/xml/default.ctp
diff --git a/cake/tests/test_app/plugins/test_plugin/console/shells/tasks/empty b/lib/Cake/tests/test_app/View/pages/empty
similarity index 100%
rename from cake/tests/test_app/plugins/test_plugin/console/shells/tasks/empty
rename to lib/Cake/tests/test_app/View/pages/empty
diff --git a/cake/tests/test_app/views/pages/extract.ctp b/lib/Cake/tests/test_app/View/pages/extract.ctp
similarity index 100%
rename from cake/tests/test_app/views/pages/extract.ctp
rename to lib/Cake/tests/test_app/View/pages/extract.ctp
diff --git a/lib/Cake/tests/test_app/View/pages/home.ctp b/lib/Cake/tests/test_app/View/pages/home.ctp
new file mode 100644
index 000000000..1b2a2e492
--- /dev/null
+++ b/lib/Cake/tests/test_app/View/pages/home.ctp
@@ -0,0 +1,163 @@
+
+
        
+ 
+
        
+	';
+				echo __d('cake_dev', 'Your tmp directory is writable.');
+			echo '';
+		else:
+			echo '';
+				echo __d('cake_dev', 'Your tmp directory is NOT writable.');
+			echo '';
+		endif;
+	?>
+
        
+
        
+	';
+				echo __d('cake_dev', 'The %s is being used for caching. To change the config edit APP/config/core.php ', ''. $settings['engine'] . 'Engine');
+			echo '';
+		else:
+			echo '';
+				echo __d('cake_dev', 'Your cache is NOT working. Please check the settings in APP/config/core.php');
+			echo '';
+		endif;
+	?>
+
        
+
        
+	';
+				echo __d('cake_dev', 'Your database configuration file is present.');
+				$filePresent = true;
+			echo '';
+		else:
+			echo '';
+				echo __d('cake_dev', 'Your database configuration file is NOT present.');
+				echo '
        ';
+				echo __d('cake_dev', 'Rename config/database.php.default to config/database.php');
+			echo '        ';
+		endif;
+	?>
+
        
+
+
        
+	isConnected()):
+			echo '';
+	 			echo __d('cake_dev', 'Cake is able to connect to the database.');
+			echo '';
+		else:
+			echo '';
+				echo __d('cake_dev', 'Cake is NOT able to connect to the database.');
+			echo '';
+		endif;
+	?>
+
        
+
+';
+		__('PCRE has not been compiled with Unicode support.');
+		echo '
        ';
+		__('Recompile PCRE with Unicode support by adding --enable-unicode-properties when configuring');
+		echo '
        ';
+	}
+?>
+
        
+
        
+
+To change its layout, create: APP/views/layouts/default.ctp.
        
+You can also add some CSS styles for your pages at: APP/webroot/css.');
+?>
+
        
+
+
        
+
        
+	Html->link(
+			sprintf('%s %s', __d('cake_dev', 'New'), __d('cake_dev', 'CakePHP 1.3 Docs')),
+			'http://book.cakephp.org/view/875/x1-3-Collection',
+			array('target' => '_blank', 'escape' => false)
+		);
+	?>
+
        
+
        
+	Html->link(
+			__d('cake_dev', 'The 15 min Blog Tutorial'),
+			'http://book.cakephp.org/view/1528/Blog',
+			array('target' => '_blank', 'escape' => false)
+		);
+	?>
+
        
+
+
        
+
        
+
+
        
+
        
+
+
        
+
+
\ No newline at end of file
diff --git a/cake/tests/test_app/views/posts/alt_ext.alt b/lib/Cake/tests/test_app/View/posts/alt_ext.alt
similarity index 100%
rename from cake/tests/test_app/views/posts/alt_ext.alt
rename to lib/Cake/tests/test_app/View/posts/alt_ext.alt
diff --git a/cake/tests/test_app/views/posts/cache_empty_sections.ctp b/lib/Cake/tests/test_app/View/posts/cache_empty_sections.ctp
similarity index 100%
rename from cake/tests/test_app/views/posts/cache_empty_sections.ctp
rename to lib/Cake/tests/test_app/View/posts/cache_empty_sections.ctp
diff --git a/cake/tests/test_app/views/posts/cache_form.ctp b/lib/Cake/tests/test_app/View/posts/cache_form.ctp
similarity index 100%
rename from cake/tests/test_app/views/posts/cache_form.ctp
rename to lib/Cake/tests/test_app/View/posts/cache_form.ctp
diff --git a/cake/tests/test_app/views/posts/helper_overwrite.ctp b/lib/Cake/tests/test_app/View/posts/helper_overwrite.ctp
similarity index 100%
rename from cake/tests/test_app/views/posts/helper_overwrite.ctp
rename to lib/Cake/tests/test_app/View/posts/helper_overwrite.ctp
diff --git a/cake/tests/test_app/views/posts/index.ctp b/lib/Cake/tests/test_app/View/posts/index.ctp
similarity index 100%
rename from cake/tests/test_app/views/posts/index.ctp
rename to lib/Cake/tests/test_app/View/posts/index.ctp
diff --git a/cake/tests/test_app/views/posts/multiple_nocache.ctp b/lib/Cake/tests/test_app/View/posts/multiple_nocache.ctp
similarity index 100%
rename from cake/tests/test_app/views/posts/multiple_nocache.ctp
rename to lib/Cake/tests/test_app/View/posts/multiple_nocache.ctp
diff --git a/cake/tests/test_app/views/posts/nocache_multiple_element.ctp b/lib/Cake/tests/test_app/View/posts/nocache_multiple_element.ctp
similarity index 100%
rename from cake/tests/test_app/views/posts/nocache_multiple_element.ctp
rename to lib/Cake/tests/test_app/View/posts/nocache_multiple_element.ctp
diff --git a/cake/tests/test_app/views/posts/scaffold.form.ctp b/lib/Cake/tests/test_app/View/posts/scaffold.form.ctp
similarity index 100%
rename from cake/tests/test_app/views/posts/scaffold.form.ctp
rename to lib/Cake/tests/test_app/View/posts/scaffold.form.ctp
diff --git a/cake/tests/test_app/views/posts/sequencial_nocache.ctp b/lib/Cake/tests/test_app/View/posts/sequencial_nocache.ctp
similarity index 100%
rename from cake/tests/test_app/views/posts/sequencial_nocache.ctp
rename to lib/Cake/tests/test_app/View/posts/sequencial_nocache.ctp
diff --git a/lib/Cake/tests/test_app/View/posts/test_nocache_tags.ctp b/lib/Cake/tests/test_app/View/posts/test_nocache_tags.ctp
new file mode 100644
index 000000000..20909edc5
--- /dev/null
+++ b/lib/Cake/tests/test_app/View/posts/test_nocache_tags.ctp
@@ -0,0 +1,142 @@
+
+
        
+	
+	
+		
+	
+	
+
        
+
        
+	
+		' . $settings['engine'];
+				echo __d('cake', ' is being used to cache, to change this edit config/core.php ');
+				echo '
        ';
+
+				echo 'Settings: 
          ';
+				foreach ($settings as $name => $value):
+					echo '
        • ' . $name . ': ' . $value . '
          • ';
+				endforeach;
+				echo '
        ';
+
+			else:
+				echo __d('cake', 'NOT working.');
+				echo '
        ';
+				if (is_writable(TMP)):
+					echo __d('cake', 'Edit: config/core.php to insure you have the newset version of this file and the variable $cakeCache set properly');
+				endif;
+			endif;
+		?>
+	
+
        
+
        
+	
+		';
+				echo __d('cake', 'Rename config/database.php.default to config/database.php');
+			endif;
+		?>
+	
+
        
+
+
        
+	
+		isConnected()):
+		 		__d('cake', ' is able to ');
+			else:
+				__d('cake', ' is NOT able to ');
+			endif;
+			__d('cake', 'connect to the database.');
+		?>
+	
+
        
+
+
        
+ 
+
        
+
        
+
        
+
        
+ 
        
+
+
        
+
        
+
        
+
        
+
        
+
+
        
+
        
+
        
+
+
        
+
        
+
+
        
+
\ No newline at end of file
diff --git a/cake/tests/test_app/plugins/test_plugin/console/templates/empty b/lib/Cake/tests/test_app/View/scaffolds/empty
similarity index 100%
rename from cake/tests/test_app/plugins/test_plugin/console/templates/empty
rename to lib/Cake/tests/test_app/View/scaffolds/empty
diff --git a/cake/tests/test_app/views/tests_apps/index.ctp b/lib/Cake/tests/test_app/View/tests_apps/index.ctp
similarity index 100%
rename from cake/tests/test_app/views/tests_apps/index.ctp
rename to lib/Cake/tests/test_app/View/tests_apps/index.ctp
diff --git a/cake/tests/test_app/views/tests_apps/json/index.ctp b/lib/Cake/tests/test_app/View/tests_apps/json/index.ctp
similarity index 100%
rename from cake/tests/test_app/views/tests_apps/json/index.ctp
rename to lib/Cake/tests/test_app/View/tests_apps/json/index.ctp
diff --git a/cake/tests/test_app/views/themed/test_theme/elements/test_element.ctp b/lib/Cake/tests/test_app/View/themed/test_theme/elements/test_element.ctp
similarity index 100%
rename from cake/tests/test_app/views/themed/test_theme/elements/test_element.ctp
rename to lib/Cake/tests/test_app/View/themed/test_theme/elements/test_element.ctp
diff --git a/cake/tests/test_app/views/themed/test_theme/layouts/default.ctp b/lib/Cake/tests/test_app/View/themed/test_theme/layouts/default.ctp
similarity index 100%
rename from cake/tests/test_app/views/themed/test_theme/layouts/default.ctp
rename to lib/Cake/tests/test_app/View/themed/test_theme/layouts/default.ctp
diff --git a/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/layouts/plugin_default.ctp b/lib/Cake/tests/test_app/View/themed/test_theme/plugins/test_plugin/layouts/plugin_default.ctp
similarity index 100%
rename from cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/layouts/plugin_default.ctp
rename to lib/Cake/tests/test_app/View/themed/test_theme/plugins/test_plugin/layouts/plugin_default.ctp
diff --git a/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/tests/index.ctp b/lib/Cake/tests/test_app/View/themed/test_theme/plugins/test_plugin/tests/index.ctp
similarity index 100%
rename from cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/tests/index.ctp
rename to lib/Cake/tests/test_app/View/themed/test_theme/plugins/test_plugin/tests/index.ctp
diff --git a/cake/tests/test_app/views/themed/test_theme/posts/index.ctp b/lib/Cake/tests/test_app/View/themed/test_theme/posts/index.ctp
similarity index 100%
rename from cake/tests/test_app/views/themed/test_theme/posts/index.ctp
rename to lib/Cake/tests/test_app/View/themed/test_theme/posts/index.ctp
diff --git a/cake/tests/test_app/views/themed/test_theme/posts/scaffold.index.ctp b/lib/Cake/tests/test_app/View/themed/test_theme/posts/scaffold.index.ctp
similarity index 100%
rename from cake/tests/test_app/views/themed/test_theme/posts/scaffold.index.ctp
rename to lib/Cake/tests/test_app/View/themed/test_theme/posts/scaffold.index.ctp
diff --git a/cake/tests/test_app/vendors/css/test_asset.css b/lib/Cake/tests/test_app/View/themed/test_theme/webroot/css/test_asset.css
similarity index 100%
rename from cake/tests/test_app/vendors/css/test_asset.css
rename to lib/Cake/tests/test_app/View/themed/test_theme/webroot/css/test_asset.css
diff --git a/cake/tests/test_app/views/themed/test_theme/webroot/css/theme_webroot.css b/lib/Cake/tests/test_app/View/themed/test_theme/webroot/css/theme_webroot.css
similarity index 100%
rename from cake/tests/test_app/views/themed/test_theme/webroot/css/theme_webroot.css
rename to lib/Cake/tests/test_app/View/themed/test_theme/webroot/css/theme_webroot.css
diff --git a/cake/tests/test_app/views/themed/test_theme/webroot/flash/theme_test.swf b/lib/Cake/tests/test_app/View/themed/test_theme/webroot/flash/theme_test.swf
similarity index 100%
rename from cake/tests/test_app/views/themed/test_theme/webroot/flash/theme_test.swf
rename to lib/Cake/tests/test_app/View/themed/test_theme/webroot/flash/theme_test.swf
diff --git a/cake/tests/test_app/views/themed/test_theme/webroot/img/cake.power.gif b/lib/Cake/tests/test_app/View/themed/test_theme/webroot/img/cake.power.gif
similarity index 100%
rename from cake/tests/test_app/views/themed/test_theme/webroot/img/cake.power.gif
rename to lib/Cake/tests/test_app/View/themed/test_theme/webroot/img/cake.power.gif
diff --git a/cake/tests/test_app/vendors/img/test.jpg b/lib/Cake/tests/test_app/View/themed/test_theme/webroot/img/test.jpg
similarity index 100%
rename from cake/tests/test_app/vendors/img/test.jpg
rename to lib/Cake/tests/test_app/View/themed/test_theme/webroot/img/test.jpg
diff --git a/cake/tests/test_app/views/themed/test_theme/webroot/js/one/theme_one.js b/lib/Cake/tests/test_app/View/themed/test_theme/webroot/js/one/theme_one.js
similarity index 100%
rename from cake/tests/test_app/views/themed/test_theme/webroot/js/one/theme_one.js
rename to lib/Cake/tests/test_app/View/themed/test_theme/webroot/js/one/theme_one.js
diff --git a/cake/tests/test_app/views/themed/test_theme/webroot/js/theme.js b/lib/Cake/tests/test_app/View/themed/test_theme/webroot/js/theme.js
similarity index 100%
rename from cake/tests/test_app/views/themed/test_theme/webroot/js/theme.js
rename to lib/Cake/tests/test_app/View/themed/test_theme/webroot/js/theme.js
diff --git a/cake/tests/test_app/views/themed/test_theme/webroot/pdfs/theme_test.pdf b/lib/Cake/tests/test_app/View/themed/test_theme/webroot/pdfs/theme_test.pdf
similarity index 100%
rename from cake/tests/test_app/views/themed/test_theme/webroot/pdfs/theme_test.pdf
rename to lib/Cake/tests/test_app/View/themed/test_theme/webroot/pdfs/theme_test.pdf
diff --git a/cake/tests/test_app/config/acl.ini.php b/lib/Cake/tests/test_app/config/acl.ini.php
similarity index 100%
rename from cake/tests/test_app/config/acl.ini.php
rename to lib/Cake/tests/test_app/config/acl.ini.php
diff --git a/cake/tests/test_app/config/empty.php b/lib/Cake/tests/test_app/config/empty.php
similarity index 100%
rename from cake/tests/test_app/config/empty.php
rename to lib/Cake/tests/test_app/config/empty.php
diff --git a/cake/tests/test_app/config/htmlhelper_minimized.ini b/lib/Cake/tests/test_app/config/htmlhelper_minimized.ini
similarity index 100%
rename from cake/tests/test_app/config/htmlhelper_minimized.ini
rename to lib/Cake/tests/test_app/config/htmlhelper_minimized.ini
diff --git a/cake/tests/test_app/config/htmlhelper_tags.php b/lib/Cake/tests/test_app/config/htmlhelper_tags.php
similarity index 100%
rename from cake/tests/test_app/config/htmlhelper_tags.php
rename to lib/Cake/tests/test_app/config/htmlhelper_tags.php
diff --git a/cake/tests/test_app/config/nested.ini b/lib/Cake/tests/test_app/config/nested.ini
similarity index 100%
rename from cake/tests/test_app/config/nested.ini
rename to lib/Cake/tests/test_app/config/nested.ini
diff --git a/cake/tests/test_app/config/no_section.ini b/lib/Cake/tests/test_app/config/no_section.ini
similarity index 100%
rename from cake/tests/test_app/config/no_section.ini
rename to lib/Cake/tests/test_app/config/no_section.ini
diff --git a/cake/tests/test_app/config/routes.php b/lib/Cake/tests/test_app/config/routes.php
similarity index 100%
rename from cake/tests/test_app/config/routes.php
rename to lib/Cake/tests/test_app/config/routes.php
diff --git a/cake/tests/test_app/config/var_test.php b/lib/Cake/tests/test_app/config/var_test.php
similarity index 100%
rename from cake/tests/test_app/config/var_test.php
rename to lib/Cake/tests/test_app/config/var_test.php
diff --git a/cake/tests/test_app/config/var_test2.php b/lib/Cake/tests/test_app/config/var_test2.php
similarity index 100%
rename from cake/tests/test_app/config/var_test2.php
rename to lib/Cake/tests/test_app/config/var_test2.php
diff --git a/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/default.po b/lib/Cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/default.po
similarity index 100%
rename from cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/default.po
rename to lib/Cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/default.po
diff --git a/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom1.po b/lib/Cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom1.po
similarity index 100%
rename from cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom1.po
rename to lib/Cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom1.po
diff --git a/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom2.po b/lib/Cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom2.po
similarity index 100%
rename from cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom2.po
rename to lib/Cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom2.po
diff --git a/cake/tests/test_app/locale/ja_jp/LC_TIME b/lib/Cake/tests/test_app/locale/ja_jp/LC_TIME
similarity index 100%
rename from cake/tests/test_app/locale/ja_jp/LC_TIME
rename to lib/Cake/tests/test_app/locale/ja_jp/LC_TIME
diff --git a/cake/tests/test_app/locale/po/LC_MESSAGES/default.po b/lib/Cake/tests/test_app/locale/po/LC_MESSAGES/default.po
similarity index 100%
rename from cake/tests/test_app/locale/po/LC_MESSAGES/default.po
rename to lib/Cake/tests/test_app/locale/po/LC_MESSAGES/default.po
diff --git a/cake/tests/test_app/locale/po/LC_MONETARY/default.po b/lib/Cake/tests/test_app/locale/po/LC_MONETARY/default.po
similarity index 100%
rename from cake/tests/test_app/locale/po/LC_MONETARY/default.po
rename to lib/Cake/tests/test_app/locale/po/LC_MONETARY/default.po
diff --git a/cake/tests/test_app/locale/po/LC_TIME b/lib/Cake/tests/test_app/locale/po/LC_TIME
similarity index 100%
rename from cake/tests/test_app/locale/po/LC_TIME
rename to lib/Cake/tests/test_app/locale/po/LC_TIME
diff --git a/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/core.mo b/lib/Cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/core.mo
rename to lib/Cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/core.mo
diff --git a/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/default.mo b/lib/Cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/default.mo
rename to lib/Cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/default.mo
diff --git a/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/core.po b/lib/Cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/core.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/core.po
rename to lib/Cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/core.po
diff --git a/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/default.po b/lib/Cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/default.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/default.po
rename to lib/Cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/default.po
diff --git a/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/core.mo b/lib/Cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/core.mo
rename to lib/Cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/core.mo
diff --git a/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/default.mo b/lib/Cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/default.mo
rename to lib/Cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/default.mo
diff --git a/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/core.po b/lib/Cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/core.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/core.po
rename to lib/Cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/core.po
diff --git a/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/default.po b/lib/Cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/default.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/default.po
rename to lib/Cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/default.po
diff --git a/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/core.mo b/lib/Cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/core.mo
rename to lib/Cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/core.mo
diff --git a/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/default.mo b/lib/Cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/default.mo
rename to lib/Cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/default.mo
diff --git a/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/core.po b/lib/Cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/core.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/core.po
rename to lib/Cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/core.po
diff --git a/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/default.po b/lib/Cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/default.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/default.po
rename to lib/Cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/default.po
diff --git a/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/core.mo b/lib/Cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/core.mo
rename to lib/Cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/core.mo
diff --git a/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/default.mo b/lib/Cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/default.mo
rename to lib/Cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/default.mo
diff --git a/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/core.po b/lib/Cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/core.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/core.po
rename to lib/Cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/core.po
diff --git a/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/default.po b/lib/Cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/default.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/default.po
rename to lib/Cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/default.po
diff --git a/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/core.mo b/lib/Cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/core.mo
rename to lib/Cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/core.mo
diff --git a/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/default.mo b/lib/Cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/default.mo
rename to lib/Cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/default.mo
diff --git a/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/core.po b/lib/Cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/core.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/core.po
rename to lib/Cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/core.po
diff --git a/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/default.po b/lib/Cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/default.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/default.po
rename to lib/Cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/default.po
diff --git a/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/core.mo b/lib/Cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/core.mo
rename to lib/Cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/core.mo
diff --git a/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/default.mo b/lib/Cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/default.mo
rename to lib/Cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/default.mo
diff --git a/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/core.po b/lib/Cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/core.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/core.po
rename to lib/Cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/core.po
diff --git a/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/default.po b/lib/Cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/default.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/default.po
rename to lib/Cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/default.po
diff --git a/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/core.mo b/lib/Cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/core.mo
rename to lib/Cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/core.mo
diff --git a/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/default.mo b/lib/Cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/default.mo
rename to lib/Cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/default.mo
diff --git a/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/core.po b/lib/Cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/core.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/core.po
rename to lib/Cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/core.po
diff --git a/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/default.po b/lib/Cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/default.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/default.po
rename to lib/Cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/default.po
diff --git a/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/core.mo b/lib/Cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/core.mo
rename to lib/Cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/core.mo
diff --git a/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/default.mo b/lib/Cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/default.mo
rename to lib/Cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/default.mo
diff --git a/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/core.po b/lib/Cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/core.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/core.po
rename to lib/Cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/core.po
diff --git a/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/default.po b/lib/Cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/default.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/default.po
rename to lib/Cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/default.po
diff --git a/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/core.mo b/lib/Cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/core.mo
rename to lib/Cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/core.mo
diff --git a/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/default.mo b/lib/Cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/default.mo
rename to lib/Cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/default.mo
diff --git a/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/core.po b/lib/Cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/core.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/core.po
rename to lib/Cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/core.po
diff --git a/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/default.po b/lib/Cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/default.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/default.po
rename to lib/Cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/default.po
diff --git a/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/core.mo b/lib/Cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/core.mo
rename to lib/Cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/core.mo
diff --git a/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/default.mo b/lib/Cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/default.mo
rename to lib/Cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/default.mo
diff --git a/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/core.po b/lib/Cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/core.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/core.po
rename to lib/Cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/core.po
diff --git a/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/default.po b/lib/Cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/default.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/default.po
rename to lib/Cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/default.po
diff --git a/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/core.mo b/lib/Cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/core.mo
rename to lib/Cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/core.mo
diff --git a/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/default.mo b/lib/Cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/default.mo
rename to lib/Cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/default.mo
diff --git a/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/core.po b/lib/Cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/core.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/core.po
rename to lib/Cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/core.po
diff --git a/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/default.po b/lib/Cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/default.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/default.po
rename to lib/Cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/default.po
diff --git a/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/core.mo b/lib/Cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/core.mo
rename to lib/Cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/core.mo
diff --git a/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/default.mo b/lib/Cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/default.mo
rename to lib/Cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/default.mo
diff --git a/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/core.po b/lib/Cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/core.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/core.po
rename to lib/Cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/core.po
diff --git a/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/default.po b/lib/Cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/default.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/default.po
rename to lib/Cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/default.po
diff --git a/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/core.mo b/lib/Cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/core.mo
rename to lib/Cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/core.mo
diff --git a/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/default.mo b/lib/Cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/default.mo
rename to lib/Cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/default.mo
diff --git a/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/core.po b/lib/Cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/core.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/core.po
rename to lib/Cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/core.po
diff --git a/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/default.po b/lib/Cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/default.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/default.po
rename to lib/Cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/default.po
diff --git a/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/core.mo b/lib/Cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/core.mo
rename to lib/Cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/core.mo
diff --git a/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/default.mo b/lib/Cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/default.mo
rename to lib/Cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/default.mo
diff --git a/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/core.po b/lib/Cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/core.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/core.po
rename to lib/Cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/core.po
diff --git a/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/default.po b/lib/Cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/default.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/default.po
rename to lib/Cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/default.po
diff --git a/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/core.mo b/lib/Cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/core.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/core.mo
rename to lib/Cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/core.mo
diff --git a/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/default.mo b/lib/Cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/default.mo
similarity index 100%
rename from cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/default.mo
rename to lib/Cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/default.mo
diff --git a/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/core.po b/lib/Cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/core.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/core.po
rename to lib/Cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/core.po
diff --git a/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/default.po b/lib/Cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/default.po
similarity index 100%
rename from cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/default.po
rename to lib/Cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/default.po
diff --git a/cake/tests/test_app/locale/time_test/LC_TIME b/lib/Cake/tests/test_app/locale/time_test/LC_TIME
similarity index 100%
rename from cake/tests/test_app/locale/time_test/LC_TIME
rename to lib/Cake/tests/test_app/locale/time_test/LC_TIME
diff --git a/cake/tests/test_app/plugins/plugin_js/webroot/js/one/plugin_one.js b/lib/Cake/tests/test_app/plugins/plugin_js/webroot/js/one/plugin_one.js
similarity index 100%
rename from cake/tests/test_app/plugins/plugin_js/webroot/js/one/plugin_one.js
rename to lib/Cake/tests/test_app/plugins/plugin_js/webroot/js/one/plugin_one.js
diff --git a/cake/tests/test_app/plugins/plugin_js/webroot/js/plugin_js.js b/lib/Cake/tests/test_app/plugins/plugin_js/webroot/js/plugin_js.js
similarity index 100%
rename from cake/tests/test_app/plugins/plugin_js/webroot/js/plugin_js.js
rename to lib/Cake/tests/test_app/plugins/plugin_js/webroot/js/plugin_js.js
diff --git a/cake/tests/test_app/plugins/test_plugin_two/console/shells/tasks/empty b/lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/Task/empty
similarity index 100%
rename from cake/tests/test_app/plugins/test_plugin_two/console/shells/tasks/empty
rename to lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/Task/empty
diff --git a/cake/tests/test_app/plugins/test_plugin/console/shells/tasks/other_task.php b/lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/Task/other_task.php
similarity index 100%
rename from cake/tests/test_app/plugins/test_plugin/console/shells/tasks/other_task.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/Task/other_task.php
diff --git a/cake/tests/test_app/plugins/test_plugin/console/shells/example.php b/lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/example.php
similarity index 100%
rename from cake/tests/test_app/plugins/test_plugin/console/shells/example.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Console/Command/example.php
diff --git a/cake/tests/test_app/plugins/test_plugin_two/console/templates/empty b/lib/Cake/tests/test_app/plugins/test_plugin/Console/templates/empty
similarity index 100%
rename from cake/tests/test_app/plugins/test_plugin_two/console/templates/empty
rename to lib/Cake/tests/test_app/plugins/test_plugin/Console/templates/empty
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php b/lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/other_component.php
similarity index 100%
rename from cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/other_component.php
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php b/lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/plugins_component.php
similarity index 100%
rename from cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/plugins_component.php
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php b/lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/test_plugin_component.php
similarity index 100%
rename from cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/test_plugin_component.php
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php b/lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/test_plugin_other_component.php
similarity index 100%
rename from cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Controller/Component/test_plugin_other_component.php
diff --git a/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php b/lib/Cake/tests/test_app/plugins/test_plugin/Controller/test_plugin_app_controller.php
similarity index 100%
rename from cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Controller/test_plugin_app_controller.php
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php b/lib/Cake/tests/test_app/plugins/test_plugin/Controller/test_plugin_controller.php
similarity index 100%
rename from cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Controller/test_plugin_controller.php
diff --git a/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php b/lib/Cake/tests/test_app/plugins/test_plugin/Controller/tests_controller.php
similarity index 100%
rename from cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Controller/tests_controller.php
diff --git a/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php b/lib/Cake/tests/test_app/plugins/test_plugin/Lib/Cache/Engine/TestPluginCacheEngine.php
similarity index 100%
rename from cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Lib/Cache/Engine/TestPluginCacheEngine.php
diff --git a/lib/Cake/tests/test_app/plugins/test_plugin/Lib/Custom/Package/CustomLibClass.php b/lib/Cake/tests/test_app/plugins/test_plugin/Lib/Custom/Package/CustomLibClass.php
new file mode 100644
index 000000000..70c86ff40
--- /dev/null
+++ b/lib/Cake/tests/test_app/plugins/test_plugin/Lib/Custom/Package/CustomLibClass.php
@@ -0,0 +1,19 @@
+
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.5432
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+class CustomLibClass {}
diff --git a/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php b/lib/Cake/tests/test_app/plugins/test_plugin/Lib/Log/Engine/TestPluginLog.php
similarity index 100%
rename from cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Lib/Log/Engine/TestPluginLog.php
diff --git a/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php b/lib/Cake/tests/test_app/plugins/test_plugin/Lib/test_plugin_library.php
similarity index 100%
rename from cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Lib/test_plugin_library.php
diff --git a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php b/lib/Cake/tests/test_app/plugins/test_plugin/Model/Behavior/test_plugin_persister_one.php
similarity index 100%
rename from cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Model/Behavior/test_plugin_persister_one.php
diff --git a/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php b/lib/Cake/tests/test_app/plugins/test_plugin/Model/Behavior/test_plugin_persister_two.php
similarity index 100%
rename from cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Model/Behavior/test_plugin_persister_two.php
diff --git a/cake/tests/test_app/plugins/test_plugin/models/datasources/dbo/dbo_dummy.php b/lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/Database/DboDummy.php
similarity index 100%
rename from cake/tests/test_app/plugins/test_plugin/models/datasources/dbo/dbo_dummy.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/Database/DboDummy.php
diff --git a/cake/tests/test_app/plugins/test_plugin/models/datasources/test/test_driver.php b/lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/Database/TestDriver.php
similarity index 97%
rename from cake/tests/test_app/plugins/test_plugin/models/datasources/test/test_driver.php
rename to lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/Database/TestDriver.php
index eb7706642..91a1d3f2b 100644
--- a/cake/tests/test_app/plugins/test_plugin/models/datasources/test/test_driver.php
+++ b/lib/Cake/tests/test_app/plugins/test_plugin/Model/Datasource/Database/TestDriver.php
@@ -1,4 +1,3 @@
 
        
 	
        \n";
-			echo "\t\t\t\t" . $this->Html->link(__('View'), array('controller' => $_details['controller'], 'action' => 'view', ${$otherSingularVar}[$_details['primaryKey']])). "\n";
-			echo "\t\t\t\t" . $this->Html->link(__('Edit'), array('controller' => $_details['controller'], 'action' => 'edit', ${$otherSingularVar}[$_details['primaryKey']])). "\n";
-			echo "\t\t\t\t" . $this->Html->link(__('Delete'), array('controller' => $_details['controller'], 'action' => 'delete', ${$otherSingularVar}[$_details['primaryKey']]), null, __('Are you sure you want to delete', true).' #' . ${$otherSingularVar}[$_details['primaryKey']] . '?'). "\n";
+			echo "\t\t\t\t" . $this->Html->link(__d('cake', 'View'), array('controller' => $_details['controller'], 'action' => 'view', ${$otherSingularVar}[$_details['primaryKey']])). "\n";
+			echo "\t\t\t\t" . $this->Html->link(__d('cake', 'Edit'), array('controller' => $_details['controller'], 'action' => 'edit', ${$otherSingularVar}[$_details['primaryKey']])). "\n";
+			echo "\t\t\t\t" . $this->Html->link(__d('cake', 'Delete'), array('controller' => $_details['controller'], 'action' => 'delete', ${$otherSingularVar}[$_details['primaryKey']]), null, __d('cake', 'Are you sure you want to delete', true).' #' . ${$otherSingularVar}[$_details['primaryKey']] . '?'). "\n";
 			echo "\t\t\t