Skip to content

Commit ee96e83

Browse files
saeidengmarkstory
authored andcommitted
rename to DuplicateNamedRouteException and tests
1 parent f2d7c7c commit ee96e83

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

src/Routing/Exception/DuplicateRouteException.php renamed to src/Routing/Exception/DuplicateNamedRouteException.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
use Cake\Core\Exception\Exception;
1616

1717
/**
18-
* Exception raised when a URL cannot be reverse routed
19-
* or when a URL cannot be parsed.
18+
* Exception raised when a route names used twice.
2019
*/
21-
class DuplicateRouteException extends Exception
20+
class DuplicateNamedRouteException extends Exception
2221
{
2322

2423
/**

src/Routing/RouteCollection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
namespace Cake\Routing;
1616

1717
use Cake\Routing\Exception\MissingRouteException;
18-
use Cake\Routing\Exception\DuplicateRouteException;
18+
use Cake\Routing\Exception\DuplicateNamedRouteException;
1919
use Cake\Routing\Route\Route;
2020

2121
/**
@@ -79,7 +79,7 @@ public function add(Route $route, array $options = [])
7979
// Explicit names
8080
if (isset($options['_name'])) {
8181
if (isset($this->_named[$options['_name']])) {
82-
throw new DuplicateRouteException([
82+
throw new DuplicateNamedRouteException([
8383
'url' => $options['_name'],
8484
'message' => 'A named route was found for "%s" that is already used, route names must be unique across your entire application.'
8585
]);

src/Template/Error/duplicate_route.ctp renamed to src/Template/Error/duplicate_named_route.ctp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use Cake\Error\Debugger;
1919
$this->layout = 'dev_error';
2020

2121
$this->assign('title', 'Duplicate Route');
22-
$this->assign('templateName', 'duplicate_route.ctp');
22+
$this->assign('templateName', 'duplicate_named_route.ctp');
2323

2424
$attributes = $error->getAttributes();
2525

tests/TestCase/Routing/RouteCollectionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,11 +358,11 @@ public function testAddingRoutes()
358358
/**
359359
* Test the add() with some _name.
360360
*
361-
* @expectedException \Cake\Routing\Exception\DuplicateRouteException
361+
* @expectedException \Cake\Routing\Exception\DuplicateNamedRouteException
362362
*
363363
* @return void
364364
*/
365-
public function testAddingDuplicatedRoutesName()
365+
public function testAddingDuplicateNamedRoutes()
366366
{
367367
$one = new Route('/pages/*', ['controller' => 'Pages', 'action' => 'display']);
368368
$two = new Route('/', ['controller' => 'Dashboards', 'action' => 'display']);

tests/TestCase/Routing/RouterTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,10 +1194,10 @@ public function testNamedRouteException()
11941194
/**
11951195
* Test that using duplicate names causes exceptions.
11961196
*
1197-
* @expectedException \Cake\Routing\Exception\DuplicateRouteException
1197+
* @expectedException \Cake\Routing\Exception\DuplicateNamedRouteException
11981198
* @return void
11991199
*/
1200-
public function testDuplicateRouteException()
1200+
public function testDuplicateNamedRouteException()
12011201
{
12021202
Router::connect(
12031203
'/users/:name',
@@ -1221,7 +1221,7 @@ public function testDuplicateRouteException()
12211221
*
12221222
* @return void
12231223
*/
1224-
public function testNoDuplicateRouteException()
1224+
public function testNoDuplicateNamedRouteException()
12251225
{
12261226
Router::connect(
12271227
'/users/:name',
@@ -1231,7 +1231,7 @@ public function testNoDuplicateRouteException()
12311231
Router::connect(
12321232
'/users/:name',
12331233
['controller' => 'users', 'action' => 'view'],
1234-
['_name' => 'otherName']
1234+
['_name' => 'test2']
12351235
);
12361236
Router::connect(
12371237
'/users/:name',

0 commit comments

Comments
 (0)