diff --git a/rules-tests/CodingStyle/Rector/FuncCall/StrictInArrayRector/Fixture/both_integers.php.inc b/rules-tests/CodingStyle/Rector/FuncCall/StrictInArrayRector/Fixture/both_integers.php.inc new file mode 100644 index 00000000000..08bd7af21a9 --- /dev/null +++ b/rules-tests/CodingStyle/Rector/FuncCall/StrictInArrayRector/Fixture/both_integers.php.inc @@ -0,0 +1,25 @@ + +----- + diff --git a/rules-tests/CodingStyle/Rector/FuncCall/StrictInArrayRector/Fixture/both_strings.php.inc b/rules-tests/CodingStyle/Rector/FuncCall/StrictInArrayRector/Fixture/both_strings.php.inc new file mode 100644 index 00000000000..473f297fc56 --- /dev/null +++ b/rules-tests/CodingStyle/Rector/FuncCall/StrictInArrayRector/Fixture/both_strings.php.inc @@ -0,0 +1,25 @@ + +----- + diff --git a/rules-tests/CodingStyle/Rector/FuncCall/StrictInArrayRector/Fixture/skip_both_mixed_type.php.inc b/rules-tests/CodingStyle/Rector/FuncCall/StrictInArrayRector/Fixture/skip_both_mixed_type.php.inc new file mode 100644 index 00000000000..e00a59754b0 --- /dev/null +++ b/rules-tests/CodingStyle/Rector/FuncCall/StrictInArrayRector/Fixture/skip_both_mixed_type.php.inc @@ -0,0 +1,14 @@ +doTestFile($filePath); + } + + public static function provideData(): Iterator + { + return self::yieldFilesFromDirectory(__DIR__ . '/Fixture'); + } + + public function provideConfigFilePath(): string + { + return __DIR__ . '/config/configured_rule.php'; + } +} diff --git a/rules-tests/CodingStyle/Rector/FuncCall/StrictInArrayRector/config/configured_rule.php b/rules-tests/CodingStyle/Rector/FuncCall/StrictInArrayRector/config/configured_rule.php new file mode 100644 index 00000000000..40d23d5523a --- /dev/null +++ b/rules-tests/CodingStyle/Rector/FuncCall/StrictInArrayRector/config/configured_rule.php @@ -0,0 +1,9 @@ +withRules([StrictInArrayRector::class]); diff --git a/rules/CodingStyle/Rector/FuncCall/StrictInArrayRector.php b/rules/CodingStyle/Rector/FuncCall/StrictInArrayRector.php new file mode 100644 index 00000000000..d15bb8097f4 --- /dev/null +++ b/rules/CodingStyle/Rector/FuncCall/StrictInArrayRector.php @@ -0,0 +1,94 @@ +> + */ + public function getNodeTypes(): array + { + return [FuncCall::class]; + } + + /** + * @param FuncCall $node + */ + public function refactor(Node $node): ?Node + { + if (! $this->isName($node, 'in_array')) { + return null; + } + + if ($node->isFirstClassCallable()) { + return null; + } + + $args = $node->getArgs(); + if (count($args) !== 2) { + return null; + } + + $firstArgType = $this->nodeTypeResolver->getNativeType($args[0]->value); + $secondArgType = $this->nodeTypeResolver->getNativeType($args[1]->value); + + if (! $secondArgType->isArray()->yes()) { + return null; + } + + if ($this->typeComparator->isSubtype($secondArgType->getIterableValueType(), $firstArgType)) { + $node->args[] = new Arg($this->nodeFactory->createTrue()); + return $node; + } + + return null; + } +} diff --git a/rules/DeadCode/Rector/FuncCall/RemoveFilterVarOnExactTypeRector.php b/rules/DeadCode/Rector/FuncCall/RemoveFilterVarOnExactTypeRector.php index e646656e6e8..482c0b9a152 100644 --- a/rules/DeadCode/Rector/FuncCall/RemoveFilterVarOnExactTypeRector.php +++ b/rules/DeadCode/Rector/FuncCall/RemoveFilterVarOnExactTypeRector.php @@ -84,7 +84,8 @@ public function refactor(Node $node): ?Node if (in_array( $constantFilterName, - ['FILTER_VALIDATE_BOOLEAN', 'FILTER_VALIDATE_BOOL'] + ['FILTER_VALIDATE_BOOLEAN', 'FILTER_VALIDATE_BOOL'], + true ) && $valueType->isBoolean() ->yes()) { return $firstArgValue; diff --git a/src/Config/Level/CodingStyleLevel.php b/src/Config/Level/CodingStyleLevel.php index 718feff2505..c8afe373dc0 100644 --- a/src/Config/Level/CodingStyleLevel.php +++ b/src/Config/Level/CodingStyleLevel.php @@ -20,6 +20,7 @@ use Rector\CodingStyle\Rector\FuncCall\ConsistentImplodeRector; use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector; use Rector\CodingStyle\Rector\FuncCall\StrictArraySearchRector; +use Rector\CodingStyle\Rector\FuncCall\StrictInArrayRector; use Rector\CodingStyle\Rector\FuncCall\VersionCompareFuncCallToConstantRector; use Rector\CodingStyle\Rector\If_\NullableCompareToNullRector; use Rector\CodingStyle\Rector\Property\SplitGroupedPropertiesRector; @@ -75,6 +76,7 @@ final class CodingStyleLevel CallUserFuncToMethodCallRector::class, FuncGetArgsToVariadicParamRector::class, StrictArraySearchRector::class, + StrictInArrayRector::class, UseClassKeywordForClassNameResolutionRector::class, SplitGroupedPropertiesRector::class, SplitGroupedClassConstantsRector::class,