finalized securitybundle

symfony · ro0NL · Aug 6, 2017 · Aug 6, 2017 · Aug 6, 2017 · Aug 6, 2017
commit 0f302777c4ff290520cc331b095514e87dbbbb95
diff --git a/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php
@@ -14,6 +14,8 @@
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Security\Acl\Dbal\Schema;
+use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Schema\SchemaException;
 
 /**
@@ -25,11 +27,39 @@
  */
 class InitAclCommand extends ContainerAwareCommand
 {
+    private $connection;
+    private $schema;
+
+    /**
+     * @param Connection $connection
+     * @param Schema     $schema
+     */
+    public function __construct($connection = null, Schema $schema = null)
+    {
+        if (!$connection instanceof Connection) {
+            @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);
+
+            parent::__construct($connection);
+
+            return;
+        }
+
+        parent::__construct();
+
+        $this->connection = $connection;
+        $this->schema = $schema;
+    }
+
     /**
      * {@inheritdoc}
+     *
+     * BC to be removed in 4.0
      */
     public function isEnabled()
     {
+        if (null !== $this->connection) {
+            return parent::isEnabled();
+        }
         if (!$this->getContainer()->has('security.acl.dbal.connection')) {
             return false;
         }
@@ -65,21 +95,22 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $container = $this->getContainer();
-
-        $connection = $container->get('security.acl.dbal.connection');
-        $schema = $container->get('security.acl.dbal.schema');
+        // BC to be removed in 4.0
+        if (null === $this->connection) {
+            $this->connection = $this->getContainer()->get('security.acl.dbal.connection');
+            $this->schema = $this->getContainer()->get('security.acl.dbal.schema');
+        }
 
         try {
-            $schema->addToSchema($connection->getSchemaManager()->createSchema());
+            $this->schema->addToSchema($this->connection->getSchemaManager()->createSchema());
         } catch (SchemaException $e) {
             $output->writeln('Aborting: '.$e->getMessage());
 
             return 1;
         }
 
-        foreach ($schema->toSql($connection->getDatabasePlatform()) as $sql) {
-            $connection->exec($sql);
+        foreach ($this->schema->toSql($this->connection->getDatabasePlatform()) as $sql) {
+            $this->connection->exec($sql);
         }
 
         $output->writeln('ACL tables have been initialized successfully.');

diff --git a/src/Symfony/Bundle/SecurityBundle/Command/SetAclCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/SetAclCommand.php
@@ -32,11 +32,36 @@
  */
 class SetAclCommand extends ContainerAwareCommand
 {
+    private $provider;
+
+    /**
+     * @param MutableAclProviderInterface $provider
+     */
+    public function __construct($provider = null)
+    {
+        if (!$provider instanceof MutableAclProviderInterface) {
+            @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);
+
+            parent::__construct($provider);
+
+            return;
+        }
+
+        parent::__construct();
+
+        $this->provider = $provider;
+    }
+
     /**
      * {@inheritdoc}
+     *
+     * BC to be removed in 4.0
      */
     public function isEnabled()
     {
+        if (null !== $this->provider) {
+            return parent::isEnabled();
+        }
         if (!$this->getContainer()->has('security.acl.provider')) {
             return false;
         }
@@ -91,6 +116,11 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        // BC to be removed in 4.0
+        if (null === $this->provider) {
+            $this->provider = $this->getContainer()->get('security.acl.provider');
+        }
+
         // Parse arguments
         $objectIdentities = array();
         $maskBuilder = $this->getMaskBuilder();
@@ -136,20 +166,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
         }
 
-        /** @var $container \Symfony\Component\DependencyInjection\ContainerInterface */
-        $container = $this->getContainer();
-        /** @var $aclProvider MutableAclProviderInterface */
-        $aclProvider = $container->get('security.acl.provider');
-
         // Sets ACL
         foreach ($objectIdentities as $objectIdentity) {
             // Creates a new ACL if it does not already exist
             try {
-                $aclProvider->createAcl($objectIdentity);
+                $this->provider->createAcl($objectIdentity);
             } catch (AclAlreadyExistsException $e) {
             }
 
-            $acl = $aclProvider->findAcl($objectIdentity, $securityIdentities);
+            $acl = $this->provider->findAcl($objectIdentity, $securityIdentities);
 
             foreach ($securityIdentities as $securityIdentity) {
                 if ($classScopeOption) {
@@ -159,13 +184,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 }
             }
 
-            $aclProvider->updateAcl($acl);
+            $this->provider->updateAcl($acl);
         }
     }
 
     /**
      * Gets the mask builder.
      *
+     * BC to be removed in 4.0
+     *
      * @return MaskBuilder
      */
     protected function getMaskBuilder()

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Bundle\SecurityBundle\DependencyInjection;
 
+use Symfony\Bundle\SecurityBundle\Command\InitAclCommand;
+use Symfony\Bundle\SecurityBundle\Command\SetAclCommand;
 use Symfony\Bundle\SecurityBundle\Command\UserPasswordEncoderCommand;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityFactoryInterface;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\UserProvider\UserProviderFactoryInterface;
@@ -114,6 +116,9 @@ public function load(array $configs, ContainerBuilder $container)
         // load ACL
         if (isset($config['acl'])) {
             $this->aclLoad($config['acl'], $container);
+        } else {
+            $container->removeDefinition(InitAclCommand::class);
+            $container->removeDefinition(SetAclCommand::class);
         }
 
         $container->registerForAutoconfiguration(VoterInterface::class)

diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/console.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/console.xml
@@ -8,10 +8,13 @@
         <defaults public="false" />
 
         <service id="Symfony\Bundle\SecurityBundle\Command\InitAclCommand">
+            <argument type="service" id="security.acl.dbal.connection" />
+            <argument type="service" id="security.acl.dbal.schema" />
             <tag name="console.command" command="init:acl" />
         </service>
 
         <service id="Symfony\Bundle\SecurityBundle\Command\SetAclCommand">
+            <argument type="service" id="security.acl.provider" />
             <tag name="console.command" command="acl:set" />
         </service>
 

diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SetAclCommandTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SetAclCommandTest.php
@@ -96,7 +96,7 @@ public function testSetAclRole()
         $role = 'ROLE_ADMIN';
 
         $application = $this->getApplication();
-        $application->add(new SetAclCommand());
+        $application->add(new SetAclCommand($application->getKernel()->getContainer()->get('security.acl.provider')));
 
         $setAclCommand = $application->find('acl:set');
         $setAclCommandTester = new CommandTester($setAclCommand);
@@ -138,7 +138,7 @@ public function testSetAclClassScope()
         $role = 'ROLE_USER';
 
         $application = $this->getApplication();
-        $application->add(new SetAclCommand());
+        $application->add(new SetAclCommand($application->getKernel()->getContainer()->get('security.acl.provider')));
 
         $setAclCommand = $application->find('acl:set');
         $setAclCommandTester = new CommandTester($setAclCommand);
@@ -170,7 +170,7 @@ private function getApplication()
         $kernel->boot();
 
     
4DBF
    $application = new Application($kernel);
-        $application->add(new InitAclCommand());
+        $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);