diff --git a/app/Config/core.php b/app/Config/core.php index 22d01a01a88..1b6fe902b37 100644 --- a/app/Config/core.php +++ b/app/Config/core.php @@ -65,7 +65,7 @@ * - `handler` - callback - The callback to handle exceptions. You can set this to any callback type, * including anonymous functions. * - `renderer` - string - The class responsible for rendering uncaught exceptions. If you choose a custom class you - * should place the file for that class in app/libs. This class needs to implement a render method. + * should place the file for that class in app/Error. This class needs to implement a render method. * - `log` - boolean - Should Exceptions be logged? * * @see ErrorHandler for more information on exception handling and configuration. @@ -165,10 +165,10 @@ * - 'database' - Uses CakePHP's database sessions. * - 'cache' - Use the Cache class to save sessions. * - * To define a custom session handler, save it at /app/libs/session/.php. + * To define a custom session handler, save it at /app/Model/Datasource/Session/.php. * Make sure the class implements `CakeSessionHandlerInterface` and set Session.handler to * - * To use database sessions, run the app/config/schema/sessions.php schema using + * To use database sessions, run the app/Config/Schema/sessions.php schema using * the cake shell command: cake schema create Sessions * */ diff --git a/app/Config/database.php.default b/app/Config/database.php.default index bc56aee0614..d23755291c8 100644 --- a/app/Config/database.php.default +++ b/app/Config/database.php.default @@ -35,7 +35,7 @@ * Database/Oracle - Oracle 8 and higher * * You can add custom database drivers (or override existing drivers) by adding the - * appropriate file to app/models/datasources/database. Drivers should be named 'MyDriver.php', + * appropriate file to app/Model/Datasource/Database. Drivers should be named 'MyDriver.php', * * * persistent => true / false diff --git a/app/Config/routes.php b/app/Config/routes.php index 2c872f84271..72ef866d8af 100644 --- a/app/Config/routes.php +++ b/app/Config/routes.php @@ -23,7 +23,7 @@ /** * Here, we are connecting '/' (base path) to controller called 'Pages', * its action called 'display', and we pass a param to select the view file - * to use (in this case, /app/views/pages/home.ctp)... + * to use (in this case, /app/View/Pages/home.ctp)... */ Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home')); /** diff --git a/index.php b/index.php index 931997aa041..1dfeb30c8f5 100644 --- a/index.php +++ b/index.php @@ -4,7 +4,7 @@ * * This file collects requests if: * - no mod_rewrite is avilable or .htaccess files are not supported - * - requires App.baseUrl to be uncommented in app/config/core.php + * - requires App.baseUrl to be uncommented in app/Config/core.php * - app/webroot is not set as a document root. * * PHP 5 diff --git a/lib/Cake/Cache/Cache.php b/lib/Cake/Cache/Cache.php index 61fbc85a2e3..06577ec27ce 100644 --- a/lib/Cake/Cache/Cache.php +++ b/lib/Cake/Cache/Cache.php @@ -106,7 +106,7 @@ class Cache { * - `user` Used by Xcache. Username for XCache * - `password` Used by Xcache. Password for XCache * - * @see app/config/core.php for configuration settings + * @see app/Config/core.php for configuration settings * @param string $name Name of the configuration * @param array $settings Optional associative array of settings passed to the engine * @return array(engine, settings) on success, false on failure diff --git a/lib/Cake/Console/Command/Task/ProjectTask.php b/lib/Cake/Console/Command/Task/ProjectTask.php index a7c8d4d0a36..d3a79c0ec62 100644 --- a/lib/Cake/Console/Command/Task/ProjectTask.php +++ b/lib/Cake/Console/Command/Task/ProjectTask.php @@ -308,7 +308,7 @@ public function corePath($path) { } /** - * Enables Configure::read('Routing.prefixes') in /app/config/core.php + * Enables Configure::read('Routing.prefixes') in /app/Config/core.php * * @param string $name Name to use as admin routing * @return boolean Success @@ -358,15 +358,15 @@ public function getPrefix() { } if ($this->interactive) { $this->hr(); - $this->out(__d('cake_console', 'You need to enable Configure::write(\'Routing.prefixes\',array(\'admin\')) in /app/config/core.php to use prefix routing.')); + $this->out(__d('cake_console', 'You need to enable Configure::write(\'Routing.prefixes\',array(\'admin\')) in /app/Config/core.php to use prefix routing.')); $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(__d('cake_console', 'Enter a routing prefix:'), null, 'admin'); } if ($this->cakeAdmin($admin) !== true) { - $this->out(__d('cake_console', 'Unable to write to /app/config/core.php.')); - $this->out(__d('cake_console', 'You need to enable Configure::write(\'Routing.prefixes\',array(\'admin\')) in /app/config/core.php to use prefix routing.')); + $this->out(__d('cake_console', 'Unable to write to /app/Config/core.php.')); + $this->out(__d('cake_console', 'You need to enable Configure::write(\'Routing.prefixes\',array(\'admin\')) in /app/Config/core.php to use prefix routing.')); $this->_stop(); } return $admin . '_'; diff --git a/lib/Cake/Console/Templates/skel/Config/core.php b/lib/Cake/Console/Templates/skel/Config/core.php index 22d01a01a88..1b6fe902b37 100644 --- a/lib/Cake/Console/Templates/skel/Config/core.php +++ b/lib/Cake/Console/Templates/skel/Config/core.php @@ -65,7 +65,7 @@ * - `handler` - callback - The callback to handle exceptions. You can set this to any callback type, * including anonymous functions. * - `renderer` - string - The class responsible for rendering uncaught exceptions. If you choose a custom class you - * should place the file for that class in app/libs. This class needs to implement a render method. + * should place the file for that class in app/Error. This class needs to implement a render method. * - `log` - boolean - Should Exceptions be logged? * * @see ErrorHandler for more information on exception handling and configuration. @@ -165,10 +165,10 @@ * - 'database' - Uses CakePHP's database sessions. * - 'cache' - Use the Cache class to save sessions. * - * To define a custom session handler, save it at /app/libs/session/.php. + * To define a custom session handler, save it at /app/Model/Datasource/Session/.php. * Make sure the class implements `CakeSessionHandlerInterface` and set Session.handler to * - * To use database sessions, run the app/config/schema/sessions.php schema using + * To use database sessions, run the app/Config/Schema/sessions.php schema using * the cake shell command: cake schema create Sessions * */ diff --git a/lib/Cake/Console/Templates/skel/Config/database.php.default b/lib/Cake/Console/Templates/skel/Config/database.php.default index bc56aee0614..d23755291c8 100644 --- a/lib/Cake/Console/Templates/skel/Config/database.php.default +++ b/lib/Cake/Console/Templates/skel/Config/database.php.default @@ -35,7 +35,7 @@ * Database/Oracle - Oracle 8 and higher * * You can add custom database drivers (or override existing drivers) by adding the - * appropriate file to app/models/datasources/database. Drivers should be named 'MyDriver.php', + * appropriate file to app/Model/Datasource/Database. Drivers should be named 'MyDriver.php', * * * persistent => true / false diff --git a/lib/Cake/Console/Templates/skel/Config/routes.php b/lib/Cake/Console/Templates/skel/Config/routes.php index 4c2d479f7c8..f2a360bf460 100644 --- a/lib/Cake/Console/Templates/skel/Config/routes.php +++ b/lib/Cake/Console/Templates/skel/Config/routes.php @@ -24,7 +24,7 @@ /** * Here, we are connecting '/' (base path) to controller called 'Pages', * its action called 'display', and we pass a param to select the view file - * to use (in this case, /app/views/pages/home.ctp)... + * to use (in this case, /app/View/Pages/home.ctp)... */ Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home')); diff --git a/lib/Cake/Controller/Component/RequestHandlerComponent.php b/lib/Cake/Controller/Component/RequestHandlerComponent.php index 22181ba5b13..ca1d28aae0c 100644 --- a/lib/Cake/Controller/Component/RequestHandlerComponent.php +++ b/lib/Cake/Controller/Component/RequestHandlerComponent.php @@ -133,9 +133,9 @@ public function initialize($controller, $settings = array()) { * - Disabling layout rendering for Ajax requests (based on the HTTP_X_REQUESTED_WITH header) * - If Router::parseExtensions() is enabled, the layout and template type are * switched based on the parsed extension or Accept-Type header. For example, if `controller/action.xml` - * is requested, the view path becomes `app/views/controller/xml/action.ctp`. Also if + * is requested, the view path becomes `app/View/Controller/xml/action.ctp`. Also if * `controller/action` is requested with `Accept-Type: application/xml` in the headers - * the view path will become `app/views/controller/xml/action.ctp`. + * the view path will become `app/View/Controller/xml/action.ctp`. * - If a helper with the same name as the extension exists, it is added to the controller. * - If the extension is of a type that RequestHandler understands, it will set that * Content-type in the response header. diff --git a/lib/Cake/Controller/Controller.php b/lib/Cake/Controller/Controller.php index d41679be2eb..255319d72e6 100644 --- a/lib/Cake/Controller/Controller.php +++ b/lib/Cake/Controller/Controller.php @@ -136,7 +136,7 @@ class Controller extends Object { /** * The name of the view file to render. The name specified - * is the filename in /app/views/ without the .ctp extension. + * is the filename in /app/View/ without the .ctp extension. * * @var string * @link http://book.cakephp.org/view/962/Page-related-Attributes-layout-and-pageTitle @@ -145,7 +145,7 @@ class Controller extends Object { /** * The name of the layout file to render the view inside of. The name specified - * is the filename of the layout in /app/views/layouts without the .ctp + * is the filename of the layout in /app/View/Layouts without the .ctp * extension. * * @var string diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php index e928c614514..4cd87d98f36 100644 --- a/lib/Cake/Core/App.php +++ b/lib/Cake/Core/App.php @@ -36,7 +36,7 @@ * * For instance if you'd like to use your own HttpSocket class, put it under * - * app/libs/Network/Http/HttpSocket.php + * app/Network/Http/HttpSocket.php * * ### Inspecting loaded paths * diff --git a/lib/Cake/Core/Configure.php b/lib/Cake/Core/Configure.php index 0ba016c3391..91160ca9ece 100644 --- a/lib/Cake/Core/Configure.php +++ b/lib/Cake/Core/Configure.php @@ -53,10 +53,10 @@ class Configure { * Bootstrapping includes the following steps: * * - Setup App array in Configure. - * - Include app/config/core.php. + * - Include app/Config/core.php. * - Configure core cache configurations. * - Load App cache files. - * - Include app/config/bootstrap.php. + * - Include app/Config/bootstrap.php. * - Setup error/exception handlers. * * @return void diff --git a/lib/Cake/Core/Object.php b/lib/Cake/Core/Object.php index f3218092d70..2a5ac321e4d 100644 --- a/lib/Cake/Core/Object.php +++ b/lib/Cake/Core/Object.php @@ -134,7 +134,7 @@ protected function _stop($status = 0) { * for more information on writing to logs. * * @param string $msg Log message - * @param integer $type Error type constant. Defined in app/config/core.php. + * @param integer $type Error type constant. Defined in app/Config/core.php. * @return boolean Success of log write */ public function log($msg, $type = LOG_ERROR) { diff --git a/lib/Cake/Error/ErrorHandler.php b/lib/Cake/Error/ErrorHandler.php index 7c2fe621bad..8c939ea86c6 100644 --- a/lib/Cake/Error/ErrorHandler.php +++ b/lib/Cake/Error/ErrorHandler.php @@ -46,7 +46,7 @@ * #### Create your own Exception handler with `Exception.handler` * * This gives you full control over the exception handling process. The class you choose should be - * loaded in your app/config/bootstrap.php, so its available to handle any exceptions. You can + * loaded in your app/Config/bootstrap.php, so its available to handle any exceptions. You can * define the handler as any callback type. Using Exception.handler overrides all other exception * handling settings and logic. * @@ -60,7 +60,7 @@ * * If you don't want to take control of the exception handling, but want to change how exceptions are * rendered you can use `Exception.renderer` to choose a class to render exception pages. By default - * `ExceptionRenderer` is used. Your custom exception renderer class should be placed in app/Lib/Error. + * `ExceptionRenderer` is used. Your custom exception renderer class should be placed in app/Error. * * Your custom renderer should expect an exception in its constructor, and implement a render method. * Failing to do so will cause additional errors. diff --git a/lib/Cake/Log/CakeLog.php b/lib/Cake/Log/CakeLog.php index f586ce3aaa2..712376cfb40 100644 --- a/lib/Cake/Log/CakeLog.php +++ b/lib/Cake/Log/CakeLog.php @@ -56,7 +56,7 @@ class CakeLog { /** * Configure and add a new logging stream to CakeLog - * You can use add loggers from app/libs use app.loggername, or any plugin/libs using plugin.loggername. + * You can use add loggers from app/Log/Engine use app.loggername, or any plugin/Log/Engine using plugin.loggername. * * ### Usage: * diff --git a/lib/Cake/Model/ConnectionManager.php b/lib/Cake/Model/ConnectionManager.php index a4dc180f94c..49b27aa4067 100644 --- a/lib/Cake/Model/ConnectionManager.php +++ b/lib/Cake/Model/ConnectionManager.php @@ -2,7 +2,7 @@ /** * Datasource connection manager * - * Provides an interface for loading and enumerating connections defined in app/config/database.php + * Provides an interface for loading and enumerating connections defined in app/Config/database.php * * PHP 5 * @@ -75,7 +75,7 @@ private static function init() { /** * Gets a reference to a DataSource object * - * @param string $name The name of the DataSource, as defined in app/config/database.php + * @param string $name The name of the DataSource, as defined in app/Config/database.php * @return object Instance * @throws MissingDatasourceConfigException * @throws MissingDatasourceFileException @@ -140,9 +140,9 @@ public static function getSourceName($source) { /** * Loads the DataSource class for the given connection name * - * @param mixed $connName A string name of the connection, as defined in app/config/database.php, + * @param mixed $connName A string name of the connection, as defined in app/Config/database.php, * or an array containing the filename (without extension) and class name of the object, - * to be found in app/models/datasources/ or cake/libs/model/datasources/. + * to be found in app/Model/Datasource/ or lib/Cake/Model/Datasource/. * @return boolean True on success, null on failure or false if the class is already loaded * @throws MissingDatasourceFileException */ diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php index dcf156c0ded..bdcf3a2d669 100644 --- a/lib/Cake/Model/Model.php +++ b/lib/Cake/Model/Model.php @@ -2849,7 +2849,7 @@ public function getAffectedRows() { /** * Sets the DataSource to which this model is bound. * - * @param string $dataSource The name of the DataSource, as defined in app/config/database.php + * @param string $dataSource The name of the DataSource, as defined in app/Config/database.php * @return boolean True on success */ public function setDataSource($dataSource = null) { diff --git a/lib/Cake/Routing/Dispatcher.php b/lib/Cake/Routing/Dispatcher.php index 078f3cec8f8..23c0ad207b3 100644 --- a/lib/Cake/Routing/Dispatcher.php +++ b/lib/Cake/Routing/Dispatcher.php @@ -166,7 +166,7 @@ protected function _invoke(Controller $controller, CakeRequest $request) { /** * Applies Routing and additionalParameters to the request to be dispatched. - * If Routes have not been loaded they will be loaded, and app/config/routes.php will be run. + * If Routes have not been loaded they will be loaded, and app/Config/routes.php will be run. * * @param CakeRequest $request CakeRequest object to mine for parameter information. * @param array $additionalParams An array of additional parameters to set to the request. diff --git a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php index dddc2d60b26..67f7c1860b1 100644 --- a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php @@ -521,7 +521,7 @@ public function testReadAndWriteWithCakeStorage() { } /** - * test using a handler from app/libs. + * test using a handler from app/Model/Datasource/Session. * * @return void */ diff --git a/lib/Cake/Test/test_app/Model/Datasource/Session/TestAppLibSession.php b/lib/Cake/Test/test_app/Model/Datasource/Session/TestAppLibSession.php index a347404c0c4..93529c267c3 100644 --- a/lib/Cake/Test/test_app/Model/Datasource/Session/TestAppLibSession.php +++ b/lib/Cake/Test/test_app/Model/Datasource/Session/TestAppLibSession.php @@ -1,6 +1,6 @@

