refactor: enable AddArrowFunctionReturnTypeRector#9343

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 3 commits into from
Dec 28, 2024
Merged

refactor: enable AddArrowFunctionReturnTypeRector #9343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2ec505
refactor: enable AddArrowFunctionReturnTypeRector
samsonasik Dec 28, 2024
f29210c
refactor: use compare equals 1 for preg_match() return on array_filter
samsonasik Dec 28, 2024
47d69b6
refactor: update var_export() return
samsonasik Dec 28, 2024
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
2 changes: 1 addition & 1 deletion app/Views/errors/cli/error_exception.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@
$function .= $padClass . $error['function'];
}

$args = implode(', ', array_map(static fn ($value) => match (true) {
$args = implode(', ', array_map(static fn ($value): string => match (true) {
is_object($value) => 'Object(' . $value::class . ')',
is_array($value) => $value !== [] ? '[...]' : '[]',
$value === null => 'null', // return the lowercased version
Expand Down
2 changes: 2 additions & 0 deletions rector.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
use Rector\TypeDeclaration\Rector\ArrowFunction\AddArrowFunctionReturnTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
use Rector\TypeDeclaration\Rector\Closure\AddClosureVoidReturnTypeWhereNoReturnRector;
Expand DownExpand Up@@ -201,6 +202,7 @@
TypedPropertyFromAssignsRector::class,
ClosureReturnTypeRector::class,
FlipTypeControlToUseExclusiveTypeRector::class,
AddArrowFunctionReturnTypeRector::class,
])
->withConfiguredRule(StringClassNameToClassConstantRector::class, [
// keep '\\' prefix string on string '\Foo\Bar'
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@@ -339,7 +339,7 @@ public static function promptByMultipleKeys(string $text, array $options): array
$pattern = preg_match_all('/^\d+(,\d+)*$/', trim($input));

// separate input by comma and convert all to an int[]
$inputToArray = array_map(static fn ($value) => (int) $value, explode(',', $input));
$inputToArray = array_map(static fn ($value): int => (int) $value, explode(',', $input));
// find max from key of $options
$maxOptions = array_key_last($options);
// find max from input
Expand Down
2 changes: 1 addition & 1 deletion system/Commands/Utilities/Routes.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -187,7 +187,7 @@ public function run(array $params)

// Sort by Handler.
if ($sortByHandler) {
usort($tbody, static fn ($handler1, $handler2) => strcmp($handler1[3], $handler2[3]));
usort($tbody, static fn ($handler1, $handler2): int => strcmp($handler1[3], $handler2[3]));
}

if ($host !== null) {
Expand Down
18 changes: 9 additions & 9 deletions system/Database/BaseBuilder.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2018,7 +2018,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
$sql = 'INSERT INTO ' . $table . ' (' . implode(', ', $keys) . ")\n{:_table_:}ON DUPLICATE KEY UPDATE\n" . implode(
",\n",
array_map(
static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
' = ' . $value :
' = VALUES(' . $value . ')'),
array_keys($updateFields),
Expand DownExpand Up@@ -2108,7 +2108,7 @@ public function onConstraint($set)
if (is_string($set)) {
$set = explode(',', $set);

$set = array_map(static fn ($key) => trim($key), $set);
$set = array_map(static fn ($key): string => trim($key), $set);
}

if ($set instanceof RawSql) {
Expand DownExpand Up@@ -2152,7 +2152,7 @@ public function setQueryAsData($query, ?string $alias = null, $columns = null):
if (is_string($query)) {
if ($columns !== null && is_string($columns)) {
$columns = explode(',', $columns);
$columns = array_map(static fn ($key) => trim($key), $columns);
$columns = array_map(static fn ($key): string => trim($key), $columns);
}

$columns = (array) $columns;
Expand DownExpand Up@@ -2190,7 +2190,7 @@ protected function fieldsFromQuery(string $sql): array
*/
protected function formatValues(array $values): array
{
return array_map(static fn ($index) => '(' . implode(',', $index) . ')', $values);
return array_map(static fn ($index): string => '(' . implode(',', $index) . ')', $values);
}

/**
Expand DownExpand Up@@ -2649,7 +2649,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
$sql .= implode(
",\n",
array_map(
static fn ($key, $value) => $key . ($value instanceof RawSql ?
static fn ($key, $value): string => $key . ($value instanceof RawSql ?
' = ' . $value :
' = ' . $alias . '.' . $value),
array_keys($updateFields),
Expand DownExpand Up@@ -2691,8 +2691,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
$data = implode(
" UNION ALL\n",
array_map(
static fn ($value) => 'SELECT ' . implode(', ', array_map(
static fn ($key, $index) => $index . ' ' . $key,
static fn ($value): string => 'SELECT ' . implode(', ', array_map(
static fn ($key, $index): string => $index . ' ' . $key,
$keys,
$value
)),
Expand DownExpand Up@@ -2946,8 +2946,8 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
$data = implode(
" UNION ALL\n",
array_map(
static fn ($value) => 'SELECT ' . implode(', ', array_map(
static fn ($key, $index) => $index . ' ' . $key,
static fn ($value): string => 'SELECT ' . implode(', ', array_map(
static fn ($key, $index): string => $index . ' ' . $key,
$keys,
$value
)),
Expand Down
2 changes: 1 addition & 1 deletion system/Database/Forge.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -861,7 +861,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
$columnNamesToDrop = explode(',', $columnNamesToDrop);
}

$columnNamesToDrop = array_map(fn ($field) => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $columnNamesToDrop);
$columnNamesToDrop = array_map(fn ($field): string => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $columnNamesToDrop);

return $sql . implode(', ', $columnNamesToDrop);
}
Expand Down
6 changes: 3 additions & 3 deletions system/Database/MySQLi/Builder.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
$sql .= implode(
",\n",
array_map(
static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
' = ' . $value :
' = ' . $alias . '.' . $value),
array_keys($updateFields),
Expand All@@ -132,8 +132,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
$data = implode(
" UNION ALL\n",
array_map(
static fn ($value) => 'SELECT ' . implode(', ', array_map(
static fn ($key, $index) => $index . ' ' . $key,
static fn ($value): string => 'SELECT ' . implode(', ', array_map(
static fn ($key, $index): string => $index . ' ' . $key,
$keys,
$value
)),
Expand Down
34 changes: 17 additions & 17 deletions system/Database/OCI8/Builder.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,8 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
$data = implode(
" FROM DUAL UNION ALL\n",
array_map(
static fn ($value) => 'SELECT ' . implode(', ', array_map(
static fn ($key, $index) => $index . ' ' . $key,
static fn ($value): string => 'SELECT ' . implode(', ', array_map(
static fn ($key, $index): string => $index . ' ' . $key,
$keys,
$value
)),
Expand All@@ -107,7 +107,7 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
*/
protected function _replace(string $table, array $keys, array $values): string
{
$fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
$fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

$uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
$hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);
Expand All@@ -126,24 +126,24 @@ protected function _replace(string $table, array $keys, array $values): string

$sql = 'MERGE INTO ' . $table . "\n USING (SELECT ";

$sql .= implode(', ', array_map(static fn ($columnName, $value) => $value . ' ' . $columnName, $keys, $values));
$sql .= implode(', ', array_map(static fn ($columnName, $value): string => $value . ' ' . $columnName, $keys, $values));

$sql .= ' FROM DUAL) "_replace" ON ( ';

$onList = [];
$onList[] = '1 != 1';

foreach ($uniqueIndexes as $index) {
$onList[] = '(' . implode(' AND ', array_map(static fn ($columnName) => $table . '."' . $columnName . '" = "_replace"."' . $columnName . '"', $index->fields)) . ')';
$onList[] = '(' . implode(' AND ', array_map(static fn ($columnName): string => $table . '."' . $columnName . '" = "_replace"."' . $columnName . '"', $index->fields)) . ')';
}

$sql .= implode(' OR ', $onList) . ') WHEN MATCHED THEN UPDATE SET ';

$sql .= implode(', ', array_map(static fn ($columnName) => $columnName . ' = "_replace".' . $columnName, $replaceableFields));
$sql .= implode(', ', array_map(static fn ($columnName): string => $columnName . ' = "_replace".' . $columnName, $replaceableFields));

$sql .= ' WHEN NOT MATCHED THEN INSERT (' . implode(', ', $replaceableFields) . ') VALUES ';

return $sql . (' (' . implode(', ', array_map(static fn ($columnName) => '"_replace".' . $columnName, $replaceableFields)) . ')');
return $sql . (' (' . implode(', ', array_map(static fn ($columnName): string => '"_replace".' . $columnName, $replaceableFields)) . ')');
}

/**
Expand DownExpand Up@@ -298,7 +298,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
$sql .= implode(
",\n",
array_map(
static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
' = ' . $value :
' = ' . $alias . '.' . $value),
array_keys($updateFields),
Expand All@@ -315,8 +315,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
$data = implode(
" UNION ALL\n",
array_map(
static fn ($value) => 'SELECT ' . implode(', ', array_map(
static fn ($key, $index) => $index . ' ' . $key,
static fn ($value): string => 'SELECT ' . implode(', ', array_map(
static fn ($key, $index): string => $index . ' ' . $key,
$keys,
$value
)) . ' FROM DUAL',
Expand All@@ -342,7 +342,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
$constraints = $this->QBOptions['constraints'] ?? [];

if (empty($constraints)) {
$fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
$fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

$uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
$hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);
Expand DownExpand Up@@ -401,7 +401,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
$sql .= implode(
",\n",
array_map(
static fn ($key, $value) => $key . ($value instanceof RawSql ?
static fn ($key, $value): string => $key . ($value instanceof RawSql ?
" = {$value}" :
" = {$alias}.{$value}"),
array_keys($updateFields),
Expand All@@ -412,7 +412,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
$sql .= "\nWHEN NOT MATCHED THEN INSERT (" . implode(', ', $keys) . ")\nVALUES ";

$sql .= (' ('
. implode(', ', array_map(static fn ($columnName) => "{$alias}.{$columnName}", $keys))
. implode(', ', array_map(static fn ($columnName): string => "{$alias}.{$columnName}", $keys))
. ')');

$this->QBOptions['sql'] = $sql;
Expand All@@ -424,8 +424,8 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
$data = implode(
" FROM DUAL UNION ALL\n",
array_map(
static fn ($value) => 'SELECT ' . implode(', ', array_map(
static fn ($key, $index) => $index . ' ' . $key,
static fn ($value): string => 'SELECT ' . implode(', ', array_map(
static fn ($key, $index): string => $index . ' ' . $key,
$keys,
$value
)),
Expand DownExpand Up@@ -503,8 +503,8 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
$data = implode(
" FROM DUAL UNION ALL\n",
array_map(
static fn ($value) => 'SELECT ' . implode(', ', array_map(
static fn ($key, $index) => $index . ' ' . $key,
static fn ($value): string => 'SELECT ' . implode(', ', array_map(
static fn ($key, $index): string => $index . ' ' . $key,
$keys,
$value
)),
Expand Down
2 changes: 1 addition & 1 deletion system/Database/OCI8/Result.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public function getFieldCount(): int
*/
public function getFieldNames(): array
{
return array_map(fn ($fieldIndex) => oci_field_name($this->resultID, $fieldIndex), range(1, $this->getFieldCount()));
return array_map(fn ($fieldIndex): false|string => oci_field_name($this->resultID, $fieldIndex), range(1, $this->getFieldCount()));
}

/**
Expand Down
14 changes: 7 additions & 7 deletions system/Database/Postgre/Builder.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -353,7 +353,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
$sql .= implode(
",\n",
array_map(
static fn ($key, $value) => $key . ($value instanceof RawSql ?
static fn ($key, $value): string => $key . ($value instanceof RawSql ?
' = ' . $value :
' = ' . $that->cast($alias . '.' . $value, $that->getFieldType($table, $key))),
array_keys($updateFields),
Expand DownExpand Up@@ -394,8 +394,8 @@ static function ($key, $value) use ($table, $alias, $that): string|RawSql {
$data = implode(
" UNION ALL\n",
array_map(
static fn ($value) => 'SELECT ' . implode(', ', array_map(
static fn ($key, $index) => $index . ' ' . $key,
static fn ($value): string => 'SELECT ' . implode(', ', array_map(
static fn ($key, $index): string => $index . ' ' . $key,
$keys,
$value
)),
Expand DownExpand Up@@ -458,7 +458,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri

// if this is the first iteration of batch then we need to build skeleton sql
if ($sql === '') {
$fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
$fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

$constraints = $this->QBOptions['constraints'] ?? [];

Expand DownExpand Up@@ -524,7 +524,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
$sql .= implode(
",\n",
array_map(
static fn ($key, $value) => $key . ($value instanceof RawSql ?
static fn ($key, $value): string => $key . ($value instanceof RawSql ?
" = {$value}" :
" = {$alias}.{$value}"),
array_keys($updateFields),
Expand DownExpand Up@@ -617,8 +617,8 @@ static function ($key, $value) use ($table, $alias, $that): RawSql|string {
$data = implode(
" UNION ALL\n",
array_map(
static fn ($value) => 'SELECT ' . implode(', ', array_map(
static fn ($key, $index) => $index . ' ' . $key,
static fn ($value): string => 'SELECT ' . implode(', ', array_map(
static fn ($key, $index): string => $index . ' ' . $key,
$keys,
$value
)),
Expand Down
2 changes: 1 addition & 1 deletion system/Database/Postgre/Connection.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -371,7 +371,7 @@ protected function _indexData(string $table): array
$obj = new stdClass();
$obj->name = $row->indexname;
$_fields = explode(',', preg_replace('/^.*\((.+?)\)$/', '$1', trim($row->indexdef)));
$obj->fields = array_map(static fn ($v) => trim($v), $_fields);
$obj->fields = array_map(static fn ($v): string => trim($v), $_fields);

if (str_starts_with($row->indexdef, 'CREATE UNIQUE INDEX pk')) {
$obj->type = 'PRIMARY';
Expand Down
2 changes: 1 addition & 1 deletion system/Database/Query.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ public function debugToolbarDisplay(): string
*/
$search = '/\b(?:' . implode('|', $highlight) . ')\b(?![^(')]*'(?:(?:[^(')]*'){2})*[^(')]*$)/';

return preg_replace_callback($search, static fn ($matches) => '<strong>' . str_replace(' ', '&nbsp;', $matches[0]) . '</strong>', $sql);
return preg_replace_callback($search, static fn ($matches): string => '<strong>' . str_replace(' ', '&nbsp;', $matches[0]) . '</strong>', $sql);
}

/**
Expand Down
6 changes: 3 additions & 3 deletions system/Database/SQLSRV/Builder.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -694,7 +694,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri

$identityInFields = in_array($tableIdentity, $keys, true);

$fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
$fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

if (empty($constraints)) {
$tableIndexes = $this->db->getIndexData($table);
Expand DownExpand Up@@ -773,7 +773,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
$sql .= implode(
",\n",
array_map(
static fn ($key, $value) => $key . ($value instanceof RawSql ?
static fn ($key, $value): string => $key . ($value instanceof RawSql ?
' = ' . $value :
" = {$alias}.{$value}"),
array_keys($updateFields),
Expand All@@ -787,7 +787,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
'(' . implode(
', ',
array_map(
static fn ($columnName) => $columnName === $tableIdentity
static fn ($columnName): string => $columnName === $tableIdentity
? "CASE WHEN {$alias}.{$columnName} IS NULL THEN (SELECT "
. 'isnull(IDENT_CURRENT(\'' . $fullTableName . '\')+IDENT_INCR(\''
. $fullTableName . "'),1)) ELSE {$alias}.{$columnName} END"
Expand Down
Loading
, '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: enable AddArrowFunctionReturnTypeRector#9343

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 3 commits into

from

Dec 28, 2024
 Merged


refactor: enable AddArrowFunctionReturnTypeRector
#9343
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a2ec505

refactor: enable AddArrowFunctionReturnTypeRector


samsonasik Dec 28, 2024
f29210c

refactor: use compare equals 1 for preg_match() return on array_filter


samsonasik Dec 28, 2024
47d69b6

refactor: update var_export() return


samsonasik Dec 28, 2024

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


2 changes: 1 addition & 1 deletion
app/Views/errors/cli/error_exception.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@
 $function .= $padClass . $error['function'];
 }

 $args = implode(', ', array_map(static fn ($value) => match (true) {
 $args = implode(', ', array_map(static fn ($value): string => match (true) {
 is_object($value) => 'Object(' . $value::class . ')',
 is_array($value) => $value !== [] ? '[...]' : '[]',
 $value === null => 'null', // return the lowercased version
Expand Down

2 changes: 2 additions & 0 deletions
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
use Rector\TypeDeclaration\Rector\ArrowFunction\AddArrowFunctionReturnTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
use Rector\TypeDeclaration\Rector\Closure\AddClosureVoidReturnTypeWhereNoReturnRector;
Expand DownExpand Up@@ -201,6 +202,7 @@
 TypedPropertyFromAssignsRector::class,
 ClosureReturnTypeRector::class,
 FlipTypeControlToUseExclusiveTypeRector::class,
 AddArrowFunctionReturnTypeRector::class,
 ])
 ->withConfiguredRule(StringClassNameToClassConstantRector::class, [
 // keep '\\' prefix string on string '\Foo\Bar'
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@@ -339,7 +339,7 @@ public static function promptByMultipleKeys(string $text, array $options): array
 $pattern = preg_match_all('/^\d+(,\d+)*$/', trim($input));

 // separate input by comma and convert all to an int[]
 $inputToArray = array_map(static fn ($value) => (int) $value, explode(',', $input));
 $inputToArray = array_map(static fn ($value): int => (int) $value, explode(',', $input));
 // find max from key of $options
 $maxOptions = array_key_last($options);
 // find max from input
Expand Down

2 changes: 1 addition & 1 deletion
system/Commands/Utilities/Routes.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,7 +187,7 @@ public function run(array $params)

 // Sort by Handler.
 if ($sortByHandler) {
 usort($tbody, static fn ($handler1, $handler2) => strcmp($handler1[3], $handler2[3]));
 usort($tbody, static fn ($handler1, $handler2): int => strcmp($handler1[3], $handler2[3]));
 }

 if ($host !== null) {
Expand Down

18 changes: 9 additions & 9 deletions
system/Database/BaseBuilder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2018,7 +2018,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql = 'INSERT INTO ' . $table . ' (' . implode(', ', $keys) . ")\n{:_table_:}ON DUPLICATE KEY UPDATE\n" . implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = VALUES(' . $value . ')'),
 array_keys($updateFields),
Expand DownExpand Up@@ -2108,7 +2108,7 @@ public function onConstraint($set)
 if (is_string($set)) {
 $set = explode(',', $set);

 $set = array_map(static fn ($key) => trim($key), $set);
 $set = array_map(static fn ($key): string => trim($key), $set);
 }

 if ($set instanceof RawSql) {
Expand DownExpand Up@@ -2152,7 +2152,7 @@ public function setQueryAsData($query, ?string $alias = null, $columns = null):
 if (is_string($query)) {
 if ($columns !== null && is_string($columns)) {
 $columns = explode(',', $columns);
 $columns = array_map(static fn ($key) => trim($key), $columns);
 $columns = array_map(static fn ($key): string => trim($key), $columns);
 }

 $columns = (array) $columns;
Expand DownExpand Up@@ -2190,7 +2190,7 @@ protected function fieldsFromQuery(string $sql): array
 */
 protected function formatValues(array $values): array
 {
 return array_map(static fn ($index) => '(' . implode(',', $index) . ')', $values);
 return array_map(static fn ($index): string => '(' . implode(',', $index) . ')', $values);
 }

 /**
Expand DownExpand Up@@ -2649,7 +2649,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $alias . '.' . $value),
 array_keys($updateFields),
Expand DownExpand Up@@ -2691,8 +2691,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand DownExpand Up@@ -2946,8 +2946,8 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -861,7 +861,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
 $columnNamesToDrop = explode(',', $columnNamesToDrop);
 }

 $columnNamesToDrop = array_map(fn ($field) => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $columnNamesToDrop);
 $columnNamesToDrop = array_map(fn ($field): string => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $columnNamesToDrop);

 return $sql . implode(', ', $columnNamesToDrop);
 }
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/MySQLi/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $alias . '.' . $value),
 array_keys($updateFields),
Expand All@@ -132,8 +132,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

34 changes: 17 additions & 17 deletions
system/Database/OCI8/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,8 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " FROM DUAL UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand All@@ -107,7 +107,7 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
 */
 protected function _replace(string $table, array $keys, array $values): string
 {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);
Expand All@@ -126,24 +126,24 @@ protected function _replace(string $table, array $keys, array $values): string

 $sql = 'MERGE INTO ' . $table . "\n USING (SELECT ";

 $sql .= implode(', ', array_map(static fn ($columnName, $value) => $value . ' ' . $columnName, $keys, $values));
 $sql .= implode(', ', array_map(static fn ($columnName, $value): string => $value . ' ' . $columnName, $keys, $values));

 $sql .= ' FROM DUAL) "_replace" ON ( ';

 $onList = [];
 $onList[] = '1 != 1';

 foreach ($uniqueIndexes as $index) {
 $onList[] = '(' . implode(' AND ', array_map(static fn ($columnName) => $table . '."' . $columnName . '" = "_replace"."' . $columnName . '"', $index->fields)) . ')';
 $onList[] = '(' . implode(' AND ', array_map(static fn ($columnName): string => $table . '."' . $columnName . '" = "_replace"."' . $columnName . '"', $index->fields)) . ')';
 }

 $sql .= implode(' OR ', $onList) . ') WHEN MATCHED THEN UPDATE SET ';

 $sql .= implode(', ', array_map(static fn ($columnName) => $columnName . ' = "_replace".' . $columnName, $replaceableFields));
 $sql .= implode(', ', array_map(static fn ($columnName): string => $columnName . ' = "_replace".' . $columnName, $replaceableFields));

 $sql .= ' WHEN NOT MATCHED THEN INSERT (' . implode(', ', $replaceableFields) . ') VALUES ';

 return $sql . (' (' . implode(', ', array_map(static fn ($columnName) => '"_replace".' . $columnName, $replaceableFields)) . ')');
 return $sql . (' (' . implode(', ', array_map(static fn ($columnName): string => '"_replace".' . $columnName, $replaceableFields)) . ')');
 }

 /**
Expand DownExpand Up@@ -298,7 +298,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $alias . '.' . $value),
 array_keys($updateFields),
Expand All@@ -315,8 +315,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )) . ' FROM DUAL',
Expand All@@ -342,7 +342,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $constraints = $this->QBOptions['constraints'] ?? [];

 if (empty($constraints)) {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);
Expand DownExpand Up@@ -401,7 +401,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 " = {$value}" :
 " = {$alias}.{$value}"),
 array_keys($updateFields),
Expand All@@ -412,7 +412,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= "\nWHEN NOT MATCHED THEN INSERT (" . implode(', ', $keys) . ")\nVALUES ";

 $sql .= (' ('
 . implode(', ', array_map(static fn ($columnName) => "{$alias}.{$columnName}", $keys))
 . implode(', ', array_map(static fn ($columnName): string => "{$alias}.{$columnName}", $keys))
 . ')');

 $this->QBOptions['sql'] = $sql;
Expand All@@ -424,8 +424,8 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " FROM DUAL UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand DownExpand Up@@ -503,8 +503,8 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " FROM DUAL UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/OCI8/Result.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public function getFieldCount(): int
 */
 public function getFieldNames(): array
 {
 return array_map(fn ($fieldIndex) => oci_field_name($this->resultID, $fieldIndex), range(1, $this->getFieldCount()));
 return array_map(fn ($fieldIndex): false|string => oci_field_name($this->resultID, $fieldIndex), range(1, $this->getFieldCount()));
 }

 /**
Expand Down

14 changes: 7 additions & 7 deletions
system/Database/Postgre/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -353,7 +353,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $that->cast($alias . '.' . $value, $that->getFieldType($table, $key))),
 array_keys($updateFields),
Expand DownExpand Up@@ -394,8 +394,8 @@ static function ($key, $value) use ($table, $alias, $that): string|RawSql {
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand DownExpand Up@@ -458,7 +458,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri

 // if this is the first iteration of batch then we need to build skeleton sql
 if ($sql === '') {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 $constraints = $this->QBOptions['constraints'] ?? [];

Expand DownExpand Up@@ -524,7 +524,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 " = {$value}" :
 " = {$alias}.{$value}"),
 array_keys($updateFields),
Expand DownExpand Up@@ -617,8 +617,8 @@ static function ($key, $value) use ($table, $alias, $that): RawSql|string {
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Postgre/Connection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -371,7 +371,7 @@ protected function _indexData(string $table): array
 $obj = new stdClass();
 $obj->name = $row->indexname;
 $_fields = explode(',', preg_replace('/^.*\((.+?)\)$/', '$1', trim($row->indexdef)));
 $obj->fields = array_map(static fn ($v) => trim($v), $_fields);
 $obj->fields = array_map(static fn ($v): string => trim($v), $_fields);

 if (str_starts_with($row->indexdef, 'CREATE UNIQUE INDEX pk')) {
 $obj->type = 'PRIMARY';
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Query.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ public function debugToolbarDisplay(): string
 */
 $search = '/\b(?:' . implode('|', $highlight) . ')\b(?![^(&#039;)]*&#039;(?:(?:[^(&#039;)]*&#039;){2})*[^(&#039;)]*$)/';

 return preg_replace_callback($search, static fn ($matches) => '<strong>' . str_replace(' ', '&nbsp;', $matches[0]) . '</strong>', $sql);
 return preg_replace_callback($search, static fn ($matches): string => '<strong>' . str_replace(' ', '&nbsp;', $matches[0]) . '</strong>', $sql);
 }

 /**
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/SQLSRV/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -694,7 +694,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri

 $identityInFields = in_array($tableIdentity, $keys, true);

 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 if (empty($constraints)) {
 $tableIndexes = $this->db->getIndexData($table);
Expand DownExpand Up@@ -773,7 +773,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 ' = ' . $value :
 " = {$alias}.{$value}"),
 array_keys($updateFields),
Expand All@@ -787,7 +787,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 '(' . implode(
 ', ',
 array_map(
 static fn ($columnName) => $columnName === $tableIdentity
 static fn ($columnName): string => $columnName === $tableIdentity
 ? "CASE WHEN {$alias}.{$columnName} IS NULL THEN (SELECT "
 . 'isnull(IDENT_CURRENT(\'' . $fullTableName . '\')+IDENT_INCR(\''
 . $fullTableName . "'),1)) ELSE {$alias}.{$columnName} END"
Expand Down
Loading

, '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: enable AddArrowFunctionReturnTypeRector#9343

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 3 commits into

from

Dec 28, 2024
 Merged


refactor: enable AddArrowFunctionReturnTypeRector
#9343
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a2ec505

refactor: enable AddArrowFunctionReturnTypeRector


samsonasik Dec 28, 2024
f29210c

refactor: use compare equals 1 for preg_match() return on array_filter


samsonasik Dec 28, 2024
47d69b6

refactor: update var_export() return


samsonasik Dec 28, 2024

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


2 changes: 1 addition & 1 deletion
app/Views/errors/cli/error_exception.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@
 $function .= $padClass . $error['function'];
 }

 $args = implode(', ', array_map(static fn ($value) => match (true) {
 $args = implode(', ', array_map(static fn ($value): string => match (true) {
 is_object($value) => 'Object(' . $value::class . ')',
 is_array($value) => $value !== [] ? '[...]' : '[]',
 $value === null => 'null', // return the lowercased version
Expand Down

2 changes: 2 additions & 0 deletions
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
use Rector\TypeDeclaration\Rector\ArrowFunction\AddArrowFunctionReturnTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
use Rector\TypeDeclaration\Rector\Closure\AddClosureVoidReturnTypeWhereNoReturnRector;
Expand DownExpand Up@@ -201,6 +202,7 @@
 TypedPropertyFromAssignsRector::class,
 ClosureReturnTypeRector::class,
 FlipTypeControlToUseExclusiveTypeRector::class,
 AddArrowFunctionReturnTypeRector::class,
 ])
 ->withConfiguredRule(StringClassNameToClassConstantRector::class, [
 // keep '\\' prefix string on string '\Foo\Bar'
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@@ -339,7 +339,7 @@ public static function promptByMultipleKeys(string $text, array $options): array
 $pattern = preg_match_all('/^\d+(,\d+)*$/', trim($input));

 // separate input by comma and convert all to an int[]
 $inputToArray = array_map(static fn ($value) => (int) $value, explode(',', $input));
 $inputToArray = array_map(static fn ($value): int => (int) $value, explode(',', $input));
 // find max from key of $options
 $maxOptions = array_key_last($options);
 // find max from input
Expand Down

2 changes: 1 addition & 1 deletion
system/Commands/Utilities/Routes.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,7 +187,7 @@ public function run(array $params)

 // Sort by Handler.
 if ($sortByHandler) {
 usort($tbody, static fn ($handler1, $handler2) => strcmp($handler1[3], $handler2[3]));
 usort($tbody, static fn ($handler1, $handler2): int => strcmp($handler1[3], $handler2[3]));
 }

 if ($host !== null) {
Expand Down

18 changes: 9 additions & 9 deletions
system/Database/BaseBuilder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2018,7 +2018,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql = 'INSERT INTO ' . $table . ' (' . implode(', ', $keys) . ")\n{:_table_:}ON DUPLICATE KEY UPDATE\n" . implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = VALUES(' . $value . ')'),
 array_keys($updateFields),
Expand DownExpand Up@@ -2108,7 +2108,7 @@ public function onConstraint($set)
 if (is_string($set)) {
 $set = explode(',', $set);

 $set = array_map(static fn ($key) => trim($key), $set);
 $set = array_map(static fn ($key): string => trim($key), $set);
 }

 if ($set instanceof RawSql) {
Expand DownExpand Up@@ -2152,7 +2152,7 @@ public function setQueryAsData($query, ?string $alias = null, $columns = null):
 if (is_string($query)) {
 if ($columns !== null && is_string($columns)) {
 $columns = explode(',', $columns);
 $columns = array_map(static fn ($key) => trim($key), $columns);
 $columns = array_map(static fn ($key): string => trim($key), $columns);
 }

 $columns = (array) $columns;
Expand DownExpand Up@@ -2190,7 +2190,7 @@ protected function fieldsFromQuery(string $sql): array
 */
 protected function formatValues(array $values): array
 {
 return array_map(static fn ($index) => '(' . implode(',', $index) . ')', $values);
 return array_map(static fn ($index): string => '(' . implode(',', $index) . ')', $values);
 }

 /**
Expand DownExpand Up@@ -2649,7 +2649,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $alias . '.' . $value),
 array_keys($updateFields),
Expand DownExpand Up@@ -2691,8 +2691,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand DownExpand Up@@ -2946,8 +2946,8 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -861,7 +861,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
 $columnNamesToDrop = explode(',', $columnNamesToDrop);
 }

 $columnNamesToDrop = array_map(fn ($field) => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $columnNamesToDrop);
 $columnNamesToDrop = array_map(fn ($field): string => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $columnNamesToDrop);

 return $sql . implode(', ', $columnNamesToDrop);
 }
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/MySQLi/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $alias . '.' . $value),
 array_keys($updateFields),
Expand All@@ -132,8 +132,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

34 changes: 17 additions & 17 deletions
system/Database/OCI8/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,8 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " FROM DUAL UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand All@@ -107,7 +107,7 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
 */
 protected function _replace(string $table, array $keys, array $values): string
 {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);
