[make:security:form-login]

Author: jrushlow

phpunit.xml.dist

@@ -19,6 +19,7 @@
         <env name="SYMFONY_PHPUNIT_VERSION" value="9.6" />
         <env name="MAKER_SKIP_MERCURE_TEST" value="false"/>
         <env name="MAKER_SKIP_PANTHER_TEST" value="false" />
+        <env name="MAKER_INTERACTIVE_DEPENDENCIES" value="false" />
 <!--    Overrides process timeout when step debugging -->
 <!--    <env name="MAKER_PROCESS_TIMEOUT" value="null" /> -->
     </php>

src/Command/MakerCommand.php

@@ -13,6 +13,7 @@
 
 use Symfony\Bundle\MakerBundle\ApplicationAwareMakerInterface;
 use Symfony\Bundle\MakerBundle\ConsoleStyle;
+use Symfony\Bundle\MakerBundle\Dependency\DependencyManager;
 use Symfony\Bundle\MakerBundle\DependencyBuilder;
 use Symfony\Bundle\MakerBundle\Exception\RuntimeCommandException;
 use Symfony\Bundle\MakerBundle\FileManager;
@@ -62,6 +63,13 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
             $dependencies = new DependencyBuilder();
             $this->maker->configureDependencies($dependencies, $input);
 
+            // env is for tests - this way we don't have to add a `y` to every test when a dependency is needed.
+            $dependencyManager = new DependencyManager($this->io, getenv('MAKER_INTERACTIVE_DEPENDS') ?? true);
+
+            $this->maker->configureComposerDependencies($dependencyManager);
+
+            $dependencyManager->installRequiredDependencies();
+
             if ($missingPackagesMessage = $dependencies->getMissingPackagesMessage($this->getName())) {
                 throw new RuntimeCommandException($missingPackagesMessage);
             }

src/Dependency/DependencyManager.php

@@ -31,56 +31,68 @@ final class DependencyManager
     /** @var OptionalClassDependency[] */
     private array $optionalClassDependencies = [];
 
-    private ConsoleStyle $io;
+    public function __construct(
+        private ConsoleStyle $io,
+        private bool $interactiveMode = true,
+    ) {
+    }
 
-    public function addRequiredDependency(RequiredClassDependency $dependency): self
+    public function addDependency(RequiredClassDependency|OptionalClassDependency|array $dependency): self
     {
-        $this->requiredClassDependencies[] = $dependency;
+        $dependencies = [];
 
-        return $this;
-    }
+        if (!\is_array($dependency)) {
+            $dependencies[] = $dependency;
+        }
 
-    public function addOptionalDependency(OptionalClassDependency $dependency): self
-    {
-        $this->optionalClassDependencies[] = $dependency;
+        foreach ($dependencies as $dependency) {
+            if ($dependency instanceof RequiredClassDependency) {
+                $this->requiredClassDependencies[] = $dependency;
+
+                continue;
+            }
+
+            $this->optionalClassDependencies[] = $dependency;
+        }
 
         return $this;
     }
 
-    public function installRequiredDependencies(ConsoleStyle $io, ?string $preInstallMessage): self
+    public function installRequiredDependencies(): self
     {
-        $this->io = $io;
-
-        $preInstallMessage ?: $this->io->caution($preInstallMessage);
-
         foreach ($this->requiredClassDependencies as $dependency) {
             if (class_exists($dependency->className) || !$this->askToInstallDependency($dependency)) {
                 continue;
             }
 
+            $dependency->preInstallMessage ?: $this->io->caution($dependency->preInstallMessage);
+
             $this->runComposer($dependency);
         }
 
         return $this;
     }
 
-    public function installOptionalDependencies(ConsoleStyle $io, ?string $preInstallMessage): self
+    public function installOptionalDependencies(): self
     {
-        $this->io = $io;
-
-        $preInstallMessage ?: $this->io->caution($preInstallMessage);
-
         foreach ($this->optionalClassDependencies as $dependency) {
             if (class_exists($dependency->className) || !$this->askToInstallDependency($dependency)) {
                 continue;
             }
 
+            $dependency->preInstallMessage ?: $this->io->caution($dependency->preInstallMessage);
+
             $this->runComposer($dependency);
         }
 
         return $this;
     }
 
+    public function installInteractively(): bool
+    {
+        return $this->interactiveMode;
+    }
+
     private function askToInstallDependency(RequiredClassDependency|OptionalClassDependency $dependency): bool
     {
         return $this->io->confirm(

src/Dependency/Model/AbstractClassDependency.php

@@ -22,6 +22,7 @@ public function __construct(
         public string $className,
         public string $composerPackage,
         public bool $installAsRequireDev = false,
+        public ?string $preInstallMessage = null,
     ) {
     }
 }

src/Maker/AbstractMaker.php

@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\MakerBundle\Maker;
 
 use Symfony\Bundle\MakerBundle\ConsoleStyle;
+use Symfony\Bundle\MakerBundle\Dependency\DependencyManager;
 use Symfony\Bundle\MakerBundle\DependencyBuilder;
 use Symfony\Bundle\MakerBundle\MakerInterface;
 use Symfony\Component\Console\Command\Command;
@@ -54,4 +55,15 @@ protected function addDependencies(array $dependencies, ?string $message = null)
             $message
         );
     }
+
+    public function configureComposerDependencies(DependencyManager $dependencyManager): void
+    {
+        // @TODO - method here in abstract prevents BC with signature added to `MakerInterface::class`
+    }
+
+    public function configureDependencies(DependencyBuilder $dependencies)
+    {
+        // @TODO - do we deprecate this method in favor of the one above. then remove in 2.x
+        // @TODO - still have plenty of work todo to determine if thats possible or a good idea...
+    }
 }

