Improve VarTagTypeRuleHelper according to my taste

ondrejmirtes · ondrejmirtes · commit 42f6c2e64bc0 · 2023-11-16T11:35:29.000+01:00
diff --git a/src/Rules/PhpDoc/VarTagTypeRuleHelper.php b/src/Rules/PhpDoc/VarTagTypeRuleHelper.php
@@ -129,9 +129,20 @@ private function containsPhpStanType(Type $type): bool
 
 	private function shouldVarTagTypeBeReported(Node\Expr $expr, Type $type, Type $varTagType): bool
 	{
-		if ($expr instanceof Expr\Array_ && $expr->items === []) {
-			$type = new ArrayType(new MixedType(), new MixedType());
-			return $type->isSuperTypeOf($varTagType)->no(); // allow annotating empty array with anything that can accept it (e.g. int[]|null)
+		if ($expr instanceof Expr\Array_) {
+			if ($expr->items === []) {
+				$type = new ArrayType(new MixedType(), new MixedType());
+			}
+
+			return $type->isSuperTypeOf($varTagType)->no();
+		}
+
+		if ($expr instanceof Expr\ConstFetch) {
+			return $type->isSuperTypeOf($varTagType)->no();
+		}
+
+		if ($expr instanceof Node\Scalar) {
+			return $type->isSuperTypeOf($varTagType)->no();
 		}
 
 		if ($expr instanceof Expr\New_) {
@@ -160,10 +171,6 @@ private function checkType(Type $type, Type $varTagType): bool
 			return $this->checkType($innerType, $innerVarTagType);
 		}
 
-		if ($type->isConstantValue()->yes()) {
-			return $type->isSuperTypeOf($varTagType)->no();
-		}
-
 		return !$type->isSuperTypeOf($varTagType)->yes();
 	}
 
diff --git a/tests/PHPStan/Rules/PhpDoc/WrongVariableNameInVarTagRuleTest.php b/tests/PHPStan/Rules/PhpDoc/WrongVariableNameInVarTagRuleTest.php
@@ -356,6 +356,10 @@ public function testEmptyArrayInitWithWiderPhpDoc(bool $checkTypeAgainstNativeTy
 		$errors = !$checkTypeAgainstNativeType
 			? []
 			: [
+				[
+					'PHPDoc tag @var with type int|null is not subtype of native type null.',
+					6,
+				],
 				[
 					'PHPDoc tag @var with type int is not subtype of native type array{}.',
 					24,
