]> git.mxchange.org Git - friendica.git/blobdiff - tests/legacy/ApiTest.php
Merge branch 'stable' into develop
[friendica.git] / tests / legacy / ApiTest.php
index 101356e52effaa6fb35d44d1428c02d565df6ff5..c94571d85771ea60ed49d654bcf546c7a3b8ed1e 100644 (file)
@@ -22,6 +22,8 @@ require_once __DIR__ . '/../../include/api.php';
  *
  * Functions that use header() need to be tested in a separate process.
  * @see https://phpunit.de/manual/5.7/en/appendixes.annotations.html#appendixes.annotations.runTestsInSeparateProcesses
+ *
+ * @backupGlobals enabled
  */
 class ApiTest extends FixtureTest
 {
@@ -48,8 +50,12 @@ class ApiTest extends FixtureTest
        /**
         * Create variables used by tests.
         */
-       protected function setUp()
+       protected function setUp() : void
        {
+               global $API, $called_api;
+               $API = [];
+               $called_api = [];
+
                parent::setUp();
 
                /** @var IConfig $config */
@@ -71,7 +77,7 @@ class ApiTest extends FixtureTest
                $this->app = DI::app();
 
                $this->app->argc = 1;
-               $this->app->argv = ['home'];
+               $this->app->argv = [''];
 
                // User data that the test database is populated with
                $this->selfUser   = [
@@ -104,10 +110,6 @@ class ApiTest extends FixtureTest
                        'authenticated' => true,
                        'uid'           => $this->selfUser['id']
                ];
-
-               $_POST   = [];
-               $_GET    = [];
-               $_SERVER = [];
        }
 
        /**
@@ -119,14 +121,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']);
        }
 
        /**
@@ -136,14 +138,14 @@ class ApiTest extends FixtureTest
         *
         * @return void
         */
-       private function assertOtherUser(array $user)
+       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']);
        }
 
        /**
@@ -153,10 +155,10 @@ class ApiTest extends FixtureTest
         *
         * @return void
         */
-       private function assertStatus(array $status)
+       private function assertStatus(array $status = [])
        {
-               $this->assertInternalType('string', $status['text']);
-               $this->assertInternalType('int', $status['id']);
+               self::assertIsString($status['text'] ?? '');
+               self::assertIsInt($status['id'] ?? '');
                // We could probably do more checks here.
        }
 
@@ -167,12 +169,12 @@ class ApiTest extends FixtureTest
         *
         * @return void
         */
-       private function assertList(array $list)
+       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::assertIsString($list['name']);
+               self::assertIsInt($list['id']);
+               self::assertIsString('string', $list['id_str']);
+               self::assertContains($list['mode'], ['public', 'private']);
                // We could probably do more checks here.
        }
 
@@ -184,10 +186,10 @@ class ApiTest extends FixtureTest
         *
         * @return void
         */
-       private function assertXml($result, $root_element)
+       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::assertStringContainsString('<' . $root_element, $result);
                // We could probably do more checks here.
        }
 
@@ -217,7 +219,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiUser()
        {
-               $this->assertEquals($this->selfUser['id'], api_user());
+               self::assertEquals($this->selfUser['id'], api_user());
        }
 
        /**
@@ -228,7 +230,7 @@ class ApiTest extends FixtureTest
        public function testApiUserWithUnallowedUser()
        {
                $_SESSION = ['allow_api' => false];
-               $this->assertEquals(false, api_user());
+               self::assertEquals(false, api_user());
        }
 
        /**
@@ -238,7 +240,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiSource()
        {
-               $this->assertEquals('api', api_source());
+               self::assertEquals('api', api_source());
        }
 
        /**
@@ -249,7 +251,7 @@ class ApiTest extends FixtureTest
        public function testApiSourceWithTwidere()
        {
                $_SERVER['HTTP_USER_AGENT'] = 'Twidere';
-               $this->assertEquals('Twidere', api_source());
+               self::assertEquals('Twidere', api_source());
        }
 
        /**
@@ -260,7 +262,7 @@ class ApiTest extends FixtureTest
        public function testApiSourceWithGet()
        {
                $_GET['source'] = 'source_name';
-               $this->assertEquals('source_name', api_source());
+               self::assertEquals('source_name', api_source());
        }
 
        /**
@@ -270,7 +272,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'));
        }
 
        /**
@@ -281,7 +283,7 @@ class ApiTest extends FixtureTest
        public function testApiRegisterFunc()
        {
                global $API;
-               $this->assertNull(
+               self::assertNull(
                        api_register_func(
                                'api_path',
                                function () {
@@ -290,32 +292,34 @@ 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']));
        }
 
        /**
         * Test the api_login() function without any login.
         *
-        * @return void
         * @runInSeparateProcess
-        * @expectedException Friendica\Network\HTTPException\UnauthorizedException
+        * @preserveGlobalState disabled
+        * @preserveGlobalState disabled
         */
        public function testApiLoginWithoutLogin()
        {
+               $this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class);
                api_login($this->app);
        }
 
        /**
         * Test the api_login() function with a bad login.
         *
-        * @return void
         * @runInSeparateProcess
-        * @expectedException Friendica\Network\HTTPException\UnauthorizedException
+        * @preserveGlobalState disabled
+        * @preserveGlobalState disabled
         */
        public function testApiLoginWithBadLogin()
        {
+               $this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class);
                $_SERVER['PHP_AUTH_USER'] = 'user@server';
                api_login($this->app);
        }
@@ -343,8 +347,9 @@ class ApiTest extends FixtureTest
        /**
         * Test the api_login() function with a correct login.
         *
-        * @return void
         * @runInSeparateProcess
+        * @preserveGlobalState disabled
+        * @doesNotPerformAssertions
         */
        public function testApiLoginWithCorrectLogin()
        {
@@ -356,12 +361,12 @@ class ApiTest extends FixtureTest
        /**
         * Test the api_login() function with a remote user.
         *
-        * @return void
         * @runInSeparateProcess
-        * @expectedException Friendica\Network\HTTPException\UnauthorizedException
+        * @preserveGlobalState disabled
         */
        public function testApiLoginWithRemoteUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class);
                $_SERVER['REDIRECT_REMOTE_USER'] = '123456dXNlcjpwYXNzd29yZA==';
                api_login($this->app);
        }
@@ -373,7 +378,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiCheckMethod()
        {
-               $this->assertFalse(api_check_method('method'));
+               self::assertFalse(api_check_method('method'));
        }
 
        /**
@@ -384,7 +389,7 @@ class ApiTest extends FixtureTest
        public function testApiCheckMethodWithCorrectMethod()
        {
                $_SERVER['REQUEST_METHOD'] = 'method';
-               $this->assertTrue(api_check_method('method'));
+               self::assertTrue(api_check_method('method'));
        }
 
        /**
@@ -394,14 +399,14 @@ class ApiTest extends FixtureTest
         */
        public function testApiCheckMethodWithWildcard()
        {
-               $this->assertTrue(api_check_method('*'));
+               self::assertTrue(api_check_method('*'));
        }
 
        /**
         * Test the api_call() function.
         *
-        * @return void
         * @runInSeparateProcess
+        * @preserveGlobalState disabled
         */
        public function testApiCall()
        {
@@ -413,12 +418,12 @@ class ApiTest extends FixtureTest
                        }
                ];
                $_SERVER['REQUEST_METHOD'] = 'method';
