Skip to content

Commit f7a8dde

Browse files
actions-userTomasVotruba
authored andcommitted
[ci-review] Rector Rectify
1 parent bee7236 commit f7a8dde

2 files changed

Lines changed: 5 additions & 13 deletions

File tree

‎scripts/src/NodeRuleMap/NodeRuleMapFactory.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
use Rector\Scripts\Finder\RectorClassFinder;
1111
use ReflectionClass;
1212

13-
final class NodeRuleMapFactory
13+
final readonly class NodeRuleMapFactory
1414
{
1515
public function __construct(
16-
private readonly RectorClassFinder $rectorClassFinder
16+
private RectorClassFinder $rectorClassFinder
1717
) {
1818
}
1919

@@ -54,7 +54,7 @@ public function create(array $ruleDirectories, array $nodeDirectories): array
5454
*/
5555
private function resolveNodeTypesByRectorClass(array $ruleDirectories): array
5656
{
57-
$ruleDirectories = array_filter($ruleDirectories, 'is_dir');
57+
$ruleDirectories = array_filter($ruleDirectories, is_dir(...));
5858
$rectorClasses = $this->rectorClassFinder->find($ruleDirectories);
5959

6060
$nodeTypesByRectorClass = [];
@@ -90,7 +90,7 @@ private function resolveNodeClasses(array $nodeDirectories): array
9090
continue;
9191
}
9292

93-
if (! (new ReflectionClass($class))->isInstantiable()) {
93+
if (! new ReflectionClass($class)->isInstantiable()) {
9494
continue;
9595
}
9696

‎scripts/validate-node-rule-map.php‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,7 @@
3838
// keep only core rules from the committed map
3939
$committedCoreMap = [];
4040
foreach ($committedMap as $nodeClass => $ruleClasses) {
41-
$coreRuleClasses = array_filter($ruleClasses, static function (string $ruleClass) use ($siblingNamespacePrefixes): bool {
42-
foreach ($siblingNamespacePrefixes as $siblingNamespacePrefix) {
43-
if (str_starts_with($ruleClass, $siblingNamespacePrefix)) {
44-
return false;
45-
}
46-
}
47-
48-
return true;
49-
});
41+
$coreRuleClasses = array_filter($ruleClasses, static fn(string $ruleClass): bool => array_all($siblingNamespacePrefixes, fn(string $siblingNamespacePrefix): bool => !str_starts_with($ruleClass, $siblingNamespacePrefix)));
5042

5143
$committedCoreMap[$nodeClass] = array_values($coreRuleClasses);
5244
}

0 commit comments

Comments
 (0)