refactor: use first class callable on function call#9004

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

Merged
samsonasik 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
refactor: use first class callable on function call#9004

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

 Merged

samsonasik
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: use first class callable on function call#9004

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

 Merged

samsonasik
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: use first class callable on function call#9004

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

 Merged

samsonasik
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
refactor: use first class callable on function call#9004

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

 Merged

samsonasik
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: use first class callable on function call#9004

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

 Merged

samsonasik
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: use first class callable on function call#9004

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

 Merged

samsonasik
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
refactor: use first class callable on function call#9004

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

 Merged

samsonasik
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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