Merge pull request #12097 from cakephp/ad-sort-routes-cli

Sort route defaults consistently in the routes cli
cakephp · May 18, 2018 · a88b2ab · a88b2ab
2 parents ea70497 + ce1e801
commit a88b2ab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/Shell/RoutesShell.php b/src/Shell/RoutesShell.php
@@ -38,6 +38,7 @@ public function main()
         ];
         foreach (Router::routes() as $route) {
             $name = isset($route->options['_name']) ? $route->options['_name'] : $route->getName();
+            ksort($route->defaults);
             $output[] = [$name, $route->template, json_encode($route->defaults)];
         }
         $this->helper('table')->output($output);
@@ -64,6 +65,7 @@ public function check($url)
             }
 
             unset($route['_matchedRoute']);
+            ksort($route);
 
             $output = [
                 ['Route name', 'URI template', 'Defaults'],

diff --git a/tests/TestCase/Shell/RoutesShellTest.php b/tests/TestCase/Shell/RoutesShellTest.php
@@ -65,17 +65,17 @@ public function testMain()
         $this->assertOutputContainsRow([
             'articles:_action',
             '/articles/:action/*',
-            '{"controller":"Articles","action":"index","plugin":null}'
+            '{"action":"index","controller":"Articles","plugin":null}'
         ]);
         $this->assertOutputContainsRow([
             'bake._controller:_action',
             '/bake/:controller/:action',
-            '{"plugin":"Bake","action":"index"}'
+            '{"action":"index","plugin":"Bake"}'
         ]);
         $this->assertOutputContainsRow([
             'testName',
             '/tests/:action/*',
-            '{"controller":"Tests","action":"index","plugin":null}'
+            '{"action":"index","controller":"Tests","plugin":null}'
         ]);
     }
 
@@ -96,7 +96,7 @@ public function testCheck()
         $this->assertOutputContainsRow([
             'articles:_action',
             '/articles/check',
-            '{"action":"check","pass":[],"controller":"Articles","plugin":null}'
+            '{"action":"check","controller":"Articles","pass":[],"plugin":null}'
         ]);
     }
 
@@ -117,7 +117,7 @@ public function testCheckWithNamedRoute()
         $this->assertOutputContainsRow([
             'testName',
             '/tests/index',
-            '{"action":"index","pass":[],"controller":"Tests","plugin":null,"_name":"testName"}'
+            '{"_name":"testName","action":"index","controller":"Tests","pass":[],"plugin":null}'
         ]);
     }