Expand All@@ -126,24 +126,24 @@ protected function _replace(string $table, array $keys, array $values): string

 $sql = 'MERGE INTO ' . $table . "\n USING (SELECT ";

 $sql .= implode(', ', array_map(static fn ($columnName, $value) => $value . ' ' . $columnName, $keys, $values));
 $sql .= implode(', ', array_map(static fn ($columnName, $value): string => $value . ' ' . $columnName, $keys, $values));

 $sql .= ' FROM DUAL) "_replace" ON ( ';

 $onList = [];
 $onList[] = '1 != 1';

 foreach ($uniqueIndexes as $index) {
 $onList[] = '(' . implode(' AND ', array_map(static fn ($columnName) => $table . '."' . $columnName . '" = "_replace"."' . $columnName . '"', $index->fields)) . ')';
 $onList[] = '(' . implode(' AND ', array_map(static fn ($columnName): string => $table . '."' . $columnName . '" = "_replace"."' . $columnName . '"', $index->fields)) . ')';
 }

 $sql .= implode(' OR ', $onList) . ') WHEN MATCHED THEN UPDATE SET ';

 $sql .= implode(', ', array_map(static fn ($columnName) => $columnName . ' = "_replace".' . $columnName, $replaceableFields));
 $sql .= implode(', ', array_map(static fn ($columnName): string => $columnName . ' = "_replace".' . $columnName, $replaceableFields));

 $sql .= ' WHEN NOT MATCHED THEN INSERT (' . implode(', ', $replaceableFields) . ') VALUES ';

 return $sql . (' (' . implode(', ', array_map(static fn ($columnName) => '"_replace".' . $columnName, $replaceableFields)) . ')');
 return $sql . (' (' . implode(', ', array_map(static fn ($columnName): string => '"_replace".' . $columnName, $replaceableFields)) . ')');
 }

 /**
Expand DownExpand Up@@ -298,7 +298,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $alias . '.' . $value),
 array_keys($updateFields),
Expand All@@ -315,8 +315,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )) . ' FROM DUAL',
Expand All@@ -342,7 +342,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $constraints = $this->QBOptions['constraints'] ?? [];

 if (empty($constraints)) {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);
Expand DownExpand Up@@ -401,7 +401,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 " = {$value}" :
 " = {$alias}.{$value}"),
 array_keys($updateFields),
Expand All@@ -412,7 +412,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= "\nWHEN NOT MATCHED THEN INSERT (" . implode(', ', $keys) . ")\nVALUES ";

 $sql .= (' ('
 . implode(', ', array_map(static fn ($columnName) => "{$alias}.{$columnName}", $keys))
 . implode(', ', array_map(static fn ($columnName): string => "{$alias}.{$columnName}", $keys))
 . ')');

 $this->QBOptions['sql'] = $sql;
Expand All@@ -424,8 +424,8 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " FROM DUAL UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand DownExpand Up@@ -503,8 +503,8 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " FROM DUAL UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/OCI8/Result.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public function getFieldCount(): int
 */
 public function getFieldNames(): array
 {
 return array_map(fn ($fieldIndex) => oci_field_name($this->resultID, $fieldIndex), range(1, $this->getFieldCount()));
 return array_map(fn ($fieldIndex): false|string => oci_field_name($this->resultID, $fieldIndex), range(1, $this->getFieldCount()));
 }

 /**
Expand Down

14 changes: 7 additions & 7 deletions
system/Database/Postgre/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -353,7 +353,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $that->cast($alias . '.' . $value, $that->getFieldType($table, $key))),
 array_keys($updateFields),
Expand DownExpand Up@@ -394,8 +394,8 @@ static function ($key, $value) use ($table, $alias, $that): string|RawSql {
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand DownExpand Up@@ -458,7 +458,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri

 // if this is the first iteration of batch then we need to build skeleton sql
 if ($sql === '') {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 $constraints = $this->QBOptions['constraints'] ?? [];

Expand DownExpand Up@@ -524,7 +524,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 " = {$value}" :
 " = {$alias}.{$value}"),
 array_keys($updateFields),
Expand DownExpand Up@@ -617,8 +617,8 @@ static function ($key, $value) use ($table, $alias, $that): RawSql|string {
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Postgre/Connection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -371,7 +371,7 @@ protected function _indexData(string $table): array
 $obj = new stdClass();
 $obj->name = $row->indexname;
 $_fields = explode(',', preg_replace('/^.*\((.+?)\)$/', '$1', trim($row->indexdef)));
 $obj->fields = array_map(static fn ($v) => trim($v), $_fields);
 $obj->fields = array_map(static fn ($v): string => trim($v), $_fields);

 if (str_starts_with($row->indexdef, 'CREATE UNIQUE INDEX pk')) {
 $obj->type = 'PRIMARY';
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Query.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ public function debugToolbarDisplay(): string
 */
 $search = '/\b(?:' . implode('|', $highlight) . ')\b(?![^(&#039;)]*&#039;(?:(?:[^(&#039;)]*&#039;){2})*[^(&#039;)]*$)/';

 return preg_replace_callback($search, static fn ($matches) => '<strong>' . str_replace(' ', '&nbsp;', $matches[0]) . '</strong>', $sql);
 return preg_replace_callback($search, static fn ($matches): string => '<strong>' . str_replace(' ', '&nbsp;', $matches[0]) . '</strong>', $sql);
 }

 /**
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/SQLSRV/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -694,7 +694,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri

 $identityInFields = in_array($tableIdentity, $keys, true);

 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 if (empty($constraints)) {
 $tableIndexes = $this->db->getIndexData($table);
Expand DownExpand Up@@ -773,7 +773,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 ' = ' . $value :
 " = {$alias}.{$value}"),
 array_keys($updateFields),
Expand All@@ -787,7 +787,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 '(' . implode(
 ', ',
 array_map(
 static fn ($columnName) => $columnName === $tableIdentity
 static fn ($columnName): string => $columnName === $tableIdentity
 ? "CASE WHEN {$alias}.{$columnName} IS NULL THEN (SELECT "
 . 'isnull(IDENT_CURRENT(\'' . $fullTableName . '\')+IDENT_INCR(\''
 . $fullTableName . "'),1)) ELSE {$alias}.{$columnName} END"
Expand Down
Loading

, '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: enable AddArrowFunctionReturnTypeRector#9343

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 3 commits into

from

Dec 28, 2024
 Merged


refactor: enable AddArrowFunctionReturnTypeRector
#9343
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a2ec505

refactor: enable AddArrowFunctionReturnTypeRector


samsonasik Dec 28, 2024
f29210c

refactor: use compare equals 1 for preg_match() return on array_filter


samsonasik Dec 28, 2024
47d69b6

refactor: update var_export() return


samsonasik Dec 28, 2024

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


2 changes: 1 addition & 1 deletion
app/Views/errors/cli/error_exception.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@
 $function .= $padClass . $error['function'];
 }

 $args = implode(', ', array_map(static fn ($value) => match (true) {
 $args = implode(', ', array_map(static fn ($value): string => match (true) {
 is_object($value) => 'Object(' . $value::class . ')',
 is_array($value) => $value !== [] ? '[...]' : '[]',
 $value === null => 'null', // return the lowercased version
Expand Down

2 changes: 2 additions & 0 deletions
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
use Rector\TypeDeclaration\Rector\ArrowFunction\AddArrowFunctionReturnTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
use Rector\TypeDeclaration\Rector\Closure\AddClosureVoidReturnTypeWhereNoReturnRector;
Expand DownExpand Up@@ -201,6 +202,7 @@
 TypedPropertyFromAssignsRector::class,
 ClosureReturnTypeRector::class,
 FlipTypeControlToUseExclusiveTypeRector::class,
 AddArrowFunctionReturnTypeRector::class,
 ])
 ->withConfiguredRule(StringClassNameToClassConstantRector::class, [
 // keep '\\' prefix string on string '\Foo\Bar'
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@@ -339,7 +339,7 @@ public static function promptByMultipleKeys(string $text, array $options): array
 $pattern = preg_match_all('/^\d+(,\d+)*$/', trim($input));

 // separate input by comma and convert all to an int[]
 $inputToArray = array_map(static fn ($value) => (int) $value, explode(',', $input));
 $inputToArray = array_map(static fn ($value): int => (int) $value, explode(',', $input));
 // find max from key of $options
 $maxOptions = array_key_last($options);
 // find max from input
Expand Down

2 changes: 1 addition & 1 deletion
system/Commands/Utilities/Routes.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,7 +187,7 @@ public function run(array $params)

 // Sort by Handler.
 if ($sortByHandler) {
 usort($tbody, static fn ($handler1, $handler2) => strcmp($handler1[3], $handler2[3]));
 usort($tbody, static fn ($handler1, $handler2): int => strcmp($handler1[3], $handler2[3]));
 }

 if ($host !== null) {
Expand Down

18 changes: 9 additions & 9 deletions
system/Database/BaseBuilder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2018,7 +2018,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql = 'INSERT INTO ' . $table . ' (' . implode(', ', $keys) . ")\n{:_table_:}ON DUPLICATE KEY UPDATE\n" . implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = VALUES(' . $value . ')'),
 array_keys($updateFields),
Expand DownExpand Up@@ -2108,7 +2108,7 @@ public function onConstraint($set)
 if (is_string($set)) {
 $set = explode(',', $set);

 $set = array_map(static fn ($key) => trim($key), $set);
 $set = array_map(static fn ($key): string => trim($key), $set);
 }

 if ($set instanceof RawSql) {
Expand DownExpand Up@@ -2152,7 +2152,7 @@ public function setQueryAsData($query, ?string $alias = null, $columns = null):
 if (is_string($query)) {
 if ($columns !== null && is_string($columns)) {
 $columns = explode(',', $columns);
 $columns = array_map(static fn ($key) => trim($key), $columns);
 $columns = array_map(static fn ($key): string => trim($key), $columns);
 }

 $columns = (array) $columns;
Expand DownExpand Up@@ -2190,7 +2190,7 @@ protected function fieldsFromQuery(string $sql): array
 */
 protected function formatValues(array $values): array
 {
 return array_map(static fn ($index) => '(' . implode(',', $index) . ')', $values);
 return array_map(static fn ($index): string => '(' . implode(',', $index) . ')', $values);
 }

 /**
Expand DownExpand Up@@ -2649,7 +2649,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $alias . '.' . $value),
 array_keys($updateFields),
Expand DownExpand Up@@ -2691,8 +2691,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand DownExpand Up@@ -2946,8 +2946,8 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -861,7 +861,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
 $columnNamesToDrop = explode(',', $columnNamesToDrop);
 }

 $columnNamesToDrop = array_map(fn ($field) => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $columnNamesToDrop);
 $columnNamesToDrop = array_map(fn ($field): string => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $columnNamesToDrop);

 return $sql . implode(', ', $columnNamesToDrop);
 }
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/MySQLi/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $alias . '.' . $value),
 array_keys($updateFields),
Expand All@@ -132,8 +132,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

34 changes: 17 additions & 17 deletions
system/Database/OCI8/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,8 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " FROM DUAL UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand All@@ -107,7 +107,7 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
 */
 protected function _replace(string $table, array $keys, array $values): string
 {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);