-               $_SERVER['QUERY_STRING'] = 'q=api_path';
+               $_SERVER['QUERY_STRING'] = 'pagename=api_path';
                $_GET['callback']          = 'callback_name';
 
                $args = DI::args()->determine($_SERVER, $_GET);
 
-               $this->assertEquals(
+               self::assertEquals(
                        'callback_name(["some_data"])',
                        api_call($this->app, $args)
                );
@@ -427,8 +432,8 @@ class ApiTest extends FixtureTest
        /**
         * Test the api_call() function with the profiled enabled.
         *
-        * @return void
         * @runInSeparateProcess
+        * @preserveGlobalState disabled
         */
        public function testApiCallWithProfiler()
        {
@@ -441,7 +446,7 @@ class ApiTest extends FixtureTest
                ];
 
                $_SERVER['REQUEST_METHOD'] = 'method';
-               $_SERVER['QUERY_STRING'] = 'q=api_path';
+               $_SERVER['QUERY_STRING'] = 'pagename=api_path';
 
                $args = DI::args()->determine($_SERVER, $_GET);
 
@@ -455,7 +460,7 @@ class ApiTest extends FixtureTest
                        'network'        => ['some_function' => 200]
                ];
 
-               $this->assertEquals(
+               self::assertEquals(
                        '["some_data"]',
                        api_call($this->app, $args)
                );
@@ -464,8 +469,8 @@ class ApiTest extends FixtureTest
        /**
         * Test the api_call() function without any result.
         *
-        * @return void
         * @runInSeparateProcess
+        * @preserveGlobalState disabled
         */
        public function testApiCallWithNoResult()
        {
@@ -477,11 +482,11 @@ class ApiTest extends FixtureTest
                        }
                ];
                $_SERVER['REQUEST_METHOD'] = 'method';
-               $_SERVER['QUERY_STRING'] = 'q=api_path';
+               $_SERVER['QUERY_STRING'] = 'pagename=api_path';
 
                $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)
                );
@@ -490,13 +495,13 @@ class ApiTest extends FixtureTest
        /**
         * Test the api_call() function with an unimplemented API.
         *
-        * @return void
         * @runInSeparateProcess
+        * @preserveGlobalState disabled
         */
        public function testApiCallWithUninplementedApi()
        {
-               $this->assertEquals(
-                       '{"status":{"error":"Not Implemented","code":"501 Not Implemented","request":""}}',
+               self::assertEquals(
+                       '{"status":{"error":"Not Found","code":"404 Not Found","request":""}}',
                        api_call($this->app)
                );
        }
@@ -504,8 +509,8 @@ class ApiTest extends FixtureTest
        /**
         * Test the api_call() function with a JSON result.
         *
-        * @return void
         * @runInSeparateProcess
+        * @preserveGlobalState disabled
         */
        public function testApiCallWithJson()
        {
@@ -517,11 +522,11 @@ class ApiTest extends FixtureTest
                        }
                ];
                $_SERVER['REQUEST_METHOD'] = 'method';
-               $_SERVER['QUERY_STRING'] = 'q=api_path.json';
+               $_SERVER['QUERY_STRING'] = 'pagename=api_path.json';
 
                $args = DI::args()->determine($_SERVER, $_GET);
 
-               $this->assertEquals(
+               self::assertEquals(
                        '["some_data"]',
                        api_call($this->app, $args)
                );
@@ -530,8 +535,8 @@ class ApiTest extends FixtureTest
        /**
         * Test the api_call() function with an XML result.
         *
-        * @return void
         * @runInSeparateProcess
+        * @preserveGlobalState disabled
         */
        public function testApiCallWithXml()
        {
@@ -543,11 +548,11 @@ class ApiTest extends FixtureTest
                        }
                ];
                $_SERVER['REQUEST_METHOD'] = 'method';
-               $_SERVER['QUERY_STRING'] = 'q=api_path.xml';
+               $_SERVER['QUERY_STRING'] = 'pagename=api_path.xml';
 
                $args = DI::args()->determine($_SERVER, $_GET);
 
-               $this->assertEquals(
+               self::assertEquals(
                        'some_data',
                        api_call($this->app, $args)
                );
@@ -556,8 +561,8 @@ class ApiTest extends FixtureTest
        /**
         * Test the api_call() function with an RSS result.
         *
-        * @return void
         * @runInSeparateProcess
+        * @preserveGlobalState disabled
         */
        public function testApiCallWithRss()
        {
@@ -569,11 +574,11 @@ class ApiTest extends FixtureTest
                        }
                ];
                $_SERVER['REQUEST_METHOD'] = 'method';
-               $_SERVER['QUERY_STRING'] = 'q=api_path.rss';
+               $_SERVER['QUERY_STRING'] = 'pagename=api_path.rss';
 
                $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)
@@ -583,8 +588,8 @@ class ApiTest extends FixtureTest
        /**
         * Test the api_call() function with an Atom result.
         *
-        * @return void
         * @runInSeparateProcess
+        * @preserveGlobalState disabled
         */
        public function testApiCallWithAtom()
        {
@@ -596,11 +601,11 @@ class ApiTest extends FixtureTest
                        }
                ];
                $_SERVER['REQUEST_METHOD'] = 'method';
-               $_SERVER['QUERY_STRING'] = 'q=api_path.atom';
+               $_SERVER['QUERY_STRING'] = 'pagename=api_path.atom';
 
                $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)
@@ -610,19 +615,19 @@ class ApiTest extends FixtureTest
        /**
         * Test the api_call() function with an unallowed method.
         *
-        * @return void
         * @runInSeparateProcess
+        * @preserveGlobalState disabled
         */
        public function testApiCallWithWrongMethod()
        {
                global $API;
                $API['api_path'] = ['method' => 'method'];
 
-               $_SERVER['QUERY_STRING'] = 'q=api_path';
+               $_SERVER['QUERY_STRING'] = 'pagename=api_path';
 
                $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)
                );
@@ -631,8 +636,8 @@ class ApiTest extends FixtureTest
        /**
         * Test the api_call() function with an unauthorized user.
         *
-        * @return void
         * @runInSeparateProcess
+        * @preserveGlobalState disabled
         */
        public function testApiCallWithWrongAuth()
        {
@@ -643,11 +648,11 @@ class ApiTest extends FixtureTest
                ];
                $_SESSION['authenticated'] = false;
                $_SERVER['REQUEST_METHOD'] = 'method';
-               $_SERVER['QUERY_STRING'] = 'q=api_path';
+               $_SERVER['QUERY_STRING'] = 'pagename=api_path';
 
                $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)
                );
