zero has no value

Author: TomasVotruba

rules/DowngradePhp72/NodeManipulator/JsonConstCleaner.php

@@ -26,7 +26,16 @@ public function __construct(
     public function clean(ConstFetch|BitwiseOr $node, array $constants): Expr|null
     {
         if ($node instanceof BitwiseOr) {
-            return $this->cleanByBitwiseOr($node, $constants);
+            // remove from bitwise or
+            if ($node->left instanceof ConstFetch && $this->nodeNameResolver->isNames($node->left, $constants)) {
+                return $node->right;
+            }
+
+            if ($node->right instanceof ConstFetch && $this->nodeNameResolver->isNames($node->right, $constants)) {
+                return $node->left;
+            }
+
+            return null;
         }
 
         return $this->cleanByConstFetch($node, $constants);

rules/DowngradePhp73/Rector/ConstFetch/DowngradePhp73JsonConstRector.php

@@ -18,11 +18,11 @@
 use PhpParser\Node\Name\FullyQualified as NameFullyQualified;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\If_;
-use PhpParser\Node\VariadicPlaceholder;
 use Rector\DowngradePhp72\NodeManipulator\JsonConstCleaner;
 use Rector\Enum\JsonConstant;
 use Rector\NodeAnalyzer\DefineFuncCallAnalyzer;
 use Rector\NodeTypeResolver\Node\AttributeKey;
+use Rector\PhpParser\NodeTraverser\SimpleNodeTraverser;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -42,7 +42,7 @@ final class DowngradePhp73JsonConstRector extends AbstractRector
     /**
      * @var array<string>
      */
-    private const REFACTOR_FUNCS = ['json_decode', 'json_encode'];
+    private const JSON_FUNCTIONS = ['json_decode', 'json_encode'];
 
     public function __construct(
         private readonly JsonConstCleaner $jsonConstCleaner,
@@ -103,9 +103,11 @@ public function refactor(Node $node): null|Expr|array
         }
 
         if ($node instanceof Expression) {
-            return $this->refactorStmt($node);
+            return $this->refactorExpression($node);
         }
 
+        dump($node::class);
+
         return $this->jsonConstCleaner->clean($node, [JsonConstant::THROW_ON_ERROR]);
     }
 
@@ -115,15 +117,12 @@ private function markConstantKnownInInnerStmts(If_ $if): void
             return;
         }
 
-        $this->traverseNodesWithCallable($if, static function (Node $node): null {
-            $node->setAttribute(self::PHP73_JSON_CONSTANT_IS_KNOWN, true);
-            return null;
-        });
+        SimpleNodeTraverser::decorateWithAttributeValue($if, self::PHP73_JSON_CONSTANT_IS_KNOWN, true);
     }
 
-    private function resolveFuncCall(Expression $Expression): ?FuncCall
+    private function resolveFuncCall(Expression $expression): ?FuncCall
     {
-        $expr = $Expression->expr;
+        $expr = $expression->expr;
         if ($expr instanceof Assign) {
             if ($expr->expr instanceof FuncCall) {
                 return $expr->expr;
@@ -149,16 +148,13 @@ private function resolveFuncCall(Expression $Expression): ?FuncCall
      *
      * @return null|array<Expression|If_>
      */
-    private function refactorStmt(Expression $expression): ?array
+    private function refactorExpression(Expression $expression): ?array
     {
         if ($expression->getAttribute(AttributeKey::IS_IN_TRY_BLOCK) === true) {
             return null;
         }
 
-        // retrieve a `FuncCall`, if any, from the statement
         $funcCall = $this->resolveFuncCall($expression);
-
-        // Nothing to do if no `FuncCall` found
         if (! $funcCall instanceof FuncCall) {
             return null;
         }
@@ -168,12 +164,12 @@ private function refactorStmt(Expression $expression): ?array
         }
 
         // Nothing to do if not a refactored function
-        if (! $this->isNames($funcCall, self::REFACTOR_FUNCS)) {
+        if (! $this->isNames($funcCall, self::JSON_FUNCTIONS)) {
             return null;
         }
 
         // Nothing to do if the flag `JSON_THROW_ON_ERROR` is not set in args
-        if (! $this->hasConstFetchInArgs($funcCall->args, 'JSON_THROW_ON_ERROR')) {
+        if (! $this->hasConstFetchInArgs($funcCall->getArgs(), 'JSON_THROW_ON_ERROR')) {
             return null;
         }
 
@@ -200,18 +196,12 @@ private function refactorStmt(Expression $expression): ?array
 
     /**
      * Search if a given constant is set within a list of `Arg`
-     * @param array<Arg|VariadicPlaceholder> $args
+     * @param Arg[] $args
      */
     private function hasConstFetchInArgs(array $args, string $constName): bool
     {
         foreach ($args as $arg) {
-            // Only `Arg` instances are handled.
-            if (! $arg instanceof Arg) {
-                return false;
-            }
-
             $value = $arg->value;
-
             if ($value instanceof ConstFetch && $this->getName($value) === $constName) {
                 return true;
             }
@@ -229,8 +219,6 @@ private function hasConstFetchInArgs(array $args, string $constName): bool
      */
     private function hasConstFetchInBitwiseOr(BitwiseOr $bitwiseOr, string $constName): bool
     {
-        $found = false;
-
         foreach ([$bitwiseOr->left, $bitwiseOr->right] as $subNode) {
             $found = match (true) {
                 $subNode instanceof BitwiseOr => (
@@ -243,10 +231,10 @@ private function hasConstFetchInBitwiseOr(BitwiseOr $bitwiseOr, string $constNam
             };
 
             if ($found) {
-                break;
+                return true;
             }
         }
 
-        return $found;
+        return false;
     }
 }

tests/Issues/DowngradeNullJson/Fixture/fixture.php.inc

@@ -22,7 +22,7 @@ class Fixture
 {
     public function run(?int $flags = null)
     {
-        $flags = $flags ?? JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT | JSON_PRESERVE_ZERO_FRACTION;
+        $flags = $flags ?? JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT | JSON_PRESERVE_ZERO_FRACTION | 0;
 
         json_encode([], $flags);
     }