adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Making plugin routes load after app routes, closes #1722

Browse source
This commit is contained in:
Jose Lorenzo Rodriguez 2011-05-22 21:50:56 -04:30
parent 95a5b99b0e
commit 5b8865a3a7
5 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/Cake/Console/Command/ConsoleShell.php
View file

@ -53,10 +53,10 @@ class ConsoleShell extends Shell {
public function initialize() {
App::uses('Dispatcher', 'Routing');
$this->Dispatcher = new Dispatcher();
$this->models = App::objects('model');
$this->models = App::objects('Model');
foreach ($this->models as $model) {
$class = Inflector::camelize(str_replace('.php', '', $model));
$class = $model;
$this->models[$model] = $class;
App::uses($class, 'Model');
$this->{$class} = new $class();
@ -123,7 +123,7 @@ class ConsoleShell extends Shell {
$out .= "\t)";
$out .= "\n";
$out .= 'Alternatively, you can use simple array syntax to test reverse';
$out .= 'To reload your routes config (config/routes.php), do the following:';
$out .= 'To reload your routes config (Config/routes.php), do the following:';
$out .= "\n";
$out .= "\tRoutes reload";
$out .= "\n";
@ -342,6 +342,8 @@ class ConsoleShell extends Shell {
if (!@include(APP . 'Config' . DS . 'routes.php')) {
return false;
}
CakePlugin::routes();
Router::parse('/');
foreach (array_keys(Router::getNamedExpressions()) as $var) {

16
lib/Cake/Core/CakePlugin.php
View file

@ -74,9 +74,6 @@ class CakePlugin {
if (!empty(self::$_plugins[$plugin]['bootstrap'])) {
self::bootstrap($plugin);
}
if (!empty(self::$_plugins[$plugin]['routes'])) {
self::routes($plugin);
}
}
/**
@ -149,12 +146,19 @@ class CakePlugin {
}
/**
* Loads the routes file for a plugin
* Loads the routes file for a plugin, or all plugins configured to load their respective routes file
*
* @param string $plugin name of the plugin
* @param string $plugin name of the plugin, if null will operate on all plugins having enabled the
* loading of routes files
* @return boolean
*/
public static function routes($plugin) {
public static function routes($plugin = null) {
if ($plugin === null) {
foreach (self::loaded() as $p) {
self::routes($p);
}
return true;
}
$config = self::$_plugins[$plugin];
if ($config['routes'] === false) {
return false;

1
lib/Cake/Routing/Dispatcher.php
View file

@ -237,6 +237,7 @@ class Dispatcher {
*/
protected function _loadRoutes() {
include APP . 'Config' . DS . 'routes.php';
CakePlugin::routes();
}
/**

2
lib/Cake/Routing/Router.php
View file

@ -183,7 +183,7 @@ class Router {
}
/**
* Gets the named route elements for use in app/config/routes.php
* Gets the named route elements for use in app/Config/routes.php
*
* @return array Named route elements
* @see Router::$__namedExpressions

5
lib/Cake/Test/Case/Core/CakePluginTest.php
View file

@ -85,6 +85,8 @@ class CakePluginTest extends CakeTestCase {
CakePlugin::load('TestPlugin', array('bootstrap' => true, 'routes' => true));
$this->assertTrue(CakePlugin::loaded('TestPlugin'));
$this->assertEquals('loaded plugin bootstrap', Configure::read('CakePluginTest.test_plugin.bootstrap'));
CakePlugin::routes();
$this->assertEquals('loaded plugin routes', Configure::read('CakePluginTest.test_plugin.routes'));
}
@ -159,6 +161,7 @@ class CakePluginTest extends CakeTestCase {
*/
public function testLoadMultipleWithDefaultsMissingFile() {
CakePlugin::load(array('TestPlugin', 'TestPluginTwo'), array('bootstrap' => true, 'routes' => true));
CakePlugin::routes();
}
/**
@ -229,6 +232,8 @@ class CakePluginTest extends CakeTestCase {
*/
public function testLoadAllWithDefaultsAndOverride() {
CakePlugin::loadAll(array('bootstrap' => true, 'TestPlugin' => array('routes' => true)));
CakePlugin::routes();
$expected = array('PluginJs', 'TestPlugin', 'TestPluginTwo');
$this->assertEquals($expected, CakePlugin::loaded());
$this->assertEquals('loaded js plugin bootstrap', Configure::read('CakePluginTest.js_plugin.bootstrap'));