Merge pull request #611 from dmaicher/support_doctrine_bundle_3

Add support for `doctrine/doctrine-bundle` 3.0

Author: greg0ire

composer.json

@@ -25,7 +25,7 @@
     "homepage": "https://www.doctrine-project.org",
     "require": {
         "php": "^7.2 || ^8.0",
-        "doctrine/doctrine-bundle": "^2.4",
+        "doctrine/doctrine-bundle": "^2.4 || ^3.0",
         "doctrine/migrations": "^3.2",
         "symfony/deprecation-contracts": "^2.1 || ^3",
         "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0"

src/EventListener/SchemaFilterListener.php

@@ -5,6 +5,7 @@
 namespace Doctrine\Bundle\MigrationsBundle\EventListener;
 
 use Doctrine\DBAL\Schema\AbstractAsset;
+use Doctrine\DBAL\Schema\Name\OptionallyQualifiedName;
 use Doctrine\ORM\Tools\Console\Command\SchemaTool\UpdateCommand;
 use Doctrine\ORM\Tools\Console\Command\ValidateSchemaCommand;
 use Symfony\Component\Console\Event\ConsoleCommandEvent;
@@ -27,7 +28,7 @@ public function __construct(string $configurationTableName)
     /** @var bool */
     private $enabled = false;
 
-    /** @param AbstractAsset|string $asset */
+    /** @param AbstractAsset<OptionallyQualifiedName>|string $asset */
     public function __invoke($asset): bool
     {
         if (! $this->enabled) {

tests/DependencyInjection/DoctrineMigrationsExtensionTest.php

@@ -37,10 +37,13 @@
 use Symfony\Component\VarExporter\LazyGhostTrait;
 
 use function assert;
+use function class_exists;
 use function interface_exists;
 use function sys_get_temp_dir;
 use function trait_exists;
 
+use const PHP_VERSION_ID;
+
 class DoctrineMigrationsExtensionTest extends TestCase
 {
     use ExpectDeprecationTrait;
@@ -290,7 +293,8 @@ public function testPrefersEntityManagerOverConnection(): void
         $config    = [
             'migrations_paths' => ['DoctrineMigrationsTest' => 'a'],
         ];
-        $ormConfig = trait_exists(LazyGhostTrait::class) ? ['enable_lazy_ghost_objects' => true] : [];
+        $ormConfig = PHP_VERSION_ID < 80400 && trait_exists(LazyGhostTrait::class) && class_exists(CacheCompatibilityPass::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,7 @@ public function testCustomEntityManager(): void
             $ormConfig['controller_resolver'] = ['auto_mapping' => false];
         }
 
-        if (trait_exists(LazyGhostTrait::class)) {
+        if (PHP_VERSION_ID < 80400 && trait_exists(LazyGhostTrait::class) && class_exists(CacheCompatibilityPass::class)) {
             $ormConfig['enable_lazy_ghost_objects'] = true;
         }
 
@@ -466,6 +470,7 @@ public function testTransactionalSetToFalseReflectsInConfig(): void
     private function getContainer(array $config, ?array $dbalConfig = null, ?array $ormConfig = null): ContainerBuilder
     {
         $container = $this->getContainerBuilder();
+        $container->setParameter('kernel.build_dir', '');
 
         $bundle = new DoctrineMigrationsBundle();
         $bundle->build($container);
@@ -488,7 +493,10 @@ private function getContainer(array $config, ?array $dbalConfig = null, ?array $
             $container->getDefinition('doctrine_migrations.schema_filter_listener')->setPublic(true);
         }
 
-        $container->addCompilerPass(new CacheCompatibilityPass());
+        if (class_exists(CacheCompatibilityPass::class)) {
+            /** @phpstan-ignore argument.type */
+            $container->addCompilerPass(new CacheCompatibilityPass());
+        }
 
         return $container;
     }