From b222c807849f88d1df19a2a5403b1765fbb4412b Mon Sep 17 00:00:00 2001 From: Guillaume Sainthillier Date: Mon, 12 Oct 2026 12:01:30 +0200 Subject: [PATCH] [Php80] Skip loose false comparison in StrContainsRector and MbStrContainsRector --- .../Fixture/fixture_equal.php.inc | 27 ------------------- .../Fixture/not_equal_mb_strstr.php.inc | 27 ------------------- .../Fixture/offset_equal_strpos.php.inc | 25 ----------------- .../offset_expression_equal_strpos.php.inc | 27 ------------------- .../offset_negative_equal_strpos.php.inc | 25 ----------------- .../offset_variable_equal_strpos.php.inc | 27 ------------------- .../offset_variable_zero_equal_strpos.php.inc | 27 ------------------- .../Fixture/offset_zero_equal_strpos.php.inc | 25 ----------------- .../Fixture/skip_loose_equal_strpos.php.inc | 13 +++++++++ .../Fixture/skip_loose_equal_strstr.php.inc | 13 +++++++++ .../skip_loose_not_equal_strpos.php.inc | 13 +++++++++ .../skip_loose_not_equal_strstr.php.inc | 13 +++++++++ .../Fixture/skip_loose_the_other_way.php.inc | 13 +++++++++ .../Fixture/strpos_equal.php.inc | 27 ------------------- .../Fixture/strstr_equal.php.inc | 27 ------------------- .../Fixture/the_other_way_equal.php.inc | 27 ------------------- .../Fixture/fixture_equal.php.inc | 27 ------------------- .../Fixture/not_equal_strstr.php.inc | 27 ------------------- .../Fixture/offset_equal_strpos.php.inc | 25 ----------------- .../offset_expression_equal_strpos.php.inc | 27 ------------------- .../offset_negative_equal_strpos.php.inc | 25 ----------------- .../offset_variable_equal_strpos.php.inc | 27 ------------------- .../offset_variable_zero_equal_strpos.php.inc | 27 ------------------- .../Fixture/offset_zero_equal_strpos.php.inc | 25 ----------------- .../Fixture/skip_loose_equal_strpos.php.inc | 13 +++++++++ .../Fixture/skip_loose_equal_strstr.php.inc | 13 +++++++++ .../skip_loose_not_equal_strpos.php.inc | 13 +++++++++ .../skip_loose_not_equal_strstr.php.inc | 13 +++++++++ .../Fixture/skip_loose_the_other_way.php.inc | 13 +++++++++ .../Fixture/strpos_equal.php.inc | 27 ------------------- .../Fixture/strstr_equal.php.inc | 27 ------------------- .../Fixture/the_other_way_equal.php.inc | 27 ------------------- .../StrFalseComparisonResolver.php | 4 +-- .../NotIdentical/MbStrContainsRector.php | 8 +++--- .../Rector/NotIdentical/StrContainsRector.php | 8 +++--- 35 files changed, 137 insertions(+), 595 deletions(-) delete mode 100644 rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/fixture_equal.php.inc delete mode 100644 rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/not_equal_mb_strstr.php.inc delete mode 100644 rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_equal_strpos.php.inc delete mode 100644 rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_expression_equal_strpos.php.inc delete mode 100644 rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_negative_equal_strpos.php.inc delete mode 100644 rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_variable_equal_strpos.php.inc delete mode 100644 rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_variable_zero_equal_strpos.php.inc delete mode 100644 rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_zero_equal_strpos.php.inc create mode 100644 rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/skip_loose_equal_strpos.php.inc create mode 100644 rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/skip_loose_equal_strstr.php.inc create mode 100644 rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/skip_loose_not_equal_strpos.php.inc create mode 100644 rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/skip_loose_not_equal_strstr.php.inc create mode 100644 rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/skip_loose_the_other_way.php.inc delete mode 100644 rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/strpos_equal.php.inc delete mode 100644 rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/strstr_equal.php.inc delete mode 100644 rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/the_other_way_equal.php.inc delete mode 100644 rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/fixture_equal.php.inc delete mode 100644 rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/not_equal_strstr.php.inc delete mode 100644 rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_equal_strpos.php.inc delete mode 100644 rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_expression_equal_strpos.php.inc delete mode 100644 rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_negative_equal_strpos.php.inc delete mode 100644 rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_variable_equal_strpos.php.inc delete mode 100644 rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_variable_zero_equal_strpos.php.inc delete mode 100644 rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_zero_equal_strpos.php.inc create mode 100644 rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/skip_loose_equal_strpos.php.inc create mode 100644 rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/skip_loose_equal_strstr.php.inc create mode 100644 rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/skip_loose_not_equal_strpos.php.inc create mode 100644 rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/skip_loose_not_equal_strstr.php.inc create mode 100644 rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/skip_loose_the_other_way.php.inc delete mode 100644 rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/strpos_equal.php.inc delete mode 100644 rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/strstr_equal.php.inc delete mode 100644 rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/the_other_way_equal.php.inc diff --git a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/fixture_equal.php.inc b/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/fixture_equal.php.inc deleted file mode 100644 index 044cda46f28..00000000000 --- a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/fixture_equal.php.inc +++ /dev/null @@ -1,27 +0,0 @@ - ------ - diff --git a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/not_equal_mb_strstr.php.inc b/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/not_equal_mb_strstr.php.inc deleted file mode 100644 index 8e1ca6f4c53..00000000000 --- a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/not_equal_mb_strstr.php.inc +++ /dev/null @@ -1,27 +0,0 @@ - ------ - diff --git a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_equal_strpos.php.inc b/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_equal_strpos.php.inc deleted file mode 100644 index 7a91da6a599..00000000000 --- a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_equal_strpos.php.inc +++ /dev/null @@ -1,25 +0,0 @@ - ------ - diff --git a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_expression_equal_strpos.php.inc b/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_expression_equal_strpos.php.inc deleted file mode 100644 index b57186ea9d6..00000000000 --- a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_expression_equal_strpos.php.inc +++ /dev/null @@ -1,27 +0,0 @@ - ------ - diff --git a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_negative_equal_strpos.php.inc b/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_negative_equal_strpos.php.inc deleted file mode 100644 index 22c0564cbd9..00000000000 --- a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_negative_equal_strpos.php.inc +++ /dev/null @@ -1,25 +0,0 @@ - ------ - diff --git a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_variable_equal_strpos.php.inc b/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_variable_equal_strpos.php.inc deleted file mode 100644 index defaf7f1515..00000000000 --- a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_variable_equal_strpos.php.inc +++ /dev/null @@ -1,27 +0,0 @@ - ------ - diff --git a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_variable_zero_equal_strpos.php.inc b/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_variable_zero_equal_strpos.php.inc deleted file mode 100644 index ff3e1bc7e9c..00000000000 --- a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_variable_zero_equal_strpos.php.inc +++ /dev/null @@ -1,27 +0,0 @@ - ------ - diff --git a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_zero_equal_strpos.php.inc b/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_zero_equal_strpos.php.inc deleted file mode 100644 index 54cf829f71e..00000000000 --- a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/offset_zero_equal_strpos.php.inc +++ /dev/null @@ -1,25 +0,0 @@ - ------ - diff --git a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/skip_loose_equal_strpos.php.inc b/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/skip_loose_equal_strpos.php.inc new file mode 100644 index 00000000000..d605176f678 --- /dev/null +++ b/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/skip_loose_equal_strpos.php.inc @@ -0,0 +1,13 @@ + diff --git a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/skip_loose_equal_strstr.php.inc b/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/skip_loose_equal_strstr.php.inc new file mode 100644 index 00000000000..c18e239d9e1 --- /dev/null +++ b/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/skip_loose_equal_strstr.php.inc @@ -0,0 +1,13 @@ + diff --git a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/skip_loose_not_equal_strpos.php.inc b/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/skip_loose_not_equal_strpos.php.inc new file mode 100644 index 00000000000..44421af9452 --- /dev/null +++ b/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/skip_loose_not_equal_strpos.php.inc @@ -0,0 +1,13 @@ + diff --git a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/skip_loose_not_equal_strstr.php.inc b/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/skip_loose_not_equal_strstr.php.inc new file mode 100644 index 00000000000..f45b0588a21 --- /dev/null +++ b/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/skip_loose_not_equal_strstr.php.inc @@ -0,0 +1,13 @@ + diff --git a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/skip_loose_the_other_way.php.inc b/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/skip_loose_the_other_way.php.inc new file mode 100644 index 00000000000..1193d772e1c --- /dev/null +++ b/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/skip_loose_the_other_way.php.inc @@ -0,0 +1,13 @@ + diff --git a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/strpos_equal.php.inc b/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/strpos_equal.php.inc deleted file mode 100644 index a6129f96ced..00000000000 --- a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/strpos_equal.php.inc +++ /dev/null @@ -1,27 +0,0 @@ - ------ - diff --git a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/strstr_equal.php.inc b/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/strstr_equal.php.inc deleted file mode 100644 index 039c4b8949e..00000000000 --- a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/strstr_equal.php.inc +++ /dev/null @@ -1,27 +0,0 @@ - ------ - diff --git a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/the_other_way_equal.php.inc b/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/the_other_way_equal.php.inc deleted file mode 100644 index 2e7ef24f8ad..00000000000 --- a/rules-tests/Php80/Rector/NotIdentical/MbStrContainsRector/Fixture/the_other_way_equal.php.inc +++ /dev/null @@ -1,27 +0,0 @@ - ------ - diff --git a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/fixture_equal.php.inc b/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/fixture_equal.php.inc deleted file mode 100644 index e345230dfb5..00000000000 --- a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/fixture_equal.php.inc +++ /dev/null @@ -1,27 +0,0 @@ - ------ - diff --git a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/not_equal_strstr.php.inc b/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/not_equal_strstr.php.inc deleted file mode 100644 index 2467d364c17..00000000000 --- a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/not_equal_strstr.php.inc +++ /dev/null @@ -1,27 +0,0 @@ - ------ - diff --git a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_equal_strpos.php.inc b/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_equal_strpos.php.inc deleted file mode 100644 index 95cda89f4eb..00000000000 --- a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_equal_strpos.php.inc +++ /dev/null @@ -1,25 +0,0 @@ - ------ - diff --git a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_expression_equal_strpos.php.inc b/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_expression_equal_strpos.php.inc deleted file mode 100644 index f86c7683193..00000000000 --- a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_expression_equal_strpos.php.inc +++ /dev/null @@ -1,27 +0,0 @@ - ------ - diff --git a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_negative_equal_strpos.php.inc b/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_negative_equal_strpos.php.inc deleted file mode 100644 index 209324612af..00000000000 --- a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_negative_equal_strpos.php.inc +++ /dev/null @@ -1,25 +0,0 @@ - ------ - diff --git a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_variable_equal_strpos.php.inc b/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_variable_equal_strpos.php.inc deleted file mode 100644 index 3557b7de24b..00000000000 --- a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_variable_equal_strpos.php.inc +++ /dev/null @@ -1,27 +0,0 @@ - ------ - diff --git a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_variable_zero_equal_strpos.php.inc b/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_variable_zero_equal_strpos.php.inc deleted file mode 100644 index 9d891068846..00000000000 --- a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_variable_zero_equal_strpos.php.inc +++ /dev/null @@ -1,27 +0,0 @@ - ------ - diff --git a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_zero_equal_strpos.php.inc b/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_zero_equal_strpos.php.inc deleted file mode 100644 index 771e9a02a83..00000000000 --- a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/offset_zero_equal_strpos.php.inc +++ /dev/null @@ -1,25 +0,0 @@ - ------ - diff --git a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/skip_loose_equal_strpos.php.inc b/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/skip_loose_equal_strpos.php.inc new file mode 100644 index 00000000000..6b282f550db --- /dev/null +++ b/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/skip_loose_equal_strpos.php.inc @@ -0,0 +1,13 @@ + diff --git a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/skip_loose_equal_strstr.php.inc b/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/skip_loose_equal_strstr.php.inc new file mode 100644 index 00000000000..6638ca1f06c --- /dev/null +++ b/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/skip_loose_equal_strstr.php.inc @@ -0,0 +1,13 @@ + diff --git a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/skip_loose_not_equal_strpos.php.inc b/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/skip_loose_not_equal_strpos.php.inc new file mode 100644 index 00000000000..e7ed6ee569e --- /dev/null +++ b/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/skip_loose_not_equal_strpos.php.inc @@ -0,0 +1,13 @@ + diff --git a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/skip_loose_not_equal_strstr.php.inc b/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/skip_loose_not_equal_strstr.php.inc new file mode 100644 index 00000000000..642f47b4218 --- /dev/null +++ b/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/skip_loose_not_equal_strstr.php.inc @@ -0,0 +1,13 @@ + diff --git a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/skip_loose_the_other_way.php.inc b/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/skip_loose_the_other_way.php.inc new file mode 100644 index 00000000000..09be82b6e3c --- /dev/null +++ b/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/skip_loose_the_other_way.php.inc @@ -0,0 +1,13 @@ + diff --git a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/strpos_equal.php.inc b/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/strpos_equal.php.inc deleted file mode 100644 index db6d9ee1e93..00000000000 --- a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/strpos_equal.php.inc +++ /dev/null @@ -1,27 +0,0 @@ - ------ - diff --git a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/strstr_equal.php.inc b/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/strstr_equal.php.inc deleted file mode 100644 index 0d65c0c8977..00000000000 --- a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/strstr_equal.php.inc +++ /dev/null @@ -1,27 +0,0 @@ - ------ - diff --git a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/the_other_way_equal.php.inc b/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/the_other_way_equal.php.inc deleted file mode 100644 index b706a1e6f91..00000000000 --- a/rules-tests/Php80/Rector/NotIdentical/StrContainsRector/Fixture/the_other_way_equal.php.inc +++ /dev/null @@ -1,27 +0,0 @@ - ------ - diff --git a/rules/Php80/NodeResolver/StrFalseComparisonResolver.php b/rules/Php80/NodeResolver/StrFalseComparisonResolver.php index 33e3c6d91a0..3650ab52647 100644 --- a/rules/Php80/NodeResolver/StrFalseComparisonResolver.php +++ b/rules/Php80/NodeResolver/StrFalseComparisonResolver.php @@ -4,9 +4,7 @@ namespace Rector\Php80\NodeResolver; -use PhpParser\Node\Expr\BinaryOp\Equal; use PhpParser\Node\Expr\BinaryOp\Identical; -use PhpParser\Node\Expr\BinaryOp\NotEqual; use PhpParser\Node\Expr\BinaryOp\NotIdentical; use PhpParser\Node\Expr\FuncCall; use Rector\NodeNameResolver\NodeNameResolver; @@ -23,7 +21,7 @@ public function __construct( /** * @param string[] $oldStrFuncNames */ - public function resolve(Identical|NotIdentical|Equal|NotEqual $expr, array $oldStrFuncNames): ?FuncCall + public function resolve(Identical|NotIdentical $expr, array $oldStrFuncNames): ?FuncCall { if ($this->valueResolver->isFalse($expr->left)) { if (! $expr->right instanceof FuncCall) { diff --git a/rules/Php80/Rector/NotIdentical/MbStrContainsRector.php b/rules/Php80/Rector/NotIdentical/MbStrContainsRector.php index d39a825261e..8f8739d3d44 100644 --- a/rules/Php80/Rector/NotIdentical/MbStrContainsRector.php +++ b/rules/Php80/Rector/NotIdentical/MbStrContainsRector.php @@ -7,9 +7,7 @@ use PhpParser\Node; use PhpParser\Node\Arg; use PhpParser\Node\Expr; -use PhpParser\Node\Expr\BinaryOp\Equal; use PhpParser\Node\Expr\BinaryOp\Identical; -use PhpParser\Node\Expr\BinaryOp\NotEqual; use PhpParser\Node\Expr\BinaryOp\NotIdentical; use PhpParser\Node\Expr\BooleanNot; use PhpParser\Node\Expr\FuncCall; @@ -79,11 +77,11 @@ public function run() */ public function getNodeTypes(): array { - return [Identical::class, NotIdentical::class, Equal::class, NotEqual::class]; + return [Identical::class, NotIdentical::class]; } /** - * @param Identical|NotIdentical|Equal|NotEqual $node + * @param Identical|NotIdentical $node */ public function refactor(Node $node): ?Node { @@ -112,7 +110,7 @@ public function refactor(Node $node): ?Node $funcCall->name = new Name('str_contains'); - if ($node instanceof Identical || $node instanceof Equal) { + if ($node instanceof Identical) { return new BooleanNot($funcCall); } diff --git a/rules/Php80/Rector/NotIdentical/StrContainsRector.php b/rules/Php80/Rector/NotIdentical/StrContainsRector.php index 2d555b7bfba..52aa91f17ff 100644 --- a/rules/Php80/Rector/NotIdentical/StrContainsRector.php +++ b/rules/Php80/Rector/NotIdentical/StrContainsRector.php @@ -7,9 +7,7 @@ use PhpParser\Node; use PhpParser\Node\Arg; use PhpParser\Node\Expr; -use PhpParser\Node\Expr\BinaryOp\Equal; use PhpParser\Node\Expr\BinaryOp\Identical; -use PhpParser\Node\Expr\BinaryOp\NotEqual; use PhpParser\Node\Expr\BinaryOp\NotIdentical; use PhpParser\Node\Expr\BooleanNot; use PhpParser\Node\Expr\FuncCall; @@ -80,11 +78,11 @@ public function run() */ public function getNodeTypes(): array { - return [Identical::class, NotIdentical::class, Equal::class, NotEqual::class]; + return [Identical::class, NotIdentical::class]; } /** - * @param Identical|NotIdentical|Equal|NotEqual $node + * @param Identical|NotIdentical $node */ public function refactor(Node $node): ?Node { @@ -118,7 +116,7 @@ public function refactor(Node $node): ?Node $funcCall->name = new Name('str_contains'); - if ($node instanceof Identical || $node instanceof Equal) { + if ($node instanceof Identical) { return new BooleanNot($funcCall); }