Fix ClassData::create() calls

Author: natepage

src/Doctrine/DoctrineHelper.php

@@ -64,7 +64,7 @@ private function isDoctrineInstalled(): bool
 
     public function getEntityNamespace(): string
     {
-        return sprintf(
+        return \sprintf(
             '%s\\%s',
             $this->namespacesHelper->getRootNamespace(),
             $this->namespacesHelper->getEntityNamespace()

src/Maker/MakeController.php

@@ -142,7 +142,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
         }
 
         if ($this->shouldGenerateTests()) {
-            $testClassName =\sprintf(
+            $testClassName = \sprintf(
                 '%s\%s\%s',
                 $this->namespacesHelper->getTestNamespace(),
                 $this->namespacesHelper->getControllerNamespace(),

src/Maker/MakeCrud.php

@@ -248,7 +248,7 @@ class: \sprintf('%s\%s', $generator->getNamespacesHelper()->getControllerNamespa
         }
 
         if ($this->shouldGenerateTests()) {
-            $testClassName =\sprintf(
+            $testClassName = \sprintf(
                 '%s\%s\%s',
                 $generator->getNamespacesHelper()->getTestNamespace(),
                 $generator->getNamespacesHelper()->getControllerNamespace(),

src/Util/ClassSource/Model/ClassData.php

@@ -27,8 +27,8 @@ private function __construct(
         public readonly ?string $extends,
         public readonly bool $isEntity,
         private UseStatementGenerator $useStatementGenerator,
-        private bool $isFinal = true,
         private string $rootNamespace,
+        private bool $isFinal = true,
         private ?string $classSuffix = null,
     ) {
         if (str_starts_with(haystack: $this->namespace, needle: $this->rootNamespace)) {

src/Util/NamespacesHelper.php

@@ -13,12 +13,8 @@
 
 final class NamespacesHelper
 {
-    /** @var string[] */
-    private $namespaces;
-
-    public function __construct(array $namespaces = null)
+    public function __construct(private array $namespaces = [])
     {
-        $this->namespaces = $namespaces ?? [];
     }
 
     public function getCommandNamespace(): string

tests/GeneratorTest.php

@@ -27,7 +27,7 @@ public function testCreateClassNameDetails(
         string $suffix,
         string $expectedFullClassName,
         string $expectedRelativeClassName,
-        array $namespaces = []
+        array $namespaces = [],
     ): void {
         $fileManager = $this->createMock(FileManager::class);
         $fileManager->expects($this->any())

tests/Util/ClassSource/ClassDataTest.php

@@ -20,7 +20,7 @@ class ClassDataTest extends TestCase
 {
     public function testStaticConstructor(): void
     {
-        $meta = ClassData::create(MakerBundle::class);
+        $meta = ClassData::create(MakerBundle::class, 'App\\');
 
         // Sanity check in case Maker's NS changes
         self::assertSame('Symfony\Bundle\MakerBundle\MakerBundle', MakerBundle::class);
@@ -32,14 +32,14 @@ public function testStaticConstructor(): void
 
     public function testGetClassDeclaration(): void
     {
-        $meta = ClassData::create(MakerBundle::class);
+        $meta = ClassData::create(MakerBundle::class, 'App\\');
 
         self::assertSame('final class MakerBundle', $meta->getClassDeclaration());
     }
 
     public function testIsFinal(): void
     {
-        $meta = ClassData::create(MakerBundle::class);
+        $meta = ClassData::create(MakerBundle::class, 'App\\');
 
         // Default - isFinal - true
         self::assertSame('final class MakerBundle', $meta->getClassDeclaration());
@@ -51,15 +51,15 @@ public function testIsFinal(): void
 
     public function testGetClassDeclarationWithExtends(): void
     {
-        $meta = ClassData::create(class: MakerBundle::class, extendsClass: MakerTestKernel::class);
+        $meta = ClassData::create(class: MakerBundle::class, rootNamespace: 'App\\', extendsClass: MakerTestKernel::class);
 
         self::assertSame('final class MakerBundle extends MakerTestKernel', $meta->getClassDeclaration());
     }
 
     /** @dataProvider suffixDataProvider */
     public function testSuffix(?string $suffix, string $expectedResult): void
     {
-        $data = ClassData::create(class: MakerBundle::class, suffix: $suffix);
+        $data = ClassData::create(class: MakerBundle::class, rootNamespace: 'App\\', suffix: $suffix);
 
         self::assertSame($expectedResult, $data->getClassName());
     }
@@ -74,7 +74,7 @@ public function suffixDataProvider(): \Generator
     /** @dataProvider namespaceDataProvider */
     public function testNamespace(string $class, ?string $rootNamespace, string $expectedNamespace, string $expectedFullClassName): void
     {
-        $class = ClassData::create($class);
+        $class = ClassData::create($class, 'App\\');
 
         if (null !== $rootNamespace) {
             $class->setRootNamespace($rootNamespace);
@@ -94,7 +94,7 @@ public function namespaceDataProvider(): \Generator
 
     public function testGetClassName(): void
     {
-        $class = ClassData::create(class: 'Controller\\Foo', suffix: 'Controller');
+        $class = ClassData::create(class: 'Controller\\Foo', rootNamespace: 'App\\', suffix: 'Controller');
         self::assertSame('FooController', $class->getClassName());
         self::assertSame('Foo', $class->getClassName(relative: false, withoutSuffix: true));
         self::assertSame('FooController', $class->getClassName(relative: true, withoutSuffix: false));
@@ -104,7 +104,7 @@ public function testGetClassName(): void
 
     public function testGetClassNameRelativeNamespace(): void
     {
-        $class = ClassData::create(class: 'Controller\\Admin\\Foo', suffix: 'Controller');
+        $class = ClassData::create(class: 'Controller\\Admin\\Foo', rootNamespace: 'App\\', suffix: 'Controller');
         self::assertSame('FooController', $class->getClassName());
         self::assertSame('Foo', $class->getClassName(relative: false, withoutSuffix: true));
         self::assertSame('Admin\FooController', $class->getClassName(relative: true, withoutSuffix: false));
@@ -114,7 +114,7 @@ public function testGetClassNameRelativeNamespace(): void
 
     public function testGetClassNameWithAbsoluteNamespace(): void
     {
-        $class = ClassData::create(class: '\\Foo\\Bar\\Admin\\Baz', suffix: 'Controller');
+        $class = ClassData::create(class: '\\Foo\\Bar\\Admin\\Baz', rootNamespace: 'App\\', suffix: 'Controller');
         self::assertSame('BazController', $class->getClassName());
         self::assertSame('Foo\Bar\Admin', $class->getNamespace());
         self::assertSame('Foo\Bar\Admin\BazController', $class->getFullClassName());
@@ -123,7 +123,7 @@ public function testGetClassNameWithAbsoluteNamespace(): void
     /** @dataProvider fullClassNameProvider */
     public function testGetFullClassName(string $class, ?string $rootNamespace, bool $withoutRootNamespace, bool $withoutSuffix, string $expectedFullClassName): void
     {
-        $class = ClassData::create($class, suffix: 'Controller');
+        $class = ClassData::create($class, rootNamespace: 'App\\', suffix: 'Controller');
 
         if (null !== $rootNamespace) {
             $class->setRootNamespace($rootNamespace);

tests/Util/TemplateComponentGeneratorTest.php

@@ -99,7 +99,7 @@ public function testGetFinalClassDeclaration(bool $finalClass, bool $finalEntity
     {
         $generator = new TemplateComponentGenerator($finalClass, $finalEntity, new NamespacesHelper());
 
-        $classData = ClassData::create(MakerBundle::class, isEntity: $isEntity);
+        $classData = ClassData::create(MakerBundle::class, rootNamespace: 'App\\', isEntity: $isEntity);
 
         $generator->configureClass($classData);
 
@@ -122,7 +122,7 @@ public function testConfiguresClassDataWithRootNamespace(): void
     {
         $generator = new TemplateComponentGenerator(false, false, new NamespacesHelper(['root' => 'MakerTest']));
 
-        $classData = ClassData::create(MakerBundle::class);
+        $classData = ClassData::create(MakerBundle::class, 'App\\');
 
         $generator->configureClass($classData);