@@ -656,12 +661,12 @@ class ApiTest extends FixtureTest
        /**
         * Test the api_error() function with a JSON result.
         *
-        * @return void
         * @runInSeparateProcess
+        * @preserveGlobalState disabled
         */
        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())
                );
@@ -670,12 +675,12 @@ class ApiTest extends FixtureTest
        /**
         * Test the api_error() function with an XML result.
         *
-        * @return void
         * @runInSeparateProcess
+        * @preserveGlobalState disabled
         */
        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/" ' .
@@ -691,12 +696,12 @@ class ApiTest extends FixtureTest
        /**
         * Test the api_error() function with an RSS result.
         *
-        * @return void
         * @runInSeparateProcess
+        * @preserveGlobalState disabled
         */
        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/" ' .
@@ -712,12 +717,12 @@ class ApiTest extends FixtureTest
        /**
         * Test the api_error() function with an Atom result.
         *
-        * @return void
         * @runInSeparateProcess
+        * @preserveGlobalState disabled
         */
        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/" ' .
@@ -739,14 +744,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']);
        }
 
        /**
@@ -757,14 +762,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::assertIsArray($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']);
        }
 
        /**
@@ -774,7 +779,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));
        }
 
        /**
@@ -784,7 +789,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']));
        }
 
        /**
@@ -795,10 +800,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']);
        }
 
        /**
@@ -811,10 +816,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']);
        }
 
        /**
@@ -827,10 +832,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']);
        }
 
        /**
@@ -846,24 +851,24 @@ 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']);
        }
 
        /**
         * Test the api_get_user() function with an user that is not allowed to use the API.
         *
-        * @return void
         * @runInSeparateProcess
+        * @preserveGlobalState disabled
         */
        public function testApiGetUserWithoutApiUser()
        {
                $_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));
        }
 
        /**
@@ -874,19 +879,19 @@ 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));
        }
 
        /**
         * Test the api_get_user() function with a wrong user ID in a GET parameter.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiGetUserWithWrongGetId()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                $_GET['user_id'] = $this->wrongUserId;
-               $this->assertOtherUser(api_get_user($this->app));
+               self::assertOtherUser(api_get_user($this->app));
        }
 
        /**
@@ -897,7 +902,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));
        }
 
        /**
@@ -908,7 +913,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));
        }
 
        /**
@@ -921,7 +926,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));
        }
 
        /**
@@ -933,7 +938,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));
        }
 
        /**
@@ -943,18 +948,18 @@ 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']));
        }
 
        /**
         * Test the api_get_user() function with a wrong user ID.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiGetUserWithWrongUser()
        {
-               $this->assertOtherUser(api_get_user($this->app, $this->wrongUserId));
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
+               self::assertOtherUser(api_get_user($this->app, $this->wrongUserId));
        }
 
        /**
@@ -964,7 +969,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiGetUserWithZeroUser()
        {
-               $this->assertSelfUser(api_get_user($this->app, 0));
+               self::assertSelfUser(api_get_user($this->app, 0));
        }
 
        /**
@@ -975,7 +980,7 @@ class ApiTest extends FixtureTest
        public function testApiItemGetUser()
        {
                $users = api_item_get_user($this->app, []);
-               $this->assertSelfUser($users[0]);
+               self::assertSelfUser($users[0]);
        }
 
        /**
@@ -986,8 +991,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]);
        }
 
        /**
@@ -998,7 +1003,7 @@ class ApiTest extends FixtureTest
        public function testApiWalkRecursive()
        {
                $array = ['item1'];
-               $this->assertEquals(
+               self::assertEquals(
                        $array,
                        api_walk_recursive(
                                $array,
@@ -1018,7 +1023,7 @@ class ApiTest extends FixtureTest
        public function testApiWalkRecursiveWithArray()
        {
                $array = [['item1'], ['item2']];
-               $this->assertEquals(
+               self::assertEquals(
                        $array,
                        api_walk_recursive(
                                $array,
@@ -1039,8 +1044,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);
        }
 
        /**
@@ -1052,8 +1057,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);
        }
 
        /**
@@ -1065,8 +1070,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);
        }
 
        /**
@@ -1076,7 +1081,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/" ' .
@@ -1094,7 +1099,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiCreateXmlWithoutNamespaces()
        {
-               $this->assertEquals(
+               self::assertEquals(
                        '<?xml version="1.0"?>' . "\n" .
                        '<ok>' . "\n" .
                        '  <data>some_data</data>' . "\n" .
@@ -1111,7 +1116,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));
        }
 
        /**
@@ -1121,7 +1126,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/" ' .
@@ -1139,17 +1144,17 @@ class ApiTest extends FixtureTest
         */
        public function testApiAccountVerifyCredentials()
        {
-               $this->assertArrayHasKey('user', api_account_verify_credentials('json'));
+               self::assertArrayHasKey('user', api_account_verify_credentials('json'));
        }
 
        /**
         * Test the api_account_verify_credentials() function without an authenticated user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiAccountVerifyCredentialsWithoutAuthenticatedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['authenticated'] = false;
                api_account_verify_credentials('json');
        }
@@ -1161,7 +1166,7 @@ class ApiTest extends FixtureTest
         */
        public function testRequestdata()
        {
-               $this->assertNull(requestdata('variable_name'));
+               self::assertNull(requestdata('variable_name'));
        }
 
        /**
@@ -1172,7 +1177,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'));
        }
 
        /**
@@ -1183,7 +1188,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'));
        }
 
        /**
@@ -1209,17 +1214,17 @@ class ApiTest extends FixtureTest
                $_GET['status'] = '<b>Status content</b>';
 
                $result = api_statuses_mediap('json');
-               $this->assertStatus($result['status']);
+               self::assertStatus($result['status']);
        }
 
        /**
         * Test the api_statuses_mediap() function without an authenticated user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiStatusesMediapWithoutAuthenticatedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['authenticated'] = false;
                api_statuses_mediap('json');
        }
@@ -1248,7 +1253,7 @@ class ApiTest extends FixtureTest
                ];
 
                $result = api_statuses_update('json');
-               $this->assertStatus($result['status']);
+               self::assertStatus($result['status']);
        }
 
        /**
@@ -1261,17 +1266,17 @@ class ApiTest extends FixtureTest
                $_GET['htmlstatus'] = '<b>Status content</b>';
 
                $result = api_statuses_update('json');
-               $this->assertStatus($result['status']);
+               self::assertStatus($result['status']);
        }
 
        /**
         * Test the api_statuses_update() function without an authenticated user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiStatusesUpdateWithoutAuthenticatedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['authenticated'] = false;
                api_statuses_update('json');
        }
@@ -1308,12 +1313,12 @@ class ApiTest extends FixtureTest
 
        /**
         * Test the api_media_upload() function.
-        *
-        * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
+        * @runInSeparateProcess
+        * @preserveGlobalState disabled
         */
        public function testApiMediaUpload()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                api_media_upload();
        }
 
