Skip to content

[DeadCode] RemoveDeadZeroAndOneOperationRector should not remove Constants #4910

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 3 commits into from
Sep 19, 2023
Merged

[DeadCode] RemoveDeadZeroAndOneOperationRector should not remove Constants #4910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbe4eb9
Create skip_constants.php.inc
TwanVermeulen Sep 4, 2023
5de4b4a
Avoid constant removal for multiplications
TwanVermeulen Sep 15, 2023
028c4b2
Merge branch 'main' of github.com:rectorphp/rector-src into patch-1
TwanVermeulen Sep 19, 2023
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
37 changes: 37 additions & 0 deletions ...s/DeadCode/Rector/Plus/RemoveDeadZeroAndOneOperationRector/Fixture/skip_constants.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?php

namespace Rector\Tests\DeadCode\Rector\Plus\RemoveDeadZeroAndOneOperationRector\Fixture;

class SkipConstants
{
public const ONE = 1;

public function run()
{
$value = 5 * self::ONE;
$value = 5 / self::ONE;
$value = self::ONE * 5;
$value = self::ONE / 5;
}
}

?>
-----
<?php

namespace Rector\Tests\DeadCode\Rector\Plus\RemoveDeadZeroAndOneOperationRector\Fixture;

class SkipConstants
{
public const ONE = 1;

public function run()
{
$value = 5 * self::ONE;
$value = 5 / self::ONE;
$value = self::ONE * 5;
$value = self::ONE / 5;
}
}

?>
Comment on lines +17 to +37
Copy link
Copy Markdown
Member

@samsonasik samsonasik Sep 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

second part is unneeded for equal content

Suggested change
?>
-----
<?php
namespace Rector\Tests\DeadCode\Rector\Plus\RemoveDeadZeroAndOneOperationRector\Fixture;
class SkipConstants
{
public const ONE = 1;
public function run()
{
$value = 5 * self::ONE;
$value = 5 / self::ONE;
$value = self::ONE * 5;
$value = self::ONE / 5;
}
}
?>

Copy link
Copy Markdown
Member

@TomasVotruba TomasVotruba Sep 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, I'll get this merged and fixup as the main work is done 👍

5 changes: 5 additions & 0 deletions rules/DeadCode/Rector/Plus/RemoveDeadZeroAndOneOperationRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use PhpParser\Node\Expr\BinaryOp\Minus;
use PhpParser\Node\Expr\BinaryOp\Mul;
use PhpParser\Node\Expr\BinaryOp\Plus;
use PhpParser\Node\Expr\ClassConstFetch;
use PhpParser\Node\Expr\UnaryMinus;
use Rector\Core\Rector\AbstractRector;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
Expand Down Expand Up @@ -169,6 +170,10 @@ private function processBinaryPlusAndMinus(Plus | Minus $binaryOp): ?Expr

private function processBinaryMulAndDiv(Mul | Div $binaryOp): ?Expr
{
if ($binaryOp->left instanceof ClassConstFetch || $binaryOp->right instanceof ClassConstFetch) {
return null;
}

if (! $this->areNumberType($binaryOp)) {
return null;
}
Expand Down