feature #19887 Sort alternatives alphabetically when a command is not found (javiereguiluz)

fabpot · fabpot · commit 0a17358abf0a · 2017-03-22T14:10:51.000-07:00
This PR was squashed before being merged into the 3.3-dev branch (closes #19887). Discussion ---------- Sort alternatives alphabetically when a command is not found | Q | A | | --- | --- | | Branch? | master | | Bug fix? | no | | New feature? | yes | | BC breaks? | no | | Deprecations? | no | | Tests pass? | yes | | Fixed tickets | #10893 | | License | MIT | | Doc PR | - | Commits ------- ba6c946 Sort commands like a human would do f04b1bd Sort alternatives alphabetically when a command is not found
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -1023,7 +1023,7 @@ private function findAlternatives($name, $collection)
         }
 
         $alternatives = array_filter($alternatives, function ($lev) use ($threshold) { return $lev < 2 * $threshold; });
-        asort($alternatives);
+        ksort($alternatives, SORT_NATURAL | SORT_FLAG_CASE);
 
         return array_keys($alternatives);
     }
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -477,6 +477,36 @@ public function testFindAlternativeNamespace()
         }
     }
 
+    public function testFindAlternativesOutput()
+    {
+        $application = new Application();
+
+        $application->add(new \FooCommand());
+        $application->add(new \Foo1Command());
+        $application->add(new \Foo2Command());
+        $application->add(new \Foo3Command());
+
+        $expectedAlternatives = array(
+            'afoobar',
+            'afoobar1',
+            'afoobar2',
+            'foo1:bar',
+            'foo3:bar',
+            'foo:bar',
+            'foo:bar1',
+        );
+
+        try {
+            $application->find('foo');
+            $this->fail('->find() throws a CommandNotFoundException if command is not defined');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\Component\Console\Exception\CommandNotFoundException', $e, '->find() throws a CommandNotFoundException if command is not defined');
+            $this->assertSame($expectedAlternatives, $e->getAlternatives());
+
+            $this->assertRegExp('/Command "foo" is not defined\..*Did you mean one of these\?.*/Ums', $e->getMessage());
+        }
+    }
+
     public function testFindNamespaceDoesNotFailOnDeepSimilarNamespaces()
     {
         $application = $this->getMockBuilder('Symfony\Component\Console\Application')->setMethods(array('getNamespaces'))->getMock();

Original file line number	Diff line number	Diff line change
`@@ -1023,7 +1023,7 @@ private function findAlternatives($name, $collection)`
`1023`	`1023`	`}`
`1024`	`1024`
`1025`	`1025`	`$alternatives = array_filter($alternatives, function ($lev) use ($threshold) { return $lev < 2 * $threshold; });`
`1026`		`- asort($alternatives);`
	`1026`	`+ ksort($alternatives, SORT_NATURAL \| SORT_FLAG_CASE);`
`1027`	`1027`
`1028`	`1028`	`return array_keys($alternatives);`
`1029`	`1029`	`}`