Browse Source

fix CS/and remove extra test function

saeid 9 years ago
parent
commit
7442e558b0

+ 1 - 4
src/Routing/RouteCollection.php

@@ -79,10 +79,7 @@ class RouteCollection
         // Explicit names
         if (isset($options['_name'])) {
             if (isset($this->_named[$options['_name']])) {
-                throw new DuplicateNamedRouteException([
-                    'url' => $options['_name'],
-                    'message' => 'A named route was found for "%s" that is already used, route names must be unique across your entire application.'
-                ]);
+                throw new DuplicateNamedRouteException(['url' => $options['_name']]);
             }
             $this->_named[$options['_name']] = $route;
         }

+ 14 - 14
src/Template/Error/duplicate_named_route.ctp

@@ -9,16 +9,16 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @since         3.2.14
+ * @since         3.3.1
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
-use Cake\Routing\Router;
 use Cake\Error\Debugger;
+use Cake\Routing\Router;
 
 $this->layout = 'dev_error';
 
-$this->assign('title', 'Duplicate Route');
+$this->assign('title', 'Duplicate Named Route');
 $this->assign('templateName', 'duplicate_named_route.ctp');
 
 $attributes = $error->getAttributes();
@@ -35,10 +35,10 @@ The same _name cannot be used twice,
 even if the names occur inside a different routing scope.
 remove duplicated route name in <?= 'config' . DIRECTORY_SEPARATOR . 'routes.php' ?></p>
 
-<?php if (!empty($attributes['context'])): ?>
+<?php if (!empty($attributes['context'])) : ?>
 <p>The passed context was:</p>
 <pre>
-<?=  Debugger::exportVar($attributes['context']); ?>
+<?= Debugger::exportVar($attributes['context']); ?>
 </pre>
 <?php endif; ?>
 
@@ -46,16 +46,16 @@ remove duplicated route name in <?= 'config' . DIRECTORY_SEPARATOR . 'routes.php
 <table cellspacing="0" cellpadding="0">
 <tr><th>Template</th><th>Defaults</th><th>Options</th></tr>
 <?php
-$url=false;
-if (!empty($attributes['url'])){
-	$url=$attributes['url'];
+$url = false;
+if (!empty($attributes['url'])) {
+    $url = $attributes['url'];
 }
-foreach (Router::routes() as $route):
-	if(isset($route->options['_name']) && $url===$route->options['_name']){
-		echo '<tr class="error">';
-	}else{
-	    echo '<tr>';	
-	}
+foreach (Router::routes() as $route) :
+    if (isset($route->options['_name']) && $url === $route->options['_name']) :
+        echo '<tr class="error">';
+    else :
+        echo '<tr>';
+    endif;
     printf(
         '<td width="25%%">%s</td><td>%s</td><td width="20%%">%s</td>',
         $route->template,

+ 0 - 24
tests/TestCase/Routing/RouterTest.php

@@ -1217,30 +1217,6 @@ class RouterTest extends TestCase
     }
 
     /**
-     * Test that using defferent names not causes exceptions.
-     *
-     * @return void
-     */
-    public function testNoDuplicateNamedRouteException()
-    {
-        Router::connect(
-            '/users/:name',
-            ['controller' => 'users', 'action' => 'view'],
-            ['_name' => 'test']
-        );
-        Router::connect(
-            '/users/:name',
-            ['controller' => 'users', 'action' => 'view'],
-            ['_name' => 'test2']
-        );
-        Router::connect(
-            '/users/:name',
-            ['controller' => 'users', 'action' => 'view'],
-            ['_name' => 'test3']
-        );
-    }
-
-    /**
      * Test that url filters are applied to url params.
      *
      * @return void