Merge pull request #10498 from MrPetovan/bug/10477-frio-csp-error-event-edit

[friendica.git] / tests / legacy / ApiTest.php

diff --git a/tests/legacy/ApiTest.php b/tests/legacy/ApiTest.php
index bced7eb19730301bce383a2ea620815e64ef6bc7..0f09756e4a29e965909041a9f098aad2b049897e 100644 (file)
--- a/tests/legacy/ApiTest.php
+++ b/tests/legacy/ApiTest.php
@@ -50,7 +50,7 @@ class ApiTest extends FixtureTest
        /**
         * Create variables used by tests.
         */
-       protected function setUp()
+       protected function setUp() : void
        {
                global $API, $called_api;
                $API = [];
@@ -157,8 +157,8 @@ class ApiTest extends FixtureTest
         */
        private function assertStatus(array $status = [])
        {
-               self::assertInternalType('string', $status['text'] ?? '');
-               self::assertInternalType('int', $status['id'] ?? '');
+               self::assertIsString($status['text'] ?? '');
+               self::assertIsInt($status['id'] ?? '');
                // We could probably do more checks here.
        }
 
@@ -171,9 +171,9 @@ class ApiTest extends FixtureTest
         */
        private function assertList(array $list = [])
        {
-               self::assertInternalType('string', $list['name']);
-               self::assertInternalType('int', $list['id']);
-               self::assertInternalType('string', $list['id_str']);
+               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.
        }
@@ -189,7 +189,7 @@ class ApiTest extends FixtureTest
        private function assertXml($result = '', $root_element = '')
        {
                self::assertStringStartsWith('<?xml version="1.0"?>', $result);
-               self::assertContains('<' . $root_element, $result);
+               self::assertStringContainsString('<' . $root_element, $result);
                // We could probably do more checks here.
        }
 
@@ -303,10 +303,10 @@ class ApiTest extends FixtureTest
         * @runInSeparateProcess
         * @preserveGlobalState disabled
         * @preserveGlobalState disabled
-        * @expectedException Friendica\Network\HTTPException\UnauthorizedException
         */
        public function testApiLoginWithoutLogin()
        {
+               $this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class);
                api_login($this->app);
        }
 
@@ -316,10 +316,10 @@ class ApiTest extends FixtureTest
         * @runInSeparateProcess
         * @preserveGlobalState disabled
         * @preserveGlobalState disabled
-        * @expectedException Friendica\Network\HTTPException\UnauthorizedException
         */
        public function testApiLoginWithBadLogin()
        {
+               $this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class);
                $_SERVER['PHP_AUTH_USER'] = 'user@server';
                api_login($this->app);
        }
@@ -363,10 +363,10 @@ class ApiTest extends FixtureTest
         *
         * @runInSeparateProcess
         * @preserveGlobalState disabled
-        * @expectedException Friendica\Network\HTTPException\UnauthorizedException
         */
        public function testApiLoginWithRemoteUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\UnauthorizedException::class);
                $_SERVER['REDIRECT_REMOTE_USER'] = '123456dXNlcjpwYXNzd29yZA==';
                api_login($this->app);
        }
@@ -762,7 +762,7 @@ class ApiTest extends FixtureTest
        public function testApiRssExtraWithoutUserInfo()
        {
                $result = api_rss_extra($this->app, [], null);
-               self::assertInternalType('array', $result['$user']);
+               self::assertIsArray($result['$user']);
                self::assertArrayHasKey('alternate', $result['$rss']);
                self::assertArrayHasKey('self', $result['$rss']);
                self::assertArrayHasKey('base', $result['$rss']);
@@ -886,10 +886,10 @@ class ApiTest extends FixtureTest
         * 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;
                self::assertOtherUser(api_get_user($this->app));
        }
@@ -955,10 +955,10 @@ class ApiTest extends FixtureTest
         * Test the api_get_user() function with a wrong user ID.
         *
         * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiGetUserWithWrongUser()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                self::assertOtherUser(api_get_user($this->app, $this->wrongUserId));
        }
 
@@ -1151,10 +1151,10 @@ class ApiTest extends FixtureTest
         * 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');
        }
@@ -1221,10 +1221,10 @@ class ApiTest extends FixtureTest
         * 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');
        }
