Merge remote-tracking branch 'origin/3.0.x' into 3.1.x

Author: greg0ire

DependencyInjection/CompilerPass/ConfigureDependencyFactoryPass.php

@@ -18,8 +18,7 @@ class ConfigureDependencyFactoryPass implements CompilerPassInterface
     public function process(ContainerBuilder $container): void
     {
         $diDefinition = $container->getDefinition('doctrine.migrations.dependency_factory');
-
-        $preferredEm = $container->getParameter('doctrine.migrations.preferred_em');
+        $preferredEm  = $container->getParameter('doctrine.migrations.preferred_em');
         if ($container->has('doctrine')) {
             $loaderDefinition = $container->getDefinition('doctrine.migrations.registry_loader');
             $loaderDefinition->setArgument(0, new Reference('doctrine'));

DependencyInjection/DoctrineMigrationsExtension.php

@@ -142,7 +142,6 @@ private function checkIfBundleRelativePath(string $path, ContainerBuilder $conta
     private function getBundlePath(string $bundleName, ContainerBuilder $container): string
     {
         $bundleMetadata = $container->getParameter('kernel.bundles_metadata');
-
         assert(is_array($bundleMetadata));
 
         if (! isset($bundleMetadata[$bundleName])) {

Resources/doc/index.rst

@@ -45,7 +45,7 @@ application:
     doctrine_migrations:
         # List of namespace/path pairs to search for migrations, at least one required
         migrations_paths:
-            'App\Migrations': 'src/App'
+            'App\Migrations': '%kernel.project_dir%/src/App'
             'AnotherApp\Migrations': '/path/to/other/migrations'
             'SomeBundle\Migrations': '@SomeBundle/Migrations'