Merge release 3.3.1 into 3.4.x

.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "CI"

.github/workflows/coding-standards.yml

@@ -12,4 +12,4 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@3.1.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.0.1"

.github/workflows/continuous-integration.yml

@@ -12,12 +12,16 @@ on:
 jobs:
   phpunit:
     name: "PHPUnit"
-    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@3.1.0"
+    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@5.0.1"
     with:
       php-versions: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"]'
+    secrets:
+      CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"
 
   phpunit-with-dev-deps:
     name: "PHPUnit with dev dependencies"
-    uses: "doctrine/.github/.github/workflows/continuous-integration-symfony-unstable.yml@3.1.0"
+    uses: "doctrine/.github/.github/workflows/continuous-integration-symfony-unstable.yml@5.0.1"
     with:
       symfony-version-constraint: "^7"
+    secrets:
+      CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"

.github/workflows/release-on-milestone-closed.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   release:
     name: "Git tag, release & create merge-up PR"
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@3.1.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.0.1"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

@@ -12,4 +12,4 @@ on:
 jobs:
   static-analysis:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/static-analysis.yml@3.1.0"
+    uses: "doctrine/.github/.github/workflows/static-analysis.yml@5.0.1"

.symfony.bundle.yaml

@@ -1,4 +1,4 @@
 branches: ["2.2.x", "3.0.x", "3.1.x", "3.2.x", "3.3.x", "3.4.x"]
 maintained_branches: ["2.2.x", "3.3.x", "3.4.x"]
-doc_dir: "Resources/doc/"
+doc_dir: {"2.2.x": "Resources/doc/", "3.3.x": "Resources/doc/", "3.4.x": "docs/"}
 dev_branch: "3.4.x"

docs/index.rst

@@ -251,10 +251,9 @@ Here is an example on how to inject the service container into your migrations:
 
         # config/services.yaml
         services:
-            Doctrine\Migrations\Version\DbalMigrationFactory: ~
             App\Migrations\Factory\MigrationFactoryDecorator:
-                decorates: Doctrine\Migrations\Version\DbalMigrationFactory
-                arguments: ['@App\Migrations\Factory\MigrationFactoryDecorator.inner', '@service_container']
+                decorates: 'doctrine.migrations.migrations_factory'
+                arguments: ['@.inner', '@service_container']
 
 
 .. code-block:: php

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.23.1@8471a896ccea3526b26d082f4461eeea467f10a4">
+<files psalm-version="5.24.0@462c80e31c34e58cc4f750c656be3927e80e550e">
   <file src="src/DependencyInjection/Configuration.php">
     <UndefinedInterfaceMethod>
       <code><![CDATA[end]]></code>

src/DependencyInjection/DoctrineMigrationsExtension.php

@@ -16,9 +16,9 @@
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 use function array_keys;
 use function assert;