@@ -1273,10 +1273,10 @@ class ApiTest extends FixtureTest
         * 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');
        }
@@ -1315,10 +1315,10 @@ class ApiTest extends FixtureTest
         * Test the api_media_upload() function.
         * @runInSeparateProcess
         * @preserveGlobalState disabled
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiMediaUpload()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                api_media_upload();
        }
 
@@ -1326,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();
        }
@@ -1338,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,
@@ -1463,10 +1463,10 @@ class ApiTest extends FixtureTest
         * 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');
        }
 
@@ -1474,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');
        }
 
@@ -1505,7 +1505,7 @@ class ApiTest extends FixtureTest
                $result             = api_search('json');
                foreach ($result['status'] as $status) {
                        self::assertStatus($status);
-                       self::assertContains('reply', $status['text'], '', true);
+                       self::assertStringContainsStringIgnoringCase('reply', $status['text'], '', true);
                }
        }
 
@@ -1521,7 +1521,7 @@ class ApiTest extends FixtureTest
                $result            = api_search('json');
                foreach ($result['status'] as $status) {
                        self::assertStatus($status);
-                       self::assertContains('reply', $status['text'], '', true);
+                       self::assertStringContainsStringIgnoringCase('reply', $status['text'], '', true);
                }
        }
 
@@ -1537,7 +1537,7 @@ class ApiTest extends FixtureTest
                $result          = api_search('json');
                foreach ($result['status'] as $status) {
                        self::assertStatus($status);
-                       self::assertContains('reply', $status['text'], '', true);
+                       self::assertStringContainsStringIgnoringCase('reply', $status['text'], '', true);
                }
        }
 
@@ -1551,7 +1551,7 @@ class ApiTest extends FixtureTest
                $result        = api_search('json');
                foreach ($result['status'] as $status) {
                        self::assertStatus($status);
-                       self::assertContains('#friendica', $status['text'], '', true);
+                       self::assertStringContainsStringIgnoringCase('#friendica', $status['text'], '', true);
                }
        }
 
@@ -1574,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');
@@ -1587,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');
        }
 
@@ -1630,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');
@@ -1701,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');
@@ -1755,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');
@@ -1779,10 +1779,10 @@ class ApiTest extends FixtureTest
         * 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');
        }
 
@@ -1818,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');
@@ -1831,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');
        }
 
@@ -1859,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');
@@ -1872,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');
        }
 
@@ -1883,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');
        }
@@ -1912,10 +1912,10 @@ class ApiTest extends FixtureTest
         * 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');
        }
 
@@ -1923,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');
        }
@@ -1973,10 +1973,10 @@ class ApiTest extends FixtureTest
         * 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');
@@ -2040,10 +2040,10 @@ class ApiTest extends FixtureTest
         * 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');
@@ -2053,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');
@@ -2066,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');
@@ -2079,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;
@@ -2135,10 +2135,10 @@ class ApiTest extends FixtureTest
         * 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;
@@ -2175,10 +2175,10 @@ class ApiTest extends FixtureTest
         * 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');
