Skip to content

Drop JSON constants from bitwise-or structurally in JsonConstCleaner #410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TomasVotruba merged 1 commit into from
Oct 18, 2026
Merged

Drop JSON constants from bitwise-or structurally in JsonConstCleaner #410

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 35 additions & 16 deletions rules/DowngradePhp72/NodeManipulator/JsonConstCleaner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@

namespace Rector\DowngradePhp72\NodeManipulator;

use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\BinaryOp\BitwiseOr;
use PhpParser\Node\Expr\ConstFetch;
use PhpParser\Node\Scalar\Int_;
use Rector\Enum\JsonConstant;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\Node\AttributeKey;

final readonly class JsonConstCleaner
{
Expand Down Expand Up @@ -47,35 +45,56 @@ private function cleanByConstFetch(ConstFetch $constFetch, array $constants): ?I
/**
* @param array<JsonConstant::*> $constants
*/
private function cleanByBitwiseOr(BitwiseOr $bitwiseOr, array $constants): null|Expr|Int_
private function cleanByBitwiseOr(BitwiseOr $bitwiseOr, array $constants): ?Expr
{
$isLeftTransformed = $this->isTransformed($bitwiseOr->left, $constants);
$isRightTransformed = $this->isTransformed($bitwiseOr->right, $constants);
$keptOperands = [];
$hasChanged = false;

if (! $isLeftTransformed && ! $isRightTransformed) {
foreach ($this->flattenOperands($bitwiseOr) as $operand) {
if ($operand instanceof ConstFetch && $this->nodeNameResolver->isNames($operand, $constants)) {
$hasChanged = true;
continue;
}

$keptOperands[] = $operand;
}

if (! $hasChanged) {
return null;
}

if (! $isLeftTransformed) {
return $bitwiseOr->left;
if ($keptOperands === []) {
return new Int_(0);
}

if (! $isRightTransformed) {
return $bitwiseOr->right;
$result = array_shift($keptOperands);
foreach ($keptOperands as $keptOperand) {
$result = new BitwiseOr($result, $keptOperand);
}

return new Int_(0);
return $result;
}

/**
* @param string[] $constants
* Flatten a left-associative bitwise-or chain into its operands. Structural, so dropping a
* target constant does not depend on the ORIGINAL_NODE attribute, which is not reliable on
* re-decorated nodes.
*
* @return Expr[]
*/
private function isTransformed(Expr $expr, array $constants): bool
private function flattenOperands(BitwiseOr $bitwiseOr): array
{
if ($expr instanceof ConstFetch && $this->nodeNameResolver->isNames($expr, $constants)) {
return true;
$operands = [];

foreach ([$bitwiseOr->left, $bitwiseOr->right] as $operand) {
if ($operand instanceof BitwiseOr) {
$operands = [...$operands, ...$this->flattenOperands($operand)];
continue;
}

$operands[] = $operand;
}

return ! $expr->getAttribute(AttributeKey::ORIGINAL_NODE) instanceof Node;
return $operands;
}
}
Loading