use statements from data object

Author: jrushlow

src/Maker/MakeCrud.php

@@ -28,7 +28,6 @@
 use Symfony\Bundle\MakerBundle\Renderer\FormTypeRenderer;
 use Symfony\Bundle\MakerBundle\Str;
 use Symfony\Bundle\MakerBundle\Util\ClassSource\Model\ClassData;
-use Symfony\Bundle\MakerBundle\Util\UseStatementGenerator;
 use Symfony\Bundle\MakerBundle\Validator;
 use Symfony\Bundle\TwigBundle\TwigBundle;
 use Symfony\Component\Console\Command\Command;
@@ -132,11 +131,6 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
             ];
         }
 
-        $controllerClassData = ClassData::create(
-            class: sprintf('App\Controller\%sController', $this->controllerClassName),
-            extendsClass: AbstractController::class,
-        );
-
         $controllerClassDetails = $generator->createClassNameDetails(
             $this->controllerClassName,
             'Controller\\',
@@ -153,6 +147,20 @@ class: sprintf('App\Controller\%sController', $this->controllerClassName),
             ++$iter;
         } while (class_exists($formClassDetails->getFullName()));
 
+        $controllerClassData = ClassData::create(
+            class: sprintf('App\Controller\%sController', $this->controllerClassName),
+            extendsClass: AbstractController::class,
+            useStatements: [
+                $entityClassDetails->getFullName(),
+                $formClassDetails->getFullName(),
+                $repositoryClassName,
+                AbstractController::class,
+                Request::class,
+                Response::class,
+                Route::class,
+            ],
+        );
+
         $entityVarPlural = lcfirst($this->inflector->pluralize($entityClassDetails->getShortName()));
         $entityVarSingular = lcfirst($this->inflector->singularize($entityClassDetails->getShortName()));
 
@@ -162,26 +170,15 @@ class: sprintf('App\Controller\%sController', $this->controllerClassName),
         $routeName = Str::asRouteName($controllerClassDetails->getRelativeNameWithoutSuffix());
         $templatesPath = Str::asFilePath($controllerClassDetails->getRelativeNameWithoutSuffix());
 
