Support callables in TestKernel::addTestConfig()

teamneusta · Mar 11, 2024 · 65d2244 · 65d2244
1 parent c6552b4
commit 65d2244
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/src/Kernel/Internal/TestKernelTrait.php b/src/Kernel/Internal/TestKernelTrait.php
@@ -19,7 +19,7 @@ trait TestKernelTrait
     private bool $dynamicCache = false;
     /** @var list<string> */
     private array $testBundles = [];
-    /** @var list<string> */
+    /** @var list<string|callable(ContainerBuilder):void> */
     private array $testConfigs = [];
     /** @var array<string, array> */
     private array $testExtensionConfigs = [];
@@ -36,9 +36,9 @@ public function addTestBundle(string $bundleClass): void
     }
 
     /**
-     * @param string $config path to a config file
+     * @param string|callable(ContainerBuilder):void $config path to a config file or a callable which get the {@see ContainerBuilder} as its first argument
      */
-    public function addTestConfig(string $config): void
+    public function addTestConfig(string|callable $config): void
     {
         $this->testConfigs[] = $config;
         $this->dynamicCache = true;

diff --git a/src/Kernel/TestKernel.php b/src/Kernel/TestKernel.php
@@ -29,14 +29,19 @@ protected function configureContainer(ContainerConfigurator $container): void
                 $container->import($pimcore10Config . '/*.{php,yaml}');
             }
 
-            foreach ($this->testConfigs as $config) {
-                $container->import($config);
-            }
-
             foreach ($this->testExtensionConfigs as $namespace => $config) {
                 $container->extension($namespace, $config);
             }
         }
+
+        public function registerContainerConfiguration(LoaderInterface $loader): void
+        {
+            parent::registerContainerConfiguration($loader);
+
+            foreach ($this->testConfigs as $config) {
+                $loader->load($config);
+            }
+        }
     }
 } else {
     class TestKernel extends Kernel
@@ -58,7 +63,7 @@ protected function configureContainer(
             }
 
             foreach ($this->testConfigs as $config) {
-                $container->import($config);
+                $loader->load($config);
             }
 
             foreach ($this->testExtensionConfigs as $namespace => $config) {

diff --git a/tests/Functional/BundleConfigurationTest.php b/tests/Functional/BundleConfigurationTest.php
@@ -6,6 +6,7 @@
 use Fixtures\ConfigurationBundle\ConfigurationBundle;
 use Neusta\Pimcore\TestingFramework\Kernel\TestKernel;
 use Neusta\Pimcore\TestingFramework\Test\ConfigurableKernelTestCase;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 final class BundleConfigurationTest extends ConfigurableKernelTestCase
@@ -34,14 +35,22 @@ public function provideDifferentConfigurationFormats(): iterable
         yield 'YAML' => [__DIR__ . '/../Fixtures/Resources/ConfigurationBundle/config.yaml'];
         yield 'XML' => [__DIR__ . '/../Fixtures/Resources/ConfigurationBundle/config.xml'];
         yield 'PHP' => [__DIR__ . '/../Fixtures/Resources/ConfigurationBundle/config.php'];
+        yield 'Callable' => [function (ContainerBuilder $container) {
+            $container->loadFromExtension('configuration', [
+                'foo' => 'value1',
+                'bar' => ['value2', 'value3'],
+            ]);
+
+            $container->register('something', \stdClass::class)->setPublic(true);
+        }];
     }
 
     /**
      * @test
      *
      * @dataProvider provideDifferentConfigurationFormats
      */
-    public function different_configuration_formats(string $config): void
+    public function different_configuration_formats(string|callable $config): void
     {
         self::bootKernel(['config' => function (TestKernel $kernel) use ($config) {
             $kernel->addTestBundle(ConfigurationBundle::class);