[TypeDeclaration] Skip Valid type from return doc and typed param on AddMethodCallBasedStrictParamTypeRector

rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/FixtureIntersection/skip_valid_type_from_return_doc.php.inc

@@ -0,0 +1,28 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector\FixtureIntersection;
+
+use Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector\Source\ConnectionInterface;
+use Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector\Source\ConnectionResolverInterface;
+use Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector\Source\SqlServerConnection;
+
+final class SkipValidTypeFromReturnDoc
+{
+    public function __invoke(ConnectionResolverInterface $resolver): void
+    {
+        $connection = $resolver->connection();
+
+        if (
+            $connection instanceof SqlServerConnection
+            || ! method_exists($connection, 'getSchemaState')
+        ) {
+            return;
+        }
+
+        $this->ensureCleanDatabase($connection);
+    }
+
+    private function ensureCleanDatabase(ConnectionInterface $connection): void
+    {
+    }
+}

rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/Source/ConnectionInterface.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector\Source;
+
+interface ConnectionInterface
+{
+}

rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/Source/ConnectionResolverInterface.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector\Source;
+
+interface ConnectionResolverInterface
+{
+    /**
+     * @param  string|null  $name
+     * @return ConnectionInterface
+     */
+    public function connection($name = null);
+}

rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/Source/SqlServerConnection.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector\Source;
+
+class SqlServerConnection extends ConnectionInterface
+{
+}

rules/TypeDeclaration/NodeAnalyzer/CallTypesResolver.php

@@ -60,6 +60,11 @@ private function resolveStrictArgValueType(Arg $arg): Type
         // "self" in another object is not correct, this make it independent
         $argValueType = $this->correctSelfType($argValueType);
 
+        $type = $this->nodeTypeResolver->getType($arg->value);
+        if (! $type->equals($argValueType) && $this->typeComparator->isSubtype($type, $argValueType)) {
+            return $type;
+        }
+
         if (! $argValueType instanceof ObjectType) {
             return $argValueType;
         }
@@ -69,11 +74,6 @@ private function resolveStrictArgValueType(Arg $arg): Type
             return new MixedType();
         }
 
-        $type = $this->nodeTypeResolver->getType($arg->value);
-        if (! $type->equals($argValueType) && $this->typeComparator->isSubtype($type, $argValueType)) {
-            return $type;
-        }
-
         return $argValueType;
     }
 

src/NodeTypeResolver/NodeTypeCorrector/AccessoryNonEmptyArrayTypeCorrector.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\NodeTypeResolver\NodeTypeCorrector;
+
+use PHPStan\Type\Accessory\NonEmptyArrayType;
+use PHPStan\Type\ArrayType;
+use PHPStan\Type\IntersectionType;
+use PHPStan\Type\MixedType;
+use PHPStan\Type\Type;
+
+final class AccessoryNonEmptyArrayTypeCorrector
+{
+    public function correct(Type $mainType): Type
+    {
+        if (! $mainType instanceof IntersectionType) {
+            return $mainType;
+        }
+
+        if (! $mainType->isArray()->yes()) {
+            return $mainType;
+        }
+
+        foreach ($mainType->getTypes() as $type) {
+            if ($type instanceof NonEmptyArrayType) {
+                return new ArrayType(new MixedType(), new MixedType());
+            }
+        }
+
+        return $mainType;
+    }
+}

src/NodeTypeResolver/NodeTypeResolver.php

@@ -51,6 +51,7 @@
 use Rector\NodeTypeResolver\Contract\NodeTypeResolverAwareInterface;
 use Rector\NodeTypeResolver\Contract\NodeTypeResolverInterface;
 use Rector\NodeTypeResolver\Node\AttributeKey;
+use Rector\NodeTypeResolver\NodeTypeCorrector\AccessoryNonEmptyArrayTypeCorrector;
 use Rector\NodeTypeResolver\NodeTypeCorrector\AccessoryNonEmptyStringTypeCorrector;
 use Rector\NodeTypeResolver\NodeTypeCorrector\GenericClassStringTypeCorrector;
 use Rector\NodeTypeResolver\PHPStan\ObjectWithoutClassTypeWithParentTypes;
@@ -79,6 +80,7 @@ public function __construct(
         private readonly GenericClassStringTypeCorrector $genericClassStringTypeCorrector,
         private readonly ReflectionProvider $reflectionProvider,
         private readonly AccessoryNonEmptyStringTypeCorrector $accessoryNonEmptyStringTypeCorrector,
+        private readonly AccessoryNonEmptyArrayTypeCorrector $accessoryNonEmptyArrayTypeCorrector,
         private readonly RenamedClassesDataCollector $renamedClassesDataCollector,
         private readonly NodeNameResolver $nodeNameResolver,
         iterable $nodeTypeResolvers
@@ -195,8 +197,7 @@ public function getType(Node $node): Type
         $type = $this->resolveByNodeTypeResolvers($node);
 
         if ($type instanceof Type) {
-            $type = $this->accessoryNonEmptyStringTypeCorrector->correct($type);
-            $type = $this->genericClassStringTypeCorrector->correct($type);
+            $type = $this->correctType($type);
 
             if ($type instanceof ObjectType) {
                 $scope = $node->getAttribute(AttributeKey::SCOPE);
@@ -231,9 +232,7 @@ public function getType(Node $node): Type
             return new MixedType();
         }
 
-        $type = $scope->getType($node);
-        $type = $this->accessoryNonEmptyStringTypeCorrector->correct($type);
-        $type = $this->genericClassStringTypeCorrector->correct($type);
+        $type = $this->correctType($scope->getType($node));
 
         // hot fix for phpstan not resolving chain method calls
         if (! $node instanceof MethodCall) {
@@ -256,6 +255,14 @@ public function isNullableType(Node $node): bool
         return TypeCombinator::containsNull($nodeType);
     }
 
+    private function correctType(Type $type): Type
+    {
+        $type = $this->accessoryNonEmptyStringTypeCorrector->correct($type);
+        $type = $this->genericClassStringTypeCorrector->correct($type);
+
+        return $this->accessoryNonEmptyArrayTypeCorrector->correct($type);
+    }
+
     public function getNativeType(Expr $expr): Type
     {
         $scope = $expr->getAttribute(AttributeKey::SCOPE);
@@ -281,7 +288,7 @@ public function getNativeType(Expr $expr): Type
                 return new ObjectWithoutClassType();
             }
 
-            return $this->accessoryNonEmptyStringTypeCorrector->correct($type);
+            return $this->correctType($type);
         }
 
         return $this->resolveNativeUnionType($type);