@@ -1321,10 +1326,10 @@ class ApiTest extends FixtureTest
         * Test the api_media_upload() function without an authenticated user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiMediaUploadWithoutAuthenticatedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['authenticated'] = false;
                api_media_upload();
        }
@@ -1333,10 +1338,10 @@ class ApiTest extends FixtureTest
         * Test the api_media_upload() function with an invalid uploaded media.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\InternalServerErrorException
         */
        public function testApiMediaUploadWithMedia()
        {
+               $this->expectException(\Friendica\Network\HTTPException\InternalServerErrorException::class);
                $_FILES = [
                        'media' => [
                                'id'       => 666,
@@ -1368,10 +1373,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']);
        }
 
        /**
@@ -1380,7 +1385,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusShowWithJson()
        {
                $result = api_status_show('json', 1);
-               $this->assertStatus($result['status']);
+               self::assertStatus($result['status']);
        }
 
        /**
@@ -1389,7 +1394,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusShowWithXml()
        {
                $result = api_status_show('xml', 1);
-               $this->assertXml($result, 'statuses');
+               self::assertXml($result, 'statuses');
        }
 
        /**
@@ -1399,7 +1404,7 @@ class ApiTest extends FixtureTest
        {
                $item = api_get_last_status($this->selfUser['id'], $this->selfUser['id']);
 
-               $this->assertNotNull($item);
+               self::assertNotNull($item);
        }
 
        /**
@@ -1411,12 +1416,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']);
        }
 
        /**
@@ -1427,7 +1432,7 @@ class ApiTest extends FixtureTest
        public function testApiUsersShowWithXml()
        {
                $result = api_users_show('xml');
-               $this->assertXml($result, 'statuses');
+               self::assertXml($result, 'statuses');
        }
 
        /**
@@ -1439,7 +1444,7 @@ class ApiTest extends FixtureTest
        {
                $_GET['q'] = 'othercontact';
                $result    = api_users_search('json');
-               $this->assertOtherUser($result['users'][0]);
+               self::assertOtherUser($result['users'][0]);
        }
 
        /**
@@ -1451,17 +1456,17 @@ class ApiTest extends FixtureTest
        {
                $_GET['q'] = 'othercontact';
                $result    = api_users_search('xml');
-               $this->assertXml($result, 'users');
+               self::assertXml($result, 'users');
        }
 
        /**
         * Test the api_users_search() function without a GET q parameter.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiUsersSearchWithoutQuery()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                api_users_search('json');
        }
 
@@ -1469,10 +1474,10 @@ class ApiTest extends FixtureTest
         * Test the api_users_lookup() function.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\NotFoundException
         */
        public function testApiUsersLookup()
        {
+               $this->expectException(\Friendica\Network\HTTPException\NotFoundException::class);
                api_users_lookup('json');
        }
 
@@ -1485,7 +1490,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]);
        }
 
        /**
@@ -1499,8 +1504,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::assertStringContainsStringIgnoringCase('reply', $status['text'], '', true);
                }
        }
 
@@ -1515,8 +1520,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::assertStringContainsStringIgnoringCase('reply', $status['text'], '', true);
                }
        }
 
@@ -1531,30 +1536,28 @@ 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::assertStringContainsStringIgnoringCase('reply', $status['text'], '', true);
                }
        }
 
        /**
         * Test the api_search() function with an q parameter contains hashtag.
-        *
-        * @return void
+        * @doesNotPerformAssertions
         */
        public function testApiSearchWithHashtag()
        {
                $_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::assertStringContainsStringIgnoringCase('#friendica', $status['text'], '', true);
                }
        }
 
        /**
         * Test the api_search() function with an exclude_replies parameter.
-        *
-        * @return void
+        * @doesNotPerformAssertions
         */
        public function testApiSearchWithExcludeReplies()
        {
@@ -1563,7 +1566,7 @@ class ApiTest extends FixtureTest
                $_REQUEST['q']               = 'friendica';
                $result                      = api_search('json');
                foreach ($result['status'] as $status) {
-                       $this->assertStatus($status);
+                       self::assertStatus($status);
                }
        }
 
@@ -1571,10 +1574,10 @@ class ApiTest extends FixtureTest
         * Test the api_search() function without an authenticated user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiSearchWithUnallowedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['allow_api'] = false;
                $_GET['screen_name']   = $this->selfUser['nick'];
                api_search('json');
@@ -1584,10 +1587,10 @@ class ApiTest extends FixtureTest
         * Test the api_search() function without any GET query parameter.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiSearchWithoutQuery()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                api_search('json');
        }
 
@@ -1602,9 +1605,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);
                }
        }
 
@@ -1617,9 +1620,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);
                }
        }
 
@@ -1627,10 +1630,10 @@ class ApiTest extends FixtureTest
         * Test the api_statuses_home_timeline() with an unallowed user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiStatusesHomeTimelineWithUnallowedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['allow_api'] = false;
                $_GET['screen_name']   = $this->selfUser['nick'];
                api_statuses_home_timeline('json');
