Updated Rector to commit d46cc1a601f7c5e6f0e1fecebf36ed0a30559b1f

rectorphp/rector-src@d46cc1a Rectify (#7216)

Author: TomasVotruba

rules/Php80/Rector/NotIdentical/StrContainsRector.php

@@ -15,7 +15,6 @@
 use PhpParser\Node\Name;
 use PhpParser\Node\Scalar\Int_;
 use Rector\Php80\NodeResolver\StrFalseComparisonResolver;
-use Rector\PhpParser\Node\Value\ValueResolver;
 use Rector\Rector\AbstractRector;
 use Rector\ValueObject\PhpVersionFeature;
 use Rector\ValueObject\PolyfillPackage;

rules/Php83/Rector/BooleanAnd/JsonValidateRector.php

@@ -30,6 +30,9 @@ final class JsonValidateRector extends AbstractRector implements MinPhpVersionIn
      * @readonly
      */
     private BinaryOpManipulator $binaryOpManipulator;
+    /**
+     * @readonly
+     */
     private ValueResolver $valueResolver;
     protected const ARG_NAMES = ['json', 'associative', 'depth', 'flags'];
     private const JSON_MAX_DEPTH = 0x7fffffff;
@@ -51,7 +54,7 @@ public function getRuleDefinition() : RuleDefinition
 CODE_SAMPLE
 , <<<'CODE_SAMPLE'
 if (json_validate($json)) {
-}    
+}
 CODE_SAMPLE
 )]);
     }
@@ -95,26 +98,26 @@ public function matchJsonValidateArg(BooleanAnd $booleanAnd) : ?FuncCall
         if (!$booleanAnd->left instanceof NotIdentical) {
             return null;
         }
-        $decodeMatch = $this->binaryOpManipulator->matchFirstAndSecondConditionNode($booleanAnd->left, fn($node) => $node instanceof FuncCall && $this->isName($node->name, 'json_decode'), fn($node) => $node instanceof ConstFetch && $this->isName($node->name, 'null'));
+        $decodeMatch = $this->binaryOpManipulator->matchFirstAndSecondConditionNode($booleanAnd->left, fn(Node $node): bool => $node instanceof FuncCall && $this->isName($node->name, 'json_decode'), fn(Node $node): bool => $node instanceof ConstFetch && $this->isName($node->name, 'null'));
         if (!$decodeMatch instanceof TwoNodeMatch) {
             return null;
         }
         // match: json_last_error() === JSON_ERROR_NONE   OR   JSON_ERROR_NONE === json_last_error()
         if (!$booleanAnd->right instanceof Identical) {
             return null;
         }
-        $errorMatch = $this->binaryOpManipulator->matchFirstAndSecondConditionNode($booleanAnd->right, fn($node) => $node instanceof FuncCall && $this->isName($node->name, 'json_last_error'), fn($node) => $node instanceof ConstFetch && $this->isName($node->name, 'JSON_ERROR_NONE'));
+        $errorMatch = $this->binaryOpManipulator->matchFirstAndSecondConditionNode($booleanAnd->right, fn(Node $node): bool => $node instanceof FuncCall && $this->isName($node->name, 'json_last_error'), fn(Node $node): bool => $node instanceof ConstFetch && $this->isName($node->name, 'JSON_ERROR_NONE'));
         if (!$errorMatch instanceof TwoNodeMatch) {
             return null;
         }
         // always return the json_decode(...) call
-        $funcCall = $decodeMatch->getFirstExpr();
-        if (!$funcCall instanceof FuncCall) {
+        $expr = $decodeMatch->getFirstExpr();
+        if (!$expr instanceof FuncCall) {
             return null;
         }
-        return $funcCall;
+        return $expr;
     }
-    protected function validateArgs(FuncCall $funcCall) : bool
+    private function validateArgs(FuncCall $funcCall) : bool
     {
         $depth = $funcCall->getArg('depth', 2);
         $flags = $funcCall->getArg('flags', 3);

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'a72065d1676018c9fa346f11ff0cdd2dd7bbe27d';
+    public const PACKAGE_VERSION = 'd46cc1a601f7c5e6f0e1fecebf36ed0a30559b1f';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2025-09-04 20:31:57';
+    public const RELEASE_DATE = '2025-09-04 14:10:50';
     /**
      * @var int
      */