Updated Rector to commit a4c489ee0914233600f93379edee4932ce2d4ee4

TomasVotruba · TomasVotruba · commit e3da0f3d06c9 · 2025-02-05T04:39:38.000Z
rectorphp/rector-src@a4c489e [TypeDeclaration] Allow union with closure type on property on TypedPropertyFromAssignsRector (#6717)
diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '7f910682cd51567d6ae5606a2edcd756f4cc79b0';
+    public const PACKAGE_VERSION = 'a4c489ee0914233600f93379edee4932ce2d4ee4';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2025-02-03 21:35:57';
+    public const RELEASE_DATE = '2025-02-05 11:37:04';
     /**
      * @var int
      */
diff --git a/src/NodeAnalyzer/PropertyAnalyzer.php b/src/NodeAnalyzer/PropertyAnalyzer.php
@@ -39,7 +39,7 @@ public function hasForbiddenType(Property $property) : bool
         }
         return \false;
     }
-    private function isForbiddenType(Type $type) : bool
+    public function isForbiddenType(Type $type) : bool
     {
         if ($type instanceof NonExistingObjectType) {
             return \true;
diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/ClosureTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/ClosureTypeMapper.php
@@ -65,13 +65,14 @@ public function mapToPhpParserNode(Type $type, string $typeKind) : ?Node
         if ($typeKind === TypeKind::PROPERTY && $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::TYPED_PROPERTIES)) {
             return new FullyQualified('Closure');
         }
-        if ($typeKind !== TypeKind::RETURN) {
-            return null;
-        }
         // ref https://3v4l.org/nUreN#v7.0.0
-        if (!$this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::ANONYMOUS_FUNCTION_RETURN_TYPE)) {
-            return null;
+        if ($typeKind === TypeKind::RETURN && $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::ANONYMOUS_FUNCTION_RETURN_TYPE)) {
+            return new FullyQualified('Closure');
+        }
+        // ref https://3v4l.org/ruh5g#v8.0.0
+        if ($typeKind === TypeKind::UNION && $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::UNION_TYPES)) {
+            return new FullyQualified('Closure');
         }
-        return new FullyQualified('Closure');
+        return null;
     }
 }
diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/UnionTypeMapper.php
@@ -15,6 +15,7 @@
 use PHPStan\Type\Type;
 use PHPStan\Type\UnionType;
 use Rector\BetterPhpDocParser\ValueObject\Type\BracketsAwareUnionTypeNode;
+use Rector\NodeAnalyzer\PropertyAnalyzer;
 use Rector\Php\PhpVersionProvider;
 use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface;
 use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
@@ -31,10 +32,15 @@ final class UnionTypeMapper implements TypeMapperInterface
      * @readonly
      */
     private PhpVersionProvider $phpVersionProvider;
+    /**
+     * @readonly
+     */
+    private PropertyAnalyzer $propertyAnalyzer;
     private PHPStanStaticTypeMapper $phpStanStaticTypeMapper;
-    public function __construct(PhpVersionProvider $phpVersionProvider)
+    public function __construct(PhpVersionProvider $phpVersionProvider, PropertyAnalyzer $propertyAnalyzer)
     {
         $this->phpVersionProvider = $phpVersionProvider;
+        $this->propertyAnalyzer = $propertyAnalyzer;
     }
     public function autowire(PHPStanStaticTypeMapper $phpStanStaticTypeMapper) : void
     {
@@ -159,7 +165,7 @@ private function matchPhpParserUnionType(UnionType $unionType, string $typeKind)
                 return null;
             }
             // special callable type only not allowed on property
-            if ($typeKind === TypeKind::PROPERTY && $unionedType->isCallable()->yes()) {
+            if ($typeKind === TypeKind::PROPERTY && $this->propertyAnalyzer->isForbiddenType($unionedType)) {
                 return null;
             }
             $phpParserUnionedTypes[] = $phpParserNode;

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function hasForbiddenType(Property $property) : bool`
`39`	`39`	`}`
`40`	`40`	`return \false;`
`41`	`41`	`}`
`42`		`- private function isForbiddenType(Type $type) : bool`
	`42`	`+ public function isForbiddenType(Type $type) : bool`
`43`	`43`	`{`
`44`	`44`	`if ($type instanceof NonExistingObjectType) {`
`45`	`45`	`return \true;`
Original file line number	Diff line number	Diff line change
`@@ -65,13 +65,14 @@ public function mapToPhpParserNode(Type $type, string $typeKind) : ?Node`
`65`	`65`	`if ($typeKind === TypeKind::PROPERTY && $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::TYPED_PROPERTIES)) {`
`66`	`66`	`return new FullyQualified('Closure');`
`67`	`67`	`}`
`68`		`- if ($typeKind !== TypeKind::RETURN) {`
`69`		`- return null;`
`70`		`- }`
`71`	`68`	`// ref https://3v4l.org/nUreN#v7.0.0`
`72`		`- if (!$this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::ANONYMOUS_FUNCTION_RETURN_TYPE)) {`
`73`		`- return null;`
	`69`	`+ if ($typeKind === TypeKind::RETURN && $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::ANONYMOUS_FUNCTION_RETURN_TYPE)) {`
	`70`	`+ return new FullyQualified('Closure');`
	`71`	`+ }`
	`72`	`+ // ref https://3v4l.org/ruh5g#v8.0.0`
	`73`	`+ if ($typeKind === TypeKind::UNION && $this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::UNION_TYPES)) {`
	`74`	`+ return new FullyQualified('Closure');`
`74`	`75`	`}`
`75`		`- return new FullyQualified('Closure');`
	`76`	`+ return null;`
`76`	`77`	`}`
`77`	`78`	`}`