make use of ComplexType

rectorphp · Nov 14, 2021 · b161a74 · b161a74
1 parent 6d176c7
commit b161a74
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 21 deletions.
diff --git a/packages/FamilyTree/Reflection/FamilyRelationsAnalyzer.php b/packages/FamilyTree/Reflection/FamilyRelationsAnalyzer.php
@@ -5,18 +5,16 @@
 namespace Rector\FamilyTree\Reflection;
 
 use PhpParser\Node;
+use PhpParser\Node\ComplexType;
 use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Expr\PropertyFetch;
 use PhpParser\Node\Expr\StaticPropertyFetch;
-use PhpParser\Node\IntersectionType;
 use PhpParser\Node\Name;
-use PhpParser\Node\NullableType;
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Interface_;
 use PhpParser\Node\Stmt\Property;
-use PhpParser\Node\UnionType as PhpParserUnionType;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ReflectionProvider;
@@ -69,7 +67,7 @@ public function getPossibleUnionPropertyType(
         Property $property,
         Type $varType,
         ?Scope $scope,
-        Name | NullableType | PhpParserUnionType | IntersectionType| null $propertyTypeNode
+        Name | ComplexType | null $propertyTypeNode
     ): PropertyType {
         if ($varType instanceof UnionType) {
             return new PropertyType($varType, $propertyTypeNode);

diff --git a/packages/PHPStanStaticTypeMapper/PHPStanStaticTypeMapper.php b/packages/PHPStanStaticTypeMapper/PHPStanStaticTypeMapper.php
@@ -4,10 +4,8 @@
 
 namespace Rector\PHPStanStaticTypeMapper;
 
-use PhpParser\Node\IntersectionType;
+use PhpParser\Node\ComplexType;
 use PhpParser\Node\Name;
-use PhpParser\Node\NullableType;
-use PhpParser\Node\UnionType;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Type\Accessory\AccessoryNumericStringType;
@@ -48,10 +46,8 @@ public function mapToPHPStanPhpDocTypeNode(Type $type, TypeKind $typeKind): Type
         throw new NotImplementedYetException(__METHOD__ . ' for ' . $type::class);
     }
 
-    public function mapToPhpParserNode(
-        Type $type,
-        TypeKind $typeKind
-    ): Name | NullableType | UnionType | IntersectionType | null {
+    public function mapToPhpParserNode(Type $type, TypeKind $typeKind): Name | ComplexType | null
+    {
         foreach ($this->typeMappers as $typeMapper) {
             if (! is_a($type, $typeMapper->getNodeClass(), true)) {
                 continue;

diff --git a/packages/StaticTypeMapper/StaticTypeMapper.php b/packages/StaticTypeMapper/StaticTypeMapper.php
@@ -5,12 +5,10 @@
 namespace Rector\StaticTypeMapper;
 
 use PhpParser\Node;
-use PhpParser\Node\IntersectionType;
+use PhpParser\Node\ComplexType;
 use PhpParser\Node\Name;
-use PhpParser\Node\NullableType;
 use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\ClassMethod;
-use PhpParser\Node\UnionType as PhpParserUnionType;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagValueNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
@@ -48,7 +46,7 @@ public function mapPHPStanTypeToPHPStanPhpDocTypeNode(Type $phpStanType, TypeKin
     }
 
     /**
-     * @return Name|NullableType|PhpParserUnionType|IntersectionType|null
+     * @return Name|ComplexType|null
      */
     public function mapPHPStanTypeToPhpParserNode(Type $phpStanType, TypeKind $typeKind): ?Node
     {

diff --git a/rules/DowngradePhp74/Rector/ClassMethod/DowngradeCovariantReturnTypeRector.php b/rules/DowngradePhp74/Rector/ClassMethod/DowngradeCovariantReturnTypeRector.php
@@ -134,7 +134,7 @@ public function refactor(Node $node): ?Node
         }
 
         // Make it nullable?
-        if ($node->returnType instanceof NullableType && ! $parentReturnTypeNode instanceof NullableType && ! $parentReturnTypeNode instanceof UnionType && ! $parentReturnTypeNode instanceof Node\IntersectionType) {
+        if ($node->returnType instanceof NullableType && ! $parentReturnTypeNode instanceof ComplexType) {
             $parentReturnTypeNode = new NullableType($parentReturnTypeNode);
         }
 

diff --git a/rules/Php74/Rector/Property/TypedPropertyRector.php b/rules/Php74/Rector/Property/TypedPropertyRector.php
@@ -12,7 +12,6 @@
 use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\Node\Stmt\Property;
 use PhpParser\Node\Stmt\Trait_;
-use PhpParser\Node\UnionType as PhpParserUnionType;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\Generic\TemplateType;
 use PHPStan\Type\MixedType;
@@ -166,6 +165,7 @@ public function refactor(Node $node): ?Node
         }
 
         $scope = $node->getAttribute(AttributeKey::SCOPE);
+
         $propertyType = $this->familyRelationsAnalyzer->getPossibleUnionPropertyType(
             $node,
             $varType,
@@ -200,7 +200,7 @@ public function provideMinPhpVersion(): int
     }
 
     private function isNullOrNonClassLikeTypeOrMixedOrVendorLockedIn(
-        Name | NullableType | PhpParserUnionType | Node\IntersectionType | null $node,
+        Name | ComplexType | null $node,
         Property $property,
         Type $type
     ): bool {

diff --git a/rules/TypeDeclaration/Rector/Param/ParamTypeFromStrictTypedPropertyRector.php b/rules/TypeDeclaration/Rector/Param/ParamTypeFromStrictTypedPropertyRector.php
@@ -10,11 +10,11 @@
 use PhpParser\Node\FunctionLike;
 use PhpParser\Node\NullableType;
 use PhpParser\Node\Param;
-use PhpParser\Node\UnionType;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\Php\PhpPropertyReflection;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
+use PHPStan\Type\UnionType;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Core\Reflection\ReflectionResolver;
 use Rector\Core\ValueObject\PhpVersionFeature;
@@ -130,7 +130,7 @@ public function provideMinPhpVersion(): int
     }
 
     /**
-     * @return Node\Name|UnionType|NullableType|Node\IntersectionType|null
+     * @return Node\Name|Node\ComplexType|null
      */
     private function matchPropertySingleTypeNode(PropertyFetch $propertyFetch): ?Node
     {
@@ -145,7 +145,7 @@ private function matchPropertySingleTypeNode(PropertyFetch $propertyFetch): ?Nod
             return null;
         }
 
-        if ($propertyType instanceof \PHPStan\Type\UnionType) {
+        if ($propertyType instanceof UnionType) {
             return null;
         }