adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-09 21:12:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #822 from rchavik/2.3

Browse source 
enable PluginDot for routeClass parameter
This commit is contained in:
José Lorenzo Rodríguez 2012-09-12 08:04:44 -07:00
commit b227ff486e
3 changed files with 33 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -304,7 +304,12 @@ class Router {
}
$routeClass = self::$_routeClass;
if (isset($options['routeClass'])) {
$routeClass = self::_validateRouteClass($options['routeClass']);
if (strpos($options['routeClass'], '.') === false) {
$routeClass = $options['routeClass'];
} else {
list($plugin, $routeClass) = pluginSplit($options['routeClass'], true);
}
$routeClass = self::_validateRouteClass($routeClass);
unset($options['routeClass']);
}
if ($routeClass == 'RedirectRoute' && isset($defaults['redirect'])) {

20
lib/Cake/Test/Case/Routing/RouterTest.php
View file

@ -2282,6 +2282,26 @@ class RouterTest extends CakeTestCase {
$this->assertEquals($expected, $result);
}
/**
* test using custom route class in PluginDot notation
*/
public function testUsingCustomRouteClassPluginDotSyntax() {
App::build(array(
'Plugin' => array(
CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS
)
));
CakePlugin::load('TestPlugin');
App::uses('TestRoute', 'TestPlugin.Routing/Route');
$routes = Router::connect(
'/:slug',
array('controller' => 'posts', 'action' => 'view'),
array('routeClass' => 'TestPlugin.TestRoute', 'slug' => '[a-z_-]+')
);
$this->assertInstanceOf('TestRoute', $routes[0]);
CakePlugin::unload('TestPlugin');
}
/**
* test that route classes must extend CakeRoute
*

7
lib/Cake/Test/test_app/Plugin/TestPlugin/Lib/Routing/Route/TestRoute.php Normal file
View file

@ -0,0 +1,7 @@
<?php
App::uses('CakeRoute', 'Routing/Route');
class TestRoute extends CakeRoute {
}