]> git.mxchange.org Git - friendica.git/commitdiff
Fix wrong `$this->assert...()` with `self::assert...()
authorPhilipp <admin@philipp.info>
Sat, 17 Oct 2020 12:19:57 +0000 (14:19 +0200)
committerPhilipp <admin@philipp.info>
Sun, 18 Oct 2020 18:52:27 +0000 (20:52 +0200)
63 files changed:
tests/functional/DependencyCheckTest.php
tests/legacy/ApiTest.php
tests/src/App/ArgumentsTest.php
tests/src/App/ModeTest.php
tests/src/App/ModuleTest.php
tests/src/App/RouterTest.php
tests/src/Console/AutomaticInstallationConsoleTest.php
tests/src/Console/ConfigConsoleTest.php
tests/src/Console/LockConsoleTest.php
tests/src/Console/ServerBlockConsoleTest.php
tests/src/Content/PageInfoTest.php
tests/src/Content/SmiliesTest.php
tests/src/Content/Text/BBCode/VideoTest.php
tests/src/Content/Text/BBCodeTest.php
tests/src/Content/Text/HTMLTest.php
tests/src/Content/Text/MarkdownTest.php
tests/src/Core/Cache/CacheTest.php
tests/src/Core/Cache/MemoryCacheTest.php
tests/src/Core/Config/CacheTest.php
tests/src/Core/Config/ConfigTest.php
tests/src/Core/Config/JitConfigTest.php
tests/src/Core/Config/PreloadConfigTest.php
tests/src/Core/InstallerTest.php
tests/src/Core/L10nTest.php
tests/src/Core/Lock/LockTest.php
tests/src/Core/Lock/SemaphoreLockTest.php
tests/src/Core/PConfig/CacheTest.php
tests/src/Core/PConfig/JitPConfigTest.php
tests/src/Core/PConfig/PConfigTest.php
tests/src/Core/PConfig/PreloadPConfigTest.php
tests/src/Core/StorageManagerTest.php
tests/src/Core/SystemTest.php
tests/src/Database/DBATest.php
tests/src/Database/DBStructureTest.php
tests/src/Model/FileTagTest.php
tests/src/Model/ProcessTest.php
tests/src/Model/Storage/DatabaseStorageTest.php
tests/src/Model/Storage/FilesystemStorageTest.php
tests/src/Model/Storage/StorageTest.php
tests/src/Model/User/CookieTest.php
tests/src/Model/UserTest.php
tests/src/Module/Api/Twitter/ContactEndpointTest.php
tests/src/Network/CurlResultTest.php
tests/src/Network/ProbeTest.php
tests/src/Protocol/ActivityTest.php
tests/src/Util/ACLFormaterTest.php
tests/src/Util/ArraysTest.php
tests/src/Util/BasePathTest.php
tests/src/Util/BaseURLTest.php
tests/src/Util/Config/ConfigFileLoaderTest.php
tests/src/Util/CryptoTest.php
tests/src/Util/DateTimeFormatTest.php
tests/src/Util/EMailerTest.php
tests/src/Util/Emailer/MailBuilderTest.php
tests/src/Util/Emailer/SystemMailBuilderTest.php
tests/src/Util/HTTPSignatureTest.php
tests/src/Util/JsonLDTest.php
tests/src/Util/Logger/AbstractLoggerTest.php
tests/src/Util/Logger/StreamLoggerTest.php
tests/src/Util/Logger/WorkerLoggerTest.php
tests/src/Util/ProfilerTest.php
tests/src/Util/StringsTest.php
tests/src/Util/XmlTest.php

index a99e25cda1dc1847c33e86f0b7d8aadd720b7d95..32c0164486ba8f9c709eedddfc95a1975bf6fbfa 100644 (file)
@@ -19,7 +19,7 @@
  *
  */
 
-namespace functional;
+namespace Friendica\Test\functional;
 
 use Dice\Dice;
 use Friendica\App;
@@ -63,8 +63,8 @@ class dependencyCheck extends TestCase
                /** @var BasePath $basePath */
                $basePath = $this->dice->create(BasePath::class, [$this->root->url()]);
 
-               $this->assertInstanceOf(BasePath::class, $basePath);
-               $this->assertEquals($this->root->url(), $basePath->getPath());
+               self::assertInstanceOf(BasePath::class, $basePath);
+               self::assertEquals($this->root->url(), $basePath->getPath());
        }
 
        /**
@@ -76,14 +76,14 @@ class dependencyCheck extends TestCase
                /** @var ConfigFileLoader $configFileLoader */
                $configFileLoader = $this->dice->create(ConfigFileLoader::class);
 
-               $this->assertInstanceOf(ConfigFileLoader::class, $configFileLoader);
+               self::assertInstanceOf(ConfigFileLoader::class, $configFileLoader);
 
                $configCache = new Cache();
                $configFileLoader->setupCache($configCache);
 
-               $this->assertNotEmpty($configCache->getAll());
-               $this->assertArrayHasKey('database', $configCache->getAll());
-               $this->assertArrayHasKey('system', $configCache->getAll());
+               self::assertNotEmpty($configCache->getAll());
+               self::assertArrayHasKey('database', $configCache->getAll());
+               self::assertArrayHasKey('system', $configCache->getAll());
        }
 
        /**
@@ -94,7 +94,7 @@ class dependencyCheck extends TestCase
                /** @var Profiler $profiler */
                $profiler = $this->dice->create(Profiler::class);
 
-               $this->assertInstanceOf(Profiler::class, $profiler);
+               self::assertInstanceOf(Profiler::class, $profiler);
 
                $configCache = new Cache([
                        'system' => [
@@ -109,8 +109,8 @@ class dependencyCheck extends TestCase
                $this->dice = new Dice();
                $profiler = $this->dice->create(Profiler::class, [$configCache]);
 
-               $this->assertInstanceOf(Profiler::class, $profiler);
-               $this->assertTrue($profiler->isRendertime());
+               self::assertInstanceOf(Profiler::class, $profiler);
+               self::assertTrue($profiler->isRendertime());
        }
 
        public function testDatabase()
@@ -118,8 +118,8 @@ class dependencyCheck extends TestCase
                /** @var Database $database */
                $database = $this->dice->create(Database::class);
 
-               $this->assertInstanceOf(Database::class, $database);
-               $this->assertTrue($database->connected());
+               self::assertInstanceOf(Database::class, $database);
+               self::assertTrue($database->connected());
        }
 
        public function testAppMode()
@@ -127,9 +127,9 @@ class dependencyCheck extends TestCase
                /** @var App\Mode $mode */
                $mode = $this->dice->create(App\Mode::class);
 
-               $this->assertInstanceOf(App\Mode::class, $mode);
+               self::assertInstanceOf(App\Mode::class, $mode);
 
-               $this->assertTrue($mode->isNormal());
+               self::assertTrue($mode->isNormal());
        }
 
        public function testConfiguration()
@@ -137,9 +137,9 @@ class dependencyCheck extends TestCase
                /** @var IConfig $config */
                $config = $this->dice->create(IConfig::class);
 
-               $this->assertInstanceOf(IConfig::class, $config);
+               self::assertInstanceOf(IConfig::class, $config);
 
-               $this->assertNotEmpty($config->get('database', 'username'));
+               self::assertNotEmpty($config->get('database', 'username'));
        }
 
        public function testLogger()
@@ -147,7 +147,7 @@ class dependencyCheck extends TestCase
                /** @var LoggerInterface $logger */
                $logger = $this->dice->create(LoggerInterface::class, ['test']);
 
-               $this->assertInstanceOf(LoggerInterface::class, $logger);
+               self::assertInstanceOf(LoggerInterface::class, $logger);
        }
 
        public function testDevLogger()
@@ -159,7 +159,7 @@ class dependencyCheck extends TestCase
                /** @var LoggerInterface $logger */
                $logger = $this->dice->create('$devLogger', ['dev']);
 
-               $this->assertInstanceOf(LoggerInterface::class, $logger);
+               self::assertInstanceOf(LoggerInterface::class, $logger);
        }
 
        public function testCache()
@@ -167,7 +167,7 @@ class dependencyCheck extends TestCase
                /** @var ICache $cache */
                $cache = $this->dice->create(ICache::class);
 
-               $this->assertInstanceOf(ICache::class, $cache);
+               self::assertInstanceOf(ICache::class, $cache);
        }
 
        public function testMemoryCache()
@@ -176,7 +176,7 @@ class dependencyCheck extends TestCase
                $cache = $this->dice->create(IMemoryCache::class);
 
                // We need to check "just" ICache, because the default Cache is DB-Cache, which isn't a memorycache
-               $this->assertInstanceOf(ICache::class, $cache);
+               self::assertInstanceOf(ICache::class, $cache);
        }
 
        public function testLock()
@@ -184,6 +184,6 @@ class dependencyCheck extends TestCase
                /** @var ILock $cache */
                $lock = $this->dice->create(ILock::class);
 
-               $this->assertInstanceOf(ILock::class, $lock);
+               self::assertInstanceOf(ILock::class, $lock);
        }
 }
index 1ff66efb6a92a0b9450cf47f91570f54dea0b404..9f7aff7a00cfa421706225996b33f09f5237e46e 100644 (file)
@@ -123,14 +123,14 @@ class ApiTest extends FixtureTest
         */
        private function assertSelfUser(array $user)
        {
-               $this->assertEquals($this->selfUser['id'], $user['uid']);
-               $this->assertEquals($this->selfUser['id'], $user['cid']);
-               $this->assertEquals(1, $user['self']);
-               $this->assertEquals('DFRN', $user['location']);
-               $this->assertEquals($this->selfUser['name'], $user['name']);
-               $this->assertEquals($this->selfUser['nick'], $user['screen_name']);
-               $this->assertEquals('dfrn', $user['network']);
-               $this->assertTrue($user['verified']);
+               self::assertEquals($this->selfUser['id'], $user['uid']);
+               self::assertEquals($this->selfUser['id'], $user['cid']);
+               self::assertEquals(1, $user['self']);
+               self::assertEquals('DFRN', $user['location']);
+               self::assertEquals($this->selfUser['name'], $user['name']);
+               self::assertEquals($this->selfUser['nick'], $user['screen_name']);
+               self::assertEquals('dfrn', $user['network']);
+               self::assertTrue($user['verified']);
        }
 
        /**
@@ -142,12 +142,12 @@ class ApiTest extends FixtureTest
         */
        private function assertOtherUser(array $user)
        {
-               $this->assertEquals($this->otherUser['id'], $user['id']);
-               $this->assertEquals($this->otherUser['id'], $user['id_str']);
-               $this->assertEquals(0, $user['self']);
-               $this->assertEquals($this->otherUser['name'], $user['name']);
-               $this->assertEquals($this->otherUser['nick'], $user['screen_name']);
-               $this->assertFalse($user['verified']);
+               self::assertEquals($this->otherUser['id'], $user['id']);
+               self::assertEquals($this->otherUser['id'], $user['id_str']);
+               self::assertEquals(0, $user['self']);
+               self::assertEquals($this->otherUser['name'], $user['name']);
+               self::assertEquals($this->otherUser['nick'], $user['screen_name']);
+               self::assertFalse($user['verified']);
        }
 
        /**
@@ -159,8 +159,8 @@ class ApiTest extends FixtureTest
         */
        private function assertStatus(array $status)
        {
-               $this->assertInternalType('string', $status['text']);
-               $this->assertInternalType('int', $status['id']);
+               self::assertInternalType('string', $status['text']);
+               self::assertInternalType('int', $status['id']);
                // We could probably do more checks here.
        }
 
@@ -173,10 +173,10 @@ class ApiTest extends FixtureTest
         */
        private function assertList(array $list)
        {
-               $this->assertInternalType('string', $list['name']);
-               $this->assertInternalType('int', $list['id']);
-               $this->assertInternalType('string', $list['id_str']);
-               $this->assertContains($list['mode'], ['public', 'private']);
+               self::assertInternalType('string', $list['name']);
+               self::assertInternalType('int', $list['id']);
+               self::assertInternalType('string', $list['id_str']);
+               self::assertContains($list['mode'], ['public', 'private']);
                // We could probably do more checks here.
        }
 
@@ -190,8 +190,8 @@ class ApiTest extends FixtureTest
         */
        private function assertXml($result, $root_element)
        {
-               $this->assertStringStartsWith('<?xml version="1.0"?>', $result);
-               $this->assertContains('<' . $root_element, $result);
+               self::assertStringStartsWith('<?xml version="1.0"?>', $result);
+               self::assertContains('<' . $root_element, $result);
                // We could probably do more checks here.
        }
 
@@ -221,7 +221,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiUser()
        {
-               $this->assertEquals($this->selfUser['id'], api_user());
+               self::assertEquals($this->selfUser['id'], api_user());
        }
 
        /**
@@ -232,7 +232,7 @@ class ApiTest extends FixtureTest
        public function testApiUserWithUnallowedUser()
        {
                $_SESSION = ['allow_api' => false];
-               $this->assertEquals(false, api_user());
+               self::assertEquals(false, api_user());
        }
 
        /**
@@ -242,7 +242,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiSource()
        {
-               $this->assertEquals('api', api_source());
+               self::assertEquals('api', api_source());
        }
 
        /**
@@ -253,7 +253,7 @@ class ApiTest extends FixtureTest
        public function testApiSourceWithTwidere()
        {
                $_SERVER['HTTP_USER_AGENT'] = 'Twidere';
-               $this->assertEquals('Twidere', api_source());
+               self::assertEquals('Twidere', api_source());
        }
 
        /**
@@ -264,7 +264,7 @@ class ApiTest extends FixtureTest
        public function testApiSourceWithGet()
        {
                $_GET['source'] = 'source_name';
-               $this->assertEquals('source_name', api_source());
+               self::assertEquals('source_name', api_source());
        }
 
        /**
@@ -274,7 +274,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiDate()
        {
-               $this->assertEquals('Wed Oct 10 00:00:00 +0000 1990', api_date('1990-10-10'));
+               self::assertEquals('Wed Oct 10 00:00:00 +0000 1990', api_date('1990-10-10'));
        }
 
        /**
@@ -285,7 +285,7 @@ class ApiTest extends FixtureTest
        public function testApiRegisterFunc()
        {
                global $API;
-               $this->assertNull(
+               self::assertNull(
                        api_register_func(
                                'api_path',
                                function () {
@@ -294,9 +294,9 @@ class ApiTest extends FixtureTest
                                'method'
                        )
                );
-               $this->assertTrue($API['api_path']['auth']);
-               $this->assertEquals('method', $API['api_path']['method']);
-               $this->assertTrue(is_callable($API['api_path']['func']));
+               self::assertTrue($API['api_path']['auth']);
+               self::assertEquals('method', $API['api_path']['method']);
+               self::assertTrue(is_callable($API['api_path']['func']));
        }
 
        /**
@@ -377,7 +377,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiCheckMethod()
        {
-               $this->assertFalse(api_check_method('method'));
+               self::assertFalse(api_check_method('method'));
        }
 
        /**
@@ -388,7 +388,7 @@ class ApiTest extends FixtureTest
        public function testApiCheckMethodWithCorrectMethod()
        {
                $_SERVER['REQUEST_METHOD'] = 'method';
-               $this->assertTrue(api_check_method('method'));
+               self::assertTrue(api_check_method('method'));
        }
 
        /**
@@ -398,7 +398,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiCheckMethodWithWildcard()
        {
-               $this->assertTrue(api_check_method('*'));
+               self::assertTrue(api_check_method('*'));
        }
 
        /**
@@ -422,7 +422,7 @@ class ApiTest extends FixtureTest
 
                $args = DI::args()->determine($_SERVER, $_GET);
 
-               $this->assertEquals(
+               self::assertEquals(
                        'callback_name(["some_data"])',
                        api_call($this->app, $args)
                );
@@ -459,7 +459,7 @@ class ApiTest extends FixtureTest
                        'network'        => ['some_function' => 200]
                ];
 
-               $this->assertEquals(
+               self::assertEquals(
                        '["some_data"]',
                        api_call($this->app, $args)
                );
@@ -485,7 +485,7 @@ class ApiTest extends FixtureTest
 
                $args = DI::args()->determine($_SERVER, $_GET);
 
-               $this->assertEquals(
+               self::assertEquals(
                        '{"status":{"error":"Internal Server Error","code":"500 Internal Server Error","request":"api_path"}}',
                        api_call($this->app, $args)
                );
@@ -499,7 +499,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiCallWithUninplementedApi()
        {
-               $this->assertEquals(
+               self::assertEquals(
                        '{"status":{"error":"Not Implemented","code":"501 Not Implemented","request":""}}',
                        api_call($this->app)
                );
@@ -525,7 +525,7 @@ class ApiTest extends FixtureTest
 
                $args = DI::args()->determine($_SERVER, $_GET);
 
-               $this->assertEquals(
+               self::assertEquals(
                        '["some_data"]',
                        api_call($this->app, $args)
                );
@@ -551,7 +551,7 @@ class ApiTest extends FixtureTest
 
                $args = DI::args()->determine($_SERVER, $_GET);
 
-               $this->assertEquals(
+               self::assertEquals(
                        'some_data',
                        api_call($this->app, $args)
                );
@@ -577,7 +577,7 @@ class ApiTest extends FixtureTest
 
                $args = DI::args()->determine($_SERVER, $_GET);
 
-               $this->assertEquals(
+               self::assertEquals(
                        '<?xml version="1.0" encoding="UTF-8"?>' . "\n" .
                        'some_data',
                        api_call($this->app, $args)
@@ -604,7 +604,7 @@ class ApiTest extends FixtureTest
 
                $args = DI::args()->determine($_SERVER, $_GET);
 
-               $this->assertEquals(
+               self::assertEquals(
                        '<?xml version="1.0" encoding="UTF-8"?>' . "\n" .
                        'some_data',
                        api_call($this->app, $args)
@@ -626,7 +626,7 @@ class ApiTest extends FixtureTest
 
                $args = DI::args()->determine($_SERVER, $_GET);
 
-               $this->assertEquals(
+               self::assertEquals(
                        '{"status":{"error":"Method Not Allowed","code":"405 Method Not Allowed","request":"api_path"}}',
                        api_call($this->app, $args)
                );
@@ -651,7 +651,7 @@ class ApiTest extends FixtureTest
 
                $args = DI::args()->determine($_SERVER, $_GET);
 
-               $this->assertEquals(
+               self::assertEquals(
                        '{"status":{"error":"This API requires login","code":"401 Unauthorized","request":"api_path"}}',
                        api_call($this->app, $args)
                );
@@ -665,7 +665,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiErrorWithJson()
        {
-               $this->assertEquals(
+               self::assertEquals(
                        '{"status":{"error":"error_message","code":"200 OK","request":""}}',
                        api_error('json', new HTTPException\OKException('error_message'), DI::args())
                );
@@ -679,7 +679,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiErrorWithXml()
        {
-               $this->assertEquals(
+               self::assertEquals(
                        '<?xml version="1.0"?>' . "\n" .
                        '<status xmlns="http://api.twitter.com" xmlns:statusnet="http://status.net/schema/api/1/" ' .
                        'xmlns:friendica="http://friendi.ca/schema/api/1/" ' .
@@ -700,7 +700,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiErrorWithRss()
        {
-               $this->assertEquals(
+               self::assertEquals(
                        '<?xml version="1.0"?>' . "\n" .
                        '<status xmlns="http://api.twitter.com" xmlns:statusnet="http://status.net/schema/api/1/" ' .
                        'xmlns:friendica="http://friendi.ca/schema/api/1/" ' .
@@ -721,7 +721,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiErrorWithAtom()
        {
-               $this->assertEquals(
+               self::assertEquals(
                        '<?xml version="1.0"?>' . "\n" .
                        '<status xmlns="http://api.twitter.com" xmlns:statusnet="http://status.net/schema/api/1/" ' .
                        'xmlns:friendica="http://friendi.ca/schema/api/1/" ' .
@@ -743,14 +743,14 @@ class ApiTest extends FixtureTest
        {
                $user_info = ['url' => 'user_url', 'lang' => 'en'];
                $result    = api_rss_extra($this->app, [], $user_info);
-               $this->assertEquals($user_info, $result['$user']);
-               $this->assertEquals($user_info['url'], $result['$rss']['alternate']);
-               $this->assertArrayHasKey('self', $result['$rss']);
-               $this->assertArrayHasKey('base', $result['$rss']);
-               $this->assertArrayHasKey('updated', $result['$rss']);
-               $this->assertArrayHasKey('atom_updated', $result['$rss']);
-               $this->assertArrayHasKey('language', $result['$rss']);
-               $this->assertArrayHasKey('logo', $result['$rss']);
+               self::assertEquals($user_info, $result['$user']);
+               self::assertEquals($user_info['url'], $result['$rss']['alternate']);
+               self::assertArrayHasKey('self', $result['$rss']);
+               self::assertArrayHasKey('base', $result['$rss']);
+               self::assertArrayHasKey('updated', $result['$rss']);
+               self::assertArrayHasKey('atom_updated', $result['$rss']);
+               self::assertArrayHasKey('language', $result['$rss']);
+               self::assertArrayHasKey('logo', $result['$rss']);
        }
 
        /**
@@ -761,14 +761,14 @@ class ApiTest extends FixtureTest
        public function testApiRssExtraWithoutUserInfo()
        {
                $result = api_rss_extra($this->app, [], null);
-               $this->assertInternalType('array', $result['$user']);
-               $this->assertArrayHasKey('alternate', $result['$rss']);
-               $this->assertArrayHasKey('self', $result['$rss']);
-               $this->assertArrayHasKey('base', $result['$rss']);
-               $this->assertArrayHasKey('updated', $result['$rss']);
-               $this->assertArrayHasKey('atom_updated', $result['$rss']);
-               $this->assertArrayHasKey('language', $result['$rss']);
-               $this->assertArrayHasKey('logo', $result['$rss']);
+               self::assertInternalType('array', $result['$user']);
+               self::assertArrayHasKey('alternate', $result['$rss']);
+               self::assertArrayHasKey('self', $result['$rss']);
+               self::assertArrayHasKey('base', $result['$rss']);
+               self::assertArrayHasKey('updated', $result['$rss']);
+               self::assertArrayHasKey('atom_updated', $result['$rss']);
+               self::assertArrayHasKey('language', $result['$rss']);
+               self::assertArrayHasKey('logo', $result['$rss']);
        }
 
        /**
@@ -778,7 +778,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiUniqueIdToNurl()
        {
-               $this->assertFalse(api_unique_id_to_nurl($this->wrongUserId));
+               self::assertFalse(api_unique_id_to_nurl($this->wrongUserId));
        }
 
        /**
@@ -788,7 +788,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiUniqueIdToNurlWithCorrectId()
        {
-               $this->assertEquals($this->otherUser['nurl'], api_unique_id_to_nurl($this->otherUser['id']));
+               self::assertEquals($this->otherUser['nurl'], api_unique_id_to_nurl($this->otherUser['id']));
        }
 
        /**
@@ -799,10 +799,10 @@ class ApiTest extends FixtureTest
        public function testApiGetUser()
        {
                $user = api_get_user($this->app);
-               $this->assertSelfUser($user);
-               $this->assertEquals('708fa0', $user['profile_sidebar_fill_color']);
-               $this->assertEquals('6fdbe8', $user['profile_link_color']);
-               $this->assertEquals('ededed', $user['profile_background_color']);
+               self::assertSelfUser($user);
+               self::assertEquals('708fa0', $user['profile_sidebar_fill_color']);
+               self::assertEquals('6fdbe8', $user['profile_link_color']);
+               self::assertEquals('ededed', $user['profile_background_color']);
        }
 
        /**
@@ -815,10 +815,10 @@ class ApiTest extends FixtureTest
                $pConfig = $this->dice->create(IPConfig::class);
                $pConfig->set($this->selfUser['id'], 'frio', 'schema', 'red');
                $user = api_get_user($this->app);
-               $this->assertSelfUser($user);
-               $this->assertEquals('708fa0', $user['profile_sidebar_fill_color']);
-               $this->assertEquals('6fdbe8', $user['profile_link_color']);
-               $this->assertEquals('ededed', $user['profile_background_color']);
+               self::assertSelfUser($user);
+               self::assertEquals('708fa0', $user['profile_sidebar_fill_color']);
+               self::assertEquals('6fdbe8', $user['profile_link_color']);
+               self::assertEquals('ededed', $user['profile_background_color']);
        }
 
        /**
@@ -831,10 +831,10 @@ class ApiTest extends FixtureTest
                $pConfig = $this->dice->create(IPConfig::class);
                $pConfig->set($this->selfUser['id'], 'frio', 'schema', '---');
                $user = api_get_user($this->app);
-               $this->assertSelfUser($user);
-               $this->assertEquals('708fa0', $user['profile_sidebar_fill_color']);
-               $this->assertEquals('6fdbe8', $user['profile_link_color']);
-               $this->assertEquals('ededed', $user['profile_background_color']);
+               self::assertSelfUser($user);
+               self::assertEquals('708fa0', $user['profile_sidebar_fill_color']);
+               self::assertEquals('6fdbe8', $user['profile_link_color']);
+               self::assertEquals('ededed', $user['profile_background_color']);
        }
 
        /**
@@ -850,10 +850,10 @@ class ApiTest extends FixtureTest
                $pConfig->set($this->selfUser['id'], 'frio', 'link_color', '#123456');
                $pConfig->set($this->selfUser['id'], 'frio', 'background_color', '#123456');
                $user = api_get_user($this->app);
-               $this->assertSelfUser($user);
-               $this->assertEquals('123456', $user['profile_sidebar_fill_color']);
-               $this->assertEquals('123456', $user['profile_link_color']);
-               $this->assertEquals('123456', $user['profile_background_color']);
+               self::assertSelfUser($user);
+               self::assertEquals('123456', $user['profile_sidebar_fill_color']);
+               self::assertEquals('123456', $user['profile_link_color']);
+               self::assertEquals('123456', $user['profile_background_color']);
        }
 
        /**
@@ -867,7 +867,7 @@ class ApiTest extends FixtureTest
                $_SERVER['PHP_AUTH_USER'] = 'Test user';
                $_SERVER['PHP_AUTH_PW']   = 'password';
                $_SESSION['allow_api']    = false;
-               $this->assertFalse(api_get_user($this->app));
+               self::assertFalse(api_get_user($this->app));
        }
 
        /**
@@ -878,7 +878,7 @@ class ApiTest extends FixtureTest
        public function testApiGetUserWithGetId()
        {
                $_GET['user_id'] = $this->otherUser['id'];
-               $this->assertOtherUser(api_get_user($this->app));
+               self::assertOtherUser(api_get_user($this->app));
        }
 
        /**
@@ -890,7 +890,7 @@ class ApiTest extends FixtureTest
        public function testApiGetUserWithWrongGetId()
        {
                $_GET['user_id'] = $this->wrongUserId;
-               $this->assertOtherUser(api_get_user($this->app));
+               self::assertOtherUser(api_get_user($this->app));
        }
 
        /**
@@ -901,7 +901,7 @@ class ApiTest extends FixtureTest
        public function testApiGetUserWithGetName()
        {
                $_GET['screen_name'] = $this->selfUser['nick'];
-               $this->assertSelfUser(api_get_user($this->app));
+               self::assertSelfUser(api_get_user($this->app));
        }
 
        /**
@@ -912,7 +912,7 @@ class ApiTest extends FixtureTest
        public function testApiGetUserWithGetUrl()
        {
                $_GET['profileurl'] = $this->selfUser['nurl'];
-               $this->assertSelfUser(api_get_user($this->app));
+               self::assertSelfUser(api_get_user($this->app));
        }
 
        /**
@@ -925,7 +925,7 @@ class ApiTest extends FixtureTest
                global $called_api;
                $called_api         = ['api_path'];
                $this->app->argv[1] = $this->otherUser['id'] . '.json';
-               $this->assertOtherUser(api_get_user($this->app));
+               self::assertOtherUser(api_get_user($this->app));
        }
 
        /**
@@ -937,7 +937,7 @@ class ApiTest extends FixtureTest
        {
                global $called_api;
                $called_api = ['api', 'api_path'];
-               $this->assertSelfUser(api_get_user($this->app));
+               self::assertSelfUser(api_get_user($this->app));
        }
 
        /**
@@ -947,7 +947,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiGetUserWithCorrectUser()
        {
-               $this->assertOtherUser(api_get_user($this->app, $this->otherUser['id']));
+               self::assertOtherUser(api_get_user($this->app, $this->otherUser['id']));
        }
 
        /**
@@ -958,7 +958,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiGetUserWithWrongUser()
        {
-               $this->assertOtherUser(api_get_user($this->app, $this->wrongUserId));
+               self::assertOtherUser(api_get_user($this->app, $this->wrongUserId));
        }
 
        /**
@@ -968,7 +968,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiGetUserWithZeroUser()
        {
-               $this->assertSelfUser(api_get_user($this->app, 0));
+               self::assertSelfUser(api_get_user($this->app, 0));
        }
 
        /**
@@ -979,7 +979,7 @@ class ApiTest extends FixtureTest
        public function testApiItemGetUser()
        {
                $users = api_item_get_user($this->app, []);
-               $this->assertSelfUser($users[0]);
+               self::assertSelfUser($users[0]);
        }
 
        /**
@@ -990,8 +990,8 @@ class ApiTest extends FixtureTest
        public function testApiItemGetUserWithDifferentParent()
        {
                $users = api_item_get_user($this->app, ['thr-parent' => 'item_parent', 'uri' => 'item_uri']);
-               $this->assertSelfUser($users[0]);
-               $this->assertEquals($users[0], $users[1]);
+               self::assertSelfUser($users[0]);
+               self::assertEquals($users[0], $users[1]);
        }
 
        /**
@@ -1002,7 +1002,7 @@ class ApiTest extends FixtureTest
        public function testApiWalkRecursive()
        {
                $array = ['item1'];
-               $this->assertEquals(
+               self::assertEquals(
                        $array,
                        api_walk_recursive(
                                $array,
@@ -1022,7 +1022,7 @@ class ApiTest extends FixtureTest
        public function testApiWalkRecursiveWithArray()
        {
                $array = [['item1'], ['item2']];
-               $this->assertEquals(
+               self::assertEquals(
                        $array,
                        api_walk_recursive(
                                $array,
@@ -1043,8 +1043,8 @@ class ApiTest extends FixtureTest
        {
                $item = true;
                $key  = '';
-               $this->assertTrue(api_reformat_xml($item, $key));
-               $this->assertEquals('true', $item);
+               self::assertTrue(api_reformat_xml($item, $key));
+               self::assertEquals('true', $item);
        }
 
        /**
@@ -1056,8 +1056,8 @@ class ApiTest extends FixtureTest
        {
                $item = '';
                $key  = 'statusnet_api';
-               $this->assertTrue(api_reformat_xml($item, $key));
-               $this->assertEquals('statusnet:api', $key);
+               self::assertTrue(api_reformat_xml($item, $key));
+               self::assertEquals('statusnet:api', $key);
        }
 
        /**
@@ -1069,8 +1069,8 @@ class ApiTest extends FixtureTest
        {
                $item = '';
                $key  = 'friendica_api';
-               $this->assertTrue(api_reformat_xml($item, $key));
-               $this->assertEquals('friendica:api', $key);
+               self::assertTrue(api_reformat_xml($item, $key));
+               self::assertEquals('friendica:api', $key);
        }
 
        /**
@@ -1080,7 +1080,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiCreateXml()
        {
-               $this->assertEquals(
+               self::assertEquals(
                        '<?xml version="1.0"?>' . "\n" .
                        '<root_element xmlns="http://api.twitter.com" xmlns:statusnet="http://status.net/schema/api/1/" ' .
                        'xmlns:friendica="http://friendi.ca/schema/api/1/" ' .
@@ -1098,7 +1098,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiCreateXmlWithoutNamespaces()
        {
-               $this->assertEquals(
+               self::assertEquals(
                        '<?xml version="1.0"?>' . "\n" .
                        '<ok>' . "\n" .
                        '  <data>some_data</data>' . "\n" .
@@ -1115,7 +1115,7 @@ class ApiTest extends FixtureTest
        public function testApiFormatData()
        {
                $data = ['some_data'];
-               $this->assertEquals($data, api_format_data('root_element', 'json', $data));
+               self::assertEquals($data, api_format_data('root_element', 'json', $data));
        }
 
        /**
@@ -1125,7 +1125,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiFormatDataWithXml()
        {
-               $this->assertEquals(
+               self::assertEquals(
                        '<?xml version="1.0"?>' . "\n" .
                        '<root_element xmlns="http://api.twitter.com" xmlns:statusnet="http://status.net/schema/api/1/" ' .
                        'xmlns:friendica="http://friendi.ca/schema/api/1/" ' .
@@ -1143,7 +1143,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiAccountVerifyCredentials()
        {
-               $this->assertArrayHasKey('user', api_account_verify_credentials('json'));
+               self::assertArrayHasKey('user', api_account_verify_credentials('json'));
        }
 
        /**
@@ -1165,7 +1165,7 @@ class ApiTest extends FixtureTest
         */
        public function testRequestdata()
        {
-               $this->assertNull(requestdata('variable_name'));
+               self::assertNull(requestdata('variable_name'));
        }
 
        /**
@@ -1176,7 +1176,7 @@ class ApiTest extends FixtureTest
        public function testRequestdataWithPost()
        {
                $_POST['variable_name'] = 'variable_value';
-               $this->assertEquals('variable_value', requestdata('variable_name'));
+               self::assertEquals('variable_value', requestdata('variable_name'));
        }
 
        /**
@@ -1187,7 +1187,7 @@ class ApiTest extends FixtureTest
        public function testRequestdataWithGet()
        {
                $_GET['variable_name'] = 'variable_value';
-               $this->assertEquals('variable_value', requestdata('variable_name'));
+               self::assertEquals('variable_value', requestdata('variable_name'));
        }
 
        /**
@@ -1213,7 +1213,7 @@ class ApiTest extends FixtureTest
                $_GET['status'] = '<b>Status content</b>';
 
                $result = api_statuses_mediap('json');
-               $this->assertStatus($result['status']);
+               self::assertStatus($result['status']);
        }
 
        /**
@@ -1252,7 +1252,7 @@ class ApiTest extends FixtureTest
                ];
 
                $result = api_statuses_update('json');
-               $this->assertStatus($result['status']);
+               self::assertStatus($result['status']);
        }
 
        /**
@@ -1265,7 +1265,7 @@ class ApiTest extends FixtureTest
                $_GET['htmlstatus'] = '<b>Status content</b>';
 
                $result = api_statuses_update('json');
-               $this->assertStatus($result['status']);
+               self::assertStatus($result['status']);
        }
 
        /**
@@ -1372,10 +1372,10 @@ class ApiTest extends FixtureTest
                $app->argc = 2;
 
                $result = api_media_upload();
-               $this->assertEquals('image/png', $result['media']['image']['image_type']);
-               $this->assertEquals(1, $result['media']['image']['w']);
-               $this->assertEquals(1, $result['media']['image']['h']);
-               $this->assertNotEmpty($result['media']['image']['friendica_preview_url']);
+               self::assertEquals('image/png', $result['media']['image']['image_type']);
+               self::assertEquals(1, $result['media']['image']['w']);
+               self::assertEquals(1, $result['media']['image']['h']);
+               self::assertNotEmpty($result['media']['image']['friendica_preview_url']);
        }
 
        /**
@@ -1384,7 +1384,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusShowWithJson()
        {
                $result = api_status_show('json', 1);
-               $this->assertStatus($result['status']);
+               self::assertStatus($result['status']);
        }
 
        /**
@@ -1393,7 +1393,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusShowWithXml()
        {
                $result = api_status_show('xml', 1);
-               $this->assertXml($result, 'statuses');
+               self::assertXml($result, 'statuses');
        }
 
        /**
@@ -1403,7 +1403,7 @@ class ApiTest extends FixtureTest
        {
                $item = api_get_last_status($this->selfUser['id'], $this->selfUser['id']);
 
-               $this->assertNotNull($item);
+               self::assertNotNull($item);
        }
 
        /**
@@ -1415,12 +1415,12 @@ class ApiTest extends FixtureTest
        {
                $result = api_users_show('json');
                // We can't use assertSelfUser() here because the user object is missing some properties.
-               $this->assertEquals($this->selfUser['id'], $result['user']['cid']);
-               $this->assertEquals('DFRN', $result['user']['location']);
-               $this->assertEquals($this->selfUser['name'], $result['user']['name']);
-               $this->assertEquals($this->selfUser['nick'], $result['user']['screen_name']);
-               $this->assertEquals('dfrn', $result['user']['network']);
-               $this->assertTrue($result['user']['verified']);
+               self::assertEquals($this->selfUser['id'], $result['user']['cid']);
+               self::assertEquals('DFRN', $result['user']['location']);
+               self::assertEquals($this->selfUser['name'], $result['user']['name']);
+               self::assertEquals($this->selfUser['nick'], $result['user']['screen_name']);
+               self::assertEquals('dfrn', $result['user']['network']);
+               self::assertTrue($result['user']['verified']);
        }
 
        /**
@@ -1431,7 +1431,7 @@ class ApiTest extends FixtureTest
        public function testApiUsersShowWithXml()
        {
                $result = api_users_show('xml');
-               $this->assertXml($result, 'statuses');
+               self::assertXml($result, 'statuses');
        }
 
        /**
@@ -1443,7 +1443,7 @@ class ApiTest extends FixtureTest
        {
                $_GET['q'] = 'othercontact';
                $result    = api_users_search('json');
-               $this->assertOtherUser($result['users'][0]);
+               self::assertOtherUser($result['users'][0]);
        }
 
        /**
@@ -1455,7 +1455,7 @@ class ApiTest extends FixtureTest
        {
                $_GET['q'] = 'othercontact';
                $result    = api_users_search('xml');
-               $this->assertXml($result, 'users');
+               self::assertXml($result, 'users');
        }
 
        /**
@@ -1489,7 +1489,7 @@ class ApiTest extends FixtureTest
        {
                $_REQUEST['user_id'] = $this->otherUser['id'];
                $result              = api_users_lookup('json');
-               $this->assertOtherUser($result['users'][0]);
+               self::assertOtherUser($result['users'][0]);
        }
 
        /**
@@ -1503,8 +1503,8 @@ class ApiTest extends FixtureTest
                $_REQUEST['max_id'] = 10;
                $result             = api_search('json');
                foreach ($result['status'] as $status) {
-                       $this->assertStatus($status);
-                       $this->assertContains('reply', $status['text'], null, true);
+                       self::assertStatus($status);
+                       self::assertContains('reply', $status['text'], null, true);
                }
        }
 
@@ -1519,8 +1519,8 @@ class ApiTest extends FixtureTest
                $_REQUEST['count'] = 20;
                $result            = api_search('json');
                foreach ($result['status'] as $status) {
-                       $this->assertStatus($status);
-                       $this->assertContains('reply', $status['text'], null, true);
+                       self::assertStatus($status);
+                       self::assertContains('reply', $status['text'], null, true);
                }
        }
 
@@ -1535,8 +1535,8 @@ class ApiTest extends FixtureTest
                $_REQUEST['rpp'] = 20;
                $result          = api_search('json');
                foreach ($result['status'] as $status) {
-                       $this->assertStatus($status);
-                       $this->assertContains('reply', $status['text'], null, true);
+                       self::assertStatus($status);
+                       self::assertContains('reply', $status['text'], null, true);
                }
        }
 
@@ -1550,8 +1550,8 @@ class ApiTest extends FixtureTest
                $_REQUEST['q'] = '%23friendica';
                $result        = api_search('json');
                foreach ($result['status'] as $status) {
-                       $this->assertStatus($status);
-                       $this->assertContains('#friendica', $status['text'], null, true);
+                       self::assertStatus($status);
+                       self::assertContains('#friendica', $status['text'], null, true);
                }
        }
 
@@ -1567,7 +1567,7 @@ class ApiTest extends FixtureTest
                $_REQUEST['q']               = 'friendica';
                $result                      = api_search('json');
                foreach ($result['status'] as $status) {
-                       $this->assertStatus($status);
+                       self::assertStatus($status);
                }
        }
 
@@ -1606,9 +1606,9 @@ class ApiTest extends FixtureTest
                $_REQUEST['exclude_replies'] = true;
                $_REQUEST['conversation_id'] = 1;
                $result                      = api_statuses_home_timeline('json');
-               $this->assertNotEmpty($result['status']);
+               self::assertNotEmpty($result['status']);
                foreach ($result['status'] as $status) {
-                       $this->assertStatus($status);
+                       self::assertStatus($status);
                }
        }
 
@@ -1621,9 +1621,9 @@ class ApiTest extends FixtureTest
        {
                $_REQUEST['page'] = -2;
                $result           = api_statuses_home_timeline('json');
-               $this->assertNotEmpty($result['status']);
+               self::assertNotEmpty($result['status']);
                foreach ($result['status'] as $status) {
-                       $this->assertStatus($status);
+                       self::assertStatus($status);
                }
        }
 
@@ -1648,7 +1648,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesHomeTimelineWithRss()
        {
                $result = api_statuses_home_timeline('rss');
-               $this->assertXml($result, 'statuses');
+               self::assertXml($result, 'statuses');
        }
 
        /**
@@ -1661,9 +1661,9 @@ class ApiTest extends FixtureTest
                $_REQUEST['max_id']          = 10;
                $_REQUEST['conversation_id'] = 1;
                $result                      = api_statuses_public_timeline('json');
-               $this->assertNotEmpty($result['status']);
+               self::assertNotEmpty($result['status']);
                foreach ($result['status'] as $status) {
-                       $this->assertStatus($status);
+                       self::assertStatus($status);
                }
        }
 
@@ -1677,9 +1677,9 @@ class ApiTest extends FixtureTest
                $_REQUEST['max_id']          = 10;
                $_REQUEST['exclude_replies'] = true;
                $result                      = api_statuses_public_timeline('json');
-               $this->assertNotEmpty($result['status']);
+               self::assertNotEmpty($result['status']);
                foreach ($result['status'] as $status) {
-                       $this->assertStatus($status);
+                       self::assertStatus($status);
                }
        }
 
@@ -1692,9 +1692,9 @@ class ApiTest extends FixtureTest
        {
                $_REQUEST['page'] = -2;
                $result           = api_statuses_public_timeline('json');
-               $this->assertNotEmpty($result['status']);
+               self::assertNotEmpty($result['status']);
                foreach ($result['status'] as $status) {
-                       $this->assertStatus($status);
+                       self::assertStatus($status);
                }
        }
 
@@ -1719,7 +1719,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesPublicTimelineWithRss()
        {
                $result = api_statuses_public_timeline('rss');
-               $this->assertXml($result, 'statuses');
+               self::assertXml($result, 'statuses');
        }
 
        /**
@@ -1731,9 +1731,9 @@ class ApiTest extends FixtureTest
        {
                $_REQUEST['max_id'] = 10;
                $result             = api_statuses_networkpublic_timeline('json');
-               $this->assertNotEmpty($result['status']);
+               self::assertNotEmpty($result['status']);
                foreach ($result['status'] as $status) {
-                       $this->assertStatus($status);
+                       self::assertStatus($status);
                }
        }
 
@@ -1746,9 +1746,9 @@ class ApiTest extends FixtureTest
        {
                $_REQUEST['page'] = -2;
                $result           = api_statuses_networkpublic_timeline('json');
-               $this->assertNotEmpty($result['status']);
+               self::assertNotEmpty($result['status']);
                foreach ($result['status'] as $status) {
-                       $this->assertStatus($status);
+                       self::assertStatus($status);
                }
        }
 
@@ -1773,7 +1773,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesNetworkpublicTimelineWithRss()
        {
                $result = api_statuses_networkpublic_timeline('rss');
-               $this->assertXml($result, 'statuses');
+               self::assertXml($result, 'statuses');
        }
 
        /**
@@ -1796,7 +1796,7 @@ class ApiTest extends FixtureTest
        {
                $this->app->argv[3] = 1;
                $result             = api_statuses_show('json');
-               $this->assertStatus($result['status']);
+               self::assertStatus($result['status']);
        }
 
        /**
@@ -1809,9 +1809,9 @@ class ApiTest extends FixtureTest
                $this->app->argv[3]       = 1;
                $_REQUEST['conversation'] = 1;
                $result                   = api_statuses_show('json');
-               $this->assertNotEmpty($result['status']);
+               self::assertNotEmpty($result['status']);
                foreach ($result['status'] as $status) {
-                       $this->assertStatus($status);
+                       self::assertStatus($status);
                }
        }
 
@@ -1850,9 +1850,9 @@ class ApiTest extends FixtureTest
                $_REQUEST['max_id'] = 10;
                $_REQUEST['page']   = -2;
                $result             = api_conversation_show('json');
-               $this->assertNotEmpty($result['status']);
+               self::assertNotEmpty($result['status']);
                foreach ($result['status'] as $status) {
-                       $this->assertStatus($status);
+                       self::assertStatus($status);
                }
        }
 
@@ -1901,12 +1901,12 @@ class ApiTest extends FixtureTest
        {
                $this->app->argv[3] = 1;
                $result             = api_statuses_repeat('json');
-               $this->assertStatus($result['status']);
+               self::assertStatus($result['status']);
 
                // Also test with a shared status
                $this->app->argv[3] = 5;
                $result             = api_statuses_repeat('json');
-               $this->assertStatus($result['status']);
+               self::assertStatus($result['status']);
        }
 
        /**
@@ -1941,7 +1941,7 @@ class ApiTest extends FixtureTest
        {
                $this->app->argv[3] = 1;
                $result             = api_statuses_destroy('json');
-               $this->assertStatus($result['status']);
+               self::assertStatus($result['status']);
        }
 
        /**
@@ -1954,7 +1954,7 @@ class ApiTest extends FixtureTest
                $this->app->user    = ['nickname' => $this->selfUser['nick']];
                $_REQUEST['max_id'] = 10;
                $result             = api_statuses_mentions('json');
-               $this->assertEmpty($result['status']);
+               self::assertEmpty($result['status']);
                // We should test with mentions in the database.
        }
 
@@ -1967,7 +1967,7 @@ class ApiTest extends FixtureTest
        {
                $_REQUEST['page'] = -2;
                $result           = api_statuses_mentions('json');
-               $this->assertEmpty($result['status']);
+               self::assertEmpty($result['status']);
        }
 
        /**
@@ -1991,7 +1991,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesMentionsWithRss()
        {
                $result = api_statuses_mentions('rss');
-               $this->assertXml($result, 'statuses');
+               self::assertXml($result, 'statuses');
        }
 
        /**
@@ -2005,9 +2005,9 @@ class ApiTest extends FixtureTest
                $_REQUEST['exclude_replies'] = true;
                $_REQUEST['conversation_id'] = 1;
                $result                      = api_statuses_user_timeline('json');
-               $this->assertNotEmpty($result['status']);
+               self::assertNotEmpty($result['status']);
                foreach ($result['status'] as $status) {
-                       $this->assertStatus($status);
+                       self::assertStatus($status);
                }
        }
 
@@ -2020,9 +2020,9 @@ class ApiTest extends FixtureTest
        {
                $_REQUEST['page'] = -2;
                $result           = api_statuses_user_timeline('json');
-               $this->assertNotEmpty($result['status']);
+               self::assertNotEmpty($result['status']);
                foreach ($result['status'] as $status) {
-                       $this->assertStatus($status);
+                       self::assertStatus($status);
                }
        }
 
@@ -2034,7 +2034,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesUserTimelineWithRss()
        {
                $result = api_statuses_user_timeline('rss');
-               $this->assertXml($result, 'statuses');
+               self::assertXml($result, 'statuses');
        }
 
        /**
@@ -2101,7 +2101,7 @@ class ApiTest extends FixtureTest
                $this->app->argc = count($this->app->argv);
                $_REQUEST['id']  = 3;
                $result          = api_favorites_create_destroy('json');
-               $this->assertStatus($result['status']);
+               self::assertStatus($result['status']);
        }
 
        /**
@@ -2115,7 +2115,7 @@ class ApiTest extends FixtureTest
                $this->app->argc = count($this->app->argv);
                $_REQUEST['id']  = 3;
                $result          = api_favorites_create_destroy('rss');
-               $this->assertXml($result, 'status');
+               self::assertXml($result, 'status');
        }
 
        /**
@@ -2129,7 +2129,7 @@ class ApiTest extends FixtureTest
                $this->app->argc = count($this->app->argv);
                $_REQUEST['id']  = 3;
                $result          = api_favorites_create_destroy('json');
-               $this->assertStatus($result['status']);
+               self::assertStatus($result['status']);
        }
 
        /**
@@ -2157,7 +2157,7 @@ class ApiTest extends FixtureTest
                $_REQUEST['max_id'] = 10;
                $result             = api_favorites('json');
                foreach ($result['status'] as $status) {
-                       $this->assertStatus($status);
+                       self::assertStatus($status);
                }
        }
 
@@ -2169,7 +2169,7 @@ class ApiTest extends FixtureTest
        public function testApiFavoritesWithRss()
        {
                $result = api_favorites('rss');
-               $this->assertXml($result, 'statuses');
+               self::assertXml($result, 'statuses');
        }
 
        /**
@@ -2197,12 +2197,12 @@ class ApiTest extends FixtureTest
                        ['id' => 2, 'screen_name' => 'recipient_name'],
                        ['id' => 3, 'screen_name' => 'sender_name']
                );
-               $this->assertEquals('item_title' . "\n" . 'item_body', $result['text']);
-               $this->assertEquals(1, $result['id']);
-               $this->assertEquals(2, $result['recipient_id']);
-               $this->assertEquals(3, $result['sender_id']);
-               $this->assertEquals('recipient_name', $result['recipient_screen_name']);
-               $this->assertEquals('sender_name', $result['sender_screen_name']);
+               self::assertEquals('item_title' . "\n" . 'item_body', $result['text']);
+               self::assertEquals(1, $result['id']);
+               self::assertEquals(2, $result['recipient_id']);
+               self::assertEquals(3, $result['sender_id']);
+               self::assertEquals('recipient_name', $result['recipient_screen_name']);
+               self::assertEquals('sender_name', $result['sender_screen_name']);
        }
 
        /**
@@ -2218,8 +2218,8 @@ class ApiTest extends FixtureTest
                        ['id' => 2, 'screen_name' => 'recipient_name'],
                        ['id' => 3, 'screen_name' => 'sender_name']
                );
-               $this->assertEquals('item_title', $result['title']);
-               $this->assertEquals('<strong>item_body</strong>', $result['text']);
+               self::assertEquals('item_title', $result['title']);
+               self::assertEquals('<strong>item_body</strong>', $result['text']);
        }
 
        /**
@@ -2235,8 +2235,8 @@ class ApiTest extends FixtureTest
                        ['id' => 2, 'screen_name' => 'recipient_name'],
                        ['id' => 3, 'screen_name' => 'sender_name']
                );
-               $this->assertEquals('item_title', $result['title']);
-               $this->assertEquals('item_body', $result['text']);
+               self::assertEquals('item_title', $result['title']);
+               self::assertEquals('item_body', $result['text']);
        }
 
        /**
@@ -2252,8 +2252,8 @@ class ApiTest extends FixtureTest
                        ['id' => 2, 'screen_name' => 'recipient_name'],
                        ['id' => 3, 'screen_name' => 'sender_name']
                );
-               $this->assertTrue(!isset($result['sender']));
-               $this->assertTrue(!isset($result['recipient']));
+               self::assertTrue(!isset($result['sender']));
+               self::assertTrue(!isset($result['recipient']));
        }
 
        /**
@@ -2294,8 +2294,8 @@ class ApiTest extends FixtureTest
                                'plink'   => 'item_plink'
                        ]
                );
-               $this->assertStringStartsWith('item_title', $result['text']);
-               $this->assertStringStartsWith('<h4>item_title</h4><br>perspiciatis impedit voluptatem', $result['html']);
+               self::assertStringStartsWith('item_title', $result['text']);
+               self::assertStringStartsWith('<h4>item_title</h4><br>perspiciatis impedit voluptatem', $result['html']);
        }
 
        /**
@@ -2313,8 +2313,8 @@ class ApiTest extends FixtureTest
                                'plink'   => 'item_plink'
                        ]
                );
-               $this->assertEquals('item_title', $result['text']);
-               $this->assertEquals('<h4>item_title</h4><br>item_plink', $result['html']);
+               self::assertEquals('item_title', $result['text']);
+               self::assertEquals('<h4>item_title</h4><br>item_plink', $result['html']);
        }
 
        /**
@@ -2330,8 +2330,8 @@ class ApiTest extends FixtureTest
                                'body'  => 'item_title item_body'
                        ]
                );
-               $this->assertEquals('item_title item_body', $result['text']);
-               $this->assertEquals('<h4>item_title</h4><br>item_title item_body', $result['html']);
+               self::assertEquals('item_title item_body', $result['text']);
+               self::assertEquals('<h4>item_title</h4><br>item_title item_body', $result['html']);
        }
 
        /**
@@ -2342,7 +2342,7 @@ class ApiTest extends FixtureTest
        public function testApiGetAttachments()
        {
                $body = 'body';
-               $this->assertEmpty(api_get_attachments($body));
+               self::assertEmpty(api_get_attachments($body));
        }
 
        /**
@@ -2353,7 +2353,7 @@ class ApiTest extends FixtureTest
        public function testApiGetAttachmentsWithImage()
        {
                $body = '[img]http://via.placeholder.com/1x1.png[/img]';
-               $this->assertInternalType('array', api_get_attachments($body));
+               self::assertInternalType('array', api_get_attachments($body));
        }
 
        /**
@@ -2365,7 +2365,7 @@ class ApiTest extends FixtureTest
        {
                $_SERVER['HTTP_USER_AGENT'] = 'AndStatus';
                $body                       = '[img]http://via.placeholder.com/1x1.png[/img]';
-               $this->assertInternalType('array', api_get_attachments($body));
+               self::assertInternalType('array', api_get_attachments($body));
        }
 
        /**
@@ -2376,7 +2376,7 @@ class ApiTest extends FixtureTest
        public function testApiGetEntitities()
        {
                $text = 'text';
-               $this->assertInternalType('array', api_get_entitities($text, 'bbcode'));
+               self::assertInternalType('array', api_get_entitities($text, 'bbcode'));
        }
 
        /**
@@ -2389,10 +2389,10 @@ class ApiTest extends FixtureTest
                $_REQUEST['include_entities'] = 'true';
                $text                         = 'text';
                $result                       = api_get_entitities($text, 'bbcode');
-               $this->assertInternalType('array', $result['hashtags']);
-               $this->assertInternalType('array', $result['symbols']);
-               $this->assertInternalType('array', $result['urls']);
-               $this->assertInternalType('array', $result['user_mentions']);
+               self::assertInternalType('array', $result['hashtags']);
+               self::assertInternalType('array', $result['symbols']);
+               self::assertInternalType('array', $result['urls']);
+               self::assertInternalType('array', $result['user_mentions']);
        }
 
        /**
@@ -2402,7 +2402,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiFormatItemsEmbededImages()
        {
-               $this->assertEquals(
+               self::assertEquals(
                        'text ' . DI::baseUrl() . '/display/item_guid',
                        api_format_items_embeded_images(['guid' => 'item_guid'], 'text data:image/foo')
                );
@@ -2415,7 +2415,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiContactlinkToArray()
        {
-               $this->assertEquals(
+               self::assertEquals(
                        [
                                'name' => 'text',
                                'url'  => '',
@@ -2431,7 +2431,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiContactlinkToArrayWithUrl()
        {
-               $this->assertEquals(
+               self::assertEquals(
                        [
                                'name' => ['link_text'],
                                'url'  => ['url'],
@@ -2449,11 +2449,11 @@ class ApiTest extends FixtureTest
        {
                $item   = ['uid' => 0, 'uri' => ''];
                $result = api_format_items_activities($item);
-               $this->assertArrayHasKey('like', $result);
-               $this->assertArrayHasKey('dislike', $result);
-               $this->assertArrayHasKey('attendyes', $result);
-               $this->assertArrayHasKey('attendno', $result);
-               $this->assertArrayHasKey('attendmaybe', $result);
+               self::assertArrayHasKey('like', $result);
+               self::assertArrayHasKey('dislike', $result);
+               self::assertArrayHasKey('attendyes', $result);
+               self::assertArrayHasKey('attendno', $result);
+               self::assertArrayHasKey('attendmaybe', $result);
        }
 
        /**
@@ -2465,11 +2465,11 @@ class ApiTest extends FixtureTest
        {
                $item   = ['uid' => 0, 'uri' => ''];
                $result = api_format_items_activities($item, 'xml');
-               $this->assertArrayHasKey('friendica:like', $result);
-               $this->assertArrayHasKey('friendica:dislike', $result);
-               $this->assertArrayHasKey('friendica:attendyes', $result);
-               $this->assertArrayHasKey('friendica:attendno', $result);
-               $this->assertArrayHasKey('friendica:attendmaybe', $result);
+               self::assertArrayHasKey('friendica:like', $result);
+               self::assertArrayHasKey('friendica:dislike', $result);
+               self::assertArrayHasKey('friendica:attendyes', $result);
+               self::assertArrayHasKey('friendica:attendno', $result);
+               self::assertArrayHasKey('friendica:attendmaybe', $result);
        }
 
        /**
@@ -2494,7 +2494,7 @@ class ApiTest extends FixtureTest
                ];
                $result = api_format_items($items, ['id' => 0], true);
                foreach ($result as $status) {
-                       $this->assertStatus($status);
+                       self::assertStatus($status);
                }
        }
 
@@ -2518,7 +2518,7 @@ class ApiTest extends FixtureTest
                ];
                $result = api_format_items($items, ['id' => 0], true, 'xml');
                foreach ($result as $status) {
-                       $this->assertStatus($status);
+                       self::assertStatus($status);
                }
        }
 
@@ -2530,9 +2530,9 @@ class ApiTest extends FixtureTest
        public function testApiAccountRateLimitStatus()
        {
                $result = api_account_rate_limit_status('json');
-               $this->assertEquals(150, $result['hash']['remaining_hits']);
-               $this->assertEquals(150, $result['hash']['hourly_limit']);
-               $this->assertInternalType('int', $result['hash']['reset_time_in_seconds']);
+               self::assertEquals(150, $result['hash']['remaining_hits']);
+               self::assertEquals(150, $result['hash']['hourly_limit']);
+               self::assertInternalType('int', $result['hash']['reset_time_in_seconds']);
        }
 
        /**
@@ -2543,7 +2543,7 @@ class ApiTest extends FixtureTest
        public function testApiAccountRateLimitStatusWithXml()
        {
                $result = api_account_rate_limit_status('xml');
-               $this->assertXml($result, 'hash');
+               self::assertXml($result, 'hash');
        }
 
        /**
@@ -2554,7 +2554,7 @@ class ApiTest extends FixtureTest
        public function testApiHelpTest()
        {
                $result = api_help_test('json');
-               $this->assertEquals(['ok' => 'ok'], $result);
+               self::assertEquals(['ok' => 'ok'], $result);
        }
 
        /**
@@ -2565,7 +2565,7 @@ class ApiTest extends FixtureTest
        public function testApiHelpTestWithXml()
        {
                $result = api_help_test('xml');
-               $this->assertXml($result, 'ok');
+               self::assertXml($result, 'ok');
        }
 
        /**
@@ -2576,7 +2576,7 @@ class ApiTest extends FixtureTest
        public function testApiListsList()
        {
                $result = api_lists_list('json');
-               $this->assertEquals(['lists_list' => []], $result);
+               self::assertEquals(['lists_list' => []], $result);
        }
 
        /**
@@ -2588,7 +2588,7 @@ class ApiTest extends FixtureTest
        {
                $result = api_lists_ownerships('json');
                foreach ($result['lists']['lists'] as $list) {
-                       $this->assertList($list);
+                       self::assertList($list);
                }
        }
 
@@ -2627,7 +2627,7 @@ class ApiTest extends FixtureTest
                $_REQUEST['max_id']  = 10;
                $result              = api_lists_statuses('json');
                foreach ($result['status'] as $status) {
-                       $this->assertStatus($status);
+                       self::assertStatus($status);
                }
        }
 
@@ -2640,7 +2640,7 @@ class ApiTest extends FixtureTest
        {
                $_REQUEST['list_id'] = 1;
                $result              = api_lists_statuses('rss');
-               $this->assertXml($result, 'statuses');
+               self::assertXml($result, 'statuses');
        }
 
        /**
@@ -2665,7 +2665,7 @@ class ApiTest extends FixtureTest
        {
                $_GET['page'] = -1;
                $result       = api_statuses_f('friends');
-               $this->assertArrayHasKey('user', $result);
+               self::assertArrayHasKey('user', $result);
        }
 
        /**
@@ -2676,7 +2676,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesFWithFollowers()
        {
                $result = api_statuses_f('followers');
-               $this->assertArrayHasKey('user', $result);
+               self::assertArrayHasKey('user', $result);
        }
 
        /**
@@ -2687,7 +2687,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesFWithBlocks()
        {
                $result = api_statuses_f('blocks');
-               $this->assertArrayHasKey('user', $result);
+               self::assertArrayHasKey('user', $result);
        }
 
        /**
@@ -2698,7 +2698,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesFWithIncoming()
        {
                $result = api_statuses_f('incoming');
-               $this->assertArrayHasKey('user', $result);
+               self::assertArrayHasKey('user', $result);
        }
 
        /**
@@ -2709,7 +2709,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesFWithUndefinedCursor()
        {
                $_GET['cursor'] = 'undefined';
-               $this->assertFalse(api_statuses_f('friends'));
+               self::assertFalse(api_statuses_f('friends'));
        }
 
        /**
@@ -2720,7 +2720,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesFriends()
        {
                $result = api_statuses_friends('json');
-               $this->assertArrayHasKey('user', $result);
+               self::assertArrayHasKey('user', $result);
        }
 
        /**
@@ -2731,7 +2731,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesFriendsWithUndefinedCursor()
        {
                $_GET['cursor'] = 'undefined';
-               $this->assertFalse(api_statuses_friends('json'));
+               self::assertFalse(api_statuses_friends('json'));
        }
 
        /**
@@ -2742,7 +2742,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesFollowers()
        {
                $result = api_statuses_followers('json');
-               $this->assertArrayHasKey('user', $result);
+               self::assertArrayHasKey('user', $result);
        }
 
        /**
@@ -2753,7 +2753,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesFollowersWithUndefinedCursor()
        {
                $_GET['cursor'] = 'undefined';
-               $this->assertFalse(api_statuses_followers('json'));
+               self::assertFalse(api_statuses_followers('json'));
        }
 
        /**
@@ -2764,7 +2764,7 @@ class ApiTest extends FixtureTest
        public function testApiBlocksList()
        {
                $result = api_blocks_list('json');
-               $this->assertArrayHasKey('user', $result);
+               self::assertArrayHasKey('user', $result);
        }
 
        /**
@@ -2775,7 +2775,7 @@ class ApiTest extends FixtureTest
        public function testApiBlocksListWithUndefinedCursor()
        {
                $_GET['cursor'] = 'undefined';
-               $this->assertFalse(api_blocks_list('json'));
+               self::assertFalse(api_blocks_list('json'));
        }
 
        /**
@@ -2786,7 +2786,7 @@ class ApiTest extends FixtureTest
        public function testApiFriendshipsIncoming()
        {
                $result = api_friendships_incoming('json');
-               $this->assertArrayHasKey('id', $result);
+               self::assertArrayHasKey('id', $result);
        }
 
        /**
@@ -2797,7 +2797,7 @@ class ApiTest extends FixtureTest
        public function testApiFriendshipsIncomingWithUndefinedCursor()
        {
                $_GET['cursor'] = 'undefined';
-               $this->assertFalse(api_friendships_incoming('json'));
+               self::assertFalse(api_friendships_incoming('json'));
        }
 
        /**
@@ -2808,16 +2808,16 @@ class ApiTest extends FixtureTest
        public function testApiStatusnetConfig()
        {
                $result = api_statusnet_config('json');
-               $this->assertEquals('localhost', $result['config']['site']['server']);
-               $this->assertEquals('default', $result['config']['site']['theme']);
-               $this->assertEquals(DI::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']);
-               $this->assertEquals(200000, $result['config']['site']['textlimit']);
-               $this->assertEquals('false', $result['config']['site']['private']);
-               $this->assertEquals('false', $result['config']['site']['ssl']);
-               $this->assertEquals(30, $result['config']['site']['shorturllength']);
+               self::assertEquals('localhost', $result['config']['site']['server']);
+               self::assertEquals('default', $result['config']['site']['theme']);
+               self::assertEquals(DI::baseUrl() . '/images/friendica-64.png', $result['config']['site']['logo']);
+               self::assertTrue($result['config']['site']['fancy']);
+               self::assertEquals('en', $result['config']['site']['language']);
+               self::assertEquals('UTC', $result['config']['site']['timezone']);
+               self::assertEquals(200000, $result['config']['site']['textlimit']);
+               self::assertEquals('false', $result['config']['site']['private']);
+               self::assertEquals('false', $result['config']['site']['ssl']);
+               self::assertEquals(30, $result['config']['site']['shorturllength']);
        }
 
        /**
@@ -2828,7 +2828,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusnetVersion()
        {
                $result = api_statusnet_version('json');
-               $this->assertEquals('0.9.7', $result['version']);
+               self::assertEquals('0.9.7', $result['version']);
        }
 
        /**
@@ -2839,7 +2839,7 @@ class ApiTest extends FixtureTest
        public function testApiDirectMessagesNew()
        {
                $result = api_direct_messages_new('json');
-               $this->assertNull($result);
+               self::assertNull($result);
        }
 
        /**
@@ -2864,7 +2864,7 @@ class ApiTest extends FixtureTest
                $_POST['text']    = 'message_text';
                $_POST['user_id'] = $this->otherUser['id'];
                $result           = api_direct_messages_new('json');
-               $this->assertEquals(['direct_message' => ['error' => -1]], $result);
+               self::assertEquals(['direct_message' => ['error' => -1]], $result);
        }
 
        /**
@@ -2878,9 +2878,9 @@ class ApiTest extends FixtureTest
                $_POST['text']        = 'message_text';
                $_POST['screen_name'] = $this->friendUser['nick'];
                $result               = api_direct_messages_new('json');
-               $this->assertContains('message_text', $result['direct_message']['text']);
-               $this->assertEquals('selfcontact', $result['direct_message']['sender_screen_name']);
-               $this->assertEquals(1, $result['direct_message']['friendica_seen']);
+               self::assertContains('message_text', $result['direct_message']['text']);
+               self::assertEquals('selfcontact', $result['direct_message']['sender_screen_name']);
+               self::assertEquals(1, $result['direct_message']['friendica_seen']);
        }
 
        /**
@@ -2895,10 +2895,10 @@ class ApiTest extends FixtureTest
                $_POST['screen_name'] = $this->friendUser['nick'];
                $_REQUEST['title']    = 'message_title';
                $result               = api_direct_messages_new('json');
-               $this->assertContains('message_text', $result['direct_message']['text']);
-               $this->assertContains('message_title', $result['direct_message']['text']);
-               $this->assertEquals('selfcontact', $result['direct_message']['sender_screen_name']);
-               $this->assertEquals(1, $result['direct_message']['friendica_seen']);
+               self::assertContains('message_text', $result['direct_message']['text']);
+               self::assertContains('message_title', $result['direct_message']['text']);
+               self::assertEquals('selfcontact', $result['direct_message']['sender_screen_name']);
+               self::assertEquals(1, $result['direct_message']['friendica_seen']);
        }
 
        /**
@@ -2912,7 +2912,7 @@ class ApiTest extends FixtureTest
                $_POST['text']        = 'message_text';
                $_POST['screen_name'] = $this->friendUser['nick'];
                $result               = api_direct_messages_new('rss');
-               $this->assertXml($result, 'direct-messages');
+               self::assertXml($result, 'direct-messages');
        }
 
        /**
@@ -2935,7 +2935,7 @@ class ApiTest extends FixtureTest
        {
                $_GET['friendica_verbose'] = 'true';
                $result                    = api_direct_messages_destroy('json');
-               $this->assertEquals(
+               self::assertEquals(
                        [
                                '$result' => [
                                        'result'  => 'error',
@@ -2981,7 +2981,7 @@ class ApiTest extends FixtureTest
                $_REQUEST['friendica_parenturi'] = 'parent_uri';
                $_GET['friendica_verbose']       = 'true';
                $result                          = api_direct_messages_destroy('json');
-               $this->assertEquals(
+               self::assertEquals(
                        [
                                '$result' => [
                                        'result'  => 'error',
@@ -3012,7 +3012,7 @@ class ApiTest extends FixtureTest
                $_REQUEST['page']   = -1;
                $_REQUEST['max_id'] = 10;
                $result             = api_direct_messages_box('json', 'sentbox', 'false');
-               $this->assertArrayHasKey('direct_message', $result);
+               self::assertArrayHasKey('direct_message', $result);
        }
 
        /**
@@ -3023,7 +3023,7 @@ class ApiTest extends FixtureTest
        public function testApiDirectMessagesBoxWithConversation()
        {
                $result = api_direct_messages_box('json', 'conversation', 'false');
-               $this->assertArrayHasKey('direct_message', $result);
+               self::assertArrayHasKey('direct_message', $result);
        }
 
        /**
@@ -3034,7 +3034,7 @@ class ApiTest extends FixtureTest
        public function testApiDirectMessagesBoxWithAll()
        {
                $result = api_direct_messages_box('json', 'all', 'false');
-               $this->assertArrayHasKey('direct_message', $result);
+               self::assertArrayHasKey('direct_message', $result);
        }
 
        /**
@@ -3045,7 +3045,7 @@ class ApiTest extends FixtureTest
        public function testApiDirectMessagesBoxWithInbox()
        {
                $result = api_direct_messages_box('json', 'inbox', 'false');
-               $this->assertArrayHasKey('direct_message', $result);
+               self::assertArrayHasKey('direct_message', $result);
        }
 
        /**
@@ -3056,7 +3056,7 @@ class ApiTest extends FixtureTest
        public function testApiDirectMessagesBoxWithVerbose()
        {
                $result = api_direct_messages_box('json', 'sentbox', 'true');
-               $this->assertEquals(
+               self::assertEquals(
                        [
                                '$result' => [
                                        'result'  => 'error',
@@ -3075,7 +3075,7 @@ class ApiTest extends FixtureTest
        public function testApiDirectMessagesBoxWithRss()
        {
                $result = api_direct_messages_box('rss', 'sentbox', 'false');
-               $this->assertXml($result, 'direct-messages');
+               self::assertXml($result, 'direct-messages');
        }
 
        /**
@@ -3099,7 +3099,7 @@ class ApiTest extends FixtureTest
        public function testApiDirectMessagesSentbox()
        {
                $result = api_direct_messages_sentbox('json');
-               $this->assertArrayHasKey('direct_message', $result);
+               self::assertArrayHasKey('direct_message', $result);
        }
 
        /**
@@ -3110,7 +3110,7 @@ class ApiTest extends FixtureTest
        public function testApiDirectMessagesInbox()
        {
                $result = api_direct_messages_inbox('json');
-               $this->assertArrayHasKey('direct_message', $result);
+               self::assertArrayHasKey('direct_message', $result);
        }
 
        /**
@@ -3121,7 +3121,7 @@ class ApiTest extends FixtureTest
        public function testApiDirectMessagesAll()
        {
                $result = api_direct_messages_all('json');
-               $this->assertArrayHasKey('direct_message', $result);
+               self::assertArrayHasKey('direct_message', $result);
        }
 
        /**
@@ -3132,7 +3132,7 @@ class ApiTest extends FixtureTest
        public function testApiDirectMessagesConversation()
        {
                $result = api_direct_messages_conversation('json');
-               $this->assertArrayHasKey('direct_message', $result);
+               self::assertArrayHasKey('direct_message', $result);
        }
 
        /**
@@ -3254,7 +3254,7 @@ class ApiTest extends FixtureTest
        public function testApiFrPhotosList()
        {
                $result = api_fr_photos_list('json');
-               $this->assertArrayHasKey('photo', $result);
+               self::assertArrayHasKey('photo', $result);
        }
 
        /**
@@ -3460,12 +3460,12 @@ class ApiTest extends FixtureTest
                $_POST['description'] = 'new_description';
                $result               = api_account_update_profile('json');
                // We can't use assertSelfUser() here because the user object is missing some properties.
-               $this->assertEquals($this->selfUser['id'], $result['user']['cid']);
-               $this->assertEquals('DFRN', $result['user']['location']);
-               $this->assertEquals($this->selfUser['nick'], $result['user']['screen_name']);
-               $this->assertEquals('dfrn', $result['user']['network']);
-               $this->assertEquals('new_name', $result['user']['name']);
-               $this->assertEquals('new_description', $result['user']['description']);
+               self::assertEquals($this->selfUser['id'], $result['user']['cid']);
+               self::assertEquals('DFRN', $result['user']['location']);
+               self::assertEquals($this->selfUser['nick'], $result['user']['screen_name']);
+               self::assertEquals('dfrn', $result['user']['network']);
+               self::assertEquals('new_name', $result['user']['name']);
+               self::assertEquals('new_description', $result['user']['description']);
        }
 
        /**
@@ -3477,7 +3477,7 @@ class ApiTest extends FixtureTest
        {
                $result = check_acl_input('<aclstring>');
                // Where does this result come from?
-               $this->assertEquals(1, $result);
+               self::assertEquals(1, $result);
        }
 
        /**
@@ -3488,7 +3488,7 @@ class ApiTest extends FixtureTest
        public function testCheckAclInputWithEmptyAclString()
        {
                $result = check_acl_input(' ');
-               $this->assertFalse($result);
+               self::assertFalse($result);
        }
 
        /**
@@ -3567,7 +3567,7 @@ class ApiTest extends FixtureTest
        {
                $item   = ['body' => '', 'author-id' => 1, 'owner-id' => 1];
                $result = api_share_as_retweet($item);
-               $this->assertFalse($result);
+               self::assertFalse($result);
        }
 
        /**
@@ -3588,11 +3588,11 @@ class ApiTest extends FixtureTest
        public function testApiInReplyTo()
        {
                $result = api_in_reply_to(['id' => 0, 'parent' => 0, 'uri' => '', 'thr-parent' => '']);
-               $this->assertArrayHasKey('status_id', $result);
-               $this->assertArrayHasKey('user_id', $result);
-               $this->assertArrayHasKey('status_id_str', $result);
-               $this->assertArrayHasKey('user_id_str', $result);
-               $this->assertArrayHasKey('screen_name', $result);
+               self::assertArrayHasKey('status_id', $result);
+               self::assertArrayHasKey('user_id', $result);
+               self::assertArrayHasKey('status_id_str', $result);
+               self::assertArrayHasKey('user_id_str', $result);
+               self::assertArrayHasKey('screen_name', $result);
        }
 
        /**
@@ -3614,7 +3614,7 @@ class ApiTest extends FixtureTest
        {
                $_REQUEST['include_entities'] = 'true';
                $result                       = api_clean_plain_items('some_text [url="some_url"]some_text[/url]');
-               $this->assertEquals('some_text [url="some_url"]"some_url"[/url]', $result);
+               self::assertEquals('some_text [url="some_url"]"some_url"[/url]', $result);
        }
 
        /**
@@ -3626,7 +3626,7 @@ class ApiTest extends FixtureTest
        {
                $contacts = [];
                $result   = api_best_nickname($contacts);
-               $this->assertNull($result);
+               self::assertNull($result);
        }
 
        /**
@@ -3763,7 +3763,7 @@ class ApiTest extends FixtureTest
                $this->app->argc = count($this->app->argv);
                $_SESSION['uid'] = 41;
                $result          = api_friendica_notification('json');
-               $this->assertEquals(['note' => false], $result);
+               self::assertEquals(['note' => false], $result);
        }
 
        /**
@@ -3783,7 +3783,7 @@ class ApiTest extends FixtureTest
   <note id="1" hash="" type="8" name="Reply to" url="http://localhost/display/1" photo="http://localhost/" date="2020-01-01 12:12:02" msg="A test reply from an item" uid="42" uri-id="" link="http://localhost/notification/1" iid="4" parent="0" parent-uri-id="" seen="0" verb="" otype="item" name_cache="Reply to" msg_cache="A test reply from an item" timestamp="1577880722" date_rel="{$dateRel}" msg_html="A test reply from an item" msg_plain="A test reply from an item"/>
 </notes>
 XML;
-               $this->assertXmlStringEqualsXmlString($assertXml, $result);
+               self::assertXmlStringEqualsXmlString($assertXml, $result);
        }
 
        /**
@@ -3796,7 +3796,7 @@ XML;
                $this->app->argv = ['api', 'friendica', 'notification'];
                $this->app->argc = count($this->app->argv);
                $result          = json_encode(api_friendica_notification('json'));
-               $this->assertJson($result);
+               self::assertJson($result);
        }
 
        /**
@@ -3837,9 +3837,9 @@ XML;
        public function testApiSavedSearchesList()
        {
                $result = api_saved_searches_list('json');
-               $this->assertEquals(1, $result['terms'][0]['id']);
-               $this->assertEquals(1, $result['terms'][0]['id_str']);
-               $this->assertEquals('Saved search', $result['terms'][0]['name']);
-               $this->assertEquals('Saved search', $result['terms'][0]['query']);
+               self::assertEquals(1, $result['terms'][0]['id']);
+               self::assertEquals(1, $result['terms'][0]['id_str']);
+               self::assertEquals('Saved search', $result['terms'][0]['name']);
+               self::assertEquals('Saved search', $result['terms'][0]['query']);
        }
 }
index 9a1b5bdad83ddffcc950c45f59ccd928b85a25b6..0fde3a7e629335cf03e53a80d6552e739accc56d 100644 (file)
@@ -28,11 +28,11 @@ class ArgumentsTest extends TestCase
 {
        private function assertArguments(array $assert, App\Arguments $arguments)
        {
-               $this->assertEquals($assert['queryString'], $arguments->getQueryString());
-               $this->assertEquals($assert['command'], $arguments->getCommand());
-               $this->assertEquals($assert['argv'], $arguments->getArgv());
-               $this->assertEquals($assert['argc'], $arguments->getArgc());
-               $this->assertCount($assert['argc'], $arguments->getArgv());
+               self::assertEquals($assert['queryString'], $arguments->getQueryString());
+               self::assertEquals($assert['command'], $arguments->getCommand());
+               self::assertEquals($assert['argv'], $arguments->getArgv());
+               self::assertEquals($assert['argc'], $arguments->getArgc());
+               self::assertCount($assert['argc'], $arguments->getArgv());
        }
 
        /**
@@ -42,7 +42,7 @@ class ArgumentsTest extends TestCase
        {
                $arguments = new App\Arguments();
 
-               $this->assertArguments([
+               self::assertArguments([
                        'queryString' => '',
                        'command'     => '',
                        'argv'        => [],
@@ -177,7 +177,7 @@ class ArgumentsTest extends TestCase
                $arguments = (new App\Arguments())
                        ->determine($server, $get);
 
-               $this->assertArguments($assert, $arguments);
+               self::assertArguments($assert, $arguments);
        }
 
        /**
@@ -191,13 +191,13 @@ class ArgumentsTest extends TestCase
                        ->determine($server, $get);
 
                for ($i = 0; $i < $arguments->getArgc(); $i++) {
-                       $this->assertTrue($arguments->has($i));
-                       $this->assertEquals($assert['argv'][$i], $arguments->get($i));
+                       self::assertTrue($arguments->has($i));
+                       self::assertEquals($assert['argv'][$i], $arguments->get($i));
                }
 
-               $this->assertFalse($arguments->has($arguments->getArgc()));
-               $this->assertEmpty($arguments->get($arguments->getArgc()));
-               $this->assertEquals('default', $arguments->get($arguments->getArgc(), 'default'));
+               self::assertFalse($arguments->has($arguments->getArgc()));
+               self::assertEmpty($arguments->get($arguments->getArgc()));
+               self::assertEquals('default', $arguments->get($arguments->getArgc(), 'default'));
        }
 
        public function dataStripped()
@@ -242,7 +242,7 @@ class ArgumentsTest extends TestCase
                $arguments = (new App\Arguments())
                        ->determine(['QUERY_STRING' => 'pagename=' . $command . $input,], ['pagename' => $command]);
 
-               $this->assertEquals($command . $assert, $arguments->getQueryString());
+               self::assertEquals($command . $assert, $arguments->getQueryString());
        }
 
        /**
@@ -254,6 +254,6 @@ class ArgumentsTest extends TestCase
 
                $argNew = $argument->determine([], []);
 
-               $this->assertNotSame($argument, $argNew);
+               self::assertNotSame($argument, $argNew);
        }
 }
index 6ea13f1fb48cf8b87cdaac375f4939d32f78213f..9179bfddce8343df072ebecdc53c118c55db83d7 100644 (file)
@@ -66,26 +66,26 @@ class ModeTest extends MockedTest
        public function testItEmpty()
        {
                $mode = new Mode();
-               $this->assertTrue($mode->isInstall());
-               $this->assertFalse($mode->isNormal());
+               self::assertTrue($mode->isInstall());
+               self::assertFalse($mode->isNormal());
        }
 
        public function testWithoutConfig()
        {
                $this->basePathMock->shouldReceive('getPath')->andReturn($this->root->url())->once();
 
-               $this->assertTrue($this->root->hasChild('config/local.config.php'));
+               self::assertTrue($this->root->hasChild('config/local.config.php'));
 
                $this->delConfigFile('local.config.php');
 
-               $this->assertFalse($this->root->hasChild('config/local.config.php'));
+               self::assertFalse($this->root->hasChild('config/local.config.php'));
 
                $mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock);
 
-               $this->assertTrue($mode->isInstall());
-               $this->assertFalse($mode->isNormal());
+               self::assertTrue($mode->isInstall());
+               self::assertFalse($mode->isNormal());
 
-               $this->assertFalse($mode->has(Mode::LOCALCONFIGPRESENT));
+               self::assertFalse($mode->has(Mode::LOCALCONFIGPRESENT));
        }
 
        public function testWithoutDatabase()
@@ -96,11 +96,11 @@ class ModeTest extends MockedTest
 
                $mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock);
 
-               $this->assertFalse($mode->isNormal());
-               $this->assertTrue($mode->isInstall());
+               self::assertFalse($mode->isNormal());
+               self::assertTrue($mode->isInstall());
 
-               $this->assertTrue($mode->has(Mode::LOCALCONFIGPRESENT));
-               $this->assertFalse($mode->has(Mode::DBAVAILABLE));
+               self::assertTrue($mode->has(Mode::LOCALCONFIGPRESENT));
+               self::assertFalse($mode->has(Mode::DBAVAILABLE));
        }
 
        public function testWithoutDatabaseSetup()
@@ -113,10 +113,10 @@ class ModeTest extends MockedTest
 
                $mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock);
 
-               $this->assertFalse($mode->isNormal());
-               $this->assertTrue($mode->isInstall());
+               self::assertFalse($mode->isNormal());
+               self::assertTrue($mode->isInstall());
 
-               $this->assertTrue($mode->has(Mode::LOCALCONFIGPRESENT));
+               self::assertTrue($mode->has(Mode::LOCALCONFIGPRESENT));
        }
 
        public function testWithMaintenanceMode()
@@ -131,11 +131,11 @@ class ModeTest extends MockedTest
 
                $mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock);
 
-               $this->assertFalse($mode->isNormal());
-               $this->assertFalse($mode->isInstall());
+               self::assertFalse($mode->isNormal());
+               self::assertFalse($mode->isInstall());
 
-               $this->assertTrue($mode->has(Mode::DBCONFIGAVAILABLE));
-               $this->assertFalse($mode->has(Mode::MAINTENANCEDISABLED));
+               self::assertTrue($mode->has(Mode::DBCONFIGAVAILABLE));
+               self::assertFalse($mode->has(Mode::MAINTENANCEDISABLED));
        }
 
        public function testNormalMode()
@@ -153,11 +153,11 @@ class ModeTest extends MockedTest
 
                $mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock);
 
-               $this->assertTrue($mode->isNormal());
-               $this->assertFalse($mode->isInstall());
+               self::assertTrue($mode->isNormal());
+               self::assertFalse($mode->isInstall());
 
-               $this->assertTrue($mode->has(Mode::DBCONFIGAVAILABLE));
-               $this->assertTrue($mode->has(Mode::MAINTENANCEDISABLED));
+               self::assertTrue($mode->has(Mode::DBCONFIGAVAILABLE));
+               self::assertTrue($mode->has(Mode::MAINTENANCEDISABLED));
        }
 
        /**
@@ -178,11 +178,11 @@ class ModeTest extends MockedTest
 
                $mode = (new Mode())->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock);
 
-               $this->assertTrue($mode->isNormal());
-               $this->assertFalse($mode->isInstall());
+               self::assertTrue($mode->isNormal());
+               self::assertFalse($mode->isInstall());
 
-               $this->assertTrue($mode->has(Mode::DBCONFIGAVAILABLE));
-               $this->assertTrue($mode->has(Mode::MAINTENANCEDISABLED));
+               self::assertTrue($mode->has(Mode::DBCONFIGAVAILABLE));
+               self::assertTrue($mode->has(Mode::MAINTENANCEDISABLED));
        }
 
        /**
@@ -196,7 +196,7 @@ class ModeTest extends MockedTest
 
                $modeNew = $mode->determine($this->basePathMock, $this->databaseMock, $this->configCacheMock);
 
-               $this->assertNotSame($modeNew, $mode);
+               self::assertNotSame($modeNew, $mode);
        }
 
        /**
@@ -210,7 +210,7 @@ class ModeTest extends MockedTest
 
                $mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect);
 
-               $this->assertTrue($mode->isBackend());
+               self::assertTrue($mode->isBackend());
        }
 
        /**
@@ -224,7 +224,7 @@ class ModeTest extends MockedTest
 
                $mode = (new Mode())->determineRunMode(false, $module, $server, $mobileDetect);
 
-               $this->assertTrue($mode->isBackend());
+               self::assertTrue($mode->isBackend());
        }
 
        /**
@@ -238,7 +238,7 @@ class ModeTest extends MockedTest
 
                $mode = (new Mode())->determineRunMode(false, $module, $server, $mobileDetect);
 
-               $this->assertFalse($mode->isBackend());
+               self::assertFalse($mode->isBackend());
        }
 
        /**
@@ -256,7 +256,7 @@ class ModeTest extends MockedTest
 
                $mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect);
 
-               $this->assertTrue($mode->isAjax());
+               self::assertTrue($mode->isAjax());
        }
 
        /**
@@ -270,7 +270,7 @@ class ModeTest extends MockedTest
 
                $mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect);
 
-               $this->assertFalse($mode->isAjax());
+               self::assertFalse($mode->isAjax());
        }
 
        /**
@@ -286,8 +286,8 @@ class ModeTest extends MockedTest
 
                $mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect);
 
-               $this->assertTrue($mode->isMobile());
-               $this->assertTrue($mode->isTablet());
+               self::assertTrue($mode->isMobile());
+               self::assertTrue($mode->isTablet());
        }
 
 
@@ -304,7 +304,7 @@ class ModeTest extends MockedTest
 
                $mode = (new Mode())->determineRunMode(true, $module, $server, $mobileDetect);
 
-               $this->assertFalse($mode->isMobile());
-               $this->assertFalse($mode->isTablet());
+               self::assertFalse($mode->isMobile());
+               self::assertFalse($mode->isTablet());
        }
 }
index be49a741aaadfea6fda2d2f13737f59548ae9954..a24608eb02e18b47754d4aa43f354c998e50ef4c 100644 (file)
@@ -34,9 +34,9 @@ class ModuleTest extends DatabaseTest
 {
        private function assertModule(array $assert, App\Module $module)
        {
-               $this->assertEquals($assert['isBackend'], $module->isBackend());
-               $this->assertEquals($assert['name'], $module->getName());
-               $this->assertEquals($assert['class'], $module->getClassName());
+               self::assertEquals($assert['isBackend'], $module->isBackend());
+               self::assertEquals($assert['name'], $module->getName());
+               self::assertEquals($assert['class'], $module->getClassName());
        }
 
        /**
@@ -46,7 +46,7 @@ class ModuleTest extends DatabaseTest
        {
                $module = new App\Module();
 
-               $this->assertModule([
+               self::assertModule([
                        'isBackend' => false,
                        'name'      => App\Module::DEFAULT,
                        'class'     => App\Module::DEFAULT_CLASS,
@@ -128,7 +128,7 @@ class ModuleTest extends DatabaseTest
        {
                $module = (new App\Module())->determineModule($args);
 
-               $this->assertModule($assert, $module);
+               self::assertModule($assert, $module);
        }
 
        public function dataModuleClass()
@@ -185,7 +185,7 @@ class ModuleTest extends DatabaseTest
 
                $module = (new App\Module($name))->determineClass(new App\Arguments('', $command), $router, $config);
 
-               $this->assertEquals($assert, $module->getClassName());
+               self::assertEquals($assert, $module->getClassName());
        }
 
        /**
@@ -197,6 +197,6 @@ class ModuleTest extends DatabaseTest
 
                $moduleNew = $module->determineModule(new App\Arguments());
 
-               $this->assertNotSame($moduleNew, $module);
+               self::assertNotSame($moduleNew, $module);
        }
 }
index b9c23a2b234e1e7806b660d850a2319fdcddbb9a..6846f74ff716d64cbe4c709945282a6b317f85ac 100644 (file)
@@ -64,15 +64,15 @@ class RouterTest extends TestCase
                $routeCollector->addRoute([Router::GET], '/variable/{var}', 'VariableModuleClassName');
                $routeCollector->addRoute([Router::GET], '/optionalvariable[/{option}]', 'OptionalVariableModuleClassName');
 
-               $this->assertEquals('IndexModuleClassName', $router->getModuleClass('/'));
-               $this->assertEquals('TestModuleClassName', $router->getModuleClass('/test'));
-               $this->assertEquals('TestGetPostModuleClassName', $router->getModuleClass('/testgetpost'));
-               $this->assertEquals('TestSubModuleClassName', $router->getModuleClass('/test/sub'));
-               $this->assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional'));
-               $this->assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional/option'));
-               $this->assertEquals('VariableModuleClassName', $router->getModuleClass('/variable/123abc'));
-               $this->assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable'));
-               $this->assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable/123abc'));
+               self::assertEquals('IndexModuleClassName', $router->getModuleClass('/'));
+               self::assertEquals('TestModuleClassName', $router->getModuleClass('/test'));
+               self::assertEquals('TestGetPostModuleClassName', $router->getModuleClass('/testgetpost'));
+               self::assertEquals('TestSubModuleClassName', $router->getModuleClass('/test/sub'));
+               self::assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional'));
+               self::assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional/option'));
+               self::assertEquals('VariableModuleClassName', $router->getModuleClass('/variable/123abc'));
+               self::assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable'));
+               self::assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable/123abc'));
        }
 
        public function testPostModuleClass()
@@ -88,15 +88,15 @@ class RouterTest extends TestCase
                $routeCollector->addRoute([Router::POST], '/variable/{var}', 'VariableModuleClassName');
                $routeCollector->addRoute([Router::POST], '/optionalvariable[/{option}]', 'OptionalVariableModuleClassName');
 
-               $this->assertEquals('IndexModuleClassName', $router->getModuleClass('/'));
-               $this->assertEquals('TestModuleClassName', $router->getModuleClass('/test'));
-               $this->assertEquals('TestGetPostModuleClassName', $router->getModuleClass('/testgetpost'));
-               $this->assertEquals('TestSubModuleClassName', $router->getModuleClass('/test/sub'));
-               $this->assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional'));
-               $this->assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional/option'));
-               $this->assertEquals('VariableModuleClassName', $router->getModuleClass('/variable/123abc'));
-               $this->assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable'));
-               $this->assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable/123abc'));
+               self::assertEquals('IndexModuleClassName', $router->getModuleClass('/'));
+               self::assertEquals('TestModuleClassName', $router->getModuleClass('/test'));
+               self::assertEquals('TestGetPostModuleClassName', $router->getModuleClass('/testgetpost'));
+               self::assertEquals('TestSubModuleClassName', $router->getModuleClass('/test/sub'));
+               self::assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional'));
+               self::assertEquals('OptionalModuleClassName', $router->getModuleClass('/optional/option'));
+               self::assertEquals('VariableModuleClassName', $router->getModuleClass('/variable/123abc'));
+               self::assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable'));
+               self::assertEquals('OptionalVariableModuleClassName', $router->getModuleClass('/optionalvariable/123abc'));
        }
 
        public function testGetModuleClassNotFound()
@@ -205,10 +205,10 @@ class RouterTest extends TestCase
                        $this->cache
                ))->loadRoutes($routes);
 
-               $this->assertEquals(Module\Home::class, $router->getModuleClass('/'));
-               $this->assertEquals(Module\Friendica::class, $router->getModuleClass('/group/route'));
-               $this->assertEquals(Module\Xrd::class, $router->getModuleClass('/group2/group3/route'));
-               $this->assertEquals(Module\Profile\Index::class, $router->getModuleClass('/double'));
+               self::assertEquals(Module\Home::class, $router->getModuleClass('/'));
+               self::assertEquals(Module\Friendica::class, $router->getModuleClass('/group/route'));
+               self::assertEquals(Module\Xrd::class, $router->getModuleClass('/group2/group3/route'));
+               self::assertEquals(Module\Profile\Index::class, $router->getModuleClass('/double'));
        }
 
        /**
@@ -221,7 +221,7 @@ class RouterTest extends TestCase
                ], '', $this->l10n, $this->cache))->loadRoutes($routes);
 
                // Don't find GET
-               $this->assertEquals(Module\WellKnown\NodeInfo::class, $router->getModuleClass('/post/it'));
-               $this->assertEquals(Module\Profile\Index::class, $router->getModuleClass('/double'));
+               self::assertEquals(Module\WellKnown\NodeInfo::class, $router->getModuleClass('/post/it'));
+               self::assertEquals(Module\Profile\Index::class, $router->getModuleClass('/double'));
        }
 }
index 8d1be751d6b5a06f3833bfa94fabfb8c96d0d339..b0481be98c84af17d55012cf693d712e82e33d25 100644 (file)
@@ -264,7 +264,7 @@ Installation is finished
 
 
 FIN;
-               $this->assertEquals($finished, $txt);
+               self::assertEquals($finished, $txt);
        }
 
        private function assertStuckDB($txt)
@@ -295,7 +295,7 @@ Could not connect to database.:
 
 FIN;
 
-               $this->assertEquals($finished, $txt);
+               self::assertEquals($finished, $txt);
        }
 
        private function assertStuckURL($txt)
@@ -319,7 +319,7 @@ The Friendica URL has to be set during CLI installation.
 
 FIN;
 
-               $this->assertEquals($finished, $txt);
+               self::assertEquals($finished, $txt);
        }
 
        /**
@@ -333,13 +333,13 @@ FIN;
        public function assertConfigEntry($cat, $key, $assertion = null, $default_value = null)
        {
                if (!empty($assertion[$cat][$key])) {
-                       $this->assertEquals($assertion[$cat][$key], $this->configCache->get($cat, $key));
+                       self::assertEquals($assertion[$cat][$key], $this->configCache->get($cat, $key));
                } elseif (!empty($assertion) && !is_array($assertion)) {
-                       $this->assertEquals($assertion, $this->configCache->get($cat, $key));
+                       self::assertEquals($assertion, $this->configCache->get($cat, $key));
                } elseif (!empty($default_value)) {
-                       $this->assertEquals($default_value, $this->configCache->get($cat, $key));
+                       self::assertEquals($default_value, $this->configCache->get($cat, $key));
                } else {
-                       $this->assertEmpty($this->configCache->get($cat, $key), $this->configCache->get($cat, $key));
+                       self::assertEmpty($this->configCache->get($cat, $key), $this->configCache->get($cat, $key));
                }
        }
 
@@ -358,21 +358,21 @@ FIN;
                        $assertion['database']['hostname'] .= (!empty($assertion['database']['port']) ? ':' . $assertion['database']['port'] : '');
                }
 
-               $this->assertConfigEntry('database', 'hostname', ($saveDb) ? $assertion : null, (!$saveDb || $defaultDb) ? Installer::DEFAULT_HOST : null);
-               $this->assertConfigEntry('database', 'username', ($saveDb) ? $assertion : null);
-               $this->assertConfigEntry('database', 'password', ($saveDb) ? $assertion : null);
-               $this->assertConfigEntry('database', 'database', ($saveDb) ? $assertion : null);
-
-               $this->assertConfigEntry('config', 'admin_email', $assertion);
-               $this->assertConfigEntry('config', 'php_path', trim(shell_exec('which php')));
-               $this->assertConfigEntry('config', 'hostname', $assertion);
-
-               $this->assertConfigEntry('system', 'default_timezone', $assertion, ($default) ? Installer::DEFAULT_TZ : null);
-               $this->assertConfigEntry('system', 'language', $assertion, ($default) ? Installer::DEFAULT_LANG : null);
-               $this->assertConfigEntry('system', 'url', $assertion);
-               $this->assertConfigEntry('system', 'urlpath', $assertion);
-               $this->assertConfigEntry('system', 'ssl_policy', $assertion, ($default) ? App\BaseURL::DEFAULT_SSL_SCHEME : null);
-               $this->assertConfigEntry('system', 'basepath', ($realBasepath) ? $this->root->url() : $assertion);
+               self::assertConfigEntry('database', 'hostname', ($saveDb) ? $assertion : null, (!$saveDb || $defaultDb) ? Installer::DEFAULT_HOST : null);
+               self::assertConfigEntry('database', 'username', ($saveDb) ? $assertion : null);
+               self::assertConfigEntry('database', 'password', ($saveDb) ? $assertion : null);
+               self::assertConfigEntry('database', 'database', ($saveDb) ? $assertion : null);
+
+               self::assertConfigEntry('config', 'admin_email', $assertion);
+               self::assertConfigEntry('config', 'php_path', trim(shell_exec('which php')));
+               self::assertConfigEntry('config', 'hostname', $assertion);
+
+               self::assertConfigEntry('system', 'default_timezone', $assertion, ($default) ? Installer::DEFAULT_TZ : null);
+               self::assertConfigEntry('system', 'language', $assertion, ($default) ? Installer::DEFAULT_LANG : null);
+               self::assertConfigEntry('system', 'url', $assertion);
+               self::assertConfigEntry('system', 'urlpath', $assertion);
+               self::assertConfigEntry('system', 'ssl_policy', $assertion, ($default) ? App\BaseURL::DEFAULT_SSL_SCHEME : null);
+               self::assertConfigEntry('system', 'basepath', ($realBasepath) ? $this->root->url() : $assertion);
        }
 
        /**
@@ -385,7 +385,7 @@ FIN;
 
                $txt = $this->dumpExecute($console);
 
-               $this->assertStuckURL($txt);
+               self::assertStuckURL($txt);
        }
 
        /**
@@ -407,10 +407,10 @@ FIN;
 
                $txt = $this->dumpExecute($console);
 
-               $this->assertFinished($txt, true, false);
-               $this->assertTrue($this->root->hasChild('config' . DIRECTORY_SEPARATOR . 'local.config.php'));
+               self::assertFinished($txt, true, false);
+               self::assertTrue($this->root->hasChild('config' . DIRECTORY_SEPARATOR . 'local.config.php'));
 
-               $this->assertConfig(['config' => ['hostname' => 'friendica.local'], 'system' => ['url' => 'http://friendica.local', 'ssl_policy' => 0, 'urlPath' => '']], false, true, true, true);
+               self::assertConfig(['config' => ['hostname' => 'friendica.local'], 'system' => ['url' => 'http://friendica.local', 'ssl_policy' => 0, 'urlPath' => '']], false, true, true, true);
        }
 
        /**
@@ -481,12 +481,12 @@ CONF;
 
                $txt = $this->dumpExecute($console);
 
-               $this->assertFinished($txt, false, true);
+               self::assertFinished($txt, false, true);
 
-               $this->assertTrue($this->root->hasChild('config' . DIRECTORY_SEPARATOR . 'local.config.php'));
-               $this->assertEquals($config, file_get_contents($this->root->getChild('config' . DIRECTORY_SEPARATOR . 'local.config.php')->url()));
+               self::assertTrue($this->root->hasChild('config' . DIRECTORY_SEPARATOR . 'local.config.php'));
+               self::assertEquals($config, file_get_contents($this->root->getChild('config' . DIRECTORY_SEPARATOR . 'local.config.php')->url()));
 
-               $this->assertConfig($data, true, false, false);
+               self::assertConfig($data, true, false, false);
        }
 
        /**
@@ -504,27 +504,27 @@ CONF;
                $this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 1);
                $this->mockReplaceMacros('testTemplate', \Mockery::any(), '', 1);
 
-               $this->assertTrue(putenv('MYSQL_HOST='     . $data['database']['hostname']));
-               $this->assertTrue(putenv('MYSQL_PORT='     . $data['database']['port']));
-               $this->assertTrue(putenv('MYSQL_DATABASE=' . $data['database']['database']));
-               $this->assertTrue(putenv('MYSQL_USERNAME=' . $data['database']['username']));
-               $this->assertTrue(putenv('MYSQL_PASSWORD=' . $data['database']['password']));
+               self::assertTrue(putenv('MYSQL_HOST='     . $data['database']['hostname']));
+               self::assertTrue(putenv('MYSQL_PORT='     . $data['database']['port']));
+               self::assertTrue(putenv('MYSQL_DATABASE=' . $data['database']['database']));
+               self::assertTrue(putenv('MYSQL_USERNAME=' . $data['database']['username']));
+               self::assertTrue(putenv('MYSQL_PASSWORD=' . $data['database']['password']));
 
-               $this->assertTrue(putenv('FRIENDICA_HOSTNAME='   . $data['config']['hostname']));
-               $this->assertTrue(putenv('FRIENDICA_BASE_PATH='  . $data['system']['basepath']));
-               $this->assertTrue(putenv('FRIENDICA_URL='        . $data['system']['url']));
-               $this->assertTrue(putenv('FRIENDICA_PHP_PATH='   . $data['config']['php_path']));
-               $this->assertTrue(putenv('FRIENDICA_ADMIN_MAIL=' . $data['config']['admin_email']));
-               $this->assertTrue(putenv('FRIENDICA_TZ='         . $data['system']['default_timezone']));
-               $this->assertTrue(putenv('FRIENDICA_LANG='       . $data['system']['language']));
+               self::assertTrue(putenv('FRIENDICA_HOSTNAME='   . $data['config']['hostname']));
+               self::assertTrue(putenv('FRIENDICA_BASE_PATH='  . $data['system']['basepath']));
+               self::assertTrue(putenv('FRIENDICA_URL='        . $data['system']['url']));
+               self::assertTrue(putenv('FRIENDICA_PHP_PATH='   . $data['config']['php_path']));
+               self::assertTrue(putenv('FRIENDICA_ADMIN_MAIL=' . $data['config']['admin_email']));
+               self::assertTrue(putenv('FRIENDICA_TZ='         . $data['system']['default_timezone']));
+               self::assertTrue(putenv('FRIENDICA_LANG='       . $data['system']['language']));
 
                $console = new AutomaticInstallation($this->consoleArgv);
                $console->setOption('savedb', true);
 
                $txt = $this->dumpExecute($console);
 
-               $this->assertFinished($txt, true);
-               $this->assertConfig($data, true, true, false, true);
+               self::assertFinished($txt, true);
+               self::assertConfig($data, true, true, false, true);
        }
 
        /**
@@ -542,26 +542,26 @@ CONF;
                $this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 1);
                $this->mockReplaceMacros('testTemplate', \Mockery::any(), '', 1);
 
-               $this->assertTrue(putenv('MYSQL_HOST=' . $data['database']['hostname']));
-               $this->assertTrue(putenv('MYSQL_PORT=' . $data['database']['port']));
-               $this->assertTrue(putenv('MYSQL_DATABASE=' . $data['database']['database']));
-               $this->assertTrue(putenv('MYSQL_USERNAME=' . $data['database']['username']));
-               $this->assertTrue(putenv('MYSQL_PASSWORD=' . $data['database']['password']));
+               self::assertTrue(putenv('MYSQL_HOST=' . $data['database']['hostname']));
+               self::assertTrue(putenv('MYSQL_PORT=' . $data['database']['port']));
+               self::assertTrue(putenv('MYSQL_DATABASE=' . $data['database']['database']));
+               self::assertTrue(putenv('MYSQL_USERNAME=' . $data['database']['username']));
+               self::assertTrue(putenv('MYSQL_PASSWORD=' . $data['database']['password']));
 
-               $this->assertTrue(putenv('FRIENDICA_HOSTNAME='   . $data['config']['hostname']));
-               $this->assertTrue(putenv('FRIENDICA_BASE_PATH='  . $data['system']['basepath']));
-               $this->assertTrue(putenv('FRIENDICA_URL='        . $data['system']['url']));
-               $this->assertTrue(putenv('FRIENDICA_PHP_PATH='   . $data['config']['php_path']));
-               $this->assertTrue(putenv('FRIENDICA_ADMIN_MAIL=' . $data['config']['admin_email']));
-               $this->assertTrue(putenv('FRIENDICA_TZ='         . $data['system']['default_timezone']));
-               $this->assertTrue(putenv('FRIENDICA_LANG='       . $data['system']['language']));
+               self::assertTrue(putenv('FRIENDICA_HOSTNAME='   . $data['config']['hostname']));
+               self::assertTrue(putenv('FRIENDICA_BASE_PATH='  . $data['system']['basepath']));
+               self::assertTrue(putenv('FRIENDICA_URL='        . $data['system']['url']));
+               self::assertTrue(putenv('FRIENDICA_PHP_PATH='   . $data['config']['php_path']));
+               self::assertTrue(putenv('FRIENDICA_ADMIN_MAIL=' . $data['config']['admin_email']));
+               self::assertTrue(putenv('FRIENDICA_TZ='         . $data['system']['default_timezone']));
+               self::assertTrue(putenv('FRIENDICA_LANG='       . $data['system']['language']));
 
                $console = new AutomaticInstallation($this->consoleArgv);
 
                $txt = $this->dumpExecute($console);
 
-               $this->assertFinished($txt, true);
-               $this->assertConfig($data, false, true, false, true);
+               self::assertFinished($txt, true);
+               self::assertConfig($data, false, true, false, true);
        }
 
        /**
@@ -599,8 +599,8 @@ CONF;
 
                $txt = $this->dumpExecute($console);
 
-               $this->assertFinished($txt, true);
-               $this->assertConfig($data, true, true, true, true);
+               self::assertFinished($txt, true);
+               self::assertConfig($data, true, true, true, true);
        }
 
        /**
@@ -618,10 +618,10 @@ CONF;
 
                $txt = $this->dumpExecute($console);
 
-               $this->assertStuckDB($txt);
-               $this->assertTrue($this->root->hasChild('config' . DIRECTORY_SEPARATOR . 'local.config.php'));
+               self::assertStuckDB($txt);
+               self::assertTrue($this->root->hasChild('config' . DIRECTORY_SEPARATOR . 'local.config.php'));
 
-               $this->assertConfig(['config' => ['hostname' => 'friendica.local'], 'system' => ['url' => 'http://friendica.local', 'ssl_policy' => 0, 'urlpath' => '']], false, true, false, true);
+               self::assertConfig(['config' => ['hostname' => 'friendica.local'], 'system' => ['url' => 'http://friendica.local', 'ssl_policy' => 0, 'urlpath' => '']], false, true, false, true);
        }
 
        public function testGetHelp()
@@ -685,6 +685,6 @@ HELP;
 
                $txt = $this->dumpExecute($console);
 
-               $this->assertEquals($theHelp, $txt);
+               self::assertEquals($theHelp, $txt);
        }
 }
index cfdbf6037702fdd2635ec18ae8cfadbde2134684..837d234b831d5cb062e10caedaf5814ecd8975fe 100644 (file)
@@ -71,7 +71,7 @@ class ConfigConsoleTest extends ConsoleTest
                $console->setArgument(1, 'test');
                $console->setArgument(2, 'now');
                $txt = $this->dumpExecute($console);
-               $this->assertEquals("config.test <= now\n", $txt);
+               self::assertEquals("config.test <= now\n", $txt);
 
                $this->configMock
                        ->shouldReceive('get')
@@ -83,7 +83,7 @@ class ConfigConsoleTest extends ConsoleTest
                $console->setArgument(0, 'config');
                $console->setArgument(1, 'test');
                $txt = $this->dumpExecute($console);
-               $this->assertEquals("config.test => now\n", $txt);
+               self::assertEquals("config.test => now\n", $txt);
 
                $this->configMock
                        ->shouldReceive('get')
@@ -95,7 +95,7 @@ class ConfigConsoleTest extends ConsoleTest
                $console->setArgument(0, 'config');
                $console->setArgument(1, 'test');
                $txt = $this->dumpExecute($console);
-               $this->assertEquals("config.test => \n", $txt);
+               self::assertEquals("config.test => \n", $txt);
        }
 
        function testSetArrayValue() {
@@ -112,7 +112,7 @@ class ConfigConsoleTest extends ConsoleTest
                $console->setArgument(2, 'now');
                $txt = $this->dumpExecute($console);
 
-               $this->assertEquals("[Error] config.test is an array and can't be set using this command.\n", $txt);
+               self::assertEquals("[Error] config.test is an array and can't be set using this command.\n", $txt);
        }
 
        function testTooManyArguments() {
@@ -124,7 +124,7 @@ class ConfigConsoleTest extends ConsoleTest
                $txt = $this->dumpExecute($console);
                $assertion = '[Warning] Too many arguments';
                $firstline = substr($txt, 0, strlen($assertion));
-               $this->assertEquals($assertion, $firstline);
+               self::assertEquals($assertion, $firstline);
        }
 
        function testVerbose() {
@@ -152,7 +152,7 @@ test.it => now
 
 CONF;
                $txt = $this->dumpExecute($console);
-               $this->assertEquals($assertion, $txt);
+               self::assertEquals($assertion, $txt);
        }
 
        function testUnableToSet() {
@@ -171,7 +171,7 @@ CONF;
                $console->setArgument(1, 'it');
                $console->setArgument(2, 'now');
                $txt = $this->dumpExecute($console);
-               $this->assertSame("Unable to set test.it\n", $txt);
+               self::assertSame("Unable to set test.it\n", $txt);
        }
 
        public function testGetHelp()
@@ -212,6 +212,6 @@ HELP;
 
                $txt = $this->dumpExecute($console);
 
-               $this->assertEquals($txt, $theHelp);
+               self::assertEquals($txt, $theHelp);
        }
 }
index 6ba0eb04ddcb11673bee898156ce1dca04d837c8..e06ee3a4ca55199e973bb3aeb70a90ca49226b5d 100644 (file)
@@ -66,7 +66,7 @@ class LockConsoleTest extends ConsoleTest
                $console = new Lock($this->appMode, $this->lockMock, $this->consoleArgv);
                $console->setArgument(0, 'list');
                $txt = $this->dumpExecute($console);
-               $this->assertEquals("Listing all Locks:\ntest\ntest2\n2 locks found\n", $txt);
+               self::assertEquals("Listing all Locks:\ntest\ntest2\n2 locks found\n", $txt);
        }
 
        public function testListPrefix()
@@ -81,7 +81,7 @@ class LockConsoleTest extends ConsoleTest
                $console->setArgument(0, 'list');
                $console->setArgument(1, 'test');
                $txt = $this->dumpExecute($console);
-               $this->assertEquals("Listing all Locks starting with \"test\":\ntest\ntest2\n2 locks found\n", $txt);
+               self::assertEquals("Listing all Locks starting with \"test\":\ntest\ntest2\n2 locks found\n", $txt);
        }
 
        public function testDelLock()
@@ -96,7 +96,7 @@ class LockConsoleTest extends ConsoleTest
                $console->setArgument(0, 'del');
                $console->setArgument(1, 'test');
                $txt = $this->dumpExecute($console);
-               $this->assertEquals("Lock 'test' released.\n", $txt);
+               self::assertEquals("Lock 'test' released.\n", $txt);
        }
 
        public function testDelUnknownLock()
@@ -111,7 +111,7 @@ class LockConsoleTest extends ConsoleTest
                $console->setArgument(0, 'del');
                $console->setArgument(1, 'test');
                $txt = $this->dumpExecute($console);
-               $this->assertEquals("Couldn't release Lock 'test'\n", $txt);
+               self::assertEquals("Couldn't release Lock 'test'\n", $txt);
        }
 
        public function testSetLock()
@@ -131,7 +131,7 @@ class LockConsoleTest extends ConsoleTest
                $console->setArgument(0, 'set');
                $console->setArgument(1, 'test');
                $txt = $this->dumpExecute($console);
-               $this->assertEquals("Lock 'test' acquired.\n", $txt);
+               self::assertEquals("Lock 'test' acquired.\n", $txt);
        }
 
        public function testSetLockIsLocked()
@@ -146,7 +146,7 @@ class LockConsoleTest extends ConsoleTest
                $console->setArgument(0, 'set');
                $console->setArgument(1, 'test');
                $txt = $this->dumpExecute($console);
-               $this->assertEquals("[Error] 'test' is already set.\n", $txt);
+               self::assertEquals("[Error] 'test' is already set.\n", $txt);
        }
 
        public function testSetLockNotWorking()
@@ -166,7 +166,7 @@ class LockConsoleTest extends ConsoleTest
                $console->setArgument(0, 'set');
                $console->setArgument(1, 'test');
                $txt = $this->dumpExecute($console);
-               $this->assertEquals("[Error] Unable to lock 'test'.\n", $txt);
+               self::assertEquals("[Error] Unable to lock 'test'.\n", $txt);
        }
 
        public function testReleaseAll()
@@ -179,7 +179,7 @@ class LockConsoleTest extends ConsoleTest
                $console = new Lock($this->appMode, $this->lockMock, $this->consoleArgv);
                $console->setArgument(0, 'clear');
                $txt = $this->dumpExecute($console);
-               $this->assertEquals("Locks successfully cleared.\n", $txt);
+               self::assertEquals("Locks successfully cleared.\n", $txt);
        }
 
        public function testReleaseAllFailed()
@@ -192,7 +192,7 @@ class LockConsoleTest extends ConsoleTest
                $console = new Lock($this->appMode, $this->lockMock, $this->consoleArgv);
                $console->setArgument(0, 'clear');
                $txt = $this->dumpExecute($console);
-               $this->assertEquals("[Error] Unable to clear the locks.\n", $txt);
+               self::assertEquals("[Error] Unable to clear the locks.\n", $txt);
        }
 
        public function testGetHelp()
@@ -229,6 +229,6 @@ HELP;
 
                $txt = $this->dumpExecute($console);
 
-               $this->assertEquals($txt, $theHelp);
+               self::assertEquals($txt, $theHelp);
        }
 }
index 7b125b8b120b83d65b3166eeb20aac6acd06b30d..8efa8a4a76d6b786b5454d25c318710b379e1acc 100644 (file)
@@ -69,7 +69,7 @@ class ServerBlockConsoleTest extends ConsoleTest
 
 CONS;
 
-               $this->assertEquals($output, $txt);
+               self::assertEquals($output, $txt);
        }
 
        /**
@@ -101,7 +101,7 @@ CONS;
                $console->setArgument(2, 'I like it!');
                $txt = $this->dumpExecute($console);
 
-               $this->assertEquals('The domain \'testme.now\' is now blocked. (Reason: \'I like it!\')' . PHP_EOL, $txt);
+               self::assertEquals('The domain \'testme.now\' is now blocked. (Reason: \'I like it!\')' . PHP_EOL, $txt);
        }
 
        /**
@@ -132,7 +132,7 @@ CONS;
                $console->setArgument(1, 'testme.now');
                $txt = $this->dumpExecute($console);
 
-               $this->assertEquals('The domain \'testme.now\' is now blocked. (Reason: \'' . ServerBlock::DEFAULT_REASON . '\')' . PHP_EOL, $txt);
+               self::assertEquals('The domain \'testme.now\' is now blocked. (Reason: \'' . ServerBlock::DEFAULT_REASON . '\')' . PHP_EOL, $txt);
        }
 
        /**
@@ -169,7 +169,7 @@ CONS;
                $console->setArgument(2, 'Other reason');
                $txt = $this->dumpExecute($console);
 
-               $this->assertEquals('The domain \'pod.ordoevangelistarum.com\' is now updated. (Reason: \'Other reason\')' . PHP_EOL, $txt);
+               self::assertEquals('The domain \'pod.ordoevangelistarum.com\' is now updated. (Reason: \'Other reason\')' . PHP_EOL, $txt);
        }
 
        /**
@@ -201,7 +201,7 @@ CONS;
                $console->setArgument(1, 'pod.ordoevangelistarum.com');
                $txt = $this->dumpExecute($console);
 
-               $this->assertEquals('The domain \'pod.ordoevangelistarum.com\' is not more blocked' . PHP_EOL, $txt);
+               self::assertEquals('The domain \'pod.ordoevangelistarum.com\' is not more blocked' . PHP_EOL, $txt);
        }
 
        /**
@@ -213,7 +213,7 @@ CONS;
                $console->setArgument(0, 'wrongcommand');
                $txt = $this->dumpExecute($console);
 
-               $this->assertStringStartsWith('[Warning] Unknown command', $txt);
+               self::assertStringStartsWith('[Warning] Unknown command', $txt);
        }
 
        /**
@@ -232,7 +232,7 @@ CONS;
                $console->setArgument(1, 'not.exiting');
                $txt = $this->dumpExecute($console);
 
-               $this->assertEquals('The domain \'not.exiting\' is not blocked.' . PHP_EOL, $txt);
+               self::assertEquals('The domain \'not.exiting\' is not blocked.' . PHP_EOL, $txt);
        }
 
        /**
@@ -244,7 +244,7 @@ CONS;
                $console->setArgument(0, 'add');
                $txt = $this->dumpExecute($console);
 
-               $this->assertStringStartsWith('[Warning] Add needs a domain and optional a reason.', $txt);
+               self::assertStringStartsWith('[Warning] Add needs a domain and optional a reason.', $txt);
        }
 
        /**
@@ -275,7 +275,7 @@ CONS;
                $console->setArgument(1, 'testme.now');
                $txt = $this->dumpExecute($console);
 
-               $this->assertEquals('Couldn\'t save \'testme.now\' as blocked server' . PHP_EOL, $txt);
+               self::assertEquals('Couldn\'t save \'testme.now\' as blocked server' . PHP_EOL, $txt);
        }
 
        /**
@@ -307,7 +307,7 @@ CONS;
                $console->setArgument(1, 'pod.ordoevangelistarum.com');
                $txt = $this->dumpExecute($console);
 
-               $this->assertEquals('Couldn\'t remove \'pod.ordoevangelistarum.com\' from blocked servers' . PHP_EOL, $txt);
+               self::assertEquals('Couldn\'t remove \'pod.ordoevangelistarum.com\' from blocked servers' . PHP_EOL, $txt);
        }
 
        /**
@@ -319,7 +319,7 @@ CONS;
                $console->setArgument(0, 'remove');
                $txt = $this->dumpExecute($console);
 
-               $this->assertStringStartsWith('[Warning] Remove needs a second parameter.', $txt);
+               self::assertStringStartsWith('[Warning] Remove needs a second parameter.', $txt);
        }
 
        /**
@@ -357,6 +357,6 @@ Options
 
 HELP;
 
-               $this->assertEquals($help, $txt);
+               self::assertEquals($help, $txt);
        }
 }
index 3604348fff8298bf77c3693c040bc65075ff54a5..f7133566a5430d8b9279ff2fd2801c7ceae289ce 100644 (file)
@@ -87,7 +87,7 @@ class PageInfoTest extends MockedTest
         */
        public function testGetRelevantUrlFromBody($expected, string $body, bool $searchNakedUrls = false)
        {
-               $this->assertSame($expected, PageInfoMock::getRelevantUrlFromBody($body, $searchNakedUrls));
+               self::assertSame($expected, PageInfoMock::getRelevantUrlFromBody($body, $searchNakedUrls));
        }
 
        public function dataStripTrailingUrlFromBody()
@@ -135,6 +135,6 @@ class PageInfoTest extends MockedTest
         */
        public function testStripTrailingUrlFromBody(string $expected, string $body, string $url)
        {
-               $this->assertSame($expected, PageInfoMock::stripTrailingUrlFromBody($body, $url));
+               self::assertSame($expected, PageInfoMock::stripTrailingUrlFromBody($body, $url));
        }
 }
index 4e0859d7c423bced2b038c531dd675a3cf3980bd..27bdead3c154654a39312096541edbf3e929d769 100644 (file)
@@ -62,6 +62,6 @@ class SmiliesTest extends MockedTest
        public function testReplaceFromArray($text, $smilies, $expected)
        {
                $output = Smilies::replaceFromArray($text, $smilies);
-               $this->assertEquals($expected, $output);
+               self::assertEquals($expected, $output);
        }
 }
index 3d1b24fb7912fe42932ecee7689905df5f5af524..ca2ab100070d9b88db99de712e46676500ed24a8 100644 (file)
@@ -57,6 +57,6 @@ class VideoTest extends MockedTest
        {
                $bbCodeVideo = new Video();
 
-               $this->assertEquals($assert, $bbCodeVideo->transform($input));
+               self::assertEquals($assert, $bbCodeVideo->transform($input));
        }
 }
index 77613e891ac24aed4ab6fe29569c13e6cb5ff4c5..17c2bca19bb68202128c699e51894f4e995c8d59 100644 (file)
@@ -169,9 +169,9 @@ class BBCodeTest extends MockedTest
                $output = BBCode::convert($data);
                $assert = '<a href="' . $data . '" target="_blank" rel="noopener noreferrer">' . $data . '</a>';
                if ($assertHTML) {
-                       $this->assertEquals($assert, $output);
+                       self::assertEquals($assert, $output);
                } else {
-                       $this->assertNotEquals($assert, $output);
+                       self::assertNotEquals($assert, $output);
                }
        }
 
@@ -264,7 +264,7 @@ class BBCodeTest extends MockedTest
        {
                $actual = BBCode::convert($text, $try_oembed, $simpleHtml, $forPlaintext);
 
-               $this->assertEquals($expectedHtml, $actual);
+               self::assertEquals($expectedHtml, $actual);
        }
 
        public function dataBBCodesToMarkdown()
@@ -299,6 +299,6 @@ class BBCodeTest extends MockedTest
        {
                $actual = BBCode::toMarkdown($text, $for_diaspora);
 
-               $this->assertEquals($expected, $actual);
+               self::assertEquals($expected, $actual);
        }
 }
index f640c4fb197bed85cc35eee8a216238591f219b4..ca313bec57c6dd5ef0291eca9fd2cc6003ac3156 100644 (file)
@@ -67,7 +67,7 @@ class HTMLTest extends MockedTest
        {
                $output = HTML::toPlaintext($input, 0);
 
-               $this->assertEquals($expected, $output);
+               self::assertEquals($expected, $output);
        }
 
        public function dataHTMLText()
@@ -97,6 +97,6 @@ class HTMLTest extends MockedTest
        {
                $actual = HTML::toBBCode($html);
 
-               $this->assertEquals($expectedBBCode, $actual);
+               self::assertEquals($expectedBBCode, $actual);
        }
 }
index e98b15bdf6ed8080eb4a59e6dda17e3533b91920..1f1146af9a01bd8d4f96070317340071127ff26d 100644 (file)
@@ -67,7 +67,7 @@ class MarkdownTest extends MockedTest
        {
                $output = Markdown::convert($input);
 
-               $this->assertEquals($expected, $output);
+               self::assertEquals($expected, $output);
        }
 
        public function dataMarkdownText()
@@ -93,6 +93,6 @@ class MarkdownTest extends MockedTest
        {
                $actual = Markdown::toBBCode($html);
 
-               $this->assertEquals($expectedBBCode, $actual);
+               self::assertEquals($expectedBBCode, $actual);
        }
 }
index e9a26f2f462a972df2efdddedd525ebeccf812f7..3daf1db6f446734c9d3140ef6d2f0d58c03675ea 100644 (file)
@@ -97,25 +97,25 @@ abstract class CacheTest extends MockedTest
         */
        function testSimple($value1, $value2)
        {
-               $this->assertNull($this->instance->get('value1'));
+               self::assertNull($this->instance->get('value1'));
 
                $this->instance->set('value1', $value1);
                $received = $this->instance->get('value1');
-               $this->assertEquals($value1, $received, 'Value received from cache not equal to the original');
+               self::assertEquals($value1, $received, 'Value received from cache not equal to the original');
 
                $this->instance->set('value1', $value2);
                $received = $this->instance->get('value1');
-               $this->assertEquals($value2, $received, 'Value not overwritten by second set');
+               self::assertEquals($value2, $received, 'Value not overwritten by second set');
 
                $this->instance->set('value2', $value1);
                $received2 = $this->instance->get('value2');
-               $this->assertEquals($value2, $received, 'Value changed while setting other variable');
-               $this->assertEquals($value1, $received2, 'Second value not equal to original');
+               self::assertEquals($value2, $received, 'Value changed while setting other variable');
+               self::assertEquals($value1, $received2, 'Second value not equal to original');
 
-               $this->assertNull($this->instance->get('not_set'), 'Unset value not equal to null');
+               self::assertNull($this->instance->get('not_set'), 'Unset value not equal to null');
 
-               $this->assertTrue($this->instance->delete('value1'));
-               $this->assertNull($this->instance->get('value1'));
+               self::assertTrue($this->instance->delete('value1'));
+               self::assertNull($this->instance->get('value1'));
        }
 
        /**
@@ -135,7 +135,7 @@ abstract class CacheTest extends MockedTest
                $this->instance->set('2_value1', $value3);
                $this->instance->set('3_value1', $value4);
 
-               $this->assertEquals([
+               self::assertEquals([
                        '1_value1' => $value1,
                        '1_value2' => $value2,
                        '2_value1' => $value3,
@@ -147,9 +147,9 @@ abstract class CacheTest extends MockedTest
                        '3_value1' => $this->instance->get('3_value1'),
                ]);
 
-               $this->assertTrue($this->instance->clear());
+               self::assertTrue($this->instance->clear());
 
-               $this->assertEquals([
+               self::assertEquals([
                        '1_value1' => $value1,
                        '1_value2' => $value2,
                        '2_value1' => $value3,
@@ -161,9 +161,9 @@ abstract class CacheTest extends MockedTest
                        '3_value1' => $this->instance->get('3_value1'),
                ]);
 
-               $this->assertTrue($this->instance->clear(false));
+               self::assertTrue($this->instance->clear(false));
 
-               $this->assertEquals([
+               self::assertEquals([
                        '1_value1' => null,
                        '1_value2' => null,
                        '2_value3' => null,
@@ -183,16 +183,16 @@ abstract class CacheTest extends MockedTest
        {
                $this->markTestSkipped('taking too much time without mocking');
 
-               $this->assertNull($this->instance->get('value1'));
+               self::assertNull($this->instance->get('value1'));
 
                $value = 'foobar';
                $this->instance->set('value1', $value, 1);
                $received = $this->instance->get('value1');
-               $this->assertEquals($value, $received, 'Value received from cache not equal to the original');
+               self::assertEquals($value, $received, 'Value received from cache not equal to the original');
 
                sleep(2);
 
-               $this->assertNull($this->instance->get('value1'));
+               self::assertNull($this->instance->get('value1'));
        }
 
        /**
@@ -206,7 +206,7 @@ abstract class CacheTest extends MockedTest
        {
                $this->instance->set('val', $data);
                $received = $this->instance->get('val');
-               $this->assertEquals($data, $received, 'Value type changed from ' . gettype($data) . ' to ' . gettype($received));
+               self::assertEquals($data, $received, 'Value type changed from ' . gettype($data) . ' to ' . gettype($received));
        }
 
        /**
@@ -220,20 +220,20 @@ abstract class CacheTest extends MockedTest
         */
        public function testGetAllKeys($value1, $value2, $value3)
        {
-               $this->assertTrue($this->instance->set('value1', $value1));
-               $this->assertTrue($this->instance->set('value2', $value2));
-               $this->assertTrue($this->instance->set('test_value3', $value3));
+               self::assertTrue($this->instance->set('value1', $value1));
+               self::assertTrue($this->instance->set('value2', $value2));
+               self::assertTrue($this->instance->set('test_value3', $value3));
 
                $list = $this->instance->getAllKeys();
 
-               $this->assertContains('value1', $list);
-               $this->assertContains('value2', $list);
-               $this->assertContains('test_value3', $list);
+               self::assertContains('value1', $list);
+               self::assertContains('value2', $list);
+               self::assertContains('test_value3', $list);
 
                $list = $this->instance->getAllKeys('test');
 
-               $this->assertContains('test_value3', $list);
-               $this->assertNotContains('value1', $list);
-               $this->assertNotContains('value2', $list);
+               self::assertContains('test_value3', $list);
+               self::assertNotContains('value1', $list);
+               self::assertNotContains('value2', $list);
        }
 }
index 8f73d76777e2302d3ea5fc9191693157e30f5d50..003db6ad832af0f807eff1bb37e14d6c873f072c 100644 (file)
@@ -45,15 +45,15 @@ abstract class MemoryCacheTest extends CacheTest
         */
        function testCompareSet($value1, $value2)
        {
-               $this->assertNull($this->instance->get('value1'));
+               self::assertNull($this->instance->get('value1'));
 
                $this->instance->add('value1', $value1);
                $received = $this->instance->get('value1');
-               $this->assertEquals($value1, $received, 'Value received from cache not equal to the original');
+               self::assertEquals($value1, $received, 'Value received from cache not equal to the original');
 
                $this->instance->compareSet('value1', $value1, $value2);
                $received = $this->instance->get('value1');
-               $this->assertEquals($value2, $received, 'Value not overwritten by compareSet');
+               self::assertEquals($value2, $received, 'Value not overwritten by compareSet');
        }
 
        /**
@@ -62,16 +62,16 @@ abstract class MemoryCacheTest extends CacheTest
         */
        function testNegativeCompareSet($value1, $value2)
        {
-               $this->assertNull($this->instance->get('value1'));
+               self::assertNull($this->instance->get('value1'));
 
                $this->instance->add('value1', $value1);
                $received = $this->instance->get('value1');
-               $this->assertEquals($value1, $received, 'Value received from cache not equal to the original');
+               self::assertEquals($value1, $received, 'Value received from cache not equal to the original');
 
                $this->instance->compareSet('value1', 'wrong', $value2);
                $received = $this->instance->get('value1');
-               $this->assertNotEquals($value2, $received, 'Value was wrongly overwritten by compareSet');
-               $this->assertEquals($value1, $received, 'Value was wrongly overwritten by any other value');
+               self::assertNotEquals($value2, $received, 'Value was wrongly overwritten by compareSet');
+               self::assertEquals($value1, $received, 'Value was wrongly overwritten by any other value');
        }
 
        /**
@@ -80,13 +80,13 @@ abstract class MemoryCacheTest extends CacheTest
         */
        function testCompareDelete($data)
        {
-               $this->assertNull($this->instance->get('value1'));
+               self::assertNull($this->instance->get('value1'));
 
                $this->instance->add('value1', $data);
                $received = $this->instance->get('value1');
-               $this->assertEquals($data, $received, 'Value received from cache not equal to the original');
+               self::assertEquals($data, $received, 'Value received from cache not equal to the original');
                $this->instance->compareDelete('value1', $data);
-               $this->assertNull($this->instance->get('value1'), 'Value was not deleted by compareDelete');
+               self::assertNull($this->instance->get('value1'), 'Value was not deleted by compareDelete');
        }
 
        /**
@@ -95,16 +95,16 @@ abstract class MemoryCacheTest extends CacheTest
         */
        function testNegativeCompareDelete($data)
        {
-               $this->assertNull($this->instance->get('value1'));
+               self::assertNull($this->instance->get('value1'));
 
                $this->instance->add('value1', $data);
                $received = $this->instance->get('value1');
-               $this->assertEquals($data, $received, 'Value received from cache not equal to the original');
+               self::assertEquals($data, $received, 'Value received from cache not equal to the original');
                $this->instance->compareDelete('value1', 'wrong');
-               $this->assertNotNull($this->instance->get('value1'), 'Value was wrongly compareDeleted');
+               self::assertNotNull($this->instance->get('value1'), 'Value was wrongly compareDeleted');
 
                $this->instance->compareDelete('value1', $data);
-               $this->assertNull($this->instance->get('value1'), 'Value was wrongly NOT deleted by compareDelete');
+               self::assertNull($this->instance->get('value1'), 'Value was wrongly NOT deleted by compareDelete');
        }
 
        /**
@@ -113,19 +113,19 @@ abstract class MemoryCacheTest extends CacheTest
         */
        function testAdd($value1, $value2)
        {
-               $this->assertNull($this->instance->get('value1'));
+               self::assertNull($this->instance->get('value1'));
 
                $this->instance->add('value1', $value1);
 
                $this->instance->add('value1', $value2);
                $received = $this->instance->get('value1');
-               $this->assertNotEquals($value2, $received, 'Value was wrongly overwritten by add');
-               $this->assertEquals($value1, $received, 'Value was wrongly overwritten by any other value');
+               self::assertNotEquals($value2, $received, 'Value was wrongly overwritten by add');
+               self::assertEquals($value1, $received, 'Value was wrongly overwritten by any other value');
 
                $this->instance->delete('value1');
                $this->instance->add('value1', $value2);
                $received = $this->instance->get('value1');
-               $this->assertEquals($value2, $received, 'Value was not overwritten by add');
-               $this->assertNotEquals($value1, $received, 'Value was not overwritten by any other value');
+               self::assertEquals($value2, $received, 'Value was not overwritten by add');
+               self::assertNotEquals($value1, $received, 'Value was not overwritten by any other value');
        }
 }
index 1acdd1f4fc98682cafb49f66b24f69f91ba6f776..383046b0425a7ecc31b8e4a7b45eeb183d1d35ce 100644 (file)
@@ -52,7 +52,7 @@ class CacheTest extends MockedTest
        {
                foreach ($data as $cat => $values) {
                        foreach ($values as $key => $value) {
-                               $this->assertEquals($data[$cat][$key], $configCache->get($cat, $key));
+                               self::assertEquals($data[$cat][$key], $configCache->get($cat, $key));
                        }
                }
        }
@@ -66,7 +66,7 @@ class CacheTest extends MockedTest
                $configCache = new Cache();
                $configCache->load($data);
 
-               $this->assertConfigValues($data, $configCache);
+               self::assertConfigValues($data, $configCache);
        }
 
        /**
@@ -87,26 +87,26 @@ class CacheTest extends MockedTest
                // doesn't override - Low Priority due Config file
                $configCache->load($override, Cache::SOURCE_FILE);
 
-               $this->assertConfigValues($data, $configCache);
+               self::assertConfigValues($data, $configCache);
 
                // override the value - High Prio due Server Env
                $configCache->load($override, Cache::SOURCE_ENV);
 
-               $this->assertEquals($override['system']['test'], $configCache->get('system', 'test'));
-               $this->assertEquals($override['system']['boolTrue'], $configCache->get('system', 'boolTrue'));
+               self::assertEquals($override['system']['test'], $configCache->get('system', 'test'));
+               self::assertEquals($override['system']['boolTrue'], $configCache->get('system', 'boolTrue'));
 
                // Don't overwrite server ENV variables - even in load mode
                $configCache->load($data, Cache::SOURCE_DB);
 
-               $this->assertEquals($override['system']['test'], $configCache->get('system', 'test'));
-               $this->assertEquals($override['system']['boolTrue'], $configCache->get('system', 'boolTrue'));
+               self::assertEquals($override['system']['test'], $configCache->get('system', 'test'));
+               self::assertEquals($override['system']['boolTrue'], $configCache->get('system', 'boolTrue'));
 
                // Overwrite ENV variables with ENV variables
                $configCache->load($data, Cache::SOURCE_ENV);
 
-               $this->assertConfigValues($data, $configCache);
-               $this->assertNotEquals($override['system']['test'], $configCache->get('system', 'test'));
-               $this->assertNotEquals($override['system']['boolTrue'], $configCache->get('system', 'boolTrue'));
+               self::assertConfigValues($data, $configCache);
+               self::assertNotEquals($override['system']['test'], $configCache->get('system', 'test'));
+               self::assertNotEquals($override['system']['boolTrue'], $configCache->get('system', 'boolTrue'));
        }
 
        /**
@@ -118,15 +118,15 @@ class CacheTest extends MockedTest
 
                // empty dataset
                $configCache->load([]);
-               $this->assertEmpty($configCache->getAll());
+               self::assertEmpty($configCache->getAll());
 
                // wrong dataset
                $configCache->load(['system' => 'not_array']);
-               $this->assertEmpty($configCache->getAll());
+               self::assertEmpty($configCache->getAll());
 
                // incomplete dataset (key is integer ID of the array)
                $configCache->load(['system' => ['value']]);
-               $this->assertEquals('value', $configCache->get('system', 0));
+               self::assertEquals('value', $configCache->get('system', 0));
        }
 
        /**
@@ -140,8 +140,8 @@ class CacheTest extends MockedTest
 
                $all = $configCache->getAll();
 
-               $this->assertContains($data['system'], $all);
-               $this->assertContains($data['config'], $all);
+               self::assertContains($data['system'], $all);
+               self::assertContains($data['config'], $all);
        }
 
        /**
@@ -158,7 +158,7 @@ class CacheTest extends MockedTest
                        }
                }
 
-               $this->assertConfigValues($data, $configCache);
+               self::assertConfigValues($data, $configCache);
        }
 
        /**
@@ -168,7 +168,7 @@ class CacheTest extends MockedTest
        {
                $configCache = new Cache();
 
-               $this->assertNull($configCache->get('something', 'value'));
+               self::assertNull($configCache->get('something', 'value'));
        }
 
        /**
@@ -186,13 +186,13 @@ class CacheTest extends MockedTest
                        ],
                ]);
 
-               $this->assertEquals([
+               self::assertEquals([
                        'key1' => 'value1',
                        'key2' => 'value2',
                ], $configCache->get('system'));
 
                // explicit null as key
-               $this->assertEquals([
+               self::assertEquals([
                        'key1' => 'value1',
                        'key2' => 'value2',
                ], $configCache->get('system', null));
@@ -212,7 +212,7 @@ class CacheTest extends MockedTest
                        }
                }
 
-               $this->assertEmpty($configCache->getAll());
+               self::assertEmpty($configCache->getAll());
        }
 
        /**
@@ -229,7 +229,7 @@ class CacheTest extends MockedTest
                        ]
                ];
 
-               $this->assertEquals($diffConfig, $configCache->keyDiff($diffConfig));
+               self::assertEquals($diffConfig, $configCache->keyDiff($diffConfig));
        }
 
        /**
@@ -242,7 +242,7 @@ class CacheTest extends MockedTest
 
                $diffConfig = $configCache->getAll();
 
-               $this->assertEmpty($configCache->keyDiff($diffConfig));
+               self::assertEmpty($configCache->keyDiff($diffConfig));
        }
 
        /**
@@ -257,9 +257,9 @@ class CacheTest extends MockedTest
                        ],
                ]);
 
-               $this->assertEquals('supersecure', $configCache->get('database', 'password'));
-               $this->assertNotEquals('supersecure', print_r($configCache->get('database', 'password'), true));
-               $this->assertEquals('notsecured', print_r($configCache->get('database', 'username'), true));
+               self::assertEquals('supersecure', $configCache->get('database', 'password'));
+               self::assertNotEquals('supersecure', print_r($configCache->get('database', 'password'), true));
+               self::assertEquals('notsecured', print_r($configCache->get('database', 'username'), true));
        }
 
        /**
@@ -274,9 +274,9 @@ class CacheTest extends MockedTest
                        ],
                ], false);
 
-               $this->assertEquals('supersecure', $configCache->get('database', 'password'));
-               $this->assertEquals('supersecure', print_r($configCache->get('database', 'password'), true));
-               $this->assertEquals('notsecured', print_r($configCache->get('database', 'username'), true));
+               self::assertEquals('supersecure', $configCache->get('database', 'password'));
+               self::assertEquals('supersecure', print_r($configCache->get('database', 'password'), true));
+               self::assertEquals('notsecured', print_r($configCache->get('database', 'username'), true));
        }
 
        /**
@@ -291,9 +291,9 @@ class CacheTest extends MockedTest
                        ]
                ]);
 
-               $this->assertNotEmpty($configCache->get('database', 'password'));
-               $this->assertInstanceOf(HiddenString::class, $configCache->get('database', 'password'));
-               $this->assertEmpty($configCache->get('database', 'username'));
+               self::assertNotEmpty($configCache->get('database', 'password'));
+               self::assertInstanceOf(HiddenString::class, $configCache->get('database', 'password'));
+               self::assertEmpty($configCache->get('database', 'username'));
        }
 
        public function testWrongTypePassword()
@@ -305,8 +305,8 @@ class CacheTest extends MockedTest
                        ]
                ]);
 
-               $this->assertNotEmpty($configCache->get('database', 'password'));
-               $this->assertEmpty($configCache->get('database', 'username'));
+               self::assertNotEmpty($configCache->get('database', 'password'));
+               self::assertEmpty($configCache->get('database', 'username'));
 
                $configCache = new Cache([
                        'database' => [
@@ -315,7 +315,7 @@ class CacheTest extends MockedTest
                        ]
                ]);
 
-               $this->assertEquals(23, $configCache->get('database', 'password'));
-               $this->assertEmpty($configCache->get('database', 'username'));
+               self::assertEquals(23, $configCache->get('database', 'password'));
+               self::assertEmpty($configCache->get('database', 'username'));
        }
 }
index 48df2b2a4ae8cc3d9b55ffc9e1072356b5e87d15..59ad3b9690a999955a7ee900c9e0f952327f7949 100644 (file)
@@ -49,9 +49,9 @@ abstract class ConfigTest extends MockedTest
        {
                $result = $this->testedConfig->getCache()->getAll();
 
-               $this->assertNotEmpty($result);
-               $this->assertArrayHasKey($cat, $result);
-               $this->assertArraySubset($data, $result[$cat]);
+               self::assertNotEmpty($result);
+               self::assertArrayHasKey($cat, $result);
+               self::assertArraySubset($data, $result[$cat]);
        }
 
 
@@ -161,10 +161,10 @@ abstract class ConfigTest extends MockedTest
                                  ->once();
 
                $this->testedConfig = $this->getInstance();
-               $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                // assert config is loaded everytime
-               $this->assertConfig('config', $data['config']);
+               self::assertConfig('config', $data['config']);
        }
 
        /**
@@ -173,7 +173,7 @@ abstract class ConfigTest extends MockedTest
        public function testLoad(array $data, array $possibleCats, array $load)
        {
                $this->testedConfig = $this->getInstance();
-               $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                foreach ($load as $loadedCats) {
                        $this->testedConfig->load($loadedCats);
@@ -181,7 +181,7 @@ abstract class ConfigTest extends MockedTest
 
                // Assert at least loaded cats are loaded
                foreach ($load as $loadedCats) {
-                       $this->assertConfig($loadedCats, $data[$loadedCats]);
+                       self::assertConfig($loadedCats, $data[$loadedCats]);
                }
        }
 
@@ -254,7 +254,7 @@ abstract class ConfigTest extends MockedTest
        public function testCacheLoadDouble(array $data1, array $data2, array $expect)
        {
                $this->testedConfig = $this->getInstance();
-               $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                foreach ($data1 as $cat => $data) {
                        $this->testedConfig->load($cat);
@@ -262,7 +262,7 @@ abstract class ConfigTest extends MockedTest
 
                // Assert at least loaded cats are loaded
                foreach ($data1 as $cat => $data) {
-                       $this->assertConfig($cat, $data);
+                       self::assertConfig($cat, $data);
                }
 
                foreach ($data2 as $cat => $data) {
@@ -279,9 +279,9 @@ abstract class ConfigTest extends MockedTest
                $this->configModel->shouldReceive('load')->withAnyArgs()->andReturn([])->once();
 
                $this->testedConfig = $this->getInstance();
-               $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
-               $this->assertEmpty($this->testedConfig->getCache()->getAll());
+               self::assertEmpty($this->testedConfig->getCache()->getAll());
        }
 
        /**
@@ -296,12 +296,12 @@ abstract class ConfigTest extends MockedTest
                                  ->times(3);
 
                $this->testedConfig = $this->getInstance();
-               $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
-               $this->assertTrue($this->testedConfig->set('test', 'it', $data));
+               self::assertTrue($this->testedConfig->set('test', 'it', $data));
 
-               $this->assertEquals($data, $this->testedConfig->get('test', 'it'));
-               $this->assertEquals($data, $this->testedConfig->getCache()->get('test', 'it'));
+               self::assertEquals($data, $this->testedConfig->get('test', 'it'));
+               self::assertEquals($data, $this->testedConfig->getCache()->get('test', 'it'));
        }
 
        /**
@@ -314,12 +314,12 @@ abstract class ConfigTest extends MockedTest
                $this->configModel->shouldReceive('set')->with('test', 'it', $data)->andReturn(true)->once();
 
                $this->testedConfig = $this->getInstance();
-               $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
-               $this->assertTrue($this->testedConfig->set('test', 'it', $data));
+               self::assertTrue($this->testedConfig->set('test', 'it', $data));
 
-               $this->assertEquals($data, $this->testedConfig->get('test', 'it'));
-               $this->assertEquals($data, $this->testedConfig->getCache()->get('test', 'it'));
+               self::assertEquals($data, $this->testedConfig->get('test', 'it'));
+               self::assertEquals($data, $this->testedConfig->getCache()->get('test', 'it'));
        }
 
        /**
@@ -328,19 +328,19 @@ abstract class ConfigTest extends MockedTest
        public function testGetWrongWithoutDB()
        {
                $this->testedConfig = $this->getInstance();
-               $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                // without refresh
-               $this->assertNull($this->testedConfig->get('test', 'it'));
+               self::assertNull($this->testedConfig->get('test', 'it'));
 
                /// beware that the cache returns '!<unset>!' and not null for a non existing value
-               $this->assertNull($this->testedConfig->getCache()->get('test', 'it'));
+               self::assertNull($this->testedConfig->getCache()->get('test', 'it'));
 
                // with default value
-               $this->assertEquals('default', $this->testedConfig->get('test', 'it', 'default'));
+               self::assertEquals('default', $this->testedConfig->get('test', 'it', 'default'));
 
                // with default value and refresh
-               $this->assertEquals('default', $this->testedConfig->get('test', 'it', 'default', true));
+               self::assertEquals('default', $this->testedConfig->get('test', 'it', 'default', true));
        }
 
        /**
@@ -353,19 +353,19 @@ abstract class ConfigTest extends MockedTest
                $this->configCache->load(['test' => ['it' => 'now']], Cache::SOURCE_FILE);
 
                $this->testedConfig = $this->getInstance();
-               $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                // without refresh
-               $this->assertEquals('now', $this->testedConfig->get('test', 'it'));
-               $this->assertEquals('now', $this->testedConfig->getCache()->get('test', 'it'));
+               self::assertEquals('now', $this->testedConfig->get('test', 'it'));
+               self::assertEquals('now', $this->testedConfig->getCache()->get('test', 'it'));
 
                // with refresh
-               $this->assertEquals($data, $this->testedConfig->get('test', 'it', null, true));
-               $this->assertEquals($data, $this->testedConfig->getCache()->get('test', 'it'));
+               self::assertEquals($data, $this->testedConfig->get('test', 'it', null, true));
+               self::assertEquals($data, $this->testedConfig->getCache()->get('test', 'it'));
 
                // without refresh and wrong value and default
-               $this->assertEquals('default', $this->testedConfig->get('test', 'not', 'default'));
-               $this->assertNull($this->testedConfig->getCache()->get('test', 'not'));
+               self::assertEquals('default', $this->testedConfig->get('test', 'not', 'default'));
+               self::assertNull($this->testedConfig->getCache()->get('test', 'not'));
        }
 
        /**
@@ -378,16 +378,16 @@ abstract class ConfigTest extends MockedTest
                $this->configCache->load(['test' => ['it' => $data]], Cache::SOURCE_FILE);
 
                $this->testedConfig = $this->getInstance();
-               $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
-               $this->assertEquals($data, $this->testedConfig->get('test', 'it'));
-               $this->assertEquals($data, $this->testedConfig->getCache()->get('test', 'it'));
+               self::assertEquals($data, $this->testedConfig->get('test', 'it'));
+               self::assertEquals($data, $this->testedConfig->getCache()->get('test', 'it'));
 
-               $this->assertTrue($this->testedConfig->delete('test', 'it'));
-               $this->assertNull($this->testedConfig->get('test', 'it'));
-               $this->assertNull($this->testedConfig->getCache()->get('test', 'it'));
+               self::assertTrue($this->testedConfig->delete('test', 'it'));
+               self::assertNull($this->testedConfig->get('test', 'it'));
+               self::assertNull($this->testedConfig->getCache()->get('test', 'it'));
 
-               $this->assertEmpty($this->testedConfig->getCache()->getAll());
+               self::assertEmpty($this->testedConfig->getCache()->getAll());
        }
 
        /**
@@ -415,23 +415,23 @@ abstract class ConfigTest extends MockedTest
                                  ->once();
 
                $this->testedConfig = $this->getInstance();
-               $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                // directly set the value to the cache
                $this->testedConfig->getCache()->set('test', 'it', 'now');
 
-               $this->assertEquals('now', $this->testedConfig->get('test', 'it'));
-               $this->assertEquals('now', $this->testedConfig->getCache()->get('test', 'it'));
+               self::assertEquals('now', $this->testedConfig->get('test', 'it'));
+               self::assertEquals('now', $this->testedConfig->getCache()->get('test', 'it'));
 
                // delete from cache only
-               $this->assertTrue($this->testedConfig->delete('test', 'it'));
+               self::assertTrue($this->testedConfig->delete('test', 'it'));
                // delete from db only
-               $this->assertTrue($this->testedConfig->delete('test', 'second'));
+               self::assertTrue($this->testedConfig->delete('test', 'second'));
                // no delete
-               $this->assertFalse($this->testedConfig->delete('test', 'third'));
+               self::assertFalse($this->testedConfig->delete('test', 'third'));
                // delete both
-               $this->assertTrue($this->testedConfig->delete('test', 'quarter'));
+               self::assertTrue($this->testedConfig->delete('test', 'quarter'));
 
-               $this->assertEmpty($this->testedConfig->getCache()->getAll());
+               self::assertEmpty($this->testedConfig->getCache()->getAll());
        }
 }
index cdaf874b65a4c91a604e94984b6854a551c93d98..df0ea4f308a583b56134bda8339e554dea349266 100644 (file)
@@ -100,7 +100,7 @@ class JitConfigTest extends ConfigTest
 
                // Assert the expected categories
                foreach ($data2 as $cat => $data) {
-                       $this->assertConfig($cat, $expect[$cat]);
+                       self::assertConfig($cat, $expect[$cat]);
                }
        }
 
index 4bcf842d80058bde99bc880d09d14ff9fb116196..386f093023708d0604483170271297a7e0a5ae43 100644 (file)
@@ -59,7 +59,7 @@ class PreloadConfigTest extends ConfigTest
 
                // Assert that every category is loaded everytime
                foreach ($data as $cat => $values) {
-                       $this->assertConfig($cat, $values);
+                       self::assertConfig($cat, $values);
                }
        }
 
@@ -80,7 +80,7 @@ class PreloadConfigTest extends ConfigTest
 
                // Assert that every category is loaded everytime and is NOT overwritten
                foreach ($data1 as $cat => $values) {
-                       $this->assertConfig($cat, $values);
+                       self::assertConfig($cat, $values);
                }
        }
 
index 00879680ee3f15b414a1b4c18a193d7e531d4a86..68af5ff37f9bf068c25eee08a28dfc248c7d5058 100644 (file)
@@ -104,7 +104,7 @@ class InstallerTest extends MockedTest
                        'help' => $help]
                ];
 
-               $this->assertArraySubset($subSet, $assertionArray, false, "expected subset: " . PHP_EOL . print_r($subSet, true) . PHP_EOL . "current subset: " . print_r($assertionArray, true));
+               self::assertArraySubset($subSet, $assertionArray, false, "expected subset: " . PHP_EOL . print_r($subSet, true) . PHP_EOL . "current subset: " . print_r($assertionArray, true));
        }
 
        /**
@@ -152,11 +152,11 @@ class InstallerTest extends MockedTest
 
                $this->setFunctions(['openssl_pkey_new' => false]);
                $install = new Installer();
-               $this->assertFalse($install->checkKeys());
+               self::assertFalse($install->checkKeys());
 
                $this->setFunctions(['openssl_pkey_new' => true]);
                $install = new Installer();
-               $this->assertTrue($install->checkKeys());
+               self::assertTrue($install->checkKeys());
        }
 
        /**
@@ -167,8 +167,8 @@ class InstallerTest extends MockedTest
                $this->mockFunctionL10TCalls();
                $this->setFunctions(['curl_init' => false, 'imagecreatefromjpeg' => true]);
                $install = new Installer();
-               $this->assertFalse($install->checkFunctions());
-               $this->assertCheckExist(3,
+               self::assertFalse($install->checkFunctions());
+               self::assertCheckExist(3,
                        'libCurl PHP module',
                        'Error: libCURL PHP module required but not installed.',
                        false,
@@ -178,8 +178,8 @@ class InstallerTest extends MockedTest
                $this->mockFunctionL10TCalls();
                $this->setFunctions(['imagecreatefromjpeg' => false]);
                $install = new Installer();
-               $this->assertFalse($install->checkFunctions());
-               $this->assertCheckExist(4,
+               self::assertFalse($install->checkFunctions());
+               self::assertCheckExist(4,
                        'GD graphics PHP module',
                        'Error: GD graphics PHP module with JPEG support required but not installed.',
                        false,
@@ -189,8 +189,8 @@ class InstallerTest extends MockedTest
                $this->mockFunctionL10TCalls();
                $this->setFunctions(['openssl_public_encrypt' => false]);
                $install = new Installer();
-               $this->assertFalse($install->checkFunctions());
-               $this->assertCheckExist(5,
+               self::assertFalse($install->checkFunctions());
+               self::assertCheckExist(5,
                        'OpenSSL PHP module',
                        'Error: openssl PHP module required but not installed.',
                        false,
@@ -200,8 +200,8 @@ class InstallerTest extends MockedTest
                $this->mockFunctionL10TCalls();
                $this->setFunctions(['mb_strlen' => false]);
                $install = new Installer();
-               $this->assertFalse($install->checkFunctions());
-               $this->assertCheckExist(6,
+               self::assertFalse($install->checkFunctions());
+               self::assertCheckExist(6,
                        'mb_string PHP module',
                        'Error: mb_string PHP module required but not installed.',
                        false,
@@ -211,8 +211,8 @@ class InstallerTest extends MockedTest
                $this->mockFunctionL10TCalls();
                $this->setFunctions(['iconv_strlen' => false]);
                $install = new Installer();
-               $this->assertFalse($install->checkFunctions());
-               $this->assertCheckExist(7,
+               self::assertFalse($install->checkFunctions());
+               self::assertCheckExist(7,
                        'iconv PHP module',
                        'Error: iconv PHP module required but not installed.',
                        false,
@@ -222,8 +222,8 @@ class InstallerTest extends MockedTest
                $this->mockFunctionL10TCalls();
                $this->setFunctions(['posix_kill' => false]);
                $install = new Installer();
-               $this->assertFalse($install->checkFunctions());
-               $this->assertCheckExist(8,
+               self::assertFalse($install->checkFunctions());
+               self::assertCheckExist(8,
                        'POSIX PHP module',
                        'Error: POSIX PHP module required but not installed.',
                        false,
@@ -233,8 +233,8 @@ class InstallerTest extends MockedTest
                $this->mockFunctionL10TCalls();
                $this->setFunctions(['json_encode' => false]);
                $install = new Installer();
-               $this->assertFalse($install->checkFunctions());
-               $this->assertCheckExist(9,
+               self::assertFalse($install->checkFunctions());
+               self::assertCheckExist(9,
                        'JSON PHP module',
                        'Error: JSON PHP module required but not installed.',
                        false,
@@ -244,8 +244,8 @@ class InstallerTest extends MockedTest
                $this->mockFunctionL10TCalls();
                $this->setFunctions(['finfo_open' => false]);
                $install = new Installer();
-               $this->assertFalse($install->checkFunctions());
-               $this->assertCheckExist(10,
+               self::assertFalse($install->checkFunctions());
+               self::assertCheckExist(10,
                        'File Information PHP module',
                        'Error: File Information PHP module required but not installed.',
                        false,
@@ -264,7 +264,7 @@ class InstallerTest extends MockedTest
                        'finfo_open' => true,
                ]);
                $install = new Installer();
-               $this->assertTrue($install->checkFunctions());
+               self::assertTrue($install->checkFunctions());
        }
 
        /**
@@ -274,17 +274,17 @@ class InstallerTest extends MockedTest
        {
                $this->l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; });
 
-               $this->assertTrue($this->root->hasChild('config/local.config.php'));
+               self::assertTrue($this->root->hasChild('config/local.config.php'));
 
                $install = new Installer();
-               $this->assertTrue($install->checkLocalIni());
+               self::assertTrue($install->checkLocalIni());
 
                $this->delConfigFile('local.config.php');
 
-               $this->assertFalse($this->root->hasChild('config/local.config.php'));
+               self::assertFalse($this->root->hasChild('config/local.config.php'));
 
                $install = new Installer();
-               $this->assertTrue($install->checkLocalIni());
+               self::assertTrue($install->checkLocalIni());
        }
 
        /**
@@ -330,8 +330,8 @@ class InstallerTest extends MockedTest
 
                $install = new Installer();
 
-               $this->assertFalse($install->checkHtAccess('https://test'));
-               $this->assertSame('test Error', $install->getChecks()[0]['error_msg']['msg']);
+               self::assertFalse($install->checkHtAccess('https://test'));
+               self::assertSame('test Error', $install->getChecks()[0]['error_msg']['msg']);
        }
 
        /**
@@ -377,7 +377,7 @@ class InstallerTest extends MockedTest
 
                $install = new Installer();
 
-               $this->assertTrue($install->checkHtAccess('https://test'));
+               self::assertTrue($install->checkHtAccess('https://test'));
        }
 
        /**
@@ -396,9 +396,9 @@ class InstallerTest extends MockedTest
                $install = new Installer();
 
                // even there is no supported type, Imagick should return true (because it is not required)
-               $this->assertTrue($install->checkImagick());
+               self::assertTrue($install->checkImagick());
 
-               $this->assertCheckExist(1,
+               self::assertCheckExist(1,
                        $this->l10nMock->t('ImageMagick supports GIF'),
                        '',
                        true,
@@ -422,8 +422,8 @@ class InstallerTest extends MockedTest
                $install = new Installer();
 
                // even there is no supported type, Imagick should return true (because it is not required)
-               $this->assertTrue($install->checkImagick());
-               $this->assertCheckExist(1,
+               self::assertTrue($install->checkImagick());
+               self::assertCheckExist(1,
                        $this->l10nMock->t('ImageMagick supports GIF'),
                        '',
                        false,
@@ -439,8 +439,8 @@ class InstallerTest extends MockedTest
                $install = new Installer();
 
                // even there is no supported type, Imagick should return true (because it is not required)
-               $this->assertTrue($install->checkImagick());
-               $this->assertCheckExist(0,
+               self::assertTrue($install->checkImagick());
+               self::assertCheckExist(0,
                        'ImageMagick PHP extension is not installed',
                        '',
                        false,
index 003ff0f8acf5f4ab3f6a53d3da58723fb82fe679..f58c4cd4ddc0dbabe47587953eedb1da1d9d9e73 100644 (file)
@@ -109,6 +109,6 @@ class L10nTest extends MockedTest
         */
        public function testDetectLanguage(array $server, array $get, string $default, string $assert)
        {
-               $this->assertEquals($assert, L10n::detectLanguage($server, $get, $default));
+               self::assertEquals($assert, L10n::detectLanguage($server, $get, $default));
        }
 }
index c7a1664f11ac44cb43301ccfbcdeaec3d2447b7e..ea668d83bb04d4d33e360c5593ad5448ce62e535 100644 (file)
@@ -56,10 +56,10 @@ abstract class LockTest extends MockedTest
         */
        public function testLock()
        {
-               $this->assertFalse($this->instance->isLocked('foo'));
-               $this->assertTrue($this->instance->acquire('foo', 1));
-               $this->assertTrue($this->instance->isLocked('foo'));
-               $this->assertFalse($this->instance->isLocked('bar'));
+               self::assertFalse($this->instance->isLocked('foo'));
+               self::assertTrue($this->instance->acquire('foo', 1));
+               self::assertTrue($this->instance->isLocked('foo'));
+               self::assertFalse($this->instance->isLocked('bar'));
        }
 
        /**
@@ -67,11 +67,11 @@ abstract class LockTest extends MockedTest
         */
        public function testDoubleLock()
        {
-               $this->assertFalse($this->instance->isLocked('foo'));
-               $this->assertTrue($this->instance->acquire('foo', 1));
-               $this->assertTrue($this->instance->isLocked('foo'));
+               self::assertFalse($this->instance->isLocked('foo'));
+               self::assertTrue($this->instance->acquire('foo', 1));
+               self::assertTrue($this->instance->isLocked('foo'));
                // We already locked it
-               $this->assertTrue($this->instance->acquire('foo', 1));
+               self::assertTrue($this->instance->acquire('foo', 1));
        }
 
        /**
@@ -79,11 +79,11 @@ abstract class LockTest extends MockedTest
         */
        public function testReleaseLock()
        {
-               $this->assertFalse($this->instance->isLocked('foo'));
-               $this->assertTrue($this->instance->acquire('foo', 1));
-               $this->assertTrue($this->instance->isLocked('foo'));
+               self::assertFalse($this->instance->isLocked('foo'));
+               self::assertTrue($this->instance->acquire('foo', 1));
+               self::assertTrue($this->instance->isLocked('foo'));
                $this->instance->release('foo');
-               $this->assertFalse($this->instance->isLocked('foo'));
+               self::assertFalse($this->instance->isLocked('foo'));
        }
 
        /**
@@ -91,19 +91,19 @@ abstract class LockTest extends MockedTest
         */
        public function testReleaseAll()
        {
-               $this->assertTrue($this->instance->acquire('foo', 1));
-               $this->assertTrue($this->instance->acquire('bar', 1));
-               $this->assertTrue($this->instance->acquire('nice', 1));
+               self::assertTrue($this->instance->acquire('foo', 1));
+               self::assertTrue($this->instance->acquire('bar', 1));
+               self::assertTrue($this->instance->acquire('nice', 1));
 
-               $this->assertTrue($this->instance->isLocked('foo'));
-               $this->assertTrue($this->instance->isLocked('bar'));
-               $this->assertTrue($this->instance->isLocked('nice'));
+               self::assertTrue($this->instance->isLocked('foo'));
+               self::assertTrue($this->instance->isLocked('bar'));
+               self::assertTrue($this->instance->isLocked('nice'));
 
-               $this->assertTrue($this->instance->releaseAll());
+               self::assertTrue($this->instance->releaseAll());
 
-               $this->assertFalse($this->instance->isLocked('foo'));
-               $this->assertFalse($this->instance->isLocked('bar'));
-               $this->assertFalse($this->instance->isLocked('nice'));
+               self::assertFalse($this->instance->isLocked('foo'));
+               self::assertFalse($this->instance->isLocked('bar'));
+               self::assertFalse($this->instance->isLocked('nice'));
        }
 
        /**
@@ -111,23 +111,23 @@ abstract class LockTest extends MockedTest
         */
        public function testReleaseAfterUnlock()
        {
-               $this->assertFalse($this->instance->isLocked('foo'));
-               $this->assertFalse($this->instance->isLocked('bar'));
-               $this->assertFalse($this->instance->isLocked('nice'));
-               $this->assertTrue($this->instance->acquire('foo', 1));
-               $this->assertTrue($this->instance->acquire('bar', 1));
-               $this->assertTrue($this->instance->acquire('nice', 1));
+               self::assertFalse($this->instance->isLocked('foo'));
+               self::assertFalse($this->instance->isLocked('bar'));
+               self::assertFalse($this->instance->isLocked('nice'));
+               self::assertTrue($this->instance->acquire('foo', 1));
+               self::assertTrue($this->instance->acquire('bar', 1));
+               self::assertTrue($this->instance->acquire('nice', 1));
 
-               $this->assertTrue($this->instance->release('foo'));
+               self::assertTrue($this->instance->release('foo'));
 
-               $this->assertFalse($this->instance->isLocked('foo'));
-               $this->assertTrue($this->instance->isLocked('bar'));
-               $this->assertTrue($this->instance->isLocked('nice'));
+               self::assertFalse($this->instance->isLocked('foo'));
+               self::assertTrue($this->instance->isLocked('bar'));
+               self::assertTrue($this->instance->isLocked('nice'));
 
-               $this->assertTrue($this->instance->releaseAll());
+               self::assertTrue($this->instance->releaseAll());
 
-               $this->assertFalse($this->instance->isLocked('bar'));
-               $this->assertFalse($this->instance->isLocked('nice'));
+               self::assertFalse($this->instance->isLocked('bar'));
+               self::assertFalse($this->instance->isLocked('nice'));
        }
 
        /**
@@ -135,11 +135,11 @@ abstract class LockTest extends MockedTest
         */
        public function testReleaseWitTTL()
        {
-               $this->assertFalse($this->instance->isLocked('test'));
-               $this->assertTrue($this->instance->acquire('test', 1, 10));
-               $this->assertTrue($this->instance->isLocked('test'));
-               $this->assertTrue($this->instance->release('test'));
-               $this->assertFalse($this->instance->isLocked('test'));
+               self::assertFalse($this->instance->isLocked('test'));
+               self::assertTrue($this->instance->acquire('test', 1, 10));
+               self::assertTrue($this->instance->isLocked('test'));
+               self::assertTrue($this->instance->release('test'));
+               self::assertFalse($this->instance->isLocked('test'));
        }
 
        /**
@@ -147,19 +147,19 @@ abstract class LockTest extends MockedTest
         */
        public function testGetLocks()
        {
-               $this->assertTrue($this->instance->acquire('foo', 1));
-               $this->assertTrue($this->instance->acquire('bar', 1));
-               $this->assertTrue($this->instance->acquire('nice', 1));
+               self::assertTrue($this->instance->acquire('foo', 1));
+               self::assertTrue($this->instance->acquire('bar', 1));
+               self::assertTrue($this->instance->acquire('nice', 1));
 
-               $this->assertTrue($this->instance->isLocked('foo'));
-               $this->assertTrue($this->instance->isLocked('bar'));
-               $this->assertTrue($this->instance->isLocked('nice'));
+               self::assertTrue($this->instance->isLocked('foo'));
+               self::assertTrue($this->instance->isLocked('bar'));
+               self::assertTrue($this->instance->isLocked('nice'));
 
                $locks = $this->instance->getLocks();
 
-               $this->assertContains('foo', $locks);
-               $this->assertContains('bar', $locks);
-               $this->assertContains('nice', $locks);
+               self::assertContains('foo', $locks);
+               self::assertContains('bar', $locks);
+               self::assertContains('nice', $locks);
        }
 
        /**
@@ -167,19 +167,19 @@ abstract class LockTest extends MockedTest
         */
        public function testGetLocksWithPrefix()
        {
-               $this->assertTrue($this->instance->acquire('foo', 1));
-               $this->assertTrue($this->instance->acquire('test1', 1));
-               $this->assertTrue($this->instance->acquire('test2', 1));
+               self::assertTrue($this->instance->acquire('foo', 1));
+               self::assertTrue($this->instance->acquire('test1', 1));
+               self::assertTrue($this->instance->acquire('test2', 1));
 
-               $this->assertTrue($this->instance->isLocked('foo'));
-               $this->assertTrue($this->instance->isLocked('test1'));
-               $this->assertTrue($this->instance->isLocked('test2'));
+               self::assertTrue($this->instance->isLocked('foo'));
+               self::assertTrue($this->instance->isLocked('test1'));
+               self::assertTrue($this->instance->isLocked('test2'));
 
                $locks = $this->instance->getLocks('test');
 
-               $this->assertContains('test1', $locks);
-               $this->assertContains('test2', $locks);
-               $this->assertNotContains('foo', $locks);
+               self::assertContains('test1', $locks);
+               self::assertContains('test2', $locks);
+               self::assertNotContains('foo', $locks);
        }
 
        /**
@@ -189,25 +189,25 @@ abstract class LockTest extends MockedTest
        {
                $this->markTestSkipped('taking too much time without mocking');
 
-               $this->assertFalse($this->instance->isLocked('foo'));
-               $this->assertFalse($this->instance->isLocked('bar'));
+               self::assertFalse($this->instance->isLocked('foo'));
+               self::assertFalse($this->instance->isLocked('bar'));
 
                // TODO [nupplaphil] - Because of the Datetime-Utils for the database, we have to wait a FULL second between the checks to invalidate the db-locks/cache
-               $this->assertTrue($this->instance->acquire('foo', 2, 1));
-               $this->assertTrue($this->instance->acquire('bar', 2, 3));
+               self::assertTrue($this->instance->acquire('foo', 2, 1));
+               self::assertTrue($this->instance->acquire('bar', 2, 3));
 
-               $this->assertTrue($this->instance->isLocked('foo'));
-               $this->assertTrue($this->instance->isLocked('bar'));
+               self::assertTrue($this->instance->isLocked('foo'));
+               self::assertTrue($this->instance->isLocked('bar'));
 
                sleep(2);
 
-               $this->assertFalse($this->instance->isLocked('foo'));
-               $this->assertTrue($this->instance->isLocked('bar'));
+               self::assertFalse($this->instance->isLocked('foo'));
+               self::assertTrue($this->instance->isLocked('bar'));
 
                sleep(2);
 
-               $this->assertFalse($this->instance->isLocked('foo'));
-               $this->assertFalse($this->instance->isLocked('bar'));
+               self::assertFalse($this->instance->isLocked('foo'));
+               self::assertFalse($this->instance->isLocked('bar'));
        }
 
        /**
@@ -215,7 +215,7 @@ abstract class LockTest extends MockedTest
         */
        public function testReleaseLockWithoutLock()
        {
-               $this->assertFalse($this->instance->isLocked('wrongLock'));
-               $this->assertFalse($this->instance->release('wrongLock'));
+               self::assertFalse($this->instance->isLocked('wrongLock'));
+               self::assertFalse($this->instance->release('wrongLock'));
        }
 }
index 04aeb2b45dff3d5e7656f3c34fd2d9ce6c6f4525..fd60f32c71fccded6b63cc56fc584a0dc2b4ca88 100644 (file)
@@ -73,9 +73,9 @@ class SemaphoreLockTest extends LockTest
                $file = get_temppath() . '/test.sem';
                touch($file);
 
-               $this->assertTrue(file_exists($file));
-               $this->assertFalse($this->instance->release('test', false));
-               $this->assertTrue(file_exists($file));
+               self::assertTrue(file_exists($file));
+               self::assertFalse($this->instance->release('test', false));
+               self::assertTrue(file_exists($file));
        }
 
        /**
@@ -90,9 +90,9 @@ class SemaphoreLockTest extends LockTest
                $file = get_temppath() . '/test.sem';
                touch($file);
 
-               $this->assertTrue(file_exists($file));
-               $this->assertFalse($this->instance->release('test', true));
-               $this->assertTrue(file_exists($file));
+               self::assertTrue(file_exists($file));
+               self::assertFalse($this->instance->release('test', true));
+               self::assertTrue(file_exists($file));
        }
 
        /**
@@ -103,9 +103,9 @@ class SemaphoreLockTest extends LockTest
                $file = get_temppath() . '/test.sem';
                touch($file);
 
-               $this->assertTrue(file_exists($file));
-               $this->assertTrue($this->instance->acquire('test'));
-               $this->assertTrue($this->instance->isLocked('test'));
-               $this->assertTrue($this->instance->release('test'));
+               self::assertTrue(file_exists($file));
+               self::assertTrue($this->instance->acquire('test'));
+               self::assertTrue($this->instance->isLocked('test'));
+               self::assertTrue($this->instance->release('test'));
        }
 }
index 927fab009cd7618e7a5871285b65751a1077ba2c..bc5aa6934f738cbc5c2cae652e0a272094934694 100644 (file)
@@ -51,7 +51,7 @@ class CacheTest extends MockedTest
        {
                foreach ($data as $cat => $values) {
                        foreach ($values as $key => $value) {
-                               $this->assertEquals($data[$cat][$key], $configCache->get($uid, $cat, $key));
+                               self::assertEquals($data[$cat][$key], $configCache->get($uid, $cat, $key));
                        }
                }
        }
@@ -72,7 +72,7 @@ class CacheTest extends MockedTest
                        }
                }
 
-               $this->assertConfigValues($data, $configCache, $uid);
+               self::assertConfigValues($data, $configCache, $uid);
        }
 
 
@@ -94,13 +94,13 @@ class CacheTest extends MockedTest
                        ],
                ]);
 
-               $this->assertEquals([
+               self::assertEquals([
                        'key1' => 'value1',
                        'key2' => 'value2',
                ], $configCache->get($uid, 'system'));
 
                // test explicit cat with null as key
-               $this->assertEquals([
+               self::assertEquals([
                        'key1' => 'value1',
                        'key2' => 'value2',
                ], $configCache->get($uid, 'system', null));
@@ -128,7 +128,7 @@ class CacheTest extends MockedTest
                        }
                }
 
-               $this->assertEmpty($configCache->getAll());
+               self::assertEmpty($configCache->getAll());
        }
 
        /**
@@ -146,7 +146,7 @@ class CacheTest extends MockedTest
                        ]
                ];
 
-               $this->assertEquals($diffConfig, $configCache->keyDiff($diffConfig));
+               self::assertEquals($diffConfig, $configCache->keyDiff($diffConfig));
        }
 
        /**
@@ -162,7 +162,7 @@ class CacheTest extends MockedTest
 
                $diffConfig = $configCache->getAll();
 
-               $this->assertEmpty($configCache->keyDiff($diffConfig));
+               self::assertEmpty($configCache->keyDiff($diffConfig));
        }
 
        /**
@@ -179,9 +179,9 @@ class CacheTest extends MockedTest
                        ]
                ]);
 
-               $this->assertEquals('supersecure', $configCache->get(1, 'database', 'password'));
-               $this->assertNotEquals('supersecure', print_r($configCache->get(1, 'database', 'password'), true));
-               $this->assertEquals('notsecured', print_r($configCache->get(1, 'database', 'username'), true));
+               self::assertEquals('supersecure', $configCache->get(1, 'database', 'password'));
+               self::assertNotEquals('supersecure', print_r($configCache->get(1, 'database', 'password'), true));
+               self::assertEquals('notsecured', print_r($configCache->get(1, 'database', 'username'), true));
        }
 
        /**
@@ -198,9 +198,9 @@ class CacheTest extends MockedTest
                        ]
                ]);
 
-               $this->assertEquals('supersecure', $configCache->get(1, 'database', 'password'));
-               $this->assertEquals('supersecure', print_r($configCache->get(1, 'database', 'password'), true));
-               $this->assertEquals('notsecured', print_r($configCache->get(1, 'database', 'username'), true));
+               self::assertEquals('supersecure', $configCache->get(1, 'database', 'password'));
+               self::assertEquals('supersecure', print_r($configCache->get(1, 'database', 'password'), true));
+               self::assertEquals('notsecured', print_r($configCache->get(1, 'database', 'username'), true));
        }
 
        /**
@@ -217,8 +217,8 @@ class CacheTest extends MockedTest
                        ]
                ]);
 
-               $this->assertEmpty($configCache->get(1, 'database', 'password'));
-               $this->assertEmpty($configCache->get(1, 'database', 'username'));
+               self::assertEmpty($configCache->get(1, 'database', 'password'));
+               self::assertEmpty($configCache->get(1, 'database', 'username'));
        }
 
        public function testWrongTypePassword()
@@ -232,8 +232,8 @@ class CacheTest extends MockedTest
                        ]
                ]);
 
-               $this->assertNotEmpty($configCache->get(1, 'database', 'password'));
-               $this->assertEmpty($configCache->get(1, 'database', 'username'));
+               self::assertNotEmpty($configCache->get(1, 'database', 'password'));
+               self::assertEmpty($configCache->get(1, 'database', 'username'));
 
                $configCache = new Cache();
 
@@ -244,8 +244,8 @@ class CacheTest extends MockedTest
                        ],
                ]);
 
-               $this->assertEquals(23, $configCache->get(1, 'database', 'password'));
-               $this->assertEmpty($configCache->get(1, 'database', 'username'));
+               self::assertEquals(23, $configCache->get(1, 'database', 'password'));
+               self::assertEmpty($configCache->get(1, 'database', 'username'));
        }
 
        /**
@@ -268,11 +268,11 @@ class CacheTest extends MockedTest
                        ],
                ]);
 
-               $this->assertEquals('value1', $configCache->get(1, 'cat1', 'key1'));
-               $this->assertEquals('value2', $configCache->get(2, 'cat2', 'key2'));
+               self::assertEquals('value1', $configCache->get(1, 'cat1', 'key1'));
+               self::assertEquals('value2', $configCache->get(2, 'cat2', 'key2'));
 
-               $this->assertNull($configCache->get(1, 'cat2', 'key2'));
-               $this->assertNull($configCache->get(2, 'cat1', 'key1'));
+               self::assertNull($configCache->get(1, 'cat2', 'key2'));
+               self::assertNull($configCache->get(2, 'cat1', 'key1'));
        }
 
        /**
@@ -286,9 +286,9 @@ class CacheTest extends MockedTest
 
                $configCache = new Cache();
 
-               $this->assertNull($configCache->get($uid, 'cat1', 'cat2'));
+               self::assertNull($configCache->get($uid, 'cat1', 'cat2'));
 
-               $this->assertFalse($configCache->set($uid, 'cat1', 'key1', 'doesn\'t matter!'));
-               $this->assertFalse($configCache->delete($uid, 'cat1', 'key1'));
+               self::assertFalse($configCache->set($uid, 'cat1', 'key1', 'doesn\'t matter!'));
+               self::assertFalse($configCache->delete($uid, 'cat1', 'key1'));
        }
 }
index ab5dbafd9148efb192b1dbaf06f6f5cbf1469f7e..b8df4682989361b3798f72ae221e9e8c09364c3e 100644 (file)
@@ -78,7 +78,7 @@ class JitPConfigTest extends PConfigTest
 
                // Assert the expected categories
                foreach ($data2 as $cat => $data) {
-                       $this->assertConfig($uid, $cat, $expect[$cat]);
+                       self::assertConfig($uid, $cat, $expect[$cat]);
                }
        }
 
index 090dab69f52e4262753dda8115ed4d7e4762b2bf..4bc5edb41844aed7b4de6153e778da4778d5146d 100644 (file)
@@ -50,10 +50,10 @@ abstract class PConfigTest extends MockedTest
        {
                $result = $this->testedConfig->getCache()->getAll();
 
-               $this->assertNotEmpty($result);
-               $this->assertArrayHasKey($uid, $result);
-               $this->assertArrayHasKey($cat, $result[$uid]);
-               $this->assertArraySubset($data, $result[$uid][$cat]);
+               self::assertNotEmpty($result);
+               self::assertArrayHasKey($uid, $result);
+               self::assertArrayHasKey($cat, $result[$uid]);
+               self::assertArraySubset($data, $result[$uid][$cat]);
        }
 
 
@@ -164,9 +164,9 @@ abstract class PConfigTest extends MockedTest
        public function testSetUp(int $uid, array $data)
        {
                $this->testedConfig = $this->getInstance();
-               $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
-               $this->assertEmpty($this->testedConfig->getCache()->getAll());
+               self::assertEmpty($this->testedConfig->getCache()->getAll());
        }
 
        /**
@@ -175,7 +175,7 @@ abstract class PConfigTest extends MockedTest
        public function testLoad(int $uid, array $data, array $possibleCats, array $load)
        {
                $this->testedConfig = $this->getInstance();
-               $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                foreach ($load as $loadedCats) {
                        $this->testedConfig->load($uid, $loadedCats);
@@ -183,7 +183,7 @@ abstract class PConfigTest extends MockedTest
 
                // Assert at least loaded cats are loaded
                foreach ($load as $loadedCats) {
-                       $this->assertConfig($uid, $loadedCats, $data[$loadedCats]);
+                       self::assertConfig($uid, $loadedCats, $data[$loadedCats]);
                }
        }
 
@@ -258,7 +258,7 @@ abstract class PConfigTest extends MockedTest
        public function testCacheLoadDouble(int $uid, array $data1, array $data2, array $expect)
        {
                $this->testedConfig = $this->getInstance();
-               $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                foreach ($data1 as $cat => $data) {
                        $this->testedConfig->load($uid, $cat);
@@ -266,7 +266,7 @@ abstract class PConfigTest extends MockedTest
 
                // Assert at least loaded cats are loaded
                foreach ($data1 as $cat => $data) {
-                       $this->assertConfig($uid, $cat, $data);
+                       self::assertConfig($uid, $cat, $data);
                }
 
                foreach ($data2 as $cat => $data) {
@@ -282,12 +282,12 @@ abstract class PConfigTest extends MockedTest
        public function testSetGetWithoutDB(int $uid, $data)
        {
                $this->testedConfig = $this->getInstance();
-               $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
-               $this->assertTrue($this->testedConfig->set($uid, 'test', 'it', $data));
+               self::assertTrue($this->testedConfig->set($uid, 'test', 'it', $data));
 
-               $this->assertEquals($data, $this->testedConfig->get($uid, 'test', 'it'));
-               $this->assertEquals($data, $this->testedConfig->getCache()->get($uid, 'test', 'it'));
+               self::assertEquals($data, $this->testedConfig->get($uid, 'test', 'it'));
+               self::assertEquals($data, $this->testedConfig->getCache()->get($uid, 'test', 'it'));
        }
 
        /**
@@ -303,12 +303,12 @@ abstract class PConfigTest extends MockedTest
                                  ->once();
 
                $this->testedConfig = $this->getInstance();
-               $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
-               $this->assertTrue($this->testedConfig->set($uid, 'test', 'it', $data));
+               self::assertTrue($this->testedConfig->set($uid, 'test', 'it', $data));
 
-               $this->assertEquals($data, $this->testedConfig->get($uid, 'test', 'it'));
-               $this->assertEquals($data, $this->testedConfig->getCache()->get($uid, 'test', 'it'));
+               self::assertEquals($data, $this->testedConfig->get($uid, 'test', 'it'));
+               self::assertEquals($data, $this->testedConfig->getCache()->get($uid, 'test', 'it'));
        }
 
        /**
@@ -317,19 +317,19 @@ abstract class PConfigTest extends MockedTest
        public function testGetWrongWithoutDB()
        {
                $this->testedConfig = $this->getInstance();
-               $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                // without refresh
-               $this->assertNull($this->testedConfig->get(0, 'test', 'it'));
+               self::assertNull($this->testedConfig->get(0, 'test', 'it'));
 
                /// beware that the cache returns '!<unset>!' and not null for a non existing value
-               $this->assertNull($this->testedConfig->getCache()->get(0, 'test', 'it'));
+               self::assertNull($this->testedConfig->getCache()->get(0, 'test', 'it'));
 
                // with default value
-               $this->assertEquals('default', $this->testedConfig->get(0, 'test', 'it', 'default'));
+               self::assertEquals('default', $this->testedConfig->get(0, 'test', 'it', 'default'));
 
                // with default value and refresh
-               $this->assertEquals('default', $this->testedConfig->get(0, 'test', 'it', 'default', true));
+               self::assertEquals('default', $this->testedConfig->get(0, 'test', 'it', 'default', true));
        }
 
        /**
@@ -342,19 +342,19 @@ abstract class PConfigTest extends MockedTest
                $this->configCache->load($uid, ['test' => ['it' => 'now']]);
 
                $this->testedConfig = $this->getInstance();
-               $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                // without refresh
-               $this->assertEquals('now', $this->testedConfig->get($uid, 'test', 'it'));
-               $this->assertEquals('now', $this->testedConfig->getCache()->get($uid, 'test', 'it'));
+               self::assertEquals('now', $this->testedConfig->get($uid, 'test', 'it'));
+               self::assertEquals('now', $this->testedConfig->getCache()->get($uid, 'test', 'it'));
 
                // with refresh
-               $this->assertEquals($data, $this->testedConfig->get($uid, 'test', 'it', null, true));
-               $this->assertEquals($data, $this->testedConfig->getCache()->get($uid, 'test', 'it'));
+               self::assertEquals($data, $this->testedConfig->get($uid, 'test', 'it', null, true));
+               self::assertEquals($data, $this->testedConfig->getCache()->get($uid, 'test', 'it'));
 
                // without refresh and wrong value and default
-               $this->assertEquals('default', $this->testedConfig->get($uid, 'test', 'not', 'default'));
-               $this->assertNull($this->testedConfig->getCache()->get($uid, 'test', 'not'));
+               self::assertEquals('default', $this->testedConfig->get($uid, 'test', 'not', 'default'));
+               self::assertNull($this->testedConfig->getCache()->get($uid, 'test', 'not'));
        }
 
        /**
@@ -367,16 +367,16 @@ abstract class PConfigTest extends MockedTest
                $this->configCache->load($uid, ['test' => ['it' => $data]]);
 
                $this->testedConfig = $this->getInstance();
-               $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
-               $this->assertEquals($data, $this->testedConfig->get($uid, 'test', 'it'));
-               $this->assertEquals($data, $this->testedConfig->getCache()->get($uid, 'test', 'it'));
+               self::assertEquals($data, $this->testedConfig->get($uid, 'test', 'it'));
+               self::assertEquals($data, $this->testedConfig->getCache()->get($uid, 'test', 'it'));
 
-               $this->assertTrue($this->testedConfig->delete($uid, 'test', 'it'));
-               $this->assertNull($this->testedConfig->get($uid, 'test', 'it'));
-               $this->assertNull($this->testedConfig->getCache()->get($uid, 'test', 'it'));
+               self::assertTrue($this->testedConfig->delete($uid, 'test', 'it'));
+               self::assertNull($this->testedConfig->get($uid, 'test', 'it'));
+               self::assertNull($this->testedConfig->getCache()->get($uid, 'test', 'it'));
 
-               $this->assertEmpty($this->testedConfig->getCache()->getAll());
+               self::assertEmpty($this->testedConfig->getCache()->getAll());
        }
 
        /**
@@ -406,24 +406,24 @@ abstract class PConfigTest extends MockedTest
                                  ->once();
 
                $this->testedConfig = $this->getInstance();
-               $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
                // directly set the value to the cache
                $this->testedConfig->getCache()->set($uid, 'test', 'it', 'now');
 
-               $this->assertEquals('now', $this->testedConfig->get($uid, 'test', 'it'));
-               $this->assertEquals('now', $this->testedConfig->getCache()->get($uid, 'test', 'it'));
+               self::assertEquals('now', $this->testedConfig->get($uid, 'test', 'it'));
+               self::assertEquals('now', $this->testedConfig->getCache()->get($uid, 'test', 'it'));
 
                // delete from cache only
-               $this->assertTrue($this->testedConfig->delete($uid, 'test', 'it'));
+               self::assertTrue($this->testedConfig->delete($uid, 'test', 'it'));
                // delete from db only
-               $this->assertTrue($this->testedConfig->delete($uid, 'test', 'second'));
+               self::assertTrue($this->testedConfig->delete($uid, 'test', 'second'));
                // no delete
-               $this->assertFalse($this->testedConfig->delete($uid, 'test', 'third'));
+               self::assertFalse($this->testedConfig->delete($uid, 'test', 'third'));
                // delete both
-               $this->assertTrue($this->testedConfig->delete($uid, 'test', 'quarter'));
+               self::assertTrue($this->testedConfig->delete($uid, 'test', 'quarter'));
 
-               $this->assertEmpty($this->testedConfig->getCache()->getAll());
+               self::assertEmpty($this->testedConfig->getCache()->getAll());
        }
 
        public function dataMultiUid()
@@ -466,12 +466,12 @@ abstract class PConfigTest extends MockedTest
                $this->configCache->load($data2['uid'], $data2['data']);
 
                $this->testedConfig = $this->getInstance();
-               $this->assertInstanceOf(Cache::class, $this->testedConfig->getCache());
+               self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
 
-               $this->assertConfig($data1['uid'], 'cat1', $data1['data']['cat1']);
-               $this->assertConfig($data1['uid'], 'cat2', $data1['data']['cat2']);
-               $this->assertConfig($data2['uid'], 'cat1', $data2['data']['cat1']);
-               $this->assertConfig($data2['uid'], 'cat2', $data2['data']['cat2']);
+               self::assertConfig($data1['uid'], 'cat1', $data1['data']['cat1']);
+               self::assertConfig($data1['uid'], 'cat2', $data1['data']['cat2']);
+               self::assertConfig($data2['uid'], 'cat1', $data2['data']['cat1']);
+               self::assertConfig($data2['uid'], 'cat2', $data2['data']['cat2']);
        }
 
        /**
@@ -485,10 +485,10 @@ abstract class PConfigTest extends MockedTest
 
                $this->testedConfig = $this->getInstance();
 
-               $this->assertNull($this->testedConfig->get($uid, 'cat1', 'cat2'));
-               $this->assertEquals('fallback!', $this->testedConfig->get($uid, 'cat1', 'cat2', 'fallback!'));
+               self::assertNull($this->testedConfig->get($uid, 'cat1', 'cat2'));
+               self::assertEquals('fallback!', $this->testedConfig->get($uid, 'cat1', 'cat2', 'fallback!'));
 
-               $this->assertFalse($this->testedConfig->set($uid, 'cat1', 'key1', 'doesn\'t matter!'));
-               $this->assertFalse($this->testedConfig->delete($uid, 'cat1', 'key1'));
+               self::assertFalse($this->testedConfig->set($uid, 'cat1', 'key1', 'doesn\'t matter!'));
+               self::assertFalse($this->testedConfig->delete($uid, 'cat1', 'key1'));
        }
 }
index 984d2c0e26302e7424ccc92f3131b9de6c01bdd0..413a6c99709d7116bcd8ec857b9404737d2bd926 100644 (file)
@@ -49,7 +49,7 @@ class PreloadPConfigTest extends PConfigTest
 
                // Assert that every category is loaded everytime
                foreach ($data as $cat => $values) {
-                       $this->assertConfig($uid, $cat, $values);
+                       self::assertConfig($uid, $cat, $values);
                }
        }
 
@@ -71,7 +71,7 @@ class PreloadPConfigTest extends PConfigTest
 
                // Assert that every category is loaded everytime and is NOT overwritten
                foreach ($data1 as $cat => $values) {
-                       $this->assertConfig($uid, $cat, $values);
+                       self::assertConfig($uid, $cat, $values);
                }
        }
 
index c6f4558b701e52da36ebed61093146d51f49c375..f061ea0fff8c7456e66d4f8650e0ebad6d45e2b9 100644 (file)
@@ -87,7 +87,7 @@ class StorageManagerTest extends DatabaseTest
        {
                $storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n);
 
-               $this->assertInstanceOf(StorageManager::class, $storageManager);
+               self::assertInstanceOf(StorageManager::class, $storageManager);
        }
 
        public function dataStorages()
@@ -172,12 +172,12 @@ class StorageManagerTest extends DatabaseTest
                $storage = $storageManager->getByName($name, $userBackend);
 
                if (!empty($assert)) {
-                       $this->assertInstanceOf(Storage\IStorage::class, $storage);
-                       $this->assertInstanceOf($assert, $storage);
+                       self::assertInstanceOf(Storage\IStorage::class, $storage);
+                       self::assertInstanceOf($assert, $storage);
                } else {
-                       $this->assertNull($storage);
+                       self::assertNull($storage);
                }
-               $this->assertEquals($assertName, $storage);
+               self::assertEquals($assertName, $storage);
        }
 
        /**
@@ -190,10 +190,10 @@ class StorageManagerTest extends DatabaseTest
                $storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n);
 
                // true in every of the backends
-               $this->assertEquals(!empty($assertName), $storageManager->isValidBackend($name));
+               self::assertEquals(!empty($assertName), $storageManager->isValidBackend($name));
 
                // if userBackend is set to true, filter out e.g. SystemRessource
-               $this->assertEquals($userBackend, $storageManager->isValidBackend($name, true));
+               self::assertEquals($userBackend, $storageManager->isValidBackend($name, true));
        }
 
        /**
@@ -203,7 +203,7 @@ class StorageManagerTest extends DatabaseTest
        {
                $storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n);
 
-               $this->assertEquals(StorageManager::DEFAULT_BACKENDS, $storageManager->listBackends());
+               self::assertEquals(StorageManager::DEFAULT_BACKENDS, $storageManager->listBackends());
        }
 
        /**
@@ -215,12 +215,12 @@ class StorageManagerTest extends DatabaseTest
        {
                $storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n);
 
-               $this->assertNull($storageManager->getBackend());
+               self::assertNull($storageManager->getBackend());
 
                if ($userBackend) {
                        $storageManager->setBackend($name);
 
-                       $this->assertInstanceOf($assert, $storageManager->getBackend());
+                       self::assertInstanceOf($assert, $storageManager->getBackend());
                }
        }
 
@@ -237,9 +237,9 @@ class StorageManagerTest extends DatabaseTest
                $storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n);
 
                if ($userBackend) {
-                       $this->assertInstanceOf($assert, $storageManager->getBackend());
+                       self::assertInstanceOf($assert, $storageManager->getBackend());
                } else {
-                       $this->assertNull($storageManager->getBackend());
+                       self::assertNull($storageManager->getBackend());
                }
        }
 
@@ -261,12 +261,12 @@ class StorageManagerTest extends DatabaseTest
 
                $storageManager = new StorageManager($this->dba, $this->config, $this->logger, $this->l10n);
 
-               $this->assertTrue($storageManager->register(SampleStorageBackend::class));
+               self::assertTrue($storageManager->register(SampleStorageBackend::class));
 
-               $this->assertEquals(array_merge(StorageManager::DEFAULT_BACKENDS, [
+               self::assertEquals(array_merge(StorageManager::DEFAULT_BACKENDS, [
                        SampleStorageBackend::getName() => SampleStorageBackend::class,
                ]), $storageManager->listBackends());
-               $this->assertEquals(array_merge(StorageManager::DEFAULT_BACKENDS, [
+               self::assertEquals(array_merge(StorageManager::DEFAULT_BACKENDS, [
                        SampleStorageBackend::getName() => SampleStorageBackend::class,
                ]), $this->config->get('storage', 'backends'));
 
@@ -274,17 +274,17 @@ class StorageManagerTest extends DatabaseTest
                SampleStorageBackend::registerHook();
                Hook::loadHooks();
 
-               $this->assertTrue($storageManager->setBackend(SampleStorageBackend::NAME));
-               $this->assertEquals(SampleStorageBackend::NAME, $this->config->get('storage', 'name'));
+               self::assertTrue($storageManager->setBackend(SampleStorageBackend::NAME));
+               self::assertEquals(SampleStorageBackend::NAME, $this->config->get('storage', 'name'));
 
-               $this->assertInstanceOf(SampleStorageBackend::class, $storageManager->getBackend());
+               self::assertInstanceOf(SampleStorageBackend::class, $storageManager->getBackend());
 
-               $this->assertTrue($storageManager->unregister(SampleStorageBackend::class));
-               $this->assertEquals(StorageManager::DEFAULT_BACKENDS, $this->config->get('storage', 'backends'));
-               $this->assertEquals(StorageManager::DEFAULT_BACKENDS, $storageManager->listBackends());
+               self::assertTrue($storageManager->unregister(SampleStorageBackend::class));
+               self::assertEquals(StorageManager::DEFAULT_BACKENDS, $this->config->get('storage', 'backends'));
+               self::assertEquals(StorageManager::DEFAULT_BACKENDS, $storageManager->listBackends());
 
-               $this->assertNull($storageManager->getBackend());
-               $this->assertNull($this->config->get('storage', 'name'));
+               self::assertNull($storageManager->getBackend());
+               self::assertNull($this->config->get('storage', 'name'));
        }
 
        /**
@@ -308,12 +308,12 @@ class StorageManagerTest extends DatabaseTest
 
                while ($photo = $this->dba->fetch($photos)) {
 
-                       $this->assertEmpty($photo['data']);
+                       self::assertEmpty($photo['data']);
 
                        $storage = $storageManager->getByName($photo['backend-class']);
                        $data = $storage->get($photo['backend-ref']);
 
-                       $this->assertNotEmpty($data);
+                       self::assertNotEmpty($data);
                }
        }
 
index 3f06ab6d23d5ec778ac557bec2eb276c914edf9a..2235b37574790c98f6de5ce5f4a033e179c3df34 100644 (file)
@@ -42,33 +42,33 @@ class SystemTest extends TestCase
        private function assertGuid($guid, $length, $prefix = '')
        {
                $length -= strlen($prefix);
-               $this->assertRegExp("/^" . $prefix . "[a-z0-9]{" . $length . "}?$/", $guid);
+               self::assertRegExp("/^" . $prefix . "[a-z0-9]{" . $length . "}?$/", $guid);
        }
 
        function testGuidWithoutParameter()
        {
                $this->useBaseUrl();
                $guid = System::createGUID();
-               $this->assertGuid($guid, 16);
+               self::assertGuid($guid, 16);
        }
 
        function testGuidWithSize32()
        {
                $this->useBaseUrl();
                $guid = System::createGUID(32);
-               $this->assertGuid($guid, 32);
+               self::assertGuid($guid, 32);
        }
 
        function testGuidWithSize64()
        {
                $this->useBaseUrl();
                $guid = System::createGUID(64);
-               $this->assertGuid($guid, 64);
+               self::assertGuid($guid, 64);
        }
 
        function testGuidWithPrefix()
        {
                $guid = System::createGUID(23, 'test');
-               $this->assertGuid($guid, 23, 'test');
+               self::assertGuid($guid, 23, 'test');
        }
 }
index aea03e76a2450992a5f328dd98d48d9774431c40..053acbe6492825ff40cd9fbe74ee401f229bc929 100644 (file)
@@ -32,13 +32,13 @@ class DBATest extends DatabaseTest
         */
        public function testExists() {
 
-               $this->assertTrue(DBA::exists('config', []));
-               $this->assertFalse(DBA::exists('notable', []));
+               self::assertTrue(DBA::exists('config', []));
+               self::assertFalse(DBA::exists('notable', []));
 
-               $this->assertTrue(DBA::exists('config', null));
-               $this->assertFalse(DBA::exists('notable', null));
+               self::assertTrue(DBA::exists('config', null));
+               self::assertFalse(DBA::exists('notable', null));
 
-               $this->assertTrue(DBA::exists('config', ['k' => 'hostname']));
-               $this->assertFalse(DBA::exists('config', ['k' => 'nonsense']));
+               self::assertTrue(DBA::exists('config', ['k' => 'hostname']));
+               self::assertFalse(DBA::exists('config', ['k' => 'nonsense']));
        }
 }
index baed645ecd85100b108828e462cc0fdc36feb738..ee1fb04f87e09e0b8270c3b2c35ccf8ab4331c99 100644 (file)
@@ -44,13 +44,13 @@ class DBStructureTest extends DatabaseTest
         * @small
         */
        public function testExists() {
-               $this->assertTrue(DBStructure::existsTable('config'));
+               self::assertTrue(DBStructure::existsTable('config'));
 
-               $this->assertFalse(DBStructure::existsTable('notatable'));
+               self::assertFalse(DBStructure::existsTable('notatable'));
 
-               $this->assertTrue(DBStructure::existsColumn('config', ['k']));
-               $this->assertFalse(DBStructure::existsColumn('config', ['nonsense']));
-               $this->assertFalse(DBStructure::existsColumn('config', ['k', 'nonsense']));
+               self::assertTrue(DBStructure::existsColumn('config', ['k']));
+               self::assertFalse(DBStructure::existsColumn('config', ['nonsense']));
+               self::assertFalse(DBStructure::existsColumn('config', ['k', 'nonsense']));
        }
 
        /**
@@ -62,13 +62,13 @@ class DBStructureTest extends DatabaseTest
                $fromType = 'varbinary(255) not null';
                $toType = 'varbinary(255) not null comment \'Test To Type\'';
 
-               $this->assertTrue(DBStructure::rename('config', [ $fromColumn => [ $toColumn, $toType ]]));
-               $this->assertTrue(DBStructure::existsColumn('config', [ $toColumn ]));
-               $this->assertFalse(DBStructure::existsColumn('config', [ $fromColumn ]));
+               self::assertTrue(DBStructure::rename('config', [ $fromColumn => [ $toColumn, $toType ]]));
+               self::assertTrue(DBStructure::existsColumn('config', [ $toColumn ]));
+               self::assertFalse(DBStructure::existsColumn('config', [ $fromColumn ]));
 
-               $this->assertTrue(DBStructure::rename('config', [ $toColumn => [ $fromColumn, $fromType ]]));
-               $this->assertTrue(DBStructure::existsColumn('config', [ $fromColumn ]));
-               $this->assertFalse(DBStructure::existsColumn('config', [ $toColumn ]));
+               self::assertTrue(DBStructure::rename('config', [ $toColumn => [ $fromColumn, $fromType ]]));
+               self::assertTrue(DBStructure::existsColumn('config', [ $fromColumn ]));
+               self::assertFalse(DBStructure::existsColumn('config', [ $toColumn ]));
        }
 
        /**
@@ -79,7 +79,7 @@ class DBStructureTest extends DatabaseTest
                $oldID = 'client_id';
                $newID = 'pw';
 
-               $this->assertTrue(DBStructure::rename('clients', [ $newID ], DBStructure::RENAME_PRIMARY_KEY));
-               $this->assertTrue(DBStructure::rename('clients', [ $oldID ], DBStructure::RENAME_PRIMARY_KEY));
+               self::assertTrue(DBStructure::rename('clients', [ $newID ], DBStructure::RENAME_PRIMARY_KEY));
+               self::assertTrue(DBStructure::rename('clients', [ $oldID ], DBStructure::RENAME_PRIMARY_KEY));
        }
 }
index b12261d700407a2c1982173d5c53258793691116..73bfe2234cdd2c38bd84098fe78a5bf977a6d8a1 100644 (file)
@@ -73,7 +73,7 @@ class FileTagTest extends TestCase
      */
     public function testArrayToFile(array $array, string $type, string $file)
     {
-        $this->assertEquals($file, FileTag::arrayToFile($array, $type));
+        self::assertEquals($file, FileTag::arrayToFile($array, $type));
     }
 
     public function dataFileToArray()
@@ -133,6 +133,6 @@ class FileTagTest extends TestCase
      */
     public function testFileToArray(string $file, string $type, array $array)
     {
-        $this->assertEquals($array, FileTag::fileToArray($file, $type));
+        self::assertEquals($array, FileTag::fileToArray($file, $type));
     }
 }
index 389e2ac70367bffaea88e464f9e9ec5ed8cb3f7d..490cd34c7a75e1af7610b9ec66a235ca997f4ea1 100644 (file)
@@ -41,22 +41,22 @@ class ProcessTest extends DatabaseTest
        {
                $process = new Process($this->dba);
 
-               $this->assertEquals(0, $this->dba->count('process'));
+               self::assertEquals(0, $this->dba->count('process'));
                $process->insert('test', 1);
                $process->insert('test2', 2);
                $process->insert('test3', 3);
 
-               $this->assertEquals(3, $this->dba->count('process'));
+               self::assertEquals(3, $this->dba->count('process'));
 
-               $this->assertEquals([
+               self::assertEquals([
                        ['command' => 'test']
                ], $this->dba->selectToArray('process', ['command'], ['pid' => 1]));
 
                $process->deleteByPid(1);
 
-               $this->assertEmpty($this->dba->selectToArray('process', ['command'], ['pid' => 1]));
+               self::assertEmpty($this->dba->selectToArray('process', ['command'], ['pid' => 1]));
 
-               $this->assertEquals(2, $this->dba->count('process'));
+               self::assertEquals(2, $this->dba->count('process'));
        }
 
        public function testDoubleInsert()
@@ -68,7 +68,7 @@ class ProcessTest extends DatabaseTest
                // double insert doesn't work
                $process->insert('test23', 1);
 
-               $this->assertEquals([['command' => 'test']], $this->dba->selectToArray('process', ['command'], ['pid' => 1]));
+               self::assertEquals([['command' => 'test']], $this->dba->selectToArray('process', ['command'], ['pid' => 1]));
        }
 
        public function testWrongDelete()
index cf29aedf95bd5e45830c5e11b2dc65570b5cd0f1..ceebc65044a84980f1ab6952a4f5946b054e6c61 100644 (file)
@@ -66,6 +66,6 @@ class DatabaseStorageTest extends StorageTest
 
        protected function assertOption(IStorage $storage)
        {
-               $this->assertEmpty($storage->getOptions());
+               self::assertEmpty($storage->getOptions());
        }
 }
index 5e508ddb06874006b473f3ec87390ad17932e524..232c0fc4bfad7a3cfc7d8918a2f2a44c8655c025 100644 (file)
@@ -66,7 +66,7 @@ class FilesystemStorageTest extends StorageTest
 
        protected function assertOption(IStorage $storage)
        {
-               $this->assertEquals([
+               self::assertEquals([
                        'storagepath' => [
                                'input', 'Storage base path',
                                $this->root->getChild('storage')->url(),
@@ -119,12 +119,12 @@ class FilesystemStorageTest extends StorageTest
                $dir = $this->root->getChild('storage/f0/c0')->url();
                $file = $this->root->getChild('storage/f0/c0/d0i0')->url();
 
-               $this->assertDirectoryExists($dir);
-               $this->assertFileExists($file);
+               self::assertDirectoryExists($dir);
+               self::assertFileExists($file);
 
-               $this->assertDirectoryIsWritable($dir);
-               $this->assertFileIsWritable($file);
+               self::assertDirectoryIsWritable($dir);
+               self::assertFileIsWritable($file);
 
-               $this->assertEquals('test', file_get_contents($file));
+               self::assertEquals('test', file_get_contents($file));
        }
 }
index d8b3c6cb778ad7b413f0d941a1bfc6fd82d17491..414aa9ea326222c670dd7bf3763f5035fe3e1770 100644 (file)
@@ -37,7 +37,7 @@ abstract class StorageTest extends MockedTest
        public function testInstance()
        {
                $instance = $this->getInstance();
-               $this->assertInstanceOf(IStorage::class, $instance);
+               self::assertInstanceOf(IStorage::class, $instance);
        }
 
        /**
@@ -58,11 +58,11 @@ abstract class StorageTest extends MockedTest
                $instance = $this->getInstance();
 
                $ref = $instance->put('data12345');
-               $this->assertNotEmpty($ref);
+               self::assertNotEmpty($ref);
 
-               $this->assertEquals('data12345', $instance->get($ref));
+               self::assertEquals('data12345', $instance->get($ref));
 
-               $this->assertTrue($instance->delete($ref));
+               self::assertTrue($instance->delete($ref));
        }
 
        /**
@@ -73,7 +73,7 @@ abstract class StorageTest extends MockedTest
                $instance = $this->getInstance();
 
                // Even deleting not existing references should return "true"
-               $this->assertTrue($instance->delete(-1234456));
+               self::assertTrue($instance->delete(-1234456));
        }
 
        /**
@@ -84,7 +84,7 @@ abstract class StorageTest extends MockedTest
                $instance = $this->getInstance();
 
                // Invalid references return an empty string
-               $this->assertEmpty($instance->get(-123456));
+               self::assertEmpty($instance->get(-123456));
        }
 
        /**
@@ -95,12 +95,12 @@ abstract class StorageTest extends MockedTest
                $instance = $this->getInstance();
 
                $ref = $instance->put('data12345');
-               $this->assertNotEmpty($ref);
+               self::assertNotEmpty($ref);
 
-               $this->assertEquals('data12345', $instance->get($ref));
+               self::assertEquals('data12345', $instance->get($ref));
 
-               $this->assertEquals($ref, $instance->put('data5432', $ref));
-               $this->assertEquals('data5432', $instance->get($ref));
+               self::assertEquals($ref, $instance->put('data5432', $ref));
+               self::assertEquals('data5432', $instance->get($ref));
        }
 
        /**
@@ -110,6 +110,6 @@ abstract class StorageTest extends MockedTest
        {
                $instance = $this->getInstance();
 
-               $this->assertEquals(-123, $instance->put('data12345', -123));
+               self::assertEquals(-123, $instance->put('data12345', -123));
        }
 }
index 40c99f3ea73fa5b19078bb4ac3a11307bac8953c..e8dba95576ae4d369edee29a1018038413cf81f0 100644 (file)
@@ -60,7 +60,7 @@ class CookieTest extends MockedTest
                $this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn('7')->once();
 
                $cookie = new Cookie($this->config, $this->baseUrl);
-               $this->assertInstanceOf(Cookie::class, $cookie);
+               self::assertInstanceOf(Cookie::class, $cookie);
        }
 
        public function dataGet()
@@ -124,31 +124,31 @@ class CookieTest extends MockedTest
                $this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn('7')->once();
 
                $cookie = new Cookie($this->config, $this->baseUrl, [], $cookieData);
-               $this->assertInstanceOf(Cookie::class, $cookie);
+               self::assertInstanceOf(Cookie::class, $cookie);
 
                $assertData = $cookie->getData();
 
                if (!$hasValues) {
-                       $this->assertEmpty($assertData);
+                       self::assertEmpty($assertData);
                } else {
-                       $this->assertNotEmpty($assertData);
+                       self::assertNotEmpty($assertData);
                        if (isset($uid)) {
-                               $this->assertObjectHasAttribute('uid', $assertData);
-                               $this->assertEquals($uid, $assertData->uid);
+                               self::assertObjectHasAttribute('uid', $assertData);
+                               self::assertEquals($uid, $assertData->uid);
                        } else {
-                               $this->assertObjectNotHasAttribute('uid', $assertData);
+                               self::assertObjectNotHasAttribute('uid', $assertData);
                        }
                        if (isset($hash)) {
-                               $this->assertObjectHasAttribute('hash', $assertData);
-                               $this->assertEquals($hash, $assertData->hash);
+                               self::assertObjectHasAttribute('hash', $assertData);
+                               self::assertEquals($hash, $assertData->hash);
                        } else {
-                               $this->assertObjectNotHasAttribute('hash', $assertData);
+                               self::assertObjectNotHasAttribute('hash', $assertData);
                        }
                        if (isset($ip)) {
-                               $this->assertObjectHasAttribute('ip', $assertData);
-                               $this->assertEquals($ip, $assertData->ip);
+                               self::assertObjectHasAttribute('ip', $assertData);
+                               self::assertEquals($ip, $assertData->ip);
                        } else {
-                               $this->assertObjectNotHasAttribute('ip', $assertData);
+                               self::assertObjectNotHasAttribute('ip', $assertData);
                        }
                }
        }
@@ -192,9 +192,9 @@ class CookieTest extends MockedTest
                $this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn('7')->once();
 
                $cookie = new Cookie($this->config, $this->baseUrl);
-               $this->assertInstanceOf(Cookie::class, $cookie);
+               self::assertInstanceOf(Cookie::class, $cookie);
 
-               $this->assertEquals($assertTrue, $cookie->check($assertHash, $password, $userPrivateKey));
+               self::assertEquals($assertTrue, $cookie->check($assertHash, $password, $userPrivateKey));
        }
 
        public function dataSet()
@@ -245,21 +245,21 @@ class CookieTest extends MockedTest
 
        public function assertCookie($uid, $hash, $remoteIp, $lifetime)
        {
-               $this->assertArrayHasKey(Cookie::NAME, StaticCookie::$_COOKIE);
+               self::assertArrayHasKey(Cookie::NAME, StaticCookie::$_COOKIE);
 
                $data = json_decode(StaticCookie::$_COOKIE[Cookie::NAME]);
 
-               $this->assertObjectHasAttribute('uid', $data);
-               $this->assertEquals($uid, $data->uid);
-               $this->assertObjectHasAttribute('hash', $data);
-               $this->assertEquals($hash, $data->hash);
-               $this->assertObjectHasAttribute('ip', $data);
-               $this->assertEquals($remoteIp, $data->ip);
+               self::assertObjectHasAttribute('uid', $data);
+               self::assertEquals($uid, $data->uid);
+               self::assertObjectHasAttribute('hash', $data);
+               self::assertEquals($hash, $data->hash);
+               self::assertObjectHasAttribute('ip', $data);
+               self::assertEquals($remoteIp, $data->ip);
 
                if (isset($lifetime) && $lifetime !== 0) {
-                       $this->assertLessThanOrEqual(time() + $lifetime, StaticCookie::$_EXPIRE);
+                       self::assertLessThanOrEqual(time() + $lifetime, StaticCookie::$_EXPIRE);
                } else {
-                       $this->assertLessThanOrEqual(time() + Cookie::DEFAULT_EXPIRE * 24 * 60 * 60, StaticCookie::$_EXPIRE);
+                       self::assertLessThanOrEqual(time() + Cookie::DEFAULT_EXPIRE * 24 * 60 * 60, StaticCookie::$_EXPIRE);
                }
        }
 
@@ -275,11 +275,11 @@ class CookieTest extends MockedTest
                $this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn(Cookie::DEFAULT_EXPIRE)->once();
 
                $cookie = new StaticCookie($this->config, $this->baseUrl, $serverArray);
-               $this->assertInstanceOf(Cookie::class, $cookie);
+               self::assertInstanceOf(Cookie::class, $cookie);
 
                $cookie->set($uid, $password, $privateKey, $lifetime);
 
-               $this->assertCookie($uid, $assertHash, $remoteIp, $lifetime);
+               self::assertCookie($uid, $assertHash, $remoteIp, $lifetime);
        }
 
        /**
@@ -294,14 +294,14 @@ class CookieTest extends MockedTest
                $this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn(Cookie::DEFAULT_EXPIRE)->once();
 
                $cookie = new StaticCookie($this->config, $this->baseUrl, $serverArray);
-               $this->assertInstanceOf(Cookie::class, $cookie);
+               self::assertInstanceOf(Cookie::class, $cookie);
 
                // Invalid set, should get overwritten
                $cookie->set(-1, 'invalid', 'nothing', -234);
 
                $cookie->set($uid, $password, $privateKey, $lifetime);
 
-               $this->assertCookie($uid, $assertHash, $remoteIp, $lifetime);
+               self::assertCookie($uid, $assertHash, $remoteIp, $lifetime);
        }
 
        /**
@@ -318,14 +318,14 @@ class CookieTest extends MockedTest
                $this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn(Cookie::DEFAULT_EXPIRE)->once();
 
                $cookie = new StaticCookie($this->config, $this->baseUrl);
-               $this->assertInstanceOf(Cookie::class, $cookie);
+               self::assertInstanceOf(Cookie::class, $cookie);
 
-               $this->assertEquals('test', StaticCookie::$_COOKIE[Cookie::NAME]);
-               $this->assertEquals(null, StaticCookie::$_EXPIRE);
+               self::assertEquals('test', StaticCookie::$_COOKIE[Cookie::NAME]);
+               self::assertEquals(null, StaticCookie::$_EXPIRE);
 
                $cookie->clear();
 
-               $this->assertEmpty(StaticCookie::$_COOKIE[Cookie::NAME]);
-               $this->assertEquals(-3600, StaticCookie::$_EXPIRE);
+               self::assertEmpty(StaticCookie::$_COOKIE[Cookie::NAME]);
+               self::assertEquals(-3600, StaticCookie::$_EXPIRE);
        }
 }
index bc0db13f4a3717be2b2673f104166c193e952dd9..b64ea330fb5752eb129518b5903ec247e3783a51 100644 (file)
@@ -72,7 +72,7 @@ class UserTest extends MockedTest
 
                $record = User::identities($this->parent['uid']);
 
-               $this->assertEquals([], $record);
+               self::assertEquals([], $record);
        }
 
        public function testIdentitiesAsParent()
@@ -109,7 +109,7 @@ class UserTest extends MockedTest
 
                $record = User::identities($this->parent['uid']);
 
-               $this->assertEquals([
+               self::assertEquals([
                        $this->parent,
                        $this->child,
                        $this->manage
@@ -162,7 +162,7 @@ class UserTest extends MockedTest
 
                $record = User::identities($this->child['uid']);
 
-               $this->assertEquals([
+               self::assertEquals([
                        $this->parent,
                        $this->child,
                        $this->manage
index e23b83682535f5876c5d0121dfc0db98c88f2bae..677790d63fef4ba3d573adfebd26fa0c41c7f767 100644 (file)
@@ -12,9 +12,9 @@ class ContactEndpointTest extends FixtureTest
 {
        public function testGetUid()
        {
-               $this->assertSame(42, ContactEndpointMock::getUid(42));
-               $this->assertSame(42, ContactEndpointMock::getUid(null, 'selfcontact'));
-               $this->assertSame(42, ContactEndpointMock::getUid(84, 'selfcontact'));
+               self::assertSame(42, ContactEndpointMock::getUid(42));
+               self::assertSame(42, ContactEndpointMock::getUid(null, 'selfcontact'));
+               self::assertSame(42, ContactEndpointMock::getUid(84, 'selfcontact'));
        }
 
        public function testGetUidContactIdNotFound()
@@ -52,7 +52,7 @@ class ContactEndpointTest extends FixtureTest
                        'total_count' => 0,
                ];
 
-               $this->assertSame($expectedEmpty, ContactEndpointMock::ids(Contact::FOLLOWER, 42));
+               self::assertSame($expectedEmpty, ContactEndpointMock::ids(Contact::FOLLOWER, 42));
 
                $expectedFriend = [
                        'ids' => [47],
@@ -63,20 +63,20 @@ class ContactEndpointTest extends FixtureTest
                        'total_count' => 1,
                ];
 
-               $this->assertSame($expectedFriend, ContactEndpointMock::ids(Contact::FRIEND, 42));
-               $this->assertSame($expectedFriend, ContactEndpointMock::ids([Contact::FOLLOWER, Contact::FRIEND], 42));
+               self::assertSame($expectedFriend, ContactEndpointMock::ids(Contact::FRIEND, 42));
+               self::assertSame($expectedFriend, ContactEndpointMock::ids([Contact::FOLLOWER, Contact::FRIEND], 42));
 
                $result = ContactEndpointMock::ids(Contact::SHARING, 42);
 
-               $this->assertArrayHasKey('ids', $result);
-               $this->assertContainsOnly('int', $result['ids']);
-               $this->assertSame(45, $result['ids'][0]);
+               self::assertArrayHasKey('ids', $result);
+               self::assertContainsOnly('int', $result['ids']);
+               self::assertSame(45, $result['ids'][0]);
 
                $result = ContactEndpointMock::ids([Contact::SHARING, Contact::FRIEND], 42);
 
-               $this->assertArrayHasKey('ids', $result);
-               $this->assertContainsOnly('int', $result['ids']);
-               $this->assertSame(45, $result['ids'][0]);
+               self::assertArrayHasKey('ids', $result);
+               self::assertContainsOnly('int', $result['ids']);
+               self::assertSame(45, $result['ids'][0]);
        }
 
        /**
@@ -88,9 +88,9 @@ class ContactEndpointTest extends FixtureTest
        {
                $result = ContactEndpointMock::ids(Contact::SHARING, 42, -1, ContactEndpoint::DEFAULT_COUNT, true);
 
-               $this->assertArrayHasKey('ids', $result);
-               $this->assertContainsOnly('string', $result['ids']);
-               $this->assertSame('45', $result['ids'][0]);
+               self::assertArrayHasKey('ids', $result);
+               self::assertContainsOnly('string', $result['ids']);
+               self::assertSame('45', $result['ids'][0]);
        }
 
        public function testIdsPagination()
@@ -106,7 +106,7 @@ class ContactEndpointTest extends FixtureTest
 
                $result = ContactEndpointMock::ids([Contact::SHARING, Contact::FRIEND], 42, -1, 1);
 
-               $this->assertSame($expectedDefaultPageResult, $result);
+               self::assertSame($expectedDefaultPageResult, $result);
 
                $nextPageCursor = $result['next_cursor'];
 
@@ -121,7 +121,7 @@ class ContactEndpointTest extends FixtureTest
 
                $result = ContactEndpointMock::ids([Contact::SHARING, Contact::FRIEND], 42, $nextPageCursor, 1);
 
-               $this->assertSame($expectedSecondPageResult, $result);
+               self::assertSame($expectedSecondPageResult, $result);
 
                $firstPageCursor = $result['previous_cursor'];
                $emptyNextPageCursor = $result['next_cursor'];
@@ -137,7 +137,7 @@ class ContactEndpointTest extends FixtureTest
 
                $result = ContactEndpointMock::ids([Contact::SHARING, Contact::FRIEND], 42, $firstPageCursor, 1);
 
-               $this->assertSame($expectedFirstPageResult, $result);
+               self::assertSame($expectedFirstPageResult, $result);
 
                $emptyPrevPageCursor = $result['previous_cursor'];
 
@@ -152,7 +152,7 @@ class ContactEndpointTest extends FixtureTest
 
                $result = ContactEndpointMock::ids([Contact::SHARING, Contact::FRIEND], 42, $emptyPrevPageCursor, 1);
 
-               $this->assertSame($expectedEmptyPrevPageResult, $result);
+               self::assertSame($expectedEmptyPrevPageResult, $result);
 
                $expectedEmptyNextPageResult = [
                        'ids' => [],
@@ -165,7 +165,7 @@ class ContactEndpointTest extends FixtureTest
 
                $result = ContactEndpointMock::ids([Contact::SHARING, Contact::FRIEND], 42, $emptyNextPageCursor, 1);
 
-               $this->assertSame($expectedEmptyNextPageResult, $result);
+               self::assertSame($expectedEmptyNextPageResult, $result);
        }
 
        /**
@@ -186,7 +186,7 @@ class ContactEndpointTest extends FixtureTest
                        'total_count' => 0,
                ];
 
-               $this->assertSame($expectedEmpty, ContactEndpointMock::list(Contact::FOLLOWER, 42));
+               self::assertSame($expectedEmpty, ContactEndpointMock::list(Contact::FOLLOWER, 42));
 
                $expectedFriendContactUser = [
                        'id' => 45,
@@ -241,14 +241,14 @@ class ContactEndpointTest extends FixtureTest
 
                $result = ContactEndpointMock::list(Contact::SHARING, 42);
 
-               $this->assertArrayHasKey('users', $result);
-               $this->assertContainsOnlyInstancesOf(User::class, $result['users']);
-               $this->assertSame($expectedFriendContactUser, $result['users'][0]->toArray());
+               self::assertArrayHasKey('users', $result);
+               self::assertContainsOnlyInstancesOf(User::class, $result['users']);
+               self::assertSame($expectedFriendContactUser, $result['users'][0]->toArray());
 
                $result = ContactEndpointMock::list([Contact::SHARING, Contact::FRIEND], 42);
 
-               $this->assertArrayHasKey('users', $result);
-               $this->assertContainsOnlyInstancesOf(User::class, $result['users']);
-               $this->assertSame($expectedFriendContactUser, $result['users'][0]->toArray());
+               self::assertArrayHasKey('users', $result);
+               self::assertContainsOnlyInstancesOf(User::class, $result['users']);
+               self::assertSame($expectedFriendContactUser, $result['users'][0]->toArray());
        }
 }
index e066fb89b052a0b0c65c9a0d1a41e7c57f5c5b6e..b13de5395ff08901ada068c5ca49bc2c60346241 100644 (file)
@@ -62,14 +62,14 @@ class CurlResultTest extends TestCase
                        'url' => 'https://test.local'
                ]);
 
-               $this->assertTrue($curlResult->isSuccess());
-               $this->assertFalse($curlResult->isTimeout());
-               $this->assertFalse($curlResult->isRedirectUrl());
-               $this->assertSame($header, $curlResult->getHeader());
-               $this->assertSame($body, $curlResult->getBody());
-               $this->assertSame('text/html; charset=utf-8', $curlResult->getContentType());
-               $this->assertSame('https://test.local', $curlResult->getUrl());
-               $this->assertSame('https://test.local', $curlResult->getRedirectUrl());
+               self::assertTrue($curlResult->isSuccess());
+               self::assertFalse($curlResult->isTimeout());
+               self::assertFalse($curlResult->isRedirectUrl());
+               self::assertSame($header, $curlResult->getHeader());
+               self::assertSame($body, $curlResult->getBody());
+               self::assertSame('text/html; charset=utf-8', $curlResult->getContentType());
+               self::assertSame('https://test.local', $curlResult->getUrl());
+               self::assertSame('https://test.local', $curlResult->getRedirectUrl());
        }
 
        /**
@@ -90,14 +90,14 @@ class CurlResultTest extends TestCase
                        'redirect_url' => 'https://test.other'
                ]);
 
-               $this->assertTrue($curlResult->isSuccess());
-               $this->assertFalse($curlResult->isTimeout());
-               $this->assertTrue($curlResult->isRedirectUrl());
-               $this->assertSame($header, $curlResult->getHeader());
-               $this->assertSame($body, $curlResult->getBody());
-               $this->assertSame('text/html; charset=utf-8', $curlResult->getContentType());
-               $this->assertSame('https://test.local/test/it', $curlResult->getUrl());
-               $this->assertSame('https://test.other/test/it', $curlResult->getRedirectUrl());
+               self::assertTrue($curlResult->isSuccess());
+               self::assertFalse($curlResult->isTimeout());
+               self::assertTrue($curlResult->isRedirectUrl());
+               self::assertSame($header, $curlResult->getHeader());
+               self::assertSame($body, $curlResult->getBody());
+               self::assertSame('text/html; charset=utf-8', $curlResult->getContentType());
+               self::assertSame('https://test.local/test/it', $curlResult->getUrl());
+               self::assertSame('https://test.other/test/it', $curlResult->getRedirectUrl());
        }
 
        /**
@@ -116,14 +116,14 @@ class CurlResultTest extends TestCase
                        'redirect_url' => 'https://test.other'
                ], CURLE_OPERATION_TIMEDOUT, 'Tested error');
 
-               $this->assertFalse($curlResult->isSuccess());
-               $this->assertTrue($curlResult->isTimeout());
-               $this->assertFalse($curlResult->isRedirectUrl());
-               $this->assertSame($header, $curlResult->getHeader());
-               $this->assertSame($body, $curlResult->getBody());
-               $this->assertSame('text/html; charset=utf-8', $curlResult->getContentType());
-               $this->assertSame('https://test.local/test/it', $curlResult->getRedirectUrl());
-               $this->assertSame('Tested error', $curlResult->getError());
+               self::assertFalse($curlResult->isSuccess());
+               self::assertTrue($curlResult->isTimeout());
+               self::assertFalse($curlResult->isRedirectUrl());
+               self::assertSame($header, $curlResult->getHeader());
+               self::assertSame($body, $curlResult->getBody());
+               self::assertSame('text/html; charset=utf-8', $curlResult->getContentType());
+               self::assertSame('https://test.local/test/it', $curlResult->getRedirectUrl());
+               self::assertSame('Tested error', $curlResult->getError());
        }
 
        /**
@@ -143,14 +143,14 @@ class CurlResultTest extends TestCase
                        'url' => 'https://test.local/test/it?key=value',
                ]);
 
-               $this->assertTrue($curlResult->isSuccess());
-               $this->assertFalse($curlResult->isTimeout());
-               $this->assertTrue($curlResult->isRedirectUrl());
-               $this->assertSame($header, $curlResult->getHeader());
-               $this->assertSame($body, $curlResult->getBody());
-               $this->assertSame('text/html; charset=utf-8', $curlResult->getContentType());
-               $this->assertSame('https://test.local/test/it?key=value', $curlResult->getUrl());
-               $this->assertSame('https://test.other/some/?key=value', $curlResult->getRedirectUrl());
+               self::assertTrue($curlResult->isSuccess());
+               self::assertFalse($curlResult->isTimeout());
+               self::assertTrue($curlResult->isRedirectUrl());
+               self::assertSame($header, $curlResult->getHeader());
+               self::assertSame($body, $curlResult->getBody());
+               self::assertSame('text/html; charset=utf-8', $curlResult->getContentType());
+               self::assertSame('https://test.local/test/it?key=value', $curlResult->getUrl());
+               self::assertSame('https://test.other/some/?key=value', $curlResult->getRedirectUrl());
        }
 
        /**
@@ -166,8 +166,8 @@ class CurlResultTest extends TestCase
                        'content_type' => 'text/html; charset=utf-8',
                        'url' => 'https://test.local'
                ]);
-               $this->assertTrue($curlResult->inHeader('vary'));
-               $this->assertFalse($curlResult->inHeader('wrongHeader'));
+               self::assertTrue($curlResult->inHeader('vary'));
+               self::assertFalse($curlResult->inHeader('wrongHeader'));
        }
 
         /**
@@ -186,8 +186,8 @@ class CurlResultTest extends TestCase
 
                $headers = $curlResult->getHeaderArray();
 
-               $this->assertNotEmpty($headers);
-               $this->assertArrayHasKey('vary', $headers);
+               self::assertNotEmpty($headers);
+               self::assertArrayHasKey('vary', $headers);
        }
 
         /**
@@ -204,7 +204,7 @@ class CurlResultTest extends TestCase
                        'url' => 'https://test.local'
                ]);
 
-               $this->assertNotEmpty($curlResult->getHeader());
-               $this->assertEmpty($curlResult->getHeader('wrongHeader'));
+               self::assertNotEmpty($curlResult->getHeader());
+               self::assertEmpty($curlResult->getHeader('wrongHeader'));
        }
 }
index 2dfc0e2ac8302aa843991613f999f7b325e2ffa4..58711cb916f9c9442a2298e9b572955b1bfe0bc2 100644 (file)
@@ -85,7 +85,7 @@ class ProbeTest extends TestCase
 
                                $feedLink = Probe::getFeedLink($url, $body);
 
-                               $this->assertEquals($expected, $feedLink, 'base url = ' . $url . ' | href = ' . $href);
+                               self::assertEquals($expected, $feedLink, 'base url = ' . $url . ' | href = ' . $href);
                        }
                }
        }
@@ -101,7 +101,7 @@ class ProbeTest extends TestCase
 
                                $feedLink = Probe::getFeedLink('http://example.com', $body);
 
-                               $this->assertEquals($expected, $feedLink, 'base url = ' . $url . ' | href = ' . $href);
+                               self::assertEquals($expected, $feedLink, 'base url = ' . $url . ' | href = ' . $href);
                        }
                }
        }
index edea12fdff61215e6726d0247d3c220e6934d15c..e9e23660eaf89f6e0c795e5e56f24a323b26984c 100644 (file)
@@ -72,14 +72,14 @@ class ActivityTest extends MockedTest
        {
                $activity = new Activity();
 
-               $this->assertEquals($assert, $activity->match($haystack, $needle));
+               self::assertEquals($assert, $activity->match($haystack, $needle));
        }
 
        public function testIsHidden()
        {
                $activity = new Activity();
 
-               $this->assertTrue($activity->isHidden(Activity::LIKE));
-               $this->assertFalse($activity->isHidden(Activity\ObjectType::BOOKMARK));
+               self::assertTrue($activity->isHidden(Activity::LIKE));
+               self::assertFalse($activity->isHidden(Activity\ObjectType::BOOKMARK));
        }
 }
index 37535b55859039eccceca0fbed38a51fb1198985..d565d0ba95db0366d270f700da17e6fc9b72c14d 100644 (file)
@@ -37,18 +37,18 @@ class ACLFormaterTest extends TestCase
 
                $acl = $aclFormatter->expand($text);
 
-               $this->assertEquals($assert, $acl);
+               self::assertEquals($assert, $acl);
 
-               $this->assertMergable($acl);
+               self::assertMergable($acl);
        }
 
        public function assertMergable(array $aclOne, array $aclTwo = [])
        {
-               $this->assertTrue(is_array($aclOne));
-               $this->assertTrue(is_array($aclTwo));
+               self::assertTrue(is_array($aclOne));
+               self::assertTrue(is_array($aclTwo));
 
                $aclMerged = array_unique(array_merge($aclOne, $aclTwo));
-               $this->assertTrue(is_array($aclMerged));
+               self::assertTrue(is_array($aclMerged));
 
                return $aclMerged;
        }
@@ -118,7 +118,7 @@ class ACLFormaterTest extends TestCase
         */
        public function testExpand($input, array $assert)
        {
-               $this->assertAcl($input, $assert);
+               self::assertAcl($input, $assert);
        }
 
        /**
@@ -131,11 +131,11 @@ class ACLFormaterTest extends TestCase
                $allow_people = $aclFormatter->expand();
                $allow_groups = $aclFormatter->expand();
 
-               $this->assertEmpty($aclFormatter->expand(null));
-               $this->assertEmpty($aclFormatter->expand());
+               self::assertEmpty($aclFormatter->expand(null));
+               self::assertEmpty($aclFormatter->expand());
 
                $recipients   = array_unique(array_merge($allow_people, $allow_groups));
-               $this->assertEmpty($recipients);
+               self::assertEmpty($recipients);
        }
 
        public function dataAclToString()
@@ -188,6 +188,6 @@ class ACLFormaterTest extends TestCase
        {
                $aclFormatter = new ACLFormatter();
 
-               $this->assertEquals($assert, $aclFormatter->toString($input));
+               self::assertEquals($assert, $aclFormatter->toString($input));
        }
 }
index 1b82c0b8ff825d018529894117cabbc6c13cd8dd..b29f80584afa805f038cb89d1223f25b40e29714 100644 (file)
@@ -35,7 +35,7 @@ class ArraysTest extends TestCase
        public function testEmptyArrayEmptyDelimiter()
        {
                $str = Arrays::recursiveImplode([], '');
-               $this->assertEmpty($str);
+               self::assertEmpty($str);
        }
 
        /**
@@ -44,7 +44,7 @@ class ArraysTest extends TestCase
        public function testEmptyArrayNonEmptyDelimiter()
        {
                $str = Arrays::recursiveImplode([], ',');
-               $this->assertEmpty($str);
+               self::assertEmpty($str);
        }
 
        /**
@@ -53,7 +53,7 @@ class ArraysTest extends TestCase
        public function testNonEmptyArrayEmptyDelimiter()
        {
                $str = Arrays::recursiveImplode([1], '');
-               $this->assertSame($str, '1');
+               self::assertSame($str, '1');
        }
 
        /**
@@ -62,7 +62,7 @@ class ArraysTest extends TestCase
        public function testNonEmptyArray2EmptyDelimiter()
        {
                $str = Arrays::recursiveImplode([1, 2], '');
-               $this->assertSame($str, '12');
+               self::assertSame($str, '12');
        }
 
        /**
@@ -71,7 +71,7 @@ class ArraysTest extends TestCase
        public function testNonEmptyArrayNonEmptyDelimiter()
        {
                $str = Arrays::recursiveImplode([1], ',');
-               $this->assertSame($str, '1');
+               self::assertSame($str, '1');
        }
 
        /**
@@ -80,7 +80,7 @@ class ArraysTest extends TestCase
        public function testNonEmptyArray2NonEmptyDelimiter()
        {
                $str = Arrays::recursiveImplode([1, 2], ',');
-               $this->assertSame($str, '1,2');
+               self::assertSame($str, '1,2');
        }
 
        /**
@@ -89,7 +89,7 @@ class ArraysTest extends TestCase
        public function testEmptyMultiArray2EmptyDelimiter()
        {
                $str = Arrays::recursiveImplode([[1], []], '');
-               $this->assertSame($str, '{1}{}');
+               self::assertSame($str, '{1}{}');
        }
 
        /**
@@ -98,7 +98,7 @@ class ArraysTest extends TestCase
        public function testEmptyMulti2Array2EmptyDelimiter()
        {
                $str = Arrays::recursiveImplode([[1], [2]], '');
-               $this->assertSame($str, '{1}{2}');
+               self::assertSame($str, '{1}{2}');
        }
 
        /**
@@ -107,7 +107,7 @@ class ArraysTest extends TestCase
        public function testEmptyMultiArray2NonEmptyDelimiter()
        {
                $str = Arrays::recursiveImplode([[1], []], ',');
-               $this->assertSame($str, '{1},{}');
+               self::assertSame($str, '{1},{}');
        }
 
        /**
@@ -116,7 +116,7 @@ class ArraysTest extends TestCase
        public function testEmptyMulti2Array2NonEmptyDelimiter()
        {
                $str = Arrays::recursiveImplode([[1], [2]], ',');
-               $this->assertSame($str, '{1},{2}');
+               self::assertSame($str, '{1},{2}');
        }
 
        /**
@@ -125,6 +125,6 @@ class ArraysTest extends TestCase
        public function testEmptyMulti3Array2NonEmptyDelimiter()
        {
                $str = Arrays::recursiveImplode([[1], [2, [3]]], ',');
-               $this->assertSame($str, '{1},{2,{3}}');
+               self::assertSame($str, '{1},{2,{3}}');
        }
 }
index c9c7b079f9aa78cd933817c94c5efde7aa603835..61c740c79c34bbe3c256e3a2c2e582eb33205f4a 100644 (file)
@@ -59,7 +59,7 @@ class BasePathTest extends MockedTest
        public function testDetermineBasePath(array $server, $input, $output)
        {
                $basepath = new BasePath($input, $server);
-               $this->assertEquals($output, $basepath->getPath());
+               self::assertEquals($output, $basepath->getPath());
        }
 
        /**
index 12fcf8858b516025461d1714f011c84c00dcd8fc..83410066b0cf14517723f7a4c6dea480328208ae 100644 (file)
@@ -201,11 +201,11 @@ class BaseURLTest extends MockedTest
 
                $baseUrl = new BaseURL($configMock, $server);
 
-               $this->assertEquals($assert['hostname'], $baseUrl->getHostname());
-               $this->assertEquals($assert['urlPath'], $baseUrl->getUrlPath());
-               $this->assertEquals($assert['sslPolicy'], $baseUrl->getSSLPolicy());
-               $this->assertEquals($assert['scheme'], $baseUrl->getScheme());
-               $this->assertEquals($assert['url'], $baseUrl->get());
+               self::assertEquals($assert['hostname'], $baseUrl->getHostname());
+               self::assertEquals($assert['urlPath'], $baseUrl->getUrlPath());
+               self::assertEquals($assert['sslPolicy'], $baseUrl->getSSLPolicy());
+               self::assertEquals($assert['scheme'], $baseUrl->getScheme());
+               self::assertEquals($assert['url'], $baseUrl->get());
        }
 
        public function dataSave()
@@ -320,7 +320,7 @@ class BaseURLTest extends MockedTest
 
                $baseUrl->save($save['hostname'], $save['sslPolicy'], $save['urlPath']);
 
-               $this->assertEquals($url, $baseUrl->get());
+               self::assertEquals($url, $baseUrl->get());
        }
 
        /**
@@ -358,7 +358,7 @@ class BaseURLTest extends MockedTest
 
                $baseUrl->saveByURL($url);
 
-               $this->assertEquals($url, $baseUrl->get());
+               self::assertEquals($url, $baseUrl->get());
        }
 
        public function dataGetBaseUrl()
@@ -417,7 +417,7 @@ class BaseURLTest extends MockedTest
 
                $baseUrl = new BaseURL($configMock, []);
 
-               $this->assertEquals($assert, $baseUrl->get($ssl));
+               self::assertEquals($assert, $baseUrl->get($ssl));
        }
 
        public function dataCheckRedirectHTTPS()
@@ -476,7 +476,7 @@ class BaseURLTest extends MockedTest
 
                $baseUrl = new BaseURL($configMock, $server);
 
-               $this->assertEquals($redirect, $baseUrl->checkRedirectHttps());
+               self::assertEquals($redirect, $baseUrl->checkRedirectHttps());
        }
 
        public function dataWrongSave()
@@ -531,12 +531,12 @@ class BaseURLTest extends MockedTest
                }
 
                $baseUrl = new BaseURL($configMock, []);
-               $this->assertFalse($baseUrl->save('test', 10, 'nope'));
+               self::assertFalse($baseUrl->save('test', 10, 'nope'));
 
                // nothing should have changed because we never successfully saved anything
-               $this->assertEquals($baseUrl->getHostname(), 'friendica.local');
-               $this->assertEquals($baseUrl->getUrlPath(), 'new/test');
-               $this->assertEquals($baseUrl->getSSLPolicy(), BaseURL::DEFAULT_SSL_SCHEME);
-               $this->assertEquals($baseUrl->get(), 'http://friendica.local/new/test');
+               self::assertEquals($baseUrl->getHostname(), 'friendica.local');
+               self::assertEquals($baseUrl->getUrlPath(), 'new/test');
+               self::assertEquals($baseUrl->getSSLPolicy(), BaseURL::DEFAULT_SSL_SCHEME);
+               self::assertEquals($baseUrl->get(), 'http://friendica.local/new/test');
        }
 }
index 57bcc844675981e9e8e1eddaf341c83a2d4d8eb1..96e54bea050cdf107cce9932534000f0b172d071 100644 (file)
@@ -50,7 +50,7 @@ class ConfigFileLoaderTest extends MockedTest
 
                $configFileLoader->setupCache($configCache);
 
-               $this->assertEquals($this->root->url(), $configCache->get('system', 'basepath'));
+               self::assertEquals($this->root->url(), $configCache->get('system', 'basepath'));
        }
 
        /**
@@ -95,13 +95,13 @@ class ConfigFileLoaderTest extends MockedTest
 
                $configFileLoader->setupCache($configCache);
 
-               $this->assertEquals('testhost', $configCache->get('database', 'hostname'));
-               $this->assertEquals('testuser', $configCache->get('database', 'username'));
-               $this->assertEquals('testpw', $configCache->get('database', 'password'));
-               $this->assertEquals('testdb', $configCache->get('database', 'database'));
+               self::assertEquals('testhost', $configCache->get('database', 'hostname'));
+               self::assertEquals('testuser', $configCache->get('database', 'username'));
+               self::assertEquals('testpw', $configCache->get('database', 'password'));
+               self::assertEquals('testdb', $configCache->get('database', 'database'));
 
-               $this->assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
-               $this->assertEquals('Friendica Social Network', $configCache->get('config', 'sitename'));
+               self::assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
+               self::assertEquals('Friendica Social Network', $configCache->get('config', 'sitename'));
        }
 
        /**
@@ -127,12 +127,12 @@ class ConfigFileLoaderTest extends MockedTest
 
                $configFileLoader->setupCache($configCache);
 
-               $this->assertEquals('testhost', $configCache->get('database', 'hostname'));
-               $this->assertEquals('testuser', $configCache->get('database', 'username'));
-               $this->assertEquals('testpw', $configCache->get('database', 'password'));
-               $this->assertEquals('testdb', $configCache->get('database', 'database'));
+               self::assertEquals('testhost', $configCache->get('database', 'hostname'));
+               self::assertEquals('testuser', $configCache->get('database', 'username'));
+               self::assertEquals('testpw', $configCache->get('database', 'password'));
+               self::assertEquals('testdb', $configCache->get('database', 'database'));
 
-               $this->assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
+               self::assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
        }
 
        /**
@@ -158,25 +158,25 @@ class ConfigFileLoaderTest extends MockedTest
 
                $configFileLoader->setupCache($configCache);
 
-               $this->assertEquals('testhost', $configCache->get('database', 'hostname'));
-               $this->assertEquals('testuser', $configCache->get('database', 'username'));
-               $this->assertEquals('testpw', $configCache->get('database', 'password'));
-               $this->assertEquals('testdb', $configCache->get('database', 'database'));
-               $this->assertEquals('anotherCharset', $configCache->get('database', 'charset'));
+               self::assertEquals('testhost', $configCache->get('database', 'hostname'));
+               self::assertEquals('testuser', $configCache->get('database', 'username'));
+               self::assertEquals('testpw', $configCache->get('database', 'password'));
+               self::assertEquals('testdb', $configCache->get('database', 'database'));
+               self::assertEquals('anotherCharset', $configCache->get('database', 'charset'));
 
-               $this->assertEquals('/var/run/friendica.pid', $configCache->get('system', 'pidfile'));
-               $this->assertEquals('Europe/Berlin', $configCache->get('system', 'default_timezone'));
-               $this->assertEquals('fr', $configCache->get('system', 'language'));
+               self::assertEquals('/var/run/friendica.pid', $configCache->get('system', 'pidfile'));
+               self::assertEquals('Europe/Berlin', $configCache->get('system', 'default_timezone'));
+               self::assertEquals('fr', $configCache->get('system', 'language'));
 
-               $this->assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
-               $this->assertEquals('Friendly admin', $configCache->get('config', 'admin_nickname'));
+               self::assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
+               self::assertEquals('Friendly admin', $configCache->get('config', 'admin_nickname'));
 
-               $this->assertEquals('/another/php', $configCache->get('config', 'php_path'));
-               $this->assertEquals('999', $configCache->get('config', 'max_import_size'));
-               $this->assertEquals('666', $configCache->get('system', 'maximagesize'));
+               self::assertEquals('/another/php', $configCache->get('config', 'php_path'));
+               self::assertEquals('999', $configCache->get('config', 'max_import_size'));
+               self::assertEquals('666', $configCache->get('system', 'maximagesize'));
 
-               $this->assertEquals('quattro,vier,duepuntozero', $configCache->get('system', 'allowed_themes'));
-               $this->assertEquals('1', $configCache->get('system', 'no_regfullname'));
+               self::assertEquals('quattro,vier,duepuntozero', $configCache->get('system', 'allowed_themes'));
+               self::assertEquals('1', $configCache->get('system', 'no_regfullname'));
        }
 
        public function testLoadAddonConfig()
@@ -206,12 +206,12 @@ class ConfigFileLoaderTest extends MockedTest
 
                $conf = $configFileLoader->loadAddonConfig('test');
 
-               $this->assertEquals('testhost', $conf['database']['hostname']);
-               $this->assertEquals('testuser', $conf['database']['username']);
-               $this->assertEquals('testpw', $conf['database']['password']);
-               $this->assertEquals('testdb', $conf['database']['database']);
+               self::assertEquals('testhost', $conf['database']['hostname']);
+               self::assertEquals('testuser', $conf['database']['username']);
+               self::assertEquals('testpw', $conf['database']['password']);
+               self::assertEquals('testdb', $conf['database']['database']);
 
-               $this->assertEquals('admin@test.it', $conf['config']['admin_email']);
+               self::assertEquals('admin@test.it', $conf['config']['admin_email']);
        }
 
        /**
@@ -239,8 +239,8 @@ class ConfigFileLoaderTest extends MockedTest
 
                $configFileLoader->setupCache($configCache);
 
-               $this->assertEquals('admin@overwritten.local', $configCache->get('config', 'admin_email'));
-               $this->assertEquals('newValue', $configCache->get('system', 'newKey'));
+               self::assertEquals('admin@overwritten.local', $configCache->get('config', 'admin_email'));
+               self::assertEquals('newValue', $configCache->get('system', 'newKey'));
        }
 
        /**
@@ -268,8 +268,8 @@ class ConfigFileLoaderTest extends MockedTest
 
                $configFileLoader->setupCache($configCache);
 
-               $this->assertEquals('admin@overwritten.local', $configCache->get('config', 'admin_email'));
-               $this->assertEquals('newValue', $configCache->get('system', 'newKey'));
+               self::assertEquals('admin@overwritten.local', $configCache->get('config', 'admin_email'));
+               self::assertEquals('newValue', $configCache->get('system', 'newKey'));
        }
 
        /**
@@ -297,7 +297,7 @@ class ConfigFileLoaderTest extends MockedTest
 
                $configFileLoader->setupCache($configCache);
 
-               $this->assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
-               $this->assertEmpty($configCache->get('system', 'NewKey'));
+               self::assertEquals('admin@test.it', $configCache->get('config', 'admin_email'));
+               self::assertEmpty($configCache->get('system', 'NewKey'));
        }
 }
index 6478c690acbf1aa60bb04475f22c9603a69c0419..1a25e171953a052362e19c0f93ab3ca3ab7e7916 100644 (file)
@@ -35,23 +35,23 @@ class CryptoTest extends TestCase
        {
                global $phpMock;
                $phpMock['random_int'] = function ($mMin, $mMax) use ($min, $max) {
-                       $this->assertEquals($min, $mMin);
-                       $this->assertEquals($max, $mMax);
+                       self::assertEquals($min, $mMin);
+                       self::assertEquals($max, $mMax);
                        return 1;
                };
        }
 
        public function testRandomDigitsRandomInt()
        {
-               $this->assertRandomInt(0, 9);
+               self::assertRandomInt(0, 9);
 
                $test = Crypto::randomDigits(1);
-               $this->assertEquals(1, strlen($test));
-               $this->assertEquals(1, $test);
+               self::assertEquals(1, strlen($test));
+               self::assertEquals(1, $test);
 
                $test = Crypto::randomDigits(8);
-               $this->assertEquals(8, strlen($test));
-               $this->assertEquals(11111111, $test);
+               self::assertEquals(8, strlen($test));
+               self::assertEquals(11111111, $test);
        }
 
        public function dataRsa()
@@ -69,7 +69,7 @@ class CryptoTest extends TestCase
         */
        public function testPubRsaToMe(string $key, string $expected)
        {
-               $this->assertEquals($expected, Crypto::rsaToPem(base64_decode($key)));
+               self::assertEquals($expected, Crypto::rsaToPem(base64_decode($key)));
        }
 
 
@@ -95,7 +95,7 @@ class CryptoTest extends TestCase
                        'n' => new BigInteger($m, 256)
                ]);
 
-               $this->assertEquals($expectedRSA->getPublicKey(), $key);
+               self::assertEquals($expectedRSA->getPublicKey(), $key);
        }
 
        /**
@@ -107,7 +107,7 @@ class CryptoTest extends TestCase
 
                $checkKey = Crypto::meToPem($m, $e);
 
-               $this->assertEquals($key, $checkKey);
+               self::assertEquals($key, $checkKey);
        }
 }
 
index 4e1a02a29bfad7d794f9ac93fe8ea360a5a8b36d..333aa1cb1f0835901a77387cf721f1664aae4416 100644 (file)
@@ -75,6 +75,6 @@ class DateTimeFormatTest extends MockedTest
        {
                $dtFormat = new DateTimeFormat();
 
-               $this->assertEquals($assert, $dtFormat->isYearMonth($input));
+               self::assertEquals($assert, $dtFormat->isYearMonth($input));
        }
 }
index 5c4cc87273fc3e03763e6c1ed5fc1dbda36832c2..7c3b4b026b1429cad40ce2c2131a7be7250b2e8d 100644 (file)
@@ -81,21 +81,21 @@ class EMailerTest extends MockedTest
 
                $emailer = new EmailerSpy($this->config, $this->pConfig, $this->baseUrl, new NullLogger(), $this->l10n);
 
-               $this->assertTrue($emailer->send($testEmail));
-
-               $this->assertContains("X-Friendica-Host: friendica.local", EmailerSpy::$MAIL_DATA['headers']);
-               $this->assertContains("X-Friendica-Platform: Friendica", EmailerSpy::$MAIL_DATA['headers']);
-               $this->assertContains("List-ID: <notification.friendica.local>", EmailerSpy::$MAIL_DATA['headers']);
-               $this->assertContains("List-Archive: <http://friendica.local/notifications/system>", EmailerSpy::$MAIL_DATA['headers']);
-               $this->assertContains("Reply-To: Sender <sender@friendica.local>", EmailerSpy::$MAIL_DATA['headers']);
-               $this->assertContains("MIME-Version: 1.0", EmailerSpy::$MAIL_DATA['headers']);
+               self::assertTrue($emailer->send($testEmail));
+
+               self::assertContains("X-Friendica-Host: friendica.local", EmailerSpy::$MAIL_DATA['headers']);
+               self::assertContains("X-Friendica-Platform: Friendica", EmailerSpy::$MAIL_DATA['headers']);
+               self::assertContains("List-ID: <notification.friendica.local>", EmailerSpy::$MAIL_DATA['headers']);
+               self::assertContains("List-Archive: <http://friendica.local/notifications/system>", EmailerSpy::$MAIL_DATA['headers']);
+               self::assertContains("Reply-To: Sender <sender@friendica.local>", EmailerSpy::$MAIL_DATA['headers']);
+               self::assertContains("MIME-Version: 1.0", EmailerSpy::$MAIL_DATA['headers']);
                // Base64 "Test Text"
-               $this->assertContains(chunk_split(base64_encode('Test Text')), EmailerSpy::$MAIL_DATA['body']);
+               self::assertContains(chunk_split(base64_encode('Test Text')), EmailerSpy::$MAIL_DATA['body']);
                // Base64 "Test Message<b>Bold</b>"
-               $this->assertContains(chunk_split(base64_encode("Test Message<b>Bold</b>")), EmailerSpy::$MAIL_DATA['body']);
-               $this->assertEquals("Test Subject", EmailerSpy::$MAIL_DATA['subject']);
-               $this->assertEquals("recipient@friendica.local", EmailerSpy::$MAIL_DATA['to']);
-               $this->assertEquals("-f sender@friendica.local", EmailerSpy::$MAIL_DATA['parameters']);
+               self::assertContains(chunk_split(base64_encode("Test Message<b>Bold</b>")), EmailerSpy::$MAIL_DATA['body']);
+               self::assertEquals("Test Subject", EmailerSpy::$MAIL_DATA['subject']);
+               self::assertEquals("recipient@friendica.local", EmailerSpy::$MAIL_DATA['to']);
+               self::assertEquals("-f sender@friendica.local", EmailerSpy::$MAIL_DATA['parameters']);
        }
 
        public function testTwoMessageIds()
@@ -124,10 +124,10 @@ class EMailerTest extends MockedTest
                $emailer = new EmailerSpy($this->config, $this->pConfig, $this->baseUrl, new NullLogger(), $this->l10n);
 
                // even in case there are two message ids, send the mail anyway
-               $this->assertTrue($emailer->send($testEmail));
+               self::assertTrue($emailer->send($testEmail));
 
                // check case sensitive key problem
-               $this->assertArrayHasKey('Message-ID', $testEmail->getAdditionalMailHeader());
-               $this->assertArrayHasKey('Message-Id', $testEmail->getAdditionalMailHeader());
+               self::assertArrayHasKey('Message-ID', $testEmail->getAdditionalMailHeader());
+               self::assertArrayHasKey('Message-Id', $testEmail->getAdditionalMailHeader());
        }
 }
index b8902242103507e0b405db0ab52665fb1e9f84a4..8287e7609001d29b9aa354759756b13c2f6b0f81 100644 (file)
@@ -67,15 +67,15 @@ class MailBuilderTest extends MockedTest
 
        public function assertEmail(IEmail $email, array $asserts)
        {
-               $this->assertEquals($asserts['subject'] ?? $email->getSubject(), $email->getSubject());
-               $this->assertEquals($asserts['html'] ?? $email->getMessage(), $email->getMessage());
-               $this->assertEquals($asserts['text'] ?? $email->getMessage(true), $email->getMessage(true));
-               $this->assertEquals($asserts['toAddress'] ?? $email->getToAddress(), $email->getToAddress());
-               $this->assertEquals($asserts['fromAddress'] ?? $email->getFromAddress(), $email->getFromAddress());
-               $this->assertEquals($asserts['fromName'] ?? $email->getFromName(), $email->getFromName());
-               $this->assertEquals($asserts['replyTo'] ?? $email->getReplyTo(), $email->getReplyTo());
-               $this->assertEquals($asserts['uid'] ?? $email->getRecipientUid(), $email->getRecipientUid());
-               $this->assertEquals($asserts['header'] ?? $email->getAdditionalMailHeader(), $email->getAdditionalMailHeader());
+               self::assertEquals($asserts['subject'] ?? $email->getSubject(), $email->getSubject());
+               self::assertEquals($asserts['html'] ?? $email->getMessage(), $email->getMessage());
+               self::assertEquals($asserts['text'] ?? $email->getMessage(true), $email->getMessage(true));
+               self::assertEquals($asserts['toAddress'] ?? $email->getToAddress(), $email->getToAddress());
+               self::assertEquals($asserts['fromAddress'] ?? $email->getFromAddress(), $email->getFromAddress());
+               self::assertEquals($asserts['fromName'] ?? $email->getFromName(), $email->getFromName());
+               self::assertEquals($asserts['replyTo'] ?? $email->getReplyTo(), $email->getReplyTo());
+               self::assertEquals($asserts['uid'] ?? $email->getRecipientUid(), $email->getRecipientUid());
+               self::assertEquals($asserts['header'] ?? $email->getAdditionalMailHeader(), $email->getAdditionalMailHeader());
        }
 
        /**
@@ -85,7 +85,7 @@ class MailBuilderTest extends MockedTest
        {
                $builder = new SampleMailBuilder($this->l10n, $this->baseUrl, $this->config, new NullLogger());
 
-               $this->assertInstanceOf(MailBuilder::class, $builder);
+               self::assertInstanceOf(MailBuilder::class, $builder);
        }
 
        /**
@@ -112,7 +112,7 @@ class MailBuilderTest extends MockedTest
                        ->forUser(['uid' => 100])
                        ->build(true);
 
-               $this->assertEmail($testEmail, [
+               self::assertEmail($testEmail, [
                        'subject' => 'Subject',
                        'html' => 'Html',
                        'text' => 'text',
@@ -165,7 +165,7 @@ class MailBuilderTest extends MockedTest
                        ->withSender('Sender', 'sender@friendica.local')
                        ->build(true);
 
-               $this->assertEmail($testEmail, [
+               self::assertEmail($testEmail, [
                        'toAddress' => 'recipient@friendica.local',
                        'fromName' => 'Sender',
                        'fromAddress' => 'sender@friendica.local',
@@ -186,7 +186,7 @@ class MailBuilderTest extends MockedTest
                        ->withSender('Sender', 'sender@friendica.local')
                        ->build(true);
 
-               $this->assertEmail($testEmail, [
+               self::assertEmail($testEmail, [
                        'toAddress' => 'recipient@friendica.local',
                        'fromName' => 'Sender',
                        'fromAddress' => 'sender@friendica.local',
index 6991ce8d4465a1e728ee8b2f14094ced27d529c7..857369bdff45960d13cf552e955effac088e7423 100644 (file)
@@ -70,7 +70,7 @@ class SystemMailBuilderTest extends MockedTest
        {
                $builder = new SystemMailBuilder($this->l10n, $this->baseUrl, $this->config, new NullLogger(), 'moreply@friendica.local', 'FriendicaSite');
 
-               $this->assertInstanceOf(MailBuilder::class, $builder);
-               $this->assertInstanceOf(SystemMailBuilder::class, $builder);
+               self::assertInstanceOf(MailBuilder::class, $builder);
+               self::assertInstanceOf(SystemMailBuilder::class, $builder);
        }
 }
index ba2f6ebbf221f6799fc391f2a0e3c8d67080819e..0458b7871ca3e534712ef8fba8d275414d062250 100644 (file)
@@ -43,7 +43,7 @@ class HTTPSignatureTest extends TestCase
            YWuxyvBa0Z6NdOb0di70cdrSDEsL5Gz7LBY5J2N9KdGg=="';
 
                $headers = HTTPSignature::parseSigheader($header);
-               $this->assertSame([
+               self::assertSame([
                        'keyId'     => 'test-key-a',
                        'algorithm' => 'hs2019',
                        'created'   => '1402170695',
index 94c7952b5caa28d8e055b0d5e9aa114f42b27336..2c922d38446398b89e47f3b1fef9656a9291d5fb 100644 (file)
@@ -34,7 +34,7 @@ class JsonLDTest extends TestCase
                $object = [];
 
                $data = JsonLD::fetchElementArray($object, 'field');
-               $this->assertNull($data);
+               self::assertNull($data);
        }
 
        public function testFetchElementArrayFoundEmptyArray()
@@ -42,7 +42,7 @@ class JsonLDTest extends TestCase
                $object = ['field' => []];
 
                $data = JsonLD::fetchElementArray($object, 'field');
-               $this->assertSame([[]], $data);
+               self::assertSame([[]], $data);
        }
 
        public function testFetchElementArrayFoundID()
@@ -50,7 +50,7 @@ class JsonLDTest extends TestCase
                $object = ['field' => ['value1', ['@id' => 'value2'], ['@id' => 'value3']]];
 
                $data = JsonLD::fetchElementArray($object, 'field', '@id');
-               $this->assertSame(['value1', 'value2', 'value3'], $data);
+               self::assertSame(['value1', 'value2', 'value3'], $data);
        }
 
        public function testFetchElementArrayFoundID2()
@@ -60,7 +60,7 @@ class JsonLDTest extends TestCase
                        'value3', ['@id' => 'value4', 'subfield42' => 'value42']]];
 
                $data = JsonLD::fetchElementArray($object, 'field', '@id');
-               $this->assertSame(['value3', 'value4'], $data);
+               self::assertSame(['value3', 'value4'], $data);
        }
        public function testFetchElementArrayFoundArrays()
        {
@@ -71,7 +71,7 @@ class JsonLDTest extends TestCase
                        ['subfield21' => 'value21', 'subfield22' => 'value22']];
 
                $data = JsonLD::fetchElementArray($object, 'field');
-               $this->assertSame($expect, $data);
+               self::assertSame($expect, $data);
        }
 
        public function testFetchElementNotFound()
@@ -79,7 +79,7 @@ class JsonLDTest extends TestCase
                $object = [];
 
                $data = JsonLD::fetchElement($object, 'field');
-               $this->assertNull($data);
+               self::assertNull($data);
        }
 
        public function testFetchElementFound()
@@ -87,7 +87,7 @@ class JsonLDTest extends TestCase
                $object = ['field' => 'value'];
 
                $data = JsonLD::fetchElement($object, 'field');
-               $this->assertSame('value', $data);
+               self::assertSame('value', $data);
        }
 
        public function testFetchElementFoundEmptyString()
@@ -95,7 +95,7 @@ class JsonLDTest extends TestCase
                $object = ['field' => ''];
 
                $data = JsonLD::fetchElement($object, 'field');
-               $this->assertSame('', $data);
+               self::assertSame('', $data);
        }
 
        public function testFetchElementKeyFoundEmptyArray()
@@ -103,7 +103,7 @@ class JsonLDTest extends TestCase
                $object = ['field' => ['content' => []]];
 
                $data = JsonLD::fetchElement($object, 'field', 'content');
-               $this->assertSame([], $data);
+               self::assertSame([], $data);
        }
 
        public function testFetchElementFoundID()
@@ -111,7 +111,7 @@ class JsonLDTest extends TestCase
                $object = ['field' => ['field2' => 'value2', '@id' => 'value', 'field3' => 'value3']];
 
                $data = JsonLD::fetchElement($object, 'field');
-               $this->assertSame('value', $data);
+               self::assertSame('value', $data);
        }
 
        public function testFetchElementType()
@@ -119,7 +119,7 @@ class JsonLDTest extends TestCase
                $object = ['source' => ['content' => 'body', 'mediaType' => 'text/bbcode']];
 
                $data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType', 'text/bbcode');
-               $this->assertSame('body', $data);
+               self::assertSame('body', $data);
        }
 
        public function testFetchElementTypeValueNotFound()
@@ -127,7 +127,7 @@ class JsonLDTest extends TestCase
                $object = ['source' => ['content' => 'body', 'mediaType' => 'text/html']];
 
                $data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType', 'text/bbcode');
-               $this->assertNull($data);
+               self::assertNull($data);
        }
 
        public function testFetchElementTypeNotFound()
@@ -135,7 +135,7 @@ class JsonLDTest extends TestCase
                $object = ['source' => ['content' => 'body', 'mediaType' => 'text/html']];
 
                $data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType2', 'text/html');
-               $this->assertNull($data);
+               self::assertNull($data);
        }
 
        public function testFetchElementKeyWithoutType()
@@ -143,7 +143,7 @@ class JsonLDTest extends TestCase
                $object = ['source' => ['content' => 'body', 'mediaType' => 'text/bbcode']];
 
                $data = JsonLD::fetchElement($object, 'source', 'content');
-               $this->assertSame('body', $data);
+               self::assertSame('body', $data);
        }
 
        public function testFetchElementTypeArray()
@@ -152,7 +152,7 @@ class JsonLDTest extends TestCase
                        ['content' => 'body', 'mediaType' => 'text/bbcode']]];
 
                $data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType', 'text/bbcode');
-               $this->assertSame('body', $data);
+               self::assertSame('body', $data);
        }
 
        public function testFetchElementTypeValueArrayNotFound()
@@ -161,7 +161,7 @@ class JsonLDTest extends TestCase
                        ['content' => 'body', 'mediaType' => 'text/bbcode']]];
 
                $data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType', 'text/markdown');
-               $this->assertNull($data);
+               self::assertNull($data);
        }
 
        public function testFetchElementTypeArrayNotFound()
@@ -170,6 +170,6 @@ class JsonLDTest extends TestCase
                        ['content' => 'body', 'mediaType' => 'text/bbcode']]];
 
                $data = JsonLD::fetchElement($object, 'source', 'content', 'mediaType2', 'text/bbcode');
-               $this->assertNull($data);
+               self::assertNull($data);
        }
 }
index 2cac6ce717ed3e98d5e13c1492f23c17843b9afd..33bf2356161b40fce2cffc18bb7fa4d2dbd7b1a2 100644 (file)
@@ -72,12 +72,12 @@ abstract class AbstractLoggerTest extends MockedTest
 
        public function assertLogline($string)
        {
-               $this->assertRegExp(self::LOGLINE, $string);
+               self::assertRegExp(self::LOGLINE, $string);
        }
 
        public function assertLoglineNums($assertNum, $string)
        {
-               $this->assertEquals($assertNum, preg_match_all(self::LOGLINE, $string));
+               self::assertEquals($assertNum, preg_match_all(self::LOGLINE, $string));
        }
 
        /**
@@ -92,8 +92,8 @@ abstract class AbstractLoggerTest extends MockedTest
                $logger->notice('message', ['an' => 'context']);
 
                $text = $this->getContent();
-               $this->assertLogline($text);
-               $this->assertLoglineNums(4, $text);
+               self::assertLogline($text);
+               self::assertLoglineNums(4, $text);
        }
 
        /**
@@ -106,8 +106,8 @@ abstract class AbstractLoggerTest extends MockedTest
                $logger->emergency('A {psr} test', ['psr' => 'working']);
                $logger->alert('An {array} test', ['array' => ['it', 'is', 'working']]);
                $text = $this->getContent();
-               $this->assertContains('A working test', $text);
-               $this->assertContains('An ["it","is","working"] test', $text);
+               self::assertContains('A working test', $text);
+               self::assertContains('An ["it","is","working"] test', $text);
        }
 
        /**
@@ -119,9 +119,9 @@ abstract class AbstractLoggerTest extends MockedTest
                $logger->emergency('A test');
 
                $text = $this->getContent();
-               $this->assertContains('"file":"' . self::FILE . '"', $text);
-               $this->assertContains('"line":' . self::LINE, $text);
-               $this->assertContains('"function":"' . self::FUNC . '"', $text);
+               self::assertContains('"file":"' . self::FILE . '"', $text);
+               self::assertContains('"line":' . self::LINE, $text);
+               self::assertContains('"function":"' . self::FUNC . '"', $text);
        }
 
        /**
@@ -141,7 +141,7 @@ abstract class AbstractLoggerTest extends MockedTest
 
                $text = $this->getContent();
 
-               $this->assertLoglineNums(5, $text);
+               self::assertLoglineNums(5, $text);
        }
 
        /**
@@ -155,8 +155,8 @@ abstract class AbstractLoggerTest extends MockedTest
 
                $text = $this->getContent();
 
-               $this->assertLogline($text);
+               self::assertLogline($text);
 
-               $this->assertContains(@json_encode($context), $text);
+               self::assertContains(@json_encode($context), $text);
        }
 }
index f507634f0eb1e8ea31c5d8e038cc50e4b2fe3c55..2e2aac2f1b2a076329b2de25c1e32bb9e0536e88 100644 (file)
@@ -92,7 +92,7 @@ class StreamLoggerTest extends AbstractLoggerTest
 
                $text = $logfile->getContent();
 
-               $this->assertLogline($text);
+               self::assertLogline($text);
        }
 
        /**
@@ -111,7 +111,7 @@ class StreamLoggerTest extends AbstractLoggerTest
 
                $text = $logfile->getContent();
 
-               $this->assertLoglineNums(2, $text);
+               self::assertLoglineNums(2, $text);
        }
 
        /**
index d63e5eda5cf4a704303f75b986749ec7e7491ab0..b110677de1cc0ea53a7a077ef5bc51181730b62c 100644 (file)
@@ -29,7 +29,7 @@ class WorkerLoggerTest extends MockedTest
 {
        private function assertUid($uid, $length = 7)
        {
-               $this->assertRegExp('/^[a-zA-Z0-9]{' . $length . '}+$/', $uid);
+               self::assertRegExp('/^[a-zA-Z0-9]{' . $length . '}+$/', $uid);
        }
 
        /**
@@ -51,7 +51,7 @@ class WorkerLoggerTest extends MockedTest
                for ($i = 1; $i < 14; $i++) {
                        $workLogger = new WorkerLogger($logger, 'test', $i);
                        $uid = $workLogger->getWorkerId();
-                       $this->assertUid($uid, $i);
+                       self::assertUid($uid, $i);
                }
        }
 
@@ -107,7 +107,7 @@ class WorkerLoggerTest extends MockedTest
                $testContext = $context;
                $testContext['worker_id'] = $workLogger->getWorkerId();
                $testContext['worker_cmd'] = 'test';
-               $this->assertUid($testContext['worker_id']);
+               self::assertUid($testContext['worker_id']);
                $logger
                        ->shouldReceive($func)
                        ->with($msg, $testContext)
@@ -125,7 +125,7 @@ class WorkerLoggerTest extends MockedTest
                $context = $testContext = ['test' => 'it'];
                $testContext['worker_id'] = $workLogger->getWorkerId();
                $testContext['worker_cmd'] = 'test';
-               $this->assertUid($testContext['worker_id']);
+               self::assertUid($testContext['worker_id']);
                $logger
                        ->shouldReceive('log')
                        ->with('debug', 'a test', $testContext)
index 30e60b209b1707a5579be95e166a3589b580970b..45b29943f507a893be49cf8513f03810dcb7a6ce 100644 (file)
@@ -134,7 +134,7 @@ class ProfilerTest extends MockedTest
                        $profiler->saveTimestamp($timestamp, $name, $function);
                }
 
-               $this->assertGreaterThanOrEqual(0, $profiler->get($name));
+               self::assertGreaterThanOrEqual(0, $profiler->get($name));
        }
 
        /**
@@ -154,7 +154,7 @@ class ProfilerTest extends MockedTest
                $profiler->saveTimestamp($timestamp, $name);
                $profiler->reset();
 
-               $this->assertEquals(0, $profiler->get($name));
+               self::assertEquals(0, $profiler->get($name));
        }
 
        public function dataBig()
@@ -227,7 +227,7 @@ class ProfilerTest extends MockedTest
                foreach ($data as $perf => $items) {
                        foreach ($items['functions'] as $function) {
                                // assert that the output contains the functions
-                               $this->assertRegExp('/' . $function . ': \d+/', $output);
+                               self::assertRegExp('/' . $function . ': \d+/', $output);
                        }
                }
        }
@@ -249,8 +249,8 @@ class ProfilerTest extends MockedTest
 
                $profiler = new Profiler($configCache);
 
-               $this->assertFalse($profiler->isRendertime());
-               $this->assertEmpty($profiler->getRendertimeString());
+               self::assertFalse($profiler->isRendertime());
+               self::assertEmpty($profiler->getRendertimeString());
 
                $profiler->saveTimestamp(time(), 'network', 'test1');
 
@@ -266,8 +266,8 @@ class ProfilerTest extends MockedTest
 
                $profiler->update($config);
 
-               $this->assertFalse($profiler->isRendertime());
-               $this->assertEmpty($profiler->getRendertimeString());
+               self::assertFalse($profiler->isRendertime());
+               self::assertEmpty($profiler->getRendertimeString());
 
                $config->shouldReceive('get')
                       ->with('system', 'profiler')
@@ -282,9 +282,9 @@ class ProfilerTest extends MockedTest
 
                $profiler->saveTimestamp(time(), 'database', 'test2');
 
-               $this->assertTrue($profiler->isRendertime());
+               self::assertTrue($profiler->isRendertime());
                $output = $profiler->getRendertimeString();
-               $this->assertRegExp('/test1: \d+/', $output);
-               $this->assertRegExp('/test2: \d+/', $output);
+               self::assertRegExp('/test1: \d+/', $output);
+               self::assertRegExp('/test2: \d+/', $output);
        }
 }
index 611d72fe7cd8b10d864f78142688f97f47a19775..86b55a2fe3328100358485683258fde7c22b8a2c 100644 (file)
@@ -37,7 +37,7 @@ class StringsTest extends TestCase
                $randomname1 = Strings::getRandomName(10);
                $randomname2 = Strings::getRandomName(10);
 
-               $this->assertNotEquals($randomname1, $randomname2);
+               self::assertNotEquals($randomname1, $randomname2);
        }
 
        /**
@@ -48,7 +48,7 @@ class StringsTest extends TestCase
                $randomname1 = Strings::getRandomName(9);
                $randomname2 = Strings::getRandomName(9);
 
-               $this->assertNotEquals($randomname1, $randomname2);
+               self::assertNotEquals($randomname1, $randomname2);
        }
 
        /**
@@ -57,7 +57,7 @@ class StringsTest extends TestCase
        public function testRandomNameNoLength()
        {
                $randomname1 = Strings::getRandomName(0);
-               $this->assertEquals(0, strlen($randomname1));
+               self::assertEquals(0, strlen($randomname1));
        }
 
        /**
@@ -68,7 +68,7 @@ class StringsTest extends TestCase
        public function testRandomNameNegativeLength()
        {
                $randomname1 = Strings::getRandomName(-23);
-               $this->assertEquals(0, strlen($randomname1));
+               self::assertEquals(0, strlen($randomname1));
        }
 
        /**
@@ -77,10 +77,10 @@ class StringsTest extends TestCase
        public function testRandomNameLength1()
        {
                $randomname1 = Strings::getRandomName(1);
-               $this->assertEquals(1, strlen($randomname1));
+               self::assertEquals(1, strlen($randomname1));
 
                $randomname2 = Strings::getRandomName(1);
-               $this->assertEquals(1, strlen($randomname2));
+               self::assertEquals(1, strlen($randomname2));
        }
 
        /**
@@ -93,8 +93,8 @@ class StringsTest extends TestCase
                $validstring = Strings::escapeTags($invalidstring);
                $escapedString = Strings::escapeHtml($invalidstring);
 
-               $this->assertEquals('[submit type="button" onclick="alert(\'failed!\');" /]', $validstring);
-               $this->assertEquals(
+               self::assertEquals('[submit type="button" onclick="alert(\'failed!\');" /]', $validstring);
+               self::assertEquals(
                        "&lt;submit type=&quot;button&quot; onclick=&quot;alert('failed!');&quot; /&gt;",
                        $escapedString
                );
@@ -132,7 +132,7 @@ class StringsTest extends TestCase
         */
        public function testIsHex($input, $valid)
        {
-               $this->assertEquals($valid, Strings::isHex($input));
+               self::assertEquals($valid, Strings::isHex($input));
        }
 
        /**
@@ -142,13 +142,13 @@ class StringsTest extends TestCase
        public function testSubstringReplaceASCII()
        {
                for ($start = -10; $start <= 10; $start += 5) {
-                       $this->assertEquals(
+                       self::assertEquals(
                                substr_replace('string', 'replacement', $start),
                                Strings::substringReplace('string', 'replacement', $start)
                        );
 
                        for ($length = -10; $length <= 10; $length += 5) {
-                               $this->assertEquals(
+                               self::assertEquals(
                                        substr_replace('string', 'replacement', $start, $length),
                                        Strings::substringReplace('string', 'replacement', $start, $length)
                                );
@@ -184,7 +184,7 @@ class StringsTest extends TestCase
         */
        public function testSubstringReplaceMultiByte(string $expected, string $string, string $replacement, int $start, int $length = null)
        {
-               $this->assertEquals(
+               self::assertEquals(
                        $expected,
                        Strings::substringReplace(
                                $string,
@@ -203,7 +203,7 @@ class StringsTest extends TestCase
                        return $text;
                });
 
-               $this->assertEquals($originalText, $text);
+               self::assertEquals($originalText, $text);
        }
 
        public function testPerformWithEscapedBlocksNested()
@@ -218,6 +218,6 @@ class StringsTest extends TestCase
                        return $text;
                });
 
-               $this->assertEquals($originalText, $text);
+               self::assertEquals($originalText, $text);
        }
 }
index 16c27836d4714b4acbfe9e17e996806cf3394f66..99b58a0b8795e6bea313a0e463aeefc15cd87a07 100644 (file)
@@ -37,7 +37,7 @@ class XmlTest extends TestCase
                $text="<tag>I want to break\n this!11!<?hard?></tag>";
                $xml=XML::escape($text);
                $retext=XML::unescape($text);
-               $this->assertEquals($text, $retext);
+               self::assertEquals($text, $retext);
     }
     
        /**
@@ -52,12 +52,12 @@ class XmlTest extends TestCase
                //should be possible to parse it
                $values=array();
                $index=array();
-               $this->assertEquals(1, xml_parse_into_struct($xml_parser, $text, $values, $index));
-               $this->assertEquals(
+               self::assertEquals(1, xml_parse_into_struct($xml_parser, $text, $values, $index));
+               self::assertEquals(
                        array('TEXT'=>array(0)),
                        $index
                );
-               $this->assertEquals(
+               self::assertEquals(
                        array(array('tag'=>'TEXT', 'type'=>'complete', 'level'=>1, 'value'=>$tag)),
                        $values
                );