Add migrations_path by merging them with the application one

To let the application migration_path in first position and avoid specifiying namespace
Sylius · Oct 1, 2020 · fb5a82d · fb5a82d
1 parent d8d8075
commit fb5a82d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/Sylius/Bundle/AdminApiBundle/DependencyInjection/SyliusAdminApiExtension.php b/src/Sylius/Bundle/AdminApiBundle/DependencyInjection/SyliusAdminApiExtension.php
@@ -65,10 +65,11 @@ private function prependDoctrineMigrations(ContainerBuilder $container): void
             return;
         }
 
+        $doctrineConfig = $container->getExtensionConfig('doctrine_migrations');
         $container->prependExtensionConfig('doctrine_migrations', [
-            'migrations_paths' => [
+            'migrations_paths' => \array_merge(\array_pop($doctrineConfig)['migrations_paths'] ?? [], [
                 'Sylius\Bundle\AdminApiBundle\Migrations' => '@SyliusAdminApiBundle/Migrations',
-            ],
+            ]),
         ]);
 
         $container->prependExtensionConfig('sylius_labs_doctrine_migrations_extra', [

diff --git a/src/Sylius/Bundle/CoreBundle/DependencyInjection/SyliusCoreExtension.php b/src/Sylius/Bundle/CoreBundle/DependencyInjection/SyliusCoreExtension.php
@@ -100,22 +100,17 @@ private function prependDoctrineMigrations(ContainerBuilder $container): void
             return;
         }
 
+        $doctrineConfig = $container->getExtensionConfig('doctrine_migrations');
         $container->prependExtensionConfig('doctrine_migrations', [
-            'migrations_paths' => [
+            'migrations_paths' => \array_merge(\array_pop($doctrineConfig)['migrations_paths'] ?? [], [
                 'Sylius\Bundle\CoreBundle\Migrations' => '@SyliusCoreBundle/Migrations',
-            ],
+            ]),
         ]);
 
         $container->prependExtensionConfig('sylius_labs_doctrine_migrations_extra', [
             'migrations' => [
                 'Sylius\Bundle\CoreBundle\Migrations' => [],
             ],
         ]);
-
-        // set application "migrations_path" configuration as default to not require `--namespace` option for `doctrine:migrations:diff`
-        $doctrineConfig = $container->getExtensionConfig('doctrine_migrations');
-        if (count($doctrineConfig) > 2 && isset($doctrineConfig[count($doctrineConfig)-1]['migrations_paths'])) {
-            $container->prependExtensionConfig('doctrine_migrations', \array_pop($doctrineConfig));
-        }
     }
 }