Skip to content

Commit 516b497

Browse files
committed
Update core.php for new routing prefixes.
1 parent 9b4f7e9 commit 516b497

File tree

2 files changed

+9
-67
lines changed

2 files changed

+9
-67
lines changed

App/Config/core.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@
114114
* Routing.prefixes = array('admin', 'manager');
115115
*
116116
* Enables:
117-
* `admin_index()` and `/admin/controller/index`
118-
* `manager_index()` and `/manager/controller/index`
117+
* `App\Controller\Admin` and `/admin/controller/index`
118+
* `App\Controller\Manager` and `/manager/controller/index`
119119
*
120120
*/
121121
//Configure::write('Routing.prefixes', array('admin'));

lib/Cake/Console/Templates/skel/Config/core.php

Lines changed: 7 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* @since CakePHP(tm) v 0.2.9
1919
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
2020
*/
21-
21+
namespace App\Config;
2222
use Cake\Cache\Cache;
2323
use Cake\Core\Configure;
2424

@@ -40,7 +40,7 @@
4040
/**
4141
* Configure the Error handler used to handle errors for your application. By default
4242
* ErrorHandler::handleError() is used. It will display errors using Debugger, when debug > 0
43-
* and log errors with Log when debug = 0.
43+
* and log errors with Cake Log when debug = 0.
4444
*
4545
* Options:
4646
*
@@ -114,8 +114,8 @@
114114
* Routing.prefixes = array('admin', 'manager');
115115
*
116116
* Enables:
117-
* `admin_index()` and `/admin/controller/index`
118-
* `manager_index()` and `/manager/controller/index`
117+
* `App\Controller\Admin` and `/admin/controller/index`
118+
* `App\Controller\Manager` and `/manager/controller/index`
119119
*
120120
*/
121121
//Configure::write('Routing.prefixes', array('admin'));
@@ -239,71 +239,13 @@
239239
*/
240240
//date_default_timezone_set('UTC');
241241

242-
/**
243-
*
244-
* Cache Engine Configuration
245-
* Default settings provided below
246-
*
247-
* File storage engine.
248-
*
249-
* Cache::config('default', array(
250-
* 'engine' => 'File', //[required]
251-
* 'duration' => 3600, //[optional]
252-
* 'probability' => 100, //[optional]
253-
* 'path' => CACHE, //[optional] use system tmp directory - remember to use absolute path
254-
* 'prefix' => 'cake_', //[optional] prefix every cache file with this string
255-
* 'lock' => false, //[optional] use file locking
256-
* 'serialize' => true, [optional]
257-
* ));
258-
*
259-
* APC (http://pecl.php.net/package/APC)
260-
*
261-
* Cache::config('default', array(
262-
* 'engine' => 'Apc', //[required]
263-
* 'duration' => 3600, //[optional]
264-
* 'probability' => 100, //[optional]
265-
* 'prefix' => Inflector::slug(APP_DIR) . '_', //[optional] prefix every cache file with this string
266-
* ));
267-
*
268-
* Xcache (http://xcache.lighttpd.net/)
269-
*
270-
* Cache::config('default', array(
271-
* 'engine' => 'Xcache', //[required]
272-
* 'duration' => 3600, //[optional]
273-
* 'probability' => 100, //[optional]
274-
* 'prefix' => Inflector::slug(APP_DIR) . '_', //[optional] prefix every cache file with this string
275-
* 'user' => 'user', //user from xcache.admin.user settings
276-
* 'password' => 'password', //plaintext password (xcache.admin.pass)
277-
* ));
278-
*
279-
* Memcache (http://www.danga.com/memcached/)
280-
*
281-
* Cache::config('default', array(
282-
* 'engine' => 'Memcache', //[required]
283-
* 'duration' => 3600, //[optional]
284-
* 'probability' => 100, //[optional]
285-
* 'prefix' => Inflector::slug(APP_DIR) . '_', //[optional] prefix every cache file with this string
286-
* 'servers' => array(
287-
* '127.0.0.1:11211' // localhost, default port 11211
288-
* ), //[optional]
289-
* 'persistent' => true, // [optional] set this to false for non-persistent connections
290-
* 'compress' => false, // [optional] compress data in Memcache (slower, but uses less memory)
291-
* ));
292-
*
293-
* Wincache (http://php.net/wincache)
294-
*
295-
* Cache::config('default', array(
296-
* 'engine' => 'Wincache', //[required]
297-
* 'duration' => 3600, //[optional]
298-
* 'probability' => 100, //[optional]
299-
* 'prefix' => Inflector::slug(APP_DIR) . '_', //[optional] prefix every cache file with this string
300-
* ));
301-
*/
302-
303242
/**
304243
* Pick the caching engine to use. If APC is enabled use it.
305244
* If running via cli - apc is disabled by default. ensure it's available and enabled in this case
306245
*
246+
* Note: 'default' and other application caches should be configured in app/Config/bootstrap.php.
247+
* Please check the comments in boostrap.php for more info on the cache engines available
248+
* and their setttings.
307249
*/
308250
$engine = 'File';
309251
if (extension_loaded('apc') && function_exists('apc_dec') && (php_sapi_name() !== 'cli' || ini_get('apc.enable_cli'))) {

0 commit comments

Comments
 (0)