@@ -2192,9 +2192,9 @@ class ApiTest extends FixtureTest
        public function testApiFormatMessages()
        {
                $result = api_format_messages(
-                       ['id' => 1, 'title' => 'item_title', 'body' => '[b]item_body[/b]'],
-                       ['id' => 2, 'screen_name' => 'recipient_name'],
-                       ['id' => 3, 'screen_name' => 'sender_name']
+                       ['id' => 1, 'uri-id' => 1, 'title' => 'item_title', 'body' => '[b]item_body[/b]'],
+                       ['id' => 2, 'uri-id' => 2, 'screen_name' => 'recipient_name'],
+                       ['id' => 3, 'uri-id' => 2, 'screen_name' => 'sender_name']
                );
                self::assertEquals('item_title' . "\n" . 'item_body', $result['text']);
                self::assertEquals(1, $result['id']);
@@ -2213,9 +2213,9 @@ class ApiTest extends FixtureTest
        {
                $_GET['getText'] = 'html';
                $result          = api_format_messages(
-                       ['id' => 1, 'title' => 'item_title', 'body' => '[b]item_body[/b]'],
-                       ['id' => 2, 'screen_name' => 'recipient_name'],
-                       ['id' => 3, 'screen_name' => 'sender_name']
+                       ['id' => 1, 'uri-id' => 1, 'title' => 'item_title', 'body' => '[b]item_body[/b]'],
+                       ['id' => 2, 'uri-id' => 2, 'screen_name' => 'recipient_name'],
+                       ['id' => 3, 'uri-id' => 3, 'screen_name' => 'sender_name']
                );
                self::assertEquals('item_title', $result['title']);
                self::assertEquals('<strong>item_body</strong>', $result['text']);
@@ -2230,9 +2230,9 @@ class ApiTest extends FixtureTest
        {
                $_GET['getText'] = 'plain';
                $result          = api_format_messages(
-                       ['id' => 1, 'title' => 'item_title', 'body' => '[b]item_body[/b]'],
-                       ['id' => 2, 'screen_name' => 'recipient_name'],
-                       ['id' => 3, 'screen_name' => 'sender_name']
+                       ['id' => 1, 'uri-id' => 1, 'title' => 'item_title', 'body' => '[b]item_body[/b]'],
+                       ['id' => 2, 'uri-id' => 2, 'screen_name' => 'recipient_name'],
+                       ['id' => 3, 'uri-id' => 3, 'screen_name' => 'sender_name']
                );
                self::assertEquals('item_title', $result['title']);
                self::assertEquals('item_body', $result['text']);
@@ -2247,9 +2247,9 @@ class ApiTest extends FixtureTest
        {
                $_GET['getUserObjects'] = 'false';
                $result                 = api_format_messages(
-                       ['id' => 1, 'title' => 'item_title', 'body' => '[b]item_body[/b]'],
-                       ['id' => 2, 'screen_name' => 'recipient_name'],
-                       ['id' => 3, 'screen_name' => 'sender_name']
+                       ['id' => 1, 'uri-id' => 1, 'title' => 'item_title', 'body' => '[b]item_body[/b]'],
+                       ['id' => 2, 'uri-id' => 2, 'screen_name' => 'recipient_name'],
+                       ['id' => 3, 'uri-id' => 3, 'screen_name' => 'sender_name']
                );
                self::assertTrue(!isset($result['sender']));
                self::assertTrue(!isset($result['recipient']));
@@ -2266,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 ' .
@@ -2308,11 +2309,12 @@ class ApiTest extends FixtureTest
                        [
                                'network' => 'feed',
                                'title'   => 'item_title',
+                               'uri-id'  => -1,
                                'body'    => '',
                                'plink'   => 'item_plink'
                        ]
                );
-               self::assertEquals('item_title', $result['text']);
+               self::assertEquals("item_title", $result['text']);
                self::assertEquals('<h4>item_title</h4><br>item_plink', $result['html']);
        }
 
@@ -2325,8 +2327,9 @@ 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,
                        ]
                );
                self::assertEquals('item_title item_body', $result['text']);