-        $useStatements = new UseStatementGenerator([
-            $entityClassDetails->getFullName(),
-            $formClassDetails->getFullName(),
-            $repositoryClassName,
-            AbstractController::class,
-            Request::class,
-            Response::class,
-            Route::class,
-        ]);
-
         if (EntityManagerInterface::class !== $repositoryClassName) {
-            $useStatements->addUseStatement(EntityManagerInterface::class);
+            $controllerClassData->addUseStatement(EntityManagerInterface::class);
         }
 
         $generator->generateController(
             $controllerClassDetails->getFullName(),
             'crud/controller/Controller.tpl.php',
             array_merge([
                 'class_data' => $controllerClassData,
-                'use_statements' => $useStatements,
                 'entity_class_name' => $entityClassDetails->getShortName(),
                 'form_class_name' => $formClassDetails->getShortName(),
                 'route_path' => Str::asRoutePath($controllerClassDetails->getRelativeNameWithoutSuffix()),
@@ -252,27 +249,24 @@ class: sprintf('App\Controller\%sController', $this->controllerClassName),
             $testClassData = ClassData::create(
                 class: sprintf('App\Tests\Controller\%sControllerTest', $entityClassDetails->getRelativeNameWithoutSuffix()),
                 extendsClass: WebTestCase::class,
+                useStatements: [
+                    $entityClassDetails->getFullName(),
+                    WebTestCase::class,
+                    KernelBrowser::class,
+                    $repositoryClassName,
+                    EntityRepository::class,
+                ],
             );
 
-            $useStatements = new UseStatementGenerator([
-                $entityClassDetails->getFullName(),
-                WebTestCase::class,
-                KernelBrowser::class,
-                $repositoryClassName,
-            ]);
-
-            $useStatements->addUseStatement(EntityRepository::class);
-
             if (EntityManagerInterface::class !== $repositoryClassName) {
-                $useStatements->addUseStatement(EntityManagerInterface::class);
+                $testClassData->addUseStatement(EntityManagerInterface::class);
             }
 
             $generator->generateClass(
                 $testClassData->fullClassName,
                 'crud/test/Test.EntityManager.tpl.php',
                 [
                     'class_data' => $testClassData,
-                    'use_statements' => $useStatements,
                     'entity_full_class_name' => $entityClassDetails->getFullName(),
                     'entity_class_name' => $entityClassDetails->getShortName(),
                     'entity_var_singular' => $entityVarSingular,

src/Resources/skeleton/crud/controller/Controller.tpl.php

@@ -2,7 +2,7 @@
 
 namespace <?= $namespace ?>;
 
-<?= $use_statements; ?>
+<?= $class_data->getUseStatements(); ?>
 
 #[Route('<?= $route_path ?>')]
 <?= $class_data->getClassDeclaration() ?>

src/Resources/skeleton/crud/test/Test.EntityManager.tpl.php

@@ -3,7 +3,7 @@
 
 namespace <?= $namespace ?>;
 
-<?= $use_statements; ?>
+<?= $class_data->getUseStatements(); ?>
 
 <?= $class_data->getClassDeclaration() ?>
 {

src/Util/ClassSource/Model/ClassData.php

@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\MakerBundle\Util\ClassSource\Model;
 
 use Symfony\Bundle\MakerBundle\Str;
+use Symfony\Bundle\MakerBundle\Util\UseStatementGenerator;
 
 /**
  * @author Jesse Rushlow <[email protected]>
@@ -26,18 +27,26 @@ private function __construct(
         public readonly string $fullClassName,
         public readonly ?string $extends,
         public readonly bool $isEntity,
+        private UseStatementGenerator $useStatementGenerator,
         private bool $isFinal = true,
     ) {
     }
 
-    public static function create(string $class, ?string $extendsClass = null, bool $isEntity = false): self
+    public static function create(string $class, ?string $extendsClass = null, bool $isEntity = false, array $useStatements = []): self
     {
+        $useStatements = new UseStatementGenerator($useStatements);
+
+        if ($extendsClass) {
+            $useStatements->addUseStatement($extendsClass);
+        }
+
         return new self(
             className: Str::getShortClassName($class),
             namespace: Str::getNamespace($class),
             fullClassName: $class,
             extends: null === $extendsClass ? null : Str::getShortClassName($extendsClass),
             isEntity: $isEntity,
+            useStatementGenerator: $useStatements,
         );
     }
 
@@ -62,4 +71,16 @@ public function setIsFinal(bool $isFinal): self
 
         return $this;
     }
+
+    public function addUseStatement(array|string $useStatement): self
+    {
+        $this->useStatementGenerator->addUseStatement($useStatement);
+
+        return $this;
+    }
+
+    public function getUseStatements(): string
+    {
+        return (string) $this->useStatementGenerator;
+    }
 }

tests/Util/TemplateComponentGeneratorTest.php

@@ -12,6 +12,8 @@
 namespace Symfony\Bundle\MakerBundle\Tests\Util;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\MakerBundle\MakerBundle;
+use Symfony\Bundle\MakerBundle\Util\ClassSource\Model\ClassData;
 use Symfony\Bundle\MakerBundle\Util\TemplateComponentGenerator;
 
 /**
@@ -94,10 +96,13 @@ public function routeTrailingNewLineDataProvider(): \Generator
      */
     public function testGetFinalClassDeclaration(bool $finalClass, bool $finalEntity, bool $isEntity, string $expectedResult): void
     {
-        $this->markTestIncomplete('We wont need this...');
         $generator = new TemplateComponentGenerator($finalClass, $finalEntity);
 
-        self::assertSame($expectedResult, $generator->getFinalDeclaration($isEntity));
+        $classData = ClassData::create(MakerBundle::class, isEntity: $isEntity);
+
+        $generator->configureClass($classData);
+
+        self::assertSame(sprintf('%sclass MakerBundle', $expectedResult), $classData->getClassDeclaration());
     }
 
     public function finalClassDataProvider(): \Generator