diff --git a/libraries/classes/Config/Validator.php b/libraries/classes/Config/Validator.php index 223b33b304..42b14429b4 100644 --- a/libraries/classes/Config/Validator.php +++ b/libraries/classes/Config/Validator.php @@ -8,6 +8,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Config; use PhpMyAdmin\Core; +use PhpMyAdmin\Sanitize; use PhpMyAdmin\Util; use function __; @@ -183,7 +184,7 @@ class Validator $result[$key] = []; } - $errorList = array_map('PhpMyAdmin\Sanitize::sanitizeMessage', (array) $errorList); + $errorList = array_map(Sanitize::sanitizeMessage(...), (array) $errorList); $result[$key] = array_merge($result[$key], $errorList); } } diff --git a/libraries/classes/Controllers/Sql/ColumnPreferencesController.php b/libraries/classes/Controllers/Sql/ColumnPreferencesController.php index af931972a1..8b8dea7e43 100644 --- a/libraries/classes/Controllers/Sql/ColumnPreferencesController.php +++ b/libraries/classes/Controllers/Sql/ColumnPreferencesController.php @@ -15,6 +15,7 @@ use PhpMyAdmin\Template; use function array_map; use function explode; +use function intval; use function is_string; final class ColumnPreferencesController extends AbstractController @@ -41,14 +42,14 @@ final class ColumnPreferencesController extends AbstractController // set column order $colorder = $request->getParsedBodyParam('col_order'); if (is_string($colorder)) { - $propertyValue = array_map('intval', explode(',', $colorder)); + $propertyValue = array_map(intval(...), explode(',', $colorder)); $status = $tableObject->setUiProp(Table::PROP_COLUMN_ORDER, $propertyValue, $tableCreateTime); } // set column visibility $colvisib = $request->getParsedBodyParam('col_visib'); if ($status === true && is_string($colvisib)) { - $propertyValue = array_map('intval', explode(',', $colvisib)); + $propertyValue = array_map(intval(...), explode(',', $colvisib)); $status = $tableObject->setUiProp(Table::PROP_COLUMN_ORDER, $propertyValue, $tableCreateTime); } diff --git a/libraries/classes/Controllers/Table/TrackingController.php b/libraries/classes/Controllers/Table/TrackingController.php index 63d92c5a8d..b29f5183fa 100644 --- a/libraries/classes/Controllers/Table/TrackingController.php +++ b/libraries/classes/Controllers/Table/TrackingController.php @@ -29,6 +29,7 @@ use function in_array; use function is_array; use function mb_strlen; use function sprintf; +use function trim; final class TrackingController extends AbstractController { @@ -118,7 +119,7 @@ final class TrackingController extends AbstractController /** @var string $users */ $users = $request->getParsedBodyParam('users', '*'); - $GLOBALS['filter_users'] = array_map('trim', explode(',', $users)); + $GLOBALS['filter_users'] = array_map(trim(...), explode(',', $users)); } $dateFrom ??= new DateTimeImmutable(); diff --git a/libraries/classes/Encoding.php b/libraries/classes/Encoding.php index de54ef2704..592645895a 100644 --- a/libraries/classes/Encoding.php +++ b/libraries/classes/Encoding.php @@ -19,6 +19,7 @@ use function mb_convert_kana; use function mb_detect_encoding; use function mb_list_encodings; use function recode_string; +use function strtolower; use function tempnam; use function unlink; @@ -340,7 +341,7 @@ class Encoding } return array_intersect( - array_map('strtolower', mb_list_encodings()), + array_map(strtolower(...), mb_list_encodings()), $GLOBALS['cfg']['AvailableCharsets'], ); } diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php index 490573e549..e3464a0fda 100644 --- a/libraries/classes/Server/Privileges.php +++ b/libraries/classes/Server/Privileges.php @@ -233,8 +233,7 @@ class Privileges ) { // Required for proper escaping of ` (backtick) in a column name $grantCols = array_map( - /** @param string $val */ - static fn ($val): string => Util::backquote($val), + Util::backquote(...), $GLOBALS[$currentGrant[0]], ); diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php index 4916cd49dd..e4b0994b56 100644 --- a/libraries/classes/Table.php +++ b/libraries/classes/Table.php @@ -36,6 +36,7 @@ use function explode; use function htmlspecialchars; use function implode; use function in_array; +use function intval; use function is_array; use function is_numeric; use function is_string; @@ -1836,7 +1837,7 @@ class Table implements Stringable // check if the table has not been modified if ($this->getStatusInfo('Create_time') == $this->uiprefs['CREATE_TIME']) { - return array_map('intval', $this->uiprefs[$property]); + return array_map(intval(...), $this->uiprefs[$property]); } // remove the property, since the table has been modified diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php index 8010923e83..2c33f0be81 100644 --- a/libraries/classes/Util.php +++ b/libraries/classes/Util.php @@ -2370,7 +2370,7 @@ class Util $disabled = ini_get('disable_functions'); if (is_string($disabled)) { $disabled = explode(',', $disabled); - $disabled = array_map(static fn (string $part) => trim($part), $disabled); + $disabled = array_map(trim(...), $disabled); return ! in_array('error_reporting', $disabled); } diff --git a/libraries/classes/Utils/Gis.php b/libraries/classes/Utils/Gis.php index e38a71d3f8..b6030bcad8 100644 --- a/libraries/classes/Utils/Gis.php +++ b/libraries/classes/Utils/Gis.php @@ -7,6 +7,7 @@ namespace PhpMyAdmin\Utils; use function array_map; use function bin2hex; use function mb_strtolower; +use function mb_strtoupper; use function preg_match; use function trim; @@ -78,7 +79,7 @@ final class Gis 'geometrycollection', ]; if ($upperCase) { - return array_map('mb_strtoupper', $gisDataTypes); + return array_map(mb_strtoupper(...), $gisDataTypes); } return $gisDataTypes; diff --git a/psalm-baseline.xml b/psalm-baseline.xml index d8f7c58063..f62aca2b71 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -668,7 +668,6 @@ $uv[$i] $values[$path] $vid - (array) $errorList @@ -13217,7 +13216,6 @@ - uiprefs[$property]]]>