[EarlyReturn] Handle both ChangeAndIfToEarlyReturnRector and ChangeOrIfReturnToEarlyReturnRector (#617)

rules/EarlyReturn/Rector/If_/ChangeAndIfToEarlyReturnRector.php

@@ -235,6 +235,10 @@ CODE_SAMPLE
         }
 
         $parent = $if->getAttribute(AttributeKey::PARENT_NODE);
+        if (! $parent instanceof Node) {
+            return false;
+        }
+
         if ($parent instanceof If_) {
             return $this->isLastIfOrBeforeLastReturn($parent);
         }

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

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Core\Tests\Issues\IssueEarlyReturnAndOr\Fixture;
+
+class ComplexAndOr
+{
+    public function run($a, $b, $c, $d)
+    {
+        if (($a && false === $b) || ! $c) {
+            return '';
+        }
+
+        return $d;
+    }
+}
+
+?>
+-----
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Core\Tests\Issues\IssueEarlyReturnAndOr\Fixture;
+
+class ComplexAndOr
+{
+    public function run($a, $b, $c, $d)
+    {
+        if ($a && false === $b) {
+            return '';
+        }
+        if (! $c) {
+            return '';
+        }
+        return $d;
+    }
+}
+
+?>

tests/Issues/IssueEarlyReturnAndOr/IssueEarlyReturnAndOrTest.php

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

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