Merge branch '3.4' into 4.3

* 3.4: [Console] allow Command::getName() to return null
symfony · Aug 30, 2019 · 2886902 · 2886902
2 parents de63799 + 0c8d9a8
commit 2886902
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Application.php b/Application.php
@@ -21,6 +21,7 @@
 use Symfony\Component\Console\Exception\CommandNotFoundException;
 use Symfony\Component\Console\Exception\ExceptionInterface;
 use Symfony\Component\Console\Exception\NamespaceNotFoundException;
+use Symfony\Component\Console\Exception\LogicException;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Helper\DebugFormatterHelper;
 use Symfony\Component\Console\Helper\FormatterHelper;
@@ -477,6 +478,10 @@ public function add(Command $command)
         // Will throw if the command is not correctly initialized.
         $command->getDefinition();
 
+        if (!$command->getName()) {
+            throw new LogicException(sprintf('The command defined in "%s" cannot have an empty name.', \get_class($command)));
+        }
+
         $this->commands[$command->getName()] = $command;
 
         foreach ($command->getAliases() as $alias) {

diff --git a/Command/Command.php b/Command/Command.php
@@ -445,14 +445,10 @@ public function setProcessTitle($title)
     /**
      * Returns the command name.
      *
-     * @return string The command name
+     * @return string|null
      */
     public function getName()
     {
-        if (!$this->name) {
-            throw new LogicException(sprintf('The command defined in "%s" cannot have an empty name.', \get_class($this)));
-        }
-
         return $this->name;
     }