mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Fix tests (static usage for non-static methods)

Browse source
This commit is contained in:
Philipp Holzer 2019-07-21 14:20:45 +02:00
parent a8e6a57e9b
commit 3d93ef9cea
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/src/Database/DBATest.php
View file

@ -15,10 +15,12 @@ class DBATest extends DatabaseTest
public function setUp() public function setUp()
{ {
$configModel = new \Friendica\Model\Config\Config(self::$dba); $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); $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); $baseUrl = new BaseURL($config, $_SERVER);
$router = new App\Router(); $router = new App\Router();
$l10n = new L10n($config, $l10n = new L10n($config,

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

@ -19,10 +19,12 @@ class DBStructureTest extends DatabaseTest
public function setUp() public function setUp()
{ {
$configModel = new Config(self::$dba); $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); $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); $baseUrl = new BaseURL($config, $_SERVER);
$router = new App\Router(); $router = new App\Router();
$l10n = new L10n($config, $l10n = new L10n($config,