Browse Source

Update config folder path in templates, comments, docblocks.

ADmad 11 years ago
parent
commit
b27976b2b7

+ 1 - 1
src/Cache/Cache.php

@@ -56,7 +56,7 @@ use Cake\Error;
  *
  * See Cache engine documentation for expected configuration keys.
  *
- * @see app/Config/core.php for configuration settings
+ * @see config/app.php for configuration settings
  * @param string $name Name of the configuration
  * @param array $config Optional associative array of settings passed to the engine
  * @return array [engine, settings] on success, false on failure

+ 1 - 1
src/Console/Command/BakeShell.php

@@ -73,7 +73,7 @@ class BakeShell extends Shell {
 		$connections = ConnectionManager::configured();
 		if (empty($connections)) {
 			$this->out(__d('cake_console', 'Your database configuration was not found.'));
-			$this->out(__d('cake_console', 'Add your database connection information to App/Config/app.php.'));
+			$this->out(__d('cake_console', 'Add your database connection information to config/app.php.'));
 			return false;
 		}
 		$this->out(__d('cake_console', 'The following commands can be used to generate skeleton code for your application.'));

+ 3 - 3
src/Console/Command/Task/PluginTask.php

@@ -47,7 +47,7 @@ class PluginTask extends BakeTask {
  */
 	public function initialize() {
 		$this->path = current(App::path('Plugin'));
-		$this->bootstrap = APP . 'Config' . DS . 'bootstrap.php';
+		$this->bootstrap = ROOT . 'config' . DS . 'bootstrap.php';
 	}
 
 /**
@@ -97,7 +97,7 @@ class PluginTask extends BakeTask {
 		if (strtolower($looksGood) === 'y') {
 			$Folder = new Folder($this->path . $plugin);
 			$directories = [
-				$classBase . DS . 'Config',
+				'config',
 				$classBase . DS . 'Model' . DS . 'Behavior',
 				$classBase . DS . 'Model' . DS . 'Table',
 				$classBase . DS . 'Model' . DS . 'Entity',
@@ -188,7 +188,7 @@ class PluginTask extends BakeTask {
 		]);
 		$this->out( __d('cake_console', 'Generating routes.php file...'));
 		$out = $this->Template->generate('config', 'routes');
-		$file = $path . $plugin . DS . 'src' . DS . 'Config' . DS . 'routes.php';
+		$file = $path . $plugin . DS . 'config' . DS . 'routes.php';
 		$this->createFile($file, $out);
 	}
 

+ 1 - 1
src/Console/Command/Task/ProjectTask.php

@@ -66,7 +66,7 @@ class ProjectTask extends BakeTask {
 		}
 
 		$response = false;
-		while (!$response && is_dir($project) === true && file_exists($project . 'Config' . 'boostrap.php')) {
+		while (!$response && is_dir($project) === true && file_exists($project . '..' . DS . 'config' . DS . 'boostrap.php')) {
 			$prompt = __d('cake_console', '<warning>A project already exists in this location:</warning> %s Overwrite?', $project);
 			$response = $this->in($prompt, ['y', 'n'], 'n');
 			if (strtolower($response) === 'n') {

+ 1 - 1
src/Core/App.php

@@ -23,7 +23,7 @@ use Cake\Utility\Inflector;
  *
  * ### Adding paths
  *
- * Additional paths for Templates and Plugins are configured with Configure now. See App/Config/app.php for an
+ * Additional paths for Templates and Plugins are configured with Configure now. See config/app.php for an
  * example. The `App.paths.plugins` and `App.paths.templates` variables are used to configure paths for plugins
  * and templates respectively. All class based resources should be mapped using your application's autoloader.
  *

+ 3 - 3
src/Core/Plugin.php

@@ -48,7 +48,7 @@ class Plugin {
  * to load them.
  *
  * This method does not configure any autoloaders. That must be done separately either
- * through composer, or your own code during App/Config/bootstrap.php.
+ * through composer, or your own code during config/bootstrap.php.
  *
  * ## Examples:
  *
@@ -95,8 +95,8 @@ class Plugin {
  *
  * ## Configuration options
  *
- * - `bootstrap` - array - Whether or not you want the $plugin/Config/bootstrap.php file loaded.
- * - `routes` - boolean - Whether or not you want to load the $plugin/Config/routes.php file.
+ * - `bootstrap` - array - Whether or not you want the $plugin/config/bootstrap.php file loaded.
+ * - `routes` - boolean - Whether or not you want to load the $plugin/config/routes.php file.
  * - `namespace` - string - A custom namespace for the plugin. It will default to the plugin name.
  * - `ignoreMissing` - boolean - Set to true to ignore missing bootstrap/routes files.
  * - `path` - string - The path the plugin can be found on. If empty the default plugin path (App.pluginPaths) will be used.

+ 1 - 1
src/Datasource/ConnectionManager.php

@@ -25,7 +25,7 @@ use Cake\Datasource\Error\MissingDatasourceConfigException;
  * a registry for the connections defined in an application.
  *
  * Provides an interface for loading and enumerating connections defined in
- * App/Config/app.php
+ * config/app.php
  */
 class ConnectionManager {
 

+ 1 - 1
src/Error/BaseErrorHandler.php

@@ -92,7 +92,7 @@ abstract class BaseErrorHandler {
 /**
  * Set as the default error handler by CakePHP.
  *
- * Use App/Config/error.php to customize or replace this error handler.
+ * Use config/error.php to customize or replace this error handler.
  * This function will use Debugger to display errors when debug > 0. And
  * will log errors to Log, when debug == 0.
  *

+ 4 - 4
src/Error/ErrorHandler.php

@@ -33,14 +33,14 @@ use Cake\Utility\Debugger;
  * You can implement application specific exception handling in one of a few ways. Each approach
  * gives you different amounts of control over the exception handling process.
  *
- * - Modify App/Config/error.php and setup custom exception handling.
+ * - Modify config/error.php and setup custom exception handling.
  * - Use the `exceptionRenderer` option to inject an Exception renderer. This will
  *   let you keep the existing handling logic but override the rendering logic.
  *
  * #### Create your own Exception handler
  *
  * This gives you full control over the exception handling process. The class you choose should be
- * loaded in your app/Config/error.php and registered as the default exception handler.
+ * loaded in your config/error.php and registered as the default exception handler.
  *
  * #### Using a custom renderer with `exceptionRenderer`
  *
@@ -54,7 +54,7 @@ use Cake\Utility\Debugger;
  * #### Logging exceptions
  *
  * Using the built-in exception handling, you can log all the exceptions
- * that are dealt with by ErrorHandler by setting `log` option to true in your App/Config/error.php.
+ * that are dealt with by ErrorHandler by setting `log` option to true in your config/error.php.
  * Enabling this will log every exception to Log and the configured loggers.
  *
  * ### PHP errors
@@ -62,7 +62,7 @@ use Cake\Utility\Debugger;
  * Error handler also provides the built in features for handling php errors (trigger_error).
  * While in debug mode, errors will be output to the screen using debugger. While in production mode,
  * errors will be logged to Log.  You can control which errors are logged by setting
- * `errorLevel` option in App/Config/error.php.
+ * `errorLevel` option in config/error.php.
  *
  * #### Logging errors
  *

+ 2 - 2
src/Error/ExceptionRenderer.php

@@ -36,12 +36,12 @@ use Cake\View\Error\MissingViewException;
  * ### Implementing application specific exception rendering
  *
  * You can implement application specific exception handling by creating a subclass of
- * ExceptionRenderer and configure it to be the `exceptionRenderer` in App/Config/error.php
+ * ExceptionRenderer and configure it to be the `exceptionRenderer` in config/error.php
  *
  * #### Using a subclass of ExceptionRenderer
  *
  * Using a subclass of ExceptionRenderer gives you full control over how Exceptions are rendered, you
- * can configure your class in your App/Config/error.php.
+ * can configure your class in your config/error.php.
  */
 class ExceptionRenderer {
 

+ 1 - 1
src/Log/Log.php

@@ -247,7 +247,7 @@ class Log {
  * @param array $config An array of name => config data for adapter.
  * @return mixed null when adding configuration and an array of configuration data when reading.
  * @throws \Cake\Error\Exception When trying to modify an existing config.
- * @see App/Config/logging.php
+ * @see config/logging.php
  */
 	public static function config($key, $config = null) {
 		$return = static::_config($key, $config);

+ 1 - 1
src/Routing/Filter/RoutingFilter.php

@@ -38,7 +38,7 @@ class RoutingFilter extends DispatcherFilter {
 
 /**
  * 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 config/routes.php will be run.
  *
  * @param \Cake\Event\Event $event containing the request, response and additional params
  * @return void

+ 1 - 1
src/Routing/Router.php

@@ -150,7 +150,7 @@ class Router {
 	protected static $_urlFilters = [];
 
 /**
- * Gets the named route patterns for use in app/Config/routes.php
+ * Gets the named route patterns for use in config/routes.php
  *
  * @return array Named route elements
  * @see Router::$_namedExpressions

+ 1 - 1
src/Template/Error/pdo_error.ctp

@@ -21,7 +21,7 @@ use Cake\Utility\Debugger;
 </p>
 <p class="notice">
 	If you are using SQL keywords as table column names, you can enable identifier
-	quoting for your database connection in src/Config/app.php.
+	quoting for your database connection in config/app.php.
 </p>
 <?php if (!empty($error->queryString)) : ?>
 	<p class="notice">

+ 1 - 1
src/Utility/Debugger.php

@@ -843,7 +843,7 @@ class Debugger {
  */
 	public static function checkSecurityKeys() {
 		if (Configure::read('Security.salt') === '__SALT__') {
-			trigger_error(sprintf('Please change the value of %s in %s to a salt value specific to your application.', '\'Security.salt\'', 'APP/Config/app.php'), E_USER_NOTICE);
+			trigger_error(sprintf('Please change the value of %s in %s to a salt value specific to your application.', '\'Security.salt\'', 'ROOT/config/app.php'), E_USER_NOTICE);
 		}
 	}
 

+ 1 - 1
src/View/Helper/FormHelper.php

@@ -259,7 +259,7 @@ class FormHelper extends Helper {
  *    you should leave 'action' undefined.
  * - `encoding` Set the accept-charset encoding for the form. Defaults to `Configure::read('App.encoding')`
  * - `templates` The templates you want to use for this form. Any templates will be merged on top of
- *   the already loaded templates. This option can either be a filename in App/Config that contains
+ *   the already loaded templates. This option can either be a filename in /config that contains
  *   the templates you want to load, or an array of templates to use.
  * - `context` Additional options for the context class. For example the EntityContext accepts a 'table'
  *   option that allows you to set the specific Table class the form should be based on.