friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

bugfix: add lost changes due merge

This commit is contained in:
Philipp Holzer 2019-07-14 22:19:16 +02:00
parent 4913502922
commit d384663b39
No known key found for this signature in database
GPG Key ID: D8365C3D36B77D90
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/include/ApiTest.php
View File

@ -12,9 +12,7 @@ use Friendica\Core\Protocol;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Factory; use Friendica\Factory;
use Friendica\Network\HTTPException; use Friendica\Network\HTTPException;
use Friendica\Util\BasePath;
use Friendica\Util\BaseURL; use Friendica\Util\BaseURL;
use Friendica\Util\Config\ConfigFileLoader;
use Monolog\Handler\TestHandler; use Monolog\Handler\TestHandler;
require_once __DIR__ . '/../../include/api.php'; require_once __DIR__ . '/../../include/api.php';
@ -51,7 +49,7 @@ class ApiTest extends DatabaseTest
{ {
$configModel = new \Friendica\Model\Config\Config(self::$dba); $configModel = new \Friendica\Model\Config\Config(self::$dba);
$config = Factory\ConfigFactory::createConfig(self::$configCache, $configModel); $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); $logger = Factory\LoggerFactory::create('test', self::$dba, $config, self::$profiler);
$baseUrl = new BaseURL($config, $_SERVER); $baseUrl = new BaseURL($config, $_SERVER);
$router = new App\Router(); $router = new App\Router();

2
tests/src/Database/DBATest.php
View File

@ -14,7 +14,7 @@ class DBATest extends DatabaseTest
{ {
$configModel = new \Friendica\Model\Config\Config(self::$dba); $configModel = new \Friendica\Model\Config\Config(self::$dba);
$config = Factory\ConfigFactory::createConfig(self::$configCache, $configModel); $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); $logger = Factory\LoggerFactory::create('test', self::$dba, $config, self::$profiler);
$baseUrl = new BaseURL($config, $_SERVER); $baseUrl = new BaseURL($config, $_SERVER);
$router = new App\Router(); $router = new App\Router();

8
tests/src/Database/DBStructureTest.php
View File

@ -6,16 +6,20 @@ use Friendica\App;
use Friendica\Core\Config\Cache\PConfigCache; use Friendica\Core\Config\Cache\PConfigCache;
use Friendica\Database\DBStructure; use Friendica\Database\DBStructure;
use Friendica\Factory; use Friendica\Factory;
use Friendica\Model\Config\Config;
use Friendica\Test\DatabaseTest; use Friendica\Test\DatabaseTest;
use Friendica\Util\BaseURL; use Friendica\Util\BaseURL;
class DBStructureTest extends DatabaseTest class DBStructureTest extends DatabaseTest
{ {
/**
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public function setUp() public function setUp()
{ {
$configModel = new \Friendica\Model\Config\Config(self::$dba); $configModel = new Config(self::$dba);
$config = Factory\ConfigFactory::createConfig(self::$configCache, $configModel); $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); $logger = Factory\LoggerFactory::create('test', self::$dba, $config, self::$profiler);
$baseUrl = new BaseURL($config, $_SERVER); $baseUrl = new BaseURL($config, $_SERVER);
$router = new App\Router(); $router = new App\Router();