Merge pull request #1974 from greg0ire/no-lsmf

Remove DBAL 3 specific things

Author: greg0ire

docs/en/configuration.rst

@@ -135,7 +135,7 @@ Configuration Reference
                             # Affects schema-tool. If absent, DBAL chooses defaults
                             # based on the platform. Examples here are for MySQL.
                             # charset:      utf8mb4
-                            # collation:    utf8mb4_unicode_ci # When using doctrine/dbal 3.x
+                            # collation:    utf8mb4_unicode_ci
                             # engine:       InnoDB
 
                         # Service identifier of a Psr\Cache\CacheItemPoolInterface implementation

src/DependencyInjection/Configuration.php

@@ -2,7 +2,6 @@
 
 namespace Doctrine\Bundle\DoctrineBundle\DependencyInjection;
 
-use Doctrine\DBAL\Schema\LegacySchemaManagerFactory;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Mapping\ClassMetadata;
@@ -241,7 +240,7 @@ private function getDbalConnectionsNode(): ArrayNodeDefinition
                 ->end()
                 ->scalarNode('schema_manager_factory')
                     ->cannotBeEmpty()
-                    ->defaultValue($this->getDefaultSchemaManagerFactory())
+                    ->defaultValue('doctrine.dbal.default_schema_manager_factory')
                 ->end()
                 ->scalarNode('result_cache')->end()
             ->end();
@@ -869,13 +868,4 @@ private function getAutoGenerateModes(): array
             'values' => $valuesArray,
         ];
     }
-
-    private function getDefaultSchemaManagerFactory(): string
-    {
-        if (class_exists(LegacySchemaManagerFactory::class)) {
-            return 'doctrine.dbal.legacy_schema_manager_factory';
-        }
-
-        return 'doctrine.dbal.default_schema_manager_factory';
-    }
 }

src/DependencyInjection/DoctrineExtension.php

@@ -16,7 +16,6 @@
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Connections\PrimaryReadReplicaConnection;
 use Doctrine\DBAL\Driver\Middleware as MiddlewareInterface;
-use Doctrine\DBAL\Schema\LegacySchemaManagerFactory;
 use Doctrine\ORM\Configuration as ORMConfiguration;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Events;
@@ -335,15 +334,11 @@ protected function loadDbalConnection($name, array $connection, ContainerBuilder
 
         $configuration->addMethodCall('setSchemaManagerFactory', [new Reference($connection['schema_manager_factory'])]);
 
-        if (isset($connection['result_cache'])) {
-            $configuration->addMethodCall('setResultCache', [new Reference($connection['result_cache'])]);
-        }
-
-        if (class_exists(LegacySchemaManagerFactory::class)) {
+        if (! isset($connection['result_cache'])) {
             return;
         }
 
-        $container->removeDefinition('doctrine.dbal.legacy_schema_manager_factory');
+        $configuration->addMethodCall('setResultCache', [new Reference($connection['result_cache'])]);
     }
 
     /**

tests/DependencyInjection/AbstractDoctrineExtensionTestCase.php

@@ -11,7 +11,6 @@
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Connections\PrimaryReadReplicaConnection;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Schema\LegacySchemaManagerFactory;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadata;
@@ -281,11 +280,7 @@ public function testDbalSchemaManagerFactory(): void
         $this->assertDICDefinitionMethodCallOnce(
             $container->getDefinition('doctrine.dbal.default_schema_manager_factory_connection.configuration'),
             'setSchemaManagerFactory',
-            [
-                new Reference(class_exists(LegacySchemaManagerFactory::class)
-                ? 'doctrine.dbal.legacy_schema_manager_factory'
-                : 'doctrine.dbal.default_schema_manager_factory'),
-            ],
+            [new Reference('doctrine.dbal.default_schema_manager_factory')],
         );
 
         $this->assertDICDefinitionMethodCallOnce(