mirror of
https://github.com/friendica/friendica
synced 2024-12-22 16:48:03 +01:00
bugfix: add lost changes due merge
This commit is contained in:
parent
4913502922
commit
d384663b39
3 changed files with 8 additions and 6 deletions
|
@ -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();
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in a new issue