Fixes

Author: ondrejmirtes

phpstan-baseline.neon

@@ -340,6 +340,14 @@ parameters:
 			count: 1
 			path: src/Reflection/SignatureMap/Php8SignatureMapProvider.php
 
+		-
+			message: """
+				#^Call to deprecated method doNotTreatPhpDocTypesAsCertain\\(\\) of class PHPStan\\\\Analyser\\\\Scope\\:
+				Use getNativeType\\(\\)$#
+			"""
+			count: 1
+			path: src/Rules/Comparison/ImpossibleCheckTypeHelper.php
+
 		-
 			message: "#^Function class_implements\\(\\) is a runtime reflection concept that might not work in PHPStan because it uses fully static reflection engine\\. Use objects retrieved from ReflectionProvider instead\\.$#"
 			count: 1

src/Rules/Classes/ImpossibleInstanceOfRule.php

@@ -74,10 +74,12 @@ public function processNode(Node $node, Scope $scope): array
 		};
 
 		if (!$instanceofType->getValue()) {
+			$exprType = $this->treatPhpDocTypesAsCertain ? $scope->getType($node->expr) : $scope->getNativeType($node->expr);
+
 			return [
 				$addTip(RuleErrorBuilder::message(sprintf(
 					'Instanceof between %s and %s will always evaluate to false.',
-					$scope->getType($node->expr)->describe(VerbosityLevel::typeOnly()),
+					$exprType->describe(VerbosityLevel::typeOnly()),
 					$classType->describe(VerbosityLevel::getRecommendedLevelByType($classType)),
 				)))->build(),
 			];
@@ -86,10 +88,12 @@ public function processNode(Node $node, Scope $scope): array
 				return [];
 			}
 
+			$exprType = $this->treatPhpDocTypesAsCertain ? $scope->getType($node->expr) : $scope->getNativeType($node->expr);
+
 			return [
 				$addTip(RuleErrorBuilder::message(sprintf(
 					'Instanceof between %s and %s will always evaluate to true.',
-					$scope->getType($node->expr)->describe(VerbosityLevel::typeOnly()),
+					$exprType->describe(VerbosityLevel::typeOnly()),
 					$classType->describe(VerbosityLevel::getRecommendedLevelByType($classType)),
 				)))->build(),
 			];

src/Rules/Comparison/ImpossibleCheckTypeHelper.php

@@ -187,7 +187,8 @@ public function findSpecifiedType(
 			}
 		}
 
