[ci-review] Rector Rectify

Author: actions-user

rules-tests/Transform/Rector/FuncCall/WrapFuncCallWithPhpVersionIdCheckerRector/WrapFuncCallWithPhpVersionIdCheckerRectorTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Rector\Tests\Transform\Rector\FuncCall\WrapFuncCallWithPhpVersionIdCheckerRector;
 
 use Iterator;

rules/Php84/Rector/Class_/DeprecatedAnnotationToDeprecatedAttributeRector.php

@@ -21,7 +21,7 @@
 final class DeprecatedAnnotationToDeprecatedAttributeRector extends AbstractRector implements MinPhpVersionInterface
 {
     public function __construct(
-        private readonly DeprecatedAnnotationToDeprecatedAttributeConverter $converter,
+        private readonly DeprecatedAnnotationToDeprecatedAttributeConverter $deprecatedAnnotationToDeprecatedAttributeConverter,
     ) {
     }
 
@@ -75,7 +75,7 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        return $this->converter->convert($node);
+        return $this->deprecatedAnnotationToDeprecatedAttributeConverter->convert($node);
     }
 
     public function provideMinPhpVersion(): int

rules/Php85/Rector/Const_/DeprecatedAnnotationToDeprecatedAttributeRector.php

@@ -19,7 +19,7 @@
 final class DeprecatedAnnotationToDeprecatedAttributeRector extends AbstractRector implements MinPhpVersionInterface
 {
     public function __construct(
-        private readonly DeprecatedAnnotationToDeprecatedAttributeConverter $converter,
+        private readonly DeprecatedAnnotationToDeprecatedAttributeConverter $deprecatedAnnotationToDeprecatedAttributeConverter,
     ) {
     }
 
@@ -52,7 +52,7 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        return $this->converter->convert($node);
+        return $this->deprecatedAnnotationToDeprecatedAttributeConverter->convert($node);
     }
 
     public function provideMinPhpVersion(): int

rules/Transform/Rector/FuncCall/WrapFuncCallWithPhpVersionIdCheckerRector.php

@@ -81,10 +81,12 @@ public function refactor(Node $node): null|Node|int
 
         $hasChanged = false;
         foreach ($node->stmts as $key => $stmt) {
-            if (! $stmt instanceof Expression || ! $stmt->expr instanceof FuncCall) {
+            if (! $stmt instanceof Expression) {
+                continue;
+            }
+            if (! $stmt->expr instanceof FuncCall) {
                 continue;
             }
-
             $funcCall = $stmt->expr;
 
             foreach ($this->wrapFuncCallWithPhpVersionIdCheckers as $wrapFuncCallWithPhpVersionIdChecker) {
@@ -121,35 +123,34 @@ public function configure(array $configuration): void
         $this->wrapFuncCallWithPhpVersionIdCheckers = $configuration;
     }
 
-    private function isWrappedFuncCall(StmtsAwareInterface $node): bool
+    private function isWrappedFuncCall(StmtsAwareInterface $stmtsAware): bool
     {
-        if (! $node instanceof If_) {
+        if (! $stmtsAware instanceof If_) {
             return false;
         }
 
-        $phpVersionId = $this->getPhpVersionId($node->cond);
-        if ($phpVersionId === null) {
+        $phpVersionId = $this->getPhpVersionId($stmtsAware->cond);
+        if (!$phpVersionId instanceof Int_) {
             return false;
         }
 
-        if (count($node->stmts) !== 1) {
+        if (count($stmtsAware->stmts) !== 1) {
             return false;
         }
 
-        $childStmt = $node->stmts[0];
+        $childStmt = $stmtsAware->stmts[0];
 
         if (! $childStmt instanceof Expression || ! $childStmt->expr instanceof FuncCall) {
             return false;
         }
 
         foreach ($this->wrapFuncCallWithPhpVersionIdCheckers as $wrapFuncCallWithPhpVersionIdChecker) {
-            if (
-                $this->getName($childStmt->expr) !== $wrapFuncCallWithPhpVersionIdChecker->getFunctionName()
-                || $phpVersionId->value !== $wrapFuncCallWithPhpVersionIdChecker->getPhpVersionId()
-            ) {
+            if ($this->getName($childStmt->expr) !== $wrapFuncCallWithPhpVersionIdChecker->getFunctionName()) {
+                continue;
+            }
+            if ($phpVersionId->value !== $wrapFuncCallWithPhpVersionIdChecker->getPhpVersionId()) {
                 continue;
             }
-
             return true;
         }
 

src/PhpAttribute/DeprecatedAnnotationToDeprecatedAttributeConverter.php

@@ -25,7 +25,7 @@
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\PhpAttribute\NodeFactory\PhpAttributeGroupFactory;
 
-final class DeprecatedAnnotationToDeprecatedAttributeConverter
+final readonly class DeprecatedAnnotationToDeprecatedAttributeConverter
 {
     /**
      * @see https://regex101.com/r/qNytVk/1
@@ -40,10 +40,10 @@ final class DeprecatedAnnotationToDeprecatedAttributeConverter
     private const START_STAR_SPACED_REGEX = '#^ *\*#ms';
 
     public function __construct(
-        private readonly PhpDocTagRemover $phpDocTagRemover,
-        private readonly PhpAttributeGroupFactory $phpAttributeGroupFactory,
-        private readonly DocBlockUpdater $docBlockUpdater,
-        private readonly PhpDocInfoFactory $phpDocInfoFactory,
+        private PhpDocTagRemover $phpDocTagRemover,
+        private PhpAttributeGroupFactory $phpAttributeGroupFactory,
+        private DocBlockUpdater $docBlockUpdater,
+        private PhpDocInfoFactory $phpDocInfoFactory,
     ) {
     }