[TypeDeclaration] Handle string&string intersection on AddMethodCallBasedStrictParamTypeRector (#1375)

Co-authored-by: Tomas Votruba <tomas.vot@gmail.com>

Author: samsonasik

packages/NodeTypeResolver/NodeTypeResolver.php

@@ -224,7 +224,8 @@ public function getNativeType(Expr $expr): Type
             return new MixedType();
         }
 
-        return $scope->getNativeType($expr);
+        $type = $scope->getNativeType($expr);
+        return $this->accessoryNonEmptyStringTypeCorrector->correct($type);
     }
 
     public function isNumberType(Node $node): bool

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

@@ -0,0 +1,37 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector\FixtureIntersection;
+
+final class StringIntersection
+{
+    public function execute()
+    {
+        $value = sys_get_temp_dir() . DIRECTORY_SEPARATOR . basename(__FILE__);
+        $this->run($value);
+    }
+
+    private function run($value)
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector\FixtureIntersection;
+
+final class StringIntersection
+{
+    public function execute()
+    {
+        $value = sys_get_temp_dir() . DIRECTORY_SEPARATOR . basename(__FILE__);
+        $this->run($value);
+    }
+
+    private function run(string $value)
+    {
+    }
+}
+
+?>

rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/IntersectionTest.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
+
+use Iterator;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+use Symplify\SmartFileSystem\SmartFileInfo;
+
+final class IntersectionTest extends AbstractRectorTestCase
+{
+    /**
+     * @dataProvider provideData()
+     */
+    public function test(SmartFileInfo $fileInfo): void
+    {
+        $this->doTestFileInfo($fileInfo);
+    }
+
+    /**
+     * @return Iterator<SmartFileInfo>
+     */
+    public function provideData(): Iterator
+    {
+        return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureIntersection');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return __DIR__ . '/config/intersection_config.php';
+    }
+}

rules-tests/TypeDeclaration/Rector/ClassMethod/AddMethodCallBasedStrictParamTypeRector/config/intersection_config.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Core\Configuration\Option;
+use Rector\Core\ValueObject\PhpVersionFeature;
+use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $parameters = $containerConfigurator->parameters();
+    $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersionFeature::INTERSECTION_TYPES);
+
+    $services = $containerConfigurator->services();
+    $services->set(AddMethodCallBasedStrictParamTypeRector::class);
+};