From dd099dc39cb8a5ea22ca5eae0d54adbb730279c9 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Thu, 6 Jul 2017 17:49:05 +0200
Subject: [PATCH] Removed declare strict types added by mistake

---
 .../src/Factory/InstallApplicationFactory.php |  2 --
 .../ApplicationConfigCustomizerPlugin.php     |  2 --
 .../Plugin/DatabaseConfigCustomizerPlugin.php | 33 +++++++++----------
 .../DefaultConfigCustomizerPluginFactory.php  |  2 --
 .../Plugin/LanguageConfigCustomizerPlugin.php |  2 --
 .../UrlShortenerConfigCustomizerPlugin.php    |  2 --
 .../ApplicationConfigCustomizerPluginTest.php |  2 --
 ...faultConfigCustomizerPluginFactoryTest.php |  2 --
 .../LanguageConfigCustomizerPluginTest.php    |  2 --
 ...UrlShortenerConfigCustomizerPluginTest.php |  2 --
 ...seImplicitOptionsMiddlewareFactoryTest.php |  2 --
 11 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/module/CLI/src/Factory/InstallApplicationFactory.php b/module/CLI/src/Factory/InstallApplicationFactory.php
index e4d4beb9..742b5b70 100644
--- a/module/CLI/src/Factory/InstallApplicationFactory.php
+++ b/module/CLI/src/Factory/InstallApplicationFactory.php
@@ -1,6 +1,4 @@
 <?php
-declare(strict_types=1);
-
 namespace Shlinkio\Shlink\CLI\Factory;
 
 use Acelaya\ZsmAnnotatedServices\Factory\V3\AnnotatedFactory;
diff --git a/module/CLI/src/Install/Plugin/ApplicationConfigCustomizerPlugin.php b/module/CLI/src/Install/Plugin/ApplicationConfigCustomizerPlugin.php
index b1bf6436..936381b0 100644
--- a/module/CLI/src/Install/Plugin/ApplicationConfigCustomizerPlugin.php
+++ b/module/CLI/src/Install/Plugin/ApplicationConfigCustomizerPlugin.php
@@ -1,6 +1,4 @@
 <?php
-declare(strict_types=1);
-
 namespace Shlinkio\Shlink\CLI\Install\Plugin;
 
 use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
