diff --git a/docs/AllRectorsOverview.md b/docs/AllRectorsOverview.md index aed64cddf36..71e76d4731c 100644 --- a/docs/AllRectorsOverview.md +++ b/docs/AllRectorsOverview.md @@ -838,7 +838,7 @@ Change array_key_exists() ternary to coalesing ### `ArrayKeysAndInArrayToArrayKeyExistsRector` - class: [`Rector\CodeQuality\Rector\FuncCall\ArrayKeysAndInArrayToArrayKeyExistsRector`](/../master/rules/code-quality/src/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector.php) -- [test fixtures](/../master/rules/code-quality/tests/Rector/FuncCall/ArrayKeysAndInArrayToIssetRector/Fixture) +- [test fixtures](/../master/rules/code-quality/tests/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector/Fixture) Replace array_keys() and in_array() to array_key_exists() @@ -849,7 +849,7 @@ Replace array_keys() and in_array() to array_key_exists() { - $keys = array_keys($values); - return in_array($packageName, $keys, true); -+ return array_keys_exists($values, $packageName)); ++ return array_key_exists($packageName, $values); } } ``` diff --git a/rules/code-quality/src/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector.php b/rules/code-quality/src/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector.php index 696b30b235d..28c6023390c 100644 --- a/rules/code-quality/src/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector.php +++ b/rules/code-quality/src/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector.php @@ -14,7 +14,7 @@ use Rector\Core\RectorDefinition\CodeSample; use Rector\Core\RectorDefinition\RectorDefinition; /** - * @see \Rector\CodeQuality\Tests\Rector\FuncCall\ArrayKeysAndInArrayToIssetRector\ArrayKeysAndInArrayToArrayKeyExistsRectorTest + * @see \Rector\CodeQuality\Tests\Rector\FuncCall\ArrayKeysAndInArrayToArrayKeyExistsRector\ArrayKeysAndInArrayToArrayKeyExistsRectorTest */ final class ArrayKeysAndInArrayToArrayKeyExistsRector extends AbstractRector { @@ -38,7 +38,7 @@ class SomeClass { public function run($packageName, $values) { - return array_keys_exists($values, $packageName)); + return array_key_exists($packageName, $values); } } PHP @@ -100,7 +100,7 @@ PHP private function createArrayKeyExists(FuncCall $inArrayFuncCall, FuncCall $arrayKeysFuncCall): FuncCall { - $arguments = [$arrayKeysFuncCall->args[0], $inArrayFuncCall->args[0]]; + $arguments = [$inArrayFuncCall->args[0], $arrayKeysFuncCall->args[0]]; return new FuncCall(new Name('array_key_exists'), $arguments); } diff --git a/rules/code-quality/tests/Rector/FuncCall/ArrayKeysAndInArrayToIssetRector/ArrayKeysAndInArrayToArrayKeyExistsRectorTest.php b/rules/code-quality/tests/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector/ArrayKeysAndInArrayToArrayKeyExistsRectorTest.php similarity index 96% rename from rules/code-quality/tests/Rector/FuncCall/ArrayKeysAndInArrayToIssetRector/ArrayKeysAndInArrayToArrayKeyExistsRectorTest.php rename to rules/code-quality/tests/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector/ArrayKeysAndInArrayToArrayKeyExistsRectorTest.php index 8301ca51ce2..6899f6c75a9 100644 --- a/rules/code-quality/tests/Rector/FuncCall/ArrayKeysAndInArrayToIssetRector/ArrayKeysAndInArrayToArrayKeyExistsRectorTest.php +++ b/rules/code-quality/tests/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector/ArrayKeysAndInArrayToArrayKeyExistsRectorTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\CodeQuality\Tests\Rector\FuncCall\ArrayKeysAndInArrayToIssetRector; +namespace Rector\CodeQuality\Tests\Rector\FuncCall\ArrayKeysAndInArrayToArrayKeyExistsRector; use Iterator; use Rector\CodeQuality\Rector\FuncCall\ArrayKeysAndInArrayToArrayKeyExistsRector; diff --git a/rules/code-quality/tests/Rector/FuncCall/ArrayKeysAndInArrayToIssetRector/Fixture/fixture.php.inc b/rules/code-quality/tests/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector/Fixture/fixture.php.inc similarity index 89% rename from rules/code-quality/tests/Rector/FuncCall/ArrayKeysAndInArrayToIssetRector/Fixture/fixture.php.inc rename to rules/code-quality/tests/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector/Fixture/fixture.php.inc index e59980681c2..212d7bae67c 100644 --- a/rules/code-quality/tests/Rector/FuncCall/ArrayKeysAndInArrayToIssetRector/Fixture/fixture.php.inc +++ b/rules/code-quality/tests/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector/Fixture/fixture.php.inc @@ -21,7 +21,7 @@ class SomeClass { public function run($packageName, $values) { - return array_key_exists($values, $packageName); + return array_key_exists($packageName, $values); } } diff --git a/rules/code-quality/tests/Rector/FuncCall/ArrayKeysAndInArrayToIssetRector/Fixture/skip_over.php.inc b/rules/code-quality/tests/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector/Fixture/skip_over.php.inc similarity index 100% rename from rules/code-quality/tests/Rector/FuncCall/ArrayKeysAndInArrayToIssetRector/Fixture/skip_over.php.inc rename to rules/code-quality/tests/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector/Fixture/skip_over.php.inc index af01fe8f205..480196c4c94 100644 --- a/rules/code-quality/tests/Rector/FuncCall/ArrayKeysAndInArrayToIssetRector/Fixture/skip_over.php.inc +++ b/rules/code-quality/tests/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector/Fixture/skip_over.php.inc @@ -7,8 +7,8 @@ class SkipOver public function run($values) { $keys = array_keys($values); - } + public function again($packageName, $values, $keys) { return in_array($packageName, $keys, true);