add MakeUseOfContaintsStmtsRector

Author: TomasVotruba

build/build-preload.php

@@ -362,11 +362,6 @@ private function findPhpParserFilesAndSortThem(string $vendorDir): array
         }
 
         return array_values($fileInfos);
-
-        //        $ContainsStmts = new SplFileInfo(__DIR__ . '/../src/Contract/PhpParser/Node/ContainsStmts.php');
-        //        array_splice($fileInfos, 1, 0, [$ContainsStmts]);
-
-        return $fileInfos;
     }
 
     /**

phpstan.neon

@@ -332,7 +332,7 @@ parameters:
 
         -
             identifier: symplify.seeAnnotationToTest
-            path: utils/PHPStan/Rule/PreferDirectIsNameRule.php
+            path: utils/
 
         -
             identifier: arrayValues.list
@@ -356,3 +356,7 @@ parameters:
         -
             identifier: offsetAccess.invalidOffset
             path: src/CustomRules/SimpleNodeDumper.php
+
+        -
+            message: '#Method Rector\\Utils\\Rector\\MakeUseOfContaintsStmtsRector\:\:refactor\(\) should return 4\|PhpParser\\Node\\Expr\\BinaryOp\\Identical\|PhpParser\\Node\\Expr\\MethodCall\|null but returns int\|null#'
+            path: utils/Rector/MakeUseOfContaintsStmtsRector.php

rector.php

@@ -6,6 +6,7 @@
 use Rector\Config\RectorConfig;
 use Rector\DeadCode\Rector\ConstFetch\RemovePhpVersionIdCheckRector;
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
+use Rector\Utils\Rector\MakeUseOfContaintsStmtsRector;
 
 return RectorConfig::configure()
     ->withPreparedSets(
@@ -35,6 +36,7 @@
         __DIR__ . '/config',
         __DIR__ . '/build/build-preload.php',
     ])
+    ->withRules([MakeUseOfContaintsStmtsRector::class])
     ->withRootFiles()
     ->withImportNames(removeUnusedImports: true)
     ->withSkip([

rules/Assert/NodeAnalyzer/ExistingAssertStaticCallResolver.php

@@ -18,14 +18,14 @@ final class ExistingAssertStaticCallResolver
      */
     public function resolve(ClassMethod $classMethod): array
     {
-        if ($classMethod->stmts === null) {
+        if ($classMethod->getStmts() === []) {
             return [];
         }
 
         $existingAssertCallHashes = [];
         $standard = new Standard();
 
-        foreach ($classMethod->stmts as $currentStmt) {
+        foreach ($classMethod->getStmts() as $currentStmt) {
             if (! $currentStmt instanceof Expression) {
                 continue;
             }

rules/Assert/Rector/ClassMethod/AddAssertArrayFromClassMethodDocblockRector.php

@@ -108,7 +108,7 @@ public function refactor(Node $node): ?ClassMethod
             return null;
         }
 
-        if ($node->stmts === null || $node->isAbstract()) {
+        if ($node->getStmts() === [] || $node->isAbstract()) {
             return null;
         }
 

rules/CodeQuality/NodeAnalyzer/ForeachAnalyzer.php

@@ -26,11 +26,11 @@ public function __construct(
      */
     public function matchAssignItemsOnlyForeachArrayVariable(Foreach_ $foreach): ?Expr
     {
-        if (count($foreach->stmts) !== 1) {
+        if (count($foreach->getStmts()) !== 1) {
             return null;
         }
 
-        $onlyStatement = $foreach->stmts[0];
+        $onlyStatement = $foreach->getStmts()[0];
         if ($onlyStatement instanceof Expression) {
             $onlyStatement = $onlyStatement->expr;
         }

rules/CodeQuality/Rector/Catch_/ThrowWithPreviousExceptionRector.php

@@ -96,7 +96,7 @@ public function refactor(Node $node): ?Node
         }
 
         $isChanged = false;
-        $this->traverseNodesWithCallable($node->stmts, function (Node $node) use (
+        $this->traverseNodesWithCallable($node->getStmts(), function (Node $node) use (
             $caughtThrowableVariable,
             &$isChanged
         ): ?int {

rules/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector.php

@@ -124,7 +124,7 @@ public function refactor(Node $node): ?Node
         }
 
         $hasChanged = false;
-        $this->traverseNodesWithCallable((array) $node->stmts, static function (Node $node) use (
+        $this->traverseNodesWithCallable((array) $node->getStmts(), static function (Node $node) use (
             &$hasChanged
         ): int|null|Return_ {
             if ($node instanceof Class_ || $node instanceof Function_ || $node instanceof Closure) {

rules/CodeQuality/Rector/Class_/InlineConstructorDefaultToPropertyRector.php

@@ -81,7 +81,7 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        if ($constructClassMethod->stmts === null) {
+        if ($constructClassMethod->getStmts() === []) {
             return null;
         }
 
@@ -182,14 +182,14 @@ private function refactorProperty(
                     AttributeKey::COMMENTS,
                     array_merge(
                         $classStmt->getComments(),
-                        isset($constructClassMethod->stmts[$key])
-                            ? $constructClassMethod->stmts[$key]->getComments()
+                        isset($constructClassMethod->getStmts()[$key])
+                            ? $constructClassMethod->getStmts()[$key]->getComments()
                             : [],
                     )
                 );
 
                 // remove assign
-                unset($constructClassMethod->stmts[$key]);
+                unset($constructClassMethod->getStmts()[$key]);
 
                 return true;
             }

rules/CodeQuality/Rector/Foreach_/ForeachToInArrayRector.php

@@ -72,7 +72,7 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        if ($node->stmts === null) {
+        if ($node->getStmts() === []) {
             return null;
         }
 
@@ -162,11 +162,11 @@ private function shouldSkipForeach(Foreach_ $foreach): bool
             return true;
         }
 
-        if (count($foreach->stmts) > 1) {
+        if (count($foreach->getStmts()) > 1) {
             return true;
         }
 
-        if (! $foreach->stmts[0] instanceof If_) {
+        if (! $foreach->getStmts()[0] instanceof If_) {
             return true;
         }
 
@@ -196,7 +196,7 @@ private function matchNodes(Equal|Identical $binaryOp, Expr $expr): ?TwoNodeMatc
 
     private function isIfBodyABoolReturnNode(If_ $if): bool
     {
-        $ifStatement = $if->stmts[0];
+        $ifStatement = $if->getStmts()[0];
         if (! $ifStatement instanceof Return_) {
             return false;
         }