Merge pull request #528 from doctrine/3.3.x

Merge 3.3.x up into 3.4.x

Resources/doc/index.rst

@@ -183,7 +183,7 @@ migration to execute:
 
 .. code-block:: terminal
 
-    $ php bin/console doctrine:migrations:status --show-versions
+    $ php bin/console doctrine:migrations:status
 
 Now you can add some migration code to the ``up()`` and ``down()`` methods and
 finally migrate when you're ready:

phpstan.neon.dist

@@ -2,8 +2,12 @@ parameters:
     level: 7
     phpVersion: 80200
     paths:
-        - %currentWorkingDirectory%/DependencyInjection
-        - %currentWorkingDirectory%/Tests
+        - DependencyInjection
+        - Tests
+
+    excludePaths:
+        # That file contains an error that cannot be ignored
+        - Tests/Fixtures/Migrations/ContainerAwareMigration.php
 
     ignoreErrors:
         - '~Parameter \#1 \$configs.*DoctrineMigrationsExtension::load.*~'

psalm-baseline.xml

@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
+<files psalm-version="5.23.1@8471a896ccea3526b26d082f4461eeea467f10a4">
   <file src="DependencyInjection/Configuration.php">
     <UndefinedInterfaceMethod>
-      <code>end</code>
+      <code><![CDATA[end]]></code>
     </UndefinedInterfaceMethod>
   </file>
   <file src="DependencyInjection/DoctrineMigrationsExtension.php">
     <MoreSpecificImplementedParamType>
-      <code>$configs</code>
+      <code><![CDATA[$configs]]></code>
     </MoreSpecificImplementedParamType>
   </file>
+  <file src="Tests/Fixtures/Migrations/ContainerAwareMigration.php">
+    <UndefinedClass>
+      <code><![CDATA[ContainerAwareInterface]]></code>
+    </UndefinedClass>
+  </file>
 </files>