Upgrade 1-11.38

vendor/symfony/console/Descriptor/ApplicationDescription.php

@@ -43,11 +43,7 @@ class ApplicationDescription
      */
     private $aliases;
 
-    /**
-     * @param string|null $namespace
-     * @param bool        $showHidden
-     */
-    public function __construct(Application $application, $namespace = null, $showHidden = false)
+    public function __construct(Application $application, string $namespace = null, bool $showHidden = false)
     {
         $this->application = $application;
         $this->namespace = $namespace;
@@ -88,7 +84,7 @@ class ApplicationDescription
     public function getCommand($name)
     {
         if (!isset($this->commands[$name]) && !isset($this->aliases[$name])) {
-            throw new CommandNotFoundException(sprintf('Command "%s" does not exist.', $name));
+            throw new CommandNotFoundException(sprintf('Command %s does not exist.', $name));
         }
 
         return isset($this->commands[$name]) ? $this->commands[$name] : $this->aliases[$name];
@@ -122,36 +118,27 @@ class ApplicationDescription
         }
     }
 
-    /**
-     * @return array
-     */
-    private function sortCommands(array $commands)
+    private function sortCommands(array $commands): array
     {
         $namespacedCommands = [];
         $globalCommands = [];
-        $sortedCommands = [];
         foreach ($commands as $name => $command) {
             $key = $this->application->extractNamespace($name, 1);
-            if (\in_array($key, ['', self::GLOBAL_NAMESPACE], true)) {
-                $globalCommands[$name] = $command;
+            if (!$key) {
+                $globalCommands['_global'][$name] = $command;
             } else {
                 $namespacedCommands[$key][$name] = $command;
             }
         }
+        ksort($namespacedCommands);
+        $namespacedCommands = array_merge($globalCommands, $namespacedCommands);
 
-        if ($globalCommands) {
-            ksort($globalCommands);
-            $sortedCommands[self::GLOBAL_NAMESPACE] = $globalCommands;
+        foreach ($namespacedCommands as &$commandsSet) {
+            ksort($commandsSet);
         }
+        // unset reference to keep scope clear
+        unset($commandsSet);
 
-        if ($namespacedCommands) {
-            ksort($namespacedCommands);
-            foreach ($namespacedCommands as $key => $commandsSet) {
-                ksort($commandsSet);
-                $sortedCommands[$key] = $commandsSet;
-            }
-        }
-
-        return $sortedCommands;
+        return $namespacedCommands;
     }
 }