Merge branch '7.4' into 8.0

* 7.4:
  [FrameworkBundle] Add config/reference.php as ResourceFile
  [FrameworkBundle] Skip non-bundle classes in PhpConfigReferenceDumpPass

Author: GromNaN

DependencyInjection/Compiler/PhpConfigReferenceDumpPass.php

@@ -13,11 +13,13 @@
 
 use Symfony\Component\Config\Definition\ArrayShapeGenerator;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
+use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\ConfigurationExtensionInterface;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader\Configurator\AppReference;
+use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 use Symfony\Component\Routing\Loader\Configurator\RoutesReference;
 
 /**
@@ -94,6 +96,9 @@ public function process(ContainerBuilder $container): void
 
         $anyEnvExtensions = [];
         foreach ($this->bundlesDefinition as $bundle => $envs) {
+            if (!is_subclass_of($bundle, BundleInterface::class)) {
+                continue;
+            }
             if (!$extension = (new $bundle())->getContainerExtension()) {
                 continue;
             }
@@ -156,8 +161,11 @@ public function process(ContainerBuilder $container): void
         ]);
 
         $dir = \dirname($this->referenceFile);
-        if (is_dir($dir) && is_writable($dir) && (!is_file($this->referenceFile) || file_get_contents($this->referenceFile) !== $configReference)) {
-            file_put_contents($this->referenceFile, $configReference);
+        if (is_dir($dir) && is_writable($dir)) {
+            if (!is_file($this->referenceFile) || file_get_contents($this->referenceFile) !== $configReference) {
+                file_put_contents($this->referenceFile, $configReference);
+            }
+            $container->addResource(new FileResource($this->referenceFile));
         }
     }
 

Tests/DependencyInjection/Compiler/PhpConfigReferenceDumpPassTest.php

@@ -11,11 +11,13 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
 
+use PHPUnit\Framework\Attributes\TestWith;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\PhpConfigReferenceDumpPass;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
+use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
@@ -57,6 +59,7 @@ public function testProcessWithConfigDir()
         $this->assertStringContainsString('namespace Symfony\Component\DependencyInjection\Loader\Configurator;', $content);
         $this->assertStringContainsString('final class App extends AppReference', $content);
         $this->assertStringContainsString('public static function config(array $config): array', $content);
+        $this->assertEquals([new FileResource(realpath($this->tempDir).'/reference.php')], $container->getResources());
     }
 
     public function testProcessIgnoresFileWriteErrors()
@@ -78,6 +81,7 @@ public function testProcessIgnoresFileWriteErrors()
 
         $pass->process($container);
         $this->assertFileDoesNotExist($readOnlyDir.'/reference.php');
+        $this->assertEmpty($container->getResources());
     }
 
     public function testProcessGeneratesExpectedReferenceFile()
@@ -99,6 +103,23 @@ public function testProcessGeneratesExpectedReferenceFile()
         }
 
         $this->assertFileEquals(__DIR__.'/../../Fixtures/reference.php', $this->tempDir.'/reference.php');
+        $this->assertEquals([new FileResource(realpath($this->tempDir).'/reference.php')], $container->getResources());
+    }
+
+    #[TestWith([self::class])]
+    #[TestWith(['Symfony\\NotARealClass'])]
+    public function testProcessWithInvalidBundleClass(string $invalidClass)
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('.container.known_envs', ['test', 'dev']);
+
+        $pass = new PhpConfigReferenceDumpPass($this->tempDir.'/reference.php', [
+            $invalidClass => ['dev' => true],
+        ]);
+        $pass->process($container);
+
+        $referenceFile = $this->tempDir.'/reference.php';
+        $this->assertFileExists($referenceFile);
     }
 }