[CodeQuality][EarlyReturn][TypeDeclaration] Handle ChangeOrIfReturnTo…

…EarlyReturnRector + ChangeAndIfToEarlyReturnRector + AddArrayReturnDocTypeRector + NarrowUnionTypeDocRector (#795)

rules/CodeQuality/Rector/ClassMethod/NarrowUnionTypeDocRector.php

@@ -90,11 +90,14 @@ public function refactor(Node $node): ?Node
             }
         }
 
-        if ($phpDocInfo->hasChanged()) {
-            $node->setAttribute(AttributeKey::HAS_PHP_DOC_INFO_JUST_CHANGED, true);
-            return $node;
+        if (! $phpDocInfo->hasChanged()) {
+            return null;
         }
 
+        $node->setAttribute(AttributeKey::HAS_PHP_DOC_INFO_JUST_CHANGED, true);
+
+        // @see https://github.com/rectorphp/rector-src/pull/795
+        // avoid duplicated ifs and returns when combined with ChangeOrIfReturnToEarlyReturnRector, ChangeAndIfToEarlyReturnRector, and AddArrayReturnDocTypeRector
         return null;
     }
 

tests/Issues/IssueEarlyReturnAndOrNarrow/Fixture/and_next_or.php.inc

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Core\Tests\Issues\IssueEarlyReturnAndOrNarrow\Fixture;
+
+class AndNextOrReturnVoid
+{
+    public function run($a, $b, $c, $d)
+    {
+        if ($a && $b  || $c) {
+            return null;
+        }
+
+        return;
+    }
+}
+
+?>
+-----
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Core\Tests\Issues\IssueEarlyReturnAndOrNarrow\Fixture;
+
+class AndNextOrReturnVoid
+{
+    /**
+     * @return null|void
+     */
+    public function run($a, $b, $c, $d)
+    {
+        if ($a && $b) {
+            return null;
+        }
+        if ($c) {
+            return null;
+        }
+        return;
+    }
+}
+
+?>

tests/Issues/IssueEarlyReturnAndOrNarrow/IssueEarlyReturnAndOrNarrowTest.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Core\Tests\Issues\IssueEarlyReturnAndOrNarrow;
+
+use Iterator;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+use Symplify\SmartFileSystem\SmartFileInfo;
+
+final class IssueEarlyReturnAndOrNarrowTest 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/IssueEarlyReturnAndOrNarrow/config/configured_rule.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\CodeQuality\Rector\ClassMethod\NarrowUnionTypeDocRector;
+use Rector\EarlyReturn\Rector\If_\ChangeAndIfToEarlyReturnRector;
+use Rector\EarlyReturn\Rector\If_\ChangeOrIfReturnToEarlyReturnRector;
+use Rector\TypeDeclaration\Rector\ClassMethod\AddArrayReturnDocTypeRector;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+    $services->set(ChangeOrIfReturnToEarlyReturnRector::class);
+    $services->set(ChangeAndIfToEarlyReturnRector::class);
+    $services->set(AddArrayReturnDocTypeRector::class);
+    $services->set(NarrowUnionTypeDocRector::class);
+};