Permalink
Browse files

Updated the paths from comments.

  • Loading branch information...
1 parent d220ee5 commit 1c7d54eacc29ea2b590c48f92b2801a9b1927f0f @jrbasso jrbasso committed Jun 20, 2011
View
@@ -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/<name>.php.
+ * To define a custom session handler, save it at /app/Model/Datasource/Session/<name>.php.
* Make sure the class implements `CakeSessionHandlerInterface` and set Session.handler to <name>
*
- * 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
*
*/
@@ -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
View
@@ -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'));
/**
View
@@ -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
View
@@ -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
@@ -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', '<error>Unable to write to</error> /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', '<error>Unable to write to</error> /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 . '_';
@@ -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/<name>.php.
+ * To define a custom session handler, save it at /app/Model/Datasource/Session/<name>.php.
* Make sure the class implements `CakeSessionHandlerInterface` and set Session.handler to <name>
*
- * 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
*
*/
@@ -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
@@ -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'));
@@ -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.
@@ -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/<sub_folder> without the .ctp extension.
+ * is the filename in /app/View/<SubFolder> 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
View
@@ -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
*
@@ -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
View
@@ -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) {
@@ -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.
View
@@ -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:
*
@@ -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
*/
View
@@ -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) {
@@ -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.
@@ -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
*/
@@ -1,6 +1,6 @@
<?php
/**
- * Test suite app/libs session handler
+ * Test suite app/Model/Datasource/Session session handler
*
*/
class TestAppLibSession implements CakeSessionHandlerInterface {
@@ -97,8 +97,8 @@ if (!empty($filePresent)):
<a href="https://trac.cakephp.org/wiki/notes/1.2.x.x"><?php echo __d('cake', 'Read the release notes and get the latest version'); ?> </a>
<h2><?php echo __d('cake', 'Editing this Page'); ?></h2>
<p>
-<?php echo __d('cake', 'To change the content of this page, create: /app/views/pages/home.ctp.'); ?><br />
-<?php echo __d('cake', 'To change its layout, create: /app/views/layouts/default.ctp.'); ?><br />
+<?php echo __d('cake', 'To change the content of this page, create: /app/View/Pages/home.ctp.'); ?><br />
+<?php echo __d('cake', 'To change its layout, create: /app/View/Layouts/default.ctp.'); ?><br />
<a href="http://manual.cakephp.org/"><?php echo __d('cake', 'See the views section of the manual for more info.'); ?> </a><br />
<?php echo __d('cake', 'You can also add some CSS styles for your pages at: app/webroot/css/.'); ?>
</p>
@@ -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);
}
}
@@ -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
*/
View
@@ -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

0 comments on commit 1c7d54e

Please sign in to comment.