Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: use first class callable on function call #9004

Merged
merged 1 commit into from
Jun 26, 2024
Merged

refactor: use first class callable on function call #9004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions system/CLI/BaseCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion system/CLI/CLI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, ' ');
Expand Down
2 changes: 1 addition & 1 deletion system/CLI/GeneratorTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ private function normalizeInputClassName(): string
implode(
'\\',
array_map(
'pascalize',
pascalize(...),
explode('\\', str_replace('/', '\\', trim($class)))
)
),
Expand Down
2 changes: 1 addition & 1 deletion system/Commands/ListCommands.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
8 changes: 4 additions & 4 deletions system/Commands/Utilities/Routes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])),
];
}

Expand Down Expand Up @@ -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']));
}
}

Expand Down
4 changes: 2 additions & 2 deletions system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion system/Cookie/Cookie.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down
2 changes: 1 addition & 1 deletion system/DataCaster/DataCaster.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion system/Database/BaseConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
);

Expand Down
6 changes: 3 additions & 3 deletions system/Database/Forge.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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
);

Expand Down Expand Up @@ -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
);

Expand Down
2 changes: 1 addition & 1 deletion system/Database/MigrationRunner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion system/Database/OCI8/Forge.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'] = '';
}
Expand Down
2 changes: 1 addition & 1 deletion system/Database/SQLite3/Forge.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
}
Expand Down
2 changes: 1 addition & 1 deletion system/Images/Handlers/GDHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions system/Router/RouteCollection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion system/Validation/Rules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Loading