Prevent auto-registration of UserPasswordEncoderCommand

chalasr · chalasr · commit 21f7c754d474 · 2017-05-22T18:48:15.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -98,11 +98,11 @@ public function load(array $configs, ContainerBuilder $container)
 
         if ($config['encoders']) {
             $this->createEncoders($config['encoders'], $container);
+        }
 
-            if (class_exists(Application::class)) {
-                $loader->load('console.xml');
-                $container->getDefinition('security.console.user_password_encoder_command')->replaceArgument(1, array_keys($config['encoders']));
-            }
+        if (class_exists(Application::class)) {
+            $loader->load('console.xml');
+            $container->getDefinition('security.console.user_password_encoder_command')->replaceArgument(1, array_keys($config['encoders']));
         }
 
         // load ACL
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -345,6 +345,11 @@ public function testUserCheckerConfigWithNoCheckers()
         $this->assertEquals('security.user_checker', $this->getContainer('container1')->getAlias('security.user_checker.secure'));
     }
 
+    public function testUserPasswordEncoderCommandIsRegistered()
+    {
+        $this->assertTrue($this->getContainer('container1')->has('security.console.user_password_encoder_command'));
+    }
+
     protected function getContainer($file)
     {
         $file = $file.'.'.$this->getFileExtension();

Original file line number	Diff line number	Diff line change
`@@ -345,6 +345,11 @@ public function testUserCheckerConfigWithNoCheckers()`
`345`	`345`	`$this->assertEquals('security.user_checker', $this->getContainer('container1')->getAlias('security.user_checker.secure'));`
`346`	`346`	`}`
`347`	`347`
	`348`	`+ public function testUserPasswordEncoderCommandIsRegistered()`
	`349`	`+ {`
	`350`	`+ $this->assertTrue($this->getContainer('container1')->has('security.console.user_password_encoder_command'));`
	`351`	`+ }`
	`352`	`+`
`348`	`353`	`protected function getContainer($file)`
`349`	`354`	`{`
`350`	`355`	`$file = $file.'.'.$this->getFileExtension();`