Report always true/false comparison against null only for native properties without native type

Author: ondrejmirtes

src/Analyser/MutatingScope.php

@@ -2781,23 +2781,6 @@ private function promoteNativeTypes(): self
 		);
 	}
 
-	/**
-	 * @param Node\Expr\PropertyFetch|Node\Expr\StaticPropertyFetch $propertyFetch
-	 */
-	public function hasPropertyNativeType($propertyFetch): bool
-	{
-		$propertyReflection = $this->propertyReflectionFinder->findPropertyReflectionFromNode($propertyFetch, $this);
-		if ($propertyReflection === null) {
-			return false;
-		}
-
-		if (!$propertyReflection->isNative()) {
-			return false;
-		}
-
-		return $propertyReflection->hasNativeType();
-	}
-
 	private function getTypeFromArrayDimFetch(
 		Expr\ArrayDimFetch $arrayDimFetch,
 		Type $offsetType,

src/Analyser/RicherScopeGetTypeHelper.php

@@ -7,6 +7,7 @@
 use PhpParser\Node\Expr\Variable;
 use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\InitializerExprTypeResolver;
+use PHPStan\Rules\Properties\PropertyReflectionFinder;
 use PHPStan\Type\BooleanType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\TypeResult;
@@ -16,7 +17,10 @@
 final class RicherScopeGetTypeHelper
 {
 
-	public function __construct(private InitializerExprTypeResolver $initializerExprTypeResolver)
+	public function __construct(
+		private InitializerExprTypeResolver $initializerExprTypeResolver,
+		private PropertyReflectionFinder $propertyReflectionFinder,
+	)
 	{
 	}
 
@@ -48,9 +52,13 @@ public function getIdenticalResult(Scope $scope, Identical $expr): TypeResult
 				|| $expr->left instanceof Node\Expr\StaticPropertyFetch
 			)
 			&& $rightType->isNull()->yes()
-			&& !$scope->hasPropertyNativeType($expr->left)
 		) {
-			return new TypeResult(new BooleanType(), []);
+			$foundPropertyReflections = $this->propertyReflectionFinder->findPropertyReflectionsFromNode($expr->left, $scope);
+			foreach ($foundPropertyReflections as $foundPropertyReflection) {
+				if ($foundPropertyReflection->isNative() && !$foundPropertyReflection->hasNativeType()) {
+					return new TypeResult(new BooleanType(), []);
+				}
+			}
 		}
 
 		if (
@@ -59,9 +67,13 @@ public function getIdenticalResult(Scope $scope, Identical $expr): TypeResult
 				|| $expr->right instanceof Node\Expr\StaticPropertyFetch
 			)
 			&& $leftType->isNull()->yes()
-			&& !$scope->hasPropertyNativeType($expr->right)
 		) {
-			return new TypeResult(new BooleanType(), []);
+			$foundPropertyReflections = $this->propertyReflectionFinder->findPropertyReflectionsFromNode($expr->right, $scope);
+			foreach ($foundPropertyReflections as $foundPropertyReflection) {
+				if ($foundPropertyReflection->isNative() && !$foundPropertyReflection->hasNativeType()) {
+					return new TypeResult(new BooleanType(), []);
+				}
+			}
 		}
 
 		return $this->initializerExprTypeResolver->resolveIdenticalType($leftType, $rightType);

src/Testing/PHPStanTestCase.php

@@ -162,7 +162,7 @@ public static function createScopeFactory(ReflectionProvider $reflectionProvider
 				new PropertyReflectionFinder(),
 				self::getParser(),
 				$container->getByType(NodeScopeResolver::class),
-				new RicherScopeGetTypeHelper($initializerExprTypeResolver),
+				new RicherScopeGetTypeHelper($initializerExprTypeResolver, new PropertyReflectionFinder()),
 				$container->getByType(PhpVersion::class),
 				$container->getByType(AttributeReflectionFactory::class),
 				$container->getParameter('phpVersion'),

tests/PHPStan/Rules/Comparison/StrictComparisonOfDifferentTypesRuleTest.php

@@ -1029,4 +1029,15 @@ public function testBug13208(): void
 		$this->analyse([__DIR__ . '/data/bug-13208.php'], []);
 	}
 
+	public function testBug11609(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-11609.php'], [
+			[
+				'Strict comparison using !== between string and null will always evaluate to true.',
+				10,
+				'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%</>.',
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/Comparison/data/bug-11609.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Bug11609;
+
+class HelloWorld
+{
+	/** @param object{hello: string, world?: string} $a */
+	public function sayHello(object $a, string $b): void
+	{
+		if ($a->hello !== null) {
+			echo 'hello';
+		}
+		if ($a->world !== null) {
+
+		}
+	}
+}