@@ -1644,7 +1647,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesHomeTimelineWithRss()
        {
                $result = api_statuses_home_timeline('rss');
-               $this->assertXml($result, 'statuses');
+               self::assertXml($result, 'statuses');
        }
 
        /**
@@ -1657,9 +1660,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);
                }
        }
 
@@ -1673,9 +1676,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);
                }
        }
 
@@ -1688,9 +1691,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);
                }
        }
 
@@ -1698,10 +1701,10 @@ class ApiTest extends FixtureTest
         * Test the api_statuses_public_timeline() function with an unallowed user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiStatusesPublicTimelineWithUnallowedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['allow_api'] = false;
                $_GET['screen_name']   = $this->selfUser['nick'];
                api_statuses_public_timeline('json');
@@ -1715,7 +1718,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesPublicTimelineWithRss()
        {
                $result = api_statuses_public_timeline('rss');
-               $this->assertXml($result, 'statuses');
+               self::assertXml($result, 'statuses');
        }
 
        /**
@@ -1727,9 +1730,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);
                }
        }
 
@@ -1742,9 +1745,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);
                }
        }
 
@@ -1752,10 +1755,10 @@ class ApiTest extends FixtureTest
         * Test the api_statuses_networkpublic_timeline() function with an unallowed user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiStatusesNetworkpublicTimelineWithUnallowedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['allow_api'] = false;
                $_GET['screen_name']   = $this->selfUser['nick'];
                api_statuses_networkpublic_timeline('json');
@@ -1769,17 +1772,17 @@ class ApiTest extends FixtureTest
        public function testApiStatusesNetworkpublicTimelineWithRss()
        {
                $result = api_statuses_networkpublic_timeline('rss');
-               $this->assertXml($result, 'statuses');
+               self::assertXml($result, 'statuses');
        }
 
        /**
         * Test the api_statuses_show() function.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiStatusesShow()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                api_statuses_show('json');
        }
 
@@ -1792,7 +1795,7 @@ class ApiTest extends FixtureTest
        {
                $this->app->argv[3] = 1;
                $result             = api_statuses_show('json');
-               $this->assertStatus($result['status']);
+               self::assertStatus($result['status']);
        }
 
        /**
@@ -1805,9 +1808,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);
                }
        }
 
@@ -1815,10 +1818,10 @@ class ApiTest extends FixtureTest
         * Test the api_statuses_show() function with an unallowed user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiStatusesShowWithUnallowedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['allow_api'] = false;
                $_GET['screen_name']   = $this->selfUser['nick'];
                api_statuses_show('json');
@@ -1828,10 +1831,10 @@ class ApiTest extends FixtureTest
         * Test the api_conversation_show() function.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiConversationShow()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                api_conversation_show('json');
        }
 
@@ -1846,9 +1849,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);
                }
        }
 
@@ -1856,10 +1859,10 @@ class ApiTest extends FixtureTest
         * Test the api_conversation_show() function with an unallowed user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiConversationShowWithUnallowedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['allow_api'] = false;
                $_GET['screen_name']   = $this->selfUser['nick'];
                api_conversation_show('json');
@@ -1869,10 +1872,10 @@ class ApiTest extends FixtureTest
         * Test the api_statuses_repeat() function.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiStatusesRepeat()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                api_statuses_repeat('json');
        }
 
@@ -1880,10 +1883,10 @@ class ApiTest extends FixtureTest
         * Test the api_statuses_repeat() function without an authenticated user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiStatusesRepeatWithoutAuthenticatedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['authenticated'] = false;
                api_statuses_repeat('json');
        }
@@ -1897,22 +1900,22 @@ 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']);
        }
 
        /**
         * Test the api_statuses_destroy() function.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiStatusesDestroy()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                api_statuses_destroy('json');
        }
 
@@ -1920,10 +1923,10 @@ class ApiTest extends FixtureTest
         * Test the api_statuses_destroy() function without an authenticated user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiStatusesDestroyWithoutAuthenticatedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['authenticated'] = false;
                api_statuses_destroy('json');
        }
@@ -1937,7 +1940,7 @@ class ApiTest extends FixtureTest
        {
                $this->app->argv[3] = 1;
                $result             = api_statuses_destroy('json');
-               $this->assertStatus($result['status']);
+               self::assertStatus($result['status']);
        }
 
        /**
@@ -1950,7 +1953,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.
        }
 
@@ -1963,17 +1966,17 @@ class ApiTest extends FixtureTest
        {
                $_REQUEST['page'] = -2;
                $result           = api_statuses_mentions('json');
-               $this->assertEmpty($result['status']);
+               self::assertEmpty($result['status']);
        }
 
        /**
         * Test the api_statuses_mentions() function with an unallowed user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiStatusesMentionsWithUnallowedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['allow_api'] = false;
                $_GET['screen_name']   = $this->selfUser['nick'];
                api_statuses_mentions('json');
@@ -1987,7 +1990,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesMentionsWithRss()
        {
                $result = api_statuses_mentions('rss');
-               $this->assertXml($result, 'statuses');
+               self::assertXml($result, 'statuses');
        }
 
        /**
@@ -2001,9 +2004,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);
                }
        }
 
@@ -2016,9 +2019,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);
                }
        }
 
@@ -2030,17 +2033,17 @@ class ApiTest extends FixtureTest
        public function testApiStatusesUserTimelineWithRss()
        {
                $result = api_statuses_user_timeline('rss');
-               $this->assertXml($result, 'statuses');
+               self::assertXml($result, 'statuses');
        }
 
        /**
         * Test the api_statuses_user_timeline() function with an unallowed user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiStatusesUserTimelineWithUnallowedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['allow_api'] = false;
                $_GET['screen_name']   = $this->selfUser['nick'];
                api_statuses_user_timeline('json');
@@ -2050,10 +2053,10 @@ class ApiTest extends FixtureTest
         * Test the api_favorites_create_destroy() function.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiFavoritesCreateDestroy()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                $this->app->argv = ['api', '1.1', 'favorites', 'create'];
                $this->app->argc = count($this->app->argv);
                api_favorites_create_destroy('json');
@@ -2063,10 +2066,10 @@ class ApiTest extends FixtureTest
         * Test the api_favorites_create_destroy() function with an invalid ID.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiFavoritesCreateDestroyWithInvalidId()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                $this->app->argv = ['api', '1.1', 'favorites', 'create', '12.json'];
                $this->app->argc = count($this->app->argv);
                api_favorites_create_destroy('json');
@@ -2076,10 +2079,10 @@ class ApiTest extends FixtureTest
         * Test the api_favorites_create_destroy() function with an invalid action.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiFavoritesCreateDestroyWithInvalidAction()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                $this->app->argv = ['api', '1.1', 'favorites', 'change.json'];
                $this->app->argc = count($this->app->argv);
                $_REQUEST['id']  = 1;
@@ -2097,7 +2100,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']);
        }
 
        /**
@@ -2111,7 +2114,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');
        }
 
        /**
@@ -2125,17 +2128,17 @@ 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']);
        }
 
        /**
         * Test the api_favorites_create_destroy() function without an authenticated user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiFavoritesCreateDestroyWithoutAuthenticatedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $this->app->argv           = ['api', '1.1', 'favorites', 'create.json'];
                $this->app->argc           = count($this->app->argv);
                $_SESSION['authenticated'] = false;
@@ -2153,7 +2156,7 @@ class ApiTest extends FixtureTest
                $_REQUEST['max_id'] = 10;
                $result             = api_favorites('json');
                foreach ($result['status'] as $status) {
-                       $this->assertStatus($status);
+                       self::assertStatus($status);
                }
        }
 
@@ -2165,17 +2168,17 @@ class ApiTest extends FixtureTest
        public function testApiFavoritesWithRss()
        {
                $result = api_favorites('rss');
-               $this->assertXml($result, 'statuses');
+               self::assertXml($result, 'statuses');
        }
 
        /**
         * Test the api_favorites() function with an unallowed user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiFavoritesWithUnallowedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['allow_api'] = false;
                $_GET['screen_name']   = $this->selfUser['nick'];
                api_favorites('json');
@@ -2193,12 +2196,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']);
        }
 
        /**
@@ -2214,8 +2217,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']);
        }
 
        /**
@@ -2231,8 +2234,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']);
        }
 
        /**
@@ -2248,8 +2251,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']));
        }
 
        /**
@@ -2263,6 +2266,7 @@ class ApiTest extends FixtureTest
                        [
                                'network' => 'feed',
                                'title'   => 'item_title',
+                               'uri-id'  => 1,
                                // We need a long string to test that it is correctly cut
                                'body'    => 'perspiciatis impedit voluptatem quis molestiae ea qui ' .
                                             'reiciendis dolorum aut ducimus sunt consequatur inventore dolor ' .
@@ -2290,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']);
        }
 
        /**
@@ -2305,12 +2309,13 @@ class ApiTest extends FixtureTest
                        [
                                'network' => 'feed',
                                'title'   => 'item_title',
+                               'uri-id'  => -1,
                                'body'    => '',
                                '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']);
        }
 
        /**
@@ -2322,12 +2327,13 @@ class ApiTest extends FixtureTest
        {
                $result = api_convert_item(
                        [
-                               'title' => 'item_title',
-                               'body'  => 'item_title item_body'
+                               'title'  => 'item_title',
+                               'body'   => 'item_title item_body',
+                               'uri-id' => 1,
                        ]
                );
-               $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']);
        }
 
        /**
@@ -2338,7 +2344,7 @@ class ApiTest extends FixtureTest
        public function testApiGetAttachments()
        {
                $body = 'body';
-               $this->assertEmpty(api_get_attachments($body));
+               self::assertEmpty(api_get_attachments($body));
        }
 
        /**
@@ -2349,7 +2355,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::assertIsArray(api_get_attachments($body));
        }
 
        /**
@@ -2361,7 +2367,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::assertIsArray(api_get_attachments($body));
        }
 
        /**
@@ -2372,7 +2378,7 @@ class ApiTest extends FixtureTest
        public function testApiGetEntitities()
        {
                $text = 'text';
-               $this->assertInternalType('array', api_get_entitities($text, 'bbcode'));
+               self::assertIsArray(api_get_entitities($text, 'bbcode'));
        }
 
        /**
@@ -2385,10 +2391,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::assertIsArray($result['hashtags']);
+               self::assertIsArray($result['symbols']);
+               self::assertIsArray($result['urls']);
+               self::assertIsArray($result['user_mentions']);
        }
 
        /**
@@ -2398,7 +2404,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')
                );
@@ -2411,7 +2417,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiContactlinkToArray()
        {
-               $this->assertEquals(
+               self::assertEquals(
                        [
                                'name' => 'text',
                                'url'  => '',
@@ -2427,7 +2433,7 @@ class ApiTest extends FixtureTest
         */
        public function testApiContactlinkToArrayWithUrl()
        {
-               $this->assertEquals(
+               self::assertEquals(
                        [
                                'name' => ['link_text'],
                                'url'  => ['url'],
@@ -2445,11 +2451,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);
        }
 
        /**
@@ -2461,17 +2467,16 @@ 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);
        }
 
        /**
         * Test the api_format_items() function.
-        *
-        * @return void
+        * @doesNotPerformAssertions
         */
        public function testApiFormatItems()
        {
@@ -2490,14 +2495,13 @@ class ApiTest extends FixtureTest
                ];
                $result = api_format_items($items, ['id' => 0], true);
                foreach ($result as $status) {
-                       $this->assertStatus($status);
+                       self::assertStatus($status);
                }
        }
 
        /**
         * Test the api_format_items() function with an XML result.
-        *
-        * @return void
+        * @doesNotPerformAssertions
         */
        public function testApiFormatItemsWithXml()
        {
@@ -2514,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);
                }
        }
 
