Enhancement: Allow creating ContainerBuilder with definitions for def…

…ault extensions
FakerPHP · Sep 5, 2023 · fc6fbc2 · fc6fbc2
1 parent 81dcd6f
commit fc6fbc2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/src/Faker/Container/ContainerBuilder.php b/src/Faker/Container/ContainerBuilder.php
@@ -59,8 +59,19 @@ public static function defaultExtensions(): array
         ];
     }
 
+    public static function withDefaultExtensions(): self
+    {
+        $instance = new self();
+
+        foreach (self::defaultExtensions() as $id => $definition) {
+            $instance->add($id, $definition);
+        }
+
+        return $instance;
+    }
+
     public static function getDefault(): ContainerInterface
     {
-        return new Container(self::defaultExtensions());
+        return self::withDefaultExtensions()->build();
     }
 }
diff --git a/src/Faker/Generator.php b/src/Faker/Generator.php
@@ -567,7 +567,7 @@ class Generator
 
     public function __construct(ContainerInterface $container = null)
     {
-        $this->container = $container ?: Container\ContainerBuilder::getDefault();
+        $this->container = $container ?: Container\ContainerBuilder::withDefaultExtensions()->build();
     }
 
     /**

diff --git a/test/Faker/Extension/ContainerBuilderTest.php b/test/Faker/Extension/ContainerBuilderTest.php
@@ -131,9 +131,11 @@ public function testBuildReturnsContainerWhenContainerBuilderHasCallableAsDefini
         self::assertEquals($definition(), $container->get($id));
     }
 
-    public function testGetDefaultReturnsContainerWithDefaultExtensions(): void
+    public function testWithDefaultExtensionsReturnsContainerBuilderWithDefaultExtensions(): void
     {
-        $container = ContainerBuilder::getDefault();
+        $builder = ContainerBuilder::withDefaultExtensions();
+
+        $container = $builder->build();
 
         self::assertTrue($container->has(Extension\BarcodeExtension::class));
         self::assertTrue($container->has(Extension\BloodExtension::class));