bugfix: add lost changes due merge

diff --git a/tests/include/ApiTest.php b/tests/include/ApiTest.php
index 17b7469fa111116b4a8711bceda4f53847f4d44c..5ae4bdff5074eecd7e6c4e7bec09f62c7c17451a 100644 (file)
--- a/tests/include/ApiTest.php
+++ b/tests/include/ApiTest.php
@@ -12,9 +12,7 @@ use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Factory;
 use Friendica\Network\HTTPException;
-use Friendica\Util\BasePath;
 use Friendica\Util\BaseURL;
-use Friendica\Util\Config\ConfigFileLoader;
 use Monolog\Handler\TestHandler;
 
 require_once __DIR__ . '/../../include/api.php';
@@ -51,7 +49,7 @@ class ApiTest extends DatabaseTest
        {
                $configModel = new \Friendica\Model\Config\Config(self::$dba);
                $config = Factory\ConfigFactory::createConfig(self::$configCache, $configModel);
-               Factory\ConfigFactory::createPConfig(new Config\Cache\PConfigCache());
+               Factory\ConfigFactory::createPConfig(self::$configCache, new Config\Cache\PConfigCache());
                $logger = Factory\LoggerFactory::create('test', self::$dba, $config, self::$profiler);
                $baseUrl = new BaseURL($config, $_SERVER);
                $router = new App\Router();

diff --git a/tests/src/Database/DBATest.php b/tests/src/Database/DBATest.php
index 24f723e5a09486c64820c2ff8d430974c7534e7c..852db4498fc1c0d78a72f1b3a8f3e89525dc1faa 100644 (file)
--- a/tests/src/Database/DBATest.php
+++ b/tests/src/Database/DBATest.php
@@ -14,7 +14,7 @@ class DBATest extends DatabaseTest
        {
                $configModel = new \Friendica\Model\Config\Config(self::$dba);
                $config = Factory\ConfigFactory::createConfig(self::$configCache, $configModel);
-               Factory\ConfigFactory::createPConfig(new Config\Cache\PConfigCache());
+               Factory\ConfigFactory::createPConfig(self::$configCache, new Config\Cache\PConfigCache());
                $logger = Factory\LoggerFactory::create('test', self::$dba, $config, self::$profiler);
                $baseUrl = new BaseURL($config, $_SERVER);
                $router = new App\Router();

diff --git a/tests/src/Database/DBStructureTest.php b/tests/src/Database/DBStructureTest.php
index 51707873cb2e335445cafe4f5db0d4ce0b852ca4..d10f07493bfaa7636ba7e9eec4d7582cad487de5 100644 (file)
--- a/tests/src/Database/DBStructureTest.php
+++ b/tests/src/Database/DBStructureTest.php
@@ -6,16 +6,20 @@ use Friendica\App;
 use Friendica\Core\Config\Cache\PConfigCache;
 use Friendica\Database\DBStructure;
 use Friendica\Factory;
+use Friendica\Model\Config\Config;
 use Friendica\Test\DatabaseTest;
 use Friendica\Util\BaseURL;
 
 class DBStructureTest extends DatabaseTest
 {
+       /**
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        */
        public function setUp()
        {
-               $configModel = new \Friendica\Model\Config\Config(self::$dba);
+               $configModel = new Config(self::$dba);
                $config = Factory\ConfigFactory::createConfig(self::$configCache, $configModel);
-               Factory\ConfigFactory::createPConfig(new PConfigCache());
+               Factory\ConfigFactory::createPConfig(self::$configCache, new PConfigCache());
                $logger = Factory\LoggerFactory::create('test', self::$dba, $config, self::$profiler);
                $baseUrl = new BaseURL($config, $_SERVER);
                $router = new App\Router();