@@ -2526,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::assertIsInt($result['hash']['reset_time_in_seconds']);
        }
 
        /**
@@ -2539,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');
        }
 
        /**
@@ -2550,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);
        }
 
        /**
@@ -2561,7 +2565,7 @@ class ApiTest extends FixtureTest
        public function testApiHelpTestWithXml()
        {
                $result = api_help_test('xml');
-               $this->assertXml($result, 'ok');
+               self::assertXml($result, 'ok');
        }
 
        /**
@@ -2572,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);
        }
 
        /**
@@ -2584,7 +2588,7 @@ class ApiTest extends FixtureTest
        {
                $result = api_lists_ownerships('json');
                foreach ($result['lists']['lists'] as $list) {
-                       $this->assertList($list);
+                       self::assertList($list);
                }
        }
 
@@ -2592,10 +2596,10 @@ class ApiTest extends FixtureTest
         * Test the api_lists_ownerships() function without an authenticated user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiListsOwnershipsWithoutAuthenticatedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['authenticated'] = false;
                api_lists_ownerships('json');
        }
@@ -2603,18 +2607,17 @@ class ApiTest extends FixtureTest
        /**
         * Test the api_lists_statuses() function.
         *
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         * @return void
         */
        public function testApiListsStatuses()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                api_lists_statuses('json');
        }
 
        /**
         * Test the api_lists_statuses() function with a list ID.
-        *
-        * @return void
+        * @doesNotPerformAssertions
         */
        public function testApiListsStatusesWithListId()
        {
@@ -2623,7 +2626,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);
                }
        }
 
