diff options
| author | 2023-05-11 13:02:04 +0200 | |
|---|---|---|
| committer | 2023-05-11 13:02:04 +0200 | |
| commit | 6e2f2f1c1e98ecd86aa89c6547beb742d7385d18 (patch) | |
| tree | 7ba9f5aebb01d12045b9067a86b5060ba13dca18 /tests/app | |
| parent | fe7d9bbcd68660a59b813346c236b61b25a51c80 (diff) | |
A few additional PHPStan rules (#5388)
A subset of
https://github.com/phpstan/phpstan-strict-rules
Diffstat (limited to 'tests/app')
| -rw-r--r-- | tests/app/Models/CategoryTest.php | 33 | ||||
| -rw-r--r-- | tests/app/Models/LogDAOTest.php | 16 | ||||
| -rw-r--r-- | tests/app/Models/SearchTest.php | 66 | ||||
| -rw-r--r-- | tests/app/Models/UserQueryTest.php | 76 | ||||
| -rw-r--r-- | tests/app/Utils/passwordUtilTest.php | 6 |
5 files changed, 98 insertions, 99 deletions
diff --git a/tests/app/Models/CategoryTest.php b/tests/app/Models/CategoryTest.php index a438afe9e..b332cb524 100644 --- a/tests/app/Models/CategoryTest.php +++ b/tests/app/Models/CategoryTest.php @@ -4,8 +4,8 @@ class CategoryTest extends PHPUnit\Framework\TestCase { public function test__construct_whenNoParameters_createsObjectWithDefaultValues(): void { $category = new FreshRSS_Category(); - $this->assertEquals(0, $category->id()); - $this->assertEquals('', $category->name()); + self::assertEquals(0, $category->id()); + self::assertEquals('', $category->name()); } /** @@ -13,7 +13,7 @@ class CategoryTest extends PHPUnit\Framework\TestCase { */ public function test_name_whenValidValue_storesModifiedValue(string $input, string $expected): void { $category = new FreshRSS_Category($input); - $this->assertEquals($expected, $category->name()); + self::assertEquals($expected, $category->name()); } /** @return array<array{string,string}> */ @@ -33,21 +33,21 @@ class CategoryTest extends PHPUnit\Framework\TestCase { $feed_1 = $this->getMockBuilder(FreshRSS_Feed::class) ->disableOriginalConstructor() ->getMock(); - $feed_1->expects($this->any()) + $feed_1->expects(self::any()) ->method('name') ->willReturn('AAA'); $feed_2 = $this->getMockBuilder(FreshRSS_Feed::class) ->disableOriginalConstructor() ->getMock(); - $feed_2->expects($this->any()) + $feed_2->expects(self::any()) ->method('name') ->willReturn('ZZZ'); $feed_3 = $this->getMockBuilder(FreshRSS_Feed::class) ->disableOriginalConstructor() ->getMock(); - $feed_3->expects($this->any()) + $feed_3->expects(self::any()) ->method('name') ->willReturn('lll'); @@ -58,25 +58,26 @@ class CategoryTest extends PHPUnit\Framework\TestCase { ]); $feeds = $category->feeds(); - $this->assertCount(3, $feeds); - $this->assertEquals('AAA', $feeds[0]->name()); - $this->assertEquals('lll', $feeds[1]->name()); - $this->assertEquals('ZZZ', $feeds[2]->name()); + self::assertCount(3, $feeds); + self::assertEquals('AAA', $feeds[0]->name()); + self::assertEquals('lll', $feeds[1]->name()); + self::assertEquals('ZZZ', $feeds[2]->name()); + /** @var FreshRSS_Feed&PHPUnit\Framework\MockObject\MockObject */ $feed_4 = $this->getMockBuilder(FreshRSS_Feed::class) ->disableOriginalConstructor() ->getMock(); - $feed_4->expects($this->any()) + $feed_4->expects(self::any()) ->method('name') ->willReturn('BBB'); $category->addFeed($feed_4); $feeds = $category->feeds(); - $this->assertCount(4, $feeds); - $this->assertEquals('AAA', $feeds[0]->name()); - $this->assertEquals('BBB', $feeds[1]->name()); - $this->assertEquals('lll', $feeds[2]->name()); - $this->assertEquals('ZZZ', $feeds[3]->name()); + self::assertCount(4, $feeds); + self::assertEquals('AAA', $feeds[0]->name()); + self::assertEquals('BBB', $feeds[1]->name()); + self::assertEquals('lll', $feeds[2]->name()); + self::assertEquals('ZZZ', $feeds[3]->name()); } } diff --git a/tests/app/Models/LogDAOTest.php b/tests/app/Models/LogDAOTest.php index abe6c6c1f..dc9fbd316 100644 --- a/tests/app/Models/LogDAOTest.php +++ b/tests/app/Models/LogDAOTest.php @@ -23,20 +23,20 @@ class LogDAOTest extends TestCase { } public function test_lines_is_array_and_truncate_function_work(): void { - $this->assertEquals(USERS_PATH . '/' . Minz_User::INTERNAL_USER . '/' . self::LOG_FILE_TEST, $this->logPath); + self::assertEquals(USERS_PATH . '/' . Minz_User::INTERNAL_USER . '/' . self::LOG_FILE_TEST, $this->logPath); $line = $this->logDAO::lines(self::LOG_FILE_TEST); - $this->assertIsArray($line); - $this->assertCount(1, $line); - $this->assertInstanceOf(FreshRSS_Log::class, $line[0]); - $this->assertEquals('Wed, 08 Feb 2023 15:35:05 +0000', $line[0]->date()); - $this->assertEquals('notice', $line[0]->level()); - $this->assertEquals("Migration 2019_12_22_FooBar: OK", $line[0]->info()); + self::assertIsArray($line); + self::assertCount(1, $line); + self::assertInstanceOf(FreshRSS_Log::class, $line[0]); + self::assertEquals('Wed, 08 Feb 2023 15:35:05 +0000', $line[0]->date()); + self::assertEquals('notice', $line[0]->level()); + self::assertEquals("Migration 2019_12_22_FooBar: OK", $line[0]->info()); $this->logDAO::truncate(self::LOG_FILE_TEST); - $this->assertStringContainsString('', file_get_contents($this->logPath) ?: ''); + self::assertStringContainsString('', file_get_contents($this->logPath) ?: ''); } protected function tearDown(): void { diff --git a/tests/app/Models/SearchTest.php b/tests/app/Models/SearchTest.php index 2b2501589..fa41542be 100644 --- a/tests/app/Models/SearchTest.php +++ b/tests/app/Models/SearchTest.php @@ -9,15 +9,15 @@ class SearchTest extends PHPUnit\Framework\TestCase { */ public function test__construct_whenInputIsEmpty_getsOnlyNullValues(?string $input): void { $search = new FreshRSS_Search($input); - $this->assertEquals('', $search->getRawInput()); - $this->assertNull($search->getIntitle()); - $this->assertNull($search->getMinDate()); - $this->assertNull($search->getMaxDate()); - $this->assertNull($search->getMinPubdate()); - $this->assertNull($search->getMaxPubdate()); - $this->assertNull($search->getAuthor()); - $this->assertNull($search->getTags()); - $this->assertNull($search->getSearch()); + self::assertEquals('', $search->getRawInput()); + self::assertNull($search->getIntitle()); + self::assertNull($search->getMinDate()); + self::assertNull($search->getMaxDate()); + self::assertNull($search->getMinPubdate()); + self::assertNull($search->getMaxPubdate()); + self::assertNull($search->getAuthor()); + self::assertNull($search->getTags()); + self::assertNull($search->getSearch()); } /** @@ -39,8 +39,8 @@ class SearchTest extends PHPUnit\Framework\TestCase { */ public function test__construct_whenInputContainsIntitle_setsIntitleProperty(string $input, ?array $intitle_value, ?array $search_value): void { $search = new FreshRSS_Search($input); - $this->assertEquals($intitle_value, $search->getIntitle()); - $this->assertEquals($search_value, $search->getSearch()); + self::assertEquals($intitle_value, $search->getIntitle()); + self::assertEquals($search_value, $search->getSearch()); } /** @@ -76,8 +76,8 @@ class SearchTest extends PHPUnit\Framework\TestCase { */ public function test__construct_whenInputContainsAuthor_setsAuthorValue(string $input, ?array $author_value, ?array $search_value): void { $search = new FreshRSS_Search($input); - $this->assertEquals($author_value, $search->getAuthor()); - $this->assertEquals($search_value, $search->getSearch()); + self::assertEquals($author_value, $search->getAuthor()); + self::assertEquals($search_value, $search->getSearch()); } /** @@ -113,8 +113,8 @@ class SearchTest extends PHPUnit\Framework\TestCase { */ public function test__construct_whenInputContainsInurl_setsInurlValue(string $input, ?array $inurl_value, ?array $search_value): void { $search = new FreshRSS_Search($input); - $this->assertEquals($inurl_value, $search->getInurl()); - $this->assertEquals($search_value, $search->getSearch()); + self::assertEquals($inurl_value, $search->getInurl()); + self::assertEquals($search_value, $search->getSearch()); } /** @@ -138,8 +138,8 @@ class SearchTest extends PHPUnit\Framework\TestCase { */ public function test__construct_whenInputContainsDate_setsDateValues(string $input, ?int $min_date_value, ?int $max_date_value): void { $search = new FreshRSS_Search($input); - $this->assertEquals($min_date_value, $search->getMinDate()); - $this->assertEquals($max_date_value, $search->getMaxDate()); + self::assertEquals($min_date_value, $search->getMinDate()); + self::assertEquals($max_date_value, $search->getMaxDate()); } /** @@ -161,8 +161,8 @@ class SearchTest extends PHPUnit\Framework\TestCase { */ public function test__construct_whenInputContainsPubdate_setsPubdateValues(string $input, ?int $min_pubdate_value, ?int $max_pubdate_value): void { $search = new FreshRSS_Search($input); - $this->assertEquals($min_pubdate_value, $search->getMinPubdate()); - $this->assertEquals($max_pubdate_value, $search->getMaxPubdate()); + self::assertEquals($min_pubdate_value, $search->getMinPubdate()); + self::assertEquals($max_pubdate_value, $search->getMaxPubdate()); } /** @@ -186,8 +186,8 @@ class SearchTest extends PHPUnit\Framework\TestCase { */ public function test__construct_whenInputContainsTags_setsTagsValue(string $input, ?array $tags_value, ?array $search_value): void { $search = new FreshRSS_Search($input); - $this->assertEquals($tags_value, $search->getTags()); - $this->assertEquals($search_value, $search->getSearch()); + self::assertEquals($tags_value, $search->getTags()); + self::assertEquals($search_value, $search->getSearch()); } /** @@ -218,16 +218,16 @@ class SearchTest extends PHPUnit\Framework\TestCase { ?int $max_date_value, ?array $intitle_value, ?array $inurl_value, ?int $min_pubdate_value, ?int $max_pubdate_value, ?array $tags_value, ?array $search_value): void { $search = new FreshRSS_Search($input); - $this->assertEquals($author_value, $search->getAuthor()); - $this->assertEquals($min_date_value, $search->getMinDate()); - $this->assertEquals($max_date_value, $search->getMaxDate()); - $this->assertEquals($intitle_value, $search->getIntitle()); - $this->assertEquals($inurl_value, $search->getInurl()); - $this->assertEquals($min_pubdate_value, $search->getMinPubdate()); - $this->assertEquals($max_pubdate_value, $search->getMaxPubdate()); - $this->assertEquals($tags_value, $search->getTags()); - $this->assertEquals($search_value, $search->getSearch()); - $this->assertEquals($input, $search->getRawInput()); + self::assertEquals($author_value, $search->getAuthor()); + self::assertEquals($min_date_value, $search->getMinDate()); + self::assertEquals($max_date_value, $search->getMaxDate()); + self::assertEquals($intitle_value, $search->getIntitle()); + self::assertEquals($inurl_value, $search->getInurl()); + self::assertEquals($min_pubdate_value, $search->getMinPubdate()); + self::assertEquals($max_pubdate_value, $search->getMaxPubdate()); + self::assertEquals($tags_value, $search->getTags()); + self::assertEquals($search_value, $search->getSearch()); + self::assertEquals($input, $search->getRawInput()); } /** @return array<array<mixed>> */ @@ -290,8 +290,8 @@ class SearchTest extends PHPUnit\Framework\TestCase { */ public function test__construct_parentheses(string $input, string $sql, array $values): void { list($filterValues, $filterSearch) = FreshRSS_EntryDAOPGSQL::sqlBooleanSearch('e.', new FreshRSS_BooleanSearch($input)); - $this->assertEquals($sql, $filterSearch); - $this->assertEquals($values, $filterValues); + self::assertEquals($sql, $filterSearch); + self::assertEquals($values, $filterValues); } /** @return array<array<mixed>> */ diff --git a/tests/app/Models/UserQueryTest.php b/tests/app/Models/UserQueryTest.php index c227024a9..aa66b1447 100644 --- a/tests/app/Models/UserQueryTest.php +++ b/tests/app/Models/UserQueryTest.php @@ -8,15 +8,15 @@ class UserQueryTest extends PHPUnit\Framework\TestCase { public function test__construct_whenAllQuery_storesAllParameters(): void { $query = array('get' => 'a'); $user_query = new FreshRSS_UserQuery($query); - $this->assertEquals('all', $user_query->getGetName()); - $this->assertEquals('all', $user_query->getGetType()); + self::assertEquals('all', $user_query->getGetName()); + self::assertEquals('all', $user_query->getGetType()); } public function test__construct_whenFavoriteQuery_storesFavoriteParameters(): void { $query = array('get' => 's'); $user_query = new FreshRSS_UserQuery($query); - $this->assertEquals('favorite', $user_query->getGetName()); - $this->assertEquals('favorite', $user_query->getGetType()); + self::assertEquals('favorite', $user_query->getGetName()); + self::assertEquals('favorite', $user_query->getGetType()); } public function test__construct_whenCategoryQueryAndNoDao_throwsException(): void { @@ -31,20 +31,20 @@ class UserQueryTest extends PHPUnit\Framework\TestCase { $category_name = 'some category name'; /** @var FreshRSS_Category&PHPUnit\Framework\MockObject\MockObject */ $cat = $this->createMock(FreshRSS_Category::class); - $cat->expects($this->atLeastOnce()) + $cat->expects(self::atLeastOnce()) ->method('name') ->withAnyParameters() ->willReturn($category_name); /** @var FreshRSS_CategoryDAO&PHPUnit\Framework\MockObject\MockObject */ $cat_dao = $this->createMock(FreshRSS_CategoryDAO::class); - $cat_dao->expects($this->atLeastOnce()) + $cat_dao->expects(self::atLeastOnce()) ->method('searchById') ->withAnyParameters() ->willReturn($cat); $query = array('get' => 'c_1'); $user_query = new FreshRSS_UserQuery($query, null, $cat_dao); - $this->assertEquals($category_name, $user_query->getGetName()); - $this->assertEquals('category', $user_query->getGetType()); + self::assertEquals($category_name, $user_query->getGetName()); + self::assertEquals('category', $user_query->getGetType()); } public function test__construct_whenFeedQueryAndNoDao_throwsException(): void { @@ -59,61 +59,60 @@ class UserQueryTest extends PHPUnit\Framework\TestCase { $feed_name = 'some feed name'; /** @var FreshRSS_Feed&PHPUnit\Framework\MockObject\MockObject */ $feed = $this->createMock(FreshRSS_Feed::class); - $feed->expects($this->atLeastOnce()) + $feed->expects(self::atLeastOnce()) ->method('name') ->withAnyParameters() ->willReturn($feed_name); /** @var FreshRSS_FeedDAO&PHPUnit\Framework\MockObject\MockObject */ $feed_dao = $this->createMock(FreshRSS_FeedDAO::class); - $feed_dao->expects($this->atLeastOnce()) + $feed_dao->expects(self::atLeastOnce()) ->method('searchById') ->withAnyParameters() ->willReturn($feed); $query = array('get' => 'f_1'); $user_query = new FreshRSS_UserQuery($query, $feed_dao, null); - $this->assertEquals($feed_name, $user_query->getGetName()); - $this->assertEquals('feed', $user_query->getGetType()); + self::assertEquals($feed_name, $user_query->getGetName()); + self::assertEquals('feed', $user_query->getGetType()); } public function test__construct_whenUnknownQuery_doesStoreParameters(): void { $query = array('get' => 'q'); $user_query = new FreshRSS_UserQuery($query); - $this->assertEmpty($user_query->getGetName()); - $this->assertEmpty($user_query->getGetType()); + self::assertEmpty($user_query->getGetName()); + self::assertEmpty($user_query->getGetType()); } public function test__construct_whenName_storesName(): void { $name = 'some name'; $query = array('name' => $name); $user_query = new FreshRSS_UserQuery($query); - $this->assertEquals($name, $user_query->getName()); + self::assertEquals($name, $user_query->getName()); } public function test__construct_whenOrder_storesOrder(): void { $order = 'some order'; $query = array('order' => $order); $user_query = new FreshRSS_UserQuery($query); - $this->assertEquals($order, $user_query->getOrder()); + self::assertEquals($order, $user_query->getOrder()); } public function test__construct_whenState_storesState(): void { $state = FreshRSS_Entry::STATE_ALL; $query = array('state' => $state); $user_query = new FreshRSS_UserQuery($query); - $this->assertEquals($state, $user_query->getState()); + self::assertEquals($state, $user_query->getState()); } public function test__construct_whenUrl_storesUrl(): void { $url = 'some url'; $query = array('url' => $url); $user_query = new FreshRSS_UserQuery($query); - $this->assertEquals($url, $user_query->getUrl()); + self::assertEquals($url, $user_query->getUrl()); } public function testToArray_whenNoData_returnsEmptyArray(): void { $user_query = new FreshRSS_UserQuery(array()); - $this->assertIsIterable($user_query->toArray()); - $this->assertCount(0, $user_query->toArray()); + self::assertCount(0, $user_query->toArray()); } public function testToArray_whenData_returnsArray(): void { @@ -126,9 +125,8 @@ class UserQueryTest extends PHPUnit\Framework\TestCase { 'url' => 'some url', ); $user_query = new FreshRSS_UserQuery($query); - $this->assertIsIterable($user_query->toArray()); - $this->assertCount(6, $user_query->toArray()); - $this->assertEquals($query, $user_query->toArray()); + self::assertCount(6, $user_query->toArray()); + self::assertEquals($query, $user_query->toArray()); } public function testHasSearch_whenSearch_returnsTrue(): void { @@ -136,30 +134,30 @@ class UserQueryTest extends PHPUnit\Framework\TestCase { 'search' => 'some search', ); $user_query = new FreshRSS_UserQuery($query); - $this->assertTrue($user_query->hasSearch()); + self::assertTrue($user_query->hasSearch()); } public function testHasSearch_whenNoSearch_returnsFalse(): void { $user_query = new FreshRSS_UserQuery(array()); - $this->assertFalse($user_query->hasSearch()); + self::assertFalse($user_query->hasSearch()); } public function testHasParameters_whenAllQuery_returnsFalse(): void { $query = array('get' => 'a'); $user_query = new FreshRSS_UserQuery($query); - $this->assertFalse($user_query->hasParameters()); + self::assertFalse($user_query->hasParameters()); } public function testHasParameters_whenNoParameter_returnsFalse(): void { $query = array(); $user_query = new FreshRSS_UserQuery($query); - $this->assertFalse($user_query->hasParameters()); + self::assertFalse($user_query->hasParameters()); } public function testHasParameters_whenParameter_returnTrue(): void { $query = array('get' => 's'); $user_query = new FreshRSS_UserQuery($query); - $this->assertTrue($user_query->hasParameters()); + self::assertTrue($user_query->hasParameters()); } public function testIsDeprecated_whenCategoryExists_returnFalse(): void { @@ -167,25 +165,25 @@ class UserQueryTest extends PHPUnit\Framework\TestCase { $cat = $this->createMock(FreshRSS_Category::class); /** @var FreshRSS_CategoryDAO&PHPUnit\Framework\MockObject\MockObject */ $cat_dao = $this->createMock(FreshRSS_CategoryDAO::class); - $cat_dao->expects($this->atLeastOnce()) + $cat_dao->expects(self::atLeastOnce()) ->method('searchById') ->withAnyParameters() ->willReturn($cat); $query = array('get' => 'c_1'); $user_query = new FreshRSS_UserQuery($query, null, $cat_dao); - $this->assertFalse($user_query->isDeprecated()); + self::assertFalse($user_query->isDeprecated()); } public function testIsDeprecated_whenCategoryDoesNotExist_returnTrue(): void { /** @var FreshRSS_CategoryDAO&PHPUnit\Framework\MockObject\MockObject */ $cat_dao = $this->createMock(FreshRSS_CategoryDAO::class); - $cat_dao->expects($this->atLeastOnce()) + $cat_dao->expects(self::atLeastOnce()) ->method('searchById') ->withAnyParameters() ->willReturn(null); $query = array('get' => 'c_1'); $user_query = new FreshRSS_UserQuery($query, null, $cat_dao); - $this->assertTrue($user_query->isDeprecated()); + self::assertTrue($user_query->isDeprecated()); } public function testIsDeprecated_whenFeedExists_returnFalse(): void { @@ -193,43 +191,43 @@ class UserQueryTest extends PHPUnit\Framework\TestCase { $feed = $this->createMock(FreshRSS_Feed::class); /** @var FreshRSS_FeedDAO&PHPUnit\Framework\MockObject\MockObject */ $feed_dao = $this->createMock(FreshRSS_FeedDAO::class); - $feed_dao->expects($this->atLeastOnce()) + $feed_dao->expects(self::atLeastOnce()) ->method('searchById') ->withAnyParameters() ->willReturn($feed); $query = array('get' => 'f_1'); $user_query = new FreshRSS_UserQuery($query, $feed_dao, null); - $this->assertFalse($user_query->isDeprecated()); + self::assertFalse($user_query->isDeprecated()); } public function testIsDeprecated_whenFeedDoesNotExist_returnTrue(): void { /** @var FreshRSS_FeedDAO&PHPUnit\Framework\MockObject\MockObject */ $feed_dao = $this->createMock(FreshRSS_FeedDAO::class); - $feed_dao->expects($this->atLeastOnce()) + $feed_dao->expects(self::atLeastOnce()) ->method('searchById') ->withAnyParameters() ->willReturn(null); $query = array('get' => 'f_1'); $user_query = new FreshRSS_UserQuery($query, $feed_dao, null); - $this->assertTrue($user_query->isDeprecated()); + self::assertTrue($user_query->isDeprecated()); } public function testIsDeprecated_whenAllQuery_returnFalse(): void { $query = array('get' => 'a'); $user_query = new FreshRSS_UserQuery($query); - $this->assertFalse($user_query->isDeprecated()); + self::assertFalse($user_query->isDeprecated()); } public function testIsDeprecated_whenFavoriteQuery_returnFalse(): void { $query = array('get' => 's'); $user_query = new FreshRSS_UserQuery($query); - $this->assertFalse($user_query->isDeprecated()); + self::assertFalse($user_query->isDeprecated()); } public function testIsDeprecated_whenUnknownQuery_returnFalse(): void { $query = array('get' => 'q'); $user_query = new FreshRSS_UserQuery($query); - $this->assertFalse($user_query->isDeprecated()); + self::assertFalse($user_query->isDeprecated()); } } diff --git a/tests/app/Utils/passwordUtilTest.php b/tests/app/Utils/passwordUtilTest.php index 113476c63..e2fe78b97 100644 --- a/tests/app/Utils/passwordUtilTest.php +++ b/tests/app/Utils/passwordUtilTest.php @@ -6,7 +6,7 @@ class passwordUtilTest extends PHPUnit\Framework\TestCase { $ok = FreshRSS_password_Util::check($password); - $this->assertTrue($ok); + self::assertTrue($ok); } public function testCheckReturnsFalseIfEmpty(): void { @@ -14,7 +14,7 @@ class passwordUtilTest extends PHPUnit\Framework\TestCase { $ok = FreshRSS_password_Util::check($password); - $this->assertFalse($ok); + self::assertFalse($ok); } public function testCheckReturnsFalseIfLessThan7Characters(): void { @@ -22,6 +22,6 @@ class passwordUtilTest extends PHPUnit\Framework\TestCase { $ok = FreshRSS_password_Util::check($password); - $this->assertFalse($ok); + self::assertFalse($ok); } } |