Expand All@@ -126,24 +126,24 @@ protected function _replace(string $table, array $keys, array $values): string

 $sql = 'MERGE INTO ' . $table . "\n USING (SELECT ";

 $sql .= implode(', ', array_map(static fn ($columnName, $value) => $value . ' ' . $columnName, $keys, $values));
 $sql .= implode(', ', array_map(static fn ($columnName, $value): string => $value . ' ' . $columnName, $keys, $values));

 $sql .= ' FROM DUAL) "_replace" ON ( ';

 $onList = [];
 $onList[] = '1 != 1';

 foreach ($uniqueIndexes as $index) {
 $onList[] = '(' . implode(' AND ', array_map(static fn ($columnName) => $table . '."' . $columnName . '" = "_replace"."' . $columnName . '"', $index->fields)) . ')';
 $onList[] = '(' . implode(' AND ', array_map(static fn ($columnName): string => $table . '."' . $columnName . '" = "_replace"."' . $columnName . '"', $index->fields)) . ')';
 }

 $sql .= implode(' OR ', $onList) . ') WHEN MATCHED THEN UPDATE SET ';

 $sql .= implode(', ', array_map(static fn ($columnName) => $columnName . ' = "_replace".' . $columnName, $replaceableFields));
 $sql .= implode(', ', array_map(static fn ($columnName): string => $columnName . ' = "_replace".' . $columnName, $replaceableFields));

 $sql .= ' WHEN NOT MATCHED THEN INSERT (' . implode(', ', $replaceableFields) . ') VALUES ';

 return $sql . (' (' . implode(', ', array_map(static fn ($columnName) => '"_replace".' . $columnName, $replaceableFields)) . ')');
 return $sql . (' (' . implode(', ', array_map(static fn ($columnName): string => '"_replace".' . $columnName, $replaceableFields)) . ')');
 }

 /**
Expand DownExpand Up@@ -298,7 +298,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $alias . '.' . $value),
 array_keys($updateFields),
Expand All@@ -315,8 +315,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )) . ' FROM DUAL',
Expand All@@ -342,7 +342,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $constraints = $this->QBOptions['constraints'] ?? [];

 if (empty($constraints)) {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);
Expand DownExpand Up@@ -401,7 +401,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 " = {$value}" :
 " = {$alias}.{$value}"),
 array_keys($updateFields),
Expand All@@ -412,7 +412,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= "\nWHEN NOT MATCHED THEN INSERT (" . implode(', ', $keys) . ")\nVALUES ";

 $sql .= (' ('
 . implode(', ', array_map(static fn ($columnName) => "{$alias}.{$columnName}", $keys))
 . implode(', ', array_map(static fn ($columnName): string => "{$alias}.{$columnName}", $keys))
 . ')');

 $this->QBOptions['sql'] = $sql;
Expand All@@ -424,8 +424,8 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " FROM DUAL UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand DownExpand Up@@ -503,8 +503,8 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " FROM DUAL UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/OCI8/Result.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public function getFieldCount(): int
 */
 public function getFieldNames(): array
 {
 return array_map(fn ($fieldIndex) => oci_field_name($this->resultID, $fieldIndex), range(1, $this->getFieldCount()));
 return array_map(fn ($fieldIndex): false|string => oci_field_name($this->resultID, $fieldIndex), range(1, $this->getFieldCount()));
 }

 /**
Expand Down

14 changes: 7 additions & 7 deletions
system/Database/Postgre/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -353,7 +353,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $that->cast($alias . '.' . $value, $that->getFieldType($table, $key))),
 array_keys($updateFields),
Expand DownExpand Up@@ -394,8 +394,8 @@ static function ($key, $value) use ($table, $alias, $that): string|RawSql {
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand DownExpand Up@@ -458,7 +458,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri

 // if this is the first iteration of batch then we need to build skeleton sql
 if ($sql === '') {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 $constraints = $this->QBOptions['constraints'] ?? [];

Expand DownExpand Up@@ -524,7 +524,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 " = {$value}" :
 " = {$alias}.{$value}"),
 array_keys($updateFields),
Expand DownExpand Up@@ -617,8 +617,8 @@ static function ($key, $value) use ($table, $alias, $that): RawSql|string {
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Postgre/Connection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -371,7 +371,7 @@ protected function _indexData(string $table): array
 $obj = new stdClass();
 $obj->name = $row->indexname;
 $_fields = explode(',', preg_replace('/^.*\((.+?)\)$/', '$1', trim($row->indexdef)));
 $obj->fields = array_map(static fn ($v) => trim($v), $_fields);
 $obj->fields = array_map(static fn ($v): string => trim($v), $_fields);

 if (str_starts_with($row->indexdef, 'CREATE UNIQUE INDEX pk')) {
 $obj->type = 'PRIMARY';
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Query.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ public function debugToolbarDisplay(): string
 */
 $search = '/\b(?:' . implode('|', $highlight) . ')\b(?![^(&#039;)]*&#039;(?:(?:[^(&#039;)]*&#039;){2})*[^(&#039;)]*$)/';

 return preg_replace_callback($search, static fn ($matches) => '<strong>' . str_replace(' ', '&nbsp;', $matches[0]) . '</strong>', $sql);
 return preg_replace_callback($search, static fn ($matches): string => '<strong>' . str_replace(' ', '&nbsp;', $matches[0]) . '</strong>', $sql);
 }

 /**
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/SQLSRV/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -694,7 +694,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri

 $identityInFields = in_array($tableIdentity, $keys, true);

 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 if (empty($constraints)) {
 $tableIndexes = $this->db->getIndexData($table);
Expand DownExpand Up@@ -773,7 +773,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 ' = ' . $value :
 " = {$alias}.{$value}"),
 array_keys($updateFields),
Expand All@@ -787,7 +787,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 '(' . implode(
 ', ',
 array_map(
 static fn ($columnName) => $columnName === $tableIdentity
 static fn ($columnName): string => $columnName === $tableIdentity
 ? "CASE WHEN {$alias}.{$columnName} IS NULL THEN (SELECT "
 . 'isnull(IDENT_CURRENT(\'' . $fullTableName . '\')+IDENT_INCR(\''
 . $fullTableName . "'),1)) ELSE {$alias}.{$columnName} END"
Expand Down
Loading

, '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: enable AddArrowFunctionReturnTypeRector#9343

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 3 commits into

from

Dec 28, 2024
 Merged


refactor: enable AddArrowFunctionReturnTypeRector
#9343
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a2ec505

refactor: enable AddArrowFunctionReturnTypeRector


samsonasik Dec 28, 2024
f29210c

refactor: use compare equals 1 for preg_match() return on array_filter


samsonasik Dec 28, 2024
47d69b6

refactor: update var_export() return


samsonasik Dec 28, 2024

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


2 changes: 1 addition & 1 deletion
app/Views/errors/cli/error_exception.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@
 $function .= $padClass . $error['function'];
 }

 $args = implode(', ', array_map(static fn ($value) => match (true) {
 $args = implode(', ', array_map(static fn ($value): string => match (true) {
 is_object($value) => 'Object(' . $value::class . ')',
 is_array($value) => $value !== [] ? '[...]' : '[]',
 $value === null => 'null', // return the lowercased version
Expand Down

2 changes: 2 additions & 0 deletions
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
use Rector\TypeDeclaration\Rector\ArrowFunction\AddArrowFunctionReturnTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
use Rector\TypeDeclaration\Rector\Closure\AddClosureVoidReturnTypeWhereNoReturnRector;
Expand DownExpand Up@@ -201,6 +202,7 @@
 TypedPropertyFromAssignsRector::class,
 ClosureReturnTypeRector::class,
 FlipTypeControlToUseExclusiveTypeRector::class,
 AddArrowFunctionReturnTypeRector::class,
 ])
 ->withConfiguredRule(StringClassNameToClassConstantRector::class, [
 // keep '\\' prefix string on string '\Foo\Bar'
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@@ -339,7 +339,7 @@ public static function promptByMultipleKeys(string $text, array $options): array
 $pattern = preg_match_all('/^\d+(,\d+)*$/', trim($input));

 // separate input by comma and convert all to an int[]
 $inputToArray = array_map(static fn ($value) => (int) $value, explode(',', $input));
 $inputToArray = array_map(static fn ($value): int => (int) $value, explode(',', $input));
 // find max from key of $options
 $maxOptions = array_key_last($options);
 // find max from input
Expand Down

2 changes: 1 addition & 1 deletion
system/Commands/Utilities/Routes.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,7 +187,7 @@ public function run(array $params)

 // Sort by Handler.
 if ($sortByHandler) {
 usort($tbody, static fn ($handler1, $handler2) => strcmp($handler1[3], $handler2[3]));
 usort($tbody, static fn ($handler1, $handler2): int => strcmp($handler1[3], $handler2[3]));
 }

 if ($host !== null) {
Expand Down

18 changes: 9 additions & 9 deletions
system/Database/BaseBuilder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2018,7 +2018,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql = 'INSERT INTO ' . $table . ' (' . implode(', ', $keys) . ")\n{:_table_:}ON DUPLICATE KEY UPDATE\n" . implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = VALUES(' . $value . ')'),
 array_keys($updateFields),
Expand DownExpand Up@@ -2108,7 +2108,7 @@ public function onConstraint($set)
 if (is_string($set)) {
 $set = explode(',', $set);

 $set = array_map(static fn ($key) => trim($key), $set);
 $set = array_map(static fn ($key): string => trim($key), $set);
 }

 if ($set instanceof RawSql) {
Expand DownExpand Up@@ -2152,7 +2152,7 @@ public function setQueryAsData($query, ?string $alias = null, $columns = null):
 if (is_string($query)) {
 if ($columns !== null && is_string($columns)) {
 $columns = explode(',', $columns);
 $columns = array_map(static fn ($key) => trim($key), $columns);
 $columns = array_map(static fn ($key): string => trim($key), $columns);
 }

 $columns = (array) $columns;
Expand DownExpand Up@@ -2190,7 +2190,7 @@ protected function fieldsFromQuery(string $sql): array
 */
 protected function formatValues(array $values): array
 {
 return array_map(static fn ($index) => '(' . implode(',', $index) . ')', $values);
 return array_map(static fn ($index): string => '(' . implode(',', $index) . ')', $values);
 }

 /**
Expand DownExpand Up@@ -2649,7 +2649,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $alias . '.' . $value),
 array_keys($updateFields),
Expand DownExpand Up@@ -2691,8 +2691,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand DownExpand Up@@ -2946,8 +2946,8 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -861,7 +861,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
 $columnNamesToDrop = explode(',', $columnNamesToDrop);
 }

 $columnNamesToDrop = array_map(fn ($field) => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $columnNamesToDrop);
 $columnNamesToDrop = array_map(fn ($field): string => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $columnNamesToDrop);

 return $sql . implode(', ', $columnNamesToDrop);
 }
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/MySQLi/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $alias . '.' . $value),
 array_keys($updateFields),
Expand All@@ -132,8 +132,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

34 changes: 17 additions & 17 deletions
system/Database/OCI8/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,8 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " FROM DUAL UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand All@@ -107,7 +107,7 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
 */
 protected function _replace(string $table, array $keys, array $values): string
 {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);
