A few additional PHPStan rules (#5388)

A subset of
https://github.com/phpstan/phpstan-strict-rules

1 files changed, 37 insertions, 39 deletions

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());
 	}
 
 }