Updated Rector to commit 25e5f0f6f9bbc09fa3622d0dfee5545e72a5f7ff

rectorphp/rector-src@25e5f0f remove array item scope, as handled in array (#7881)

Author: TomasVotruba

rules/Php73/Rector/FuncCall/JsonThrowOnErrorRector.php

@@ -5,6 +5,8 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Arg;
+use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\BinaryOp\BitwiseOr;
 use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Identifier;
@@ -31,6 +33,10 @@ final class JsonThrowOnErrorRector extends AbstractRector implements MinPhpVersi
      * @readonly
      */
     private BetterNodeFinder $betterNodeFinder;
+    /**
+     * @var mixed[]
+     */
+    private const FLAGS = ['JSON_THROW_ON_ERROR'];
     private bool $hasChanged = \false;
     public function __construct(ValueResolver $valueResolver, BetterNodeFinder $betterNodeFinder)
     {
@@ -56,9 +62,6 @@ public function getNodeTypes(): array
     {
         return NodeGroup::STMTS_AWARE;
     }
-    /**
-     * @param StmtsAware $node
-     */
     public function refactor(Node $node): ?Node
     {
         // if found, skip it :)
@@ -109,19 +112,28 @@ private function shouldSkipFuncCall(FuncCall $funcCall): bool
         }
         return $this->isFirstValueStringOrArray($funcCall);
     }
-    private function processJsonEncode(FuncCall $funcCall): ?FuncCall
+    private function processJsonEncode(FuncCall $funcCall): FuncCall
     {
+        $flags = [];
         if (isset($funcCall->args[1])) {
-            return null;
+            /** @var Arg $arg */
+            $arg = $funcCall->args[1];
+            $flags = $this->getFlags($arg);
+        }
+        $newArg = $this->getArgWithFlags($flags);
+        if ($newArg instanceof Arg) {
+            $this->hasChanged = \true;
+            $funcCall->args[1] = $newArg;
         }
-        $this->hasChanged = \true;
-        $funcCall->args[1] = new Arg($this->createConstFetch('JSON_THROW_ON_ERROR'));
         return $funcCall;
     }
-    private function processJsonDecode(FuncCall $funcCall): ?FuncCall
+    private function processJsonDecode(FuncCall $funcCall): FuncCall
     {
+        $flags = [];
         if (isset($funcCall->args[3])) {
-            return null;
+            /** @var Arg $arg */
+            $arg = $funcCall->args[3];
+            $flags = $this->getFlags($arg);
         }
         // set default to inter-args
         if (!isset($funcCall->args[1])) {
@@ -130,8 +142,11 @@ private function processJsonDecode(FuncCall $funcCall): ?FuncCall
         if (!isset($funcCall->args[2])) {
             $funcCall->args[2] = new Arg(new Int_(512));
         }
-        $this->hasChanged = \true;
-        $funcCall->args[3] = new Arg($this->createConstFetch('JSON_THROW_ON_ERROR'));
+        $newArg = $this->getArgWithFlags($flags);
+        if ($newArg instanceof Arg) {
+            $this->hasChanged = \true;
+            $funcCall->args[3] = $newArg;
+        }
         return $funcCall;
     }
     private function createConstFetch(string $name): ConstFetch
@@ -150,4 +165,49 @@ private function isFirstValueStringOrArray(FuncCall $funcCall): bool
         }
         return is_array($value);
     }
+    /**
+     * @param string[] $flags
+     * @return string[]
+     * @param \PhpParser\Node\Expr|\PhpParser\Node\Arg $arg
+     */
+    private function getFlags($arg, array $flags = []): array
+    {
+        // Unwrap Arg
+        if ($arg instanceof Arg) {
+            $arg = $arg->value;
+        }
+        // Single flag: SOME_CONST
+        if ($arg instanceof ConstFetch) {
+            $flags[] = $arg->name->getFirst();
+            return $flags;
+        }
+        // Multiple flags: FLAG_A | FLAG_B | FLAG_C
+        if ($arg instanceof BitwiseOr) {
+            $flags = $this->getFlags($arg->left, $flags);
+            $flags = $this->getFlags($arg->right, $flags);
+        }
+        return array_values(array_unique($flags));
+        // array_unique in case the same flag is written multiple times
+    }
+    /**
+     * @param string[] $flags
+     */
+    private function getArgWithFlags(array $flags): ?Arg
+    {
+        $originalCount = count($flags);
+        $flags = array_values(array_unique(array_merge($flags, self::FLAGS)));
+        if ($originalCount === count($flags)) {
+            return null;
+        }
+        // Single flag
+        if (count($flags) === 1) {
+            return new Arg($this->createConstFetch($flags[0]));
+        }
+        // Build FLAG_A | FLAG_B | FLAG_C
+        $expr = $this->createConstFetch(array_shift($flags));
+        foreach ($flags as $flag) {
+            $expr = new BitwiseOr($expr, $this->createConstFetch($flag));
+        }
+        return new Arg($expr);
+    }
 }

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '4997962de1f53c449dadbef7025bffe5ca41e63c';
+    public const PACKAGE_VERSION = '25e5f0f6f9bbc09fa3622d0dfee5545e72a5f7ff';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2026-02-03 23:37:44';
+    public const RELEASE_DATE = '2026-02-05 00:44:59';
     /**
      * @var int
      */

src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php

@@ -290,10 +290,6 @@ public function processNodes(array $stmts, string $filePath, ?MutatingScope $for
                 $this->processCatch($node, $filePath, $mutatingScope);
                 return;
             }
-            if ($node instanceof ArrayItem) {
-                $this->processArrayItem($node, $mutatingScope);
-                return;
-            }
             if ($node instanceof NullableType) {
                 $node->type->setAttribute(AttributeKey::SCOPE, $mutatingScope);
                 return;