Merge pull request #9004 from samsonasik/refactor-first-class

samsonasik · web-flow · commit fc5dd88e2266 · 2024-06-26T13:07:49.000+07:00
refactor: use first class callable on function call
diff --git a/system/CLI/BaseCommand.php b/system/CLI/BaseCommand.php
@@ -163,7 +163,7 @@ public function showHelp()
         if ($this->arguments !== []) {
             CLI::newLine();
             CLI::write(lang('CLI.helpArguments'), 'yellow');
-            $length = max(array_map('strlen', array_keys($this->arguments)));
+            $length = max(array_map(strlen(...), array_keys($this->arguments)));
 
             foreach ($this->arguments as $argument => $description) {
                 CLI::write(CLI::color($this->setPad($argument, $length, 2, 2), 'green') . $description);
@@ -173,7 +173,7 @@ public function showHelp()
         if ($this->options !== []) {
             CLI::newLine();
             CLI::write(lang('CLI.helpOptions'), 'yellow');
-            $length = max(array_map('strlen', array_keys($this->options)));
+            $length = max(array_map(strlen(...), array_keys($this->options)));
 
             foreach ($this->options as $option => $description) {
                 CLI::write(CLI::color($this->setPad($option, $length, 2, 2), 'green') . $description);
diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
@@ -393,7 +393,7 @@ private static function isZeroOptions(array $options): void
     private static function printKeysAndValues(array $options): void
     {
         // +2 for the square brackets around the key
-        $keyMaxLength = max(array_map('mb_strwidth', array_keys($options))) + 2;
+        $keyMaxLength = max(array_map(mb_strwidth(...), array_keys($options))) + 2;
 
         foreach ($options as $key => $description) {
             $name = str_pad('  [' . $key . ']  ', $keyMaxLength + 4, ' ');
diff --git a/system/CLI/GeneratorTrait.php b/system/CLI/GeneratorTrait.php
@@ -325,7 +325,7 @@ private function normalizeInputClassName(): string
             implode(
                 '\\',
                 array_map(
-                    'pascalize',
+                    pascalize(...),
                     explode('\\', str_replace('/', '\\', trim($class)))
                 )
             ),
diff --git a/system/Commands/ListCommands.php b/system/Commands/ListCommands.php
@@ -101,7 +101,7 @@ protected function listFull(array $commands)
             $groups[$command['group']][$title] = $command;
         }
 
-        $length = max(array_map('strlen', array_keys($commands)));
+        $length = max(array_map(strlen(...), array_keys($commands)));
 
         ksort($groups);
 
diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
@@ -119,8 +119,8 @@ public function run(array $params)
                 $route['route'],
                 $routeName,
                 $route['handler'],
-                implode(' ', array_map('class_basename', $filters['before'])),
-                implode(' ', array_map('class_basename', $filters['after'])),
+                implode(' ', array_map(class_basename(...), $filters['before'])),
+                implode(' ', array_map(class_basename(...), $filters['after'])),
             ];
         }
 
@@ -166,8 +166,8 @@ public function run(array $params)
                     // There is no `AUTO` method, but it is intentional not to get route filters.
                     $filters = $filterCollector->get('AUTO', $uriGenerator->get($routes[1]));
 
-                    $routes[] = implode(' ', array_map('class_basename', $filters['before']));
-                    $routes[] = implode(' ', array_map('class_basename', $filters['after']));
+                    $routes[] = implode(' ', array_map(class_basename(...), $filters['before']));
+                    $routes[] = implode(' ', array_map(class_basename(...), $filters['after']));
                 }
             }
 
diff --git a/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php b/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php
@@ -125,8 +125,8 @@ private function addFilters($routes)
             $filters['before'] = array_intersect($filtersLongest['before'], $filtersShortest['before']);
             $filters['after']  = array_intersect($filtersLongest['after'], $filtersShortest['after']);
 
-            $route['before'] = implode(' ', array_map('class_basename', $filters['before']));
-            $route['after']  = implode(' ', array_map('class_basename', $filters['after']));
+            $route['before'] = implode(' ', array_map(class_basename(...), $filters['before']));
+            $route['after']  = implode(' ', array_map(class_basename(...), $filters['after']));
         }
 
         return $routes;
diff --git a/system/Cookie/Cookie.php b/system/Cookie/Cookie.php
@@ -283,7 +283,7 @@ public function getPrefixedName(): string
             $name .= $this->getName();
         } else {
             $search  = str_split(self::$reservedCharsList);
-            $replace = array_map('rawurlencode', $search);
+            $replace = array_map(rawurlencode(...), $search);
 
             $name .= str_replace($search, $replace, $this->getName());
         }