Expand All@@ -126,24 +126,24 @@ protected function _replace(string $table, array $keys, array $values): string

 $sql = 'MERGE INTO ' . $table . "\n USING (SELECT ";

 $sql .= implode(', ', array_map(static fn ($columnName, $value) => $value . ' ' . $columnName, $keys, $values));
 $sql .= implode(', ', array_map(static fn ($columnName, $value): string => $value . ' ' . $columnName, $keys, $values));

 $sql .= ' FROM DUAL) "_replace" ON ( ';

 $onList = [];
 $onList[] = '1 != 1';

 foreach ($uniqueIndexes as $index) {
 $onList[] = '(' . implode(' AND ', array_map(static fn ($columnName) => $table . '."' . $columnName . '" = "_replace"."' . $columnName . '"', $index->fields)) . ')';
 $onList[] = '(' . implode(' AND ', array_map(static fn ($columnName): string => $table . '."' . $columnName . '" = "_replace"."' . $columnName . '"', $index->fields)) . ')';
 }

 $sql .= implode(' OR ', $onList) . ') WHEN MATCHED THEN UPDATE SET ';

 $sql .= implode(', ', array_map(static fn ($columnName) => $columnName . ' = "_replace".' . $columnName, $replaceableFields));
 $sql .= implode(', ', array_map(static fn ($columnName): string => $columnName . ' = "_replace".' . $columnName, $replaceableFields));

 $sql .= ' WHEN NOT MATCHED THEN INSERT (' . implode(', ', $replaceableFields) . ') VALUES ';

 return $sql . (' (' . implode(', ', array_map(static fn ($columnName) => '"_replace".' . $columnName, $replaceableFields)) . ')');
 return $sql . (' (' . implode(', ', array_map(static fn ($columnName): string => '"_replace".' . $columnName, $replaceableFields)) . ')');
 }

 /**
Expand DownExpand Up@@ -298,7 +298,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $alias . '.' . $value),
 array_keys($updateFields),
Expand All@@ -315,8 +315,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )) . ' FROM DUAL',
Expand All@@ -342,7 +342,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $constraints = $this->QBOptions['constraints'] ?? [];

 if (empty($constraints)) {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);
Expand DownExpand Up@@ -401,7 +401,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 " = {$value}" :
 " = {$alias}.{$value}"),
 array_keys($updateFields),
Expand All@@ -412,7 +412,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= "\nWHEN NOT MATCHED THEN INSERT (" . implode(', ', $keys) . ")\nVALUES ";

 $sql .= (' ('
 . implode(', ', array_map(static fn ($columnName) => "{$alias}.{$columnName}", $keys))
 . implode(', ', array_map(static fn ($columnName): string => "{$alias}.{$columnName}", $keys))
 . ')');

 $this->QBOptions['sql'] = $sql;
Expand All@@ -424,8 +424,8 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " FROM DUAL UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand DownExpand Up@@ -503,8 +503,8 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " FROM DUAL UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/OCI8/Result.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public function getFieldCount(): int
 */
 public function getFieldNames(): array
 {
 return array_map(fn ($fieldIndex) => oci_field_name($this->resultID, $fieldIndex), range(1, $this->getFieldCount()));
 return array_map(fn ($fieldIndex): false|string => oci_field_name($this->resultID, $fieldIndex), range(1, $this->getFieldCount()));
 }

 /**
Expand Down

14 changes: 7 additions & 7 deletions
system/Database/Postgre/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -353,7 +353,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $that->cast($alias . '.' . $value, $that->getFieldType($table, $key))),
 array_keys($updateFields),
Expand DownExpand Up@@ -394,8 +394,8 @@ static function ($key, $value) use ($table, $alias, $that): string|RawSql {
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand DownExpand Up@@ -458,7 +458,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri

 // if this is the first iteration of batch then we need to build skeleton sql
 if ($sql === '') {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 $constraints = $this->QBOptions['constraints'] ?? [];

Expand DownExpand Up@@ -524,7 +524,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 " = {$value}" :
 " = {$alias}.{$value}"),
 array_keys($updateFields),
Expand DownExpand Up@@ -617,8 +617,8 @@ static function ($key, $value) use ($table, $alias, $that): RawSql|string {
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Postgre/Connection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -371,7 +371,7 @@ protected function _indexData(string $table): array
 $obj = new stdClass();
 $obj->name = $row->indexname;
 $_fields = explode(',', preg_replace('/^.*\((.+?)\)$/', '$1', trim($row->indexdef)));
 $obj->fields = array_map(static fn ($v) => trim($v), $_fields);
 $obj->fields = array_map(static fn ($v): string => trim($v), $_fields);

 if (str_starts_with($row->indexdef, 'CREATE UNIQUE INDEX pk')) {
 $obj->type = 'PRIMARY';
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Query.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ public function debugToolbarDisplay(): string
 */
 $search = '/\b(?:' . implode('|', $highlight) . ')\b(?![^(&#039;)]*&#039;(?:(?:[^(&#039;)]*&#039;){2})*[^(&#039;)]*$)/';

 return preg_replace_callback($search, static fn ($matches) => '<strong>' . str_replace(' ', '&nbsp;', $matches[0]) . '</strong>', $sql);
 return preg_replace_callback($search, static fn ($matches): string => '<strong>' . str_replace(' ', '&nbsp;', $matches[0]) . '</strong>', $sql);
 }

 /**
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/SQLSRV/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -694,7 +694,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri

 $identityInFields = in_array($tableIdentity, $keys, true);

 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 if (empty($constraints)) {
 $tableIndexes = $this->db->getIndexData($table);
Expand DownExpand Up@@ -773,7 +773,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 ' = ' . $value :
 " = {$alias}.{$value}"),
 array_keys($updateFields),
Expand All@@ -787,7 +787,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 '(' . implode(
 ', ',
 array_map(
 static fn ($columnName) => $columnName === $tableIdentity
 static fn ($columnName): string => $columnName === $tableIdentity
 ? "CASE WHEN {$alias}.{$columnName} IS NULL THEN (SELECT "
 . 'isnull(IDENT_CURRENT(\'' . $fullTableName . '\')+IDENT_INCR(\''
 . $fullTableName . "'),1)) ELSE {$alias}.{$columnName} END"
Expand Down
Loading

, '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: enable AddArrowFunctionReturnTypeRector#9343

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 3 commits into

from

Dec 28, 2024
 Merged


refactor: enable AddArrowFunctionReturnTypeRector
#9343
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a2ec505

refactor: enable AddArrowFunctionReturnTypeRector


samsonasik Dec 28, 2024
f29210c

refactor: use compare equals 1 for preg_match() return on array_filter


samsonasik Dec 28, 2024
47d69b6

refactor: update var_export() return


samsonasik Dec 28, 2024

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


2 changes: 1 addition & 1 deletion
app/Views/errors/cli/error_exception.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@
 $function .= $padClass . $error['function'];
 }

 $args = implode(', ', array_map(static fn ($value) => match (true) {
 $args = implode(', ', array_map(static fn ($value): string => match (true) {
 is_object($value) => 'Object(' . $value::class . ')',
 is_array($value) => $value !== [] ? '[...]' : '[]',
 $value === null => 'null', // return the lowercased version
Expand Down

2 changes: 2 additions & 0 deletions
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
use Rector\TypeDeclaration\Rector\ArrowFunction\AddArrowFunctionReturnTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
use Rector\TypeDeclaration\Rector\Closure\AddClosureVoidReturnTypeWhereNoReturnRector;
Expand DownExpand Up@@ -201,6 +202,7 @@
 TypedPropertyFromAssignsRector::class,
 ClosureReturnTypeRector::class,
 FlipTypeControlToUseExclusiveTypeRector::class,
 AddArrowFunctionReturnTypeRector::class,
 ])
 ->withConfiguredRule(StringClassNameToClassConstantRector::class, [
 // keep '\\' prefix string on string '\Foo\Bar'
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@@ -339,7 +339,7 @@ public static function promptByMultipleKeys(string $text, array $options): array
 $pattern = preg_match_all('/^\d+(,\d+)*$/', trim($input));

 // separate input by comma and convert all to an int[]
 $inputToArray = array_map(static fn ($value) => (int) $value, explode(',', $input));
 $inputToArray = array_map(static fn ($value): int => (int) $value, explode(',', $input));
 // find max from key of $options
 $maxOptions = array_key_last($options);
 // find max from input
Expand Down

2 changes: 1 addition & 1 deletion
system/Commands/Utilities/Routes.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,7 +187,7 @@ public function run(array $params)

 // Sort by Handler.
 if ($sortByHandler) {
 usort($tbody, static fn ($handler1, $handler2) => strcmp($handler1[3], $handler2[3]));
 usort($tbody, static fn ($handler1, $handler2): int => strcmp($handler1[3], $handler2[3]));
 }

 if ($host !== null) {
Expand Down

18 changes: 9 additions & 9 deletions
system/Database/BaseBuilder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2018,7 +2018,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql = 'INSERT INTO ' . $table . ' (' . implode(', ', $keys) . ")\n{:_table_:}ON DUPLICATE KEY UPDATE\n" . implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = VALUES(' . $value . ')'),
 array_keys($updateFields),
Expand DownExpand Up@@ -2108,7 +2108,7 @@ public function onConstraint($set)
 if (is_string($set)) {
 $set = explode(',', $set);

 $set = array_map(static fn ($key) => trim($key), $set);
 $set = array_map(static fn ($key): string => trim($key), $set);
 }

 if ($set instanceof RawSql) {
Expand DownExpand Up@@ -2152,7 +2152,7 @@ public function setQueryAsData($query, ?string $alias = null, $columns = null):
 if (is_string($query)) {
 if ($columns !== null && is_string($columns)) {
 $columns = explode(',', $columns);
 $columns = array_map(static fn ($key) => trim($key), $columns);
 $columns = array_map(static fn ($key): string => trim($key), $columns);
 }

 $columns = (array) $columns;
Expand DownExpand Up@@ -2190,7 +2190,7 @@ protected function fieldsFromQuery(string $sql): array
 */
 protected function formatValues(array $values): array
 {
 return array_map(static fn ($index) => '(' . implode(',', $index) . ')', $values);
 return array_map(static fn ($index): string => '(' . implode(',', $index) . ')', $values);
 }

 /**
Expand DownExpand Up@@ -2649,7 +2649,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $alias . '.' . $value),
 array_keys($updateFields),
Expand DownExpand Up@@ -2691,8 +2691,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand DownExpand Up@@ -2946,8 +2946,8 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -861,7 +861,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
 $columnNamesToDrop = explode(',', $columnNamesToDrop);
 }

 $columnNamesToDrop = array_map(fn ($field) => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $columnNamesToDrop);
 $columnNamesToDrop = array_map(fn ($field): string => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $columnNamesToDrop);

 return $sql . implode(', ', $columnNamesToDrop);
 }
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/MySQLi/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $alias . '.' . $value),
 array_keys($updateFields),
Expand All@@ -132,8 +132,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

34 changes: 17 additions & 17 deletions
system/Database/OCI8/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,8 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " FROM DUAL UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand All@@ -107,7 +107,7 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
 */
 protected function _replace(string $table, array $keys, array $values): string
 {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);
