X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FInstaller.php;h=28db93d292de706f36a01ca76912f9cac51b24f3;hb=0d1fa70e2ecb372d158871285e0cda5f6d77194a;hp=01ef1d8c923c5b397ef1e3e3806abdefdba1e594;hpb=ab8997f9db910ba70c592bf106a7f5fc41a55b2d;p=friendica.git
diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index 01ef1d8c92..28db93d292 100644
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -1,17 +1,33 @@
.
+ *
*/
+
namespace Friendica\Core;
use DOMDocument;
use Exception;
-use Friendica\Core\Config\Cache\ConfigCache;
+use Friendica\Core\Config\Cache;
use Friendica\Database\Database;
use Friendica\Database\DBStructure;
use Friendica\DI;
use Friendica\Util\Images;
-use Friendica\Util\Network;
use Friendica\Util\Strings;
/**
@@ -129,12 +145,12 @@ class Installer
* - Creates `config/local.config.php`
* - Installs Database Structure
*
- * @param ConfigCache $configCache The config cache with all config relevant information
+ * @param Cache $configCache The config cache with all config relevant information
*
* @return bool true if the config was created, otherwise false
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public function createConfig(ConfigCache $configCache)
+ public function createConfig(Cache $configCache)
{
$basepath = $configCache->get('system', 'basepath');
@@ -242,7 +258,7 @@ class Installer
$help = "";
if (!$passed) {
$help .= DI::l10n()->t('Could not find a command line version of PHP in the web server PATH.') . EOL;
- $help .= DI::l10n()->t("If you don't have a command line version of PHP installed on your server, you will not be able to run the background processing. See 'Setup the worker'") . EOL;
+ $help .= DI::l10n()->t("If you don't have a command line version of PHP installed on your server, you will not be able to run the background processing. See 'Setup the worker'") . EOL;
$help .= EOL . EOL;
$tpl = Renderer::getMarkupTemplate('field_input.tpl');
/// @todo Separate backend Installer class and presentation layer/view
@@ -531,11 +547,11 @@ class Installer
$help = "";
$error_msg = "";
if (function_exists('curl_init')) {
- $fetchResult = Network::fetchUrlFull($baseurl . "/install/testrewrite");
+ $fetchResult = DI::httpRequest()->fetchFull($baseurl . "/install/testrewrite");
$url = Strings::normaliseLink($baseurl . "/install/testrewrite");
if ($fetchResult->getReturnCode() != 204) {
- $fetchResult = Network::fetchUrlFull($url);
+ $fetchResult = DI::httpRequest()->fetchFull($url);
}
if ($fetchResult->getReturnCode() != 204) {
@@ -618,12 +634,12 @@ class Installer
/**
* Setup the default cache for a new installation
*
- * @param ConfigCache $configCache The configuration cache
- * @param string $basePath The determined basepath
+ * @param Cache $configCache The configuration cache
+ * @param string $basePath The determined basepath
*
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public function setUpCache(ConfigCache $configCache, $basePath)
+ public function setUpCache(Cache $configCache, $basePath)
{
$configCache->set('config', 'php_path' , $this->getPHPPath());
$configCache->set('system', 'basepath' , $basePath);