Split instance of check to 2 rules (#4165)

* Extract RemoveTypedPropertyDeadInstanceOfRector to handle properties in own scope * be sure
rectorphp · Jun 10, 2023 · a394e5e · a394e5e
1 parent d3e37c4
commit a394e5e
Show file tree

Hide file tree

Showing 14 changed files with 330 additions and 127 deletions.
diff --git a/config/set/dead-code.php b/config/set/dead-code.php
@@ -28,6 +28,7 @@
 use Rector\DeadCode\Rector\FunctionLike\RemoveDeadReturnRector;
 use Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector;
 use Rector\DeadCode\Rector\If_\RemoveDeadInstanceOfRector;
+use Rector\DeadCode\Rector\If_\RemoveTypedPropertyDeadInstanceOfRector;
 use Rector\DeadCode\Rector\If_\RemoveUnusedNonEmptyArrayBeforeForeachRector;
 use Rector\DeadCode\Rector\If_\SimplifyIfElseWithSameContentRector;
 use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector;
@@ -78,6 +79,7 @@
         RemoveDeadConditionAboveReturnRector::class,
         RemoveUnusedConstructorParamRector::class,
         RemoveDeadInstanceOfRector::class,
+        RemoveTypedPropertyDeadInstanceOfRector::class,
         RemoveDeadLoopRector::class,
         RemoveUnusedPrivateMethodParameterRector::class,
         // docblock

diff --git a/phpstan.neon b/phpstan.neon
@@ -704,3 +704,5 @@ parameters:
 
         - '#Function "class_exists\(\)" cannot be used/left in the code\: use ReflectionProvider\->has\*\(\) instead#'
         - '#Cognitive complexity for "Rector\\Php81\\Rector\\Property\\ReadOnlyPropertyRector\:\:refactorWithScope\(\)" is 12, keep it under 11#'
+
+        - '#Parameter \#2 \$callable of method Rector\\Core\\Rector\\AbstractRector\:\:traverseNodesWithCallable\(\) expects callable\(PhpParser\\Node\)\: \(int\|PhpParser\\Node\|null\), Closure\(PhpParser\\Node\)\: \(array<PhpParser\\Node\\Stmt>\|int\|null\) given#'
diff --git a/...ts/DeadCode/Rector/If_/RemoveDeadInstanceOfRector/Fixture/skip_direct_method_call.php.inc b/...ts/DeadCode/Rector/If_/RemoveDeadInstanceOfRector/Fixture/skip_direct_method_call.php.inc
@@ -4,7 +4,7 @@ namespace Rector\Tests\DeadCode\Rector\If_\RemoveDeadInstanceOfRector\Fixture;
 
 use stdClass;
 
-class SkipDirectMethodCall
+final class SkipDirectMethodCall
 {
     private function get(): stdClass
     {
@@ -22,5 +22,3 @@ class SkipDirectMethodCall
         return true;
     }
 }
-
-?>
diff --git a/...-tests/DeadCode/Rector/If_/RemoveDeadInstanceOfRector/Fixture/skip_property_fetch.php.inc b/...-tests/DeadCode/Rector/If_/RemoveDeadInstanceOfRector/Fixture/skip_property_fetch.php.inc
@@ -0,0 +1,26 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\If_\RemoveDeadInstanceOfRector\Fixture;
+
+use stdClass;
+
+final class SkipPropertyFetch
+{
+    /** @var stdClass */
+    private $var;
+
+    public function init()
+    {
+        $this->var = new stdClass;
+    }
+
+    public function go()
+    {
+        if (! $this->var instanceof stdClass) {
+            echo 'you need to run init() first' . PHP_EOL;
+            return;
+        }
+
+        echo 'success' . PHP_EOL;
+    }
+}
diff --git a/...yped_property_filled_by_construct.php.inc → ...yped_property_filled_by_construct.php.inc b/...yped_property_filled_by_construct.php.inc → ...yped_property_filled_by_construct.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\If_\RemoveDeadInstanceOfRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\If_\RemoveTypedPropertyDeadInstanceOfRector\Fixture;
 
 use stdClass;
 
@@ -29,7 +29,7 @@ class NonTypedPropertyFilledByConstruct
 -----
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\If_\RemoveDeadInstanceOfRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\If_\RemoveTypedPropertyDeadInstanceOfRector\Fixture;
 
 use stdClass;
 

diff --git a/...erty_filled_by_construct_hardcode.php.inc → ...erty_filled_by_construct_hardcode.php.inc b/...erty_filled_by_construct_hardcode.php.inc → ...erty_filled_by_construct_hardcode.php.inc
@@ -1,12 +1,11 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\If_\RemoveDeadInstanceOfRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\If_\RemoveTypedPropertyDeadInstanceOfRector\Fixture;
 
 use stdClass;
 
 class NonTypedPropertyFilledByConstructHardCode
 {
-    /** @var stdClass */
     private $var;
 
     public function __construct()
@@ -29,13 +28,12 @@ class NonTypedPropertyFilledByConstructHardCode
 -----
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\If_\RemoveDeadInstanceOfRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\If_\RemoveTypedPropertyDeadInstanceOfRector\Fixture;
 
 use stdClass;
 
 class NonTypedPropertyFilledByConstructHardCode
 {
-    /** @var stdClass */
     private $var;
 
     public function __construct()

diff --git a/..._property_not_filled_by_construct.php.inc → ..._property_not_filled_by_construct.php.inc b/..._property_not_filled_by_construct.php.inc → ..._property_not_filled_by_construct.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\If_\RemoveDeadInstanceOfRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\If_\RemoveTypedPropertyDeadInstanceOfRector\Fixture;
 
 use stdClass;
 

diff --git a/...ceOfRector/Fixture/typed_property.php.inc → ...ceOfRector/Fixture/typed_property.php.inc b/...ceOfRector/Fixture/typed_property.php.inc → ...ceOfRector/Fixture/typed_property.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\If_\RemoveDeadInstanceOfRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\If_\RemoveTypedPropertyDeadInstanceOfRector\Fixture;
 
 use stdClass;
 
@@ -28,7 +28,7 @@ class TypedProperty
 -----
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\If_\RemoveDeadInstanceOfRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\If_\RemoveTypedPropertyDeadInstanceOfRector\Fixture;
 
 use stdClass;
 

diff --git a/...erty_filled_by_construct_hardcode.php.inc → ...erty_filled_by_construct_hardcode.php.inc b/...erty_filled_by_construct_hardcode.php.inc → ...erty_filled_by_construct_hardcode.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\If_\RemoveDeadInstanceOfRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\If_\RemoveTypedPropertyDeadInstanceOfRector\Fixture;
 
 use stdClass;
 
@@ -28,7 +28,7 @@ class TypedPropertyFilledByConstructHardCode
 -----
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\If_\RemoveDeadInstanceOfRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\If_\RemoveTypedPropertyDeadInstanceOfRector\Fixture;
 
 use stdClass;
 

diff --git a/...d_property_via_property_promotion.php.inc → ...d_property_via_property_promotion.php.inc b/...d_property_via_property_promotion.php.inc → ...d_property_via_property_promotion.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\If_\RemoveDeadInstanceOfRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\If_\RemoveTypedPropertyDeadInstanceOfRector\Fixture;
 
 use stdClass;
 
@@ -25,7 +25,7 @@ class TypedPropertyViaPropertyPromotion
 -----
 <?php
 
-namespace Rector\Tests\DeadCode\Rector\If_\RemoveDeadInstanceOfRector\Fixture;
+namespace Rector\Tests\DeadCode\Rector\If_\RemoveTypedPropertyDeadInstanceOfRector\Fixture;
 
 use stdClass;
 

diff --git a/..._/RemoveTypedPropertyDeadInstanceOfRector/RemoveTypedPropertyDeadInstanceOfRectorTest.php b/..._/RemoveTypedPropertyDeadInstanceOfRector/RemoveTypedPropertyDeadInstanceOfRectorTest.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\DeadCode\Rector\If_\RemoveTypedPropertyDeadInstanceOfRector;
+
+use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+
+final class RemoveTypedPropertyDeadInstanceOfRectorTest extends AbstractRectorTestCase
+{
+    #[DataProvider('provideData')]
+    public function test(string $filePath): void
+    {
+        $this->doTestFile($filePath);
+    }
+
+    public static function provideData(): Iterator
+    {
+        return self::yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return __DIR__ . '/config/configured_rule.php';
+    }
+}
diff --git a/...ts/DeadCode/Rector/If_/RemoveTypedPropertyDeadInstanceOfRector/config/configured_rule.php b/...ts/DeadCode/Rector/If_/RemoveTypedPropertyDeadInstanceOfRector/config/configured_rule.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\DeadCode\Rector\If_\RemoveTypedPropertyDeadInstanceOfRector;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->rule(RemoveTypedPropertyDeadInstanceOfRector::class);
+};