Expand All@@ -126,24 +126,24 @@ protected function _replace(string $table, array $keys, array $values): string

 $sql = 'MERGE INTO ' . $table . "\n USING (SELECT ";

 $sql .= implode(', ', array_map(static fn ($columnName, $value) => $value . ' ' . $columnName, $keys, $values));
 $sql .= implode(', ', array_map(static fn ($columnName, $value): string => $value . ' ' . $columnName, $keys, $values));

 $sql .= ' FROM DUAL) "_replace" ON ( ';

 $onList = [];
 $onList[] = '1 != 1';

 foreach ($uniqueIndexes as $index) {
 $onList[] = '(' . implode(' AND ', array_map(static fn ($columnName) => $table . '."' . $columnName . '" = "_replace"."' . $columnName . '"', $index->fields)) . ')';
 $onList[] = '(' . implode(' AND ', array_map(static fn ($columnName): string => $table . '."' . $columnName . '" = "_replace"."' . $columnName . '"', $index->fields)) . ')';
 }

 $sql .= implode(' OR ', $onList) . ') WHEN MATCHED THEN UPDATE SET ';

 $sql .= implode(', ', array_map(static fn ($columnName) => $columnName . ' = "_replace".' . $columnName, $replaceableFields));
 $sql .= implode(', ', array_map(static fn ($columnName): string => $columnName . ' = "_replace".' . $columnName, $replaceableFields));

 $sql .= ' WHEN NOT MATCHED THEN INSERT (' . implode(', ', $replaceableFields) . ') VALUES ';

 return $sql . (' (' . implode(', ', array_map(static fn ($columnName) => '"_replace".' . $columnName, $replaceableFields)) . ')');
 return $sql . (' (' . implode(', ', array_map(static fn ($columnName): string => '"_replace".' . $columnName, $replaceableFields)) . ')');
 }

 /**
Expand DownExpand Up@@ -298,7 +298,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $alias . '.' . $value),
 array_keys($updateFields),
Expand All@@ -315,8 +315,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )) . ' FROM DUAL',
Expand All@@ -342,7 +342,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $constraints = $this->QBOptions['constraints'] ?? [];

 if (empty($constraints)) {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);
Expand DownExpand Up@@ -401,7 +401,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 " = {$value}" :
 " = {$alias}.{$value}"),
 array_keys($updateFields),
Expand All@@ -412,7 +412,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= "\nWHEN NOT MATCHED THEN INSERT (" . implode(', ', $keys) . ")\nVALUES ";

 $sql .= (' ('
 . implode(', ', array_map(static fn ($columnName) => "{$alias}.{$columnName}", $keys))
 . implode(', ', array_map(static fn ($columnName): string => "{$alias}.{$columnName}", $keys))
 . ')');

 $this->QBOptions['sql'] = $sql;
Expand All@@ -424,8 +424,8 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " FROM DUAL UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand DownExpand Up@@ -503,8 +503,8 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " FROM DUAL UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/OCI8/Result.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public function getFieldCount(): int
 */
 public function getFieldNames(): array
 {
 return array_map(fn ($fieldIndex) => oci_field_name($this->resultID, $fieldIndex), range(1, $this->getFieldCount()));
 return array_map(fn ($fieldIndex): false|string => oci_field_name($this->resultID, $fieldIndex), range(1, $this->getFieldCount()));
 }

 /**
Expand Down

14 changes: 7 additions & 7 deletions
system/Database/Postgre/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -353,7 +353,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $that->cast($alias . '.' . $value, $that->getFieldType($table, $key))),
 array_keys($updateFields),
Expand DownExpand Up@@ -394,8 +394,8 @@ static function ($key, $value) use ($table, $alias, $that): string|RawSql {
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand DownExpand Up@@ -458,7 +458,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri

 // if this is the first iteration of batch then we need to build skeleton sql
 if ($sql === '') {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 $constraints = $this->QBOptions['constraints'] ?? [];

Expand DownExpand Up@@ -524,7 +524,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 " = {$value}" :
 " = {$alias}.{$value}"),
 array_keys($updateFields),
Expand DownExpand Up@@ -617,8 +617,8 @@ static function ($key, $value) use ($table, $alias, $that): RawSql|string {
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Postgre/Connection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -371,7 +371,7 @@ protected function _indexData(string $table): array
 $obj = new stdClass();
 $obj->name = $row->indexname;
 $_fields = explode(',', preg_replace('/^.*\((.+?)\)$/', '$1', trim($row->indexdef)));
 $obj->fields = array_map(static fn ($v) => trim($v), $_fields);
 $obj->fields = array_map(static fn ($v): string => trim($v), $_fields);

 if (str_starts_with($row->indexdef, 'CREATE UNIQUE INDEX pk')) {
 $obj->type = 'PRIMARY';
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Query.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ public function debugToolbarDisplay(): string
 */
 $search = '/\b(?:' . implode('|', $highlight) . ')\b(?![^(&#039;)]*&#039;(?:(?:[^(&#039;)]*&#039;){2})*[^(&#039;)]*$)/';

 return preg_replace_callback($search, static fn ($matches) => '<strong>' . str_replace(' ', '&nbsp;', $matches[0]) . '</strong>', $sql);
 return preg_replace_callback($search, static fn ($matches): string => '<strong>' . str_replace(' ', '&nbsp;', $matches[0]) . '</strong>', $sql);
 }

 /**
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/SQLSRV/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -694,7 +694,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri

 $identityInFields = in_array($tableIdentity, $keys, true);

 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 if (empty($constraints)) {
 $tableIndexes = $this->db->getIndexData($table);
Expand DownExpand Up@@ -773,7 +773,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 ' = ' . $value :
 " = {$alias}.{$value}"),
 array_keys($updateFields),
Expand All@@ -787,7 +787,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 '(' . implode(
 ', ',
 array_map(
 static fn ($columnName) => $columnName === $tableIdentity
 static fn ($columnName): string => $columnName === $tableIdentity
 ? "CASE WHEN {$alias}.{$columnName} IS NULL THEN (SELECT "
 . 'isnull(IDENT_CURRENT(\'' . $fullTableName . '\')+IDENT_INCR(\''
 . $fullTableName . "'),1)) ELSE {$alias}.{$columnName} END"
Expand Down
Loading

, '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: enable AddArrowFunctionReturnTypeRector#9343

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 3 commits into

from

Dec 28, 2024
 Merged


refactor: enable AddArrowFunctionReturnTypeRector
#9343
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a2ec505

refactor: enable AddArrowFunctionReturnTypeRector


samsonasik Dec 28, 2024
f29210c

refactor: use compare equals 1 for preg_match() return on array_filter


samsonasik Dec 28, 2024
47d69b6

refactor: update var_export() return


samsonasik Dec 28, 2024

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


2 changes: 1 addition & 1 deletion
app/Views/errors/cli/error_exception.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@
 $function .= $padClass . $error['function'];
 }

 $args = implode(', ', array_map(static fn ($value) => match (true) {
 $args = implode(', ', array_map(static fn ($value): string => match (true) {
 is_object($value) => 'Object(' . $value::class . ')',
 is_array($value) => $value !== [] ? '[...]' : '[]',
 $value === null => 'null', // return the lowercased version
Expand Down

2 changes: 2 additions & 0 deletions
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
use Rector\TypeDeclaration\Rector\ArrowFunction\AddArrowFunctionReturnTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
use Rector\TypeDeclaration\Rector\Closure\AddClosureVoidReturnTypeWhereNoReturnRector;
Expand DownExpand Up@@ -201,6 +202,7 @@
 TypedPropertyFromAssignsRector::class,
 ClosureReturnTypeRector::class,
 FlipTypeControlToUseExclusiveTypeRector::class,
 AddArrowFunctionReturnTypeRector::class,
 ])
 ->withConfiguredRule(StringClassNameToClassConstantRector::class, [
 // keep '\\' prefix string on string '\Foo\Bar'
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@@ -339,7 +339,7 @@ public static function promptByMultipleKeys(string $text, array $options): array
 $pattern = preg_match_all('/^\d+(,\d+)*$/', trim($input));

 // separate input by comma and convert all to an int[]
 $inputToArray = array_map(static fn ($value) => (int) $value, explode(',', $input));
 $inputToArray = array_map(static fn ($value): int => (int) $value, explode(',', $input));
 // find max from key of $options
 $maxOptions = array_key_last($options);
 // find max from input
Expand Down

2 changes: 1 addition & 1 deletion
system/Commands/Utilities/Routes.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,7 +187,7 @@ public function run(array $params)

 // Sort by Handler.
 if ($sortByHandler) {
 usort($tbody, static fn ($handler1, $handler2) => strcmp($handler1[3], $handler2[3]));
 usort($tbody, static fn ($handler1, $handler2): int => strcmp($handler1[3], $handler2[3]));
 }

 if ($host !== null) {
Expand Down

18 changes: 9 additions & 9 deletions
system/Database/BaseBuilder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2018,7 +2018,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql = 'INSERT INTO ' . $table . ' (' . implode(', ', $keys) . ")\n{:_table_:}ON DUPLICATE KEY UPDATE\n" . implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = VALUES(' . $value . ')'),
 array_keys($updateFields),
Expand DownExpand Up@@ -2108,7 +2108,7 @@ public function onConstraint($set)
 if (is_string($set)) {
 $set = explode(',', $set);

 $set = array_map(static fn ($key) => trim($key), $set);
 $set = array_map(static fn ($key): string => trim($key), $set);
 }

 if ($set instanceof RawSql) {
Expand DownExpand Up@@ -2152,7 +2152,7 @@ public function setQueryAsData($query, ?string $alias = null, $columns = null):
 if (is_string($query)) {
 if ($columns !== null && is_string($columns)) {
 $columns = explode(',', $columns);
 $columns = array_map(static fn ($key) => trim($key), $columns);
 $columns = array_map(static fn ($key): string => trim($key), $columns);
 }

 $columns = (array) $columns;
Expand DownExpand Up@@ -2190,7 +2190,7 @@ protected function fieldsFromQuery(string $sql): array
 */
 protected function formatValues(array $values): array
 {
 return array_map(static fn ($index) => '(' . implode(',', $index) . ')', $values);
 return array_map(static fn ($index): string => '(' . implode(',', $index) . ')', $values);
 }

 /**
Expand DownExpand Up@@ -2649,7 +2649,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $alias . '.' . $value),
 array_keys($updateFields),
Expand DownExpand Up@@ -2691,8 +2691,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand DownExpand Up@@ -2946,8 +2946,8 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -861,7 +861,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
 $columnNamesToDrop = explode(',', $columnNamesToDrop);
 }

 $columnNamesToDrop = array_map(fn ($field) => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $columnNamesToDrop);
 $columnNamesToDrop = array_map(fn ($field): string => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $columnNamesToDrop);

 return $sql . implode(', ', $columnNamesToDrop);
 }
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/MySQLi/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $alias . '.' . $value),
 array_keys($updateFields),
Expand All@@ -132,8 +132,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

34 changes: 17 additions & 17 deletions
system/Database/OCI8/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,8 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " FROM DUAL UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand All@@ -107,7 +107,7 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
 */
 protected function _replace(string $table, array $keys, array $values): string
 {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);
