Fix InteractiveSecurityHelper constructor calls

Author: natepage

config/makers.xml

@@ -83,6 +83,7 @@
                 <argument type="service" id="maker.file_manager" />
                 <argument type="service" id="maker.renderer.form_type_renderer" />
                 <argument type="service" id="maker.doctrine_helper" />
+                <argument type="service" id="maker.namespaces_helper" />
                 <argument type="service" id="router" on-invalid="ignore" />
                 <tag name="maker.command" />
             </service>
@@ -160,6 +161,7 @@
                 <argument type="service" id="maker.file_manager" />
                 <argument type="service" id="maker.security_config_updater" />
                 <argument type="service" id="maker.security_controller_builder" />
+                <argument type="service" id="maker.namespaces_helper" />
                 <tag name="maker.command" />
             </service>
 

src/Maker/MakeAuthenticator.php

@@ -151,7 +151,7 @@ function ($answer) {
         );
         $input->setArgument('authenticator-class', $io->askQuestion($questionAuthenticatorClass));
 
-        $interactiveSecurityHelper = new InteractiveSecurityHelper();
+        $interactiveSecurityHelper = new InteractiveSecurityHelper($this->generator->getNamespacesHelper());
         $command->addOption('firewall-name', null, InputOption::VALUE_OPTIONAL);
         $input->setOption('firewall-name', $interactiveSecurityHelper->guessFirewallName($io, $securityData));
 

src/Maker/MakeRegistrationForm.php

@@ -37,6 +37,7 @@
 use Symfony\Bundle\MakerBundle\Util\ClassNameDetails;
 use Symfony\Bundle\MakerBundle\Util\ClassSourceManipulator;
 use Symfony\Bundle\MakerBundle\Util\CliOutputHelper;
+use Symfony\Bundle\MakerBundle\Util\NamespacesHelper;
 use Symfony\Bundle\MakerBundle\Util\UseStatementGenerator;
 use Symfony\Bundle\MakerBundle\Util\YamlSourceManipulator;
 use Symfony\Bundle\MakerBundle\Validator;
@@ -91,6 +92,7 @@ public function __construct(
         private FileManager $fileManager,
         private FormTypeRenderer $formTypeRenderer,
         private DoctrineHelper $doctrineHelper,
+        private NamespacesHelper $namespacesHelper,
         private ?RouterInterface $router = null,
     ) {
     }
