[PHPStanStaticTypeMapper] FQCN for Closure type mapper

packages/PHPStanStaticTypeMapper/TypeMapper/ClosureTypeMapper.php

@@ -6,9 +6,13 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Name\FullyQualified;
+use PHPStan\PhpDocParser\Ast\Node as AstNode;
+use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\ClosureType;
 use PHPStan\Type\Type;
+use Rector\BetterPhpDocParser\ValueObject\Type\FullyQualifiedIdentifierTypeNode;
+use Rector\PhpDocParser\PhpDocParser\PhpDocNodeTraverser;
 use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface;
 use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
 
@@ -30,7 +34,22 @@ public function getNodeClass(): string
      */
     public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode
     {
-        return $type->toPhpDocNode();
+        $typeNode = $type->toPhpDocNode();
+
+        $phpDocNodeTraverser = new PhpDocNodeTraverser();
+        $phpDocNodeTraverser->traverseWithCallable($typeNode, '', static function (AstNode $astNode) : ?FullyQualifiedIdentifierTypeNode {
+            if (! $astNode instanceof IdentifierTypeNode) {
+                return null;
+            }
+
+            if ($astNode->name !== 'Closure') {
+                return null;
+            }
+
+            return new FullyQualifiedIdentifierTypeNode('Closure');
+        });
+
+        return $typeNode;
     }
 
     /**

rules-tests/TypeDeclaration/Rector/Property/VarAnnotationIncorrectNullableRector/Fixture/fqcn_var_closure_var_annotation_missing_null.php.inc

@@ -0,0 +1,23 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Property\VarAnnotationIncorrectNullableRector\Fixture;
+
+final class FqcnVarClosureVarAnnotationMissingNull
+{
+    /** @var \Closure(string, int, \Closure(float):int):string */
+    private ?\Closure $tooltipGenerator = null;
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Property\VarAnnotationIncorrectNullableRector\Fixture;
+
+final class FqcnVarClosureVarAnnotationMissingNull
+{
+    /** @var null|\Closure(string, int, \Closure(float): int): string */
+    private ?\Closure $tooltipGenerator = null;
+}
+
+?>

rules-tests/TypeDeclaration/Rector/Property/VarAnnotationIncorrectNullableRector/Fixture/skip_already_nullable_closure_var.php.inc

@@ -0,0 +1,11 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Property\VarAnnotationIncorrectNullableRector\Fixture;
+
+use Closure;
+
+final class SkipAlreadyNullableClosureVar
+{
+    /** @var null|Closure(string, int, Closure(float):int):string */
+    private ?Closure $tooltipGenerator = null;
+}

rules-tests/TypeDeclaration/Rector/Property/VarAnnotationIncorrectNullableRector/Fixture/var-closure-annotation-missing-null-prefer-prepend.php.inc

@@ -20,7 +20,7 @@ use Closure;
 
 final class VarClosureAnnotationMissingNullPreferPrepend
 {
-    /** @var null|Closure(string, int, Closure(float): int): string */
+    /** @var null|\Closure(string, int, \Closure(float): int): string */
     private ?Closure $tooltipGenerator = null;
 }
 

rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorReadonlyClassRector.php

@@ -195,10 +195,6 @@ private function shouldSkipProperty(
             }
         }
 
-        if (! $isReadOnlyByPhpdoc) {
-            return true;
-        }
-
-        return false;
+        return ! $isReadOnlyByPhpdoc;
     }
 }