diff --git a/system/DataCaster/DataCaster.php b/system/DataCaster/DataCaster.php
@@ -156,7 +156,7 @@ public function castAs(mixed $value, string $field, string $method = 'get'): mix
         // type[param, param2,param3]
         if (preg_match('/\A(.+)\[(.+)\]\z/', $type, $matches)) {
             $type   = $matches[1];
-            $params = array_map('trim', explode(',', $matches[2]));
+            $params = array_map(trim(...), explode(',', $matches[2]));
         }
 
         if ($isNullable && ! $this->strict) {
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
@@ -1519,7 +1519,7 @@ public function tableExists(string $tableName, bool $cached = true): bool
         if (! empty($this->dataCache['table_names'])) {
             $key = array_search(
                 strtolower($tableName),
-                array_map('strtolower', $this->dataCache['table_names']),
+                array_map(strtolower(...), $this->dataCache['table_names']),
                 true
             );
 
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
@@ -306,7 +306,7 @@ public function dropDatabase(string $dbName): bool
         if (! empty($this->db->dataCache['db_names'])) {
             $key = array_search(
                 strtolower($dbName),
-                array_map('strtolower', $this->db->dataCache['db_names']),
+                array_map(strtolower(...), $this->db->dataCache['db_names']),
                 true
             );
             if ($key !== false) {
@@ -667,7 +667,7 @@ public function dropTable(string $tableName, bool $ifExists = false, bool $casca
         if ($query && ! empty($this->db->dataCache['table_names'])) {
             $key = array_search(
                 strtolower($this->db->DBPrefix . $tableName),
-                array_map('strtolower', $this->db->dataCache['table_names']),
+                array_map(strtolower(...), $this->db->dataCache['table_names']),
                 true
             );
 
@@ -729,7 +729,7 @@ public function renameTable(string $tableName, string $newTableName)
         if ($result && ! empty($this->db->dataCache['table_names'])) {
             $key = array_search(
                 strtolower($this->db->DBPrefix . $tableName),
-                array_map('strtolower', $this->db->dataCache['table_names']),
+                array_map(strtolower(...), $this->db->dataCache['table_names']),
                 true
             );
 
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
@@ -686,7 +686,7 @@ public function getBatches(): array
             ->get()
             ->getResultArray();
 
-        return array_map('intval', array_column($batches, 'batch'));
+        return array_map(intval(...), array_column($batches, 'batch'));
     }
 
     /**
diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
@@ -202,7 +202,7 @@ protected function _processColumn(array $processedField): string
             $constraint = ' CHECK(' . $this->db->escapeIdentifiers($processedField['name'])
                 . ' IN ' . $processedField['length'] . ')';
 
-            $processedField['length'] = '(' . max(array_map('mb_strlen', explode("','", mb_substr($processedField['length'], 2, -2)))) . ')' . $constraint;
+            $processedField['length'] = '(' . max(array_map(mb_strlen(...), explode("','", mb_substr($processedField['length'], 2, -2)))) . ')' . $constraint;
         } elseif (isset($this->primaryKeys['fields']) && count($this->primaryKeys['fields']) === 1 && $processedField['name'] === $this->primaryKeys['fields'][0]) {
             $processedField['unique'] = '';
         }
diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php
@@ -101,7 +101,7 @@ public function dropDatabase(string $dbName): bool
         }
 
         if (! empty($this->db->dataCache['db_names'])) {
-            $key = array_search(strtolower($dbName), array_map('strtolower', $this->db->dataCache['db_names']), true);
+            $key = array_search(strtolower($dbName), array_map(strtolower(...), $this->db->dataCache['db_names']), true);
             if ($key !== false) {
                 unset($this->db->dataCache['db_names'][$key]);
             }
diff --git a/system/Images/Handlers/GDHandler.php b/system/Images/Handlers/GDHandler.php
@@ -471,7 +471,7 @@ protected function textOverlay(string $text, array $options = [], bool $isShadow
 
         // shorthand hex, #f00
         if (strlen($color) === 3) {
-            $color = implode('', array_map('str_repeat', str_split($color), [2, 2, 2]));
+            $color = implode('', array_map(str_repeat(...), str_split($color), [2, 2, 2]));
         }
 
         $color = str_split(substr($color, 0, 6), 2);
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
@@ -853,7 +853,7 @@ public function resource(string $name, ?array $options = null): RouteCollectionI
         // In order to allow customization of the route the
         // resources are sent to, we need to have a new name
         // to store the values in.
-        $newName = implode('\\', array_map('ucfirst', explode('/', $name)));
+        $newName = implode('\\', array_map(ucfirst(...), explode('/', $name)));
 
         // If a new controller is specified, then we replace the
         // $name value with the name of the new controller.
@@ -947,7 +947,7 @@ public function presenter(string $name, ?array $options = null): RouteCollection
         // In order to allow customization of the route the
         // resources are sent to, we need to have a new name
         // to store the values in.
-        $newName = implode('\\', array_map('ucfirst', explode('/', $name)));
+        $newName = implode('\\', array_map(ucfirst(...), explode('/', $name)));
 
         // If a new controller is specified, then we replace the
         // $name value with the name of the new controller.
diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php
@@ -159,7 +159,7 @@ public function in_list($value, string $list): bool
             $value = (string) $value;
         }
 
-        $list = array_map('trim', explode(',', $list));
+        $list = array_map(trim(...), explode(',', $list));
 
         return in_array($value, $list, true);
     }

Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ private static function isZeroOptions(array $options): void`
`393`	`393`	`private static function printKeysAndValues(array $options): void`
`394`	`394`	`{`
`395`	`395`	`// +2 for the square brackets around the key`
`396`		`- $keyMaxLength = max(array_map('mb_strwidth', array_keys($options))) + 2;`
	`396`	`+ $keyMaxLength = max(array_map(mb_strwidth(...), array_keys($options))) + 2;`
`397`	`397`
`398`	`398`	`foreach ($options as $key => $description) {`
`399`	`399`	`$name = str_pad(' [' . $key . '] ', $keyMaxLength + 4, ' ');`
Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ private function normalizeInputClassName(): string`
`325`	`325`	`implode(`
`326`	`326`	`'\\',`
`327`	`327`	`array_map(`
`328`		`- 'pascalize',`
	`328`	`+ pascalize(...),`
`329`	`329`	`explode('\\', str_replace('/', '\\', trim($class)))`
`330`	`330`	`)`
`331`	`331`	`),`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ protected function listFull(array $commands)`
`101`	`101`	`$groups[$command['group']][$title] = $command;`
`102`	`102`	`}`
`103`	`103`
`104`		`- $length = max(array_map('strlen', array_keys($commands)));`
	`104`	`+ $length = max(array_map(strlen(...), array_keys($commands)));`
`105`	`105`
`106`	`106`	`ksort($groups);`
`107`	`107`
Original file line number	Diff line number	Diff line change
`@@ -119,8 +119,8 @@ public function run(array $params)`
`119`	`119`	`$route['route'],`
`120`	`120`	`$routeName,`
`121`	`121`	`$route['handler'],`
`122`		`- implode(' ', array_map('class_basename', $filters['before'])),`
`123`		`- implode(' ', array_map('class_basename', $filters['after'])),`
	`122`	`+ implode(' ', array_map(class_basename(...), $filters['before'])),`
	`123`	`+ implode(' ', array_map(class_basename(...), $filters['after'])),`
`124`	`124`	`];`
`125`	`125`	`}`
`126`	`126`
`@@ -166,8 +166,8 @@ public function run(array $params)`
`166`	`166`	// There is no `AUTO` method, but it is intentional not to get route filters.
`167`	`167`	`$filters = $filterCollector->get('AUTO', $uriGenerator->get($routes[1]));`
`168`	`168`
`169`		`- $routes[] = implode(' ', array_map('class_basename', $filters['before']));`
`170`		`- $routes[] = implode(' ', array_map('class_basename', $filters['after']));`
	`169`	`+ $routes[] = implode(' ', array_map(class_basename(...), $filters['before']));`
	`170`	`+ $routes[] = implode(' ', array_map(class_basename(...), $filters['after']));`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`
Original file line number	Diff line number	Diff line change
`@@ -125,8 +125,8 @@ private function addFilters($routes)`
`125`	`125`	`$filters['before'] = array_intersect($filtersLongest['before'], $filtersShortest['before']);`
`126`	`126`	`$filters['after'] = array_intersect($filtersLongest['after'], $filtersShortest['after']);`
`127`	`127`
`128`		`- $route['before'] = implode(' ', array_map('class_basename', $filters['before']));`
`129`		`- $route['after'] = implode(' ', array_map('class_basename', $filters['after']));`
	`128`	`+ $route['before'] = implode(' ', array_map(class_basename(...), $filters['before']));`
	`129`	`+ $route['after'] = implode(' ', array_map(class_basename(...), $filters['after']));`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`return $routes;`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ public function getPrefixedName(): string`
`283`	`283`	`$name .= $this->getName();`
`284`	`284`	`} else {`
`285`	`285`	`$search = str_split(self::$reservedCharsList);`
`286`		`- $replace = array_map('rawurlencode', $search);`
	`286`	`+ $replace = array_map(rawurlencode(...), $search);`
`287`	`287`
`288`	`288`	`$name .= str_replace($search, $replace, $this->getName());`
`289`	`289`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public function castAs(mixed $value, string $field, string $method = 'get'): mix`
`156`	`156`	`// type[param, param2,param3]`
`157`	`157`	`if (preg_match('/\A(.+)\[(.+)\]\z/', $type, $matches)) {`
`158`	`158`	`$type = $matches[1];`
`159`		`- $params = array_map('trim', explode(',', $matches[2]));`
	`159`	`+ $params = array_map(trim(...), explode(',', $matches[2]));`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`if ($isNullable && ! $this->strict) {`