bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Replace global $a with BaseObject::getApp()

Browse source
This commit is contained in:
Hypolite Petovan 2018-07-09 22:39:59 -04:00
commit 820afa2284
17 changed files with 51 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

17
tests/ApiTest.php
View file

@ -5,12 +5,11 @@
namespace Friendica\Test;
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Network\BadRequestException;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Network\HTTPException;
use Friendica\Render\FriendicaSmarty;
/**
* Tests for the API functions.
@ -26,12 +25,10 @@ class ApiTest extends DatabaseTest
*/
protected function setUp()
{
global $a;
parent::setUp();
// Reusable App object
$this->app = new App(__DIR__.'/../');
$a = $this->app;
$this->app = \Friendica\BaseObject::getApp();
// User data that the test database is populated with
$this->selfUser = [
@ -2164,7 +2161,7 @@ class ApiTest extends DatabaseTest
public function testApiFormatItemsEmbededImages()
{
$this->assertEquals(
'text ' . \Friendica\Core\System::baseUrl() . '/display/item_guid',
'text ' . System::baseUrl() . '/display/item_guid',
api_format_items_embeded_images(['guid' => 'item_guid'], 'text data:image/foo')
);
}
@ -2338,7 +2335,7 @@ class ApiTest extends DatabaseTest
'body' => '',
'verb' => '',
'author-id' => 43,
'author-network' => \Friendica\Core\Protocol::DFRN,
'author-network' => Protocol::DFRN,
'author-link' => 'http://localhost/profile/othercontact',
'plink' => '',
]
@ -2361,7 +2358,7 @@ class ApiTest extends DatabaseTest
'body' => '',
'verb' => '',
'author-id' => 43,
'author-network' => \Friendica\Core\Protocol::DFRN,
'author-network' => Protocol::DFRN,
'author-link' => 'http://localhost/profile/othercontact',
'plink' => '',
]
@ -2635,7 +2632,7 @@ class ApiTest extends DatabaseTest
$result = api_statusnet_config('json');
$this->assertEquals('localhost', $result['config']['site']['server']);
$this->assertEquals('default', $result['config']['site']['theme']);
$this->assertEquals(\Friendica\Core\System::baseUrl() . '/images/friendica-64.png', $result['config']['site']['logo']);
$this->assertEquals(System::baseUrl() . '/images/friendica-64.png', $result['config']['site']['logo']);
$this->assertTrue($result['config']['site']['fancy']);
$this->assertEquals('en', $result['config']['site']['language']);
$this->assertEquals('UTC', $result['config']['site']['timezone']);

3
tests/src/Core/Cache/CacheTest.php
View file

@ -2,7 +2,6 @@
namespace Friendica\Test\src\Core\Cache;
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Test\DatabaseTest;
use Friendica\Util\DateTimeFormat;
@ -18,13 +17,11 @@ abstract class CacheTest extends DatabaseTest
protected function setUp()
{
global $a;
parent::setUp();
$this->instance = $this->getInstance();
// Reusable App object
$this->app = \Friendica\BaseObject::getApp();
$a = $this->app;
// Default config
Config::set('config', 'hostname', 'localhost');

4
tests/src/Core/Lock/LockTest.php
View file

@ -2,10 +2,8 @@
namespace Friendica\Test\src\Core\Lock;
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Test\DatabaseTest;
use PHPUnit\Framework\TestCase;
abstract class LockTest extends DatabaseTest
{
@ -18,13 +16,11 @@ abstract class LockTest extends DatabaseTest
protected function setUp()
{
global $a;
parent::setUp();
$this->instance = $this->getInstance();
// Reusable App object
$this->app = \Friendica\BaseObject::getApp();
$a = $this->app;
// Default config
Config::set('config', 'hostname', 'localhost');