CS & version

cakephp · Aug 19, 2016 · a9ba3f6 · a9ba3f6
1 parent ee96e83
commit a9ba3f6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/src/Routing/Exception/DuplicateNamedRouteException.php b/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;

diff --git a/src/Routing/RouteCollection.php b/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;
 
 /**

diff --git a/tests/TestCase/Routing/RouteCollectionTest.php b/tests/TestCase/Routing/RouteCollectionTest.php
@@ -357,18 +357,17 @@ public function testAddingRoutes()
 
     /**
      * 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']);
     }
 
     /**

diff --git a/tests/TestCase/Routing/RouterTest.php b/tests/TestCase/Routing/RouterTest.php
@@ -1204,12 +1204,12 @@ public function testDuplicateNamedRouteException()
             ['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 @@ public function testNoDuplicateNamedRouteException()
             ['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']