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_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 9fe19d399e2..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_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 66046e53e53..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 453e6f6c2c5..bf006134529 100644 --- a/rules/Php80/Rector/NotIdentical/MbStrContainsRector.php +++ b/rules/Php80/Rector/NotIdentical/MbStrContainsRector.php @@ -5,9 +5,7 @@ namespace Rector\Php80\Rector\NotIdentical; use PhpParser\Node; -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; @@ -78,11 +76,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 { @@ -108,7 +106,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 a180fc4e6a5..1bdedfac64d 100644 --- a/rules/Php80/Rector/NotIdentical/StrContainsRector.php +++ b/rules/Php80/Rector/NotIdentical/StrContainsRector.php @@ -6,9 +6,7 @@ use PhpParser\Node; 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 { @@ -114,7 +112,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); }