From b030f94c99e09e1b9136d1bf539e20d3b04b2d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o?= Date: Thu, 16 Jan 2025 16:16:11 +0100 Subject: [PATCH 1/2] Fix logical comparision --- .../Rector/Expression/DowngradeThrowExprRector.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/DowngradePhp80/Rector/Expression/DowngradeThrowExprRector.php b/rules/DowngradePhp80/Rector/Expression/DowngradeThrowExprRector.php index 2a7aa9f6..e6783ee2 100644 --- a/rules/DowngradePhp80/Rector/Expression/DowngradeThrowExprRector.php +++ b/rules/DowngradePhp80/Rector/Expression/DowngradeThrowExprRector.php @@ -11,7 +11,7 @@ use PhpParser\Node\Expr\Assign; use PhpParser\Node\Expr\BinaryOp\Coalesce; use PhpParser\Node\Expr\BinaryOp\Identical; -use PhpParser\Node\Expr\BinaryOp\NotIdentical; +use PhpParser\Node\Expr\BinaryOp\Identical; use PhpParser\Node\Expr\BooleanNot; use PhpParser\Node\Expr\Closure; use PhpParser\Node\Expr\ConstFetch; @@ -253,7 +253,7 @@ private function createIf(Coalesce $coalesce, Throw_ $throw): If_ if ($conditionalExpr instanceof Variable || $conditionalExpr instanceof ArrayDimFetch || $conditionalExpr instanceof PropertyFetch) { $booleanNot = new BooleanNot(new Isset_([$conditionalExpr])); } else { - $booleanNot = new NotIdentical($conditionalExpr, new ConstFetch(new Name('null'))); + $booleanNot = new Identical($conditionalExpr, new ConstFetch(new Name('null'))); } return new If_($booleanNot, [ From ea76346fad845abe5fe1bc43f86c8d5efa7eef85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Cun=C3=A9az?= Date: Thu, 16 Jan 2025 17:05:29 +0100 Subject: [PATCH 2/2] Fix tests and remove redundant import --- .../DowngradeThrowExprRector/Fixture/no_isset_on_expr.php.inc | 2 +- .../Rector/Expression/DowngradeThrowExprRector.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/rules-tests/DowngradePhp80/Rector/Expression/DowngradeThrowExprRector/Fixture/no_isset_on_expr.php.inc b/rules-tests/DowngradePhp80/Rector/Expression/DowngradeThrowExprRector/Fixture/no_isset_on_expr.php.inc index b8630ead..ed5e05d6 100644 --- a/rules-tests/DowngradePhp80/Rector/Expression/DowngradeThrowExprRector/Fixture/no_isset_on_expr.php.inc +++ b/rules-tests/DowngradePhp80/Rector/Expression/DowngradeThrowExprRector/Fixture/no_isset_on_expr.php.inc @@ -20,7 +20,7 @@ final class NoIssetOnExpr { public function run($backedEnumClassName, $backedEnumValue) { - if ($backedEnumClassName::tryFrom($backedEnumValue) !== null) { + if ($backedEnumClassName::tryFrom($backedEnumValue) === null) { throw new \Symfony\Component\DependencyInjection\Exception\RuntimeException(sprintf('Enum value "%s" is not backed by "%s".', $backedEnumValue, $backedEnumClassName)); } return $backedEnumClassName::tryFrom($backedEnumValue); diff --git a/rules/DowngradePhp80/Rector/Expression/DowngradeThrowExprRector.php b/rules/DowngradePhp80/Rector/Expression/DowngradeThrowExprRector.php index e6783ee2..57aad9e9 100644 --- a/rules/DowngradePhp80/Rector/Expression/DowngradeThrowExprRector.php +++ b/rules/DowngradePhp80/Rector/Expression/DowngradeThrowExprRector.php @@ -11,7 +11,6 @@ use PhpParser\Node\Expr\Assign; use PhpParser\Node\Expr\BinaryOp\Coalesce; use PhpParser\Node\Expr\BinaryOp\Identical; -use PhpParser\Node\Expr\BinaryOp\Identical; use PhpParser\Node\Expr\BooleanNot; use PhpParser\Node\Expr\Closure; use PhpParser\Node\Expr\ConstFetch;