X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FConsole%2FAutomaticInstallation.php;h=37ba2dc1376c2fd539ff938d6644f03d087b25e2;hb=3f523a88b0af4e2a73b29917da33d221abef9647;hp=12c3b325ae301796c4feba8b5b3411fbb5f16a1b;hpb=cb80108957f16011b5b7b1b8961da8cbd78d60c9;p=friendica.git diff --git a/src/Console/AutomaticInstallation.php b/src/Console/AutomaticInstallation.php index 12c3b325ae..37ba2dc137 100644 --- a/src/Console/AutomaticInstallation.php +++ b/src/Console/AutomaticInstallation.php @@ -1,11 +1,31 @@ . + * + */ 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\IConfig - */ + /** @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\IConfig $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"); @@ -241,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()) { @@ -281,11 +291,12 @@ HELP; /** * @param array $results + * * @return string */ private function extractErrors($results) { - $errorMessage = ''; + $errorMessage = ''; $allChecksRequired = $this->getOption('a') !== null; foreach ($results as $result) {