@@ -2341,7 +2344,7 @@ class ApiTest extends FixtureTest
        public function testApiGetAttachments()
        {
                $body = 'body';
-               self::assertEmpty(api_get_attachments($body));
+               self::assertEmpty(api_get_attachments($body, 0));
        }
 
        /**
@@ -2352,7 +2355,7 @@ class ApiTest extends FixtureTest
        public function testApiGetAttachmentsWithImage()
        {
                $body = '[img]http://via.placeholder.com/1x1.png[/img]';
-               self::assertInternalType('array', api_get_attachments($body));
+               self::assertIsArray(api_get_attachments($body, 0));
        }
 
        /**
@@ -2364,7 +2367,7 @@ class ApiTest extends FixtureTest
        {
                $_SERVER['HTTP_USER_AGENT'] = 'AndStatus';
                $body                       = '[img]http://via.placeholder.com/1x1.png[/img]';
-               self::assertInternalType('array', api_get_attachments($body));
+               self::assertIsArray(api_get_attachments($body, 0));
        }
 
        /**
@@ -2375,7 +2378,7 @@ class ApiTest extends FixtureTest
        public function testApiGetEntitities()
        {
                $text = 'text';
-               self::assertInternalType('array', api_get_entitities($text, 'bbcode'));
+               self::assertIsArray(api_get_entitities($text, 'bbcode', 0));
        }
 
        /**
@@ -2387,11 +2390,11 @@ class ApiTest extends FixtureTest
        {
                $_REQUEST['include_entities'] = 'true';
                $text                         = 'text';
-               $result                       = api_get_entitities($text, 'bbcode');
-               self::assertInternalType('array', $result['hashtags']);
-               self::assertInternalType('array', $result['symbols']);
-               self::assertInternalType('array', $result['urls']);
-               self::assertInternalType('array', $result['user_mentions']);
+               $result                       = api_get_entitities($text, 'bbcode', 0);
+               self::assertIsArray($result['hashtags']);
+               self::assertIsArray($result['symbols']);
+               self::assertIsArray($result['urls']);
+               self::assertIsArray($result['user_mentions']);
        }
 
        /**
@@ -2529,7 +2532,7 @@ class ApiTest extends FixtureTest
                $result = api_account_rate_limit_status('json');
                self::assertEquals(150, $result['hash']['remaining_hits']);
                self::assertEquals(150, $result['hash']['hourly_limit']);
-               self::assertInternalType('int', $result['hash']['reset_time_in_seconds']);
+               self::assertIsInt($result['hash']['reset_time_in_seconds']);
        }
 
        /**
@@ -2593,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');
        }
@@ -2604,11 +2607,11 @@ 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');
        }
 
@@ -2643,10 +2646,10 @@ class ApiTest extends FixtureTest
         * 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');
@@ -2842,10 +2845,10 @@ class ApiTest extends FixtureTest
         * 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');
        }
@@ -2874,7 +2877,7 @@ class ApiTest extends FixtureTest
                $_POST['text']        = 'message_text';
                $_POST['screen_name'] = $this->friendUser['nick'];
                $result               = api_direct_messages_new('json');
-               self::assertContains('message_text', $result['direct_message']['text']);
+               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,8 +2894,8 @@ class ApiTest extends FixtureTest
                $_POST['screen_name'] = $this->friendUser['nick'];
                $_REQUEST['title']    = 'message_title';
                $result               = api_direct_messages_new('json');
-               self::assertContains('message_text', $result['direct_message']['text']);
-               self::assertContains('message_title', $result['direct_message']['text']);
+               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']);
        }
@@ -2915,10 +2918,10 @@ class ApiTest extends FixtureTest
         * 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');
        }
 
@@ -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');
        }
@@ -3078,10 +3081,10 @@ class ApiTest extends FixtureTest
         * 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');
@@ -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');
        }
@@ -3257,20 +3260,20 @@ class ApiTest extends FixtureTest
         * 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.
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
         */
        public function testApiFrPhotoCreateUpdate()
        {
+               $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
                api_fr_photo_create_update('json');
        }
 
@@ -3278,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');
        }
@@ -3290,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');
        }
@@ -3322,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');
        }
 
@@ -3333,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');
        }
@@ -3345,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');
        }
@@ -3367,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');
        }
 
@@ -3378,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');
        }
@@ -3390,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');
        }
@@ -3412,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');
        }
 
@@ -3423,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');
        }
@@ -3435,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();
        }
 
@@ -3515,43 +3518,6 @@ class ApiTest extends FixtureTest
                $this->markTestIncomplete();
        }
 
-       /**
-        * Test the api_friendica_remoteauth() function.
-        *
-        * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
-        */
-       public function testApiFriendicaRemoteauth()
-       {
-               api_friendica_remoteauth();
-       }
-
-       /**
-        * Test the api_friendica_remoteauth() function with an URL.
-        *
-        * @return void
-        * @expectedException Friendica\Network\HTTPException\BadRequestException
-        */
-       public function testApiFriendicaRemoteauthWithUrl()
-       {
-               $_GET['url']   = 'url';
-               $_GET['c_url'] = 'url';
-               api_friendica_remoteauth();
-       }
-
-       /**
-        * Test the api_friendica_remoteauth() function with a correct URL.
-        *
-        * @return void
-        */
-       public function testApiFriendicaRemoteauthWithCorrectUrl()
-       {
-               $this->markTestIncomplete("We can't use an assertion here because of App->redirect().");
-               $_GET['url']   = 'url';
-               $_GET['c_url'] = $this->selfUser['nurl'];
-               api_friendica_remoteauth();
-       }
-
        /**
         * Test the api_share_as_retweet() function.
         *
@@ -3727,10 +3693,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');
        }
 
@@ -3738,10 +3704,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');
        }