forbidPhpDocNullabilityMismatchWithNativeTypehint: fix template handling (#71)

* ForbidPhpDocNullabilityMismatchWithNativeTypehintRule: fix template handling

* improve test

Author: janedbal

src/Rule/ForbidPhpDocNullabilityMismatchWithNativeTypehintRule.php

@@ -6,6 +6,8 @@
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\FunctionLike;
 use PhpParser\Node\Param;
+use PhpParser\Node\Stmt\ClassMethod;
+use PhpParser\Node\Stmt\Function_;
 use PhpParser\Node\Stmt\Property;
 use PHPStan\Analyser\Scope;
 use PHPStan\PhpDoc\ResolvedPhpDocBlock;
@@ -171,7 +173,7 @@ private function resolvePhpDoc(Node $node, Scope $scope): ?ResolvedPhpDocBlock
             $scope->getFile(),
             $scope->getClassReflection() === null ? null : $scope->getClassReflection()->getName(),
             $scope->getTraitReflection() === null ? null : $scope->getTraitReflection()->getName(),
-            $scope->getFunctionName(),
+            $this->getFunctionName($node),
             $docComment->getText(),
         );
     }
@@ -219,4 +221,13 @@ private function comparePhpDocAndNativeType(?Type $phpDocReturnType, ?Type $nati
         return [];
     }
 
+    private function getFunctionName(Node $node): ?string
+    {
+        if ($node instanceof ClassMethod || $node instanceof Function_) {
+            return $node->name->name;
+        }
+
+        return null;
+    }
+
 }

tests/Rule/data/ForbidPhpDocNullabilityMismatchWithNativeTypehintRule/code.php

@@ -85,4 +85,24 @@ public function testConditionTypeForParameter(?float $originalMoney): ?float
         return $originalMoney;
     }
 
+    /**
+     * @template T as string|null
+     * @phpstan-param T $stringOrNullInTemplate
+     * @phpstan-return T
+     */
+    public static function getStringOrNull($stringOrNullInTemplate): ?string
+    {
+        return $stringOrNullInTemplate;
+    }
+
+    /**
+     * @template T as string
+     * @phpstan-param T $stringOrNullInTemplate
+     * @phpstan-return T
+     */
+    public static function getStringMissingNull($stringOrNullInTemplate): ?string // error: The @return phpdoc does not contain null, but native return type does
+    {
+        return $stringOrNullInTemplate;
+    }
+
 }