@@ -116,7 +118,7 @@ public function configureCommand(Command $command, InputConfiguration $inputConf
 
     public function interact(InputInterface $input, ConsoleStyle $io, Command $command): void
     {
-        $interactiveSecurityHelper = new InteractiveSecurityHelper();
+        $interactiveSecurityHelper = new InteractiveSecurityHelper($this->namespacesHelper);
 
         if (null === $this->router) {
             throw new RuntimeCommandException('Router have been explicitly disabled in your configuration. This command needs to use the router.');

src/Maker/Security/MakeFormLogin.php

@@ -29,6 +29,7 @@
 use Symfony\Bundle\MakerBundle\Security\SecurityControllerBuilder;
 use Symfony\Bundle\MakerBundle\Str;
 use Symfony\Bundle\MakerBundle\Util\ClassSourceManipulator;
+use Symfony\Bundle\MakerBundle\Util\NamespacesHelper;
 use Symfony\Bundle\MakerBundle\Util\UseStatementGenerator;
 use Symfony\Bundle\MakerBundle\Util\YamlSourceManipulator;
 use Symfony\Bundle\MakerBundle\Validator;
@@ -67,6 +68,7 @@ public function __construct(
         private FileManager $fileManager,
         private SecurityConfigUpdater $securityConfigUpdater,
         private SecurityControllerBuilder $securityControllerBuilder,
+        private NamespacesHelper $namespacesHelper,
     ) {
     }
 
@@ -126,7 +128,7 @@ public function interact(InputInterface $input, ConsoleStyle $io, Command $comma
             Validator::validateClassName(...)
         );
 
-        $securityHelper = new InteractiveSecurityHelper();
+        $securityHelper = new InteractiveSecurityHelper($this->namespacesHelper);
         $this->firewallToUpdate = $securityHelper->guessFirewallName($io, $securityData);
         $this->userClass = $securityHelper->guessUserClass($io, $securityData['security']['providers']);
         $this->userNameField = $securityHelper->guessUserNameField($io, $this->userClass, $securityData['security']['providers']);

tests/Security/InteractiveSecurityHelperTest.php

@@ -15,6 +15,7 @@
 use Symfony\Bundle\MakerBundle\Security\InteractiveSecurityHelper;
 use Symfony\Bundle\MakerBundle\Security\Model\Authenticator;
 use Symfony\Bundle\MakerBundle\Security\Model\AuthenticatorType;
+use Symfony\Bundle\MakerBundle\Util\NamespacesHelper;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 class InteractiveSecurityHelperTest extends TestCase
@@ -30,7 +31,7 @@ public function testGuessFirewallName(array $securityData, string $expectedFirew
             ->method('choice')
             ->willReturn($expectedFirewallName);
 
-        $helper = new InteractiveSecurityHelper();
+        $helper = new InteractiveSecurityHelper(new NamespacesHelper());
         $this->assertEquals(
             $expectedFirewallName,
             $helper->guessFirewallName($io, $securityData)
@@ -88,7 +89,7 @@ public function testGuessUserClass(array $securityData, string $expectedUserClas
             ->method('ask')
             ->willReturn($expectedUserClass);
 
-        $helper = new InteractiveSecurityHelper();
+        $helper = new InteractiveSecurityHelper(new NamespacesHelper());
         $this->assertEquals(
             $expectedUserClass,
             $helper->guessUserClass($io, $securityData)
@@ -128,7 +129,7 @@ public function testGuessUserNameField(array $providers, string $expectedUsernam
             ->with(\sprintf('Which field on your <fg=yellow>%s</> class will people enter when logging in?', $class), $choices, 'username')
             ->willReturn($expectedUsernameField);
 
-        $interactiveSecurityHelper = new InteractiveSecurityHelper();
+        $interactiveSecurityHelper = new InteractiveSecurityHelper(new NamespacesHelper());
         $this->assertEquals(
             $expectedUsernameField,
             $interactiveSecurityHelper->guessUserNameField($io, $class, $providers)
@@ -185,7 +186,7 @@ public function testGuessEmailField(string $expectedEmailField, bool $fieldAutom
             ->with(\sprintf('Which field on your <fg=yellow>%s</> class holds the email address?', $class), $choices, null)
             ->willReturn($expectedEmailField);
 
-        $interactiveSecurityHelper = new InteractiveSecurityHelper();
+        $interactiveSecurityHelper = new InteractiveSecurityHelper(new NamespacesHelper());
         $this->assertEquals(
             $expectedEmailField,
             $interactiveSecurityHelper->guessEmailField($io, $class)
@@ -211,7 +212,7 @@ public function guessEmailFieldTest()
     /** @dataProvider authenticatorClassProvider */
     public function testGetAuthenticatorsFromConfig(array $firewalls, array $expectedResults): void
     {
-        $helper = new InteractiveSecurityHelper();
+        $helper = new InteractiveSecurityHelper(new NamespacesHelper());
         $result = $helper->getAuthenticatorsFromConfig($firewalls);
 
         self::assertEquals($expectedResults, $result);
@@ -287,7 +288,7 @@ public function testGuessPasswordSetter(string $expectedPasswordSetter, bool $au
             ->with(\sprintf('Which method on your <fg=yellow>%s</> class can be used to set the encoded password (e.g. setPassword())?', $class), $choices, null)
             ->willReturn($expectedPasswordSetter);
 
-        $interactiveSecurityHelper = new InteractiveSecurityHelper();
+        $interactiveSecurityHelper = new InteractiveSecurityHelper(new NamespacesHelper());
         $this->assertEquals(
             $expectedPasswordSetter,
             $interactiveSecurityHelper->guessPasswordSetter($io, $class)
@@ -322,7 +323,7 @@ public function testGuessEmailGetter(string $expectedEmailGetter, string $emailA
             ->with(\sprintf('Which method on your <fg=yellow>%s</> class can be used to get the email address (e.g. getEmail())?', $class), $choices, null)
             ->willReturn($expectedEmailGetter);
 
-        $interactiveSecurityHelper = new InteractiveSecurityHelper();
+        $interactiveSecurityHelper = new InteractiveSecurityHelper(new NamespacesHelper());
         $this->assertEquals(
             $expectedEmailGetter,
             $interactiveSecurityHelper->guessEmailGetter($io, $class, $emailAttribute)