Merge pull request #8134 from nupplaphil/task/di_l10n

[friendica.git] / tests / src / Console / AutomaticInstallationConsoleTest.php

diff --git a/tests/src/Console/AutomaticInstallationConsoleTest.php b/tests/src/Console/AutomaticInstallationConsoleTest.php
index a8c4894b9d315706706cae0fa07c73f1db0b761b..ab879b31945095be535403f5cfb6a44cc25e0aae 100644 (file)
--- a/tests/src/Console/AutomaticInstallationConsoleTest.php
+++ b/tests/src/Console/AutomaticInstallationConsoleTest.php
@@ -4,18 +4,17 @@ namespace Friendica\Test\src\Console;
 
 use Dice\Dice;
 use Friendica\App;
-use Friendica\BaseObject;
 use Friendica\Console\AutomaticInstallation;
 use Friendica\Core\Config\Cache\ConfigCache;
 use Friendica\Core\Installer;
-use Friendica\Core\L10n\L10n;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Database\Database;
+use Friendica\DI;
 use Friendica\Test\Util\DBAMockTrait;
 use Friendica\Test\Util\DBStructureMockTrait;
 use Friendica\Test\Util\RendererMockTrait;
 use Friendica\Test\Util\VFSTrait;
-use Friendica\Util\BaseURL;
 use Friendica\Util\Logger\VoidLogger;
 use Mockery\MockInterface;
 use org\bovigo\vfs\vfsStream;
@@ -78,7 +77,7 @@ class AutomaticInstallationConsoleTest extends ConsoleTest
                           ->with(L10n::class)
                           ->andReturn($l10nMock);
 
-               BaseObject::setDependencyInjection($this->dice);
+               DI::init($this->dice);
 
                $this->configCache = new ConfigCache();
                $this->configCache->set('system', 'basepath', $this->root->url());
@@ -353,7 +352,7 @@ FIN;
                $this->assertConfigEntry('system', 'language', $assertion, ($default) ? Installer::DEFAULT_LANG : null);
                $this->assertConfigEntry('system', 'url', $assertion);
                $this->assertConfigEntry('system', 'urlpath', $assertion);
-               $this->assertConfigEntry('system', 'ssl_policy', $assertion, ($default) ? BaseURL::DEFAULT_SSL_SCHEME : null);
+               $this->assertConfigEntry('system', 'ssl_policy', $assertion, ($default) ? App\BaseURL::DEFAULT_SSL_SCHEME : null);
                $this->assertConfigEntry('system', 'basepath', ($realBasepath) ? $this->root->url() : $assertion);
        }