Merge pull request doctrine#8957 from derrabus/remove/connection-helper

Only wire ConnectionHelper if it's available

lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php

@@ -27,12 +27,13 @@ final class ConsoleRunner
      */
     public static function createHelperSet(EntityManagerInterface $entityManager): HelperSet
     {
-        return new HelperSet(
-            [
-                'db' => new DBALConsole\Helper\ConnectionHelper($entityManager->getConnection()),
-                'em' => new EntityManagerHelper($entityManager),
-            ]
-        );
+        $helpers = ['em' => new EntityManagerHelper($entityManager)];
+
+        if (class_exists(DBALConsole\Helper\ConnectionHelper::class)) {
+            $helpers['db'] = new DBALConsole\Helper\ConnectionHelper($entityManager->getConnection());
+        }
+
+        return new HelperSet($helpers);
     }
 
     /**

phpstan-dbal3.neon

@@ -6,3 +6,11 @@ parameters:
     ignoreErrors:
         # deprecations from doctrine/dbal:3.x
         - '/^Call to an undefined method Doctrine\\DBAL\\Platforms\\AbstractPlatform::getGuidExpression\(\).$/'
+
+        # Fallback logic for DBAL 2
+        -
+            message: '/HelperSet constructor expects/'
+            path: lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php
+        -
+            message: '/Application::add\(\) expects Symfony\\Component\\Console\\Command\\Command/'
+            path: lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php

psalm-baseline.xml

@@ -659,7 +659,6 @@
     </DeprecatedClass>
     <PropertyTypeCoercion occurrences="1">
       <code>$resultSetMapping</code>
-      <code>$resultSetMapping</code>
     </PropertyTypeCoercion>
     <ReferenceConstraintViolation occurrences="1">
       <code>return $rowData;</code>
@@ -3560,14 +3559,11 @@
     </MissingReturnType>
   </file>
   <file src="lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php">
-    <DeprecatedClass occurrences="7">
-      <code>DBALConsole\Command\ImportCommand::class</code>
+    <DeprecatedClass occurrences="4">
       <code>Versions::getVersion('doctrine/orm')</code>
       <code>new Command\ConvertDoctrine1SchemaCommand()</code>
       <code>new Command\GenerateEntitiesCommand($entityManagerProvider)</code>
       <code>new Command\GenerateRepositoriesCommand($entityManagerProvider)</code>
-      <code>new DBALConsole\Command\ImportCommand()</code>
-      <code>new DBALConsole\Helper\ConnectionHelper($entityManager-&gt;getConnection())</code>
     </DeprecatedClass>
   </file>
   <file src="lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php">

psalm.xml

@@ -16,6 +16,13 @@
         </ignoreFiles>
     </projectFiles>
     <issueHandlers>
+        <DeprecatedClass>
+            <errorLevel type="suppress">
+                <!-- DBAL 2 compatibility -->
+                <referencedClass name="Doctrine\DBAL\Tools\Console\Command\ImportCommand"/>
+                <referencedClass name="Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper"/>
+            </errorLevel>
+        </DeprecatedClass>
         <DeprecatedMethod>
             <errorLevel type="suppress">
                 <!-- We're calling the deprecated method for BC here. -->