diff --git a/module/CLI/src/Install/Plugin/DatabaseConfigCustomizerPlugin.php b/module/CLI/src/Install/Plugin/DatabaseConfigCustomizerPlugin.php
index 2f5e10f5..88bceb47 100644
--- a/module/CLI/src/Install/Plugin/DatabaseConfigCustomizerPlugin.php
+++ b/module/CLI/src/Install/Plugin/DatabaseConfigCustomizerPlugin.php
@@ -50,26 +50,23 @@ class DatabaseConfigCustomizerPlugin extends AbstractConfigCustomizerPlugin
     {
         $this->printTitle($output, 'DATABASE');
 
-        if ($appConfig->hasDatabase()) {
-            $keepConfig = $this->questionHelper->ask($input, $output, new ConfirmationQuestion(
-                '<question>Do you want to keep imported database config? (Y/n):</question> '
-            ));
-            if ($keepConfig) {
-                // If the user selected to keep DB config and is configured to use sqlite, copy DB file
-                if ($appConfig->getDatabase()['DRIVER'] === self::DATABASE_DRIVERS['SQLite']) {
-                    try {
-                        $this->filesystem->copy(
-                            $appConfig->getImportedInstallationPath() . '/' . CustomizableAppConfig::SQLITE_DB_PATH,
-                            CustomizableAppConfig::SQLITE_DB_PATH
-                        );
-                    } catch (IOException $e) {
-                        $output->writeln('<error>It wasn\'t possible to import the SQLite database</error>');
-                        throw $e;
-                    }
+        if ($appConfig->hasDatabase() && $this->questionHelper->ask($input, $output, new ConfirmationQuestion(
+            '<question>Do you want to keep imported database config? (Y/n):</question> '
+        ))) {
+            // If the user selected to keep DB config and is configured to use sqlite, copy DB file
+            if ($appConfig->getDatabase()['DRIVER'] === self::DATABASE_DRIVERS['SQLite']) {
+                try {
+                    $this->filesystem->copy(
+                        $appConfig->getImportedInstallationPath() . '/' . CustomizableAppConfig::SQLITE_DB_PATH,
+                        CustomizableAppConfig::SQLITE_DB_PATH
+                    );
+                } catch (IOException $e) {
+                    $output->writeln('<error>It wasn\'t possible to import the SQLite database</error>');
+                    throw $e;
                 }
-
-                return;
             }
+
+            return;
         }
 
         // Select database type
diff --git a/module/CLI/src/Install/Plugin/Factory/DefaultConfigCustomizerPluginFactory.php b/module/CLI/src/Install/Plugin/Factory/DefaultConfigCustomizerPluginFactory.php
index 6e1ea7a0..78e5a87a 100644
--- a/module/CLI/src/Install/Plugin/Factory/DefaultConfigCustomizerPluginFactory.php
+++ b/module/CLI/src/Install/Plugin/Factory/DefaultConfigCustomizerPluginFactory.php
@@ -1,6 +1,4 @@
 <?php
-declare(strict_types=1);
-
 namespace Shlinkio\Shlink\CLI\Install\Plugin\Factory;
 
 use Interop\Container\ContainerInterface;
diff --git a/module/CLI/src/Install/Plugin/LanguageConfigCustomizerPlugin.php b/module/CLI/src/Install/Plugin/LanguageConfigCustomizerPlugin.php
index 83fbe7ad..91b5c7ec 100644
--- a/module/CLI/src/Install/Plugin/LanguageConfigCustomizerPlugin.php
+++ b/module/CLI/src/Install/Plugin/LanguageConfigCustomizerPlugin.php
@@ -1,6 +1,4 @@
 <?php
-declare(strict_types=1);
-
 namespace Shlinkio\Shlink\CLI\Install\Plugin;
 
 use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
diff --git a/module/CLI/src/Install/Plugin/UrlShortenerConfigCustomizerPlugin.php b/module/CLI/src/Install/Plugin/UrlShortenerConfigCustomizerPlugin.php
index 30186bfb..ac9c32e9 100644
--- a/module/CLI/src/Install/Plugin/UrlShortenerConfigCustomizerPlugin.php
+++ b/module/CLI/src/Install/Plugin/UrlShortenerConfigCustomizerPlugin.php
@@ -1,6 +1,4 @@
 <?php
-declare(strict_types=1);
-
 namespace Shlinkio\Shlink\CLI\Install\Plugin;
 
 use Shlinkio\Shlink\CLI\Model\CustomizableAppConfig;
diff --git a/module/CLI/test/Install/Plugin/ApplicationConfigCustomizerPluginTest.php b/module/CLI/test/Install/Plugin/ApplicationConfigCustomizerPluginTest.php
index cd4cef42..d0a4505d 100644
--- a/module/CLI/test/Install/Plugin/ApplicationConfigCustomizerPluginTest.php
+++ b/module/CLI/test/Install/Plugin/ApplicationConfigCustomizerPluginTest.php
@@ -1,6 +1,4 @@
 <?php
-declare(strict_types=1);
-
 namespace ShlinkioTest\Shlink\CLI\Install\Plugin;
 
 use PHPUnit\Framework\TestCase;
diff --git a/module/CLI/test/Install/Plugin/Factory/DefaultConfigCustomizerPluginFactoryTest.php b/module/CLI/test/Install/Plugin/Factory/DefaultConfigCustomizerPluginFactoryTest.php
index 509099ed..e5004dcc 100644
--- a/module/CLI/test/Install/Plugin/Factory/DefaultConfigCustomizerPluginFactoryTest.php
+++ b/module/CLI/test/Install/Plugin/Factory/DefaultConfigCustomizerPluginFactoryTest.php
@@ -1,6 +1,4 @@
 <?php
-declare(strict_types=1);
-
 namespace ShlinkioTest\Shlink\CLI\Install\Plugin\Factory;
 
 use PHPUnit\Framework\TestCase;
diff --git a/module/CLI/test/Install/Plugin/LanguageConfigCustomizerPluginTest.php b/module/CLI/test/Install/Plugin/LanguageConfigCustomizerPluginTest.php
index 0edc382e..77cae092 100644
--- a/module/CLI/test/Install/Plugin/LanguageConfigCustomizerPluginTest.php
+++ b/module/CLI/test/Install/Plugin/LanguageConfigCustomizerPluginTest.php
@@ -1,6 +1,4 @@
 <?php
-declare(strict_types=1);
-
 namespace ShlinkioTest\Shlink\CLI\Install\Plugin;
 
 use PHPUnit\Framework\TestCase;
diff --git a/module/CLI/test/Install/Plugin/UrlShortenerConfigCustomizerPluginTest.php b/module/CLI/test/Install/Plugin/UrlShortenerConfigCustomizerPluginTest.php
index dc2a9f6e..85eaf681 100644
--- a/module/CLI/test/Install/Plugin/UrlShortenerConfigCustomizerPluginTest.php
+++ b/module/CLI/test/Install/Plugin/UrlShortenerConfigCustomizerPluginTest.php
@@ -1,6 +1,4 @@
 <?php
-declare(strict_types=1);
-
 namespace ShlinkioTest\Shlink\CLI\Install\Plugin;
 
 use PHPUnit\Framework\TestCase;
diff --git a/module/Common/test/Factory/EmptyResponseImplicitOptionsMiddlewareFactoryTest.php b/module/Common/test/Factory/EmptyResponseImplicitOptionsMiddlewareFactoryTest.php
index dd4b6301..aca35f62 100644
--- a/module/Common/test/Factory/EmptyResponseImplicitOptionsMiddlewareFactoryTest.php
+++ b/module/Common/test/Factory/EmptyResponseImplicitOptionsMiddlewareFactoryTest.php
@@ -1,6 +1,4 @@
 <?php
-declare(strict_types=1);
-
 namespace ShlinkioTest\Shlink\Common\Factory;
 
 use PHPUnit\Framework\TestCase;