Remove null from builder class name

This uses the `::class` syntax to avoid unnecessary usage of `null` values. Signed-off-by: Luís Cobucci <[email protected]>
lcobucci · Nov 10, 2024 · d9928fb · d9928fb
1 parent 6aecee7
commit d9928fb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/src/ContainerBuilder.php b/src/ContainerBuilder.php
@@ -38,11 +38,11 @@ public static function default(string $configurationFile, string $namespace): se
         return self::xml($configurationFile, $namespace);
     }
 
-    /** @param class-string<SymfonyBuilder>|null $builderClass */
+    /** @param class-string<SymfonyBuilder> $builderClass */
     public static function xml(
         string $configurationFile,
         string $namespace,
-        ?string $builderClass = null,
+        string $builderClass = SymfonyBuilder::class,
     ): self {
         return new self(
             new ContainerConfiguration($namespace),
@@ -51,11 +51,11 @@ public static function xml(
         );
     }
 
-    /** @param class-string<SymfonyBuilder>|null $builderClass */
+    /** @param class-string<SymfonyBuilder> $builderClass */
     public static function php(
         string $configurationFile,
         string $namespace,
-        ?string $builderClass = null,
+        string $builderClass = SymfonyBuilder::class,
     ): self {
         return new self(
             new ContainerConfiguration($namespace),
@@ -64,11 +64,11 @@ public static function php(
         );
     }
 
-    /** @param class-string<SymfonyBuilder>|null $builderClass */
+    /** @param class-string<SymfonyBuilder> $builderClass */
     public static function yaml(
         string $configurationFile,
         string $namespace,
-        ?string $builderClass = null,
+        string $builderClass = SymfonyBuilder::class,
     ): self {
         return new self(
             new ContainerConfiguration($namespace),
@@ -77,11 +77,11 @@ public static function yaml(
         );
     }
 
-    /** @param class-string<SymfonyBuilder>|null $builderClass */
+    /** @param class-string<SymfonyBuilder> $builderClass */
     public static function delegating(
         string $configurationFile,
         string $namespace,
-        ?string $builderClass = null,
+        string $builderClass = SymfonyBuilder::class,
     ): self {
         return new self(
             new ContainerConfiguration($namespace),

diff --git a/src/Generator.php b/src/Generator.php
@@ -16,16 +16,13 @@
 abstract class Generator
 {
     private Compiler $compiler;
-    /** @var class-string<SymfonyBuilder> */
-    private string $builderClass;
 
-    /** @param class-string<SymfonyBuilder>|null $builderClass */
+    /** @param class-string<SymfonyBuilder> $builderClass */
     public function __construct(
-        private string $configurationFile,
-        ?string $builderClass = null,
+        private readonly string $configurationFile,
+        private readonly string $builderClass = SymfonyBuilder::class,
     ) {
-        $this->compiler     = new Compiler();
-        $this->builderClass = $builderClass ?? SymfonyBuilder::class;
+        $this->compiler = new Compiler();
     }
 
     /**

diff --git a/test/ContainerBuilderTest.php b/test/ContainerBuilderTest.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Config\ConfigCache;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\PassConfig;
+use Symfony\Component\DependencyInjection\ContainerBuilder as SymfonyBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 use function get_class;
@@ -43,7 +44,7 @@ public function configureDependencies(): void
     public function namedConstructorsShouldSimplifyTheObjectCreation(
         string $method,
         Generator $generator,
-        ?string $builderClass = null,
+        string $builderClass = SymfonyBuilder::class,
     ): void {
         $expected = new ContainerBuilder(
             new ContainerConfiguration('Lcobucci\\DependencyInjection'),