refactor: for readability

Author: kenjis

phpstan-baseline.php

@@ -877,18 +877,6 @@
 	'count' => 3,
 	'path' => __DIR__ . '/system/Commands/Utilities/Environment.php',
 ];
-$ignoreErrors[] = [
-	// identifier: missingType.iterableValue
-	'message' => '#^Method CodeIgniter\\\\Commands\\\\Utilities\\\\FilterCheck\\:\\:addRequiredFilters\\(\\) has parameter \\$filters with no value type specified in iterable type array\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Commands/Utilities/FilterCheck.php',
-];
-$ignoreErrors[] = [
-	// identifier: missingType.iterableValue
-	'message' => '#^Method CodeIgniter\\\\Commands\\\\Utilities\\\\FilterCheck\\:\\:addRequiredFilters\\(\\) return type has no value type specified in iterable type array\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Commands/Utilities/FilterCheck.php',
-];
 $ignoreErrors[] = [
 	// identifier: missingType.iterableValue
 	'message' => '#^Method CodeIgniter\\\\Commands\\\\Utilities\\\\Namespaces\\:\\:outputAllNamespaces\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#',

system/Commands/Utilities/FilterCheck.php

@@ -133,27 +133,49 @@ private function showTable(
         string $method,
         string $route
     ): void {
-        $tbody = [];
-
-        $filters = $this->addRequiredFilters($filterCollector, $filters);
-
-        $tbody[] = [
-            strtoupper($method),
-            $route,
-            implode(' ', $filters['before']),
-            implode(' ', $filters['after']),
-        ];
-
         $thead = [
             'Method',
             'Route',
             'Before Filters',
             'After Filters',
         ];
 
+        $required = $filterCollector->getRequiredFilters();
+
+        $coloredRequired = $this->colorItems($required);
+
+        $before = array_merge($coloredRequired['before'], $filters['before']);
+        $after  = array_merge($filters['after'], $coloredRequired['after']);
+
+        $tbody   = [];
+        $tbody[] = [
+            strtoupper($method),
+            $route,
+            implode(' ', $before),
+            implode(' ', $after),
+        ];
+
         CLI::table($tbody, $thead);
     }
 
+    /**
+     * Color all elements of the array.
+     *
+     * @param array<array-key, mixed> $array
+     *
+     * @return array<array-key, mixed>
+     */
+    private function colorItems(array $array): array
+    {
+        return array_map(function ($item) {
+            if (is_array($item)) {
+                return $this->colorItems($item);
+            }
+
+            return CLI::color($item, 'yellow');
+        }, $array);
+    }
+
     private function showFilterClasses(
         FilterCollector $filterCollector,
         string $method,
@@ -162,13 +184,7 @@ private function showFilterClasses(
         $requiredFilterClasses = $filterCollector->getRequiredFilterClasses();
         $filterClasses         = $filterCollector->getClasses($method, $route);
 
-        foreach ($requiredFilterClasses as $position => $classes) {
-            foreach ($classes as $class) {
-                $class = CLI::color($class, 'yellow');
-
-                $coloredRequiredFilterClasses[$position][] = $class;
-            }
-        }
+        $coloredRequiredFilterClasses = $this->colorItems($requiredFilterClasses);
 
         $classList = [
             'before' => array_merge($coloredRequiredFilterClasses['before'], $filterClasses['before']),
@@ -180,29 +196,4 @@ private function showFilterClasses(
             CLI::write(implode(' → ', $classes));
         }
     }
-
-    private function addRequiredFilters(FilterCollector $filterCollector, array $filters): array
-    {
-        $output = [];
-
-        $required = $filterCollector->getRequiredFilters();
-
-        $colored = [];
-
-        foreach ($required['before'] as $filter) {
-            $filter    = CLI::color($filter, 'yellow');
-            $colored[] = $filter;
-        }
-        $output['before'] = array_merge($colored, $filters['before']);
-
-        $colored = [];
-
-        foreach ($required['after'] as $filter) {
-            $filter    = CLI::color($filter, 'yellow');
-            $colored[] = $filter;
-        }
-        $output['after'] = array_merge($filters['after'], $colored);
-
-        return $output;
-    }
 }

system/Commands/Utilities/Routes/FilterFinder.php

@@ -160,6 +160,9 @@ public function getRequiredFilterClasses(): array
         $before = $this->filters->getRequiredClasses('before');
         $after  = $this->filters->getRequiredClasses('after');
 
+        $requiredBefore = [];
+        $requiredAfter  = [];
+
         foreach ($before as $classInfo) {
             $requiredBefore[] = $classInfo[0];
         }