[FrameworkBundle] Dump bundles config reference first

Author: MatTheCat

DependencyInjection/Compiler/PhpConfigReferenceDumpPass.php

@@ -95,35 +95,28 @@ public function process(ContainerBuilder $container): void
         $appTypes = '';
 
         $anyEnvExtensions = [];
-        foreach ($container->getExtensions() as $alias => $extension) {
-            if (!$configuration = $this->getConfiguration($extension, $container)) {
-                continue;
-            }
-
-            $anyEnvExtensions[$alias] = $extension;
-            $type = $this->camelCase($alias).'Config';
-            $appTypes .= \sprintf("\n * @psalm-type %s = %s", $type, ArrayShapeGenerator::generate($configuration->getConfigTreeBuilder()->buildTree()));
-        }
+        $registeredExtensions = $container->getExtensions();
         foreach ($this->bundlesDefinition as $bundle => $envs) {
             if (!is_subclass_of($bundle, BundleInterface::class)) {
                 continue;
             }
             if (!$extension = (new $bundle())->getContainerExtension()) {
                 continue;
             }
-            if (!$configuration = $this->getConfiguration($extension, $container)) {
-                continue;
-            }
 
             $extensionAlias = $extension->getAlias();
-            if (isset($anyEnvExtensions[$extensionAlias])) {
-                $extension = $anyEnvExtensions[$extensionAlias];
-            } else {
-                $anyEnvExtensions[$extensionAlias] = $extension;
-                $type = $this->camelCase($extensionAlias).'Config';
-                $appTypes .= \sprintf("\n * @psalm-type %s = %s", $type, ArrayShapeGenerator::generate($configuration->getConfigTreeBuilder()->buildTree()));
+            if (isset($registeredExtensions[$extensionAlias])) {
+                $extension = $registeredExtensions[$extensionAlias];
+                unset($registeredExtensions[$extensionAlias]);
             }
 
+            if (!$configuration = $this->getConfiguration($extension, $container)) {
+                continue;
+            }
+            $anyEnvExtensions[$extensionAlias] = $extension;
+            $type = $this->camelCase($extensionAlias).'Config';
+            $appTypes .= \sprintf("\n * @psalm-type %s = %s", $type, ArrayShapeGenerator::generate($configuration->getConfigTreeBuilder()->buildTree()));
+
             foreach ($knownEnvs as $env) {
                 if ($envs[$env] ?? $envs['all'] ?? false) {
                     $extensionsPerEnv[$env][] = $extension;
@@ -132,6 +125,14 @@ public function process(ContainerBuilder $container): void
                 }
             }
         }
+        foreach ($registeredExtensions as $alias => $extension) {
+            if (!$configuration = $this->getConfiguration($extension, $container)) {
+                continue;
+            }
+            $anyEnvExtensions[$alias] = $extension;
+            $type = $this->camelCase($alias).'Config';
+            $appTypes .= \sprintf("\n * @psalm-type %s = %s", $type, ArrayShapeGenerator::generate($configuration->getConfigTreeBuilder()->buildTree()));
+        }
         krsort($extensionsPerEnv);
 
         $r = new \ReflectionClass(AppReference::class);