Expand All@@ -126,24 +126,24 @@ protected function _replace(string $table, array $keys, array $values): string

 $sql = 'MERGE INTO ' . $table . "\n USING (SELECT ";

 $sql .= implode(', ', array_map(static fn ($columnName, $value) => $value . ' ' . $columnName, $keys, $values));
 $sql .= implode(', ', array_map(static fn ($columnName, $value): string => $value . ' ' . $columnName, $keys, $values));

 $sql .= ' FROM DUAL) "_replace" ON ( ';

 $onList = [];
 $onList[] = '1 != 1';

 foreach ($uniqueIndexes as $index) {
 $onList[] = '(' . implode(' AND ', array_map(static fn ($columnName) => $table . '."' . $columnName . '" = "_replace"."' . $columnName . '"', $index->fields)) . ')';
 $onList[] = '(' . implode(' AND ', array_map(static fn ($columnName): string => $table . '."' . $columnName . '" = "_replace"."' . $columnName . '"', $index->fields)) . ')';
 }

 $sql .= implode(' OR ', $onList) . ') WHEN MATCHED THEN UPDATE SET ';

 $sql .= implode(', ', array_map(static fn ($columnName) => $columnName . ' = "_replace".' . $columnName, $replaceableFields));
 $sql .= implode(', ', array_map(static fn ($columnName): string => $columnName . ' = "_replace".' . $columnName, $replaceableFields));

 $sql .= ' WHEN NOT MATCHED THEN INSERT (' . implode(', ', $replaceableFields) . ') VALUES ';

 return $sql . (' (' . implode(', ', array_map(static fn ($columnName) => '"_replace".' . $columnName, $replaceableFields)) . ')');
 return $sql . (' (' . implode(', ', array_map(static fn ($columnName): string => '"_replace".' . $columnName, $replaceableFields)) . ')');
 }

 /**
Expand DownExpand Up@@ -298,7 +298,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $alias . '.' . $value),
 array_keys($updateFields),
Expand All@@ -315,8 +315,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )) . ' FROM DUAL',
Expand All@@ -342,7 +342,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $constraints = $this->QBOptions['constraints'] ?? [];

 if (empty($constraints)) {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);
Expand DownExpand Up@@ -401,7 +401,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 " = {$value}" :
 " = {$alias}.{$value}"),
 array_keys($updateFields),
Expand All@@ -412,7 +412,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= "\nWHEN NOT MATCHED THEN INSERT (" . implode(', ', $keys) . ")\nVALUES ";

 $sql .= (' ('
 . implode(', ', array_map(static fn ($columnName) => "{$alias}.{$columnName}", $keys))
 . implode(', ', array_map(static fn ($columnName): string => "{$alias}.{$columnName}", $keys))
 . ')');

 $this->QBOptions['sql'] = $sql;
Expand All@@ -424,8 +424,8 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " FROM DUAL UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand DownExpand Up@@ -503,8 +503,8 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " FROM DUAL UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/OCI8/Result.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public function getFieldCount(): int
 */
 public function getFieldNames(): array
 {
 return array_map(fn ($fieldIndex) => oci_field_name($this->resultID, $fieldIndex), range(1, $this->getFieldCount()));
 return array_map(fn ($fieldIndex): false|string => oci_field_name($this->resultID, $fieldIndex), range(1, $this->getFieldCount()));
 }

 /**
Expand Down

14 changes: 7 additions & 7 deletions
system/Database/Postgre/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -353,7 +353,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $that->cast($alias . '.' . $value, $that->getFieldType($table, $key))),
 array_keys($updateFields),
Expand DownExpand Up@@ -394,8 +394,8 @@ static function ($key, $value) use ($table, $alias, $that): string|RawSql {
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand DownExpand Up@@ -458,7 +458,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri

 // if this is the first iteration of batch then we need to build skeleton sql
 if ($sql === '') {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 $constraints = $this->QBOptions['constraints'] ?? [];

Expand DownExpand Up@@ -524,7 +524,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 " = {$value}" :
 " = {$alias}.{$value}"),
 array_keys($updateFields),
Expand DownExpand Up@@ -617,8 +617,8 @@ static function ($key, $value) use ($table, $alias, $that): RawSql|string {
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Postgre/Connection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -371,7 +371,7 @@ protected function _indexData(string $table): array
 $obj = new stdClass();
 $obj->name = $row->indexname;
 $_fields = explode(',', preg_replace('/^.*\((.+?)\)$/', '$1', trim($row->indexdef)));
 $obj->fields = array_map(static fn ($v) => trim($v), $_fields);
 $obj->fields = array_map(static fn ($v): string => trim($v), $_fields);

 if (str_starts_with($row->indexdef, 'CREATE UNIQUE INDEX pk')) {
 $obj->type = 'PRIMARY';
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Query.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ public function debugToolbarDisplay(): string
 */
 $search = '/\b(?:' . implode('|', $highlight) . ')\b(?![^(&#039;)]*&#039;(?:(?:[^(&#039;)]*&#039;){2})*[^(&#039;)]*$)/';

 return preg_replace_callback($search, static fn ($matches) => '<strong>' . str_replace(' ', '&nbsp;', $matches[0]) . '</strong>', $sql);
 return preg_replace_callback($search, static fn ($matches): string => '<strong>' . str_replace(' ', '&nbsp;', $matches[0]) . '</strong>', $sql);
 }

 /**
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/SQLSRV/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -694,7 +694,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri

 $identityInFields = in_array($tableIdentity, $keys, true);

 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 if (empty($constraints)) {
 $tableIndexes = $this->db->getIndexData($table);
Expand DownExpand Up@@ -773,7 +773,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 ' = ' . $value :
 " = {$alias}.{$value}"),
 array_keys($updateFields),
Expand All@@ -787,7 +787,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 '(' . implode(
 ', ',
 array_map(
 static fn ($columnName) => $columnName === $tableIdentity
 static fn ($columnName): string => $columnName === $tableIdentity
 ? "CASE WHEN {$alias}.{$columnName} IS NULL THEN (SELECT "
 . 'isnull(IDENT_CURRENT(\'' . $fullTableName . '\')+IDENT_INCR(\''
 . $fullTableName . "'),1)) ELSE {$alias}.{$columnName} END"
Expand Down
Loading

, '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: enable AddArrowFunctionReturnTypeRector#9343

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 3 commits into

from

Dec 28, 2024
 Merged


refactor: enable AddArrowFunctionReturnTypeRector
#9343
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
a2ec505

refactor: enable AddArrowFunctionReturnTypeRector


samsonasik Dec 28, 2024
f29210c

refactor: use compare equals 1 for preg_match() return on array_filter


samsonasik Dec 28, 2024
47d69b6

refactor: update var_export() return


samsonasik Dec 28, 2024

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


2 changes: 1 addition & 1 deletion
app/Views/errors/cli/error_exception.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,7 +50,7 @@
 $function .= $padClass . $error['function'];
 }

 $args = implode(', ', array_map(static fn ($value) => match (true) {
 $args = implode(', ', array_map(static fn ($value): string => match (true) {
 is_object($value) => 'Object(' . $value::class . ')',
 is_array($value) => $value !== [] ? '[...]' : '[]',
 $value === null => 'null', // return the lowercased version
Expand Down

2 changes: 2 additions & 0 deletions
rector.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@
use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
use Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector;
use Rector\TypeDeclaration\Rector\ArrowFunction\AddArrowFunctionReturnTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\AddMethodCallBasedStrictParamTypeRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
use Rector\TypeDeclaration\Rector\Closure\AddClosureVoidReturnTypeWhereNoReturnRector;
Expand DownExpand Up@@ -201,6 +202,7 @@
 TypedPropertyFromAssignsRector::class,
 ClosureReturnTypeRector::class,
 FlipTypeControlToUseExclusiveTypeRector::class,
 AddArrowFunctionReturnTypeRector::class,
 ])
 ->withConfiguredRule(StringClassNameToClassConstantRector::class, [
 // keep '\\' prefix string on string '\Foo\Bar'
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@@ -339,7 +339,7 @@ public static function promptByMultipleKeys(string $text, array $options): array
 $pattern = preg_match_all('/^\d+(,\d+)*$/', trim($input));

 // separate input by comma and convert all to an int[]
 $inputToArray = array_map(static fn ($value) => (int) $value, explode(',', $input));
 $inputToArray = array_map(static fn ($value): int => (int) $value, explode(',', $input));
 // find max from key of $options
 $maxOptions = array_key_last($options);
 // find max from input
Expand Down

2 changes: 1 addition & 1 deletion
system/Commands/Utilities/Routes.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,7 +187,7 @@ public function run(array $params)

 // Sort by Handler.
 if ($sortByHandler) {
 usort($tbody, static fn ($handler1, $handler2) => strcmp($handler1[3], $handler2[3]));
 usort($tbody, static fn ($handler1, $handler2): int => strcmp($handler1[3], $handler2[3]));
 }

 if ($host !== null) {
Expand Down

18 changes: 9 additions & 9 deletions
system/Database/BaseBuilder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2018,7 +2018,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql = 'INSERT INTO ' . $table . ' (' . implode(', ', $keys) . ")\n{:_table_:}ON DUPLICATE KEY UPDATE\n" . implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = VALUES(' . $value . ')'),
 array_keys($updateFields),
Expand DownExpand Up@@ -2108,7 +2108,7 @@ public function onConstraint($set)
 if (is_string($set)) {
 $set = explode(',', $set);

 $set = array_map(static fn ($key) => trim($key), $set);
 $set = array_map(static fn ($key): string => trim($key), $set);
 }

 if ($set instanceof RawSql) {
Expand DownExpand Up@@ -2152,7 +2152,7 @@ public function setQueryAsData($query, ?string $alias = null, $columns = null):
 if (is_string($query)) {
 if ($columns !== null && is_string($columns)) {
 $columns = explode(',', $columns);
 $columns = array_map(static fn ($key) => trim($key), $columns);
 $columns = array_map(static fn ($key): string => trim($key), $columns);
 }

 $columns = (array) $columns;
Expand DownExpand Up@@ -2190,7 +2190,7 @@ protected function fieldsFromQuery(string $sql): array
 */
 protected function formatValues(array $values): array
 {
 return array_map(static fn ($index) => '(' . implode(',', $index) . ')', $values);
 return array_map(static fn ($index): string => '(' . implode(',', $index) . ')', $values);
 }

 /**
Expand DownExpand Up@@ -2649,7 +2649,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $alias . '.' . $value),
 array_keys($updateFields),
Expand DownExpand Up@@ -2691,8 +2691,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand DownExpand Up@@ -2946,8 +2946,8 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -861,7 +861,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
 $columnNamesToDrop = explode(',', $columnNamesToDrop);
 }

 $columnNamesToDrop = array_map(fn ($field) => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $columnNamesToDrop);
 $columnNamesToDrop = array_map(fn ($field): string => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $columnNamesToDrop);

 return $sql . implode(', ', $columnNamesToDrop);
 }
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/MySQLi/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $alias . '.' . $value),
 array_keys($updateFields),
Expand All@@ -132,8 +132,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

34 changes: 17 additions & 17 deletions
system/Database/OCI8/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,8 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " FROM DUAL UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand All@@ -107,7 +107,7 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
 */
 protected function _replace(string $table, array $keys, array $values): string
 {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);
