tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #10366 from nupplaphil/bug/phpunit_warnings

Browse source 
Replace assertInternalType() with proper assertions
This commit is contained in:
Hypolite Petovan 2021-06-02 17:38:20 -04:00 committed by GitHub
parent ab7f26aca0 0fead7e3ea
commit 1542289103
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
tests/legacy/ApiTest.php
View file

@ -157,8 +157,8 @@ class ApiTest extends FixtureTest
*/ */
private function assertStatus(array $status = []) private function assertStatus(array $status = [])
{ {
self::assertInternalType('string', $status['text'] ?? ''); self::assertIsString($status['text'] ?? '');
self::assertInternalType('int', $status['id'] ?? ''); self::assertIsInt($status['id'] ?? '');
// We could probably do more checks here. // We could probably do more checks here.
} }
@ -171,9 +171,9 @@ class ApiTest extends FixtureTest
*/ */
private function assertList(array $list = []) private function assertList(array $list = [])
{ {
self::assertInternalType('string', $list['name']); self::assertIsString($list['name']);
self::assertInternalType('int', $list['id']); self::assertIsInt($list['id']);
self::assertInternalType('string', $list['id_str']); self::assertIsString('string', $list['id_str']);
self::assertContains($list['mode'], ['public', 'private']); self::assertContains($list['mode'], ['public', 'private']);
// We could probably do more checks here. // We could probably do more checks here.
} }
@ -762,7 +762,7 @@ class ApiTest extends FixtureTest
public function testApiRssExtraWithoutUserInfo() public function testApiRssExtraWithoutUserInfo()
{ {
$result = api_rss_extra($this->app, [], null); $result = api_rss_extra($this->app, [], null);
self::assertInternalType('array', $result['$user']); self::assertIsArray($result['$user']);
self::assertArrayHasKey('alternate', $result['$rss']); self::assertArrayHasKey('alternate', $result['$rss']);
self::assertArrayHasKey('self', $result['$rss']); self::assertArrayHasKey('self', $result['$rss']);
self::assertArrayHasKey('base', $result['$rss']); self::assertArrayHasKey('base', $result['$rss']);
@ -2355,7 +2355,7 @@ class ApiTest extends FixtureTest
public function testApiGetAttachmentsWithImage() public function testApiGetAttachmentsWithImage()
{ {
$body = '[img]http://via.placeholder.com/1x1.png[/img]'; $body = '[img]http://via.placeholder.com/1x1.png[/img]';
self::assertInternalType('array', api_get_attachments($body)); self::assertIsArray(api_get_attachments($body));
} }
/** /**
@ -2367,7 +2367,7 @@ class ApiTest extends FixtureTest
{ {
$_SERVER['HTTP_USER_AGENT'] = 'AndStatus'; $_SERVER['HTTP_USER_AGENT'] = 'AndStatus';
$body = '[img]http://via.placeholder.com/1x1.png[/img]'; $body = '[img]http://via.placeholder.com/1x1.png[/img]';
self::assertInternalType('array', api_get_attachments($body)); self::assertIsArray(api_get_attachments($body));
} }
/** /**
@ -2378,7 +2378,7 @@ class ApiTest extends FixtureTest
public function testApiGetEntitities() public function testApiGetEntitities()
{ {
$text = 'text'; $text = 'text';
self::assertInternalType('array', api_get_entitities($text, 'bbcode')); self::assertIsArray(api_get_entitities($text, 'bbcode'));
} }
/** /**
@ -2391,10 +2391,10 @@ class ApiTest extends FixtureTest
$_REQUEST['include_entities'] = 'true'; $_REQUEST['include_entities'] = 'true';
$text = 'text'; $text = 'text';
$result = api_get_entitities($text, 'bbcode'); $result = api_get_entitities($text, 'bbcode');
self::assertInternalType('array', $result['hashtags']); self::assertIsArray($result['hashtags']);
self::assertInternalType('array', $result['symbols']); self::assertIsArray($result['symbols']);
self::assertInternalType('array', $result['urls']); self::assertIsArray($result['urls']);
self::assertInternalType('array', $result['user_mentions']); self::assertIsArray($result['user_mentions']);
} }
/** /**
@ -2532,7 +2532,7 @@ class ApiTest extends FixtureTest
$result = api_account_rate_limit_status('json'); $result = api_account_rate_limit_status('json');
self::assertEquals(150, $result['hash']['remaining_hits']); self::assertEquals(150, $result['hash']['remaining_hits']);
self::assertEquals(150, $result['hash']['hourly_limit']); self::assertEquals(150, $result['hash']['hourly_limit']);
self::assertInternalType('int', $result['hash']['reset_time_in_seconds']); self::assertIsInt($result['hash']['reset_time_in_seconds']);
} }
/** /**