@@ -2636,17 +2639,17 @@ class ApiTest extends FixtureTest
        {
                $_REQUEST['list_id'] = 1;
                $result              = api_lists_statuses('rss');
-               $this->assertXml($result, 'statuses');
+               self::assertXml($result, 'statuses');
        }
 
        /**
         * Test the api_lists_statuses() function with an unallowed user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiListsStatusesWithUnallowedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['allow_api'] = false;
                $_GET['screen_name']   = $this->selfUser['nick'];
                api_lists_statuses('json');
@@ -2661,7 +2664,7 @@ class ApiTest extends FixtureTest
        {
                $_GET['page'] = -1;
                $result       = api_statuses_f('friends');
-               $this->assertArrayHasKey('user', $result);
+               self::assertArrayHasKey('user', $result);
        }
 
        /**
@@ -2672,7 +2675,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesFWithFollowers()
        {
                $result = api_statuses_f('followers');
-               $this->assertArrayHasKey('user', $result);
+               self::assertArrayHasKey('user', $result);
        }
 
        /**
@@ -2683,7 +2686,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesFWithBlocks()
        {
                $result = api_statuses_f('blocks');
-               $this->assertArrayHasKey('user', $result);
+               self::assertArrayHasKey('user', $result);
        }
 
        /**
@@ -2694,7 +2697,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesFWithIncoming()
        {
                $result = api_statuses_f('incoming');
-               $this->assertArrayHasKey('user', $result);
+               self::assertArrayHasKey('user', $result);
        }
 
        /**
@@ -2705,7 +2708,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesFWithUndefinedCursor()
        {
                $_GET['cursor'] = 'undefined';
-               $this->assertFalse(api_statuses_f('friends'));
+               self::assertFalse(api_statuses_f('friends'));
        }
 
        /**
@@ -2716,7 +2719,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesFriends()
        {
                $result = api_statuses_friends('json');
-               $this->assertArrayHasKey('user', $result);
+               self::assertArrayHasKey('user', $result);
        }
 
        /**
@@ -2727,7 +2730,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesFriendsWithUndefinedCursor()
        {
                $_GET['cursor'] = 'undefined';
-               $this->assertFalse(api_statuses_friends('json'));
+               self::assertFalse(api_statuses_friends('json'));
        }
 
        /**
@@ -2738,7 +2741,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesFollowers()
        {
                $result = api_statuses_followers('json');
-               $this->assertArrayHasKey('user', $result);
+               self::assertArrayHasKey('user', $result);
        }
 
        /**
@@ -2749,7 +2752,7 @@ class ApiTest extends FixtureTest
        public function testApiStatusesFollowersWithUndefinedCursor()
        {
                $_GET['cursor'] = 'undefined';
-               $this->assertFalse(api_statuses_followers('json'));
+               self::assertFalse(api_statuses_followers('json'));
        }
 
        /**
@@ -2760,7 +2763,7 @@ class ApiTest extends FixtureTest
        public function testApiBlocksList()
        {
                $result = api_blocks_list('json');
-               $this->assertArrayHasKey('user', $result);
+               self::assertArrayHasKey('user', $result);
        }
 
        /**
@@ -2771,7 +2774,7 @@ class ApiTest extends FixtureTest
        public function testApiBlocksListWithUndefinedCursor()
        {
                $_GET['cursor'] = 'undefined';
-               $this->assertFalse(api_blocks_list('json'));
+               self::assertFalse(api_blocks_list('json'));
        }
 
        /**
@@ -2782,7 +2785,7 @@ class ApiTest extends FixtureTest
        public function testApiFriendshipsIncoming()
        {
                $result = api_friendships_incoming('json');
-               $this->assertArrayHasKey('id', $result);
+               self::assertArrayHasKey('id', $result);
        }
 
        /**
@@ -2793,7 +2796,7 @@ class ApiTest extends FixtureTest
        public function testApiFriendshipsIncomingWithUndefinedCursor()
        {
                $_GET['cursor'] = 'undefined';
-               $this->assertFalse(api_friendships_incoming('json'));
+               self::assertFalse(api_friendships_incoming('json'));
        }
 
        /**
@@ -2804,16 +2807,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']);
        }
 
        /**
@@ -2824,7 +2827,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']);
        }
 
        /**
@@ -2835,17 +2838,17 @@ class ApiTest extends FixtureTest
        public function testApiDirectMessagesNew()
        {
                $result = api_direct_messages_new('json');
-               $this->assertNull($result);
+               self::assertNull($result);
        }
 
        /**
         * Test the api_direct_messages_new() function without an authenticated user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiDirectMessagesNewWithoutAuthenticatedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['authenticated'] = false;
                api_direct_messages_new('json');
        }
@@ -2860,7 +2863,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);
        }
 
        /**
@@ -2874,9 +2877,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::assertStringContainsString('message_text', $result['direct_message']['text']);
+               self::assertEquals('selfcontact', $result['direct_message']['sender_screen_name']);
+               self::assertEquals(1, $result['direct_message']['friendica_seen']);
        }
 
        /**
@@ -2891,10 +2894,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::assertStringContainsString('message_text', $result['direct_message']['text']);
+               self::assertStringContainsString('message_title', $result['direct_message']['text']);
+               self::assertEquals('selfcontact', $result['direct_message']['sender_screen_name']);
+               self::assertEquals(1, $result['direct_message']['friendica_seen']);
        }
 
        /**
@@ -2908,17 +2911,17 @@ 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');
        }
 
        /**
         * Test the api_direct_messages_destroy() function.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiDirectMessagesDestroy()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                api_direct_messages_destroy('json');
        }
 
@@ -2931,7 +2934,7 @@ class ApiTest extends FixtureTest
        {
                $_GET['friendica_verbose'] = 'true';
                $result                    = api_direct_messages_destroy('json');
-               $this->assertEquals(
+               self::assertEquals(
                        [
                                '$result' => [
                                        'result'  => 'error',
@@ -2946,10 +2949,10 @@ class ApiTest extends FixtureTest
         * Test the api_direct_messages_destroy() function without an authenticated user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiDirectMessagesDestroyWithoutAuthenticatedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['authenticated'] = false;
                api_direct_messages_destroy('json');
        }
@@ -2958,10 +2961,10 @@ class ApiTest extends FixtureTest
         * Test the api_direct_messages_destroy() function with a non-zero ID.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiDirectMessagesDestroyWithId()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                $_REQUEST['id'] = 1;
                api_direct_messages_destroy('json');
        }
@@ -2977,7 +2980,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',
@@ -3008,7 +3011,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);
        }
 
        /**
@@ -3019,7 +3022,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);
        }
 
        /**
@@ -3030,7 +3033,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);
        }
 
        /**
@@ -3041,7 +3044,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);
        }
 
        /**
@@ -3052,7 +3055,7 @@ class ApiTest extends FixtureTest
        public function testApiDirectMessagesBoxWithVerbose()
        {
                $result = api_direct_messages_box('json', 'sentbox', 'true');
-               $this->assertEquals(
+               self::assertEquals(
                        [
                                '$result' => [
                                        'result'  => 'error',
@@ -3071,17 +3074,17 @@ 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');
        }
 
        /**
         * Test the api_direct_messages_box() function without an authenticated user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiDirectMessagesBoxWithUnallowedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['allow_api'] = false;
                $_GET['screen_name']   = $this->selfUser['nick'];
                api_direct_messages_box('json', 'sentbox', 'false');
@@ -3095,7 +3098,7 @@ class ApiTest extends FixtureTest
        public function testApiDirectMessagesSentbox()
        {
                $result = api_direct_messages_sentbox('json');
-               $this->assertArrayHasKey('direct_message', $result);
+               self::assertArrayHasKey('direct_message', $result);
        }
 
        /**
@@ -3106,7 +3109,7 @@ class ApiTest extends FixtureTest
        public function testApiDirectMessagesInbox()
        {
                $result = api_direct_messages_inbox('json');
-               $this->assertArrayHasKey('direct_message', $result);
+               self::assertArrayHasKey('direct_message', $result);
        }
 
        /**
@@ -3117,7 +3120,7 @@ class ApiTest extends FixtureTest
        public function testApiDirectMessagesAll()
        {
                $result = api_direct_messages_all('json');
-               $this->assertArrayHasKey('direct_message', $result);
+               self::assertArrayHasKey('direct_message', $result);
        }
 
        /**
@@ -3128,7 +3131,7 @@ class ApiTest extends FixtureTest
        public function testApiDirectMessagesConversation()
        {
                $result = api_direct_messages_conversation('json');
-               $this->assertArrayHasKey('direct_message', $result);
+               self::assertArrayHasKey('direct_message', $result);
        }
 
        /**
@@ -3155,10 +3158,10 @@ class ApiTest extends FixtureTest
         * Test the api_fr_photoalbum_delete() function.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiFrPhotoalbumDelete()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                api_fr_photoalbum_delete('json');
        }
 
@@ -3166,10 +3169,10 @@ class ApiTest extends FixtureTest
         * Test the api_fr_photoalbum_delete() function with an album name.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiFrPhotoalbumDeleteWithAlbum()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                $_REQUEST['album'] = 'album_name';
                api_fr_photoalbum_delete('json');
        }
@@ -3188,10 +3191,10 @@ class ApiTest extends FixtureTest
         * Test the api_fr_photoalbum_delete() function.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiFrPhotoalbumUpdate()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                api_fr_photoalbum_update('json');
        }
 
@@ -3199,10 +3202,10 @@ class ApiTest extends FixtureTest
         * Test the api_fr_photoalbum_delete() function with an album name.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiFrPhotoalbumUpdateWithAlbum()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                $_REQUEST['album'] = 'album_name';
                api_fr_photoalbum_update('json');
        }
@@ -3211,10 +3214,10 @@ class ApiTest extends FixtureTest
         * Test the api_fr_photoalbum_delete() function with an album name.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiFrPhotoalbumUpdateWithAlbumAndNewAlbum()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                $_REQUEST['album']     = 'album_name';
                $_REQUEST['album_new'] = 'album_name';
                api_fr_photoalbum_update('json');
@@ -3224,10 +3227,10 @@ class ApiTest extends FixtureTest
         * Test the api_fr_photoalbum_update() function without an authenticated user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiFrPhotoalbumUpdateWithoutAuthenticatedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['authenticated'] = false;
                api_fr_photoalbum_update('json');
        }
@@ -3250,29 +3253,27 @@ class ApiTest extends FixtureTest
        public function testApiFrPhotosList()
        {
                $result = api_fr_photos_list('json');
-               $this->assertArrayHasKey('photo', $result);
+               self::assertArrayHasKey('photo', $result);
        }
 
        /**
         * Test the api_fr_photos_list() function without an authenticated user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiFrPhotosListWithoutAuthenticatedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['authenticated'] = false;
                api_fr_photos_list('json');
        }
 
        /**
         * Test the api_fr_photo_create_update() function.
-        *
-        * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiFrPhotoCreateUpdate()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                api_fr_photo_create_update('json');
        }
 
@@ -3280,10 +3281,10 @@ class ApiTest extends FixtureTest
         * Test the api_fr_photo_create_update() function without an authenticated user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiFrPhotoCreateUpdateWithoutAuthenticatedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['authenticated'] = false;
                api_fr_photo_create_update('json');
        }
@@ -3292,10 +3293,10 @@ class ApiTest extends FixtureTest
         * Test the api_fr_photo_create_update() function with an album name.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiFrPhotoCreateUpdateWithAlbum()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                $_REQUEST['album'] = 'album_name';
                api_fr_photo_create_update('json');
        }
@@ -3324,10 +3325,10 @@ class ApiTest extends FixtureTest
         * Test the api_fr_photo_delete() function.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiFrPhotoDelete()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                api_fr_photo_delete('json');
        }
 
@@ -3335,10 +3336,10 @@ class ApiTest extends FixtureTest
         * Test the api_fr_photo_delete() function without an authenticated user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiFrPhotoDeleteWithoutAuthenticatedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['authenticated'] = false;
                api_fr_photo_delete('json');
        }
@@ -3347,10 +3348,10 @@ class ApiTest extends FixtureTest
         * Test the api_fr_photo_delete() function with a photo ID.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiFrPhotoDeleteWithPhotoId()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                $_REQUEST['photo_id'] = 1;
                api_fr_photo_delete('json');
        }
@@ -3369,10 +3370,10 @@ class ApiTest extends FixtureTest
         * Test the api_fr_photo_detail() function.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiFrPhotoDetail()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                api_fr_photo_detail('json');
        }
 
@@ -3380,10 +3381,10 @@ class ApiTest extends FixtureTest
         * Test the api_fr_photo_detail() function without an authenticated user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiFrPhotoDetailWithoutAuthenticatedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['authenticated'] = false;
                api_fr_photo_detail('json');
        }
@@ -3392,10 +3393,10 @@ class ApiTest extends FixtureTest
         * Test the api_fr_photo_detail() function with a photo ID.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\NotFoundException
         */
        public function testApiFrPhotoDetailWithPhotoId()
        {
+               $this->expectException(\Friendica\Network\HTTPException\NotFoundException::class);
                $_REQUEST['photo_id'] = 1;
                api_fr_photo_detail('json');
        }