-
-
+
+

diff --git a/lib/Cake/Utility/Debugger.php b/lib/Cake/Utility/Debugger.php index 1d058d8ae7d..002b8de936a 100644 --- a/lib/Cake/Utility/Debugger.php +++ b/lib/Cake/Utility/Debugger.php @@ -644,11 +644,11 @@ public function outputError($data) { */ public static function checkSecurityKeys() { if (Configure::read('Security.salt') == 'DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi') { - 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); + 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(__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); + 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/lib/Cake/View/ThemeView.php b/lib/Cake/View/ThemeView.php index 8e11b30301c..3f440911097 100644 --- a/lib/Cake/View/ThemeView.php +++ b/lib/Cake/View/ThemeView.php @@ -26,7 +26,7 @@ * the default app view files will be used. You can set `$this->theme` and `$this->viewClass = 'Theme'` * in your Controller to use the ThemeView. * - * Example of theme path with `$this->theme = 'super_hot';` Would be `app/views/themed/super_hot/posts` + * Example of theme path with `$this->theme = 'super_hot';` Would be `app/View/Themed/SuperHot/Posts` * * @package cake.libs.view */ diff --git a/lib/Cake/View/View.php b/lib/Cake/View/View.php index fa47a526f77..c08559c895f 100644 --- a/lib/Cake/View/View.php +++ b/lib/Cake/View/View.php @@ -289,7 +289,7 @@ public function __construct($controller) { * This realizes the concept of Elements, (or "partial layouts") and the $params array is used to send * data to be used in the element. Elements can be cached improving performance by using the `cache` option. * - * @param string $name Name of template file in the/app/views/elements/ folder + * @param string $name Name of template file in the/app/View/Elements/ folder * @param array $data Array of data to be made available to the rendered view (i.e. the Element) * @param array $options Array of options. Possible keys are: * - `cache` - Can either be `true`, to enable caching using the config in View::$elementCache. Or an array