Browse Source

CS & version

saeid 9 years ago
parent
commit
a9ba3f60b0

+ 1 - 1
src/Routing/Exception/DuplicateNamedRouteException.php

@@ -7,7 +7,7 @@
  * Redistributions of files must retain the above copyright notice.
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @since         3.2.14
+ * @since         3.3.1
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 namespace Cake\Routing\Exception;

+ 1 - 1
src/Routing/RouteCollection.php

@@ -14,8 +14,8 @@
  */
 namespace Cake\Routing;
 
-use Cake\Routing\Exception\MissingRouteException;
 use Cake\Routing\Exception\DuplicateNamedRouteException;
+use Cake\Routing\Exception\MissingRouteException;
 use Cake\Routing\Route\Route;
 
 /**

+ 4 - 5
tests/TestCase/Routing/RouteCollectionTest.php

@@ -357,18 +357,17 @@ class RouteCollectionTest extends TestCase
 
     /**
      * Test the add() with some _name.
-	 * 
+     *
      * @expectedException \Cake\Routing\Exception\DuplicateNamedRouteException
-	 * 
+     *
      * @return void
      */
     public function testAddingDuplicateNamedRoutes()
     {
         $one = new Route('/pages/*', ['controller' => 'Pages', 'action' => 'display']);
         $two = new Route('/', ['controller' => 'Dashboards', 'action' => 'display']);
-        $this->collection->add($one,['_name' => 'test']);
-        $this->collection->add($two,['_name' => 'test']);
-
+        $this->collection->add($one, ['_name' => 'test']);
+        $this->collection->add($two, ['_name' => 'test']);
     }
 
     /**

+ 4 - 4
tests/TestCase/Routing/RouterTest.php

@@ -1204,12 +1204,12 @@ class RouterTest extends TestCase
             ['controller' => 'users', 'action' => 'view'],
             ['_name' => 'test']
         );
-		Router::connect(
+        Router::connect(
             '/users/:name',
             ['controller' => 'users', 'action' => 'view'],
             ['_name' => 'otherName']
         );
-		Router::connect(
+        Router::connect(
             '/users/:name',
             ['controller' => 'users', 'action' => 'view'],
             ['_name' => 'test']
@@ -1228,12 +1228,12 @@ class RouterTest extends TestCase
             ['controller' => 'users', 'action' => 'view'],
             ['_name' => 'test']
         );
-		Router::connect(
+        Router::connect(
             '/users/:name',
             ['controller' => 'users', 'action' => 'view'],
             ['_name' => 'test2']
         );
-		Router::connect(
+        Router::connect(
             '/users/:name',
             ['controller' => 'users', 'action' => 'view'],
             ['_name' => 'test3']