Merge branch '4.6'

# Conflicts: # CHANGELOG.md
contao · Sep 11, 2018 · a7c95b5 · a7c95b5
2 parents ff0eeb4 + 9c03f2e
commit a7c95b5
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 416 deletions.
diff --git a/composer.json b/composer.json
@@ -15,7 +15,6 @@
         "doctrine/dbal": "^2.5",
         "patchwork/utf8": "^1.2",
         "psr/log": "^1.0",
-        "sensio/framework-extra-bundle": "^5.0",
         "sensiolabs/ansi-to-html": "^1.1",
         "symfony/config": "3.4.* || 4.1.*",
         "symfony/console": "3.4.* || 4.1.*",

diff --git a/src/Controller/InstallationController.php b/src/Controller/InstallationController.php
@@ -20,14 +20,14 @@
 use Contao\InstallationBundle\Event\InitializeApplicationEvent;
 use Doctrine\DBAL\DBALException;
 use Patchwork\Utf8;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Finder\SplFileInfo;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * @Route("/contao", defaults={"_scope" = "backend", "_token_check" = true})

diff --git a/src/Database/Installer.php b/src/Database/Installer.php
@@ -197,15 +197,24 @@ private function checkEngineAndCollation(array &$sql, Schema $toSchema): void
             }
 
             $engine = $table->getOption('engine');
+            $innodb = 'innodb' === strtolower($engine);
 
-            if ($tableOptions->Engine !== $engine) {
-                if ('InnoDB' === $engine) {
+            if (strtolower($tableOptions->Engine) !== strtolower($engine)) {
+                if ($innodb) {
                     $command = 'ALTER TABLE '.$tableName.' ENGINE = '.$engine.' ROW_FORMAT = DYNAMIC';
                 } else {
                     $command = 'ALTER TABLE '.$tableName.' ENGINE = '.$engine;
                 }
 
                 $sql['ALTER_TABLE'][md5($command)] = $command;
+            } elseif ($innodb) {
+                $rowFormat = $table->getOption('row_format');
+
+                if ($rowFormat && strtolower($tableOptions->Row_format) !== strtolower($rowFormat)) {
+                    $command = 'ALTER TABLE '.$tableName.' ENGINE = '.$engine.' ROW_FORMAT = DYNAMIC';
+
+                    $sql['ALTER_TABLE'][md5($command)] = $command;
+                }
             }
 
             $collate = $table->getOption('collate');

diff --git a/src/Database/Version447Update.php b/src/Database/Version447Update.php
@@ -108,8 +108,13 @@ public function run(): void
         if ($this->hasMessage()) {
             $translator = $this->container->get('translator');
 
-            $this->prependMessage(sprintf('<p>%s</p><ul>', $translator->trans('duplicate_subscriptions')));
-            $this->addMessage(sprintf('</ul><p>%s</p>', $translator->trans('duplicates_purged')));
+            $this->prependMessage(sprintf(
+                '<h3>%s</h3><p>%s</p><ul>',
+                $translator->trans('duplicate_subscriptions'),
+                $translator->trans('duplicate_subscriptions_begin')
+            ));
+
+            $this->addMessage(sprintf('</ul><p>%s</p>', $translator->trans('duplicate_subscriptions_end')));
         }
     }
 }
diff --git a/src/Database/Version450Update.php b/src/Database/Version450Update.php
@@ -42,6 +42,20 @@ public function run(): void
                 youtubeOptions text NULL
         ');
 
+        $this->connection->query("
+            ALTER TABLE
+                tl_content
+            ADD
+                youtubeStart int(10) unsigned NOT NULL default '0'
+        ");
+
+        $this->connection->query("
+            ALTER TABLE
+                tl_content
+            ADD
+                youtubeStop int(10) unsigned NOT NULL default '0'
+        ");
+
         $this->connection->query("
             UPDATE
                 tl_form_field

diff --git a/src/DependencyInjection/ContaoInstallationExtension.php b/src/DependencyInjection/ContaoInstallationExtension.php
@@ -30,8 +30,15 @@ public function load(array $configs, ContainerBuilder $container): void
             new FileLocator(__DIR__.'/../Resources/config')
         );
 
-        $loader->load('listener.yml');
-        $loader->load('services.yml');
+        static $files = [
+            'commands.yml',
+            'listener.yml',
+            'services.yml',
+        ];
+
+        foreach ($files as $file) {
+            $loader->load($file);
+        }
     }
 
     /**

diff --git a/src/Resources/config/commands.yml b/src/Resources/config/commands.yml
@@ -0,0 +1,9 @@
+services:
+    _defaults:
+        autoconfigure: true
+
+    contao.command.lock:
+        class: Contao\InstallationBundle\Command\LockCommand
+
+    contao.command.unlock:
+        class: Contao\InstallationBundle\Command\UnlockCommand