Merge pull request #606 from greg0ire/fix-build

Address newly detected PHPStan issues

Author: greg0ire

src/EventListener/SchemaFilterListener.php

@@ -27,7 +27,7 @@ public function __construct(string $configurationTableName)
     /** @var bool */
     private $enabled = false;
 
-    /** @param AbstractAsset|string $asset */
+    /** @param AbstractAsset<*>|string $asset */
     public function __invoke($asset): bool
     {
         if (! $this->enabled) {

tests/Collector/EventListener/SchemaFilterListenerTest.php

@@ -49,7 +49,7 @@ public function testItFiltersNothingWhenNotRunningSpecificCommands(): void
     public function testItFiltersOutMigrationMetadataTableWhenRunningSpecificCommands(string $command): void
     {
         $listener   = new SchemaFilterListener('doctrine_migration_versions');
-        $ormCommand = new $command($this->createStub(EntityManagerProvider::class));
+        $ormCommand = new $command(self::createStub(EntityManagerProvider::class));
 
         $listener->onConsoleCommand(new ConsoleCommandEvent(
             $ormCommand,

tests/DependencyInjection/DoctrineMigrationsExtensionTest.php

@@ -41,6 +41,8 @@
 use function sys_get_temp_dir;
 use function trait_exists;
 
+use const PHP_VERSION_ID;
+
 class DoctrineMigrationsExtensionTest extends TestCase
 {
     use ExpectDeprecationTrait;
@@ -287,10 +289,12 @@ public function testCustomConnection(): void
 
     public function testPrefersEntityManagerOverConnection(): void
     {
-        $config    = [
+        $config = [
             'migrations_paths' => ['DoctrineMigrationsTest' => 'a'],
         ];
-        $ormConfig = trait_exists(LazyGhostTrait::class) ? ['enable_lazy_ghost_objects' => true] : [];
+
+        $ormConfig = PHP_VERSION_ID < 80400 && trait_exists(LazyGhostTrait::class) ? ['enable_lazy_ghost_objects' => true] : [];
+
         if (InstalledVersions::satisfies(new VersionParser(), 'doctrine/doctrine-bundle', '^2.7.1 ')) {
             $ormConfig['controller_resolver'] = ['auto_mapping' => false];
         }
@@ -363,7 +367,12 @@ public function testCustomEntityManager(): void
             $ormConfig['controller_resolver'] = ['auto_mapping' => false];
         }
 
-        if (trait_exists(LazyGhostTrait::class)) {
+        if (PHP_VERSION_ID >= 80400) {
+            foreach ($ormConfig['entity_managers'] as $name => $emConfig) {
+                $ormConfig['entity_managers'][$name]['enable_native_lazy_objects'] = true;
+            }
+        } elseif (interface_exists(LazyGhostTrait::class)) {
+            // For PHP 8.0 and 8.1 we need to check for the interface as the trait is only used when the interface exists
             $ormConfig['enable_lazy_ghost_objects'] = true;
         }
 
@@ -506,6 +515,7 @@ private function getContainerBuilder(): ContainerBuilder
                     'namespace' => $bundle->getNamespace(),
                 ],
             ],
+            'kernel.build_dir' => sys_get_temp_dir(),
             'kernel.cache_dir' => sys_get_temp_dir(),
             'kernel.environment' => 'test',
             'kernel.project_dir' => __DIR__ . '/../',