loading recursive imports in regular order

yceruto · yceruto · commit f1f602a6ee52 · 2023-12-04T20:13:04.000-05:00
diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
@@ -46,6 +46,8 @@ abstract class FileLoader extends BaseFileLoader
     protected array $aliases = [];
     protected bool $autoRegisterAliasesForSinglyImplementedInterfaces = true;
     protected bool $prepend = false;
+    protected array $extensionConfigs = [];
+    protected int $importing = 0;
 
     /**
      * @param bool $prepend Whether to prepend extension config instead of appending them
@@ -71,6 +73,7 @@ public function import(mixed $resource, string $type = null, bool|string $ignore
             throw new \TypeError(sprintf('Invalid argument $ignoreErrors provided to "%s::import()": boolean or "not_found" expected, "%s" given.', static::class, get_debug_type($ignoreErrors)));
         }
 
+        ++$this->importing;
         try {
             return parent::import(...$args);
         } catch (LoaderLoadException $e) {
@@ -87,6 +90,8 @@ public function import(mixed $resource, string $type = null, bool|string $ignore
             if (__FILE__ !== $frame['file']) {
                 throw $e;
             }
+        } finally {
+            --$this->importing;
         }
 
         return null;
@@ -224,11 +229,37 @@ public function registerAliasesForSinglyImplementedInterfaces(): void
 
     protected function loadExtensionConfig(string $namespace, array $config): void
     {
-        if ($this->prepend) {
-            $this->container->prependExtensionConfig($namespace, $config);
-        } else {
+        if (!$this->prepend) {
             $this->container->loadFromExtension($namespace, $config);
+
+            return;
+        }
+
+        if ($this->importing) {
+            if (!isset($this->extensionConfigs[$namespace])) {
+                $this->extensionConfigs[$namespace] = [];
+            }
+            array_unshift($this->extensionConfigs[$namespace], $config);
+
+            return;
+        }
+
+        $this->container->prependExtensionConfig($namespace, $config);
+    }
+
+    protected function loadExtensionConfigs(): void
+    {
+        if ($this->importing || [] === $this->extensionConfigs) {
+            return;
         }
+
+        foreach ($this->extensionConfigs as $namespace => $configs) {
+            foreach ($configs as $config) {
+                $this->container->prependExtensionConfig($namespace, $config);
+            }
+        }
+
+        $this->extensionConfigs = [];
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
@@ -145,10 +145,19 @@ class_exists(ContainerConfigurator::class);
 
         $callback(...$arguments);
 
-        /** @var ConfigBuilderInterface $configBuilder */
+        $this->loadFromExtensions($configBuilders);
+    }
+
+    /**
+     * @param iterable<ConfigBuilderInterface> $configBuilders
+     */
+    private function loadFromExtensions(iterable $configBuilders): void
+    {
         foreach ($configBuilders as $configBuilder) {
             $this->loadExtensionConfig($configBuilder->getExtensionAlias(), $configBuilder->toArray());
         }
+
+        $this->loadExtensionConfigs();
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -832,6 +832,8 @@ private function loadFromExtensions(\DOMDocument $xml): void
 
             $this->loadExtensionConfig($node->namespaceURI, $values);
         }
+
+        $this->loadExtensionConfigs();
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -947,6 +947,8 @@ private function loadFromExtensions(array $content): void
 
             $this->loadExtensionConfig($namespace, $values);
         }
+
+        $this->loadExtensionConfigs();
     }
 
     private function checkDefinition(string $id, array $definition, string $file): void
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Extension/AbstractExtensionTest.php b/src/Symfony/Component/DependencyInjection/Tests/Extension/AbstractExtensionTest.php
@@ -88,9 +88,11 @@ public function getAlias(): string
         $container = $this->processPrependExtension($extension);
 
         $expected = [
-            ['foo' => 'ping'],
-            ['foo' => 'b'],
             ['foo' => 'a'],
+            ['foo' => 'c1'],
+            ['foo' => 'c2'],
+            ['foo' => 'b'],
+            ['foo' => 'ping'],
             ['foo' => 'pong'],
             ['foo' => 'bar'],
         ];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/packages/third_b.yaml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/packages/third_b.yaml
@@ -1,2 +1,5 @@
+imports:
+    - { resource: './third_c.yaml' }
+
 third:
     foo: b
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/packages/third_c.yaml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/packages/third_c.yaml
@@ -0,0 +1,6 @@
+third:
+    foo: c1
+
+when@test:
+    third:
+        foo: c2

Original file line number	Diff line number	Diff line change
`@@ -832,6 +832,8 @@ private function loadFromExtensions(\DOMDocument $xml): void`
`832`	`832`
`833`	`833`	`$this->loadExtensionConfig($node->namespaceURI, $values);`
`834`	`834`	`}`
	`835`	`+`
	`836`	`+ $this->loadExtensionConfigs();`
`835`	`837`	`}`
`836`	`838`
`837`	`839`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -947,6 +947,8 @@ private function loadFromExtensions(array $content): void`
`947`	`947`
`948`	`948`	`$this->loadExtensionConfig($namespace, $values);`
`949`	`949`	`}`
	`950`	`+`
	`951`	`+ $this->loadExtensionConfigs();`
`950`	`952`	`}`
`951`	`953`
`952`	`954`	`private function checkDefinition(string $id, array $definition, string $file): void`
-Original file line number
+Diff line change
@@ @@ -1,2 +1,5 @@ @@
 +imports:
 +    - { resource: './third_c.yaml' }
++
 third:
     foo: b