|
|
@@ -16,8 +16,11 @@ namespace Cake\Test\TestCase\Routing;
|
|
|
|
|
|
use Cake\Routing\RouteBuilder;
|
|
|
use Cake\Routing\RouteCollection;
|
|
|
-use Cake\Routing\Router;
|
|
|
+use Cake\Routing\Route\DashedRoute;
|
|
|
+use Cake\Routing\Route\InflectedRoute;
|
|
|
+use Cake\Routing\Route\RedirectRoute;
|
|
|
use Cake\Routing\Route\Route;
|
|
|
+use Cake\Routing\Router;
|
|
|
use Cake\TestSuite\TestCase;
|
|
|
|
|
|
/**
|
|
|
@@ -81,8 +84,8 @@ class RouteBuilderTest extends TestCase
|
|
|
|
|
|
$all = $this->collection->routes();
|
|
|
$this->assertCount(2, $all);
|
|
|
- $this->assertInstanceOf('Cake\Routing\Route\Route', $all[0]);
|
|
|
- $this->assertInstanceOf('Cake\Routing\Route\Route', $all[1]);
|
|
|
+ $this->assertInstanceOf(Route::class, $all[0]);
|
|
|
+ $this->assertInstanceOf(Route::class, $all[1]);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -102,8 +105,8 @@ class RouteBuilderTest extends TestCase
|
|
|
$routes->connect('/:controller/:action/*');
|
|
|
|
|
|
$all = $this->collection->routes();
|
|
|
- $this->assertInstanceOf('Cake\Routing\Route\InflectedRoute', $all[0]);
|
|
|
- $this->assertInstanceOf('Cake\Routing\Route\InflectedRoute', $all[1]);
|
|
|
+ $this->assertInstanceOf(InflectedRoute::class, $all[0]);
|
|
|
+ $this->assertInstanceOf(InflectedRoute::class, $all[1]);
|
|
|
|
|
|
$this->collection = new RouteCollection();
|
|
|
$routes = new RouteBuilder($this->collection, '/l');
|
|
|
@@ -142,7 +145,7 @@ class RouteBuilderTest extends TestCase
|
|
|
$this->assertNull($routes->connect('/:controller'));
|
|
|
$route = $this->collection->routes()[0];
|
|
|
|
|
|
- $this->assertInstanceOf('Cake\Routing\Route\Route', $route);
|
|
|
+ $this->assertInstanceOf(Route::class, $route);
|
|
|
$this->assertEquals('/l/:controller', $route->template);
|
|
|
$expected = ['prefix' => 'api', 'action' => 'index', 'plugin' => null];
|
|
|
$this->assertEquals($expected, $route->defaults);
|
|
|
@@ -289,12 +292,12 @@ class RouteBuilderTest extends TestCase
|
|
|
$routes->redirect('/p/:id', ['controller' => 'posts', 'action' => 'view'], ['status' => 301]);
|
|
|
$route = $this->collection->routes()[0];
|
|
|
|
|
|
- $this->assertInstanceOf('Cake\Routing\Route\RedirectRoute', $route);
|
|
|
+ $this->assertInstanceOf(RedirectRoute::class, $route);
|
|
|
|
|
|
$routes->redirect('/old', '/forums', ['status' => 301]);
|
|
|
$route = $this->collection->routes()[1];
|
|
|
|
|
|
- $this->assertInstanceOf('Cake\Routing\Route\RedirectRoute', $route);
|
|
|
+ $this->assertInstanceOf(RedirectRoute::class, $route);
|
|
|
$this->assertEquals('/forums', $route->redirect[0]);
|
|
|
}
|
|
|
|
|
|
@@ -307,7 +310,7 @@ class RouteBuilderTest extends TestCase
|
|
|
{
|
|
|
$routes = new RouteBuilder($this->collection, '/path', ['key' => 'value']);
|
|
|
$res = $routes->prefix('admin', ['param' => 'value'], function ($r) {
|
|
|
- $this->assertInstanceOf('Cake\Routing\RouteBuilder', $r);
|
|
|
+ $this->assertInstanceOf(RouteBuilder::class, $r);
|
|
|
$this->assertCount(0, $this->collection->routes());
|
|
|
$this->assertEquals('/path/admin', $r->path());
|
|
|
$this->assertEquals(['prefix' => 'admin', 'key' => 'value', 'param' => 'value'], $r->params());
|
|
|
@@ -324,7 +327,7 @@ class RouteBuilderTest extends TestCase
|
|
|
{
|
|
|
$routes = new RouteBuilder($this->collection, '/path', ['key' => 'value']);
|
|
|
$res = $routes->prefix('admin', function ($r) {
|
|
|
- $this->assertInstanceOf('Cake\Routing\RouteBuilder', $r);
|
|
|
+ $this->assertInstanceOf(RouteBuilder::class, $r);
|
|
|
$this->assertCount(0, $this->collection->routes());
|
|
|
$this->assertEquals('/path/admin', $r->path());
|
|
|
$this->assertEquals(['prefix' => 'admin', 'key' => 'value'], $r->params());
|
|
|
@@ -680,7 +683,7 @@ class RouteBuilderTest extends TestCase
|
|
|
$all = $this->collection->routes();
|
|
|
$this->assertEquals('/api/:controller', $all[0]->template);
|
|
|
$this->assertEquals('/api/:controller/:action/*', $all[1]->template);
|
|
|
- $this->assertInstanceOf('Cake\Routing\Route\Route', $all[0]);
|
|
|
+ $this->assertInstanceOf(Route::class, $all[0]);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -696,7 +699,7 @@ class RouteBuilderTest extends TestCase
|
|
|
$all = $this->collection->routes();
|
|
|
$this->assertEquals('/api/:controller', $all[0]->template);
|
|
|
$this->assertEquals('/api/:controller/:action/*', $all[1]->template);
|
|
|
- $this->assertInstanceOf('Cake\Routing\Route\InflectedRoute', $all[0]);
|
|
|
+ $this->assertInstanceOf(InflectedRoute::class, $all[0]);
|
|
|
}
|
|
|
|
|
|
/**
|