Merge pull request #3087 from paslandau/fix_array_key_exists_rector

Fix ArrayKeysAndInArrayToArrayKeyExistsRectorTest
This commit is contained in:
Tomas Votruba 2020-03-28 17:40:03 +01:00 committed by GitHub
commit 23b08fc2b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions

View File

@ -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);
}
}
```

View File

@ -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);
}

View File

@ -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;

View File

@ -21,7 +21,7 @@ class SomeClass
{
public function run($packageName, $values)
{
return array_key_exists($values, $packageName);
return array_key_exists($packageName, $values);
}
}

View File

@ -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);