minor #47299 [Console] fix expected command name order with mixed integer and string namespaces (xabbuh)

nicolas-grekas · nicolas-grekas · commit a8573b04edcc · 2022-08-17T16:34:04.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Console] fix expected command name order with mixed integer and string namespaces | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | Commits ------- 5cd0eae fix expected command name order with mixed integer and string namespaces
diff --git a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
@@ -131,7 +131,7 @@ private function sortCommands(array $commands): array
         }
 
         if ($namespacedCommands) {
-            ksort($namespacedCommands);
+            ksort($namespacedCommands, \SORT_STRING);
             foreach ($namespacedCommands as $key => $commandsSet) {
                 ksort($commandsSet);
                 $sortedCommands[$key] = $commandsSet;
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/ApplicationDescriptionTest.php b/src/Symfony/Component/Console/Tests/Descriptor/ApplicationDescriptionTest.php
@@ -36,7 +36,7 @@ public function getNamespacesProvider()
         return [
             [['_global'], ['foobar']],
             [['a', 'b'], ['b:foo', 'a:foo', 'b:bar']],
-            [['_global', 'b', 'z', 22, 33], ['z:foo', '1', '33:foo', 'b:foo', '22:foo:bar']],
+            [['_global', 22, 33, 'b', 'z'], ['z:foo', '1', '33:foo', 'b:foo', '22:foo:bar']],
         ];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ private function sortCommands(array $commands): array`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`if ($namespacedCommands) {`
`134`		`- ksort($namespacedCommands);`
	`134`	`+ ksort($namespacedCommands, \SORT_STRING);`
`135`	`135`	`foreach ($namespacedCommands as $key => $commandsSet) {`
`136`	`136`	`ksort($commandsSet);`
`137`	`137`	`$sortedCommands[$key] = $commandsSet;`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function getNamespacesProvider()`
`36`	`36`	`return [`
`37`	`37`	`[['_global'], ['foobar']],`
`38`	`38`	`[['a', 'b'], ['b:foo', 'a:foo', 'b:bar']],`
`39`		`- [['_global', 'b', 'z', 22, 33], ['z:foo', '1', '33:foo', 'b:foo', '22:foo:bar']],`
	`39`	`+ [['_global', 22, 33, 'b', 'z'], ['z:foo', '1', '33:foo', 'b:foo', '22:foo:bar']],`
`40`	`40`	`];`
`41`	`41`	`}`
`42`	`42`	`}`