Merge pull request #9397 from vinzv/9238-red-color-unread-messages-faded

[friendica.git] / src / Console / AutomaticInstallation.php

diff --git a/src/Console/AutomaticInstallation.php b/src/Console/AutomaticInstallation.php
index 0f1e7a742f1864e191a75cd73144020f400fb21d..37ba2dc1376c2fd539ff938d6644f03d087b25e2 100644 (file)
--- a/src/Console/AutomaticInstallation.php
+++ b/src/Console/AutomaticInstallation.php
@@ -1,11 +1,31 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Console;
 
 use Asika\SimpleConsole\Console;
 use Friendica\App;
 use Friendica\App\BaseURL;
-use Friendica\Core\Config;
+use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Cache;
 use Friendica\Core\Installer;
 use Friendica\Core\Theme;
 use Friendica\Database\Database;
@@ -15,23 +35,13 @@ use RuntimeException;
 
 class AutomaticInstallation extends Console
 {
-       /**
-        * @var App\Mode
-        */
+       /** @var App\Mode */
        private $appMode;
-       /**
-        * @var Config\Cache\ConfigCache
-        */
+       /** @var Cache */
        private $configCache;
-
-       /**
-        * @var Config\Configuration
-        */
+       /** @var IConfig */
        private $config;
-
-       /**
-        * @var Database
-        */
+       /** @var Database */
        private $dba;
 
        protected function getHelp()
@@ -89,14 +99,14 @@ Examples
 HELP;
        }
 
-       public function __construct(App\Mode $appMode, Config\Cache\ConfigCache $configCache, Config\Configuration $config, Database $dba, array $argv = null)
+       public function __construct(App\Mode $appMode, Cache $configCache, IConfig $config, Database $dba, array $argv = null)
        {
                parent::__construct($argv);
 
-               $this->appMode = $appMode;
-               $this->configCache  =$configCache;
-               $this->config = $config;
-               $this->dba = $dba;
+               $this->appMode     = $appMode;
+               $this->configCache = $configCache;
+               $this->config      = $config;
+               $this->dba         = $dba;
        }
 
        protected function doExecute()
@@ -106,9 +116,9 @@ HELP;
 
                $installer = new Installer();
 
-               $configCache = $this->configCache;
+               $configCache  = $this->configCache;
                $basePathConf = $configCache->get('system', 'basepath');
-               $basepath = new BasePath($basePathConf);
+               $basepath     = new BasePath($basePathConf);
                $installer->setUpCache($configCache, $basepath->getPath());
 
                $this->out(" Complete!\n\n");
@@ -129,16 +139,13 @@ HELP;
                $config_file = $this->getOption(['f', 'file']);
 
                if (!empty($config_file)) {
-                       if ($config_file != 'config' . DIRECTORY_SEPARATOR . 'local.config.php') {
-                               // Copy config file
-                               $this->out("Copying config file...\n");
-                               if (!copy($basePathConf . DIRECTORY_SEPARATOR . $config_file, $basePathConf . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.config.php')) {
-                                       throw new RuntimeException("ERROR: Saving config file failed. Please copy '$config_file' to '" . $basePathConf . "'" . DIRECTORY_SEPARATOR . "config" . DIRECTORY_SEPARATOR . "local.config.php' manually.\n");
-                               }
+
+                       if (!file_exists($config_file)) {
+                               throw new RuntimeException("ERROR: Config file does not exist.\n");
                        }
 
                        //reload the config cache
-                       $loader = new ConfigFileLoader($basePathConf);
+                       $loader = new ConfigFileLoader($config_file);
                        $loader->setupCache($configCache);
 
                } else {
@@ -195,7 +202,7 @@ HELP;
                        $installer->createConfig($configCache);
                }
 
-               $this->out(" Complete!\n\n");
+               $this->out("Complete!\n\n");
 
                // Check database connection
                $this->out("Checking database...\n");
@@ -219,6 +226,14 @@ HELP;
                        throw new RuntimeException($errorMessage);
                }
 
+               if (!empty($config_file) && $config_file != 'config' . DIRECTORY_SEPARATOR . 'local.config.php') {
+                       // Copy config file
+                       $this->out("Copying config file...\n");
+                       if (!copy($basePathConf . DIRECTORY_SEPARATOR . $config_file, $basePathConf . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.config.php')) {
+                               throw new RuntimeException("ERROR: Saving config file failed. Please copy '$config_file' to '" . $basePathConf . "'" . DIRECTORY_SEPARATOR . "config" . DIRECTORY_SEPARATOR . "local.config.php' manually.\n");
+                       }
+               }
+
                $this->out(" Complete!\n\n");
 
                // Install theme
@@ -236,18 +251,18 @@ HELP;
        }
 
        /**
-        * @param Installer                 $installer   The Installer instance
-        * @param Config\Cache\ConfigCache $configCache The config cache
+        * @param Installer $installer   The Installer instance
+        * @param Cache     $configCache The config cache
         *
         * @return bool true if checks were successfully, otherwise false
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       private function runBasicChecks(Installer $installer, Config\Cache\ConfigCache $configCache)
+       private function runBasicChecks(Installer $installer, Cache $configCache)
        {
                $checked = true;
 
                $installer->resetChecks();
-               if (!$installer->checkFunctions())              {
+               if (!$installer->checkFunctions()) {
                        $checked = false;
                }
                if (!$installer->checkImagick()) {
@@ -276,11 +291,12 @@ HELP;
 
        /**
         * @param array $results
+        *
         * @return string
         */
        private function extractErrors($results)
        {
-               $errorMessage = '';
+               $errorMessage      = '';
                $allChecksRequired = $this->getOption('a') !== null;
 
                foreach ($results as $result) {