Remove TypeNormalizer as type comparison is handled well by PHPStan (#…

…6570) * try running without type narrower * Remove type normalizer, as no longer needed * Fix array type using isArray()
rectorphp · Dec 12, 2024 · 6fce22d · 6fce22d
1 parent ff49b20
commit 6fce22d
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 233 deletions.
diff --git a/...eDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/Fixture/false_bool_docblock.php.inc b/...eDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/Fixture/false_bool_docblock.php.inc
@@ -28,7 +28,7 @@ final class FalseBoolDocblock
     /**
      * @return array|bool some description
      */
-    public function run(): array|false
+    public function run(): false|array
     {
         if (rand(0, 1)) {
             return false;

diff --git a/...ests/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/Fixture/union_array.php.inc b/...ests/TypeDeclaration/Rector/ClassMethod/ReturnUnionTypeRector/Fixture/union_array.php.inc
@@ -32,7 +32,7 @@ use stdClass;
 
 final class UnionArray
 {
-    public function run($a, $b): \DateTime|array|null
+    public function run($a, $b): null|\DateTime|array
     {
         if ($a) {
             return null;

diff --git a/rules-tests/TypeDeclaration/TypeNormalizerTest.php b/rules-tests/TypeDeclaration/TypeNormalizerTest.php
diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictNewArrayRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictNewArrayRector.php
@@ -147,7 +147,7 @@ private function processAddArrayReturnType(
         ClassMethod|Function_|Closure $node,
         Type $returnType
     ): ClassMethod|Function_|Closure|null {
-        if (! $returnType instanceof ArrayType && ! $returnType instanceof ConstantArrayType) {
+        if (! $returnType->isArray()->yes()) {
             return null;
         }
 
@@ -174,10 +174,8 @@ private function shouldSkip(ClassMethod|Function_|Closure $node, Scope $scope):
         );
     }
 
-    private function changeReturnType(
-        ClassMethod|Function_|Closure $node,
-        ArrayType|ConstantArrayType $arrayType
-    ): void {
+    private function changeReturnType(ClassMethod|Function_|Closure $node, Type $arrayType): void
+    {
         $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);
 
         // skip already filled type, on purpose
@@ -265,7 +263,7 @@ private function matchArrayAssignedVariable(array $stmts): array
         return $variables;
     }
 
-    private function shouldAddReturnArrayDocType(ArrayType|ConstantArrayType $arrayType): bool
+    private function shouldAddReturnArrayDocType(Type $arrayType): bool
     {
         if ($arrayType instanceof ConstantArrayType) {
             if ($arrayType->getIterableValueType() instanceof NeverType) {

diff --git a/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer.php b/rules/TypeDeclaration/TypeInferer/ReturnTypeInferer.php
@@ -18,7 +18,6 @@
 final readonly class ReturnTypeInferer
 {
     public function __construct(
-        private TypeNormalizer $typeNormalizer,
         private ReturnedNodesReturnTypeInfererTypeInferer $returnedNodesReturnTypeInfererTypeInferer
     ) {
     }
@@ -30,6 +29,7 @@ public function inferFunctionLike(ClassMethod|Function_|Closure $functionLike):
             return new MixedType();
         }
 
-        return $this->typeNormalizer->normalizeArrayTypeAndArrayNever($originalType);
+        return $originalType;
+        // return $this->typeNormalizer->normalizeArrayTypeAndArrayNever($originalType);
     }
 }
diff --git a/rules/TypeDeclaration/TypeNormalizer.php b/rules/TypeDeclaration/TypeNormalizer.php
diff --git a/rules/TypeDeclaration/ValueObject/NestedArrayType.php b/rules/TypeDeclaration/ValueObject/NestedArrayType.php
diff --git a/src/NodeTypeResolver/TypeComparator/TypeComparator.php b/src/NodeTypeResolver/TypeComparator/TypeComparator.php
@@ -21,13 +21,11 @@
 use Rector\Reflection\ReflectionResolver;
 use Rector\StaticTypeMapper\StaticTypeMapper;
 use Rector\StaticTypeMapper\ValueObject\Type\AliasedObjectType;
-use Rector\TypeDeclaration\TypeNormalizer;
 
 final readonly class TypeComparator
 {
     public function __construct(
         private TypeHasher $typeHasher,
-        private TypeNormalizer $typeNormalizer,
         private StaticTypeMapper $staticTypeMapper,
         private ArrayTypeComparator $arrayTypeComparator,
         private ScalarTypeComparator $scalarTypeComparator,
@@ -56,9 +54,6 @@ public function areTypesEqual(Type $firstType, Type $secondType): bool
             return true;
         }
 
-        $firstType = $this->typeNormalizer->normalizeArrayOfUnionToUnionArray($firstType);
-        $secondType = $this->typeNormalizer->normalizeArrayOfUnionToUnionArray($secondType);
-
         if ($this->typeHasher->areTypesEqual($firstType, $secondType)) {
             return true;
         }