clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing sort of BaseURL usage for App & Cache usage

This commit is contained in:
Philipp Holzer 2019-08-04 19:02:16 +02:00
parent fba0574ec0
commit a66580444f
No known key found for this signature in database
GPG Key ID: D8365C3D36B77D90
3 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Core/System.php
View File

@ -6,6 +6,7 @@ namespace Friendica\Core;
use Friendica\BaseObject; use Friendica\BaseObject;
use Friendica\Network\HTTPException\InternalServerErrorException; use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Util\BaseURL;
use Friendica\Util\XML; use Friendica\Util\XML;
/** /**
@ -29,7 +30,7 @@ class System extends BaseObject
*/ */
public static function baseUrl($ssl = false) public static function baseUrl($ssl = false)
{ {
return self::getApp()->getBaseURL($ssl); return self::getClass(BaseURL::class)->get($ssl);
} }
/** /**

33
tests/include/ApiTest.php
View File

@ -65,9 +65,24 @@ class ApiTest extends DatabaseTest
/** @var Database $dba */ /** @var Database $dba */
$dba = $this->dice->create(Database::class); $dba = $this->dice->create(Database::class);
/** @var Configuration $config */
$this->config = $this->dice->create(Configuration::class);
$this->config->set('system', 'url', 'http://localhost');
$this->config->set('system', 'hostname', 'localhost');
$this->config->set('system', 'worker_dont_fork', true);
// Default config
$this->config->set('config', 'hostname', 'localhost');
$this->config->set('system', 'throttle_limit_day', 100);
$this->config->set('system', 'throttle_limit_week', 100);
$this->config->set('system', 'throttle_limit_month', 100);
$this->config->set('system', 'theme', 'system_theme');
// Load the API dataset for the whole API // Load the API dataset for the whole API
$this->loadFixture(__DIR__ . '/../datasets/api.fixture.php', $dba); $this->loadFixture(__DIR__ . '/../datasets/api.fixture.php', $dba);
/** @var App app */
$this->app = BaseObject::getApp(); $this->app = BaseObject::getApp();
$this->app->argc = 1; $this->app->argc = 1;
@ -106,20 +121,6 @@ class ApiTest extends DatabaseTest
$_POST = []; $_POST = [];
$_GET = []; $_GET = [];
$_SERVER = []; $_SERVER = [];
/** @var Configuration $config */
$this->config = $this->dice->create(Configuration::class);
$this->config->set('system', 'url', 'http://localhost');
$this->config->set('system', 'hostname', 'localhost');
$this->config->set('system', 'worker_dont_fork', true);
// Default config
$this->config->set('config', 'hostname', 'localhost');
$this->config->set('system', 'throttle_limit_day', 100);
$this->config->set('system', 'throttle_limit_week', 100);
$this->config->set('system', 'throttle_limit_month', 100);
$this->config->set('system', 'theme', 'system_theme');
} }
/** /**
@ -450,8 +451,8 @@ class ApiTest extends DatabaseTest
} }
]; ];
$_SERVER['REQUEST_METHOD'] = 'method'; $_SERVER['REQUEST_METHOD'] = 'method';
$this->configset('system', 'profiler', true); $this->config->set('system', 'profiler', true);
$this->configset('rendertime', 'callstack', true); $this->config->set('rendertime', 'callstack', true);
$this->app->callstack = [ $this->app->callstack = [
'database' => ['some_function' => 200], 'database' => ['some_function' => 200],
'database_write' => ['some_function' => 200], 'database_write' => ['some_function' => 200],

7
tests/src/Content/Text/BBCodeTest.php
View File

@ -7,6 +7,7 @@ use Friendica\Core\L10n\L10n;
use Friendica\Test\MockedTest; use Friendica\Test\MockedTest;
use Friendica\Test\Util\AppMockTrait; use Friendica\Test\Util\AppMockTrait;
use Friendica\Test\Util\VFSTrait; use Friendica\Test\Util\VFSTrait;
use Friendica\Util\BaseURL;
class BBCodeTest extends MockedTest class BBCodeTest extends MockedTest
{ {
@ -44,6 +45,12 @@ class BBCodeTest extends MockedTest
$this->dice->shouldReceive('create') $this->dice->shouldReceive('create')
->with(L10n::class) ->with(L10n::class)
->andReturn($l10nMock); ->andReturn($l10nMock);
$baseUrlMock = \Mockery::mock(BaseURL::class);
$baseUrlMock->shouldReceive('get')->withAnyArgs()->andReturn('friendica.local');
$this->dice->shouldReceive('create')
->with(BaseURL::class)
->andReturn($baseUrlMock);
} }
public function dataLinks() public function dataLinks()