use existing RoutingMigration

AlexejKossmann · Jul 25, 2020 · fb2566f · fb2566f
1 parent 69c840f
commit fb2566f
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 269 deletions.
diff --git a/core-bundle/src/Migration/Version410/FolderUrlMigration.php b/core-bundle/src/Migration/Version410/FolderUrlMigration.php
diff --git a/core-bundle/src/Migration/Version410/RoutingMigration.php b/core-bundle/src/Migration/Version410/RoutingMigration.php
@@ -12,6 +12,8 @@
 
 namespace Contao\CoreBundle\Migration\Version410;
 
+use Contao\Config;
+use Contao\CoreBundle\Framework\ContaoFramework;
 use Contao\CoreBundle\Migration\AbstractMigration;
 use Contao\CoreBundle\Migration\MigrationResult;
 use Doctrine\DBAL\Connection;
@@ -29,6 +31,11 @@ class RoutingMigration extends AbstractMigration
      */
     private $connection;
 
+    /**
+     * @var ContaoFramework
+     */
+    private $framework;
+
     /**
      * @var string
      */
@@ -39,9 +46,10 @@ class RoutingMigration extends AbstractMigration
      */
     private $prependLocale;
 
-    public function __construct(Connection $connection, string $urlSuffix = '.html', bool $prependLocale = false)
+    public function __construct(Connection $connection, ContaoFramework $framework, string $urlSuffix = '.html', bool $prependLocale = false)
     {
         $this->connection = $connection;
+        $this->framework = $framework;
         $this->urlSuffix = $urlSuffix;
         $this->prependLocale = $prependLocale;
     }
@@ -56,7 +64,7 @@ public function shouldRun(): bool
 
         $columns = $schemaManager->listTableColumns('tl_page');
 
-        return !isset($columns['urlprefix']) && !isset($columns['urlsuffix']);
+        return !isset($columns['urlprefix']) && !isset($columns['urlsuffix']) && !isset($columns['usefolderurl']);
     }
 
     public function run(): MigrationResult
@@ -67,7 +75,10 @@ public function run(): MigrationResult
         $urlSuffix = new Column('urlSuffix', new StringType());
         $urlSuffix->setColumnDefinition("varchar(16) NOT NULL default '.html'");
 
-        $diff = new TableDiff('tl_page', [$urlPrefix, $urlSuffix]);
+        $useFolderUrl = new Column('useFolderUrl', new StringType());
+        $useFolderUrl->setColumnDefinition("char(1) NOT NULL default ''");
+
+        $diff = new TableDiff('tl_page', [$urlPrefix, $urlSuffix, $useFolderUrl]);
         $sql = $this->connection->getDatabasePlatform()->getAlterTableSQL($diff);
 
         foreach ($sql as $statement) {
@@ -81,6 +92,15 @@ public function run(): MigrationResult
             ->execute(['suffix' => $this->urlSuffix])
         ;
 
+        $this->framework->initialize();
+
+        /** @var Config $config */
+        $config = $this->framework->getAdapter(Config::class);
+
+        if ($config->get('folderUrl')) {
+            $this->connection->update('tl_page', ['useFolderUrl' => '1'], ['type' => 'root']);
+        }
+
         return $this->createResult(true);
     }
 }
diff --git a/core-bundle/src/Resources/config/migrations.yml b/core-bundle/src/Resources/config/migrations.yml
@@ -13,11 +13,13 @@ services:
         arguments:
             - '@database_connection'
 
-    Contao\CoreBundle\Migration\Version410\FolderUrlMigration:
+    Contao\CoreBundle\Migration\Version410\OrderFieldMigration:
         arguments:
             - '@database_connection'
-            - '@contao.framework'
 
-    Contao\CoreBundle\Migration\Version410\OrderFieldMigration:
+    Contao\CoreBundle\Migration\Version410\RoutingMigration:
         arguments:
             - '@database_connection'
+            - '@contao.framework'
+            - '%contao.url_suffix%'
+            - '%contao.prepend_locale%'
diff --git a/core-bundle/tests/DependencyInjection/ContaoCoreExtensionTest.php b/core-bundle/tests/DependencyInjection/ContaoCoreExtensionTest.php
@@ -96,6 +96,7 @@
 use Contao\CoreBundle\Menu\BackendMenuBuilder;
 use Contao\CoreBundle\Migration\MigrationCollection;
 use Contao\CoreBundle\Migration\Version409\CeAccessMigration;
+use Contao\CoreBundle\Migration\Version410\RoutingMigration;
 use Contao\CoreBundle\Monolog\ContaoTableHandler;
 use Contao\CoreBundle\Monolog\ContaoTableProcessor;
 use Contao\CoreBundle\OptIn\OptIn;
@@ -3739,6 +3740,27 @@ public function testRegistersTheVersion409CeAccessMigration(): void
         );
     }
 
+    public function testRegistersTheVersion410RoutingMigration(): void
+    {
+        $container = $this->getContainerBuilder();
+
+        $this->assertTrue($container->has(RoutingMigration::class));
+
+        $definition = $container->getDefinition(RoutingMigration::class);
+
+        $this->assertTrue($definition->isPrivate());
+
+        $this->assertEquals(
+            [
+                new Reference('database_connection'),
+                new Reference('contao.framework'),
+                '%contao.url_suffix%',
+                '%contao.prepend_locale%',
+            ],
+            $definition->getArguments()
+        );
+    }
+
     public function testRegistersThePredefinedImageSizes(): void
     {
         $container = $this->getContainerBuilder();

diff --git a/core-bundle/tests/Migration/Version410/FolderUrlMigrationTest.php b/core-bundle/tests/Migration/Version410/FolderUrlMigrationTest.php