-		$specifiedTypes = $this->typeSpecifier->specifyTypesInCondition($scope, $node, $this->determineContext($scope, $node));
+		$typeSpecifierScope = $this->treatPhpDocTypesAsCertain ? $scope : $scope->doNotTreatPhpDocTypesAsCertain();
+		$specifiedTypes = $this->typeSpecifier->specifyTypesInCondition($typeSpecifierScope, $node, $this->determineContext($typeSpecifierScope, $node));
 
 		// don't validate types on overwrite
 		if ($specifiedTypes->shouldOverwrite()) {
@@ -199,7 +200,7 @@ public function findSpecifiedType(
 
 		$rootExpr = $specifiedTypes->getRootExpr();
 		if ($rootExpr !== null) {
-			if (self::isSpecified($scope, $node, $rootExpr)) {
+			if (self::isSpecified($typeSpecifierScope, $node, $rootExpr)) {
 				return null;
 			}
 
@@ -214,7 +215,7 @@ public function findSpecifiedType(
 		$results = [];
 
 		foreach ($sureTypes as $sureType) {
-			if (self::isSpecified($scope, $node, $sureType[0])) {
+			if (self::isSpecified($typeSpecifierScope, $node, $sureType[0])) {
 				$results[] = TrinaryLogic::createMaybe();
 				continue;
 			}
@@ -232,7 +233,7 @@ public function findSpecifiedType(
 		}
 
 		foreach ($sureNotTypes as $sureNotType) {
-			if (self::isSpecified($scope, $node, $sureNotType[0])) {
+			if (self::isSpecified($typeSpecifierScope, $node, $sureNotType[0])) {
 				$results[] = TrinaryLogic::createMaybe();
 				continue;
 			}

tests/PHPStan/Analyser/data/bug-7805.php

@@ -21,12 +21,10 @@ function foo(array $params)
 		assertNativeType("array<mixed~'help', mixed>", $params);
 		$params = $params === [] ? ['list'] : $params;
 		assertType("array{'list'}", $params);
-		assertNativeType("array{'list'}", $params);
-		// assertNativeType("array<mixed~'help', mixed>", $params); // not working yet
+		assertNativeType("non-empty-array<mixed~'help', mixed>", $params);
 		array_unshift($params, 'help');
 		assertType("array{'help', 'list'}", $params);
-		assertNativeType("array{'list'}", $params);
-		// assertNativeType("array<mixed~'help', mixed>", $params); // not working yet
+		assertNativeType("non-empty-array<mixed~'help', mixed>", $params);
 	}
 	assertType("array{}|array{'help', 'list'}", $params);
 	assertNativeType('array', $params);

tests/PHPStan/Rules/Classes/ImpossibleInstanceOfRuleTest.php

@@ -147,14 +147,14 @@ public function testInstanceof(): void
 					'Instanceof between ImpossibleInstanceOf\Bar and ImpossibleInstanceOf\BarGrandChild will always evaluate to false.',
 					322,
 				],
-				[
+				/*[
 					'Instanceof between mixed and int results in an error.',
 					353,
 				],
 				[
 					'Instanceof between mixed and ImpossibleInstanceOf\InvalidTypeTest|int results in an error.',
 					362,
-				],
+				],*/
 				[
 					'Instanceof between ImpossibleInstanceOf\Foo and ImpossibleInstanceOf\Foo will always evaluate to true.',
 					388,
@@ -173,6 +173,7 @@ public function testInstanceof(): void
 				[
 					'Instanceof between class-string<DateTimeInterface> and class-string<DateTimeInterface> will always evaluate to false.',
 					419,
+					$tipText,
 				],
 				[
 					'Instanceof between class-string<DateTimeInterface> and \'DateTimeInterface\' will always evaluate to false.',
@@ -254,14 +255,14 @@ public function testInstanceofWithoutAlwaysTrue(): void
 					'Instanceof between ImpossibleInstanceOf\Bar and ImpossibleInstanceOf\BarGrandChild will always evaluate to false.',
 					322,
 				],
-				[
+				/*[
 					'Instanceof between mixed and int results in an error.',
 					353,
 				],
 				[
 					'Instanceof between mixed and ImpossibleInstanceOf\InvalidTypeTest|int results in an error.',
 					362,
-				],
+				],*/
 				[
 					'Instanceof between T of Exception and Error will always evaluate to false.',
 					404,
@@ -275,6 +276,7 @@ public function testInstanceofWithoutAlwaysTrue(): void
 				[
 					'Instanceof between class-string<DateTimeInterface> and class-string<DateTimeInterface> will always evaluate to false.',
 					419,
+					$tipText,
 				],
 				[
 					'Instanceof between class-string<DateTimeInterface> and \'DateTimeInterface\' will always evaluate to false.',

tests/PHPStan/Rules/Comparison/ImpossibleCheckTypeFunctionCallRuleTest.php

@@ -495,7 +495,7 @@ public function testBugInArrayDateFormat(): void
 			[
 				'Call to function in_array() with arguments \'b\', non-empty-array<int, \'a\'> and true will always evaluate to false.',
 				43,
-				'Because the type is coming from a PHPDoc, you can turn off this check by setting <fg=cyan>treatPhpDocTypesAsCertain: false</> in your <fg=cyan>%configurationFile%</>.',
+				//'Because the type is coming from a PHPDoc, you can turn off this check by setting <fg=cyan>treatPhpDocTypesAsCertain: false</> in your <fg=cyan>%configurationFile%</>.',
 			],
 			[
 				'Call to function in_array() with arguments int, array{} and true will always evaluate to false.',