Permalink
Browse files

Brought \app\Config and \lib\Cake\Console\Templates\skel\Config in sync

  • Loading branch information...
1 parent af8b1e2 commit 72765a2afc586341250cb109dd9ea19292dce2b8 @ravage84 ravage84 committed Feb 3, 2013
View
@@ -1,5 +1,11 @@
<?php
/**
+ * This is i18n Schema file
+ *
+ * Use it to configure database for i18n
+ *
+ * PHP 5
+ *
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
* Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
*
@@ -13,16 +19,18 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
-/**
+// @codingStandardsIgnoreStart
+
+/*
*
* Using the Schema command line utility
*
* Use it to configure database for i18n
*
* cake schema run create i18n
*/
-// @codingStandardsIgnoreStart
-class I18nSchema extends CakeSchema {
+class i18nSchema extends CakeSchema {
+
// @codingStandardsIgnoreEnd
public $name = 'i18n';
View
@@ -23,79 +23,7 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
-/**
- * Cache Engine Configuration
- * Default settings provided below
- *
- * File storage engine.
- *
- * Cache::config('default', array(
- * 'engine' => 'File', //[required]
- * 'duration'=> 3600, //[optional]
- * 'probability'=> 100, //[optional]
- * 'path' => CACHE, //[optional] use system tmp directory - remember to use absolute path
- * 'prefix' => 'cake_', //[optional] prefix every cache file with this string
- * 'lock' => false, //[optional] use file locking
- * 'serialize' => true, // [optional]
- * 'mask' => 0666, // [optional] permission mask to use when creating cache files
- * ));
- *
- * APC (http://pecl.php.net/package/APC)
- *
- * Cache::config('default', array(
- * 'engine' => 'Apc', //[required]
- * 'duration'=> 3600, //[optional]
- * 'probability'=> 100, //[optional]
- * 'prefix' => Inflector::slug(APP_DIR) . '_', //[optional] prefix every cache file with this string
- * ));
- *
- * Xcache (http://xcache.lighttpd.net/)
- *
- * Cache::config('default', array(
- * 'engine' => 'Xcache', //[required]
- * 'duration'=> 3600, //[optional]
- * 'probability'=> 100, //[optional]
- * 'prefix' => Inflector::slug(APP_DIR) . '_', //[optional] prefix every cache file with this string
- * 'user' => 'user', //user from xcache.admin.user settings
- * 'password' => 'password', //plaintext password (xcache.admin.pass)
- * ));
- *
- * Memcache (http://memcached.org/)
- *
- * Cache::config('default', array(
- * 'engine' => 'Memcache', //[required]
- * 'duration'=> 3600, //[optional]
- * 'probability'=> 100, //[optional]
- * 'prefix' => Inflector::slug(APP_DIR) . '_', //[optional] prefix every cache file with this string
- * 'servers' => array(
- * '127.0.0.1:11211' // localhost, default port 11211
- * ), //[optional]
- * 'persistent' => true, // [optional] set this to false for non-persistent connections
- * 'compress' => false, // [optional] compress data in Memcache (slower, but uses less memory)
- * ));
- *
- * Wincache (http://php.net/wincache)
- *
- * Cache::config('default', array(
- * 'engine' => 'Wincache', //[required]
- * 'duration'=> 3600, //[optional]
- * 'probability'=> 100, //[optional]
- * 'prefix' => Inflector::slug(APP_DIR) . '_', //[optional] prefix every cache file with this string
- * ));
- *
- * Redis (http://http://redis.io/)
- *
- * Cache::config('default', array(
- * 'engine' => 'Redis', //[required]
- * 'duration'=> 3600, //[optional]
- * 'probability'=> 100, //[optional]
- * 'prefix' => Inflector::slug(APP_DIR) . '_', //[optional] prefix every cache file with this string
- * 'server' => '127.0.0.1' // localhost
- * 'port' => 6379 // default port 6379
- * 'timeout' => 0 // timeout in seconds, 0 = unlimited
- * 'persistent' => true, // [optional] set this to false for non-persistent connections
- * ));
- */
+// Setup a 'default' cache configuration for use in the application.
Cache::config('default', array('engine' => 'File'));
/**
@@ -143,7 +71,6 @@
*
*/
-
/**
* You can attach event listeners to the request lifecyle as Dispatcher Filter . By Default CakePHP bundles two filters:
*
View
@@ -35,8 +35,8 @@
Configure::write('debug', 2);
/**
- * Configure the Error handler used to handle errors for your application. By default
- * ErrorHandler::handleError() is used. It will display errors using Debugger, when debug > 0
+ * Configure the Error handler used to handle errors for your application. By default
+ * ErrorHandler::handleError() is used. It will display errors using Debugger, when debug > 0
* and log errors with CakeLog when debug = 0.
*
* Options:
@@ -56,17 +56,17 @@
));
/**
- * Configure the Exception handler used for uncaught exceptions. By default,
+ * Configure the Exception handler used for uncaught exceptions. By default,
* ErrorHandler::handleException() is used. It will display a HTML page for the exception, and
- * while debug > 0, framework errors like Missing Controller will be displayed. When debug = 0,
+ * while debug > 0, framework errors like Missing Controller will be displayed. When debug = 0,
* framework errors will be coerced into generic HTTP errors.
*
* Options:
*
* - `handler` - callback - The callback to handle exceptions. You can set this to any callback type,
* including anonymous functions.
* Make sure you add App::uses('MyHandler', 'Error'); when using a custom handler class
- * - `renderer` - string - The class responsible for rendering uncaught exceptions. If you choose a custom class you
+ * - `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/Lib/Error. This class needs to implement a render method.
* - `log` - boolean - Should Exceptions be logged?
*
@@ -171,8 +171,8 @@
* value to false, when dealing with older versions of IE, Chrome Frame or certain web-browsing devices and AJAX
* - `Session.defaults` - The default configuration set to use as a basis for your session.
* There are four builtins: php, cake, cache, database.
- * - `Session.handler` - Can be used to enable a custom session handler. Expects an array of of callables,
- * that can be used with `session_save_handler`. Using this option will automatically add `session.save_handler`
+ * - `Session.handler` - Can be used to enable a custom session handler. Expects an array of of callables,
+ * that can be used with `session_save_handler`. Using this option will automatically add `session.save_handler`
* to the ini array.
* - `Session.autoRegenerate` - Enabling this setting, turns on automatic renewal of sessions, and
* sessionids that change frequently. See CakeSession::$requestCountdown.
@@ -247,6 +247,67 @@
//date_default_timezone_set('UTC');
/**
+ *
+ * Cache Engine Configuration
+ * Default settings provided below
+ *
+ * File storage engine.
+ *
+ * Cache::config('default', array(
+ * 'engine' => 'File', //[required]
+ * 'duration' => 3600, //[optional]
+ * 'probability' => 100, //[optional]
+ * 'path' => CACHE, //[optional] use system tmp directory - remember to use absolute path
+ * 'prefix' => 'cake_', //[optional] prefix every cache file with this string
+ * 'lock' => false, //[optional] use file locking
+ * 'serialize' => true, [optional]
+ * ));
+ *
+ * APC (http://pecl.php.net/package/APC)
+ *
+ * Cache::config('default', array(
+ * 'engine' => 'Apc', //[required]
+ * 'duration' => 3600, //[optional]
+ * 'probability' => 100, //[optional]
+ * 'prefix' => Inflector::slug(APP_DIR) . '_', //[optional] prefix every cache file with this string
+ * ));
+ *
+ * Xcache (http://xcache.lighttpd.net/)
+ *
+ * Cache::config('default', array(
+ * 'engine' => 'Xcache', //[required]
+ * 'duration' => 3600, //[optional]
+ * 'probability' => 100, //[optional]
+ * 'prefix' => Inflector::slug(APP_DIR) . '_', //[optional] prefix every cache file with this string
+ * 'user' => 'user', //user from xcache.admin.user settings
+ * 'password' => 'password', //plaintext password (xcache.admin.pass)
+ * ));
+ *
+ * Memcache (http://www.danga.com/memcached/)
+ *
+ * Cache::config('default', array(
+ * 'engine' => 'Memcache', //[required]
+ * 'duration' => 3600, //[optional]
+ * 'probability' => 100, //[optional]
+ * 'prefix' => Inflector::slug(APP_DIR) . '_', //[optional] prefix every cache file with this string
+ * 'servers' => array(
+ * '127.0.0.1:11211' // localhost, default port 11211
+ * ), //[optional]
+ * 'persistent' => true, // [optional] set this to false for non-persistent connections
+ * 'compress' => false, // [optional] compress data in Memcache (slower, but uses less memory)
+ * ));
+ *
+ * Wincache (http://php.net/wincache)
+ *
+ * Cache::config('default', array(
+ * 'engine' => 'Wincache', //[required]
+ * 'duration' => 3600, //[optional]
+ * 'probability' => 100, //[optional]
+ * 'prefix' => Inflector::slug(APP_DIR) . '_', //[optional] prefix every cache file with this string
+ * ));
+ */
+
+/**
* Configure the cache handlers that CakePHP will use for internal
* metadata like class maps, and model schema.
*
@@ -260,15 +321,15 @@
// In development mode, caches should expire quickly.
$duration = '+999 days';
-if (Configure::read('debug') >= 1) {
+if (Configure::read('debug') > 0) {
$duration = '+10 seconds';
}
// Prefix each application on the same server with a different string, to avoid Memcache and APC conflicts.
$prefix = 'myapp_';
/**
- * Configure the cache used for general framework caching. Path information,
+ * Configure the cache used for general framework caching. Path information,
* object listings, and translation cache files are stored with this configuration.
*/
Cache::config('_cake_core_', array(
@@ -280,7 +341,7 @@
));
/**
- * Configure the cache for model and datasource caches. This cache configuration
+ * Configure the cache for model and datasource caches. This cache configuration
* is used to store schema descriptions, and table listings in connections.
*/
Cache::config('_cake_model_', array(
@@ -34,7 +34,7 @@
* Database/Sqlserver - Microsoft SQL Server 2005 and higher
*
* You can add custom database datasources (or override existing datasources) by adding the
- * appropriate file to app/Model/Datasource/Database. Datasources should be named 'MyDatasource.php',
+ * appropriate file to app/Model/Datasource/Database. Datasources should be named 'MyDatasource.php',
*
*
* persistent => true / false
@@ -44,11 +44,12 @@
* 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
+ * 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 Postgres specifies which schema you would like to use the tables in. Postgres defaults to 'public'.
+ * For Postgres/Sqlserver specifies which schema you would like to use the tables in. Postgres defaults to 'public'. For Sqlserver, it defaults to empty and use
+ * the connected user's default schema (typically 'dbo').
*
* encoding =>
* For MySQL, Postgres specifies the character encoding to use when connecting to the
@@ -33,7 +33,7 @@
* Debug - Do not send the email, just return the result
*
* You can add custom transports (or override existing transports) by adding the
- * appropriate file to app/Network/Email. Transports should be named 'YourTransport.php',
+ * appropriate file to app/Network/Email. Transports should be named 'YourTransport.php',
* where 'Your' is the name of the transport.
*
* from =>
View
@@ -32,7 +32,7 @@
Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display'));
/**
- * Load all plugin routes. See the CakePlugin documentation on
+ * Load all plugin routes. See the CakePlugin documentation on
* how to customize the loading of plugin routes.
*/
CakePlugin::routes();
@@ -1,6 +1,4 @@
<?php
-/*DbAcl schema generated on: 2007-11-24 15:11:13 : 1195945453*/
-
/**
* This is Acl Schema file
*
@@ -39,36 +37,36 @@ public function after($event = array()) {
}
public $acos = array(
- 'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 10, 'key' => 'primary'),
- 'parent_id' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
- 'model' => array('type' => 'string', 'null' => true),
- 'foreign_key' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
- 'alias' => array('type' => 'string', 'null' => true),
- 'lft' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
- 'rght' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
- 'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
- );
+ 'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 10, 'key' => 'primary'),
+ 'parent_id' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
+ 'model' => array('type' => 'string', 'null' => true),
+ 'foreign_key' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
+ 'alias' => array('type' => 'string', 'null' => true),
+ 'lft' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
+ 'rght' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
+ 'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
+ );
public $aros = array(
- 'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 10, 'key' => 'primary'),
- 'parent_id' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
- 'model' => array('type' => 'string', 'null' => true),
- 'foreign_key' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
- 'alias' => array('type' => 'string', 'null' => true),
- 'lft' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
- 'rght' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
- 'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
- );
+ 'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 10, 'key' => 'primary'),
+ 'parent_id' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
+ 'model' => array('type' => 'string', 'null' => true),
+ 'foreign_key' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
+ 'alias' => array('type' => 'string', 'null' => true),
+ 'lft' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
+ 'rght' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
+ 'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
+ );
public $aros_acos = array(
- 'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 10, 'key' => 'primary'),
- 'aro_id' => array('type' => 'integer', 'null' => false, 'length' => 10, 'key' => 'index'),
- 'aco_id' => array('type' => 'integer', 'null' => false, 'length' => 10),
- '_create' => array('type' => 'string', 'null' => false, 'default' => '0', 'length' => 2),
- '_read' => array('type' => 'string', 'null' => false, 'default' => '0', 'length' => 2),
- '_update' => array('type' => 'string', 'null' => false, 'default' => '0', 'length' => 2),
- '_delete' => array('type' => 'string', 'null' => false, 'default' => '0', 'length' => 2),
- 'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1), 'ARO_ACO_KEY' => array('column' => array('aro_id', 'aco_id'), 'unique' => 1))
- );
+ 'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 10, 'key' => 'primary'),
+ 'aro_id' => array('type' => 'integer', 'null' => false, 'length' => 10, 'key' => 'index'),
+ 'aco_id' => array('type' => 'integer', 'null' => false, 'length' => 10),
+ '_create' => array('type' => 'string', 'null' => false, 'default' => '0', 'length' => 2),
+ '_read' => array('type' => 'string', 'null' => false, 'default' => '0', 'length' => 2),
+ '_update' => array('type' => 'string', 'null' => false, 'default' => '0', 'length' => 2),
+ '_delete' => array('type' => 'string', 'null' => false, 'default' => '0', 'length' => 2),
+ 'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1), 'ARO_ACO_KEY' => array('column' => array('aro_id', 'aco_id'), 'unique' => 1))
+ );
}
@@ -1,6 +1,4 @@
<?php
-/*i18n schema generated on: 2007-11-25 07:11:25 : 1196004805*/
-
/**
* This is i18n Schema file
*
@@ -26,6 +24,9 @@
/*
*
* Using the Schema command line utility
+ *
+ * Use it to configure database for i18n
+ *
* cake schema run create i18n
*/
class i18nSchema extends CakeSchema {
@@ -1,6 +1,4 @@
<?php
-/*Sessions schema generated on: 2007-11-25 07:11:54 : 1196004714*/
-
/**
* This is Sessions Schema file
*
Oops, something went wrong.

0 comments on commit 72765a2

Please sign in to comment.