symfony
diff --git a/‎src/Symfony/Component/Console/Command/Command.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Command/Command.php
+11-1Lines changed: 11 additions & 1 deletion b/‎src/Symfony/Component/Console/Command/Command.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Command/Command.php
+11-1Lines changed: 11 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Console/Command/DefaultNameProviderInterface.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Command/DefaultNameProviderInterface.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Console/Command/DefaultNameProviderInterface.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Command/DefaultNameProviderInterface.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php
+2-5Lines changed: 2 additions & 5 deletions b/‎src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php
+2-5Lines changed: 2 additions & 5 deletions
@@ -27,8 +27,10 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class Command
+class Command implements DefaultNameProviderInterface
 {
+    protected static $defaultName;
+
     private $application;
     private $name;
     private $processTitle;
@@ -45,6 +47,14 @@ class Command
     private $usages = array();
     private $helperSet;
 
+    public static function getDefaultName()
+    {
+        $class = get_called_class();
+        $r = new \ReflectionProperty($class, 'defaultName');
+
+        return $class === $r->class ? static::$defaultName : null;
+    }
+
     /**
      * Constructor.
      *
 
@@ -20,7 +20,7 @@
 interface DefaultNameProviderInterface
 {
     /**
-     * @return string The name to use by default for calling the Command
+     * @return string|null The name to use by default for calling the Command or null when no default name is set
      */
     public static function getDefaultName();
 }
@@ -56,7 +56,7 @@ public function process(ContainerBuilder $container)
 
             $commandId = 'console.command.'.strtolower(str_replace('\\', '_', $class));
 
-            if (!isset($tags[0]['command']) && !$r->implementsInterface(DefaultNameProviderInterface::class)) {
+            if (!isset($tags[0]['command']) && (!$r->implementsInterface(DefaultNameProviderInterface::class) || !$defaultName = $class::getDefaultName())) {
                 if (isset($serviceIds[$commandId]) || $container->hasAlias($commandId)) {
                     $commandId = $commandId.'_'.$id;
                 }
@@ -70,7 +70,7 @@ public function process(ContainerBuilder $container)
             }
 
             $serviceIds[$commandId] = false;
-            $commandName = isset($tags[0]['command']) ? $tags[0]['command'] : $class::getDefaultName();
+            $commandName = isset($tags[0]['command']) ? $tags[0]['command'] : $defaultName;
             unset($tags[0]);
             $lazyCommandMap[$commandName] = $id;
             $lazyCommandRefs[$id] = new TypedReference($id, $class);
 
@@ -180,10 +180,7 @@ class MyCommand extends Command
 {
 }
 
-class NamedCommand extends Command implements DefaultNameProviderInterface
+class NamedCommand extends Command
 {
-    public static function getDefaultName()
-    {
-        return 'default';
-    }
+    protected static $defaultName = 'default';
 }
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`interface DefaultNameProviderInterface`
`21`	`21`	`{`
`22`	`22`	`/**`
`23`		`- * @return string The name to use by default for calling the Command`
	`23`	`+ * @return string\|null The name to use by default for calling the Command or null when no default name is set`
`24`	`24`	`*/`
`25`	`25`	`public static function getDefaultName();`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -180,10 +180,7 @@ class MyCommand extends Command`
`180`	`180`	`{`
`181`	`181`	`}`
`182`	`182`
`183`		`-class NamedCommand extends Command implements DefaultNameProviderInterface`
	`183`	`+class NamedCommand extends Command`
`184`	`184`	`{`
`185`		`- public static function getDefaultName()`
`186`		`- {`
`187`		`- return 'default';`
`188`		`- }`
	`185`	`+ protected static $defaultName = 'default';`
`189`	`186`	`}`