Move migrations to core bundle (see #2545)

Description ----------- | Q | A | -----------------| --- | Fixed issues | Fixes #2364 Commits ------- 1d6f417 Move migrations to core bundle 20dfde3 Fix missing globals array 51fb5c7 PHPStan 5034731 Pass the filesystem as dependency and remove the Contao 3 migrations
contao · Dec 7, 2020 · 244d845 · 244d845
1 parent 8605bc4
commit 244d845
Show file tree

Hide file tree

Showing 15 changed files with 71 additions and 266 deletions.
diff --git a/...-bundle/src/Database/Version400Update.php → ...Migration/Version400/Version400Update.php b/...-bundle/src/Database/Version400Update.php → ...Migration/Version400/Version400Update.php
@@ -10,7 +10,7 @@
  * @license LGPL-3.0-or-later
  */
 
-namespace Contao\InstallationBundle\Database;
+namespace Contao\CoreBundle\Migration\Version400;
 
 use Contao\CoreBundle\Migration\AbstractMigration;
 use Contao\CoreBundle\Migration\MigrationResult;

diff --git a/...-bundle/src/Database/Version410Update.php → ...Migration/Version401/Version410Update.php b/...-bundle/src/Database/Version410Update.php → ...Migration/Version401/Version410Update.php
@@ -10,8 +10,9 @@
  * @license LGPL-3.0-or-later
  */
 
-namespace Contao\InstallationBundle\Database;
+namespace Contao\CoreBundle\Migration\Version401;
 
+use Contao\CoreBundle\Framework\ContaoFramework;
 use Contao\CoreBundle\Migration\AbstractMigration;
 use Contao\CoreBundle\Migration\MigrationResult;
 use Doctrine\DBAL\Connection;
@@ -26,9 +27,15 @@ class Version410Update extends AbstractMigration
      */
     private $connection;
 
-    public function __construct(Connection $connection)
+    /**
+     * @var ContaoFramework
+     */
+    private $framework;
+
+    public function __construct(Connection $connection, ContaoFramework $framework)
     {
         $this->connection = $connection;
+        $this->framework = $framework;
     }
 
     public function getName(): string
@@ -51,6 +58,8 @@ public function shouldRun(): bool
 
     public function run(): MigrationResult
     {
+        $this->framework->initialize();
+
         $crop = $GLOBALS['TL_CROP'];
 
         if (empty($crop)) {

diff --git a/...-bundle/src/Database/Version430Update.php → ...Migration/Version403/Version430Update.php b/...-bundle/src/Database/Version430Update.php → ...Migration/Version403/Version430Update.php
@@ -10,7 +10,7 @@
  * @license LGPL-3.0-or-later
  */
 
-namespace Contao\InstallationBundle\Database;
+namespace Contao\CoreBundle\Migration\Version403;
 
 use Contao\CoreBundle\Migration\AbstractMigration;
 use Contao\CoreBundle\Migration\MigrationResult;

diff --git a/...-bundle/src/Database/Version440Update.php → ...Migration/Version404/Version440Update.php b/...-bundle/src/Database/Version440Update.php → ...Migration/Version404/Version440Update.php
@@ -10,7 +10,7 @@
  * @license LGPL-3.0-or-later
  */
 
-namespace Contao\InstallationBundle\Database;
+namespace Contao\CoreBundle\Migration\Version404;
 
 use Contao\CoreBundle\Migration\AbstractMigration;
 use Contao\CoreBundle\Migration\MigrationResult;

diff --git a/...-bundle/src/Database/Version447Update.php → ...Migration/Version404/Version447Update.php b/...-bundle/src/Database/Version447Update.php → ...Migration/Version404/Version447Update.php
@@ -10,7 +10,7 @@
  * @license LGPL-3.0-or-later
  */
 
-namespace Contao\InstallationBundle\Database;
+namespace Contao\CoreBundle\Migration\Version404;
 
 use Contao\CoreBundle\Migration\AbstractMigration;
 use Contao\CoreBundle\Migration\MigrationResult;

diff --git a/...-bundle/src/Database/Version450Update.php → ...Migration/Version405/Version450Update.php b/...-bundle/src/Database/Version450Update.php → ...Migration/Version405/Version450Update.php
@@ -10,7 +10,7 @@
  * @license LGPL-3.0-or-later
  */
 
-namespace Contao\InstallationBundle\Database;
+namespace Contao\CoreBundle\Migration\Version405;
 
 use Contao\CoreBundle\Migration\AbstractMigration;
 use Contao\CoreBundle\Migration\MigrationResult;

diff --git a/...-bundle/src/Database/Version460Update.php → ...Migration/Version406/Version460Update.php b/...-bundle/src/Database/Version460Update.php → ...Migration/Version406/Version460Update.php
@@ -10,7 +10,7 @@
  * @license LGPL-3.0-or-later
  */
 
-namespace Contao\InstallationBundle\Database;
+namespace Contao\CoreBundle\Migration\Version406;
 
 use Contao\CoreBundle\Migration\AbstractMigration;
 use Contao\CoreBundle\Migration\MigrationResult;

diff --git a/...-bundle/src/Database/Version470Update.php → ...Migration/Version407/Version470Update.php b/...-bundle/src/Database/Version470Update.php → ...Migration/Version407/Version470Update.php
@@ -10,7 +10,7 @@
  * @license LGPL-3.0-or-later
  */
 
-namespace Contao\InstallationBundle\Database;
+namespace Contao\CoreBundle\Migration\Version407;
 
 use Contao\CoreBundle\Migration\AbstractMigration;
 use Contao\CoreBundle\Migration\MigrationResult;

diff --git a/...-bundle/src/Database/Version480Update.php → ...Migration/Version408/Version480Update.php b/...-bundle/src/Database/Version480Update.php → ...Migration/Version408/Version480Update.php
@@ -10,13 +10,14 @@
  * @license LGPL-3.0-or-later
  */
 
-namespace Contao\InstallationBundle\Database;
+namespace Contao\CoreBundle\Migration\Version408;
 
 use Contao\CoreBundle\Migration\AbstractMigration;
 use Contao\CoreBundle\Migration\MigrationResult;
 use Contao\File;
 use Contao\StringUtil;
 use Doctrine\DBAL\Connection;
+use Symfony\Component\Filesystem\Filesystem;
 
 /**
  * @internal
@@ -28,14 +29,20 @@ class Version480Update extends AbstractMigration
      */
     private $connection;
 
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
     /**
      * @var string
      */
     private $projectDir;
 
-    public function __construct(Connection $connection, string $projectDir)
+    public function __construct(Connection $connection, Filesystem $filesystem, string $projectDir)
     {
         $this->connection = $connection;
+        $this->filesystem = $filesystem;
         $this->projectDir = $projectDir;
     }
 
@@ -153,7 +160,7 @@ public function run(): MigrationResult
 
         // Convert the important part to relative values as fractions
         while (false !== ($file = $statement->fetch(\PDO::FETCH_OBJ))) {
-            if (!file_exists($this->projectDir.'/'.$file->path) || is_dir($this->projectDir.'/'.$file->path)) {
+            if (!$this->filesystem->exists($this->projectDir.'/'.$file->path) || is_dir($this->projectDir.'/'.$file->path)) {
                 continue;
             }
 

diff --git a/core-bundle/src/Resources/config/migrations.yml b/core-bundle/src/Resources/config/migrations.yml
@@ -4,6 +4,49 @@ services:
 
     Contao\CoreBundle\Migration\MigrationCollection: ~
 
+    Contao\CoreBundle\Migration\Version400\Version400Update:
+        arguments:
+            - '@database_connection'
+
+    Contao\CoreBundle\Migration\Version401\Version410Update:
+        arguments:
+            - '@database_connection'
+            - '@contao.framework'
+
+    Contao\CoreBundle\Migration\Version403\Version430Update:
+        arguments:
+            - '@database_connection'
+
+    Contao\CoreBundle\Migration\Version404\Version440Update:
+        arguments:
+            - '@database_connection'
+
+    Contao\CoreBundle\Migration\Version404\Version447Update:
+        arguments:
+            - '@database_connection'
+            - '@translator'
+
+    Contao\CoreBundle\Migration\Version405\Version450Update:
+        arguments:
+            - '@database_connection'
+
+    Contao\CoreBundle\Migration\Version406\Version460Update:
+        arguments:
+            - '@database_connection'
+
+    Contao\CoreBundle\Migration\Version407\Version470Update:
+        arguments:
+            - '@database_connection'
+            - '@filesystem'
+            - '%contao.upload_path%'
+            - '%kernel.project_dir%'
+
+    Contao\CoreBundle\Migration\Version408\Version480Update:
+        arguments:
+            - '@database_connection'
+            - '@filesystem'
+            - '%kernel.project_dir%'
+
     Contao\CoreBundle\Migration\Version409\CeAccessMigration:
         arguments:
             - '@database_connection'

diff --git a/installation-bundle/src/Database/Version330Update.php b/installation-bundle/src/Database/Version330Update.php
diff --git a/installation-bundle/src/Database/Version350Update.php b/installation-bundle/src/Database/Version350Update.php
diff --git a/installation-bundle/src/DependencyInjection/ContaoInstallationExtension.php b/installation-bundle/src/DependencyInjection/ContaoInstallationExtension.php
@@ -29,6 +29,5 @@ public function load(array $configs, ContainerBuilder $container): void
         $loader->load('commands.yml');
         $loader->load('listener.yml');
         $loader->load('services.yml');
-        $loader->load('migrations.yml');
     }
 }