src/Maker/MakeTwigComponent.php

@@ -15,7 +15,6 @@
 use Symfony\Bundle\MakerBundle\Dependency\DependencyManager;
 use Symfony\Bundle\MakerBundle\Dependency\Model\OptionalClassDependency;
 use Symfony\Bundle\MakerBundle\Dependency\Model\RequiredClassDependency;
-use Symfony\Bundle\MakerBundle\DependencyBuilder;
 use Symfony\Bundle\MakerBundle\Generator;
 use Symfony\Bundle\MakerBundle\InputConfiguration;
 use Symfony\Bundle\MakerBundle\Str;
@@ -31,10 +30,7 @@
  */
 final class MakeTwigComponent extends AbstractMaker
 {
-    public function __construct(
-        private DependencyManager $dependencyManager = new DependencyManager(),
-    ) {
-    }
+    private DependencyManager $dependencyManager;
 
     public static function getCommandName(): string
     {
@@ -55,27 +51,27 @@ public function configureCommand(Command $command, InputConfiguration $inputConf
         ;
     }
 
-    public function configureDependencies(DependencyBuilder $dependencies): void
+    public function configureComposerDependencies(DependencyManager $dependencyManager): void
     {
-        $this->dependencyManager
-            ->addRequiredDependency(new RequiredClassDependency(
-                AsTwigComponent::class,
-                'symfony/ux-twig-component',
+        // $this is a hack - we need the manager later in `interact()`
+        $this->dependencyManager = $dependencyManager;
+
+        $dependencyManager
+            ->addDependency(new RequiredClassDependency(
+                className: AsTwigComponent::class,
+                composerPackage: 'symfony/ux-twig-component',
+                preInstallMessage: 'This command requires the Symfony UX Twig Component Package.'
             ))
-            ->addOptionalDependency(new OptionalClassDependency(
-                AsLiveComponent::class,
-                'symfony/ux-live-component',
+            ->addDependency(new OptionalClassDependency(
+                className: AsLiveComponent::class,
+                composerPackage: 'symfony/ux-live-component',
+                preInstallMessage: 'The Symfony UX Live Component is needed to make this a live component.'
             ))
         ;
     }
 
     public function interact(InputInterface $input, ConsoleStyle $io, Command $command): void
     {
-        $this->dependencyManager->installRequiredDependencies(
-            io: $io,
-            preInstallMessage: 'This command requires the Symfony UX Twig Component Package.'
-        );
-
         if (!$input->getOption('live')) {
             $input->setOption('live', $io->confirm('Make this a live component?'));
         }
@@ -84,10 +80,8 @@ public function interact(InputInterface $input, ConsoleStyle $io, Command $comma
             return;
         }
 
-        $this->dependencyManager->installOptionalDependencies(
-            io: $io,
-            preInstallMessage: 'The Symfony UX Live Component is needed to make this a live component.'
-        );
+        // @TODO - with the dependencyManager in `Command` -> we can't use it outside of configure dependencies.....
+        $this->dependencyManager->installOptionalDependencies();
     }
 
     public function generate(InputInterface $input, ConsoleStyle $io, Generator $generator): void

src/Maker/Security/MakeFormLogin.php

@@ -14,7 +14,8 @@
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Bundle\MakerBundle\ConsoleStyle;
-use Symfony\Bundle\MakerBundle\DependencyBuilder;
+use Symfony\Bundle\MakerBundle\Dependency\DependencyManager;
+use Symfony\Bundle\MakerBundle\Dependency\Model\RequiredClassDependency;
 use Symfony\Bundle\MakerBundle\Exception\RuntimeCommandException;
 use Symfony\Bundle\MakerBundle\FileManager;
 use Symfony\Bundle\MakerBundle\Generator;
@@ -77,22 +78,15 @@ public static function getCommandDescription(): string
         return 'Generate the code needed for the form_login authenticator';
     }
 
-    public function configureDependencies(DependencyBuilder $dependencies): void
+    public function configureComposerDependencies(DependencyManager $dependencyManager): void
     {
-        $dependencies->addClassDependency(
-            SecurityBundle::class,
-            'security'
-        );
-
-        $dependencies->addClassDependency(TwigBundle::class, 'twig');
-
-        // needed to update the YAML files
-        $dependencies->addClassDependency(
-            Yaml::class,
-            'yaml'
-        );
-
-        $dependencies->addClassDependency(DoctrineBundle::class, 'orm');
+        $dependencyManager
+            ->addDependency([
+                new RequiredClassDependency(SecurityBundle::class, 'security'),
+                new RequiredClassDependency(TwigBundle::class, 'twig'),
+                new RequiredClassDependency(Yaml::class, 'yaml'),
+                new RequiredClassDependency(DoctrineBundle::class, 'orm'),
+        ]);
     }
 
     public function interact(InputInterface $input, ConsoleStyle $io, Command $command): void

src/MakerInterface.php

@@ -11,13 +11,15 @@
 
 namespace Symfony\Bundle\MakerBundle;
 
+use Symfony\Bundle\MakerBundle\Dependency\DependencyManager;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 
 /**
  * Interface that all maker commands must implement.
  *
  * @method static string getCommandDescription()
+ * @method        void   configureComposerDependencies(DependencyManager $dependencyManager)
  *
  * @author Ryan Weaver <ryan@knpuniversity.com>
  */