[TypeDeclaration] Deprecate unreliable AddArrayReturnDocTypeRector, u…

…sed split strict typed rules instead (#3133)

config/set/type-declaration.php

@@ -5,7 +5,6 @@
 use Rector\CodeQuality\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector;
 use Rector\Config\RectorConfig;
 use Rector\TypeDeclaration\Rector\ArrowFunction\AddArrowFunctionReturnTypeRector;
-use Rector\TypeDeclaration\Rector\ClassMethod\AddArrayReturnDocTypeRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeBasedOnPHPUnitDataProviderRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeFromPropertyTypeRector;
@@ -38,7 +37,6 @@
     $rectorConfig->rules([
         AddClosureReturnTypeRector::class,
         AddArrowFunctionReturnTypeRector::class,
-        AddArrayReturnDocTypeRector::class,
         ParamTypeByMethodCallTypeRector::class,
         TypedPropertyFromAssignsRector::class,
         ReturnAnnotationIncorrectNullableRector::class,

packages/VendorLocker/NodeVendorLocker/ClassMethodReturnTypeOverrideGuard.php

@@ -10,18 +10,12 @@
 use PhpParser\Node\Stmt\Return_;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ReflectionProvider;
-use PHPStan\Type\ArrayType;
-use PHPStan\Type\Generic\GenericClassStringType;
-use PHPStan\Type\MixedType;
-use PHPStan\Type\StringType;
-use PHPStan\Type\Type;
 use PHPStan\Type\VoidType;
 use Rector\Core\PhpParser\AstResolver;
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\Core\Reflection\ReflectionResolver;
 use Rector\FamilyTree\Reflection\FamilyRelationsAnalyzer;
 use Rector\NodeNameResolver\NodeNameResolver;
-use Rector\StaticTypeMapper\PhpDoc\CustomPHPStanDetector;
 use Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer;
 
 final class ClassMethodReturnTypeOverrideGuard
@@ -40,7 +34,6 @@ public function __construct(
         private readonly BetterNodeFinder $betterNodeFinder,
         private readonly AstResolver $astResolver,
         private readonly ReflectionResolver $reflectionResolver,
-        private readonly CustomPHPStanDetector $customPHPStanDetector,
         private readonly ReturnTypeInferer $returnTypeInferer
     ) {
     }
@@ -78,28 +71,6 @@ public function shouldSkipClassMethod(ClassMethod $classMethod): bool
         return $this->hasClassMethodExprReturn($classMethod);
     }
 
-    public function shouldSkipClassMethodOldTypeWithNewType(
-        Type $oldType,
-        Type $newType,
-        ClassMethod $classMethod
-    ): bool {
-        if ($this->customPHPStanDetector->isCustomType($oldType, $classMethod)) {
-            return true;
-        }
-
-        if ($oldType instanceof MixedType) {
-            return false;
-        }
-
-        // new generic string type is more advanced than old array type
-        if ($this->isFirstArrayTypeMoreAdvanced($oldType, $newType)) {
-            return false;
-        }
-
-        return $oldType->isSuperTypeOf($newType)
-            ->yes();
-    }
-
     /**
      * @param ClassReflection[] $childrenClassReflections
      */
@@ -169,21 +140,4 @@ static function (Node $node): bool {
             }
         );
     }
-
-    private function isFirstArrayTypeMoreAdvanced(Type $oldType, Type $newType): bool
-    {
-        if (! $oldType instanceof ArrayType) {
-            return false;
-        }
-
-        if (! $newType instanceof ArrayType) {
-            return false;
-        }
-
-        if (! $oldType->getItemType() instanceof StringType) {
-            return false;
-        }
-
-        return $newType->getItemType() instanceof GenericClassStringType;
-    }
 }