Merge branch '4.6'

Author: adamwojs

composer.json

@@ -21,9 +21,9 @@
         "ibexa/code-style": "~2.0.0",
         "ibexa/doctrine-schema": "~5.0.x-dev",
         "ibexa/rector": "~5.0.x-dev",
-        "phpstan/phpstan": "^1.10",
-        "phpstan/phpstan-phpunit": "^1.3",
-        "phpstan/phpstan-symfony": "^1.3",
+        "phpstan/phpstan": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0",
+        "phpstan/phpstan-symfony": "^2.0",
         "phpunit/phpunit": "^9.0",
         "qossmic/deptrac-shim": "^0.24.0 || ^1.0.2"
     },

phpstan-baseline.neon

@@ -0,0 +1,37 @@
+parameters:
+	ignoreErrors:
+		-
+			message: '#^Call to function assert\(\) with true will always evaluate to true\.$#'
+			identifier: function.alreadyNarrowedType
+			count: 1
+			path: src/contracts/Persistence/CriterionMapper/AbstractFieldCriterionMapper.php
+
+		-
+			message: '#^Instanceof between T of Ibexa\\Contracts\\CoreSearch\\Values\\Query\\Criterion\\FieldValueCriterion and Ibexa\\Contracts\\CoreSearch\\Values\\Query\\Criterion\\FieldValueCriterion will always evaluate to true\.$#'
+			identifier: instanceof.alwaysTrue
+			count: 1
+			path: src/contracts/Persistence/CriterionMapper/AbstractFieldCriterionMapper.php
+
+		-
+			message: '#^Method Ibexa\\CoreSearch\\CriterionMapper\\LogicalAndCriterionMapper\:\:getType\(\) never returns ''NOT'' so it can be removed from the return type\.$#'
+			identifier: return.unusedType
+			count: 1
+			path: src/lib/CriterionMapper/LogicalAndCriterionMapper.php
+
+		-
+			message: '#^Method Ibexa\\CoreSearch\\CriterionMapper\\LogicalAndCriterionMapper\:\:getType\(\) never returns ''OR'' so it can be removed from the return type\.$#'
+			identifier: return.unusedType
+			count: 1
+			path: src/lib/CriterionMapper/LogicalAndCriterionMapper.php
+
+		-
+			message: '#^Method Ibexa\\CoreSearch\\CriterionMapper\\LogicalOrCriterionMapper\:\:getType\(\) never returns ''AND'' so it can be removed from the return type\.$#'
+			identifier: return.unusedType
+			count: 1
+			path: src/lib/CriterionMapper/LogicalOrCriterionMapper.php
+
+		-
+			message: '#^Method Ibexa\\CoreSearch\\CriterionMapper\\LogicalOrCriterionMapper\:\:getType\(\) never returns ''NOT'' so it can be removed from the return type\.$#'
+			identifier: return.unusedType
+			count: 1
+			path: src/lib/CriterionMapper/LogicalOrCriterionMapper.php

phpstan.neon

@@ -1,6 +1,7 @@
 includes:
     - vendor/phpstan/phpstan-phpunit/extension.neon
     - vendor/phpstan/phpstan-symfony/extension.neon
+    - phpstan-baseline.neon
 
 parameters:
     level: 8