remove docblock based type, as might be invalid

Author: TomasVotruba

rules-tests/TypeDeclaration/Rector/ArrowFunction/AddArrowFunctionReturnTypeRector/Fixture/return_by_array_shape_type.php.inc

@@ -12,6 +12,7 @@
 use PhpParser\Node\Expr\Instanceof_;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Identifier;
+use PhpParser\Node\Scalar\String_;
 use PHPStan\Type\ArrayType;
 use Rector\PhpParser\Node\BetterNodeFinder;
 use Rector\Rector\AbstractRector;
@@ -148,7 +149,8 @@ private function resolveDimFetchVariableNames(Closure|ArrowFunction $closureExpr
             if ($arrayDimFetch->var instanceof Variable) {
                 $type = $this->nodeTypeResolver->getNativeType($arrayDimFetch->var);
 
-                if ($type->isString()->yes()) {
+                // skip string values
+                if (! $arrayDimFetch->dim instanceof String_ && ($type->isString()->yes() || $type->isString()->maybe())) {
                     continue;
                 }
 

rules/TypeDeclaration/Rector/FuncCall/AddArrowFunctionParamArrayWhereDimFetchRector.php

@@ -8,6 +8,8 @@
 use PHPStan\DependencyInjection\Nette\NetteContainer;
 use PHPStan\Parser\AnonymousClassVisitor;
 use PHPStan\Parser\RichParser;
+use PHPStan\Parser\VariadicFunctionsVisitor;
+use PHPStan\Parser\VariadicMethodsVisitor;
 use Rector\Util\Reflection\PrivatesAccessor;
 
 /**
@@ -34,12 +36,16 @@ public static function removeRichVisitors(RichParser $richParser): void
         // get tags property
         $tags = $privatesAccessor->getPrivateProperty($deeperContainer, 'tags');
 
-        // keep only the anonymous class visitor
+        // keep visitors that are useful
         // remove all the rest, https://github.com/phpstan/phpstan-src/tree/1d86de8bb9371534983a8dbcd879e057d2ff028f/src/Parser
-        $tags[RichParser::VISITOR_SERVICE_TAG] = [
+        $nodeVisitorsToKeep = [
             $container->findServiceNamesByType(AnonymousClassVisitor::class)[0] => true,
+            $container->findServiceNamesByType(VariadicFunctionsVisitor::class)[0] => true,
+            $container->findServiceNamesByType(VariadicMethodsVisitor::class)[0] => true,
         ];
 
+        $tags[RichParser::VISITOR_SERVICE_TAG] = $nodeVisitorsToKeep;
+
         $privatesAccessor->setPrivateProperty($deeperContainer, 'tags', $tags);
     }
 }

src/DependencyInjection/PHPStan/PHPStanContainerMemento.php

@@ -1,5 +1,3 @@
 <?php
 
-namespace Rector\Tests\PhpParser\Printer\Fixture;
-
-$result = array_map(array: [1, 2, 3], callback: fn(int $value) => $value);
+$result = \array_map(array: [1, 2, 3], callback: fn(int $value) => $value);