Expand All@@ -126,24 +126,24 @@ protected function _replace(string $table, array $keys, array $values): string

 $sql = 'MERGE INTO ' . $table . "\n USING (SELECT ";

 $sql .= implode(', ', array_map(static fn ($columnName, $value) => $value . ' ' . $columnName, $keys, $values));
 $sql .= implode(', ', array_map(static fn ($columnName, $value): string => $value . ' ' . $columnName, $keys, $values));

 $sql .= ' FROM DUAL) "_replace" ON ( ';

 $onList = [];
 $onList[] = '1 != 1';

 foreach ($uniqueIndexes as $index) {
 $onList[] = '(' . implode(' AND ', array_map(static fn ($columnName) => $table . '."' . $columnName . '" = "_replace"."' . $columnName . '"', $index->fields)) . ')';
 $onList[] = '(' . implode(' AND ', array_map(static fn ($columnName): string => $table . '."' . $columnName . '" = "_replace"."' . $columnName . '"', $index->fields)) . ')';
 }

 $sql .= implode(' OR ', $onList) . ') WHEN MATCHED THEN UPDATE SET ';

 $sql .= implode(', ', array_map(static fn ($columnName) => $columnName . ' = "_replace".' . $columnName, $replaceableFields));
 $sql .= implode(', ', array_map(static fn ($columnName): string => $columnName . ' = "_replace".' . $columnName, $replaceableFields));

 $sql .= ' WHEN NOT MATCHED THEN INSERT (' . implode(', ', $replaceableFields) . ') VALUES ';

 return $sql . (' (' . implode(', ', array_map(static fn ($columnName) => '"_replace".' . $columnName, $replaceableFields)) . ')');
 return $sql . (' (' . implode(', ', array_map(static fn ($columnName): string => '"_replace".' . $columnName, $replaceableFields)) . ')');
 }

 /**
Expand DownExpand Up@@ -298,7 +298,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $table . '.' . $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $table . '.' . $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $alias . '.' . $value),
 array_keys($updateFields),
Expand All@@ -315,8 +315,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )) . ' FROM DUAL',
Expand All@@ -342,7 +342,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $constraints = $this->QBOptions['constraints'] ?? [];

 if (empty($constraints)) {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames): bool {
 $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);
Expand DownExpand Up@@ -401,7 +401,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 " = {$value}" :
 " = {$alias}.{$value}"),
 array_keys($updateFields),
Expand All@@ -412,7 +412,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= "\nWHEN NOT MATCHED THEN INSERT (" . implode(', ', $keys) . ")\nVALUES ";

 $sql .= (' ('
 . implode(', ', array_map(static fn ($columnName) => "{$alias}.{$columnName}", $keys))
 . implode(', ', array_map(static fn ($columnName): string => "{$alias}.{$columnName}", $keys))
 . ')');

 $this->QBOptions['sql'] = $sql;
Expand All@@ -424,8 +424,8 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " FROM DUAL UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand DownExpand Up@@ -503,8 +503,8 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
 $data = implode(
 " FROM DUAL UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/OCI8/Result.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ public function getFieldCount(): int
 */
 public function getFieldNames(): array
 {
 return array_map(fn ($fieldIndex) => oci_field_name($this->resultID, $fieldIndex), range(1, $this->getFieldCount()));
 return array_map(fn ($fieldIndex): false|string => oci_field_name($this->resultID, $fieldIndex), range(1, $this->getFieldCount()));
 }

 /**
Expand Down

14 changes: 7 additions & 7 deletions
system/Database/Postgre/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -353,7 +353,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 ' = ' . $value :
 ' = ' . $that->cast($alias . '.' . $value, $that->getFieldType($table, $key))),
 array_keys($updateFields),
Expand DownExpand Up@@ -394,8 +394,8 @@ static function ($key, $value) use ($table, $alias, $that): string|RawSql {
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand DownExpand Up@@ -458,7 +458,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri

 // if this is the first iteration of batch then we need to build skeleton sql
 if ($sql === '') {
 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 $constraints = $this->QBOptions['constraints'] ?? [];

Expand DownExpand Up@@ -524,7 +524,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 " = {$value}" :
 " = {$alias}.{$value}"),
 array_keys($updateFields),
Expand DownExpand Up@@ -617,8 +617,8 @@ static function ($key, $value) use ($table, $alias, $that): RawSql|string {
 $data = implode(
 " UNION ALL\n",
 array_map(
 static fn ($value) => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index) => $index . ' ' . $key,
 static fn ($value): string => 'SELECT ' . implode(', ', array_map(
 static fn ($key, $index): string => $index . ' ' . $key,
 $keys,
 $value
 )),
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Postgre/Connection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -371,7 +371,7 @@ protected function _indexData(string $table): array
 $obj = new stdClass();
 $obj->name = $row->indexname;
 $_fields = explode(',', preg_replace('/^.*\((.+?)\)$/', '$1', trim($row->indexdef)));
 $obj->fields = array_map(static fn ($v) => trim($v), $_fields);
 $obj->fields = array_map(static fn ($v): string => trim($v), $_fields);

 if (str_starts_with($row->indexdef, 'CREATE UNIQUE INDEX pk')) {
 $obj->type = 'PRIMARY';
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Query.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -418,7 +418,7 @@ public function debugToolbarDisplay(): string
 */
 $search = '/\b(?:' . implode('|', $highlight) . ')\b(?![^(&#039;)]*&#039;(?:(?:[^(&#039;)]*&#039;){2})*[^(&#039;)]*$)/';

 return preg_replace_callback($search, static fn ($matches) => '<strong>' . str_replace(' ', '&nbsp;', $matches[0]) . '</strong>', $sql);
 return preg_replace_callback($search, static fn ($matches): string => '<strong>' . str_replace(' ', '&nbsp;', $matches[0]) . '</strong>', $sql);
 }

 /**
Expand Down

6 changes: 3 additions & 3 deletions
system/Database/SQLSRV/Builder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -694,7 +694,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri

 $identityInFields = in_array($tableIdentity, $keys, true);

 $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 $fieldNames = array_map(static fn ($columnName): string => trim($columnName, '"'), $keys);

 if (empty($constraints)) {
 $tableIndexes = $this->db->getIndexData($table);
Expand DownExpand Up@@ -773,7 +773,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 $sql .= implode(
 ",\n",
 array_map(
 static fn ($key, $value) => $key . ($value instanceof RawSql ?
 static fn ($key, $value): string => $key . ($value instanceof RawSql ?
 ' = ' . $value :
 " = {$alias}.{$value}"),
 array_keys($updateFields),
Expand All@@ -787,7 +787,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 '(' . implode(
 ', ',
 array_map(
 static fn ($columnName) => $columnName === $tableIdentity
 static fn ($columnName): string => $columnName === $tableIdentity
 ? "CASE WHEN {$alias}.{$columnName} IS NULL THEN (SELECT "
 . 'isnull(IDENT_CURRENT(\'' . $fullTableName . '\')+IDENT_INCR(\''
 . $fullTableName . "'),1)) ELSE {$alias}.{$columnName} END"
Expand Down
Loading