[DowngradePhp80/72] Handle DowngradeTrailingCommasInParamUseRector+Do…

…wngradeParameterTypeWideningRector (#2843)

Co-authored-by: GitHub Action <action@github.com>

src/ProcessAnalyzer/RectifiedAnalyzer.php

@@ -80,7 +80,10 @@ private function shouldContinue(
         Node $node,
         ?Node $originalNode
     ): bool {
-        if ($rectifiedNode->getRectorClass() === $rectorClass && $rectifiedNode->getNode() === $node) {
+        $rectifiedNodeClass = $rectifiedNode->getRectorClass();
+        $rectifiedNodeNode = $rectifiedNode->getNode();
+
+        if ($rectifiedNodeClass === $rectorClass && $rectifiedNodeNode === $node) {
             /**
              * allow to revisit the Node with same Rector rule if Node is changed by other rule
              */
@@ -91,7 +94,33 @@ private function shouldContinue(
             return true;
         }
 
+        if ($this->isPreviousCreatedByRuleAttributeEquals($rectifiedNodeClass, $rectifiedNodeNode, $node)) {
+            return true;
+        }
+
         $startTokenPos = $node->getStartTokenPos();
         return $startTokenPos < 0;
     }
+
+    /**
+     * @param class-string<RectorInterface> $rectifiedNodeClass
+     */
+    private function isPreviousCreatedByRuleAttributeEquals(
+        string $rectifiedNodeClass,
+        Node $rectifiedNodeNode,
+        Node $node
+    ): bool {
+        /** @var class-string<RectorInterface>[] $createdByRule */
+        $createdByRule = $node->getAttribute(AttributeKey::CREATED_BY_RULE) ?? [];
+        if (count($createdByRule) !== 1) {
+            return false;
+        }
+
+        // different rule, allowed
+        if (current($createdByRule) !== $rectifiedNodeClass) {
+            return true;
+        }
+
+        return $rectifiedNodeNode === $node;
+    }
 }

tests/Issues/IssueDowngradeParamType/Fixture/fixture.php.inc

@@ -0,0 +1,42 @@
+<?php
+
+namespace Rector\Core\Tests\Issues\IssueDowngradeParamType\Fixture;
+
+class ParentClass
+{
+    public function execute(string $param,): void
+    {
+    }
+}
+
+class ChildClass extends ParentClass
+{
+    public function execute($param): void
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Core\Tests\Issues\IssueDowngradeParamType\Fixture;
+
+class ParentClass
+{
+    /**
+     * @param string $param
+     */
+    public function execute($param): void
+    {
+    }
+}
+
+class ChildClass extends ParentClass
+{
+    public function execute($param): void
+    {
+    }
+}
+
+?>

tests/Issues/IssueDowngradeParamType/IssueDowngradeParamTypeTest.php

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

tests/Issues/IssueDowngradeParamType/IssueDowngradeParamTypeToPhp71Test.php

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

tests/Issues/IssueDowngradeParamType/config/configured_rule.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\DowngradePhp72\Rector\ClassMethod\DowngradeParameterTypeWideningRector;
+use Rector\DowngradePhp80\Rector\ClassMethod\DowngradeTrailingCommasInParamUseRector;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->importNames();
+    $rectorConfig->rule(DowngradeTrailingCommasInParamUseRector::class);
+    $rectorConfig->rule(DowngradeParameterTypeWideningRector::class);
+};

tests/Issues/IssueDowngradeParamType/config/configured_rule_downgrade_down_to_php71.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\Set\ValueObject\DowngradeLevelSetList;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->importNames();
+    $rectorConfig->sets([DowngradeLevelSetList::DOWN_TO_PHP_71]);
+};