@@ -3414,10 +3415,10 @@ class ApiTest extends FixtureTest
         * Test the api_account_update_profile_image() function.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiAccountUpdateProfileImage()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                api_account_update_profile_image('json');
        }
 
@@ -3425,10 +3426,10 @@ class ApiTest extends FixtureTest
         * Test the api_account_update_profile_image() function without an authenticated user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiAccountUpdateProfileImageWithoutAuthenticatedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['authenticated'] = false;
                api_account_update_profile_image('json');
        }
@@ -3437,10 +3438,10 @@ class ApiTest extends FixtureTest
         * Test the api_account_update_profile_image() function with an uploaded file.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiAccountUpdateProfileImageWithUpload()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                $this->markTestIncomplete();
        }
 
@@ -3456,12 +3457,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']);
        }
 
        /**
@@ -3473,7 +3474,7 @@ class ApiTest extends FixtureTest
        {
                $result = check_acl_input('<aclstring>');
                // Where does this result come from?
-               $this->assertEquals(1, $result);
+               self::assertEquals(1, $result);
        }
 
        /**
@@ -3484,7 +3485,7 @@ class ApiTest extends FixtureTest
        public function testCheckAclInputWithEmptyAclString()
        {
                $result = check_acl_input(' ');
-               $this->assertFalse($result);
+               self::assertFalse($result);
        }
 
        /**
@@ -3521,10 +3522,10 @@ class ApiTest extends FixtureTest
         * Test the api_friendica_remoteauth() function.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiFriendicaRemoteauth()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                api_friendica_remoteauth();
        }
 
@@ -3532,10 +3533,10 @@ class ApiTest extends FixtureTest
         * Test the api_friendica_remoteauth() function with an URL.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiFriendicaRemoteauthWithUrl()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                $_GET['url']   = 'url';
                $_GET['c_url'] = 'url';
                api_friendica_remoteauth();
@@ -3563,7 +3564,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);
        }
 
        /**
@@ -3584,11 +3585,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);
        }
 
        /**
@@ -3610,7 +3611,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);
        }
 
        /**
@@ -3622,7 +3623,7 @@ class ApiTest extends FixtureTest
        {
                $contacts = [];
                $result   = api_best_nickname($contacts);
-               $this->assertNull($result);
+               self::assertNull($result);
        }
 
        /**
@@ -3729,10 +3730,10 @@ class ApiTest extends FixtureTest
         * Test the api_friendica_notification() function.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiFriendicaNotification()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                api_friendica_notification('json');
        }
 
@@ -3740,10 +3741,10 @@ class ApiTest extends FixtureTest
         * Test the api_friendica_notification() function without an authenticated user.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\ForbiddenException
         */
        public function testApiFriendicaNotificationWithoutAuthenticatedUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\ForbiddenException::class);
                $_SESSION['authenticated'] = false;
                api_friendica_notification('json');
        }
@@ -3759,7 +3760,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);
        }
 
        /**
@@ -3776,10 +3777,10 @@ class ApiTest extends FixtureTest
                $assertXml=<<<XML
 <?xml version="1.0"?>
 <notes>
-  <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"/>
+  <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="" 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);
        }
 
        /**
@@ -3792,7 +3793,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);
        }
 
        /**
@@ -3833,9 +3834,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']);
        }
 }