symfony
diff --git a/‎src/Symfony/Component/Console/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/CHANGELOG.md
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Console/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/CHANGELOG.md
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Console/Command/Command.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Command/Command.php
+13Lines changed: 13 additions & 0 deletions b/‎src/Symfony/Component/Console/Command/Command.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Command/Command.php
+13Lines changed: 13 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Console/Command/DefaultNameProviderInterface.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Command/DefaultNameProviderInterface.php
-26Lines changed: 0 additions & 26 deletions b/‎src/Symfony/Component/Console/Command/DefaultNameProviderInterface.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Command/DefaultNameProviderInterface.php
-26Lines changed: 0 additions & 26 deletions
diff --git a/‎src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
+4-3Lines changed: 4 additions & 3 deletions b/‎src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
+4-3Lines changed: 4 additions & 3 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-6Lines changed: 2 additions & 6 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-6Lines changed: 2 additions & 6 deletions
@@ -7,7 +7,7 @@ CHANGELOG
  * added `CommandLoaderInterface`, `FactoryCommandLoader` and PSR-11
    `ContainerCommandLoader` for commands lazy-loading
  * added a case-insensitive command name matching fallback
- * added `DefaultNameProviderInterface`
+ * added `Command::$defaultName` and `Command::getDefaultName()`
 
 3.3.0
 -----
 
@@ -29,6 +29,8 @@
  */
 class Command
 {
+    protected static $defaultName;
+
     private $application;
     private $name;
     private $processTitle;
@@ -45,6 +47,17 @@ class Command
     private $usages = array();
     private $helperSet;
 
+    /**
+     * @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()
+    {
+        $class = get_called_class();
+        $r = new \ReflectionProperty($class, 'defaultName');
+
+        return $class === $r->class ? static::$defaultName : null;
+    }
+
     /**
      * Constructor.
      *
 
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Console\DependencyInjection;
 
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Command\DefaultNameProviderInterface;
 use Symfony\Component\Console\CommandLoader\ContainerCommandLoader;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;
@@ -56,7 +55,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']) && !$commandName = $class::getDefaultName()) {
                 if (isset($serviceIds[$commandId]) || $container->hasAlias($commandId)) {
                     $commandId = $commandId.'_'.$id;
                 }
@@ -70,7 +69,9 @@ public function process(ContainerBuilder $container)
             }
 
             $serviceIds[$commandId] = false;
-            $commandName = isset($tags[0]['command']) ? $tags[0]['command'] : $class::getDefaultName();
+            if (isset($tags[0]['command'])) {
+                $commandName = $tags[0]['command'];
+            }
             unset($tags[0]);
             $lazyCommandMap[$commandName] = $id;
             $lazyCommandRefs[$id] = new TypedReference($id, $class);
 
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Console\Tests\DependencyInjection;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Console\Command\DefaultNameProviderInterface;
 use Symfony\Component\Console\CommandLoader\ContainerCommandLoader;
 use Symfony\Component\Console\DependencyInjection\AddConsoleCommandPass;
 use Symfony\Component\Console\Command\Command;
@@ -180,10 +179,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
`@@ -12,7 +12,6 @@`
`12`	`12`	`namespace Symfony\Component\Console\Tests\DependencyInjection;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`		`-use Symfony\Component\Console\Command\DefaultNameProviderInterface;`
`16`	`15`	`use Symfony\Component\Console\CommandLoader\ContainerCommandLoader;`
`17`	`16`	`use Symfony\Component\Console\DependencyInjection\AddConsoleCommandPass;`
`18`	`17`	`use Symfony\Component\Console\Command\Command;`
`@@ -180,10 +179,7 @@ class MyCommand extends Command`
`180`	`179`	`{`
`181`	`180`	`}`
`182`	`181`
`183`		`-class NamedCommand extends Command implements DefaultNameProviderInterface`
	`182`	`+class NamedCommand extends Command`
`184`	`183`	`{`
`185`		`- public static function getDefaultName()`
`186`		`- {`
`187`		`- return 'default';`
`188`		`- }`
	`184`	`+ protected static $defaultName = 'default';`
`189`	`185`	`}`