Merge remote-tracking branch 'origin/1.12.x' into 2.1.x

Author: ondrejmirtes

src/Rules/Comparison/ImpossibleCheckTypeFunctionCallRule.php

@@ -8,6 +8,7 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
 use function sprintf;
+use function strtolower;
 
 /**
  * @implements Rule<Node\Expr\FuncCall>
@@ -36,6 +37,9 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		$functionName = (string) $node->name;
+		if (strtolower($functionName) === 'is_a') {
+			return [];
+		}
 		$isAlways = $this->impossibleCheckTypeHelper->findSpecifiedType($scope, $node);
 		if ($isAlways === null) {
 			return [];

src/Type/Php/IsAFunctionTypeSpecifyingExtension.php

@@ -9,12 +9,9 @@
 use PHPStan\Analyser\TypeSpecifierAwareExtension;
 use PHPStan\Analyser\TypeSpecifierContext;
 use PHPStan\Reflection\FunctionReflection;
-use PHPStan\Type\ClassStringType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\FunctionTypeSpecifyingExtension;
-use PHPStan\Type\ObjectWithoutClassType;
-use PHPStan\Type\TypeCombinator;
 use function count;
 use function strtolower;
 
@@ -50,20 +47,9 @@ public function specifyTypes(FunctionReflection $functionReflection, FuncCall $n
 		$allowStringType = isset($node->getArgs()[2]) ? $scope->getType($node->getArgs()[2]->value) : new ConstantBooleanType(false);
 		$allowString = !$allowStringType->equals(new ConstantBooleanType(false));
 
-		$superType = $allowString
-			? TypeCombinator::union(new ObjectWithoutClassType(), new ClassStringType())
-			: new ObjectWithoutClassType();
-
-		$resultType = $this->isAFunctionTypeSpecifyingHelper->determineType($objectOrClassType, $classType, $allowString, true);
-
-		// prevent false-positives in IsAFunctionTypeSpecifyingHelper
-		if ($resultType->equals($superType) && $resultType->isSuperTypeOf($objectOrClassType)->yes()) {
-			return new SpecifiedTypes([], []);
-		}
-
 		return $this->typeSpecifier->create(
 			$node->getArgs()[0]->value,
-			$resultType,
+			$this->isAFunctionTypeSpecifyingHelper->determineType($objectOrClassType, $classType, $allowString, true),
 			$context,
 			$scope,
 		);

src/Type/Php/IsSubclassOfFunctionTypeSpecifyingExtension.php

@@ -9,12 +9,9 @@
 use PHPStan\Analyser\TypeSpecifierAwareExtension;
 use PHPStan\Analyser\TypeSpecifierContext;
 use PHPStan\Reflection\FunctionReflection;
-use PHPStan\Type\ClassStringType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\FunctionTypeSpecifyingExtension;
 use PHPStan\Type\Generic\GenericClassStringType;
-use PHPStan\Type\ObjectWithoutClassType;
-use PHPStan\Type\TypeCombinator;
 use function count;
 use function strtolower;
 
@@ -51,20 +48,9 @@ public function specifyTypes(FunctionReflection $functionReflection, FuncCall $n
 			return new SpecifiedTypes([], []);
 		}
 
-		$superType = $allowString
-			? TypeCombinator::union(new ObjectWithoutClassType(), new ClassStringType())
-			: new ObjectWithoutClassType();
-
-		$resultType = $this->isAFunctionTypeSpecifyingHelper->determineType($objectOrClassType, $classType, $allowString, false);
-
-		// prevent false-positives in IsAFunctionTypeSpecifyingHelper
-		if ($resultType->equals($superType) && $resultType->isSuperTypeOf($objectOrClassType)->yes()) {
-			return new SpecifiedTypes([], []);
-		}
-
 		return $this->typeSpecifier->create(
 			$node->getArgs()[0]->value,
-			$resultType,
+			$this->isAFunctionTypeSpecifyingHelper->determineType($objectOrClassType, $classType, $allowString, false),
 			$context,
 			$scope,
 		);

tests/PHPStan/Analyser/TypeSpecifierTest.php

@@ -1134,7 +1134,9 @@ public function dataCondition(): iterable
 					new Arg(new Variable('stringOrNull')),
 					new Arg(new Expr\ConstFetch(new Name('false'))),
 				]),
-				[],
+				[
+					'$object' => 'object',
+				],
 				[],
 			],
 			[

tests/PHPStan/Rules/Comparison/ImpossibleCheckTypeFunctionCallRuleTest.php

@@ -955,26 +955,4 @@ public function testAlwaysTruePregMatch(): void
 		$this->analyse([__DIR__ . '/data/always-true-preg-match.php'], []);
 	}
 
-	public function testBug3979(): void
-	{
-		$this->treatPhpDocTypesAsCertain = true;
-		$this->analyse([__DIR__ . '/data/bug-3979.php'], []);
-	}
-
-	public function testBug8464(): void
-	{
-		if (PHP_VERSION_ID < 80000) {
-			$this->markTestSkipped('Test requires PHP 8.0.');
-		}
-
-		$this->treatPhpDocTypesAsCertain = true;
-		$this->analyse([__DIR__ . '/data/bug-8464.php'], []);
-	}
-
-	public function testBug8954(): void
-	{
-		$this->treatPhpDocTypesAsCertain = true;
-		$this->analyse([__DIR__ . '/data/bug-8954.php'], []);
-	}
-
 }