Merge pull request #7412 from nupplaphil/task/dice

Introduce DICE

bin/auth_ejabberd.php

@@ -51,7 +51,10 @@ chdir($directory);
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-$a = Factory\DependencyFactory::setUp('auth_ejabbered', dirname(__DIR__));
+$dice = new \Dice\Dice();
+$dice = $dice->addRules(include __DIR__ . '/../static/dependencies.config.php');
+
+$a = Factory\DependencyFactory::setUp('auth_ejabbered', $dice);
 
 if ($a->getMode()->isNormal()) {
 	$oAuth = new ExAuth();

bin/console.php

@@ -5,7 +5,10 @@ require dirname(__DIR__) . '/vendor/autoload.php';
 
 use Friendica\Factory;
 
-$a = Factory\DependencyFactory::setUp('console', dirname(__DIR__));
+$dice = new \Dice\Dice();
+$dice = $dice->addRules(include __DIR__ . '/../static/dependencies.config.php');
+
+$a = Factory\DependencyFactory::setUp('console', $dice);
 \Friendica\BaseObject::setApp($a);
 
 (new Friendica\Core\Console($argv))->execute();

bin/daemon.php

@@ -32,7 +32,10 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-$a = Factory\DependencyFactory::setUp('daemon', dirname(__DIR__));
+$dice = new \Dice\Dice();
+$dice = $dice->addRules(include __DIR__ . '/../static/dependencies.config.php');
+
+$a = Factory\DependencyFactory::setUp('daemon', $dice);
 
 if ($a->getMode()->isInstall()) {
 	die("Friendica isn't properly installed yet.\n");

bin/worker.php

@@ -30,7 +30,10 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-$a = Factory\DependencyFactory::setUp('worker', dirname(__DIR__));
+$dice = new \Dice\Dice();
+$dice = $dice->addRules(include __DIR__ . '/../static/dependencies.config.php');
+
+$a = Factory\DependencyFactory::setUp('worker', $dice);
 
 // Check the database structure and possibly fixes it
 Update::check($a->getBasePath(), true, $a->getMode());

composer.json

@@ -58,7 +58,8 @@
 		"npm-asset/fullcalendar": "^3.0.1",
 		"npm-asset/cropperjs": "1.2.2",
 		"npm-asset/imagesloaded": "4.1.4",
-		"pear/console_table": "^1.3"
+		"pear/console_table": "^1.3",
+		"level-2/dice": ">1.0"
 	},
 	"repositories": [
 		{

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "eb985236d64ed0b0fe1fc2e4ac6616e2",
+    "content-hash": "b9ea7162aa7ede630a2090c883e1174b",
     "packages": [
         {
             "name": "asika/simple-console",
@@ -769,6 +769,52 @@
             ],
             "time": "2018-09-18T12:18:08+00:00"
         },
+        {
+            "name": "level-2/dice",
+            "version": "4.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Level-2/Dice.git",
+                "reference": "e631f110f0520294fec902814c61cac26566023c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Level-2/Dice/zipball/e631f110f0520294fec902814c61cac26566023c",
+                "reference": "e631f110f0520294fec902814c61cac26566023c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Dice\\": "./"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Tom Butler",
+                    "email": "tom@r.je"
+                }
+            ],
+            "description": "A minimalist Dependency injection container (DIC) for PHP. Please note: 3.0+ is only compatible with PHP 7.0. The 2.0 branch is compatbile with PHP 5.6.",
+            "homepage": "http://r.je/dice.html",
+            "keywords": [
+                "dependency injection",
+                "dependency injection container",
+                "di",
+                "ioc"
+            ],
+            "time": "2019-05-01T12:55:36+00:00"
+        },
         {
             "name": "lightopenid/lightopenid",
             "version": "dev-master",

index.php

@@ -12,7 +12,9 @@ if (!file_exists(__DIR__ . '/vendor/autoload.php')) {
 
 require __DIR__ . '/vendor/autoload.php';
 
-$a = Factory\DependencyFactory::setUp('index', __DIR__, false);
+$dice = new \Dice\Dice();
+$dice = $dice->addRules(include __DIR__ . '/static/dependencies.config.php');
+
+$a = Factory\DependencyFactory::setUp('index', $dice, false);
 
 $a->runFrontend();
-

src/App.php

@@ -376,12 +376,10 @@ class App
 		$this->getMode()->determine($this->getBasePath());
 
 		if ($this->getMode()->has(App\Mode::DBAVAILABLE)) {
-			$this->profiler->update(
+			$this->profiler->update($this->config);
-				$this->config->get('system', 'profiler', false),
-				$this->config->get('rendertime', 'callstack', false));
 
 			Core\Hook::loadHooks();
-			$loader = new ConfigFileLoader($this->getBasePath(), $this->mode);
+			$loader = new ConfigFileLoader($this->getBasePath());
 			Core\Hook::callAll('load_config', $loader);
 		}
 

src/App/Mode.php

@@ -2,8 +2,9 @@
 
 namespace Friendica\App;
 
-use Friendica\Core\Config;
+use Friendica\Core\Config\Cache\ConfigCache;
-use Friendica\Database\DBA;
+use Friendica\Database\Database;
+use Friendica\Util\BasePath;
 
 /**
  * Mode of the current Friendica Node
@@ -28,9 +29,21 @@ class Mode
 	 */
 	private $basepath;
 
-	public function __construct($basepath = '')
+	/**
+	 * @var Database
+	 */
+	private $database;
+
+	/**
+	 * @var ConfigCache
+	 */
+	private $configCache;
+
+	public function __construct(BasePath $basepath, Database $database, ConfigCache $configCache)
 	{
-		$this->basepath = $basepath;
+		$this->basepath    = $basepath->getPath();
+		$this->database    = $database;
+		$this->configCache = $configCache;
 		$this->mode        = 0;
 	}
 
@@ -41,13 +54,16 @@ class Mode
 	 * - App::MODE_MAINTENANCE: The maintenance mode has been set
 	 * - App::MODE_NORMAL     : Normal run with all features enabled
 	 *
-	 * @param string $basepath the Basepath of the Application
+	 * @param string $basePath the Basepath of the Application
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 *
+	 * @return Mode returns itself
+	 *
+	 * @throws \Exception
 	 */
-	public function determine($basepath = null)
+	public function determine($basePath = null)
 	{
-		if (!empty($basepath)) {
+		if (!empty($basePath)) {
-			$this->basepath = $basepath;
+			$this->basepath = $basePath;
 		}
 
 		$this->mode = 0;
@@ -55,28 +71,33 @@ class Mode
 		if (!file_exists($this->basepath . '/config/local.config.php')
 		    && !file_exists($this->basepath . '/config/local.ini.php')
 		    && !file_exists($this->basepath . '/.htconfig.php')) {
-			return;
+			return $this;
 		}
 
 		$this->mode |= Mode::LOCALCONFIGPRESENT;
 
-		if (!DBA::connected()) {
+		if (!$this->database->connected()) {
-			return;
+			return $this;
 		}
 
 		$this->mode |= Mode::DBAVAILABLE;
 
-		if (DBA::fetchFirst("SHOW TABLES LIKE 'config'") === false) {
+		if ($this->database->fetchFirst("SHOW TABLES LIKE 'config'") === false) {
-			return;
+			return $this;
 		}
 
 		$this->mode |= Mode::DBCONFIGAVAILABLE;
 
-		if (Config::get('system', 'maintenance')) {
+		if (!empty($this->configCache->get('system', 'maintenance')) ||
-			return;
+		    // Don't use Config or Configuration here because we're possibly BEFORE initializing the Configuration,
+		    // so this could lead to a dependency circle
+		    !empty($this->database->selectFirst('config', ['v'], ['cat' => 'system', 'k' => 'maintenance'])['v'])) {
+			return $this;
 		}
 
 		$this->mode |= Mode::MAINTENANCEDISABLED;
+
+		return $this;
 	}
 
 	/**

src/App/Router.php

@@ -220,13 +220,9 @@ class Router
 		$this->routeCollector->addRoute(['GET'],         '/xrd',                 Module\Xrd::class);
 	}
 
-	public function __construct(RouteCollector $routeCollector = null)
+	public function __construct()
 	{
-		if (!$routeCollector) {
+		$this->routeCollector = new RouteCollector(new Std(), new GroupCountBased());
-			$routeCollector = new RouteCollector(new Std(), new GroupCountBased());
-		}
-
-		$this->routeCollector = $routeCollector;
 	}
 
 	public function getRouteCollector()

src/Console/AutomaticInstallation.php

@@ -79,7 +79,8 @@ HELP;
 		$installer = new Installer();
 
 		$configCache = $a->getConfigCache();
-		$installer->setUpCache($configCache, BasePath::create($a->getBasePath(), $_SERVER));
+		$basepath = new BasePath($a->getBasePath());
+		$installer->setUpCache($configCache, $basepath->getPath());
 
 		$this->out(" Complete!\n\n");
 

src/Core/Installer.php

@@ -7,8 +7,8 @@ namespace Friendica\Core;
 use DOMDocument;
 use Exception;
 use Friendica\Core\Config\Cache\ConfigCache;
+use Friendica\Database\Database;
 use Friendica\Database\DBStructure;
-use Friendica\Factory\DBFactory;
 use Friendica\Object\Image;
 use Friendica\Util\Logger\VoidLogger;
 use Friendica\Util\Network;
@@ -600,7 +600,7 @@ class Installer
 	 */
 	public function checkDB(ConfigCache $configCache, Profiler $profiler)
 	{
-		$database = DBFactory::init($configCache, $profiler, [], new VoidLogger());
+		$database = new Database($configCache, $profiler, new VoidLogger());
 
 		if ($database->connected()) {
 			if (DBStructure::existsTable('user')) {

src/Core/L10n/L10n.php

@@ -2,6 +2,7 @@
 
 namespace Friendica\Core\L10n;
 
+use Friendica\Core\Config\Configuration;
 use Friendica\Core\Hook;
 use Friendica\Core\Session;
 use Friendica\Database\Database;
@@ -52,12 +53,12 @@ class L10n
 	 */
 	private $logger;
 
-	public function __construct(string $lang, Database $dba, LoggerInterface $logger)
+	public function __construct(Configuration $config, Database $dba, LoggerInterface $logger)
 	{
 		$this->dba    = $dba;
 		$this->logger = $logger;
 
-		$this->loadTranslationTable($lang);
+		$this->loadTranslationTable(L10n::detectLanguage($config->get('system', 'language', 'en')));
 
 		\Friendica\Core\L10n::init($this);
 	}

src/Database/Database.php

@@ -9,7 +9,6 @@ use Friendica\Util\Profiler;
 use mysqli;
 use mysqli_result;
 use mysqli_stmt;
-use ParagonIE\HiddenString\HiddenString;
 use PDO;
 use PDOException;
 use PDOStatement;
@@ -46,30 +45,47 @@ class Database
 	private $in_transaction = false;
 	private $in_retrial     = false;
 	private $relation       = [];
-	private $db_serveraddr;
-	private $db_user;
-	/**
-	 * @var HiddenString
-	 */
-	private $db_pass;
-	private $db_name;
-	private $db_charset;
 
-	public function __construct(ConfigCache $configCache, Profiler $profiler, LoggerInterface $logger, $serveraddr, $user, HiddenString $pass, $db, $charset = null)
+	public function __construct(ConfigCache $configCache, Profiler $profiler, LoggerInterface $logger, array $server = [])
 	{
 		// We are storing these values for being able to perform a reconnect
 		$this->configCache   = $configCache;
 		$this->profiler      = $profiler;
 		$this->logger        = $logger;
-		$this->db_serveraddr = $serveraddr;
-		$this->db_user       = $user;
-		$this->db_pass       = $pass;
-		$this->db_name       = $db;
-		$this->db_charset    = $charset;
 
+		$this->readServerVariables($server);
 		$this->connect();
 
 		DBA::init($this);
+
+		if ($this->isConnected()) {
+			// Loads DB_UPDATE_VERSION constant
+			DBStructure::definition($configCache->get('system', 'basepath'), false);
+		}
+	}
+
+	private function readServerVariables(array $server)
+	{
+		// Use environment variables for mysql if they are set beforehand
+		if (!empty($server['MYSQL_HOST'])
+		    && !empty($server['MYSQL_USERNAME'] || !empty($server['MYSQL_USER']))
+		    && $server['MYSQL_PASSWORD'] !== false
+		    && !empty($server['MYSQL_DATABASE']))
+		{
+			$db_host = $server['MYSQL_HOST'];
+			if (!empty($server['MYSQL_PORT'])) {
+				$db_host .= ':' . $server['MYSQL_PORT'];
+			}
+			$this->configCache->set('database', 'hostname', $db_host);
+			unset($db_host);
+			if (!empty($server['MYSQL_USERNAME'])) {
+				$this->configCache->set('database', 'username', $server['MYSQL_USERNAME']);
+			} else {
+				$this->configCache->set('database', 'username', $server['MYSQL_USER']);
+			}
+			$this->configCache->set('database', 'password', (string) $server['MYSQL_PASSWORD']);
+			$this->configCache->set('database', 'database', $server['MYSQL_DATABASE']);
+		}
 	}
 
 	public function connect()
@@ -79,20 +95,17 @@ class Database
 		}
 
 		$port       = 0;
-		$serveraddr = trim($this->db_serveraddr);
+		$serveraddr = trim($this->configCache->get('database', 'hostname'));
-
 		$serverdata = explode(':', $serveraddr);
 		$server     = $serverdata[0];
-
 		if (count($serverdata) > 1) {
 			$port = trim($serverdata[1]);
 		}
-
 		$server  = trim($server);
-		$user    = trim($this->db_user);
+		$user    = trim($this->configCache->get('database', 'username'));
-		$pass    = trim($this->db_pass);
+		$pass    = trim($this->configCache->get('database', 'password'));
-		$db      = trim($this->db_name);
+		$db      = trim($this->configCache->get('database', 'database'));
-		$charset = trim($this->db_charset);
+		$charset = trim($this->configCache->get('database', 'charset'));
 
 		if (!(strlen($server) && strlen($user))) {
 			return false;

src/Factory/ConfigFactory.php

@@ -5,9 +5,9 @@ namespace Friendica\Factory;
 use Friendica\Core;
 use Friendica\Core\Config;
 use Friendica\Core\Config\Cache;
-use Friendica\Util\ConfigFileLoader;
 use Friendica\Model\Config\Config as ConfigModel;
 use Friendica\Model\Config\PConfig as PConfigModel;
+use Friendica\Util\ConfigFileLoader;
 
 class ConfigFactory
 {
@@ -16,7 +16,7 @@ class ConfigFactory
 	 *
 	 * @return Cache\ConfigCache
 	 */
-	public static function createCache(ConfigFileLoader $loader)
+	public function createCache(ConfigFileLoader $loader)
 	{
 		$configCache = new Cache\ConfigCache();
 		$loader->setupCache($configCache);
@@ -30,7 +30,7 @@ class ConfigFactory
 	 *
 	 * @return Config\Configuration
 	 */
-	public static function createConfig(Cache\ConfigCache $configCache, ConfigModel $configModel)
+	public function createConfig(Cache\ConfigCache $configCache, ConfigModel $configModel)
 	{
 		if ($configCache->get('system', 'config_adapter') === 'preload') {
 			$configuration = new Config\PreloadConfiguration($configCache, $configModel);
@@ -52,7 +52,7 @@ class ConfigFactory
 	 *
 	 * @return Config\PConfiguration
 	 */
-	public static function createPConfig(Cache\ConfigCache $configCache, Cache\PConfigCache $pConfigCache, PConfigModel $configModel)
+	public function createPConfig(Cache\ConfigCache $configCache, Cache\PConfigCache $pConfigCache, PConfigModel $configModel)
 	{
 		if ($configCache->get('system', 'config_adapter') === 'preload') {
 			$configuration = new Config\PreloadPConfiguration($pConfigCache, $configModel);

src/Factory/DBFactory.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace Friendica\Factory;
-
-use Friendica\Core\Config\Cache;
-use Friendica\Database;
-use Friendica\Util\Logger\VoidLogger;
-use Friendica\Util\Profiler;
-use ParagonIE\HiddenString\HiddenString;
-
-class DBFactory
-{
-	/**
-	 * Initialize the DBA connection
-	 *
-	 * @param Cache\ConfigCache $configCache The configuration cache
-	 * @param Profiler          $profiler    The profiler
-	 * @param array             $server      The $_SERVER variables
-	 *
-	 * @return Database\Database
-	 * @throws \Exception if connection went bad
-	 */
-	public static function init(Cache\ConfigCache $configCache, Profiler $profiler, array $server)
-	{
-		$db_host = $configCache->get('database', 'hostname');
-		$db_user = $configCache->get('database', 'username');
-		$db_pass = $configCache->get('database', 'password');
-		$db_data = $configCache->get('database', 'database');
-		$charset = $configCache->get('database', 'charset');
-
-		// Use environment variables for mysql if they are set beforehand
-		if (!empty($server['MYSQL_HOST'])
-			&& !empty($server['MYSQL_USERNAME'] || !empty($server['MYSQL_USER']))
-			&& $server['MYSQL_PASSWORD'] !== false
-			&& !empty($server['MYSQL_DATABASE']))
-		{
-			$db_host = $server['MYSQL_HOST'];
-			if (!empty($server['MYSQL_PORT'])) {
-				$db_host .= ':' . $server['MYSQL_PORT'];
-			}
-			if (!empty($server['MYSQL_USERNAME'])) {
-				$db_user = $server['MYSQL_USERNAME'];
-			} else {
-				$db_user = $server['MYSQL_USER'];
-			}
-			$db_pass = new HiddenString((string) $server['MYSQL_PASSWORD']);
-			$db_data = $server['MYSQL_DATABASE'];
-		}
-
-		$database = new Database\Database($configCache, $profiler, new VoidLogger(), $db_host, $db_user, $db_pass, $db_data, $charset);
-
-		if ($database->connected()) {
-			// Loads DB_UPDATE_VERSION constant
-			Database\DBStructure::definition($configCache->get('system', 'basepath'), false);
-		}
-
-		unset($db_host, $db_user, $db_pass, $db_data, $charset);
-
-		return $database;
-	}
-}

src/Factory/DependencyFactory.php

@@ -2,13 +2,10 @@
 
 namespace Friendica\Factory;
 
+use Dice\Dice;
 use Friendica\App;
-use Friendica\Core\Config\Cache\PConfigCache;
+use Friendica\Core\Config\PConfiguration;
-use Friendica\Core\L10n\L10n;
+use Psr\Log\LoggerInterface;
-use Friendica\Factory;
-use Friendica\Util\BasePath;
-use Friendica\Util\BaseURL;
-use Friendica\Util\ConfigFileLoader;
 
 class DependencyFactory
 {
@@ -16,34 +13,18 @@ class DependencyFactory
 	 * Setting all default-dependencies of a friendica execution
 	 *
 	 * @param string $channel   The channel of this execution
-	 * @param string $directory The base directory
 	 * @param bool   $isBackend True, if it's a backend execution, otherwise false (Default true)
 	 *
 	 * @return App The application
 	 *
 	 * @throws \Exception
 	 */
-	public static function setUp($channel, $directory, $isBackend = true)
+	public static function setUp($channel, Dice $dice, $isBackend = true)
 	{
-		$basePath = BasePath::create($directory, $_SERVER);
+		$pConfig = $dice->create(PConfiguration::class);
-		$mode = new App\Mode($basePath);
+		$logger = $dice->create(LoggerInterface::class, [$channel]);
-		$router = new App\Router();
+		$devLogger = $dice->create('$devLogger', [$channel]);
-		$configLoader = new ConfigFileLoader($basePath, $mode);
-		$configCache = Factory\ConfigFactory::createCache($configLoader);
-		$profiler = Factory\ProfilerFactory::create($configCache);
-		$database = Factory\DBFactory::init($configCache, $profiler, $_SERVER);
-		$configModel = new \Friendica\Model\Config\Config($database);
-		$config = Factory\ConfigFactory::createConfig($configCache, $configModel);
-		// needed to call PConfig::init()
-		$pconfigModel = new \Friendica\Model\Config\PConfig($database);
-		Factory\ConfigFactory::createPConfig($configCache, new PConfigCache(), $pconfigModel);
-		$logger = Factory\LoggerFactory::create($channel, $database, $config, $profiler);
-		Factory\LoggerFactory::createDev($channel, $config, $profiler);
-		$baseURL = new BaseURL($config, $_SERVER);
-		$l10n = new L10n(L10n::detectLanguage($config->get('system', 'language')),
-			$database,
-			$logger);
 
-		return new App($database, $config, $mode, $router, $baseURL, $logger, $profiler, $l10n, $isBackend);
+		return $dice->create(App::class, [$isBackend]);
 	}
 }

src/Factory/LoggerFactory.php

@@ -48,7 +48,7 @@ class LoggerFactory
 	 * @throws \Exception
 	 * @throws InternalServerErrorException
 	 */
-	public static function create($channel, Database $database, Configuration $config, Profiler $profiler)
+	public function create($channel, Database $database, Configuration $config, Profiler $profiler)
 	{
 		if (empty($config->get('system', 'debugging', false))) {
 			$logger = new VoidLogger();

src/Factory/ProfilerFactory.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Friendica\Factory;
-
-use Friendica\Core\Config\Cache\ConfigCache;
-use Friendica\Util\Profiler;
-
-class ProfilerFactory
-{
-	/**
-	 * Creates a Profiler for the current execution
-	 *
-	 * @param ConfigCache     $configCache The configuration cache
-	 *
-	 * @return Profiler
-	 */
-	public static function create(ConfigCache $configCache)
-	{
-		$enabled = $configCache->get('system', 'profiler');
-		$enabled = isset($enabled) && $enabled !== '0';
-		$renderTime = $configCache->get('rendertime', 'callstack');
-		$renderTime = isset($renderTime) && $renderTime !== '0';
-
-		return new Profiler($enabled, $renderTime);
-	}
-}

src/Module/Install.php

@@ -67,7 +67,8 @@ class Install extends BaseModule
 
 		// get basic installation information and save them to the config cache
 		$configCache = $a->getConfigCache();
-		self::$installer->setUpCache($configCache, BasePath::create($a->getBasePath(), $_SERVER));
+		$basePath = new BasePath($a->getBasePath());
+		self::$installer->setUpCache($configCache, $basePath->getPath());
 
 		// We overwrite current theme css, because during install we may not have a working mod_rewrite
 		// so we may not have a css at all. Here we set a static css file for the install procedure pages

src/Util/BasePath.php

@@ -4,36 +4,55 @@ namespace Friendica\Util;
 
 class BasePath
 {
+	/**
+	 * @var string
+	 */
+	private $baseDir;
+	/**
+	 * @var array
+	 */
+	private $server;
+
+	/**
+	 * @param string|null $baseDir The default base path
+	 * @param array       $server  server arguments
+	 */
+	public function __construct(string $baseDir, array $server = [])
+	{
+		$this->baseDir = $baseDir;
+		$this->server = $server;
+	}
+
 	/**
 	 * @brief Returns the base filesystem path of the App
 	 *
 	 * It first checks for the internal variable, then for DOCUMENT_ROOT and
 	 * finally for PWD
 	 *
-	 * @param string|null $basePath The default base path
-	 * @param array       $server   server arguments
-	 *
 	 * @return string
 	 *
 	 * @throws \Exception if directory isn't usable
 	 */
-	public static function create($basePath, array $server = [])
+	public function getPath()
 	{
-		if ((!$basePath || !is_dir($basePath)) && !empty($server['DOCUMENT_ROOT'])) {
+		$baseDir = $this->baseDir;
-			$basePath = $server['DOCUMENT_ROOT'];
+		$server = $this->server;
+
+		if ((!$baseDir || !is_dir($baseDir)) && !empty($server['DOCUMENT_ROOT'])) {
+			$baseDir = $server['DOCUMENT_ROOT'];
 		}
 
-		if ((!$basePath || !is_dir($basePath)) && !empty($server['PWD'])) {
+		if ((!$baseDir || !is_dir($baseDir)) && !empty($server['PWD'])) {
-			$basePath = $server['PWD'];
+			$baseDir = $server['PWD'];
 		}
 
-		$basePath = self::getRealPath($basePath);
+		$baseDir = self::getRealPath($baseDir);
 
-		if (!is_dir($basePath)) {
+		if (!is_dir($baseDir)) {
-			throw new \Exception(sprintf('\'%s\' is not a valid basepath', $basePath));
+			throw new \Exception(sprintf('\'%s\' is not a valid basepath', $baseDir));
 		}
 
-		return $basePath;
+		return $baseDir;
 	}
 
 	/**

src/Util/ConfigFileLoader.php

@@ -3,7 +3,6 @@
 namespace Friendica\Util;
 
 use Exception;
-use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\Config\Cache\ConfigCache;
 
@@ -52,10 +51,6 @@ class ConfigFileLoader
 	 */
 	const SAMPLE_END = '-sample';
 
-	/**
-	 * @var App\Mode
-	 */
-	private $appMode;
 	/**
 	 * @var string
 	 */
@@ -69,12 +64,11 @@ class ConfigFileLoader
 	 */
 	private $staticDir;
 
-	public function __construct($baseDir, App\Mode $mode)
+	public function __construct(string $basePath)
 	{
-		$this->baseDir   = $baseDir;
+		$this->baseDir   = $basePath;
-		$this->configDir = $baseDir . DIRECTORY_SEPARATOR . self::CONFIG_DIR;
+		$this->configDir = $this->baseDir . DIRECTORY_SEPARATOR . self::CONFIG_DIR;
-		$this->staticDir = $baseDir . DIRECTORY_SEPARATOR . self::STATIC_DIR;
+		$this->staticDir = $this->baseDir . DIRECTORY_SEPARATOR . self::STATIC_DIR;
-		$this->appMode   = $mode;
 	}
 
 	/**
@@ -102,7 +96,7 @@ class ConfigFileLoader
 		$this->loadCoreConfig($config);
 
 		// In case of install mode, add the found basepath (because there isn't a basepath set yet
-		if (!$raw && ($this->appMode->isInstall() || empty($config->get('system', 'basepath')))) {
+		if (!$raw && empty($config->get('system', 'basepath'))) {
 			// Setting at least the basepath we know
 			$config->set('system', 'basepath', $this->baseDir);
 		}

src/Util/Profiler.php

@@ -2,6 +2,8 @@
 
 namespace Friendica\Util;
 
+use Friendica\Core\Config\Cache\ConfigCache;
+use Friendica\Core\Config\Configuration;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
@@ -45,23 +47,21 @@ class Profiler implements ContainerInterface
 	/**
 	 * Updates the enabling of the current profiler
 	 *
-	 * @param bool $enabled
+	 * @param Configuration $config
-	 * @param bool $renderTime
 	 */
-	public function update($enabled = false, $renderTime = false)
+	public function update(Configuration $config)
 	{
-		$this->enabled = $enabled;
+		$this->enabled = $config->get('system', 'profiler');
-		$this->rendertime = $renderTime;
+		$this->rendertime = $config->get('rendertime', 'callstack');
 	}
 
 	/**
-	 * @param bool $enabled           True, if the Profiler is enabled
+	 * @param ConfigCache $configCache The configuration cache
-	 * @param bool $renderTime        True, if the Profiler should measure the whole rendertime including functions
 	 */
-	public function __construct($enabled = false, $renderTime = false)
+	public function __construct(ConfigCache $configCache)
 	{
-		$this->enabled = $enabled;
+		$this->enabled = $configCache->get('system', 'profiler');
-		$this->rendertime = $renderTime;
+		$this->rendertime = $configCache->get('rendertime', 'callstack');
 		$this->reset();
 	}
 

static/dependencies.config.php

@@ -0,0 +1,125 @@
+<?php
+
+use Dice\Dice;
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Database\Database;
+use Friendica\Factory;
+use Friendica\Util;
+use Psr\Log\LoggerInterface;
+
+/**
+ * The configuration defines "complex" dependencies inside Friendica
+ * So this classes shouldn't be simple or their dependencies are already defined here.
+ *
+ * This kind of dependencies are NOT required to be defined here:
+ *   - $a = new ClassA(new ClassB());
+ *   - $a = new ClassA();
+ *   - $a = new ClassA(Configuration $configuration);
+ *
+ * This kind of dependencies SHOULD be defined here:
+ *   - $a = new ClassA();
+ *     $b = $a->create();
+ *
+ *   - $a = new ClassA($creationPassedVariable);
+ *
+ */
+return [
+	'$basepath' => [
+		'instanceOf' => Util\BasePath::class,
+		'call' => [
+			['getPath', [], Dice::CHAIN_CALL],
+		],
+		'constructParams' => [
+			dirname(__FILE__, 2),
+			$_SERVER
+		]
+	],
+	Util\BasePath::class => [
+		'shared'          => true,
+		'constructParams' => [
+			dirname(__FILE__, 2),
+			$_SERVER
+		]
+	],
+	Util\ConfigFileLoader::class => [
+		'shared' => true,
+		'constructParams' => [
+			[Dice::INSTANCE => '$basepath'],
+		],
+	],
+	Config\Cache\ConfigCache::class => [
+		'instanceOf' => Factory\ConfigFactory::class,
+		'call'       => [
+			['createCache', [], Dice::CHAIN_CALL],
+		],
+		'shared'     => true,
+	],
+	App\Mode::class => [
+		'call'   => [
+			['determine', [], Dice::CHAIN_CALL],
+		],
+		// marks the result as shared for other creations, so there's just
+		// one instance for the whole execution
+		'shared' => true,
+	],
+	Config\Configuration::class => [
+		'shared' => true,
+		'instanceOf' => Factory\ConfigFactory::class,
+		'call' => [
+			['createConfig', [], Dice::CHAIN_CALL],
+		],
+	],
+	Config\PConfiguration::class => [
+		'shared' => true,
+		'instanceOf' => Factory\ConfigFactory::class,
+		'call' => [
+			['createPConfig', [], Dice::CHAIN_CALL],
+		]
+	],
+	Database::class => [
+		'shared' => true,
+		'constructParams' => [
+			[DICE::INSTANCE => \Psr\Log\NullLogger::class],
+			$_SERVER,
+		],
+	],
+	/**
+	 * Creates the Util\BaseURL
+	 *
+	 * Same as:
+	 *   $baseURL = new Util\BaseURL($configuration, $_SERVER);
+	 */
+	Util\BaseURL::class => [
+		'shared'          => true,
+		'constructParams' => [
+			$_SERVER,
+		],
+	],
+	/**
+	 * Create a Logger, which implements the LoggerInterface
+	 *
+	 * Same as:
+	 *   $loggerFactory = new Factory\LoggerFactory();
+	 *   $logger = $loggerFactory->create($channel, $configuration, $profiler);
+	 *
+	 * Attention1: We can use DICE for detecting dependencies inside "chained" calls too
+	 * Attention2: The variable "$channel" is passed inside the creation of the dependencies per:
+	 *    $app = $dice->create(App::class, [], ['$channel' => 'index']);
+	 *    and is automatically passed as an argument with the same name
+	 */
+	LoggerInterface::class => [
+		'shared'     => true,
+		'instanceOf' => Factory\LoggerFactory::class,
+		'call'       => [
+			['create', [], Dice::CHAIN_CALL],
+		],
+	],
+	'$devLogger' => [
+		'shared'     => true,
+		'instanceOf' => Factory\LoggerFactory::class,
+		'call'       => [
+			['createDev', [], Dice::CHAIN_CALL],
+		]
+	]
+];

tests/DatabaseTest.php

@@ -9,14 +9,13 @@ use Friendica\App\Mode;
 use Friendica\Core\Config\Cache\ConfigCache;
 use Friendica\Database\Database;
 use Friendica\Factory\ConfigFactory;
-use Friendica\Factory\DBFactory;
-use Friendica\Factory\ProfilerFactory;
 use Friendica\Util\BasePath;
 use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\Profiler;
 use PHPUnit\DbUnit\DataSet\YamlDataSet;
 use PHPUnit\DbUnit\TestCaseTrait;
 use PHPUnit_Extensions_Database_DB_IDatabaseConnection;
+use Psr\Log\NullLogger;
 
 require_once __DIR__ . '/../boot.php';
 
@@ -46,12 +45,13 @@ abstract class DatabaseTest extends MockedTest
 	{
 		parent::setUpBeforeClass();
 
-		self::$basePath = BasePath::create(dirname(__DIR__));
+		self::$basePath = new BasePath(dirname(__DIR__));
-		self::$mode = new Mode(self::$basePath);
+		$configLoader = new ConfigFileLoader(self::$basePath->getPath());
-		$configLoader = new ConfigFileLoader(self::$basePath, self::$mode);
+		$configFactory = new ConfigFactory();
-		self::$configCache = ConfigFactory::createCache($configLoader);
+		self::$configCache = $configFactory->createCache($configLoader);
-		self::$profiler = ProfilerFactory::create(self::$configCache);
+		self::$profiler = new Profiler(self::$configCache);
-		self::$dba = DBFactory::init(self::$configCache, self::$profiler, $_SERVER);
+		self::$dba = new Database(self::$configCache, self::$profiler, new NullLogger(), $_SERVER);
+		self::$mode = new Mode(self::$basePath, self::$dba, self::$configCache);
 	}
 
 	/**

tests/functional/DependencyCheckTest.php

@@ -0,0 +1,136 @@
+<?php
+
+namespace functional;
+
+use Dice\Dice;
+use Friendica\App;
+use Friendica\Core\Config\Cache\ConfigCache;
+use Friendica\Core\Config\Configuration;
+use Friendica\Database\Database;
+use Friendica\Test\Util\VFSTrait;
+use Friendica\Util\BasePath;
+use Friendica\Util\ConfigFileLoader;
+use Friendica\Util\Profiler;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+
+class dependencyCheck extends TestCase
+{
+	use VFSTrait;
+
+	/**
+	 * @var Dice
+	 */
+	private $dice;
+
+	protected function setUp()
+	{
+		parent::setUp();
+
+		$this->setUpVfsDir();
+
+		$this->dice = new Dice();
+		$this->dice = $this->dice->addRules(include __DIR__ . '/../../static/dependencies.config.php');
+	}
+
+	/**
+	 * Test the creation of the BasePath
+	 */
+	public function testBasePath()
+	{
+		/** @var BasePath $basePath */
+		$basePath = $this->dice->create(BasePath::class, [$this->root->url()]);
+
+		$this->assertInstanceOf(BasePath::class, $basePath);
+		$this->assertEquals($this->root->url(), $basePath->getPath());
+	}
+
+	/**
+	 * Test the initial config cache
+	 * Should not need any other files
+	 */
+	public function testConfigFileLoader()
+	{
+		/** @var ConfigFileLoader $configFileLoader */
+		$configFileLoader = $this->dice->create(ConfigFileLoader::class);
+
+		$this->assertInstanceOf(ConfigFileLoader::class, $configFileLoader);
+
+		$configCache = new ConfigCache();
+		$configFileLoader->setupCache($configCache);
+
+		$this->assertNotEmpty($configCache->getAll());
+		$this->assertArrayHasKey('database', $configCache->getAll());
+		$this->assertArrayHasKey('system', $configCache->getAll());
+	}
+
+	/**
+	 * Test the construction of a profiler class with DI
+	 */
+	public function testProfiler()
+	{
+		/** @var Profiler $profiler */
+		$profiler = $this->dice->create(Profiler::class);
+
+		$this->assertInstanceOf(Profiler::class, $profiler);
+
+		$configCache = new ConfigCache([
+			'system' => [
+				'profiler' => true,
+			],
+			'rendertime' => [
+				'callstack' => true,
+			]
+		]);
+
+		$profiler = $this->dice->create(Profiler::class, [$configCache]);
+
+		$this->assertInstanceOf(Profiler::class, $profiler);
+		$this->assertTrue($profiler->isRendertime());
+	}
+
+	public function testDatabase()
+	{
+		/** @var Database $database */
+		$database = $this->dice->create(Database::class);
+
+		$this->assertInstanceOf(Database::class, $database);
+		$this->assertTrue($database->connected());
+	}
+
+	public function testAppMode()
+	{
+		/** @var App\Mode $mode */
+		$mode = $this->dice->create(App\Mode::class);
+
+		$this->assertInstanceOf(App\Mode::class, $mode);
+
+		$this->assertTrue($mode->isNormal());
+	}
+
+	public function testConfiguration()
+	{
+		/** @var Configuration $config */
+		$config = $this->dice->create(Configuration::class);
+
+		$this->assertInstanceOf(Configuration::class, $config);
+
+		$this->assertNotEmpty($config->get('database', 'username'));
+	}
+
+	public function testLogger()
+	{
+		/** @var LoggerInterface $logger */
+		$logger = $this->dice->create(LoggerInterface::class, ['test']);
+
+		$this->assertInstanceOf(LoggerInterface::class, $logger);
+	}
+
+	public function testDevLogger()
+	{
+		/** @var LoggerInterface $logger */
+		$logger = $this->dice->create('$devLogger', ['dev']);
+
+		self::assertInstanceOf(LoggerInterface::class, $logger);
+	}
+}

tests/include/ApiTest.php

@@ -15,7 +15,6 @@ use Friendica\Core\System;
 use Friendica\Factory;
 use Friendica\Network\HTTPException;
 use Friendica\Util\BaseURL;
-use Friendica\Util\ConfigFileLoader;
 use Monolog\Handler\TestHandler;
 
 require_once __DIR__ . '/../../include/api.php';
@@ -51,13 +50,15 @@ class ApiTest extends DatabaseTest
 	public function setUp()
 	{
 		$configModel = new \Friendica\Model\Config\Config(self::$dba);
-		$config = Factory\ConfigFactory::createConfig(self::$configCache, $configModel);
+		$configFactory = new Factory\ConfigFactory();
+		$config = $configFactory->createConfig(self::$configCache, $configModel);
 		$pconfigModel = new \Friendica\Model\Config\PConfig(self::$dba);
-		Factory\ConfigFactory::createPConfig(self::$configCache, new PConfigCache(), $pconfigModel);
+		$configFactory->createPConfig(self::$configCache, new PConfigCache(), $pconfigModel);
-		$logger = Factory\LoggerFactory::create('test', self::$dba, $config, self::$profiler);
+		$loggerFactory = new Factory\LoggerFactory();
+		$logger = $loggerFactory->create('test', self::$dba, $config, self::$profiler);
 		$baseUrl = new BaseURL($config, $_SERVER);
 		$router = new App\Router();
-		$l10n = new L10n(L10n::detectLanguage($config->get('system', 'language')),
+		$l10n = new L10n($config,
 			self::$dba,
 			$logger);
 		$this->app = new App(self::$dba, $config, self::$mode, $router, $baseUrl, $logger, self::$profiler, $l10n, false);

tests/src/App/ModeTest.php

@@ -4,32 +4,56 @@ namespace Friendica\Test\src\App;
 
 use Friendica\App\Mode;
 use Friendica\Core\Config;
+use Friendica\Database\Database;
 use Friendica\Test\MockedTest;
 use Friendica\Test\Util\DBAMockTrait;
 use Friendica\Test\Util\VFSTrait;
+use Friendica\Util\BasePath;
+use Mockery\MockInterface;
 
 class ModeTest extends MockedTest
 {
 	use VFSTrait;
 	use DBAMockTrait;
 
+	/**
+	 * @var BasePath|MockInterface
+	 */
+	private $basePathMock;
+
+	/**
+	 * @var Database|MockInterface
+	 */
+	private $databaseMock;
+
+	/**
+	 * @var Config\Cache\ConfigCache|MockInterface
+	 */
+	private $configCacheMock;
+
 	public function setUp()
 	{
 		parent::setUp();
 
 		$this->setUpVfsDir();
+
+		$this->basePathMock = \Mockery::mock(BasePath::class);
+		$this->basePathMock->shouldReceive('getPath')->andReturn($this->root->url())->once();
+
+		$this->databaseMock = \Mockery::mock(Database::class);
+		$this->configCacheMock = \Mockery::mock(Config\Cache\ConfigCache::class);
 	}
 
 	public function testItEmpty()
 	{
-		$mode = new Mode($this->root->url());
+		$mode = new Mode($this->basePathMock, $this->databaseMock, $this->configCacheMock);
 		$this->assertTrue($mode->isInstall());
 		$this->assertFalse($mode->isNormal());
 	}
 
 	public function testWithoutConfig()
 	{
-		$mode = new Mode($this->root->url());
+		$mode = new Mode($this->basePathMock, $this->databaseMock, $this->configCacheMock);
 
 		$this->assertTrue($this->root->hasChild('config/local.config.php'));
 
@@ -45,15 +69,11 @@ class ModeTest extends MockedTest
 		$this->assertFalse($mode->has(Mode::LOCALCONFIGPRESENT));
 	}
 
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState disabled
-	 */
 	public function testWithoutDatabase()
 	{
-		$this->mockConnected(false, 1);
+		$this->databaseMock->shouldReceive('connected')->andReturn(false)->once();
 
-		$mode = new Mode($this->root->url());
+		$mode = new Mode($this->basePathMock, $this->databaseMock, $this->configCacheMock);
 		$mode->determine();
 
 		$this->assertFalse($mode->isNormal());
@@ -63,16 +83,13 @@ class ModeTest extends MockedTest
 		$this->assertFalse($mode->has(Mode::DBAVAILABLE));
 	}
 
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState disabled
-	 */
 	public function testWithoutDatabaseSetup()
 	{
-		$this->mockConnected(true, 1);
+		$this->databaseMock->shouldReceive('connected')->andReturn(true)->once();
-		$this->mockFetchFirst('SHOW TABLES LIKE \'config\'', false, 1);
+		$this->databaseMock->shouldReceive('fetchFirst')
+		                   ->with('SHOW TABLES LIKE \'config\'')->andReturn(false)->once();
 
-		$mode = new Mode($this->root->url());
+		$mode = new Mode($this->basePathMock, $this->databaseMock, $this->configCacheMock);
 		$mode->determine();
 
 		$this->assertFalse($mode->isNormal());
@@ -81,25 +98,15 @@ class ModeTest extends MockedTest
 		$this->assertTrue($mode->has(Mode::LOCALCONFIGPRESENT));
 	}
 
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState disabled
-	 */
 	public function testWithMaintenanceMode()
 	{
-		$this->mockConnected(true, 1);
+		$this->databaseMock->shouldReceive('connected')->andReturn(true)->once();
-		$this->mockFetchFirst('SHOW TABLES LIKE \'config\'', true, 1);
+		$this->databaseMock->shouldReceive('fetchFirst')
+		                   ->with('SHOW TABLES LIKE \'config\'')->andReturn(true)->once();
+		$this->configCacheMock->shouldReceive('get')->with('system', 'maintenance')
+		                      ->andReturn(true)->once();
 
-		$config = \Mockery::mock(Config\Configuration::class);
+		$mode = new Mode($this->basePathMock, $this->databaseMock, $this->configCacheMock);
-		$config
-			->shouldReceive('get')
-			->with('system', 'maintenance', null, false)
-			->andReturn(true)
-			->once();
-		// Initialize empty Config
-		Config::init($config);
-
-		$mode = new Mode($this->root->url());
 		$mode->determine();
 
 		$this->assertFalse($mode->isNormal());
@@ -109,25 +116,42 @@ class ModeTest extends MockedTest
 		$this->assertFalse($mode->has(Mode::MAINTENANCEDISABLED));
 	}
 
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState disabled
-	 */
 	public function testNormalMode()
 	{
-		$this->mockConnected(true, 1);
+		$this->databaseMock->shouldReceive('connected')->andReturn(true)->once();
-		$this->mockFetchFirst('SHOW TABLES LIKE \'config\'', true, 1);
+		$this->databaseMock->shouldReceive('fetchFirst')
+		                   ->with('SHOW TABLES LIKE \'config\'')->andReturn(true)->once();
+		$this->configCacheMock->shouldReceive('get')->with('system', 'maintenance')
+		                      ->andReturn(false)->once();
+		$this->databaseMock->shouldReceive('selectFirst')
+		                   ->with('config', ['v'], ['cat' => 'system', 'k' => 'maintenance'])
+		                   ->andReturn(['v' => null])->once();
 
-		$config = \Mockery::mock(Config\Configuration::class);
+		$mode = new Mode($this->basePathMock, $this->databaseMock, $this->configCacheMock);
-		$config
+		$mode->determine();
-			->shouldReceive('get')
-			->with('system', 'maintenance', null, false)
-			->andReturn(false)
-			->once();
-		// Initialize empty Config
-		Config::init($config);
 
-		$mode = new Mode($this->root->url());
+		$this->assertTrue($mode->isNormal());
+		$this->assertFalse($mode->isInstall());
+
+		$this->assertTrue($mode->has(Mode::DBCONFIGAVAILABLE));
+		$this->assertTrue($mode->has(Mode::MAINTENANCEDISABLED));
+	}
+
+	/**
+	 * Test explicit disabled maintenance (in case you manually disable it)
+	 */
+	public function testDisabledMaintenance()
+	{
+		$this->databaseMock->shouldReceive('connected')->andReturn(true)->once();
+		$this->databaseMock->shouldReceive('fetchFirst')
+		                   ->with('SHOW TABLES LIKE \'config\'')->andReturn(true)->once();
+		$this->configCacheMock->shouldReceive('get')->with('system', 'maintenance')
+		                      ->andReturn(false)->once();
+		$this->databaseMock->shouldReceive('selectFirst')
+		                   ->with('config', ['v'], ['cat' => 'system', 'k' => 'maintenance'])
+		                   ->andReturn(['v' => '0'])->once();
+
+		$mode = new Mode($this->basePathMock, $this->databaseMock, $this->configCacheMock);
 		$mode->determine();
 
 		$this->assertTrue($mode->isNormal());

tests/src/Database/DBATest.php

@@ -15,13 +15,15 @@ class DBATest extends DatabaseTest
 	public function setUp()
 	{
 		$configModel = new \Friendica\Model\Config\Config(self::$dba);
-		$config = Factory\ConfigFactory::createConfig(self::$configCache, $configModel);
+		$configFactory = new Factory\ConfigFactory();
+		$config = $configFactory->createConfig(self::$configCache, $configModel);
 		$pconfigModel = new \Friendica\Model\Config\PConfig(self::$dba);
-		Factory\ConfigFactory::createPConfig(self::$configCache, new PConfigCache(), $pconfigModel);
+		$configFactory->createPConfig(self::$configCache, new PConfigCache(), $pconfigModel);
-		$logger = Factory\LoggerFactory::create('test', self::$dba, $config, self::$profiler);
+		$loggerFactory = new Factory\LoggerFactory();
+		$logger = $loggerFactory->create('test', self::$dba, $config, self::$profiler);
 		$baseUrl = new BaseURL($config, $_SERVER);
 		$router = new App\Router();
-		$l10n = new L10n(L10n::detectLanguage($config->get('system', 'language')),
+		$l10n = new L10n($config,
 			self::$dba,
 			$logger);
 		$this->app = new App(self::$dba, $config, self::$mode, $router, $baseUrl, $logger, self::$profiler, $l10n, false);

tests/src/Database/DBStructureTest.php

@@ -19,13 +19,15 @@ class DBStructureTest extends DatabaseTest
 	public function setUp()
 	{
 		$configModel = new Config(self::$dba);
-		$config = Factory\ConfigFactory::createConfig(self::$configCache, $configModel);
+		$configFactory = new Factory\ConfigFactory();
+		$config = $configFactory->createConfig(self::$configCache, $configModel);
 		$pconfigModel = new \Friendica\Model\Config\PConfig(self::$dba);
-		Factory\ConfigFactory::createPConfig(self::$configCache, new PConfigCache(), $pconfigModel);
+		$configFactory->createPConfig(self::$configCache, new PConfigCache(), $pconfigModel);
-		$logger = Factory\LoggerFactory::create('test', self::$dba, $config, self::$profiler);
+		$loggerFactory = new Factory\LoggerFactory();
+		$logger = $loggerFactory->create('test', self::$dba, $config, self::$profiler);
 		$baseUrl = new BaseURL($config, $_SERVER);
 		$router = new App\Router();
-		$l10n = new L10n(L10n::detectLanguage($config->get('system', 'language')),
+		$l10n = new L10n($config,
 			self::$dba,
 			$logger);
 		$this->app = new App(self::$dba, $config, self::$mode, $router, $baseUrl, $logger, self::$profiler, $l10n, false);

tests/src/Util/BasePathTest.php

@@ -58,7 +58,8 @@ class BasePathTest extends MockedTest
 	 */
 	public function testDetermineBasePath(array $server, $input, $output)
 	{
-		$this->assertEquals($output, BasePath::create($input, $server));
+		$basepath = new BasePath($input, $server);
+		$this->assertEquals($output, $basepath->getPath());
 	}
 
 	/**
@@ -68,6 +69,7 @@ class BasePathTest extends MockedTest
 	 */
 	public function testFailedBasePath()
 	{
-		BasePath::create('/now23452sgfgas', []);
+		$basepath = new BasePath('/now23452sgfgas', []);
+		$basepath->getPath();
 	}
 }

tests/src/Util/Config/ConfigFileLoaderTest.php

@@ -2,31 +2,21 @@
 
 namespace Friendica\Test\src\Util\Config;
 
-use Friendica\App;
 use Friendica\Core\Config\Cache\ConfigCache;
 use Friendica\Test\MockedTest;
 use Friendica\Test\Util\VFSTrait;
 use Friendica\Util\ConfigFileLoader;
-use Mockery\MockInterface;
 use org\bovigo\vfs\vfsStream;
 
 class ConfigFileLoaderTest extends MockedTest
 {
 	use VFSTrait;
 
-	/**
-	 * @var App\Mode|MockInterface
-	 */
-	private $mode;
-
 	protected function setUp()
 	{
 		parent::setUp();
 
 		$this->setUpVfsDir();
-
-		$this->mode = \Mockery::mock(App\Mode::class);
-		$this->mode->shouldReceive('isInstall')->andReturn(true);
 	}
 
 	/**
@@ -34,7 +24,9 @@ class ConfigFileLoaderTest extends MockedTest
 	 */
 	public function testLoadConfigFiles()
 	{
-		$configFileLoader = new ConfigFileLoader($this->root->url(), $this->mode);
+		$this->delConfigFile('local.config.php');
+
+		$configFileLoader = new ConfigFileLoader($this->root->url());
 		$configCache = new ConfigCache();
 
 		$configFileLoader->setupCache($configCache);
@@ -55,7 +47,7 @@ class ConfigFileLoaderTest extends MockedTest
 			->at($this->root->getChild('config'))
 			->setContent('<?php return true;');
 
-		$configFileLoader = new ConfigFileLoader($this->root->url(), $this->mode);
+		$configFileLoader = new ConfigFileLoader($this->root->url());
 		$configCache = new ConfigCache();
 
 		$configFileLoader->setupCache($configCache);
@@ -79,7 +71,7 @@ class ConfigFileLoaderTest extends MockedTest
 			->at($this->root->getChild('config'))
 			->setContent(file_get_contents($file));
 
-		$configFileLoader = new ConfigFileLoader($this->root->url(), $this->mode);
+		$configFileLoader = new ConfigFileLoader($this->root->url());
 		$configCache = new ConfigCache();
 
 		$configFileLoader->setupCache($configCache);
@@ -111,7 +103,7 @@ class ConfigFileLoaderTest extends MockedTest
 			->at($this->root->getChild('config'))
 			->setContent(file_get_contents($file));
 
-		$configFileLoader = new ConfigFileLoader($this->root->url(), $this->mode);
+		$configFileLoader = new ConfigFileLoader($this->root->url());
 		$configCache = new ConfigCache();
 
 		$configFileLoader->setupCache($configCache);
@@ -142,7 +134,7 @@ class ConfigFileLoaderTest extends MockedTest
 			->at($this->root)
 			->setContent(file_get_contents($file));
 
-		$configFileLoader = new ConfigFileLoader($this->root->url(), $this->mode);
+		$configFileLoader = new ConfigFileLoader($this->root->url());
 		$configCache = new ConfigCache();
 
 		$configFileLoader->setupCache($configCache);
@@ -191,7 +183,7 @@ class ConfigFileLoaderTest extends MockedTest
 			->at($this->root->getChild('addon')->getChild('test')->getChild('config'))
 			->setContent(file_get_contents($file));
 
-		$configFileLoader = new ConfigFileLoader($this->root->url(), $this->mode);
+		$configFileLoader = new ConfigFileLoader($this->root->url());
 
 		$conf = $configFileLoader->loadAddonConfig('test');
 
@@ -223,7 +215,7 @@ class ConfigFileLoaderTest extends MockedTest
 				->at($this->root->getChild('config'))
 		         ->setContent(file_get_contents($fileDir . 'B.config.php'));
 
-		$configFileLoader = new ConfigFileLoader($this->root->url(), $this->mode);
+		$configFileLoader = new ConfigFileLoader($this->root->url());
 		$configCache = new ConfigCache();
 
 		$configFileLoader->setupCache($configCache);
@@ -252,7 +244,7 @@ class ConfigFileLoaderTest extends MockedTest
 		         ->at($this->root->getChild('config'))
 		         ->setContent(file_get_contents($fileDir . 'B.ini.php'));
 
-		$configFileLoader = new ConfigFileLoader($this->root->url(), $this->mode);
+		$configFileLoader = new ConfigFileLoader($this->root->url());
 		$configCache = new ConfigCache();
 
 		$configFileLoader->setupCache($configCache);
@@ -281,7 +273,7 @@ class ConfigFileLoaderTest extends MockedTest
 		         ->at($this->root->getChild('config'))
 		         ->setContent(file_get_contents($fileDir . 'B.ini.php'));
 
-		$configFileLoader = new ConfigFileLoader($this->root->url(), $this->mode);
+		$configFileLoader = new ConfigFileLoader($this->root->url());
 		$configCache = new ConfigCache();
 
 		$configFileLoader->setupCache($configCache);

tests/src/Util/ProfilerTest.php

@@ -2,6 +2,8 @@
 
 namespace Friendica\Test\src\Util;
 
+use Friendica\Core\Config\Cache\ConfigCache;
+use Friendica\Core\Config\Configuration;
 use Friendica\Test\MockedTest;
 use Friendica\Util\Profiler;
 use Mockery\MockInterface;
@@ -26,7 +28,12 @@ class ProfilerTest extends MockedTest
 	 */
 	public function testSetUp()
 	{
-		$profiler = new Profiler(true, true);
+		$configCache = \Mockery::mock(ConfigCache::class);
+		$configCache->shouldReceive('get')
+		            ->withAnyArgs()
+		            ->andReturn(true)
+		            ->twice();
+		$profiler = new Profiler($configCache);
 	}
 
 	/**
@@ -96,7 +103,13 @@ class ProfilerTest extends MockedTest
 	 */
 	public function testSaveTimestamp($timestamp, $name, array $functions)
 	{
-		$profiler = new Profiler(true, true);
+		$configCache = \Mockery::mock(ConfigCache::class);
+		$configCache->shouldReceive('get')
+		            ->withAnyArgs()
+		            ->andReturn(true)
+		            ->twice();
+
+		$profiler = new Profiler($configCache);
 
 		foreach ($functions as $function) {
 			$profiler->saveTimestamp($timestamp, $name, $function);
@@ -111,7 +124,13 @@ class ProfilerTest extends MockedTest
 	 */
 	public function testReset($timestamp, $name, array $functions)
 	{
-		$profiler = new Profiler(true, true);
+		$configCache = \Mockery::mock(ConfigCache::class);
+		$configCache->shouldReceive('get')
+		            ->withAnyArgs()
+		            ->andReturn(true)
+		            ->twice();
+
+		$profiler = new Profiler($configCache);
 
 		$profiler->saveTimestamp($timestamp, $name);
 		$profiler->reset();
@@ -168,7 +187,13 @@ class ProfilerTest extends MockedTest
 			->shouldReceive('info')
 			->once();
 
-		$profiler = new Profiler(true, true);
+		$configCache = \Mockery::mock(ConfigCache::class);
+		$configCache->shouldReceive('get')
+		            ->withAnyArgs()
+		            ->andReturn(true)
+		            ->twice();
+
+		$profiler = new Profiler($configCache);
 
 		foreach ($data as $perf => $items) {
 			foreach ($items['functions'] as $function) {
@@ -193,19 +218,48 @@ class ProfilerTest extends MockedTest
 	 */
 	public function testEnableDisable()
 	{
-		$profiler = new Profiler(true, false);
+		$configCache = \Mockery::mock(ConfigCache::class);
+		$configCache->shouldReceive('get')
+		            ->with('system', 'profiler')
+		            ->andReturn(true)
+		            ->once();
+		$configCache->shouldReceive('get')
+		            ->with('rendertime', 'callstack')
+		            ->andReturn(false)
+		            ->once();
+
+		$profiler = new Profiler($configCache);
 
 		$this->assertFalse($profiler->isRendertime());
 		$this->assertEmpty($profiler->getRendertimeString());
 
 		$profiler->saveTimestamp(time(), 'network', 'test1');
 
-		$profiler->update(false, false);
+		$config = \Mockery::mock(Configuration::class);
+		$config->shouldReceive('get')
+		            ->with('system', 'profiler')
+		            ->andReturn(false)
+		            ->once();
+		$config->shouldReceive('get')
+		            ->with('rendertime', 'callstack')
+		            ->andReturn(false)
+		            ->once();
+
+		$profiler->update($config);
 
 		$this->assertFalse($profiler->isRendertime());
 		$this->assertEmpty($profiler->getRendertimeString());
 
-		$profiler->update(true, true);
+		$config->shouldReceive('get')
+		       ->with('system', 'profiler')
+		       ->andReturn(true)
+		       ->once();
+		$config->shouldReceive('get')
+		       ->with('rendertime', 'callstack')
+		       ->andReturn(true)
+		       ->once();
+
+		$profiler->update($config);
 
 		$profiler->saveTimestamp(time(), 'database', 'test2');