update to PHPStan 1.8 & strict rules 1.3

nextras · Jul 11, 2022 · bdafb59 · bdafb59
1 parent 1fbc39d
commit bdafb59
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 17 deletions.
diff --git a/composer.json b/composer.json
@@ -36,11 +36,11 @@
 		"marc-mabe/php-enum": "~3.0",
 		"mockery/mockery": "~1.2",
 		"phpstan/extension-installer": "1.1.0",
-		"phpstan/phpstan": "1.7.10",
+		"phpstan/phpstan": "1.8.0",
 		"phpstan/phpstan-deprecation-rules": "1.0.0",
 		"phpstan/phpstan-nette": "1.0.0",
 		"phpstan/phpstan-mockery": "1.1.0",
-		"phpstan/phpstan-strict-rules": "1.1.0",
+		"phpstan/phpstan-strict-rules": "1.3.0",
 		"nextras/orm-phpstan": "~1.0",
 		"marc-mabe/php-enum-phpstan": "dev-master",
 		"tracy/tracy": "~2.3"

diff --git a/src/Collection/Functions/ConjunctionOperatorFunction.php b/src/Collection/Functions/ConjunctionOperatorFunction.php
@@ -61,7 +61,7 @@ public function processArrayExpression(
 			$callback = $helper->createFilter($arg, $aggregator);
 			$valueReference = $callback($entity);
 			if ($valueReference->aggregator === null) {
-				if ($valueReference->value == false) {
+				if ($valueReference->value == false) { // @phpstan-ignore-line Loose comparison https://github.com/nextras/orm/issues/586
 					return new ArrayPropertyValueReference(
 					/* $result = */false,
 						null,
@@ -93,7 +93,7 @@ public function processArrayExpression(
 
 			$aggregator = $aggregators[$key];
 			$result = $aggregator->aggregateValues($valuesBatch);
-			if ($result == false) {
+			if ($result == false) { // @phpstan-ignore-line Loose comparison https://github.com/nextras/orm/issues/586
 				return new ArrayPropertyValueReference(
 				/* $result = */false,
 					null,

diff --git a/src/Collection/Functions/DisjunctionOperatorFunction.php b/src/Collection/Functions/DisjunctionOperatorFunction.php
@@ -54,7 +54,7 @@ public function processArrayExpression(
 			$callback = $helper->createFilter($arg, $aggregator);
 			$valueReference = $callback($entity);
 			if ($valueReference->aggregator === null) {
-				if ($valueReference->value == true) {
+				if ($valueReference->value == true) { // @phpstan-ignore-line Loose comparison https://github.com/nextras/orm/issues/586
 					return new ArrayPropertyValueReference(
 					/* $result = */true,
 						null,
@@ -86,7 +86,7 @@ public function processArrayExpression(
 
 			$aggregator = $aggregators[$key];
 			$result = $aggregator->aggregateValues($valuesBatch);
-			if ($result == true) {
+			if ($result == true) { // @phpstan-ignore-line Loose comparison https://github.com/nextras/orm/issues/586
 				return new ArrayPropertyValueReference(
 				/* $result = */true,
 					null,

diff --git a/src/Model/Model.php b/src/Model/Model.php
@@ -259,9 +259,9 @@ public function &__get(string $name): IRepository
 
 	/**
 	 * @return IRepository[]
-	 * @phpstan-return list<IRepository<IEntity>>>
+	 * @phpstan-return list<IRepository<IEntity>>
 	 */
-	private function getLoadedRepositories()
+	private function getLoadedRepositories(): array
 	{
 		$repositories = [];
 		foreach (array_keys($this->configuration[0]) as $className) {

diff --git a/tests/cases/integration/BridgeNetteDI/dic-extension-order.phpt b/tests/cases/integration/BridgeNetteDI/dic-extension-order.phpt
@@ -31,5 +31,5 @@ function buildDic(string $config): Container
 }
 
 $container = buildDic(__DIR__ . '/dic-extension-order.neon');
-Assert::true($container->getByType(IModel::class) != null);
+Assert::count(1, $container->findByType(IModel::class));
 Assert::type(Model::class, $container->getByType(IModel::class));
diff --git a/tests/cases/unit/Entity/AbstractEntity.is_modified.phpt b/tests/cases/unit/Entity/AbstractEntity.is_modified.phpt
@@ -9,7 +9,6 @@ namespace NextrasTests\Orm\Entity\Fragments;
 
 use Mockery;
 use Nextras\Orm\Entity\AbstractEntity;
-use Nextras\Orm\Entity\IEntity;
 use Nextras\Orm\Entity\Reflection\EntityMetadata;
 use Nextras\Orm\Entity\Reflection\PropertyMetadata;
 use Nextras\Orm\Repository\IRepository;
@@ -20,7 +19,7 @@ use Tester\Assert;
 require_once __DIR__ . '/../../../bootstrap.php';
 
 
-abstract class DataEntityFragmentIsModifiedTest extends AbstractEntity
+class DataEntityFragmentIsModifiedTest extends AbstractEntity
 {
 	public function __construct(EntityMetadata $metadata)
 	{
@@ -44,10 +43,7 @@ class AbstractEntityIsModifiedTest extends TestCase
 		$metadata = Mockery::mock(EntityMetadata::class);
 		$metadata->shouldReceive('getProperty')->with('property');
 
-		/** @var DataEntityFragmentIsModifiedTest $entity */
-		$entity = Mockery::mock(DataEntityFragmentIsModifiedTest::class)->makePartial();
-		$entity->__construct($metadata);
-
+		$entity = new DataEntityFragmentIsModifiedTest($metadata);
 		Assert::true($entity->isModified());
 		Assert::true($entity->isModified('property'));
 	}

diff --git a/tests/cases/unit/Mapper/Dbal/DbalValueOperatorFunctionTest.phpt b/tests/cases/unit/Mapper/Dbal/DbalValueOperatorFunctionTest.phpt
@@ -47,7 +47,7 @@ class DbalValueOperatorFunctionTest extends TestCase
 
 
 	/**
-	 * @return array<array{BaseCompareFunction, array<mixed>, array<mixed>}>>
+	 * @return array<array{BaseCompareFunction, array<mixed>, array<mixed>}>
 	 */
 	protected function operatorTestProvider(): array
 	{

diff --git a/tests/inc/model/author/AuthorsMapper.php b/tests/inc/model/author/AuthorsMapper.php
@@ -3,6 +3,7 @@
 namespace NextrasTests\Orm;
 
 
+use Nextras\Dbal\Platforms\PostgreSqlPlatform;
 use Nextras\Orm\Mapper\Dbal\DbalMapper;
 
 
@@ -13,7 +14,7 @@ final class AuthorsMapper extends DbalMapper
 {
 	public function getTableName(): string
 	{
-		if ($this->connection->getPlatform()->getName() == 'pgsql') {
+		if ($this->connection->getPlatform()->getName() === PostgreSqlPlatform::NAME) {
 			return 'public.authors';
 		} else {
 			return 'authors';