feature #23887 [Console] Allow commands to provide a default name for compile time registration (chalasr, nicolas-grekas)

fabpot · fabpot · commit 9778a0cb627a · 2017-08-24T14:10:36.000-07:00
This PR was merged into the 3.4 branch. Discussion ---------- [Console] Allow commands to provide a default name for compile time registration | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #23796 | License | MIT | Doc PR | symfony/symfony-docs#8147 Commits ------- eda7d42955 [Console] Add protected static $defaultName to set the default name of a Command 5d9ae6b56f [Console] Allow commands to provide a default name for compile time registration
diff --git a/Command/InitAclCommand.php b/Command/InitAclCommand.php
@@ -27,6 +27,8 @@
  */
 class InitAclCommand extends ContainerAwareCommand
 {
+    protected static $defaultName = 'init:acl';
+
     private $connection;
     private $schema;
 
@@ -70,7 +72,6 @@ public function isEnabled()
     protected function configure()
     {
         $this
-            ->setName('init:acl')
             ->setDescription('Mounts ACL tables in the database')
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command mounts ACL tables in the database.
diff --git a/Command/SetAclCommand.php b/Command/SetAclCommand.php
@@ -32,6 +32,8 @@
  */
 class SetAclCommand extends ContainerAwareCommand
 {
+    protected static $defaultName = 'acl:set';
+
     private $provider;
 
     /**
@@ -80,7 +82,6 @@ public function isEnabled()
     protected function configure()
     {
         $this
-            ->setName('acl:set')
             ->setDescription('Sets ACL for objects')
             ->setHelp(<<<EOF
 The <info>%command.name%</info> command sets ACL.
diff --git a/Command/UserPasswordEncoderCommand.php b/Command/UserPasswordEncoderCommand.php
@@ -19,7 +19,6 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\Security\Core\Encoder\BCryptPasswordEncoder;
 use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
 use Symfony\Component\Security\Core\User\User;
@@ -33,6 +32,8 @@
  */
 class UserPasswordEncoderCommand extends ContainerAwareCommand
 {
+    protected static $defaultName = 'security:encode-password';
+
     private $encoderFactory;
     private $userClasses;
 
@@ -54,7 +55,6 @@ public function __construct(EncoderFactoryInterface $encoderFactory = null, arra
     protected function configure()
     {
         $this
-            ->setName('security:encode-password')
             ->setDescription('Encodes a password.')
             ->addArgument('password', InputArgument::OPTIONAL, 'The plain password to encode.')
             ->addArgument('user-class', InputArgument::OPTIONAL, 'The User entity class path associated with the encoder used to encode the password.')
diff --git a/Tests/Functional/SetAclCommandTest.php b/Tests/Functional/SetAclCommandTest.php
@@ -20,7 +20,6 @@
  * file that was distributed with this source code.
  */
 use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Bundle\SecurityBundle\Command\InitAclCommand;
 use Symfony\Bundle\SecurityBundle\Command\SetAclCommand;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
@@ -170,7 +169,6 @@ private function getApplication()
         $kernel->boot();
 
         $application = new Application($kernel);
-        $application->add(new InitAclCommand($kernel->getContainer()->get('security.acl.dbal.connection'), $kernel->getContainer()->get('security.acl.dbal.schema')));
 
         $initAclCommand = $application->find('init:acl');
         $initAclCommandTester = new CommandTester($initAclCommand);
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
     "require-dev": {
         "symfony/asset": "~2.8|~3.0|~4.0",
         "symfony/browser-kit": "~2.8|~3.0|~4.0",
-        "symfony/console": "~3.2|~4.0",
+        "symfony/console": "~3.4|~4.0",
         "symfony/css-selector": "~2.8|~3.0|~4.0",
         "symfony/dom-crawler": "~2.8|~3.0|~4.0",
         "symfony/event-dispatcher": "^3.3.1|~4.0",
@@ -47,7 +47,8 @@
     },
     "conflict": {
         "symfony/var-dumper": "<3.3",
-        "symfony/event-dispatcher": "<3.3.1"
+        "symfony/event-dispatcher": "<3.3.1",
+        "symfony/console": "<3.4"
     },
     "suggest": {
         "symfony/security-acl": "For using the ACL functionality of this bundle"
