From 881ce3b3e3941dacd963303e0ab729d375a8b613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= <lcobucci@gmail.com>
Date: Tue, 19 Nov 2024 22:02:12 +0100
Subject: [PATCH] Make tests compatible with Symfony 7.1 and 7.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We were testing a little too much of the internals of the dependency
injection component, which was a little to brittled and causing tests to
fail when running against the unstable version.

This modifies the focus to handle the intersection point between this
library and the component internals.

Signed-off-by: Luís Cobucci <lcobucci@gmail.com>
---
 test/CompilerTest.php | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/test/CompilerTest.php b/test/CompilerTest.php
index 4dbe1994..43d911cd 100644
--- a/test/CompilerTest.php
+++ b/test/CompilerTest.php
@@ -17,10 +17,12 @@
 use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\DependencyInjection\Container;
 
-use function count;
+use function array_keys;
+use function array_reduce;
 use function file_get_contents;
 use function file_put_contents;
 use function iterator_to_array;
+use function str_starts_with;
 
 #[PHPUnit\CoversClass(Compiler::class)]
 #[PHPUnit\UsesClass(ParameterBag::class)]
@@ -32,13 +34,6 @@ final class CompilerTest extends TestCase
 {
     use GeneratesDumpDirectory;
 
-    private const EXPECTED_FILES = [
-        'getTestingService.php',
-        'AppContainer.php',
-        'AppContainer.preload.php',
-        'AppContainer.php.meta',
-    ];
-
     private ContainerConfiguration $config;
     private ConfigCache $dump;
     private ParameterBag $parameters;
@@ -75,14 +70,10 @@ public function compileShouldCreateMultipleFilesForDevelopmentMode(): void
         $compiler = new Compiler();
         $compiler->compile($this->config, $this->dump, new Yaml(__FILE__));
 
-        $expectedFiles  = self::EXPECTED_FILES;
         $generatedFiles = iterator_to_array($this->getGeneratedFiles());
 
-        self::assertCount(count($expectedFiles), $generatedFiles);
-
-        foreach ($generatedFiles as $name => $file) {
-            self::assertContains($name, $expectedFiles);
-        }
+        self::assertArrayHasKey('getTestingService.php', $generatedFiles);
+        self::assertArrayHasKey('AppContainer.php', $generatedFiles);
     }
 
     #[PHPUnit\Test]
@@ -93,14 +84,10 @@ public function compileShouldInlineFactoriesForProductionMode(): void
         $compiler = new Compiler();
         $compiler->compile($this->config, $this->dump, new Yaml(__FILE__));
 
-        $expectedFiles  = self::EXPECTED_FILES;
         $generatedFiles = iterator_to_array($this->getGeneratedFiles());
 
-        self::assertCount(count($expectedFiles) - 1, $generatedFiles);
-
-        foreach ($generatedFiles as $name => $file) {
-            self::assertContains($name, $expectedFiles);
-        }
+        self::assertArrayNotHasKey('getTestingService.php', $generatedFiles);
+        self::assertArrayHasKey('AppContainer.php', $generatedFiles);
     }
 
     #[PHPUnit\Test]
@@ -126,10 +113,19 @@ public function compileShouldAllowForLazyServices(): void
         $compiler = new Compiler();
         $compiler->compile($this->config, $this->dump, new Yaml(__FILE__));
 
-        $expectedFiles  = self::EXPECTED_FILES;
         $generatedFiles = iterator_to_array($this->getGeneratedFiles());
 
-        self::assertCount(count($expectedFiles) + 1, $generatedFiles);
+        self::assertArrayHasKey('getTestingService.php', $generatedFiles);
+        self::assertArrayHasKey('AppContainer.php', $generatedFiles);
+        self::assertTrue(
+            array_reduce(
+                array_keys($generatedFiles),
+                // @phpstan-ignore-next-line
+                static fn (bool $result, string $name): bool => $result ?: str_starts_with($name, 'stdClassGhost'),
+                false,
+            ),
+            'Failed asserting that ghost file for the stdClass service exists.',
+        );
     }
 
     #[PHPUnit\Test]