Merge branch '1.10.x' into 1.11.x

Author: ondrejmirtes

composer.json

@@ -21,9 +21,9 @@
 		"nette/neon": "^3.3.1",
 		"nette/schema": "^1.2.2",
 		"nette/utils": "^3.2.5",
-		"nikic/php-parser": "^4.15.4",
+		"nikic/php-parser": "^4.15.5",
 		"ondram/ci-detector": "^3.4.0",
-		"ondrejmirtes/better-reflection": "6.8.0.1",
+		"ondrejmirtes/better-reflection": "6.11.0.0",
 		"phpstan/php-8-stubs": "0.3.60",
 		"phpstan/phpdoc-parser": "1.22.0",
 		"react/async": "^3",

composer.lock

@@ -277,16 +277,6 @@ parameters:
 			count: 1
 			path: src/Reflection/BetterReflection/BetterReflectionProvider.php
 
-		-
-			message: "#^Dead catch \\- PHPStan\\\\BetterReflection\\\\Reflection\\\\Exception\\\\NotAClassReflection is never thrown in the try block\\.$#"
-			count: 1
-			path: src/Reflection/BetterReflection/BetterReflectionProvider.php
-
-		-
-			message: "#^Dead catch \\- PHPStan\\\\BetterReflection\\\\Reflection\\\\Exception\\\\NotAnInterfaceReflection is never thrown in the try block\\.$#"
-			count: 1
-			path: src/Reflection/BetterReflection/BetterReflectionProvider.php
-
 		-
 			message: """
 				#^Call to deprecated method getTypeFromValue\\(\\) of class PHPStan\\\\Type\\\\ConstantTypeHelper\\:

phpstan-baseline.neon

@@ -95,16 +95,7 @@ public static function isParametersAcceptorSuperTypeOf(
 
 		$theirReturnType = $theirs->getReturnType();
 		if ($treatMixedAsAny) {
-			if (
-				$theirReturnType instanceof MixedType
-				&& !$theirReturnType instanceof TemplateMixedType
-			) {
-				$isReturnTypeSuperType = new AcceptsResult(TrinaryLogic::createYes(), []);
-			} elseif ($theirReturnType instanceof BenevolentUnionType) {
-				$isReturnTypeSuperType = $ours->getReturnType()->acceptsWithReason($theirReturnType, true);
-			} else {
-				$isReturnTypeSuperType = new AcceptsResult($ours->getReturnType()->isSuperTypeOf($theirReturnType), []);
-			}
+			$isReturnTypeSuperType = $ours->getReturnType()->acceptsWithReason($theirReturnType, true);
 		} else {
 			$isReturnTypeSuperType = new AcceptsResult($ours->getReturnType()->isSuperTypeOf($theirReturnType), []);
 		}