diff --git a/examples/config.manyhosts.inc.php b/examples/config.manyhosts.inc.php
index 8e93435d0d..c9022d3462 100644
--- a/examples/config.manyhosts.inc.php
+++ b/examples/config.manyhosts.inc.php
@@ -9,12 +9,7 @@
 declare(strict_types=1);
 
 $i = 0;
-$hosts = [
-    'foo.example.com',
-    'bar.example.com',
-    'baz.example.com',
-    'quux.example.com',
-];
+$hosts = ['foo.example.com', 'bar.example.com', 'baz.example.com', 'quux.example.com'];
 
 foreach ($hosts as $host) {
     $i++;
diff --git a/examples/openid.php b/examples/openid.php
index d149bf726e..91ce8406f0 100644
--- a/examples/openid.php
+++ b/examples/openid.php
@@ -24,12 +24,7 @@ $secureCookie = false;
 /**
  * Map of authenticated users to MySQL user/password pairs.
  */
-$authMap = [
-    'https://launchpad.net/~username' => [
-        'user' => 'root',
-        'password' => '',
-    ],
-];
+$authMap = ['https://launchpad.net/~username' => ['user' => 'root', 'password' => '']];
 
 // phpcs:disable PSR1.Files.SideEffects,Squiz.Functions.GlobalFunction
 
diff --git a/examples/signon-script.php b/examples/signon-script.php
index 076eb97fea..0b27a0bbcf 100644
--- a/examples/signon-script.php
+++ b/examples/signon-script.php
@@ -24,15 +24,9 @@ function get_login_credentials($user): array
 {
     /* Optionally we can use passed username */
     if (! empty($user)) {
-        return [
-            $user,
-            'password',
-        ];
+        return [$user, 'password'];
     }
 
     /* Here we would retrieve the credentials */
-    return [
-        'root',
-        '',
-    ];
+    return ['root', ''];
 }
diff --git a/libraries/classes/Advisory/Advisor.php b/libraries/classes/Advisory/Advisor.php
index be3e372341..445b2df31c 100644
--- a/libraries/classes/Advisory/Advisor.php
+++ b/libraries/classes/Advisory/Advisor.php
@@ -44,12 +44,7 @@ class Advisor
     private array $rules = [];
 
     /** @var array{fired:array, notfired:array, unchecked:array, errors:array} */
-    private array $runResult = [
-        'fired' => [],
-        'notfired' => [],
-        'unchecked' => [],
-        'errors' => [],
-    ];
+    private array $runResult = ['fired' => [], 'notfired' => [], 'unchecked' => [], 'errors' => []];
 
     public function __construct(private DatabaseInterface $dbi, private ExpressionLanguage $expression)
     {
@@ -191,12 +186,7 @@ class Advisor
      */
     private function runRules(): void
     {
-        $this->runResult = [
-            'fired' => [],
-            'notfired' => [],
-            'unchecked' => [],
-            'errors' => [],
-        ];
+        $this->runResult = ['fired' => [], 'notfired' => [], 'unchecked' => [], 'errors' => []];
 
         foreach ($this->rules as $rule) {
             $this->variables['value'] = 0;
diff --git a/libraries/classes/BrowseForeigners.php b/libraries/classes/BrowseForeigners.php
index 53826906ff..ad401c17e6 100644
--- a/libraries/classes/BrowseForeigners.php
+++ b/libraries/classes/BrowseForeigners.php
@@ -71,10 +71,7 @@ class BrowseForeigners
         // key names and descriptions for the left section,
         // sorted by key names
         $leftKeyname = $keys[$indexByKeyname];
-        [
-            $leftDescription,
-            $leftDescriptionTitle,
-        ] = $this->getDescriptionAndTitle($descriptions[$indexByKeyname]);
+        [$leftDescription, $leftDescriptionTitle] = $this->getDescriptionAndTitle($descriptions[$indexByKeyname]);
 
         // key names and descriptions for the right section,
         // sorted by descriptions
@@ -129,11 +126,7 @@ class BrowseForeigners
 
         $output .= '</tr>';
 
-        return [
-            $output,
-            $horizontalCount,
-            $indexByDescription,
-        ];
+        return [$output, $horizontalCount, $indexByDescription];
     }
 
     /**
@@ -230,11 +223,7 @@ class BrowseForeigners
         $indexByDescription = 0;
 
         foreach (array_keys($keys) as $indexByKeyname) {
-            [
-                $html,
-                $horizontalCount,
-                $indexByDescription,
-            ] = $this->getHtmlForOneKey(
+            [$html, $horizontalCount, $indexByDescription] = $this->getHtmlForOneKey(
                 $horizontalCount,
                 $header,
                 $keys,
@@ -267,10 +256,7 @@ class BrowseForeigners
             $description = mb_substr($description, 0, $this->settings->limitChars) . '...';
         }
 
-        return [
-            $description,
-            $descriptionTitle,
-        ];
+        return [$description, $descriptionTitle];
     }
 
     /**
diff --git a/libraries/classes/Charsets.php b/libraries/classes/Charsets.php
index 1500830924..01c3bb96e1 100644
--- a/libraries/classes/Charsets.php
+++ b/libraries/classes/Charsets.php
@@ -167,10 +167,7 @@ class Charsets
 
         if (self::$serverCharset === null) {// Fallback in case nothing is found
             return Charset::fromServer(
-                [
-                    'Charset' => __('Unknown'),
-                    'Description' => __('Unknown'),
-                ],
+                ['Charset' => __('Unknown'), 'Description' => __('Unknown')],
             );
         }
 
diff --git a/libraries/classes/CheckUserPrivileges.php b/libraries/classes/CheckUserPrivileges.php
index 6924f6851d..f88aec2902 100644
--- a/libraries/classes/CheckUserPrivileges.php
+++ b/libraries/classes/CheckUserPrivileges.php
@@ -65,11 +65,7 @@ class CheckUserPrivileges
         );
         $showGrantsTableName = Util::unQuote($showGrantsTableName, '`');
 
-        return [
-            $showGrantsString,
-            $showGrantsDbName,
-            $showGrantsTableName,
-        ];
+        return [$showGrantsString, $showGrantsDbName, $showGrantsTableName];
     }
 
     /**
@@ -190,11 +186,7 @@ class CheckUserPrivileges
         $re1 = '(^|[^\\\\])(\\\)+'; // escaped wildcards
 
         while ($row = $showGrantsResult->fetchRow()) {
-            [
-                $showGrantsString,
-                $showGrantsDbName,
-                $showGrantsTableName,
-            ] = $this->getItemsFromShowGrantsRow($row[0]);
+            [$showGrantsString, $showGrantsDbName, $showGrantsTableName] = $this->getItemsFromShowGrantsRow($row[0]);
 
             if ($showGrantsDbName === '*') {
                 if ($showGrantsString !== 'USAGE') {
diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php
index 88f6baf5d1..4b16893f52 100644
--- a/libraries/classes/Config.php
+++ b/libraries/classes/Config.php
@@ -1077,11 +1077,7 @@ class Config
     {
         // First try configured temp dir
         // Fallback to PHP upload_tmp_dir
-        $dirs = [
-            $this->getTempDir('upload'),
-            ini_get('upload_tmp_dir'),
-            sys_get_temp_dir(),
-        ];
+        $dirs = [$this->getTempDir('upload'), ini_get('upload_tmp_dir'), sys_get_temp_dir()];
 
         foreach ($dirs as $dir) {
             if (! empty($dir) && @is_writable($dir)) {
@@ -1262,11 +1258,7 @@ class Config
             }
         } else {
             if ($server === null) {
-                return [
-                    null,
-                    null,
-                    null,
-                ];
+                return [null, null, null];
             }
 
             if (isset($server['user'])) {
@@ -1301,11 +1293,7 @@ class Config
             $server['hide_connection_errors'] = false;
         }
 
-        return [
-            $user,
-            $password,
-            $server,
-        ];
+        return [$user, $password, $server];
     }
 
     /**
diff --git a/libraries/classes/Config/ConfigFile.php b/libraries/classes/Config/ConfigFile.php
index f629863b87..76f7d8aedc 100644
--- a/libraries/classes/Config/ConfigFile.php
+++ b/libraries/classes/Config/ConfigFile.php
@@ -501,40 +501,15 @@ class ConfigFile
             'Servers' => [
                 1 => [
                     'port' => 'integer',
-                    'auth_type' => [
-                        'config',
-                        'http',
-                        'signon',
-                        'cookie',
-                    ],
-                    'AllowDeny' => [
-                        'order' => [
-                            '',
-                            'deny,allow',
-                            'allow,deny',
-                            'explicit',
-                        ],
-                    ],
+                    'auth_type' => ['config', 'http', 'signon', 'cookie'],
+                    'AllowDeny' => ['order' => ['', 'deny,allow', 'allow,deny', 'explicit']],
                     'only_db' => 'array',
                 ],
             ],
-            'RecodingEngine' => [
-                'auto',
-                'iconv',
-                'recode',
-                'mb',
-                'none',
-            ],
-            'OBGzip' => [
-                'auto',
-                true,
-                false,
-            ],
+            'RecodingEngine' => ['auto', 'iconv', 'recode', 'mb', 'none'],
+            'OBGzip' => ['auto', true, false],
             'MemoryLimit' => 'short_string',
-            'NavigationLogoLinkWindow' => [
-                'main',
-                'new',
-            ],
+            'NavigationLogoLinkWindow' => ['main', 'new'],
             'NavigationTreeDefaultTabTable' => [
                 // fields list
                 'structure' => __('Structure'),
@@ -564,49 +539,19 @@ class ConfigFile
             'NavigationTreeDbSeparator' => 'short_string',
             'NavigationTreeTableSeparator' => 'short_string',
             'NavigationWidth' => 'integer',
-            'TableNavigationLinksMode' => [
-                'icons' => __('Icons'),
-                'text' => __('Text'),
-                'both' => __('Both'),
-            ],
-            'MaxRows' => [
-                25,
-                50,
-                100,
-                250,
-                500,
-            ],
-            'Order' => [
-                'ASC',
-                'DESC',
-                'SMART',
-            ],
+            'TableNavigationLinksMode' => ['icons' => __('Icons'), 'text' => __('Text'), 'both' => __('Both')],
+            'MaxRows' => [25, 50, 100, 250, 500],
+            'Order' => ['ASC', 'DESC', 'SMART'],
             'RowActionLinks' => [
                 'none' => __('Nowhere'),
                 'left' => __('Left'),
                 'right' => __('Right'),
                 'both' => __('Both'),
             ],
-            'TablePrimaryKeyOrder' => [
-                'NONE' => __('None'),
-                'ASC' => __('Ascending'),
-                'DESC' => __('Descending'),
-            ],
-            'ProtectBinary' => [
-                false,
-                'blob',
-                'noblob',
-                'all',
-            ],
-            'CharEditing' => [
-                'input',
-                'textarea',
-            ],
-            'TabsMode' => [
-                'icons' => __('Icons'),
-                'text' => __('Text'),
-                'both' => __('Both'),
-            ],
+            'TablePrimaryKeyOrder' => ['NONE' => __('None'), 'ASC' => __('Ascending'), 'DESC' => __('Descending')],
+            'ProtectBinary' => [false, 'blob', 'noblob', 'all'],
+            'CharEditing' => ['input', 'textarea'],
+            'TabsMode' => ['icons' => __('Icons'), 'text' => __('Text'), 'both' => __('Both')],
             'PDFDefaultPageSize' => [
                 'A3' => 'A3',
                 'A4' => 'A4',
@@ -614,20 +559,13 @@ class ConfigFile
                 'letter' => 'letter',
                 'legal' => 'legal',
             ],
-            'ActionLinksMode' => [
-                'icons' => __('Icons'),
-                'text' => __('Text'),
-                'both' => __('Both'),
-            ],
+            'ActionLinksMode' => ['icons' => __('Icons'), 'text' => __('Text'), 'both' => __('Both')],
             'GridEditing' => [
                 'click' => __('Click'),
                 'double-click' => __('Double click'),
                 'disabled' => __('Disabled'),
             ],
-            'RelationalDisplay' => [
-                'K' => __('key'),
-                'D' => __('display column'),
-            ],
+            'RelationalDisplay' => ['K' => __('key'), 'D' => __('display column')],
             'DefaultTabServer' => [
                 // the welcome page (recommended for multiuser setups)
                 'welcome' => __('Welcome'),
@@ -662,11 +600,7 @@ class ConfigFile
                 // browse page
                 'browse' => __('Browse'),
             ],
-            'InitialSlidersState' => [
-                'open' => __('Open'),
-                'closed' => __('Closed'),
-                'disabled' => __('Disabled'),
-            ],
+            'InitialSlidersState' => ['open' => __('Open'), 'closed' => __('Closed'), 'disabled' => __('Disabled')],
             'FirstDayOfCalendar' => [
                 '1' => _pgettext('Week day name', 'Monday'),
                 '2' => _pgettext('Week day name', 'Tuesday'),
@@ -719,11 +653,7 @@ class ConfigFile
                 'ldi_terminated' => 'short_string',
                 'ldi_enclosed' => 'short_string',
                 'ldi_escaped' => 'short_string',
-                'ldi_local_option' => [
-                    'auto',
-                    true,
-                    false,
-                ],
+                'ldi_local_option' => ['auto', true, false],
             ],
 
             'Export' => [
@@ -752,11 +682,7 @@ class ConfigFile
                     'xml',
                     'yaml',
                 ],
-                'compression' => [
-                    'none',
-                    'zip',
-                    'gzip',
-                ],
+                'compression' => ['none', 'zip', 'gzip'],
                 'charset' => array_merge([''], $GLOBALS['cfg']['AvailableCharsets'] ?? []),
                 'sql_compatibility' => [
                     'NONE',
@@ -772,11 +698,7 @@ class ConfigFile
                     //'POSTGRESQL',
                     'TRADITIONAL',
                 ],
-                'codegen_format' => [
-                    '#',
-                    'NHibernate C# DO',
-                    'NHibernate XML',
-                ],
+                'codegen_format' => ['#', 'NHibernate C# DO', 'NHibernate XML'],
                 'csv_separator' => 'short_string',
                 'csv_terminated' => 'short_string',
                 'csv_enclosed' => 'short_string',
@@ -793,11 +715,7 @@ class ConfigFile
                     'data' => __('data'),
                     'structure_and_data' => __('structure and data'),
                 ],
-                'sql_type' => [
-                    'INSERT',
-                    'UPDATE',
-                    'REPLACE',
-                ],
+                'sql_type' => ['INSERT', 'UPDATE', 'REPLACE'],
                 'sql_insert_syntax' => [
                     'complete' => __('complete inserts'),
                     'extended' => __('extended inserts'),
@@ -826,20 +744,9 @@ class ConfigFile
             ],
 
             'Console' => [
-                'Mode' => [
-                    'info',
-                    'show',
-                    'collapse',
-                ],
-                'OrderBy' => [
-                    'exec',
-                    'time',
-                    'count',
-                ],
-                'Order' => [
-                    'asc',
-                    'desc',
-                ],
+                'Mode' => ['info', 'show', 'collapse'],
+                'OrderBy' => ['exec', 'time', 'count'],
+                'Order' => ['asc', 'desc'],
             ],
 
             /**
@@ -855,42 +762,12 @@ class ConfigFile
                 'Export/sql_max_query_size' => 'validatePositiveNumber',
                 'FirstLevelNavigationItems' => 'validatePositiveNumber',
                 'ForeignKeyMaxLimit' => 'validatePositiveNumber',
-                'Import/csv_enclosed' => [
-                    [
-                        'validateByRegex',
-                        '/^.?$/',
-                    ],
-                ],
-                'Import/csv_escaped' => [
-                    [
-                        'validateByRegex',
-                        '/^.$/',
-                    ],
-                ],
-                'Import/csv_terminated' => [
-                    [
-                        'validateByRegex',
-                        '/^.$/',
-                    ],
-                ],
-                'Import/ldi_enclosed' => [
-                    [
-                        'validateByRegex',
-                        '/^.?$/',
-                    ],
-                ],
-                'Import/ldi_escaped' => [
-                    [
-                        'validateByRegex',
-                        '/^.$/',
-                    ],
-                ],
-                'Import/ldi_terminated' => [
-                    [
-                        'validateByRegex',
-                        '/^.$/',
-                    ],
-                ],
+                'Import/csv_enclosed' => [['validateByRegex', '/^.?$/']],
+                'Import/csv_escaped' => [['validateByRegex', '/^.$/']],
+                'Import/csv_terminated' => [['validateByRegex', '/^.$/']],
+                'Import/ldi_enclosed' => [['validateByRegex', '/^.?$/']],
+                'Import/ldi_escaped' => [['validateByRegex', '/^.$/']],
+                'Import/ldi_terminated' => [['validateByRegex', '/^.$/']],
                 'Import/skip_queries' => 'validateNonNegativeNumber',
                 'InsertRows' => 'validatePositiveNumber',
                 'NumRecentTables' => 'validateNonNegativeNumber',
@@ -905,12 +782,7 @@ class ConfigFile
                 'MaxSizeForInputField' => 'validatePositiveNumber',
                 'MinSizeForInputField' => 'validateNonNegativeNumber',
                 'MaxTableList' => 'validatePositiveNumber',
-                'MemoryLimit' => [
-                    [
-                        'validateByRegex',
-                        '/^(-1|(\d+(?:[kmg])?))$/i',
-                    ],
-                ],
+                'MemoryLimit' => [['validateByRegex', '/^(-1|(\d+(?:[kmg])?))$/i']],
                 'NavigationTreeDisplayItemFilterMinimum' => 'validatePositiveNumber',
                 'NavigationTreeTableLevel' => 'validatePositiveNumber',
                 'NavigationWidth' => 'validateNonNegativeNumber',
@@ -929,24 +801,9 @@ class ConfigFile
              * Additional validators used for user preferences
              */
             '_userValidators' => [
-                'MaxDbList' => [
-                    [
-                        'validateUpperBound',
-                        'value:MaxDbList',
-                    ],
-                ],
-                'MaxTableList' => [
-                    [
-                        'validateUpperBound',
-                        'value:MaxTableList',
-                    ],
-                ],
-                'QueryHistoryMax' => [
-                    [
-                        'validateUpperBound',
-                        'value:QueryHistoryMax',
-                    ],
-                ],
+                'MaxDbList' => [['validateUpperBound', 'value:MaxDbList']],
+                'MaxTableList' => [['validateUpperBound', 'value:MaxTableList']],
+                'QueryHistoryMax' => [['validateUpperBound', 'value:QueryHistoryMax']],
             ],
         ];
     }
diff --git a/libraries/classes/Config/Descriptions.php b/libraries/classes/Config/Descriptions.php
index ac9c32bb2b..6f96216936 100644
--- a/libraries/classes/Config/Descriptions.php
+++ b/libraries/classes/Config/Descriptions.php
@@ -27,14 +27,8 @@ class Descriptions
     public static function get(string $path, string $type = 'name'): string
     {
         $key = str_replace(
-            [
-                'Servers/1/',
-                '/',
-            ],
-            [
-                'Servers/',
-                '_',
-            ],
+            ['Servers/1/', '/'],
+            ['Servers/', '_'],
             $path,
         );
         $value = self::getString($key, $type);
diff --git a/libraries/classes/Config/FormDisplay.php b/libraries/classes/Config/FormDisplay.php
index 0e59a8ecdc..79383e0e9d 100644
--- a/libraries/classes/Config/FormDisplay.php
+++ b/libraries/classes/Config/FormDisplay.php
@@ -796,18 +796,9 @@ class FormDisplay
         if ($systemPath === 'ZipDump' || $systemPath === 'GZipDump' || $systemPath === 'BZipDump') {
             $comment = '';
             $funcs = [
-                'ZipDump' => [
-                    'zip_open',
-                    'gzcompress',
-                ],
-                'GZipDump' => [
-                    'gzopen',
-                    'gzencode',
-                ],
-                'BZipDump' => [
-                    'bzopen',
-                    'bzcompress',
-                ],
+                'ZipDump' => ['zip_open', 'gzcompress'],
+                'GZipDump' => ['gzopen', 'gzencode'],
+                'BZipDump' => ['bzopen', 'bzcompress'],
             ];
             if (! function_exists($funcs[$systemPath][0])) {
                 $comment = sprintf(
diff --git a/libraries/classes/Config/FormDisplayTemplate.php b/libraries/classes/Config/FormDisplayTemplate.php
index a68eb8437d..589a14a7b7 100644
--- a/libraries/classes/Config/FormDisplayTemplate.php
+++ b/libraries/classes/Config/FormDisplayTemplate.php
@@ -152,10 +152,7 @@ class FormDisplayTemplate
      */
     public function displayErrors(string $name, array $errorList): string
     {
-        return $this->template->render('config/form_display/errors', [
-            'name' => $name,
-            'error_list' => $errorList,
-        ]);
+        return $this->template->render('config/form_display/errors', ['name' => $name, 'error_list' => $errorList]);
     }
 
     public function display(array $data): string
diff --git a/libraries/classes/Config/Forms/Page/BrowseForm.php b/libraries/classes/Config/Forms/Page/BrowseForm.php
index e7f7c19584..a4e8d7ca17 100644
--- a/libraries/classes/Config/Forms/Page/BrowseForm.php
+++ b/libraries/classes/Config/Forms/Page/BrowseForm.php
@@ -15,8 +15,6 @@ class BrowseForm extends BaseForm
     /** @return array */
     public static function getForms(): array
     {
-        return [
-            'Browse' => MainForm::getForms()['Browse'],
-        ];
+        return ['Browse' => MainForm::getForms()['Browse']];
     }
 }
diff --git a/libraries/classes/Config/Forms/Page/DbStructureForm.php b/libraries/classes/Config/Forms/Page/DbStructureForm.php
index 250c4c4aae..84e49d8009 100644
--- a/libraries/classes/Config/Forms/Page/DbStructureForm.php
+++ b/libraries/classes/Config/Forms/Page/DbStructureForm.php
@@ -15,8 +15,6 @@ class DbStructureForm extends BaseForm
     /** @return array */
     public static function getForms(): array
     {
-        return [
-            'DbStructure' => MainForm::getForms()['DbStructure'],
-        ];
+        return ['DbStructure' => MainForm::getForms()['DbStructure']];
     }
 }
diff --git a/libraries/classes/Config/Forms/Page/EditForm.php b/libraries/classes/Config/Forms/Page/EditForm.php
index 6049a04b32..5dd9d18351 100644
--- a/libraries/classes/Config/Forms/Page/EditForm.php
+++ b/libraries/classes/Config/Forms/Page/EditForm.php
@@ -16,9 +16,6 @@ class EditForm extends BaseForm
     /** @return array */
     public static function getForms(): array
     {
-        return [
-            'Edit' => MainForm::getForms()['Edit'],
-            'Text_fields' => FeaturesForm::getForms()['Text_fields'],
-        ];
+        return ['Edit' => MainForm::getForms()['Edit'], 'Text_fields' => FeaturesForm::getForms()['Text_fields']];
     }
 }
diff --git a/libraries/classes/Config/Forms/Page/TableStructureForm.php b/libraries/classes/Config/Forms/Page/TableStructureForm.php
index 4c730bf521..72181f842e 100644
--- a/libraries/classes/Config/Forms/Page/TableStructureForm.php
+++ b/libraries/classes/Config/Forms/Page/TableStructureForm.php
@@ -15,8 +15,6 @@ class TableStructureForm extends BaseForm
     /** @return array */
     public static function getForms(): array
     {
-        return [
-            'TableStructure' => MainForm::getForms()['TableStructure'],
-        ];
+        return ['TableStructure' => MainForm::getForms()['TableStructure']];
     }
 }
diff --git a/libraries/classes/Config/Forms/Setup/ConfigForm.php b/libraries/classes/Config/Forms/Setup/ConfigForm.php
index 806f0caa81..ead35cfbd7 100644
--- a/libraries/classes/Config/Forms/Setup/ConfigForm.php
+++ b/libraries/classes/Config/Forms/Setup/ConfigForm.php
@@ -14,11 +14,6 @@ class ConfigForm extends BaseForm
     /** @return array */
     public static function getForms(): array
     {
-        return [
-            'Config' => [
-                'DefaultLang',
-                'ServerDefault',
-            ],
-        ];
+        return ['Config' => ['DefaultLang', 'ServerDefault']];
     }
 }
diff --git a/libraries/classes/Config/Forms/Setup/FeaturesForm.php b/libraries/classes/Config/Forms/Setup/FeaturesForm.php
index 7dd5664fec..fb367accdc 100644
--- a/libraries/classes/Config/Forms/Setup/FeaturesForm.php
+++ b/libraries/classes/Config/Forms/Setup/FeaturesForm.php
@@ -19,10 +19,7 @@ class FeaturesForm extends \PhpMyAdmin\Config\Forms\User\FeaturesForm
         /* Remove only_db/hide_db, we have proper Server form in setup */
         $result['Databases'] = array_diff(
             $result['Databases'],
-            [
-                'Servers/1/only_db',
-                'Servers/1/hide_db',
-            ],
+            ['Servers/1/only_db', 'Servers/1/hide_db'],
         );
         /* Following are not available to user */
         $result['Import_export'] = [
@@ -50,10 +47,7 @@ class FeaturesForm extends \PhpMyAdmin\Config\Forms\User\FeaturesForm
             'CaptchaLoginPrivateKey',
             'CaptchaSiteVerifyURL',
         ];
-        $result['Developer'] = [
-            'UserprefsDeveloperTab',
-            'DBG/sql',
-        ];
+        $result['Developer'] = ['UserprefsDeveloperTab', 'DBG/sql'];
         $result['Other_core_settings'] = [
             'OBGzip',
             'PersistentConnections',
diff --git a/libraries/classes/Config/Forms/Setup/ServersForm.php b/libraries/classes/Config/Forms/Setup/ServersForm.php
index 55e36aa87f..881bee3659 100644
--- a/libraries/classes/Config/Forms/Setup/ServersForm.php
+++ b/libraries/classes/Config/Forms/Setup/ServersForm.php
@@ -18,18 +18,7 @@ class ServersForm extends BaseForm
     {
         // phpcs:disable Squiz.Arrays.ArrayDeclaration.KeySpecified,Squiz.Arrays.ArrayDeclaration.NoKeySpecified
         return [
-            'Server' => [
-                'Servers' => [
-                    1 => [
-                        'verbose',
-                        'host',
-                        'port',
-                        'socket',
-                        'ssl',
-                        'compress',
-                    ],
-                ],
-            ],
+            'Server' => ['Servers' => [1 => ['verbose', 'host', 'port', 'socket', 'ssl', 'compress']]],
             'Server_auth' => [
                 'Servers' => [
                     1 => [
diff --git a/libraries/classes/Config/Forms/User/FeaturesForm.php b/libraries/classes/Config/Forms/User/FeaturesForm.php
index 7205255d8e..c7afe7c18c 100644
--- a/libraries/classes/Config/Forms/User/FeaturesForm.php
+++ b/libraries/classes/Config/Forms/User/FeaturesForm.php
@@ -47,12 +47,7 @@ class FeaturesForm extends BaseForm
                 'TextareaRows',
                 'LongtextDoubleTextarea',
             ],
-            'Page_titles' => [
-                'TitleDefault',
-                'TitleTable',
-                'TitleDatabase',
-                'TitleServer',
-            ],
+            'Page_titles' => ['TitleDefault', 'TitleTable', 'TitleDatabase', 'TitleServer'],
             'Warnings' => [
                 'PmaNoRelation_DisableWarning',
                 'SuhosinDisableWarning',
diff --git a/libraries/classes/Config/Forms/User/ImportForm.php b/libraries/classes/Config/Forms/User/ImportForm.php
index 72de1d398e..c601eff65a 100644
--- a/libraries/classes/Config/Forms/User/ImportForm.php
+++ b/libraries/classes/Config/Forms/User/ImportForm.php
@@ -24,11 +24,7 @@ class ImportForm extends BaseForm
                 'Import/skip_queries',
                 'enable_drag_drop_import',
             ],
-            'Sql' => [
-                'Import/sql_compatibility',
-                'Import/sql_no_auto_value_on_zero',
-                'Import/sql_read_as_multibytes',
-            ],
+            'Sql' => ['Import/sql_compatibility', 'Import/sql_no_auto_value_on_zero', 'Import/sql_read_as_multibytes'],
             'Csv' => [
                 ':group:' . __('CSV'),
                 'Import/csv_replace',
diff --git a/libraries/classes/Config/Forms/User/MainForm.php b/libraries/classes/Config/Forms/User/MainForm.php
index 910d6991aa..938032076e 100644
--- a/libraries/classes/Config/Forms/User/MainForm.php
+++ b/libraries/classes/Config/Forms/User/MainForm.php
@@ -17,11 +17,7 @@ class MainForm extends BaseForm
     public static function getForms(): array
     {
         return [
-            'Startup' => [
-                'ShowCreateDb',
-                'ShowStats',
-                'ShowServerInfo',
-            ],
+            'Startup' => ['ShowCreateDb', 'ShowStats', 'ShowServerInfo'],
             'DbStructure' => [
                 'ShowDbStructureCharset',
                 'ShowDbStructureComment',
@@ -70,12 +66,7 @@ class MainForm extends BaseForm
                 'ForeignKeyDropdownOrder',
                 'ForeignKeyMaxLimit',
             ],
-            'Tabs' => [
-                'TabsMode',
-                'DefaultTabServer',
-                'DefaultTabDatabase',
-                'DefaultTabTable',
-            ],
+            'Tabs' => ['TabsMode', 'DefaultTabServer', 'DefaultTabDatabase', 'DefaultTabTable'],
             'DisplayRelationalSchema' => ['PDFDefaultPageSize'],
         ];
     }
diff --git a/libraries/classes/Config/Forms/User/NaviForm.php b/libraries/classes/Config/Forms/User/NaviForm.php
index f96158a8f0..0f5c7c107b 100644
--- a/libraries/classes/Config/Forms/User/NaviForm.php
+++ b/libraries/classes/Config/Forms/User/NaviForm.php
@@ -41,14 +41,8 @@ class NaviForm extends BaseForm
                 'NavigationTreeShowEvents',
                 'NavigationTreeAutoexpandSingleDb',
             ],
-            'Navi_servers' => [
-                'NavigationDisplayServers',
-                'DisplayServersList',
-            ],
-            'Navi_databases' => [
-                'NavigationTreeDisplayDbFilterMinimum',
-                'NavigationTreeDbSeparator',
-            ],
+            'Navi_servers' => ['NavigationDisplayServers', 'DisplayServersList'],
+            'Navi_databases' => ['NavigationTreeDisplayDbFilterMinimum', 'NavigationTreeDbSeparator'],
             'Navi_tables' => [
                 'NavigationTreeDefaultTabTable',
                 'NavigationTreeDefaultTabTable2',
diff --git a/libraries/classes/Config/Forms/User/SqlForm.php b/libraries/classes/Config/Forms/User/SqlForm.php
index b9754f5c79..509bfce65a 100644
--- a/libraries/classes/Config/Forms/User/SqlForm.php
+++ b/libraries/classes/Config/Forms/User/SqlForm.php
@@ -29,12 +29,7 @@ class SqlForm extends BaseForm
                 'EnableAutocompleteForTablesAndColumns',
                 'DefaultForeignKeyChecks',
             ],
-            'Sql_box' => [
-                'SQLQuery/Edit',
-                'SQLQuery/Explain',
-                'SQLQuery/ShowAsPHP',
-                'SQLQuery/Refresh',
-            ],
+            'Sql_box' => ['SQLQuery/Edit', 'SQLQuery/Explain', 'SQLQuery/ShowAsPHP', 'SQLQuery/Refresh'],
         ];
     }
 
diff --git a/libraries/classes/Config/SpecialSchemaLinks.php b/libraries/classes/Config/SpecialSchemaLinks.php
index 02cabafbaf..82b9c82336 100644
--- a/libraries/classes/Config/SpecialSchemaLinks.php
+++ b/libraries/classes/Config/SpecialSchemaLinks.php
@@ -72,35 +72,19 @@ class SpecialSchemaLinks
                 'columns_priv' => [
                     'user' => [
                         'link_param' => 'username',
-                        'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'hostname',
-                                'column_name' => 'host',
-                            ],
-                        ],
+                        'link_dependancy_params' => [0 => ['param_info' => 'hostname', 'column_name' => 'host']],
                         'default_page' => './' . Url::getFromRoute('/server/privileges'),
                     ],
                     'table_name' => [
                         'link_param' => 'table',
-                        'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'Db',
-                            ],
-                        ],
+                        'link_dependancy_params' => [0 => ['param_info' => 'db', 'column_name' => 'Db']],
                         'default_page' => $defaultPageTable,
                     ],
                     'column_name' => [
                         'link_param' => 'field',
                         'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'Db',
-                            ],
-                            1 => [
-                                'param_info' => 'table',
-                                'column_name' => 'Table_name',
-                            ],
+                            0 => ['param_info' => 'db', 'column_name' => 'Db'],
+                            1 => ['param_info' => 'table', 'column_name' => 'Table_name'],
                         ],
                         'default_page' => './' . Url::getFromRoute('/table/structure/change', ['change_column' => 1]),
                     ],
@@ -108,24 +92,14 @@ class SpecialSchemaLinks
                 'db' => [
                     'user' => [
                         'link_param' => 'username',
-                        'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'hostname',
-                                'column_name' => 'host',
-                            ],
-                        ],
+                        'link_dependancy_params' => [0 => ['param_info' => 'hostname', 'column_name' => 'host']],
                         'default_page' => './' . Url::getFromRoute('/server/privileges'),
                     ],
                 ],
                 'event' => [
                     'name' => [
                         'link_param' => 'item_name',
-                        'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'db',
-                            ],
-                        ],
+                        'link_dependancy_params' => [0 => ['param_info' => 'db', 'column_name' => 'db']],
                         'default_page' => './' . Url::getFromRoute('/database/events', ['edit_item' => 1]),
                     ],
 
@@ -133,25 +107,14 @@ class SpecialSchemaLinks
                 'innodb_index_stats' => [
                     'table_name' => [
                         'link_param' => 'table',
-                        'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'database_name',
-                            ],
-                        ],
+                        'link_dependancy_params' => [0 => ['param_info' => 'db', 'column_name' => 'database_name']],
                         'default_page' => $defaultPageTable,
                     ],
                     'index_name' => [
                         'link_param' => 'index',
                         'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'database_name',
-                            ],
-                            1 => [
-                                'param_info' => 'table',
-                                'column_name' => 'table_name',
-                            ],
+                            0 => ['param_info' => 'db', 'column_name' => 'database_name'],
+                            1 => ['param_info' => 'table', 'column_name' => 'table_name'],
                         ],
                         'default_page' => './' . Url::getFromRoute('/table/structure'),
                     ],
@@ -159,12 +122,7 @@ class SpecialSchemaLinks
                 'innodb_table_stats' => [
                     'table_name' => [
                         'link_param' => 'table',
-                        'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'database_name',
-                            ],
-                        ],
+                        'link_dependancy_params' => [0 => ['param_info' => 'db', 'column_name' => 'database_name']],
                         'default_page' => $defaultPageTable,
                     ],
                 ],
@@ -172,28 +130,16 @@ class SpecialSchemaLinks
                     'name' => [
                         'link_param' => 'item_name',
                         'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'db',
-                            ],
-                            1 => [
-                                'param_info' => 'item_type',
-                                'column_name' => 'type',
-                            ],
+                            0 => ['param_info' => 'db', 'column_name' => 'db'],
+                            1 => ['param_info' => 'item_type', 'column_name' => 'type'],
                         ],
                         'default_page' => './' . Url::getFromRoute('/database/routines', ['edit_item' => 1]),
                     ],
                     'specific_name' => [
                         'link_param' => 'item_name',
                         'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'db',
-                            ],
-                            1 => [
-                                'param_info' => 'item_type',
-                                'column_name' => 'type',
-                            ],
+                            0 => ['param_info' => 'db', 'column_name' => 'db'],
+                            1 => ['param_info' => 'item_type', 'column_name' => 'type'],
                         ],
                         'default_page' => './' . Url::getFromRoute('/database/routines', ['edit_item' => 1]),
                     ],
@@ -201,25 +147,14 @@ class SpecialSchemaLinks
                 'proc_priv' => [
                     'user' => [
                         'link_param' => 'username',
-                        'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'hostname',
-                                'column_name' => 'Host',
-                            ],
-                        ],
+                        'link_dependancy_params' => [0 => ['param_info' => 'hostname', 'column_name' => 'Host']],
                         'default_page' => './' . Url::getFromRoute('/server/privileges'),
                     ],
                     'routine_name' => [
                         'link_param' => 'item_name',
                         'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'Db',
-                            ],
-                            1 => [
-                                'param_info' => 'item_type',
-                                'column_name' => 'Routine_type',
-                            ],
+                            0 => ['param_info' => 'db', 'column_name' => 'Db'],
+                            1 => ['param_info' => 'item_type', 'column_name' => 'Routine_type'],
                         ],
                         'default_page' => './' . Url::getFromRoute('/database/routines', ['edit_item' => 1]),
                     ],
@@ -227,46 +162,26 @@ class SpecialSchemaLinks
                 'proxies_priv' => [
                     'user' => [
                         'link_param' => 'username',
-                        'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'hostname',
-                                'column_name' => 'Host',
-                            ],
-                        ],
+                        'link_dependancy_params' => [0 => ['param_info' => 'hostname', 'column_name' => 'Host']],
                         'default_page' => './' . Url::getFromRoute('/server/privileges'),
                     ],
                 ],
                 'tables_priv' => [
                     'user' => [
                         'link_param' => 'username',
-                        'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'hostname',
-                                'column_name' => 'Host',
-                            ],
-                        ],
+                        'link_dependancy_params' => [0 => ['param_info' => 'hostname', 'column_name' => 'Host']],
                         'default_page' => './' . Url::getFromRoute('/server/privileges'),
                     ],
                     'table_name' => [
                         'link_param' => 'table',
-                        'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'Db',
-                            ],
-                        ],
+                        'link_dependancy_params' => [0 => ['param_info' => 'db', 'column_name' => 'Db']],
                         'default_page' => $defaultPageTable,
                     ],
                 ],
                 'user' => [
                     'user' => [
                         'link_param' => 'username',
-                        'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'hostname',
-                                'column_name' => 'host',
-                            ],
-                        ],
+                        'link_dependancy_params' => [0 => ['param_info' => 'hostname', 'column_name' => 'host']],
                         'default_page' => './' . Url::getFromRoute('/server/privileges'),
                     ],
                 ],
@@ -275,25 +190,14 @@ class SpecialSchemaLinks
                 'columns' => [
                     'table_name' => [
                         'link_param' => 'table',
-                        'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'table_schema',
-                            ],
-                        ],
+                        'link_dependancy_params' => [0 => ['param_info' => 'db', 'column_name' => 'table_schema']],
                         'default_page' => $defaultPageTable,
                     ],
                     'column_name' => [
                         'link_param' => 'field',
                         'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'table_schema',
-                            ],
-                            1 => [
-                                'param_info' => 'table',
-                                'column_name' => 'table_name',
-                            ],
+                            0 => ['param_info' => 'db', 'column_name' => 'table_schema'],
+                            1 => ['param_info' => 'table', 'column_name' => 'table_name'],
                         ],
                         'default_page' => './' . Url::getFromRoute('/table/structure/change', ['change_column' => 1]),
                     ],
@@ -301,49 +205,29 @@ class SpecialSchemaLinks
                 'key_column_usage' => [
                     'table_name' => [
                         'link_param' => 'table',
-                        'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'constraint_schema',
-                            ],
-                        ],
+                        'link_dependancy_params' => [0 => ['param_info' => 'db','column_name' => 'constraint_schema']],
                         'default_page' => $defaultPageTable,
                     ],
                     'column_name' => [
                         'link_param' => 'field',
                         'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'table_schema',
-                            ],
-                            1 => [
-                                'param_info' => 'table',
-                                'column_name' => 'table_name',
-                            ],
+                            0 => ['param_info' => 'db', 'column_name' => 'table_schema'],
+                            1 => ['param_info' => 'table', 'column_name' => 'table_name'],
                         ],
                         'default_page' => './' . Url::getFromRoute('/table/structure/change', ['change_column' => 1]),
                     ],
                     'referenced_table_name' => [
                         'link_param' => 'table',
                         'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'referenced_table_schema',
-                            ],
+                            0 => ['param_info' => 'db', 'column_name' => 'referenced_table_schema'],
                         ],
                         'default_page' => $defaultPageTable,
                     ],
                     'referenced_column_name' => [
                         'link_param' => 'field',
                         'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'referenced_table_schema',
-                            ],
-                            1 => [
-                                'param_info' => 'table',
-                                'column_name' => 'referenced_table_name',
-                            ],
+                            0 => ['param_info' => 'db', 'column_name' => 'referenced_table_schema'],
+                            1 => ['param_info' => 'table', 'column_name' => 'referenced_table_name'],
                         ],
                         'default_page' => './' . Url::getFromRoute('/table/structure/change', ['change_column' => 1]),
                     ],
@@ -351,46 +235,26 @@ class SpecialSchemaLinks
                 'partitions' => [
                     'table_name' => [
                         'link_param' => 'table',
-                        'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'table_schema',
-                            ],
-                        ],
+                        'link_dependancy_params' => [0 => ['param_info' => 'db', 'column_name' => 'table_schema']],
                         'default_page' => $defaultPageTable,
                     ],
                 ],
                 'processlist' => [
                     'user' => [
                         'link_param' => 'username',
-                        'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'hostname',
-                                'column_name' => 'host',
-                            ],
-                        ],
+                        'link_dependancy_params' => [0 => ['param_info' => 'hostname', 'column_name' => 'host']],
                         'default_page' => './' . Url::getFromRoute('/server/privileges'),
                     ],
                 ],
                 'referential_constraints' => [
                     'table_name' => [
                         'link_param' => 'table',
-                        'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'constraint_schema',
-                            ],
-                        ],
+                        'link_dependancy_params' => [0 => ['param_info' => 'db','column_name' => 'constraint_schema']],
                         'default_page' => $defaultPageTable,
                     ],
                     'referenced_table_name' => [
                         'link_param' => 'table',
-                        'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'constraint_schema',
-                            ],
-                        ],
+                        'link_dependancy_params' => [0 => ['param_info' => 'db','column_name' => 'constraint_schema']],
                         'default_page' => $defaultPageTable,
                     ],
                 ],
@@ -398,46 +262,24 @@ class SpecialSchemaLinks
                     'routine_name' => [
                         'link_param' => 'item_name',
                         'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'routine_schema',
-                            ],
-                            1 => [
-                                'param_info' => 'item_type',
-                                'column_name' => 'routine_type',
-                            ],
+                            0 => ['param_info' => 'db', 'column_name' => 'routine_schema'],
+                            1 => ['param_info' => 'item_type', 'column_name' => 'routine_type'],
                         ],
                         'default_page' => './' . Url::getFromRoute('/database/routines'),
                     ],
                 ],
-                'schemata' => [
-                    'schema_name' => [
-                        'link_param' => 'db',
-                        'default_page' => $defaultPageDatabase,
-                    ],
-                ],
+                'schemata' => ['schema_name' => ['link_param' => 'db', 'default_page' => $defaultPageDatabase]],
                 'statistics' => [
                     'table_name' => [
                         'link_param' => 'table',
-                        'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'table_schema',
-                            ],
-                        ],
+                        'link_dependancy_params' => [0 => ['param_info' => 'db', 'column_name' => 'table_schema']],
                         'default_page' => $defaultPageTable,
                     ],
                     'column_name' => [
                         'link_param' => 'field',
                         'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'table_schema',
-                            ],
-                            1 => [
-                                'param_info' => 'table',
-                                'column_name' => 'table_name',
-                            ],
+                            0 => ['param_info' => 'db', 'column_name' => 'table_schema'],
+                            1 => ['param_info' => 'table', 'column_name' => 'table_name'],
                         ],
                         'default_page' => './' . Url::getFromRoute('/table/structure/change', ['change_column' => 1]),
                     ],
@@ -445,36 +287,21 @@ class SpecialSchemaLinks
                 'tables' => [
                     'table_name' => [
                         'link_param' => 'table',
-                        'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'table_schema',
-                            ],
-                        ],
+                        'link_dependancy_params' => [0 => ['param_info' => 'db', 'column_name' => 'table_schema']],
                         'default_page' => $defaultPageTable,
                     ],
                 ],
                 'table_constraints' => [
                     'table_name' => [
                         'link_param' => 'table',
-                        'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'table_schema',
-                            ],
-                        ],
+                        'link_dependancy_params' => [0 => ['param_info' => 'db', 'column_name' => 'table_schema']],
                         'default_page' => $defaultPageTable,
                     ],
                 ],
                 'views' => [
                     'table_name' => [
                         'link_param' => 'table',
-                        'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'table_schema',
-                            ],
-                        ],
+                        'link_dependancy_params' => [0 => ['param_info' => 'db', 'column_name' => 'table_schema']],
                         'default_page' => $defaultPageTable,
                     ],
                 ],
diff --git a/libraries/classes/ConfigStorage/Relation.php b/libraries/classes/ConfigStorage/Relation.php
index f8eb8585ff..563c7c00df 100644
--- a/libraries/classes/ConfigStorage/Relation.php
+++ b/libraries/classes/ConfigStorage/Relation.php
@@ -225,15 +225,9 @@ class Relation
 
         $workToTable = [
             'relwork' => 'relation',
-            'displaywork' => [
-                'relation',
-                'table_info',
-            ],
+            'displaywork' => ['relation', 'table_info'],
             'bookmarkwork' => 'bookmarktable',
-            'pdfwork' => [
-                'table_coords',
-                'pdf_pages',
-            ],
+            'pdfwork' => ['table_coords', 'pdf_pages'],
             'commwork' => 'column_info',
             'mimework' => 'column_info',
             'historywork' => 'history',
@@ -242,10 +236,7 @@ class Relation
             'uiprefswork' => 'table_uiprefs',
             'trackingwork' => 'tracking',
             'userconfigwork' => 'userconfig',
-            'menuswork' => [
-                'users',
-                'usergroups',
-            ],
+            'menuswork' => ['users', 'usergroups'],
             'navwork' => 'navigationhiding',
             'savedsearcheswork' => 'savedsearches',
             'centralcolumnswork' => 'central_columns',
@@ -347,10 +338,7 @@ class Relation
     {
         // From 4.3, new input oriented transformation feature was introduced.
         // Check whether column_info table has input transformation columns
-        $newCols = [
-            'input_transformation',
-            'input_transformation_options',
-        ];
+        $newCols = ['input_transformation', 'input_transformation_options'];
         $query = 'SHOW COLUMNS FROM '
             . Util::backquote($GLOBALS['cfg']['Server']['pmadb'])
             . '.' . Util::backquote($GLOBALS['cfg']['Server']['column_info'])
@@ -373,10 +361,7 @@ class Relation
             // replace pma__column_info table name from query
             // to with set in config.inc.php
             $query = str_replace(
-                [
-                    '`phpmyadmin`',
-                    '`pma__column_info`',
-                ],
+                ['`phpmyadmin`', '`pma__column_info`'],
                 [
                     Util::backquote($GLOBALS['cfg']['Server']['pmadb']),
                     Util::backquote($GLOBALS['cfg']['Server']['column_info']),
@@ -672,11 +657,7 @@ class Relation
             $_SESSION['sql_history'] = [];
         }
 
-        $_SESSION['sql_history'][] = [
-            'db' => $db,
-            'table' => $table,
-            'sqlquery' => $sqlquery,
-        ];
+        $_SESSION['sql_history'][] = ['db' => $db, 'table' => $table, 'sqlquery' => $sqlquery];
 
         if (count($_SESSION['sql_history']) > $GLOBALS['cfg']['QueryHistoryMax']) {
             // history should not exceed a maximum count
@@ -1365,10 +1346,7 @@ class Relation
 
             return $this->dbi->fetchResult(
                 $relQuery,
-                [
-                    'referenced_column_name',
-                    null,
-                ],
+                ['referenced_column_name', null],
             );
         }
 
@@ -1394,12 +1372,7 @@ class Relation
         array|null $foreignersFull = null,
         array|null $childReferencesFull = null,
     ): array {
-        $columnStatus = [
-            'isEditable' => true,
-            'isReferenced' => false,
-            'isForeignKey' => false,
-            'references' => [],
-        ];
+        $columnStatus = ['isEditable' => true, 'isReferenced' => false, 'isForeignKey' => false, 'references' => []];
 
         $foreigners = [];
         if ($foreignersFull !== null) {
@@ -1691,10 +1664,7 @@ class Relation
             $haveRel = count($resRel) > 0;
         }
 
-        return [
-            $resRel,
-            $haveRel,
-        ];
+        return [$resRel, $haveRel];
     }
 
     /**
diff --git a/libraries/classes/ConfigStorage/UserGroups.php b/libraries/classes/ConfigStorage/UserGroups.php
index f584ef63b7..9d27b8d025 100644
--- a/libraries/classes/ConfigStorage/UserGroups.php
+++ b/libraries/classes/ConfigStorage/UserGroups.php
@@ -52,10 +52,7 @@ class UserGroups
         if ($result) {
             $i = 0;
             while ($row = $result->fetchRow()) {
-                $users[] = [
-                    'count' => ++$i,
-                    'user' => $row[0],
-                ];
+                $users[] = ['count' => ++$i, 'user' => $row[0]];
             }
         }
 
@@ -102,20 +99,14 @@ class UserGroups
                 $userGroupVal['tableTab'] = self::getAllowedTabNames($tabs, 'table');
                 $userGroupVal['userGroupUrl'] = Url::getFromRoute('/server/user-groups');
                 $userGroupVal['viewUsersUrl'] = Url::getCommon(
-                    [
-                        'viewUsers' => 1,
-                        'userGroup' => $groupName,
-                    ],
+                    ['viewUsers' => 1, 'userGroup' => $groupName],
                     '',
                     false,
                 );
                 $userGroupVal['viewUsersIcon'] = Generator::getIcon('b_usrlist', __('View users'));
 
                 $userGroupVal['editUsersUrl'] = Url::getCommon(
-                    [
-                        'editUserGroup' => 1,
-                        'userGroup' => $groupName,
-                    ],
+                    ['editUserGroup' => 1, 'userGroup' => $groupName],
                     '',
                     false,
                 );
@@ -210,11 +201,7 @@ class UserGroups
             $urlParams['addUserGroupSubmit'] = '1';
         }
 
-        $allowedTabs = [
-            'server' => [],
-            'db' => [],
-            'table' => [],
-        ];
+        $allowedTabs = ['server' => [], 'db' => [], 'table' => []];
         if ($userGroup !== null) {
             $groupTable = Util::backquote($configurableMenusFeature->database)
                 . '.' . Util::backquote($configurableMenusFeature->userGroups);
diff --git a/libraries/classes/Controllers/Database/ExportController.php b/libraries/classes/Controllers/Database/ExportController.php
index 1d5fcdff54..03924546d4 100644
--- a/libraries/classes/Controllers/Database/ExportController.php
+++ b/libraries/classes/Controllers/Database/ExportController.php
@@ -56,10 +56,7 @@ final class ExportController extends AbstractController
 
         $GLOBALS['urlParams']['goto'] = Url::getFromRoute('/database/export');
 
-        [
-            $GLOBALS['tables'],
-            $GLOBALS['num_tables'],
-        ] = Util::getDbInfo($request, $GLOBALS['db'], false);
+        [$GLOBALS['tables'], $GLOBALS['num_tables']] = Util::getDbInfo($request, $GLOBALS['db'], false);
 
         // exit if no tables in db found
         if ($GLOBALS['num_tables'] < 1) {
diff --git a/libraries/classes/Controllers/Database/ImportController.php b/libraries/classes/Controllers/Database/ImportController.php
index 1f30a5f654..d21e9ec502 100644
--- a/libraries/classes/Controllers/Database/ImportController.php
+++ b/libraries/classes/Controllers/Database/ImportController.php
@@ -75,11 +75,7 @@ final class ImportController extends AbstractController
         $charsets = Charsets::getCharsets($this->dbi, $GLOBALS['cfg']['Server']['DisableIS']);
 
         $idKey = $_SESSION[$GLOBALS['SESSION_KEY']]['handler']::getIdKey();
-        $hiddenInputs = [
-            $idKey => $uploadId,
-            'import_type' => 'database',
-            'db' => $GLOBALS['db'],
-        ];
+        $hiddenInputs = [$idKey => $uploadId, 'import_type' => 'database', 'db' => $GLOBALS['db']];
 
         $default = isset($_GET['format']) ? (string) $_GET['format'] : Plugins::getDefault('Import', 'format');
         $choice = Plugins::getChoice($importList, $default);
diff --git a/libraries/classes/Controllers/Database/MultiTableQueryController.php b/libraries/classes/Controllers/Database/MultiTableQueryController.php
index eabccd6194..6f375c4495 100644
--- a/libraries/classes/Controllers/Database/MultiTableQueryController.php
+++ b/libraries/classes/Controllers/Database/MultiTableQueryController.php
@@ -23,10 +23,7 @@ class MultiTableQueryController extends AbstractController
 
     public function __invoke(ServerRequest $request): void
     {
-        $this->addScriptFiles([
-            'database/multi_table_query.js',
-            'database/query_generator.js',
-        ]);
+        $this->addScriptFiles(['database/multi_table_query.js', 'database/query_generator.js']);
 
         $queryInstance = new MultiTableQuery($this->dbi, $this->template, $GLOBALS['db']);
 
diff --git a/libraries/classes/Controllers/Database/PrivilegesController.php b/libraries/classes/Controllers/Database/PrivilegesController.php
index 738cfd6543..1c621f5e91 100644
--- a/libraries/classes/Controllers/Database/PrivilegesController.php
+++ b/libraries/classes/Controllers/Database/PrivilegesController.php
@@ -61,10 +61,7 @@ class PrivilegesController extends AbstractController
         $isCreateUser = $this->dbi->isCreateUser();
 
         if (! $this->dbi->isSuperUser() && ! $isGrantUser && ! $isCreateUser) {
-            $this->render('server/sub_page_header', [
-                'type' => 'privileges',
-                'is_image' => false,
-            ]);
+            $this->render('server/sub_page_header', ['type' => 'privileges', 'is_image' => false]);
             $this->response->addHTML(
                 Message::error(__('No Privileges'))
                     ->getDisplay(),
diff --git a/libraries/classes/Controllers/Database/Structure/ChangePrefixFormController.php b/libraries/classes/Controllers/Database/Structure/ChangePrefixFormController.php
index d6fe4c0c85..e888b3355c 100644
--- a/libraries/classes/Controllers/Database/Structure/ChangePrefixFormController.php
+++ b/libraries/classes/Controllers/Database/Structure/ChangePrefixFormController.php
@@ -33,9 +33,6 @@ final class ChangePrefixFormController extends AbstractController
         }
 
         $this->response->disable();
-        $this->render('database/structure/change_prefix_form', [
-            'route' => $route,
-            'url_params' => $urlParams,
-        ]);
+        $this->render('database/structure/change_prefix_form', ['route' => $route, 'url_params' => $urlParams]);
     }
 }
diff --git a/libraries/classes/Controllers/Database/Structure/FavoriteTableController.php b/libraries/classes/Controllers/Database/Structure/FavoriteTableController.php
index 6915ac1a43..e0dd9ccd07 100644
--- a/libraries/classes/Controllers/Database/Structure/FavoriteTableController.php
+++ b/libraries/classes/Controllers/Database/Structure/FavoriteTableController.php
@@ -156,10 +156,7 @@ final class FavoriteTableController extends AbstractController
         // Set flag when localStorage and pmadb(if present) are in sync.
         $_SESSION['tmpval']['favorites_synced'][$GLOBALS['server']] = true;
 
-        return [
-            'favoriteTables' => json_encode($favoriteTables),
-            'list' => $favoriteInstance->getHtmlList(),
-        ];
+        return ['favoriteTables' => json_encode($favoriteTables), 'list' => $favoriteInstance->getHtmlList()];
     }
 
     /**
diff --git a/libraries/classes/Controllers/Database/Structure/RealRowCountController.php b/libraries/classes/Controllers/Database/Structure/RealRowCountController.php
index f6d6f0ce52..1b163b620b 100644
--- a/libraries/classes/Controllers/Database/Structure/RealRowCountController.php
+++ b/libraries/classes/Controllers/Database/Structure/RealRowCountController.php
@@ -65,10 +65,7 @@ final class RealRowCountController extends AbstractController
             $rowCount = $this->dbi
                 ->getTable($GLOBALS['db'], $table['TABLE_NAME'])
                 ->getRealRowCountTable();
-            $realRowCountAll[] = [
-                'table' => $table['TABLE_NAME'],
-                'row_count' => $rowCount,
-            ];
+            $realRowCountAll[] = ['table' => $table['TABLE_NAME'], 'row_count' => $rowCount];
         }
 
         $this->response->addJSON(['real_row_count_all' => json_encode($realRowCountAll)]);
diff --git a/libraries/classes/Controllers/Database/StructureController.php b/libraries/classes/Controllers/Database/StructureController.php
index 4146056823..962b9e746c 100644
--- a/libraries/classes/Controllers/Database/StructureController.php
+++ b/libraries/classes/Controllers/Database/StructureController.php
@@ -88,11 +88,7 @@ class StructureController extends AbstractController
      */
     private function getDatabaseInfo(ServerRequest $request): void
     {
-        [
-            $tables,
-            $numTables,
-            $totalNumTables,
-        ] = Util::getDbInfo($request, $GLOBALS['db']);
+        [$tables, $numTables, $totalNumTables] = Util::getDbInfo($request, $GLOBALS['db']);
 
         $this->tables = $tables;
         $this->numTables = $numTables;
@@ -121,10 +117,7 @@ class StructureController extends AbstractController
     {
         $GLOBALS['errorUrl'] ??= null;
 
-        $parameters = [
-            'sort' => $_REQUEST['sort'] ?? null,
-            'sort_order' => $_REQUEST['sort_order'] ?? null,
-        ];
+        $parameters = ['sort' => $_REQUEST['sort'] ?? null, 'sort_order' => $_REQUEST['sort_order'] ?? null];
 
         $this->checkParameters(['db']);
 
@@ -159,10 +152,7 @@ class StructureController extends AbstractController
         $this->response->addHTML($pageSettings->getHTML());
 
         if ($this->numTables > 0) {
-            $urlParams = [
-                'pos' => $this->position,
-                'db' => $GLOBALS['db'],
-            ];
+            $urlParams = ['pos' => $this->position, 'db' => $GLOBALS['db']];
             if (isset($parameters['sort'])) {
                 $urlParams['sort'] = $parameters['sort'];
             }
@@ -234,10 +224,7 @@ class StructureController extends AbstractController
             $inputClass = ['checkall'];
 
             // Sets parameters for links
-            $tableUrlParams = [
-                'db' => $GLOBALS['db'],
-                'table' => $currentTable['TABLE_NAME'],
-            ];
+            $tableUrlParams = ['db' => $GLOBALS['db'], 'table' => $currentTable['TABLE_NAME']];
             // do not list the previous table's size info for a view
 
             [
@@ -444,10 +431,7 @@ class StructureController extends AbstractController
             $this->dbi->getDbCollation($GLOBALS['db']),
         );
         if ($collation !== null) {
-            $databaseCollation = [
-                'name' => $collation->getName(),
-                'description' => $collation->getDescription(),
-            ];
+            $databaseCollation = ['name' => $collation->getName(), 'description' => $collation->getDescription()];
             $databaseCharset = $collation->getCharset();
         }
 
@@ -564,10 +548,7 @@ class StructureController extends AbstractController
             }
         }
 
-        return [
-            $approxRows,
-            $showSuperscript,
-        ];
+        return [$approxRows, $showSuperscript];
     }
 
     /**
@@ -599,10 +580,7 @@ class StructureController extends AbstractController
                 || $this->hasTable($replicaInfo['Wild_Ignore_Table'], $table);
         }
 
-        return [
-            $do,
-            $ignored,
-        ];
+        return [$do, $ignored];
     }
 
     /**
@@ -806,15 +784,7 @@ class StructureController extends AbstractController
             }
         }
 
-        return [
-            $currentTable,
-            $formattedSize,
-            $unit,
-            $formattedOverhead,
-            $overheadUnit,
-            $overheadSize,
-            $sumSize,
-        ];
+        return [$currentTable, $formattedSize, $unit, $formattedOverhead, $overheadUnit, $overheadSize, $sumSize];
     }
 
     /**
@@ -852,12 +822,7 @@ class StructureController extends AbstractController
             [$formattedSize, $unit] = Util::formatByteDown($tblsize, 3, ($tblsize > 0 ? 1 : 0));
         }
 
-        return [
-            $currentTable,
-            $formattedSize,
-            $unit,
-            $sumSize,
-        ];
+        return [$currentTable, $formattedSize, $unit, $sumSize];
     }
 
     /**
@@ -882,11 +847,6 @@ class StructureController extends AbstractController
             [$formattedSize, $unit] = Util::formatByteDown($tblsize, 3, ($tblsize > 0 ? 1 : 0));
         }
 
-        return [
-            $currentTable,
-            $formattedSize,
-            $unit,
-            $sumSize,
-        ];
+        return [$currentTable, $formattedSize, $unit, $sumSize];
     }
 }
diff --git a/libraries/classes/Controllers/GisDataEditorController.php b/libraries/classes/Controllers/GisDataEditorController.php
index 3405a7632a..e2138f9e12 100644
--- a/libraries/classes/Controllers/GisDataEditorController.php
+++ b/libraries/classes/Controllers/GisDataEditorController.php
@@ -99,17 +99,8 @@ class GisDataEditorController extends AbstractController
         $result = "'" . $wkt . "'," . $srid;
 
         // Generate SVG based visualization
-        $visualizationSettings = [
-            'width' => 450,
-            'height' => 300,
-            'spatialColumn' => 'wkt',
-        ];
-        $data = [
-            [
-                'wkt' => $wktWithZero,
-                'srid' => $srid,
-            ],
-        ];
+        $visualizationSettings = ['width' => 450, 'height' => 300, 'spatialColumn' => 'wkt'];
+        $data = [['wkt' => $wktWithZero, 'srid' => $srid]];
 
         $visualization = GisVisualization::getByData($data, $visualizationSettings);
         $svg = $visualization->asSVG();
@@ -117,11 +108,7 @@ class GisDataEditorController extends AbstractController
 
         // If the call is to update the WKT and visualization make an AJAX response
         if ($request->hasBodyParam('generate')) {
-            $this->response->addJSON([
-                'result' => $result,
-                'visualization' => $svg,
-                'openLayers' => $openLayers,
-            ]);
+            $this->response->addJSON(['result' => $result, 'visualization' => $svg, 'openLayers' => $openLayers]);
 
             return;
         }
diff --git a/libraries/classes/Controllers/Import/ImportController.php b/libraries/classes/Controllers/Import/ImportController.php
index 846cd1b2a3..e71e0b04e5 100644
--- a/libraries/classes/Controllers/Import/ImportController.php
+++ b/libraries/classes/Controllers/Import/ImportController.php
@@ -248,10 +248,7 @@ final class ImportController extends AbstractController
         $GLOBALS['format'] = Core::securePath($GLOBALS['format']);
 
         if (strlen($GLOBALS['table']) > 0 && strlen($GLOBALS['db']) > 0) {
-            $GLOBALS['urlParams'] = [
-                'db' => $GLOBALS['db'],
-                'table' => $GLOBALS['table'],
-            ];
+            $GLOBALS['urlParams'] = ['db' => $GLOBALS['db'], 'table' => $GLOBALS['table']];
         } elseif (strlen($GLOBALS['db']) > 0) {
             $GLOBALS['urlParams'] = ['db' => $GLOBALS['db']];
         } else {
diff --git a/libraries/classes/Controllers/Import/StatusController.php b/libraries/classes/Controllers/Import/StatusController.php
index b4071739c9..b78dfd44d3 100644
--- a/libraries/classes/Controllers/Import/StatusController.php
+++ b/libraries/classes/Controllers/Import/StatusController.php
@@ -35,11 +35,7 @@ class StatusController
         $GLOBALS['plugins'] ??= null;
         $GLOBALS['timestamp'] ??= null;
 
-        [
-            $GLOBALS['SESSION_KEY'],
-            $GLOBALS['upload_id'],
-            $GLOBALS['plugins'],
-        ] = Ajax::uploadProgressSetup();
+        [$GLOBALS['SESSION_KEY'], $GLOBALS['upload_id'], $GLOBALS['plugins']] = Ajax::uploadProgressSetup();
 
         // $_GET["message"] is used for asking for an import message
         if ($request->hasQueryParam('message')) {
diff --git a/libraries/classes/Controllers/Normalization/AddNewPrimaryController.php b/libraries/classes/Controllers/Normalization/AddNewPrimaryController.php
index a8da10f792..3afe4d1876 100644
--- a/libraries/classes/Controllers/Normalization/AddNewPrimaryController.php
+++ b/libraries/classes/Controllers/Normalization/AddNewPrimaryController.php
@@ -29,10 +29,7 @@ final class AddNewPrimaryController extends AbstractController
         $dbName = isset($db) ? $db->getName() : '';
         $tableName = isset($table) ? $table->getName() : '';
 
-        $columnMeta = [
-            'Field' => $tableName . '_id',
-            'Extra' => 'auto_increment',
-        ];
+        $columnMeta = ['Field' => $tableName . '_id', 'Extra' => 'auto_increment'];
         $html = $this->normalization->getHtmlForCreateNewColumn($numFields, $dbName, $tableName, $columnMeta);
         $html .= Url::getHiddenInputs($dbName, $tableName);
         $this->response->addHTML($html);
diff --git a/libraries/classes/Controllers/Normalization/MainController.php b/libraries/classes/Controllers/Normalization/MainController.php
index 91bde1300b..234bb4e4b6 100644
--- a/libraries/classes/Controllers/Normalization/MainController.php
+++ b/libraries/classes/Controllers/Normalization/MainController.php
@@ -15,9 +15,6 @@ class MainController extends AbstractController
     public function __invoke(ServerRequest $request): void
     {
         $this->addScriptFiles(['normalization.js', 'vendor/jquery/jquery.uitablefilter.js']);
-        $this->render('table/normalization/normalization', [
-            'db' => $GLOBALS['db'],
-            'table' => $GLOBALS['table'],
-        ]);
+        $this->render('table/normalization/normalization', ['db' => $GLOBALS['db'], 'table' => $GLOBALS['table']]);
     }
 }
diff --git a/libraries/classes/Controllers/Preferences/TwoFactorController.php b/libraries/classes/Controllers/Preferences/TwoFactorController.php
index c5f8f027fd..2db7401e1a 100644
--- a/libraries/classes/Controllers/Preferences/TwoFactorController.php
+++ b/libraries/classes/Controllers/Preferences/TwoFactorController.php
@@ -36,9 +36,7 @@ class TwoFactorController extends AbstractController
 
         if ($request->hasBodyParam('2fa_remove')) {
             if (! $twoFactor->check(true)) {
-                echo $this->template->render('preferences/two_factor/confirm', [
-                    'form' => $twoFactor->render(),
-                ]);
+                echo $this->template->render('preferences/two_factor/confirm', ['form' => $twoFactor->render()]);
 
                 return;
             }
diff --git a/libraries/classes/Controllers/RecentTablesListController.php b/libraries/classes/Controllers/RecentTablesListController.php
index 51cbce21c2..4e91a4e626 100644
--- a/libraries/classes/Controllers/RecentTablesListController.php
+++ b/libraries/classes/Controllers/RecentTablesListController.php
@@ -15,8 +15,6 @@ final class RecentTablesListController extends AbstractController
             return;
         }
 
-        $this->response->addJSON([
-            'list' => RecentFavoriteTable::getInstance('recent')->getHtmlList(),
-        ]);
+        $this->response->addJSON(['list' => RecentFavoriteTable::getInstance('recent')->getHtmlList()]);
     }
 }
diff --git a/libraries/classes/Controllers/Server/DatabasesController.php b/libraries/classes/Controllers/Server/DatabasesController.php
index 2b23804ac1..f94fca9cbb 100644
--- a/libraries/classes/Controllers/Server/DatabasesController.php
+++ b/libraries/classes/Controllers/Server/DatabasesController.php
@@ -272,10 +272,7 @@ class DatabasesController extends AbstractController
             ];
         }
 
-        return [
-            'databases' => $databases,
-            'total_statistics' => $totalStatistics,
-        ];
+        return ['databases' => $databases, 'total_statistics' => $totalStatistics];
     }
 
     /**
@@ -286,36 +283,12 @@ class DatabasesController extends AbstractController
     private function getStatisticsColumns(): array
     {
         return [
-            'SCHEMA_TABLES' => [
-                'title' => __('Tables'),
-                'format' => 'number',
-                'raw' => 0,
-            ],
-            'SCHEMA_TABLE_ROWS' => [
-                'title' => __('Rows'),
-                'format' => 'number',
-                'raw' => 0,
-            ],
-            'SCHEMA_DATA_LENGTH' => [
-                'title' => __('Data'),
-                'format' => 'byte',
-                'raw' => 0,
-            ],
-            'SCHEMA_INDEX_LENGTH' => [
-                'title' => __('Indexes'),
-                'format' => 'byte',
-                'raw' => 0,
-            ],
-            'SCHEMA_LENGTH' => [
-                'title' => __('Total'),
-                'format' => 'byte',
-                'raw' => 0,
-            ],
-            'SCHEMA_DATA_FREE' => [
-                'title' => __('Overhead'),
-                'format' => 'byte',
-                'raw' => 0,
-            ],
+            'SCHEMA_TABLES' => ['title' => __('Tables'), 'format' => 'number', 'raw' => 0],
+            'SCHEMA_TABLE_ROWS' => ['title' => __('Rows'), 'format' => 'number', 'raw' => 0],
+            'SCHEMA_DATA_LENGTH' => ['title' => __('Data'), 'format' => 'byte', 'raw' => 0],
+            'SCHEMA_INDEX_LENGTH' => ['title' => __('Indexes'), 'format' => 'byte', 'raw' => 0],
+            'SCHEMA_LENGTH' => ['title' => __('Total'), 'format' => 'byte', 'raw' => 0],
+            'SCHEMA_DATA_FREE' => ['title' => __('Overhead'), 'format' => 'byte', 'raw' => 0],
         ];
     }
 }
diff --git a/libraries/classes/Controllers/Server/EnginesController.php b/libraries/classes/Controllers/Server/EnginesController.php
index a31a9d7499..76aa170fb6 100644
--- a/libraries/classes/Controllers/Server/EnginesController.php
+++ b/libraries/classes/Controllers/Server/EnginesController.php
@@ -30,8 +30,6 @@ class EnginesController extends AbstractController
             $this->dbi->selectDb('mysql');
         }
 
-        $this->render('server/engines/index', [
-            'engines' => StorageEngine::getStorageEngines(),
-        ]);
+        $this->render('server/engines/index', ['engines' => StorageEngine::getStorageEngines()]);
     }
 }
diff --git a/libraries/classes/Controllers/Server/ImportController.php b/libraries/classes/Controllers/Server/ImportController.php
index 5d27d92e13..f669b3196c 100644
--- a/libraries/classes/Controllers/Server/ImportController.php
+++ b/libraries/classes/Controllers/Server/ImportController.php
@@ -71,10 +71,7 @@ final class ImportController extends AbstractController
         $charsets = Charsets::getCharsets($this->dbi, $GLOBALS['cfg']['Server']['DisableIS']);
 
         $idKey = $_SESSION[$GLOBALS['SESSION_KEY']]['handler']::getIdKey();
-        $hiddenInputs = [
-            $idKey => $uploadId,
-            'import_type' => 'server',
-        ];
+        $hiddenInputs = [$idKey => $uploadId, 'import_type' => 'server'];
 
         $default = isset($_GET['format']) ? (string) $_GET['format'] : Plugins::getDefault('Import', 'format');
         $choice = Plugins::getChoice($importList, $default);
diff --git a/libraries/classes/Controllers/Server/PluginsController.php b/libraries/classes/Controllers/Server/PluginsController.php
index 40f9d690fe..d2222c7f1c 100644
--- a/libraries/classes/Controllers/Server/PluginsController.php
+++ b/libraries/classes/Controllers/Server/PluginsController.php
@@ -58,9 +58,6 @@ class PluginsController extends AbstractController
             );
         }
 
-        $this->render('server/plugins/index', [
-            'plugins' => $plugins,
-            'clean_types' => $cleanTypes,
-        ]);
+        $this->render('server/plugins/index', ['plugins' => $plugins, 'clean_types' => $cleanTypes]);
     }
 }
diff --git a/libraries/classes/Controllers/Server/PrivilegesController.php b/libraries/classes/Controllers/Server/PrivilegesController.php
index 42db6c3950..bf612a3f42 100644
--- a/libraries/classes/Controllers/Server/PrivilegesController.php
+++ b/libraries/classes/Controllers/Server/PrivilegesController.php
@@ -78,10 +78,7 @@ class PrivilegesController extends AbstractController
         /**
          * Sets globals from $_POST patterns, for privileges and max_* vars
          */
-        Core::setPostAsGlobal([
-            '/_priv$/i',
-            '/^max_/i',
-        ]);
+        Core::setPostAsGlobal(['/_priv$/i', '/^max_/i']);
 
         $GLOBALS['errorUrl'] = Url::getFromRoute('/');
 
@@ -109,10 +106,7 @@ class PrivilegesController extends AbstractController
         $isCreateUser = $this->dbi->isCreateUser();
 
         if (! $this->dbi->isSuperUser() && ! $isGrantUser && ! $isCreateUser) {
-            $this->render('server/sub_page_header', [
-                'type' => 'privileges',
-                'is_image' => false,
-            ]);
+            $this->render('server/sub_page_header', ['type' => 'privileges', 'is_image' => false]);
             $this->response->addHTML(
                 Message::error(__('No Privileges'))
                     ->getDisplay(),
@@ -162,13 +156,7 @@ class PrivilegesController extends AbstractController
          * Adds a user
          *   (Changes / copies a user, part II)
          */
-        [
-            $retMessage,
-            $queries,
-            $queriesForDisplay,
-            $GLOBALS['sql_query'],
-            $addUserError,
-        ] = $serverPrivileges->addUser(
+        [$retMessage, $queries, $queriesForDisplay, $GLOBALS['sql_query'], $addUserError] = $serverPrivileges->addUser(
             $GLOBALS['dbname'] ?? null,
             $GLOBALS['username'] ?? '',
             $GLOBALS['hostname'] ?? '',
@@ -365,14 +353,8 @@ class PrivilegesController extends AbstractController
             if (isset($GLOBALS['dbname']) && ! is_array($GLOBALS['dbname'])) {
                 $urlDbname = urlencode(
                     str_replace(
-                        [
-                            '\_',
-                            '\%',
-                        ],
-                        [
-                            '_',
-                            '%',
-                        ],
+                        ['\_', '\%'],
+                        ['_', '%'],
                         $GLOBALS['dbname'],
                     ),
                 );
diff --git a/libraries/classes/Controllers/Server/ShowEngineController.php b/libraries/classes/Controllers/Server/ShowEngineController.php
index b76fde64c0..fcbed17d16 100644
--- a/libraries/classes/Controllers/Server/ShowEngineController.php
+++ b/libraries/classes/Controllers/Server/ShowEngineController.php
@@ -51,9 +51,6 @@ final class ShowEngineController extends AbstractController
             ];
         }
 
-        $this->render('server/engines/show', [
-            'engine' => $engine,
-            'page' => $page,
-        ]);
+        $this->render('server/engines/show', ['engine' => $engine, 'page' => $page]);
     }
 }
diff --git a/libraries/classes/Controllers/Server/Status/Monitor/ChartingDataController.php b/libraries/classes/Controllers/Server/Status/Monitor/ChartingDataController.php
index 528316a011..160073dfae 100644
--- a/libraries/classes/Controllers/Server/Status/Monitor/ChartingDataController.php
+++ b/libraries/classes/Controllers/Server/Status/Monitor/ChartingDataController.php
@@ -40,8 +40,6 @@ final class ChartingDataController extends AbstractController
             return;
         }
 
-        $this->response->addJSON([
-            'message' => $this->monitor->getJsonForChartingData($requiredData),
-        ]);
+        $this->response->addJSON(['message' => $this->monitor->getJsonForChartingData($requiredData)]);
     }
 }
diff --git a/libraries/classes/Controllers/Server/Status/VariablesController.php b/libraries/classes/Controllers/Server/Status/VariablesController.php
index f3560c4db6..8b89245923 100644
--- a/libraries/classes/Controllers/Server/Status/VariablesController.php
+++ b/libraries/classes/Controllers/Server/Status/VariablesController.php
@@ -63,11 +63,7 @@ class VariablesController extends AbstractController
                     continue;
                 }
 
-                $categories[$sectionId] = [
-                    'id' => $sectionId,
-                    'name' => $sectionName,
-                    'is_selected' => false,
-                ];
+                $categories[$sectionId] = ['id' => $sectionId, 'name' => $sectionName, 'is_selected' => false];
                 if (! $filterCategory || $filterCategory !== $sectionId) {
                     continue;
                 }
@@ -77,10 +73,7 @@ class VariablesController extends AbstractController
 
             $links = [];
             foreach ($this->data->links as $sectionName => $sectionLinks) {
-                $links[$sectionName] = [
-                    'name' => 'status_' . $sectionName,
-                    'links' => $sectionLinks,
-                ];
+                $links[$sectionName] = ['name' => 'status_' . $sectionName, 'links' => $sectionLinks];
             }
 
             $descriptions = $this->getDescriptions();
@@ -121,10 +114,7 @@ class VariablesController extends AbstractController
                 }
 
                 foreach ($this->data->links[$name] as $linkName => $linkUrl) {
-                    $variables[$name]['description_doc'][] = [
-                        'name' => $linkName,
-                        'url' => $linkUrl,
-                    ];
+                    $variables[$name]['description_doc'][] = ['name' => $linkName, 'url' => $linkUrl];
                 }
             }
         }
@@ -147,11 +137,7 @@ class VariablesController extends AbstractController
      */
     private function flush(string $flush): void
     {
-        $flushCommands = [
-            'STATUS',
-            'TABLES',
-            'QUERY CACHE',
-        ];
+        $flushCommands = ['STATUS', 'TABLES', 'QUERY CACHE'];
 
         if (! in_array($flush, $flushCommands)) {
             return;
diff --git a/libraries/classes/Controllers/Server/Variables/GetVariableController.php b/libraries/classes/Controllers/Server/Variables/GetVariableController.php
index 8da5a34c2a..2806fa342a 100644
--- a/libraries/classes/Controllers/Server/Variables/GetVariableController.php
+++ b/libraries/classes/Controllers/Server/Variables/GetVariableController.php
@@ -37,9 +37,7 @@ final class GetVariableController extends AbstractController
             DatabaseInterface::FETCH_NUM,
         );
 
-        $json = [
-            'message' => $varValue[1],
-        ];
+        $json = ['message' => $varValue[1]];
 
         $variableType = ServerVariablesProvider::getImplementation()->getVariableType($params['name']);
 
diff --git a/libraries/classes/Controllers/Server/Variables/SetVariableController.php b/libraries/classes/Controllers/Server/Variables/SetVariableController.php
index 8cfd130c67..2c14529c38 100644
--- a/libraries/classes/Controllers/Server/Variables/SetVariableController.php
+++ b/libraries/classes/Controllers/Server/Variables/SetVariableController.php
@@ -50,14 +50,7 @@ final class SetVariableController extends AbstractController
                 $matches,
             )
         ) {
-            $exp = [
-                'kb' => 1,
-                'kib' => 1,
-                'mb' => 2,
-                'mib' => 2,
-                'gb' => 3,
-                'gib' => 3,
-            ];
+            $exp = ['kb' => 1, 'kib' => 1, 'mb' => 2, 'mib' => 2, 'gb' => 3, 'gib' => 3];
             $value = (float) $matches[1] * 1024 ** $exp[mb_strtolower($matches[3])];
         } else {
             $value = $this->dbi->quoteString($value);
@@ -111,10 +104,7 @@ final class SetVariableController extends AbstractController
                 $formattedValue = trim(
                     $this->template->render(
                         'server/variables/format_variable',
-                        [
-                            'valueTitle' => Util::formatNumber($value, 0),
-                            'value' => implode(' ', $bytes),
-                        ],
+                        ['valueTitle' => Util::formatNumber($value, 0), 'value' => implode(' ', $bytes)],
                     ),
                 );
             } else {
@@ -122,9 +112,6 @@ final class SetVariableController extends AbstractController
             }
         }
 
-        return [
-            $formattedValue,
-            $isHtmlFormatted,
-        ];
+        return [$formattedValue, $isHtmlFormatted];
     }
 }
diff --git a/libraries/classes/Controllers/Server/VariablesController.php b/libraries/classes/Controllers/Server/VariablesController.php
index 2a7355954f..8d4901fb19 100644
--- a/libraries/classes/Controllers/Server/VariablesController.php
+++ b/libraries/classes/Controllers/Server/VariablesController.php
@@ -114,10 +114,7 @@ class VariablesController extends AbstractController
                 $formattedValue = trim(
                     $this->template->render(
                         'server/variables/format_variable',
-                        [
-                            'valueTitle' => Util::formatNumber($value, 0),
-                            'value' => implode(' ', $bytes),
-                        ],
+                        ['valueTitle' => Util::formatNumber($value, 0), 'value' => implode(' ', $bytes)],
                     ),
                 );
             } else {
@@ -125,9 +122,6 @@ class VariablesController extends AbstractController
             }
         }
 
-        return [
-            $formattedValue,
-            $isHtmlFormatted,
-        ];
+        return [$formattedValue, $isHtmlFormatted];
     }
 }
diff --git a/libraries/classes/Controllers/Setup/AbstractController.php b/libraries/classes/Controllers/Setup/AbstractController.php
index 165c37f13e..1f6e8639f3 100644
--- a/libraries/classes/Controllers/Setup/AbstractController.php
+++ b/libraries/classes/Controllers/Setup/AbstractController.php
@@ -20,10 +20,7 @@ abstract class AbstractController
     /** @return array */
     protected function getPages(): array
     {
-        $ignored = [
-            'Config',
-            'Servers',
-        ];
+        $ignored = ['Config', 'Servers'];
         $pages = [];
         foreach (SetupFormList::getAllFormNames() as $formset) {
             if (in_array($formset, $ignored)) {
@@ -33,10 +30,7 @@ abstract class AbstractController
             /** @var BaseForm $formClass */
             $formClass = SetupFormList::get($formset);
 
-            $pages[$formset] = [
-                'name' => $formClass::getName(),
-                'formset' => $formset,
-            ];
+            $pages[$formset] = ['name' => $formClass::getName(), 'formset' => $formset];
         }
 
         return $pages;
diff --git a/libraries/classes/Controllers/Setup/HomeController.php b/libraries/classes/Controllers/Setup/HomeController.php
index 4130960e45..3684c46384 100644
--- a/libraries/classes/Controllers/Setup/HomeController.php
+++ b/libraries/classes/Controllers/Setup/HomeController.php
@@ -73,16 +73,8 @@ class HomeController extends AbstractController
                 'dsn' => $this->config->getServerDSN($id),
                 'params' => [
                     'token' => $_SESSION[' PMA_token '],
-                    'edit' => [
-                        'page' => 'servers',
-                        'mode' => 'edit',
-                        'id' => $id,
-                    ],
-                    'remove' => [
-                        'page' => 'servers',
-                        'mode' => 'remove',
-                        'id' => $id,
-                    ],
+                    'edit' => ['page' => 'servers', 'mode' => 'edit', 'id' => $id],
+                    'remove' => ['page' => 'servers', 'mode' => 'remove', 'id' => $id],
                 ],
             ];
         }
diff --git a/libraries/classes/Controllers/Setup/MainController.php b/libraries/classes/Controllers/Setup/MainController.php
index f4a143109e..4d72938b2a 100644
--- a/libraries/classes/Controllers/Setup/MainController.php
+++ b/libraries/classes/Controllers/Setup/MainController.php
@@ -65,9 +65,7 @@ final class MainController
             /** @var mixed $mode */
             $mode = $request->getQueryParam('mode');
             if ($mode === 'remove' && $request->isPost()) {
-                $controller->destroy([
-                    'id' => $request->getQueryParam('id'),
-                ]);
+                $controller->destroy(['id' => $request->getQueryParam('id')]);
                 header('Location: ../setup/index.php' . Url::getCommonRaw(['route' => '/setup']));
 
                 return;
diff --git a/libraries/classes/Controllers/Table/AddFieldController.php b/libraries/classes/Controllers/Table/AddFieldController.php
index d8c180b7e6..588dd9041b 100644
--- a/libraries/classes/Controllers/Table/AddFieldController.php
+++ b/libraries/classes/Controllers/Table/AddFieldController.php
@@ -65,10 +65,7 @@ class AddFieldController extends AbstractController
         /**
          * Defines the url to return to in case of error in a sql statement
          */
-        $GLOBALS['errorUrl'] = Url::getFromRoute('/table/sql', [
-            'db' => $GLOBALS['db'],
-            'table' => $GLOBALS['table'],
-        ]);
+        $GLOBALS['errorUrl'] = Url::getFromRoute('/table/sql', ['db' => $GLOBALS['db'], 'table' => $GLOBALS['table']]);
 
         // check number of fields to be created
         if (isset($_POST['submit_num_fields'])) {
diff --git a/libraries/classes/Controllers/Table/ExportController.php b/libraries/classes/Controllers/Table/ExportController.php
index c7e0949857..4ef854f2d1 100644
--- a/libraries/classes/Controllers/Table/ExportController.php
+++ b/libraries/classes/Controllers/Table/ExportController.php
@@ -65,17 +65,11 @@ class ExportController extends AbstractController
             if (! empty($parser->statements[0]) && ($parser->statements[0] instanceof SelectStatement)) {
                 // Checking if the WHERE clause has to be replaced.
                 if (! empty($GLOBALS['where_clause']) && is_array($GLOBALS['where_clause'])) {
-                    $GLOBALS['replaces'][] = [
-                        'WHERE',
-                        'WHERE (' . implode(') OR (', $GLOBALS['where_clause']) . ')',
-                    ];
+                    $GLOBALS['replaces'][] = ['WHERE', 'WHERE (' . implode(') OR (', $GLOBALS['where_clause']) . ')'];
                 }
 
                 // Preparing to remove the LIMIT clause.
-                $GLOBALS['replaces'][] = [
-                    'LIMIT',
-                    '',
-                ];
+                $GLOBALS['replaces'][] = ['LIMIT', ''];
 
                 // Replacing the clauses.
                 $GLOBALS['sql_query'] = Query::replaceClauses(
diff --git a/libraries/classes/Controllers/Table/FindReplaceController.php b/libraries/classes/Controllers/Table/FindReplaceController.php
index 86c507520b..c8f5e31a17 100644
--- a/libraries/classes/Controllers/Table/FindReplaceController.php
+++ b/libraries/classes/Controllers/Table/FindReplaceController.php
@@ -260,18 +260,7 @@ class FindReplaceController extends AbstractController
         $result = $this->dbi->fetchResult($sqlQuery, 0);
 
         /* Iterate over possible delimiters to get one */
-        $delimiters = [
-            '/',
-            '@',
-            '#',
-            '~',
-            '!',
-            '$',
-            '%',
-            '^',
-            '&',
-            '_',
-        ];
+        $delimiters = ['/', '@', '#', '~', '!', '$', '%', '^', '&', '_'];
 
         foreach ($delimiters as $delimiter) {
             if (! str_contains($find, $delimiter)) {
diff --git a/libraries/classes/Controllers/Table/IndexRenameController.php b/libraries/classes/Controllers/Table/IndexRenameController.php
index 72c90256d5..dbf1f1cb65 100644
--- a/libraries/classes/Controllers/Table/IndexRenameController.php
+++ b/libraries/classes/Controllers/Table/IndexRenameController.php
@@ -72,10 +72,7 @@ final class IndexRenameController extends AbstractController
     {
         $this->dbi->selectDb($GLOBALS['db']);
 
-        $formParams = [
-            'db' => $GLOBALS['db'],
-            'table' => $GLOBALS['table'],
-        ];
+        $formParams = ['db' => $GLOBALS['db'], 'table' => $GLOBALS['table']];
 
         if (isset($_POST['old_index'])) {
             $formParams['old_index'] = $_POST['old_index'];
@@ -83,9 +80,6 @@ final class IndexRenameController extends AbstractController
             $formParams['old_index'] = $_POST['index'];
         }
 
-        $this->render('table/index_rename_form', [
-            'index' => $index,
-            'form_params' => $formParams,
-        ]);
+        $this->render('table/index_rename_form', ['index' => $index, 'form_params' => $formParams]);
     }
 }
diff --git a/libraries/classes/Controllers/Table/IndexesController.php b/libraries/classes/Controllers/Table/IndexesController.php
index f530e84213..4f131b741b 100644
--- a/libraries/classes/Controllers/Table/IndexesController.php
+++ b/libraries/classes/Controllers/Table/IndexesController.php
@@ -107,9 +107,7 @@ class IndexesController extends AbstractController
         // Get fields and stores their name/type
         if (isset($_POST['create_edit_table'])) {
             $fields = json_decode($_POST['columns'], true);
-            $indexParams = [
-                'Non_unique' => $_POST['index']['Index_choice'] !== 'UNIQUE',
-            ];
+            $indexParams = ['Non_unique' => $_POST['index']['Index_choice'] !== 'UNIQUE'];
             $index->set($indexParams);
             $addFields = count($fields);
         } else {
@@ -117,10 +115,7 @@ class IndexesController extends AbstractController
                 ->getNameAndTypeOfTheColumns();
         }
 
-        $formParams = [
-            'db' => $GLOBALS['db'],
-            'table' => $GLOBALS['table'],
-        ];
+        $formParams = ['db' => $GLOBALS['db'], 'table' => $GLOBALS['table']];
 
         if (isset($_POST['create_index'])) {
             $formParams['create_index'] = 1;
diff --git a/libraries/classes/Controllers/Table/Maintenance/AnalyzeController.php b/libraries/classes/Controllers/Table/Maintenance/AnalyzeController.php
index 0fedeeb1c2..11bd0d8c1e 100644
--- a/libraries/classes/Controllers/Table/Maintenance/AnalyzeController.php
+++ b/libraries/classes/Controllers/Table/Maintenance/AnalyzeController.php
@@ -76,9 +76,6 @@ final class AnalyzeController extends AbstractController
             'success',
         );
 
-        $this->render('table/maintenance/analyze', [
-            'message' => $message,
-            'rows' => $rows,
-        ]);
+        $this->render('table/maintenance/analyze', ['message' => $message, 'rows' => $rows]);
     }
 }
diff --git a/libraries/classes/Controllers/Table/Maintenance/ChecksumController.php b/libraries/classes/Controllers/Table/Maintenance/ChecksumController.php
index a43403a48a..c4290abf29 100644
--- a/libraries/classes/Controllers/Table/Maintenance/ChecksumController.php
+++ b/libraries/classes/Controllers/Table/Maintenance/ChecksumController.php
@@ -76,10 +76,6 @@ final class ChecksumController extends AbstractController
             'success',
         );
 
-        $this->render('table/maintenance/checksum', [
-            'message' => $message,
-            'rows' => $rows,
-            'warnings' => $warnings,
-        ]);
+        $this->render('table/maintenance/checksum', ['message' => $message, 'rows' => $rows, 'warnings' => $warnings]);
     }
 }
diff --git a/libraries/classes/Controllers/Table/Maintenance/OptimizeController.php b/libraries/classes/Controllers/Table/Maintenance/OptimizeController.php
index 5012b9720a..b022b9fdad 100644
--- a/libraries/classes/Controllers/Table/Maintenance/OptimizeController.php
+++ b/libraries/classes/Controllers/Table/Maintenance/OptimizeController.php
@@ -76,9 +76,6 @@ final class OptimizeController extends AbstractController
             'success',
         );
 
-        $this->render('table/maintenance/optimize', [
-            'message' => $message,
-            'rows' => $rows,
-        ]);
+        $this->render('table/maintenance/optimize', ['message' => $message, 'rows' => $rows]);
     }
 }
diff --git a/libraries/classes/Controllers/Table/Maintenance/RepairController.php b/libraries/classes/Controllers/Table/Maintenance/RepairController.php
index f4926da664..fe59f47680 100644
--- a/libraries/classes/Controllers/Table/Maintenance/RepairController.php
+++ b/libraries/classes/Controllers/Table/Maintenance/RepairController.php
@@ -76,9 +76,6 @@ final class RepairController extends AbstractController
             'success',
         );
 
-        $this->render('table/maintenance/repair', [
-            'message' => $message,
-            'rows' => $rows,
-        ]);
+        $this->render('table/maintenance/repair', ['message' => $message, 'rows' => $rows]);
     }
 }
diff --git a/libraries/classes/Controllers/Table/Partition/DropController.php b/libraries/classes/Controllers/Table/Partition/DropController.php
index 551e169209..7fd85ff653 100644
--- a/libraries/classes/Controllers/Table/Partition/DropController.php
+++ b/libraries/classes/Controllers/Table/Partition/DropController.php
@@ -64,9 +64,6 @@ final class DropController extends AbstractController
             );
         }
 
-        $this->render('table/partition/drop', [
-            'partition_name' => $partitionName,
-            'message' => $message,
-        ]);
+        $this->render('table/partition/drop', ['partition_name' => $partitionName, 'message' => $message]);
     }
 }
diff --git a/libraries/classes/Controllers/Table/Partition/RebuildController.php b/libraries/classes/Controllers/Table/Partition/RebuildController.php
index 48fc8a4673..a73cca5c4d 100644
--- a/libraries/classes/Controllers/Table/Partition/RebuildController.php
+++ b/libraries/classes/Controllers/Table/Partition/RebuildController.php
@@ -64,9 +64,6 @@ final class RebuildController extends AbstractController
             );
         }
 
-        $this->render('table/partition/rebuild', [
-            'partition_name' => $partitionName,
-            'message' => $message,
-        ]);
+        $this->render('table/partition/rebuild', ['partition_name' => $partitionName, 'message' => $message]);
     }
 }
diff --git a/libraries/classes/Controllers/Table/Partition/TruncateController.php b/libraries/classes/Controllers/Table/Partition/TruncateController.php
index c4d24dc109..376609e460 100644
--- a/libraries/classes/Controllers/Table/Partition/TruncateController.php
+++ b/libraries/classes/Controllers/Table/Partition/TruncateController.php
@@ -64,9 +64,6 @@ final class TruncateController extends AbstractController
             );
         }
 
-        $this->render('table/partition/truncate', [
-            'partition_name' => $partitionName,
-            'message' => $message,
-        ]);
+        $this->render('table/partition/truncate', ['partition_name' => $partitionName, 'message' => $message]);
     }
 }
diff --git a/libraries/classes/Controllers/Table/PrivilegesController.php b/libraries/classes/Controllers/Table/PrivilegesController.php
index 10590e57bb..62f03b2148 100644
--- a/libraries/classes/Controllers/Table/PrivilegesController.php
+++ b/libraries/classes/Controllers/Table/PrivilegesController.php
@@ -64,10 +64,7 @@ class PrivilegesController extends AbstractController
         $isCreateUser = $this->dbi->isCreateUser();
 
         if (! $this->dbi->isSuperUser() && ! $isGrantUser && ! $isCreateUser) {
-            $this->render('server/sub_page_header', [
-                'type' => 'privileges',
-                'is_image' => false,
-            ]);
+            $this->render('server/sub_page_header', ['type' => 'privileges', 'is_image' => false]);
             $this->response->addHTML(
                 Message::error(__('No Privileges'))
                     ->getDisplay(),
diff --git a/libraries/classes/Controllers/Table/RelationController.php b/libraries/classes/Controllers/Table/RelationController.php
index b096c9b57d..052c78ac3c 100644
--- a/libraries/classes/Controllers/Table/RelationController.php
+++ b/libraries/classes/Controllers/Table/RelationController.php
@@ -251,12 +251,7 @@ final class RelationController extends AbstractController
             isset($_POST['destination_foreign_db'], $_POST['destination_foreign_table'])
             && isset($_POST['destination_foreign_column'])
         ) {
-            [
-                $html,
-                $previewSqlData,
-                $displayQuery,
-                $seenError,
-            ] = $table->updateForeignKeys(
+            [$html, $previewSqlData, $displayQuery, $seenError] = $table->updateForeignKeys(
                 $_POST['destination_foreign_db'],
                 $multiEditColumnsName,
                 $_POST['destination_foreign_table'],
diff --git a/libraries/classes/Controllers/Table/ReplaceController.php b/libraries/classes/Controllers/Table/ReplaceController.php
index eb06026fe1..ccacb56c30 100644
--- a/libraries/classes/Controllers/Table/ReplaceController.php
+++ b/libraries/classes/Controllers/Table/ReplaceController.php
@@ -72,10 +72,7 @@ final class ReplaceController extends AbstractController
         $insertRows = $_POST['insert_rows'] ?? null;
         if (is_numeric($insertRows) && $insertRows != $GLOBALS['cfg']['InsertRows']) {
             // check whether insert row mode, if so include /table/change
-            $this->addScriptFiles([
-                'vendor/jquery/additional-methods.js',
-                'table/change.js',
-            ]);
+            $this->addScriptFiles(['vendor/jquery/additional-methods.js', 'table/change.js']);
             $GLOBALS['cfg']['InsertRows'] = $_POST['insert_rows'];
             /** @var ChangeController $controller */
             $controller = Core::getContainerBuilder()->get(ChangeController::class);
@@ -84,11 +81,7 @@ final class ReplaceController extends AbstractController
             return;
         }
 
-        $afterInsertActions = [
-            'new_insert',
-            'same_insert',
-            'edit_next',
-        ];
+        $afterInsertActions = ['new_insert', 'same_insert', 'edit_next'];
         if (isset($_POST['after_insert']) && in_array($_POST['after_insert'], $afterInsertActions)) {
             $GLOBALS['urlParams']['after_insert'] = $_POST['after_insert'];
             if (isset($_POST['where_clause'])) {
@@ -111,12 +104,7 @@ final class ReplaceController extends AbstractController
         /**
          * Prepares the update/insert of a row
          */
-        [
-            $loopArray,
-            $usingKey,
-            $isInsert,
-            $isInsertignore,
-        ] = $this->insertEdit->getParamsForUpdateOrInsert();
+        [$loopArray, $usingKey, $isInsert, $isInsertignore] = $this->insertEdit->getParamsForUpdateOrInsert();
 
         $GLOBALS['query'] = [];
         $valueSets = [];
@@ -433,10 +421,7 @@ final class ReplaceController extends AbstractController
                 $extraData = [];
             }
 
-            $transformationTypes = [
-                'input_transformation',
-                'transformation',
-            ];
+            $transformationTypes = ['input_transformation', 'transformation'];
             foreach ($mimeMap as $transformation) {
                 $columnName = $transformation['column_name'];
                 foreach ($transformationTypes as $type) {
diff --git a/libraries/classes/Controllers/Table/SearchController.php b/libraries/classes/Controllers/Table/SearchController.php
index 9a5f05049c..e6902c3de9 100644
--- a/libraries/classes/Controllers/Table/SearchController.php
+++ b/libraries/classes/Controllers/Table/SearchController.php
@@ -395,11 +395,6 @@ class SearchController extends AbstractController
             'is_float' => $isFloat,
         ]);
 
-        return [
-            'type' => $type,
-            'collation' => $collation,
-            'func' => $func,
-            'value' => $value,
-        ];
+        return ['type' => $type, 'collation' => $collation, 'func' => $func, 'value' => $value];
     }
 }
diff --git a/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php b/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php
index 5279f456f7..48e843db8b 100644
--- a/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php
+++ b/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php
@@ -94,12 +94,7 @@ final class MoveColumnsController extends AbstractController
                 $defaultType = 'USER_DEFINED';
             }
 
-            $virtual = [
-                'VIRTUAL',
-                'PERSISTENT',
-                'VIRTUAL GENERATED',
-                'STORED GENERATED',
-            ];
+            $virtual = ['VIRTUAL', 'PERSISTENT', 'VIRTUAL GENERATED', 'STORED GENERATED'];
             $data['Virtuality'] = '';
             $data['Expression'] = '';
             if (isset($data['Extra']) && in_array($data['Extra'], $virtual)) {
diff --git a/libraries/classes/Controllers/Table/Structure/SaveController.php b/libraries/classes/Controllers/Table/Structure/SaveController.php
index f24acdcbd3..0c1a8824dd 100644
--- a/libraries/classes/Controllers/Table/Structure/SaveController.php
+++ b/libraries/classes/Controllers/Table/Structure/SaveController.php
@@ -64,10 +64,7 @@ final class SaveController extends AbstractController
      */
     private function updateColumns(): bool
     {
-        $errUrl = Url::getFromRoute('/table/structure', [
-            'db' => $GLOBALS['db'],
-            'table' => $GLOBALS['table'],
-        ]);
+        $errUrl = Url::getFromRoute('/table/structure', ['db' => $GLOBALS['db'], 'table' => $GLOBALS['table']]);
         $regenerate = false;
         $fieldCnt = count($_POST['field_name'] ?? []);
         $changes = [];
diff --git a/libraries/classes/Controllers/Table/StructureController.php b/libraries/classes/Controllers/Table/StructureController.php
index 9c1ca38d01..e71017970f 100644
--- a/libraries/classes/Controllers/Table/StructureController.php
+++ b/libraries/classes/Controllers/Table/StructureController.php
@@ -356,10 +356,7 @@ class StructureController extends AbstractController
             $GLOBALS['tbl_collation'],
         );
         if ($collation !== null) {
-            $tableCollation = [
-                'name' => $collation->getName(),
-                'description' => $collation->getDescription(),
-            ];
+            $tableCollation = ['name' => $collation->getName(), 'description' => $collation->getDescription()];
         }
 
         if (isset($GLOBALS['showtable']['Create_time'])) {
diff --git a/libraries/classes/Controllers/Table/ZoomSearchController.php b/libraries/classes/Controllers/Table/ZoomSearchController.php
index 08a1244356..fc7bd48c50 100644
--- a/libraries/classes/Controllers/Table/ZoomSearchController.php
+++ b/libraries/classes/Controllers/Table/ZoomSearchController.php
@@ -480,11 +480,6 @@ class ZoomSearchController extends AbstractController
             'is_float' => $isFloat,
         ]);
 
-        return [
-            'type' => $type,
-            'collation' => $collation,
-            'func' => $func,
-            'value' => $value,
-        ];
+        return ['type' => $type, 'collation' => $collation, 'func' => $func, 'value' => $value];
     }
 }
diff --git a/libraries/classes/Controllers/Transformation/OverviewController.php b/libraries/classes/Controllers/Transformation/OverviewController.php
index d8998d6ece..5fe5e942d5 100644
--- a/libraries/classes/Controllers/Transformation/OverviewController.php
+++ b/libraries/classes/Controllers/Transformation/OverviewController.php
@@ -34,16 +34,10 @@ class OverviewController extends AbstractController
 
         $mimeTypes = [];
         foreach ($types['mimetype'] as $mimeType) {
-            $mimeTypes[] = [
-                'name' => $mimeType,
-                'is_empty' => isset($types['empty_mimetype'][$mimeType]),
-            ];
+            $mimeTypes[] = ['name' => $mimeType, 'is_empty' => isset($types['empty_mimetype'][$mimeType])];
         }
 
-        $transformations = [
-            'transformation' => [],
-            'input_transformation' => [],
-        ];
+        $transformations = ['transformation' => [], 'input_transformation' => []];
 
         foreach (array_keys($transformations) as $type) {
             foreach ($types[$type] as $key => $transformation) {
@@ -54,9 +48,6 @@ class OverviewController extends AbstractController
             }
         }
 
-        $this->render('transformation_overview', [
-            'mime_types' => $mimeTypes,
-            'transformations' => $transformations,
-        ]);
+        $this->render('transformation_overview', ['mime_types' => $mimeTypes, 'transformations' => $transformations]);
     }
 }
diff --git a/libraries/classes/Controllers/VersionCheckController.php b/libraries/classes/Controllers/VersionCheckController.php
index 8ff35af01f..3030514dc9 100644
--- a/libraries/classes/Controllers/VersionCheckController.php
+++ b/libraries/classes/Controllers/VersionCheckController.php
@@ -55,9 +55,6 @@ class VersionCheckController extends AbstractController
             $date = $latestCompatible['date'];
         }
 
-        echo json_encode([
-            'version' => ! empty($version) ? $version : '',
-            'date' => ! empty($date) ? $date : '',
-        ]);
+        echo json_encode(['version' => ! empty($version) ? $version : '', 'date' => ! empty($date) ? $date : '']);
     }
 }
diff --git a/libraries/classes/Controllers/View/CreateController.php b/libraries/classes/Controllers/View/CreateController.php
index 0e6ce99408..df148a1ef6 100644
--- a/libraries/classes/Controllers/View/CreateController.php
+++ b/libraries/classes/Controllers/View/CreateController.php
@@ -34,21 +34,11 @@ use function substr;
 class CreateController extends AbstractController
 {
     /** @todo Move the whole view rebuilding logic to SQL parser */
-    private const VIEW_SECURITY_OPTIONS = [
-        'DEFINER',
-        'INVOKER',
-    ];
+    private const VIEW_SECURITY_OPTIONS = ['DEFINER', 'INVOKER'];
 
-    private const VIEW_ALGORITHM_OPTIONS = [
-        'UNDEFINED',
-        'MERGE',
-        'TEMPTABLE',
-    ];
+    private const VIEW_ALGORITHM_OPTIONS = ['UNDEFINED', 'MERGE', 'TEMPTABLE'];
 
-    private const VIEW_WITH_OPTIONS = [
-        'CASCADED',
-        'LOCAL',
-    ];
+    private const VIEW_WITH_OPTIONS = ['CASCADED', 'LOCAL'];
 
     public function __construct(ResponseRenderer $response, Template $template, private DatabaseInterface $dbi)
     {
diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php
index 42cb79fade..422d98a368 100644
--- a/libraries/classes/Core.php
+++ b/libraries/classes/Core.php
@@ -83,16 +83,7 @@ class Core
     public static function getPHPDocLink(string $target): string
     {
         /* List of PHP documentation translations */
-        $phpDocLanguages = [
-            'pt_BR',
-            'zh_CN',
-            'fr',
-            'de',
-            'ja',
-            'ru',
-            'es',
-            'tr',
-        ];
+        $phpDocLanguages = ['pt_BR', 'zh_CN', 'fr', 'de', 'ja', 'ru', 'es', 'tr'];
 
         $lang = 'en';
         if (isset($GLOBALS['lang']) && in_array($GLOBALS['lang'], $phpDocLanguages)) {
diff --git a/libraries/classes/CreateAddField.php b/libraries/classes/CreateAddField.php
index 193366e10e..740deb6d40 100644
--- a/libraries/classes/CreateAddField.php
+++ b/libraries/classes/CreateAddField.php
@@ -41,14 +41,7 @@ class CreateAddField
         $fieldFullText = json_decode($_POST['fulltext_indexes'], true);
         $fieldSpatial = json_decode($_POST['spatial_indexes'], true);
 
-        return [
-            $fieldCount,
-            $fieldPrimary,
-            $fieldIndex,
-            $fieldUnique,
-            $fieldFullText,
-            $fieldSpatial,
-        ];
+        return [$fieldCount, $fieldPrimary, $fieldIndex, $fieldUnique, $fieldFullText, $fieldSpatial];
     }
 
     /**
diff --git a/libraries/classes/Database/CentralColumns.php b/libraries/classes/Database/CentralColumns.php
index 8f9c7a3f64..aea97b6d50 100644
--- a/libraries/classes/Database/CentralColumns.php
+++ b/libraries/classes/Database/CentralColumns.php
@@ -941,10 +941,7 @@ class CentralColumns
         foreach ($charsets as $charset) {
             $collationsList = [];
             foreach ($collations[$charset->getName()] as $collation) {
-                $collationsList[] = [
-                    'name' => $collation->getName(),
-                    'description' => $collation->getDescription(),
-                ];
+                $collationsList[] = ['name' => $collation->getName(), 'description' => $collation->getDescription()];
             }
 
             $charsetsList[] = [
diff --git a/libraries/classes/Database/Designer/Common.php b/libraries/classes/Database/Designer/Common.php
index ac78912eb2..c28c8c0c00 100644
--- a/libraries/classes/Database/Designer/Common.php
+++ b/libraries/classes/Database/Designer/Common.php
@@ -171,10 +171,7 @@ class Common
             $retval[$ti][$cNameI] = [];
             if (in_array($dtnI, $tableDbNames) && in_array($con['STN'][$i], $tableDbNames)) {
                 $retval[$ti][$cNameI][$dtnI] = [];
-                $retval[$ti][$cNameI][$dtnI][$con['DCN'][$i]] = [
-                    0 => $con['STN'][$i],
-                    1 => $con['SCN'][$i],
-                ];
+                $retval[$ti][$cNameI][$dtnI][$con['DCN'][$i]] = [0 => $con['STN'][$i], 1 => $con['SCN'][$i]];
             }
 
             $ti++;
@@ -234,10 +231,7 @@ class Common
      */
     public function getScriptTabs(array $designerTables): array
     {
-        $retval = [
-            'j_tabs' => [],
-            'h_tabs' => [],
-        ];
+        $retval = ['j_tabs' => [], 'h_tabs' => []];
 
         foreach ($designerTables as $designerTable) {
             $key = rawurlencode($designerTable->getDbTableString());
@@ -490,10 +484,7 @@ class Common
         $updQuery = new Table($table, $db, $this->dbi);
         $updQuery->updateDisplayField($field, $displayFeature);
 
-        return [
-            true,
-            null,
-        ];
+        return [true, null];
     }
 
     /**
@@ -534,10 +525,7 @@ class Common
             $existRelForeign = $this->relation->getForeigners($db2, $t2, '', 'foreign');
             $foreigner = $this->relation->searchColumnInForeigners($existRelForeign, $f2);
             if ($foreigner && isset($foreigner['constraint'])) {
-                return [
-                    false,
-                    __('Error: relationship already exists.'),
-                ];
+                return [false, __('Error: relationship already exists.')];
             }
 
             // note: in InnoDB, the index does not requires to be on a PRIMARY
@@ -586,33 +574,20 @@ class Common
 
                 $updQuery .= ';';
                 if ($this->dbi->tryQuery($updQuery)) {
-                    return [
-                        true,
-                        __('FOREIGN KEY relationship has been added.'),
-                    ];
+                    return [true, __('FOREIGN KEY relationship has been added.')];
                 }
 
                 $error = $this->dbi->getError();
 
-                return [
-                    false,
-                    __('Error: FOREIGN KEY relationship could not be added!')
-                    . '<br>' . $error,
-                ];
+                return [false, __('Error: FOREIGN KEY relationship could not be added!') . '<br>' . $error];
             }
 
-            return [
-                false,
-                __('Error: Missing index on column(s).'),
-            ];
+            return [false, __('Error: Missing index on column(s).')];
         }
 
         $relationFeature = $this->relation->getRelationParameters()->relationFeature;
         if ($relationFeature === null) {
-            return [
-                false,
-                __('Error: Relational features are disabled!'),
-            ];
+            return [false, __('Error: Relational features are disabled!')];
         }
 
         // no need to recheck if the keys are primary or unique at this point,
@@ -633,19 +608,12 @@ class Common
             . "'" . $this->dbi->escapeString($f1) . "')";
 
         if ($this->dbi->tryQueryAsControlUser($q)) {
-            return [
-                true,
-                __('Internal relationship has been added.'),
-            ];
+            return [true, __('Internal relationship has been added.')];
         }
 
         $error = $this->dbi->getError(Connection::TYPE_CONTROL);
 
-        return [
-            false,
-            __('Error: Internal relationship could not be added!')
-            . '<br>' . $error,
-        ];
+        return [false, __('Error: Internal relationship could not be added!') . '<br>' . $error];
     }
 
     /**
@@ -679,19 +647,13 @@ class Common
                     . Util::backquote($foreigner['constraint']) . ';';
                 $this->dbi->query($updQuery);
 
-                return [
-                    true,
-                    __('FOREIGN KEY relationship has been removed.'),
-                ];
+                return [true, __('FOREIGN KEY relationship has been removed.')];
             }
         }
 
         $relationFeature = $this->relation->getRelationParameters()->relationFeature;
         if ($relationFeature === null) {
-            return [
-                false,
-                __('Error: Relational features are disabled!'),
-            ];
+            return [false, __('Error: Relational features are disabled!')];
         }
 
         // internal relations
@@ -710,16 +672,10 @@ class Common
         if (! $result) {
             $error = $this->dbi->getError(Connection::TYPE_CONTROL);
 
-            return [
-                false,
-                __('Error: Internal relationship could not be removed!') . '<br>' . $error,
-            ];
+            return [false, __('Error: Internal relationship could not be removed!') . '<br>' . $error];
         }
 
-        return [
-            true,
-            __('Internal relationship has been removed.'),
-        ];
+        return [true, __('Internal relationship has been removed.')];
     }
 
     /**
diff --git a/libraries/classes/Database/Events.php b/libraries/classes/Database/Events.php
index fe0a11ccb0..1d8bdccef7 100644
--- a/libraries/classes/Database/Events.php
+++ b/libraries/classes/Database/Events.php
@@ -608,11 +608,7 @@ class Events
         $events = $this->dbi->fetchResult($query);
 
         foreach ($events as $event) {
-            $result[] = [
-                'name' => $event['Name'],
-                'type' => $event['Type'],
-                'status' => $event['Status'],
-            ];
+            $result[] = ['name' => $event['Name'], 'type' => $event['Type'], 'status' => $event['Status']];
         }
 
         // Sort results by name
diff --git a/libraries/classes/Database/Qbe.php b/libraries/classes/Database/Qbe.php
index b739327ba2..92851652ed 100644
--- a/libraries/classes/Database/Qbe.php
+++ b/libraries/classes/Database/Qbe.php
@@ -1109,10 +1109,7 @@ class Qbe
             }
         }
 
-        return [
-            'unique' => $uniqueColumns,
-            'index' => $indexColumns,
-        ];
+        return ['unique' => $uniqueColumns, 'index' => $indexColumns];
     }
 
     /**
@@ -1302,10 +1299,7 @@ class Qbe
             $whereClauseTables[$table] = $table;
         }
 
-        return [
-            'where_clause_tables' => $whereClauseTables,
-            'where_clause_columns' => $whereClauseColumns,
-        ];
+        return ['where_clause_tables' => $whereClauseTables, 'where_clause_columns' => $whereClauseColumns];
     }
 
     /**
@@ -1712,38 +1706,26 @@ class Qbe
             $candidateColumns = $uniqueColumns;
             $needSort = 1;
 
-            return [
-                $candidateColumns,
-                $needSort,
-            ];
+            return [$candidateColumns, $needSort];
         }
 
         if (isset($indexColumns) && count($indexColumns) > 0) {
             $candidateColumns = $indexColumns;
             $needSort = 1;
 
-            return [
-                $candidateColumns,
-                $needSort,
-            ];
+            return [$candidateColumns, $needSort];
         }
 
         if (isset($whereClauseColumns) && count($whereClauseColumns) > 0) {
             $candidateColumns = $whereClauseColumns;
             $needSort = 0;
 
-            return [
-                $candidateColumns,
-                $needSort,
-            ];
+            return [$candidateColumns, $needSort];
         }
 
         $candidateColumns = $searchTables;
         $needSort = 0;
 
-        return [
-            $candidateColumns,
-            $needSort,
-        ];
+        return [$candidateColumns, $needSort];
     }
 }
diff --git a/libraries/classes/Database/Routines.php b/libraries/classes/Database/Routines.php
index 465a34539a..633370c18e 100644
--- a/libraries/classes/Database/Routines.php
+++ b/libraries/classes/Database/Routines.php
@@ -343,10 +343,7 @@ class Routines
                 $errors = $this->checkResult($createRoutine, $errors);
             }
 
-            return [
-                $errors,
-                null,
-            ];
+            return [$errors, null];
         }
 
         // Default value
@@ -373,10 +370,7 @@ class Routines
 
         $message = $this->flushPrivileges($resultAdjust);
 
-        return [
-            [],
-            $message,
-        ];
+        return [[], $message];
     }
 
     /**
diff --git a/libraries/classes/Database/Search.php b/libraries/classes/Database/Search.php
index 544666c581..55cf270ba3 100644
--- a/libraries/classes/Database/Search.php
+++ b/libraries/classes/Database/Search.php
@@ -231,11 +231,7 @@ class Search
             $resultCount = (int) $this->dbi->fetchValue($newSearchSqls['select_count']);
             $resultTotal += $resultCount;
             // Gets the result row's HTML for a table
-            $rows[] = [
-                'table' => $eachTable,
-                'new_search_sqls' => $newSearchSqls,
-                'result_count' => $resultCount,
-            ];
+            $rows[] = ['table' => $eachTable, 'new_search_sqls' => $newSearchSqls, 'result_count' => $resultCount];
         }
 
         return $this->template->render('database/search/results', [
diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php
index 08e7eec7c7..2624d29104 100644
--- a/libraries/classes/DatabaseInterface.php
+++ b/libraries/classes/DatabaseInterface.php
@@ -415,10 +415,7 @@ class DatabaseInterface implements DbalInterface
             /** @var mixed[][][] $tables */
             $tables = $this->fetchResult(
                 $sql,
-                [
-                    'TABLE_SCHEMA',
-                    'TABLE_NAME',
-                ],
+                ['TABLE_SCHEMA', 'TABLE_NAME'],
                 null,
                 $connectionType,
             );
diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php
index 24ac2087c3..9cab419279 100644
--- a/libraries/classes/Display/Results.php
+++ b/libraries/classes/Display/Results.php
@@ -301,16 +301,10 @@ class Results
                 'views' => ['view_definition' => $sqlHighlightingData],
             ],
             'mysql' => [
-                'event' => [
-                    'body' => $blobSqlHighlightingData,
-                    'body_utf8' => $blobSqlHighlightingData,
-                ],
+                'event' => ['body' => $blobSqlHighlightingData, 'body_utf8' => $blobSqlHighlightingData],
                 'general_log' => ['argument' => $sqlHighlightingData],
                 'help_category' => ['url' => $linkData],
-                'help_topic' => [
-                    'example' => $sqlHighlightingData,
-                    'url' => $linkData,
-                ],
+                'help_topic' => ['example' => $sqlHighlightingData, 'url' => $linkData],
                 'proc' => [
                     'param_list' => $blobSqlHighlightingData,
                     'returns' => $blobSqlHighlightingData,
@@ -611,10 +605,7 @@ class Results
         // if for COUNT query, number of rows returned more than 1
         // (may be being used GROUP BY)
         if ($this->properties['is_count'] && $numRows > 1) {
-            $displayParts = $displayParts->with([
-                'hasNavigationBar' => true,
-                'hasSortLink' => true,
-            ]);
+            $displayParts = $displayParts->with(['hasNavigationBar' => true, 'hasSortLink' => true]);
         }
 
         // 4. If navigation bar or sorting fields names URLs should be
@@ -631,10 +622,7 @@ class Results
             }
         }
 
-        return [
-            $displayParts,
-            (int) $theTotal,
-        ];
+        return [$displayParts, (int) $theTotal];
     }
 
     /**
@@ -687,10 +675,7 @@ class Results
             ]);
         }
 
-        return [
-            $output,
-            $nbTotalPage,
-        ];
+        return [$output, $nbTotalPage];
     }
 
     /**
@@ -716,10 +701,7 @@ class Results
         $pageSelector = '';
         $numberTotalPage = 1;
         if (! $isShowingAll) {
-            [
-                $pageSelector,
-                $numberTotalPage,
-            ] = $this->getHtmlPageSelector();
+            [$pageSelector, $numberTotalPage] = $this->getHtmlPageSelector();
         }
 
         $isLastPage = $this->properties['unlim_num_rows'] !== -1 && $this->properties['unlim_num_rows'] !== false
@@ -1061,11 +1043,7 @@ class Results
             ];
         }
 
-        $options[] = [
-            'value' => $unsortedSqlQuery,
-            'content' => __('None'),
-            'is_selected' => ! $isIndexUsed,
-        ];
+        $options[] = ['value' => $unsortedSqlQuery, 'content' => __('None'), 'is_selected' => ! $isIndexUsed];
 
         return ['hidden_fields' => $hiddenFields, 'options' => $options];
     }
@@ -1521,11 +1499,7 @@ class Results
             $sortOrderColumns[] = $sortOrder;
         }
 
-        return [
-            $singleSortOrder,
-            implode(', ', $sortOrderColumns),
-            $orderImg ?? '',
-        ];
+        return [$singleSortOrder, implode(', ', $sortOrderColumns), $orderImg ?? ''];
     }
 
     /**
@@ -1612,43 +1586,28 @@ class Results
             $orderImg = ' ' . Generator::getImage(
                 's_desc',
                 __('Descending'),
-                [
-                    'class' => 'soimg',
-                    'title' => '',
-                ],
+                ['class' => 'soimg', 'title' => ''],
             );
             $orderImg .= ' ' . Generator::getImage(
                 's_asc',
                 __('Ascending'),
-                [
-                    'class' => 'soimg hide',
-                    'title' => '',
-                ],
+                ['class' => 'soimg hide', 'title' => ''],
             );
         } else {
             $sortOrder .= self::DESCENDING_SORT_DIR;
             $orderImg = ' ' . Generator::getImage(
                 's_asc',
                 __('Ascending'),
-                [
-                    'class' => 'soimg',
-                    'title' => '',
-                ],
+                ['class' => 'soimg', 'title' => ''],
             );
             $orderImg .= ' ' . Generator::getImage(
                 's_desc',
                 __('Descending'),
-                [
-                    'class' => 'soimg hide',
-                    'title' => '',
-                ],
+                ['class' => 'soimg hide', 'title' => ''],
             );
         }
 
-        return [
-            $sortOrder,
-            $orderImg,
-        ];
+        return [$sortOrder, $orderImg];
     }
 
     /**
@@ -1883,10 +1842,7 @@ class Results
         bool $isFieldTruncated = false,
         bool $hasTransformationPlugin = false,
     ): string {
-        $classes = array_filter([
-            $class,
-            $nowrap,
-        ]);
+        $classes = array_filter([$class, $nowrap]);
 
         if ($meta->internalMediaType !== null) {
             $classes[] = preg_replace('/\//', '_', $meta->internalMediaType);
@@ -2413,10 +2369,7 @@ class Results
                 );
                 $transformationPlugin = new Text_Plain_Link();
 
-                $transformOptions = [
-                    0 => $linkingUrl,
-                    2 => true,
-                ];
+                $transformOptions = [0 => $linkingUrl, 2 => true];
 
                 $meta->internalMediaType = str_replace('_', '/', 'Text/Plain');
             }
@@ -2669,10 +2622,7 @@ class Results
             $colVisib = false;
         }
 
-        return [
-            $colOrder,
-            $colVisib,
-        ];
+        return [$colOrder, $colVisib];
     }
 
     /**
@@ -2754,13 +2704,7 @@ class Results
             __('Copy'),
         );
 
-        return [
-            $editUrl,
-            $copyUrl,
-            $editStr,
-            $copyStr,
-            $urlParams,
-        ];
+        return [$editUrl, $copyUrl, $editStr, $copyStr, $urlParams];
     }
 
     /**
@@ -2827,11 +2771,7 @@ class Results
 
             $kill = $this->dbi->getKillQuery($processId);
 
-            $urlParams = [
-                'db' => 'mysql',
-                'sql_query' => $kill,
-                'goto' => $linkGoto,
-            ];
+            $urlParams = ['db' => 'mysql', 'sql_query' => $kill, 'goto' => $linkGoto];
 
             $deleteUrl = Url::getFromRoute('/sql');
             $jsConf = $kill;
@@ -2843,12 +2783,7 @@ class Results
             $deleteUrl = $deleteString = $jsConf = $urlParams = null;
         }
 
-        return [
-            $deleteUrl,
-            $deleteString,
-            $jsConf,
-            $urlParams,
-        ];
+        return [$deleteUrl, $deleteString, $jsConf, $urlParams];
     }
 
     /**
@@ -3139,11 +3074,7 @@ class Results
             && str_contains($transformationPlugin->getName(), 'Link'))
             && ! $meta->isBinary()
         ) {
-            [
-                $isFieldTruncated,
-                $column,
-                $originalLength,
-            ] = $this->getPartialText($column);
+            [$isFieldTruncated, $column, $originalLength] = $this->getPartialText($column);
         }
 
         if ($meta->isMappedTypeBit) {
@@ -3411,10 +3342,7 @@ class Results
         // 1.1 Gets the information about which functionalities should be
         //     displayed
 
-        [
-            $displayParts,
-            $total,
-        ] = $this->setDisplayPartsAndTotal($displayParts);
+        [$displayParts, $total] = $this->setDisplayPartsAndTotal($displayParts);
 
         // 1.2 Defines offsets for the next and previous pages
         $posNext = 0;
@@ -3834,12 +3762,7 @@ class Results
         foreach ($existRel as $masterField => $rel) {
             if ($masterField !== 'foreign_keys_data') {
                 $displayField = $this->relation->getDisplayField($rel['foreign_db'], $rel['foreign_table']);
-                $map[$masterField] = [
-                    $rel['foreign_table'],
-                    $rel['foreign_field'],
-                    $displayField,
-                    $rel['foreign_db'],
-                ];
+                $map[$masterField] = [$rel['foreign_table'], $rel['foreign_field'], $displayField, $rel['foreign_db']];
             } else {
                 foreach ($rel as $oneKey) {
                     foreach ($oneKey['index_list'] as $index => $oneField) {
@@ -4303,10 +4226,6 @@ class Results
             $truncated = false;
         }
 
-        return [
-            $truncated,
-            $str,
-            $originalLength,
-        ];
+        return [$truncated, $str, $originalLength];
     }
 }
diff --git a/libraries/classes/Encoding.php b/libraries/classes/Encoding.php
index f753ba7d95..b27fe2d8da 100644
--- a/libraries/classes/Encoding.php
+++ b/libraries/classes/Encoding.php
@@ -65,26 +65,10 @@ class Encoding
      * @var array
      */
     private static array $enginemap = [
-        'iconv' => [
-            'iconv',
-            self::ENGINE_ICONV,
-            'iconv',
-        ],
-        'recode' => [
-            'recode_string',
-            self::ENGINE_RECODE,
-            'recode',
-        ],
-        'mb' => [
-            'mb_convert_encoding',
-            self::ENGINE_MB,
-            'mbstring',
-        ],
-        'none' => [
-            'isset',
-            self::ENGINE_NONE,
-            '',
-        ],
+        'iconv' => ['iconv', self::ENGINE_ICONV, 'iconv'],
+        'recode' => ['recode_string', self::ENGINE_RECODE, 'recode'],
+        'mb' => ['mb_convert_encoding', self::ENGINE_MB, 'mbstring'],
+        'none' => ['isset', self::ENGINE_NONE, ''],
     ];
 
     /**
@@ -92,11 +76,7 @@ class Encoding
      *
      * @var array
      */
-    private static array $engineorder = [
-        'iconv',
-        'mb',
-        'recode',
-    ];
+    private static array $engineorder = ['iconv', 'mb', 'recode'];
 
     /**
      * Kanji encodings list
diff --git a/libraries/classes/Engines/Bdb.php b/libraries/classes/Engines/Bdb.php
index aaa3cace96..0098dff365 100644
--- a/libraries/classes/Engines/Bdb.php
+++ b/libraries/classes/Engines/Bdb.php
@@ -24,9 +24,7 @@ class Bdb extends StorageEngine
     public function getVariables(): array
     {
         return [
-            'version_bdb' => [
-                'title' => __('Version information'),
-            ],
+            'version_bdb' => ['title' => __('Version information')],
             'bdb_cache_size' => ['type' => StorageEngine::DETAILS_TYPE_SIZE],
             'bdb_home' => [],
             'bdb_log_buffer_size' => ['type' => StorageEngine::DETAILS_TYPE_SIZE],
diff --git a/libraries/classes/Engines/Innodb.php b/libraries/classes/Engines/Innodb.php
index f3b87748dc..c0f6399ba9 100644
--- a/libraries/classes/Engines/Innodb.php
+++ b/libraries/classes/Engines/Innodb.php
@@ -31,9 +31,7 @@ class Innodb extends StorageEngine
                 'title' => __('Data home directory'),
                 'desc' => __('The common part of the directory path for all InnoDB data files.'),
             ],
-            'innodb_data_file_path' => [
-                'title' => __('Data files'),
-            ],
+            'innodb_data_file_path' => ['title' => __('Data files')],
             'innodb_autoextend_increment' => [
                 'title' => __('Autoextend increment'),
                 'desc' => __(
@@ -103,10 +101,7 @@ class Innodb extends StorageEngine
             return [];
         }
 
-        return [
-            'Bufferpool' => __('Buffer Pool'),
-            'Status' => __('InnoDB Status'),
-        ];
+        return ['Bufferpool' => __('Buffer Pool'), 'Status' => __('InnoDB Status')];
     }
 
     /**
diff --git a/libraries/classes/Engines/Memory.php b/libraries/classes/Engines/Memory.php
index 55040dfe07..e42eafd60a 100644
--- a/libraries/classes/Engines/Memory.php
+++ b/libraries/classes/Engines/Memory.php
@@ -21,8 +21,6 @@ class Memory extends StorageEngine
      */
     public function getVariables(): array
     {
-        return [
-            'max_heap_table_size' => ['type' => StorageEngine::DETAILS_TYPE_SIZE],
-        ];
+        return ['max_heap_table_size' => ['type' => StorageEngine::DETAILS_TYPE_SIZE]];
     }
 }
diff --git a/libraries/classes/Engines/Ndbcluster.php b/libraries/classes/Engines/Ndbcluster.php
index 43194e9877..fb11a4d918 100644
--- a/libraries/classes/Engines/Ndbcluster.php
+++ b/libraries/classes/Engines/Ndbcluster.php
@@ -21,9 +21,7 @@ class Ndbcluster extends StorageEngine
      */
     public function getVariables(): array
     {
-        return [
-            'ndb_connectstring' => [],
-        ];
+        return ['ndb_connectstring' => []];
     }
 
     /**
diff --git a/libraries/classes/Error.php b/libraries/classes/Error.php
index 9ba77e1ced..6df5fbe8d3 100644
--- a/libraries/classes/Error.php
+++ b/libraries/classes/Error.php
@@ -157,12 +157,7 @@ class Error extends Message
     {
         $result = [];
 
-        $members = [
-            'line',
-            'function',
-            'class',
-            'type',
-        ];
+        $members = ['line', 'function', 'class', 'type'];
 
         foreach ($backtrace as $idx => $step) {
             /* Create new backtrace entry */
@@ -415,12 +410,7 @@ class Error extends Message
     public static function getArg(mixed $arg, string $function): string
     {
         $retval = '';
-        $includeFunctions = [
-            'include',
-            'include_once',
-            'require',
-            'require_once',
-        ];
+        $includeFunctions = ['include', 'include_once', 'require', 'require_once'];
         $connectFunctions = [
             'mysql_connect',
             'mysql_pconnect',
diff --git a/libraries/classes/ErrorReport.php b/libraries/classes/ErrorReport.php
index 4104bdf3d2..ef44d6a1ef 100644
--- a/libraries/classes/ErrorReport.php
+++ b/libraries/classes/ErrorReport.php
@@ -192,10 +192,7 @@ class ErrorReport
 
         $uri = $scriptName . '?' . $query;
 
-        return [
-            $uri,
-            $scriptName,
-        ];
+        return [$uri, $scriptName];
     }
 
     /**
diff --git a/libraries/classes/Export.php b/libraries/classes/Export.php
index cf8eadc3b5..1e1ad2063c 100644
--- a/libraries/classes/Export.php
+++ b/libraries/classes/Export.php
@@ -318,10 +318,7 @@ class Export
             $mediaType = 'application/zip';
         }
 
-        return [
-            $filename,
-            $mediaType,
-        ];
+        return [$filename, $mediaType];
     }
 
     /**
@@ -437,11 +434,7 @@ class Export
             }
         }
 
-        return [
-            $saveFilename,
-            $message,
-            $fileHandle,
-        ];
+        return [$saveFilename, $message, $fileHandle];
     }
 
     /**
diff --git a/libraries/classes/Export/Options.php b/libraries/classes/Export/Options.php
index 3e57d33ca8..670163b7c7 100644
--- a/libraries/classes/Export/Options.php
+++ b/libraries/classes/Export/Options.php
@@ -76,10 +76,7 @@ final class Options
                 $isSelected = true;
             }
 
-            $databases[] = [
-                'name' => $currentDb,
-                'is_selected' => $isSelected,
-            ];
+            $databases[] = ['name' => $currentDb, 'is_selected' => $isSelected];
         }
 
         return $databases;
diff --git a/libraries/classes/FileListing.php b/libraries/classes/FileListing.php
index db04985de3..4017a286e0 100644
--- a/libraries/classes/FileListing.php
+++ b/libraries/classes/FileListing.php
@@ -84,10 +84,7 @@ class FileListing
 
         $template = new Template();
 
-        return $template->render('file_select_options', [
-            'filesList' => $list,
-            'active' => $active,
-        ]);
+        return $template->render('file_select_options', ['filesList' => $list, 'active' => $active]);
     }
 
     /**
diff --git a/libraries/classes/Font.php b/libraries/classes/Font.php
index 4865f9aa8c..e8baffac6a 100644
--- a/libraries/classes/Font.php
+++ b/libraries/classes/Font.php
@@ -30,51 +30,17 @@ class Font
         $charLists = [];
 
         //ijl
-        $charLists[] = [
-            'chars' => [
-                'i',
-                'j',
-                'l',
-            ],
-            'modifier' => 0.23,
-        ];
+        $charLists[] = ['chars' => ['i', 'j', 'l'], 'modifier' => 0.23];
         //f
-        $charLists[] = [
-            'chars' => ['f'],
-            'modifier' => 0.27,
-        ];
+        $charLists[] = ['chars' => ['f'], 'modifier' => 0.27];
         //tI
-        $charLists[] = [
-            'chars' => [
-                't',
-                'I',
-            ],
-            'modifier' => 0.28,
-        ];
+        $charLists[] = ['chars' => ['t', 'I'], 'modifier' => 0.28];
         //r
-        $charLists[] = [
-            'chars' => ['r'],
-            'modifier' => 0.34,
-        ];
+        $charLists[] = ['chars' => ['r'], 'modifier' => 0.34];
         //1
-        $charLists[] = [
-            'chars' => ['1'],
-            'modifier' => 0.49,
-        ];
+        $charLists[] = ['chars' => ['1'], 'modifier' => 0.49];
         //cksvxyzJ
-        $charLists[] = [
-            'chars' => [
-                'c',
-                'k',
-                's',
-                'v',
-                'x',
-                'y',
-                'z',
-                'J',
-            ],
-            'modifier' => 0.5,
-        ];
+        $charLists[] = ['chars' => ['c', 'k', 's', 'v', 'x', 'y', 'z', 'J'], 'modifier' => 0.5];
         //abdeghnopquL023456789
         $charLists[] = [
             'chars' => [
@@ -103,69 +69,19 @@ class Font
             'modifier' => 0.56,
         ];
         //FTZ
-        $charLists[] = [
-            'chars' => [
-                'F',
-                'T',
-                'Z',
-            ],
-            'modifier' => 0.61,
-        ];
+        $charLists[] = ['chars' => ['F', 'T', 'Z'], 'modifier' => 0.61];
         //ABEKPSVXY
-        $charLists[] = [
-            'chars' => [
-                'A',
-                'B',
-                'E',
-                'K',
-                'P',
-                'S',
-                'V',
-                'X',
-                'Y',
-            ],
-            'modifier' => 0.67,
-        ];
+        $charLists[] = ['chars' => ['A', 'B', 'E', 'K', 'P', 'S', 'V', 'X', 'Y'], 'modifier' => 0.67];
         //wCDHNRU
-        $charLists[] = [
-            'chars' => [
-                'w',
-                'C',
-                'D',
-                'H',
-                'N',
-                'R',
-                'U',
-            ],
-            'modifier' => 0.73,
-        ];
+        $charLists[] = ['chars' => ['w', 'C', 'D', 'H', 'N', 'R', 'U'], 'modifier' => 0.73];
         //GOQ
-        $charLists[] = [
-            'chars' => [
-                'G',
-                'O',
-                'Q',
-            ],
-            'modifier' => 0.78,
-        ];
+        $charLists[] = ['chars' => ['G', 'O', 'Q'], 'modifier' => 0.78];
         //mM
-        $charLists[] = [
-            'chars' => [
-                'm',
-                'M',
-            ],
-            'modifier' => 0.84,
-        ];
+        $charLists[] = ['chars' => ['m', 'M'], 'modifier' => 0.84];
         //W
-        $charLists[] = [
-            'chars' => ['W'],
-            'modifier' => 0.95,
-        ];
+        $charLists[] = ['chars' => ['W'], 'modifier' => 0.95];
         //" "
-        $charLists[] = [
-            'chars' => [' '],
-            'modifier' => 0.28,
-        ];
+        $charLists[] = ['chars' => [' '], 'modifier' => 0.28];
 
         return $charLists;
     }
diff --git a/libraries/classes/Gis/GisGeometry.php b/libraries/classes/Gis/GisGeometry.php
index 066402fe75..0179f1b4ba 100644
--- a/libraries/classes/Gis/GisGeometry.php
+++ b/libraries/classes/Gis/GisGeometry.php
@@ -160,10 +160,7 @@ abstract class GisGeometry
             $wkt = $value;
         }
 
-        return [
-            'srid' => $srid,
-            'wkt' => $wkt,
-        ];
+        return ['srid' => $srid, 'wkt' => $wkt];
     }
 
     /**
@@ -190,12 +187,7 @@ abstract class GisGeometry
         preg_match('/^\w+/', $wkt, $matches);
         $wktType = strtoupper($matches[0]);
 
-        return [
-            'srid' => $data['srid'],
-            $index => [
-                $wktType => $this->getCoordinateParams($wkt),
-            ],
-        ];
+        return ['srid' => $data['srid'], $index => [$wktType => $this->getCoordinateParams($wkt)]];
     }
 
     /**
diff --git a/libraries/classes/Gis/GisGeometryCollection.php b/libraries/classes/Gis/GisGeometryCollection.php
index e41346df00..61b271f3c8 100644
--- a/libraries/classes/Gis/GisGeometryCollection.php
+++ b/libraries/classes/Gis/GisGeometryCollection.php
@@ -322,12 +322,7 @@ class GisGeometryCollection extends GisGeometry
         // Trim to remove leading 'GEOMETRYCOLLECTION(' and trailing ')'
         $geomCol = mb_substr($wkt, 19, -1);
         $wktGeometries = $this->explodeGeomCol($geomCol);
-        $params = [
-            'srid' => $data['srid'],
-            'GEOMETRYCOLLECTION' => [
-                'geom_count' => count($wktGeometries),
-            ],
-        ];
+        $params = ['srid' => $data['srid'], 'GEOMETRYCOLLECTION' => ['geom_count' => count($wktGeometries)]];
 
         $i = 0;
         foreach ($wktGeometries as $wktGeometry) {
@@ -342,10 +337,7 @@ class GisGeometryCollection extends GisGeometry
                 continue;
             }
 
-            $params[$i++] = [
-                'gis_type' => $wktType,
-                $wktType => $gisObj->getCoordinateParams($wktGeometry),
-            ];
+            $params[$i++] = ['gis_type' => $wktType, $wktType => $gisObj->getCoordinateParams($wktGeometry)];
         }
 
         return $params;
diff --git a/libraries/classes/Gis/GisLineString.php b/libraries/classes/Gis/GisLineString.php
index 8c1e6386f8..a3276b7ac1 100644
--- a/libraries/classes/Gis/GisLineString.php
+++ b/libraries/classes/Gis/GisLineString.php
@@ -124,10 +124,7 @@ class GisLineString extends GisGeometry
      */
     public function prepareRowAsPdf(string $spatial, string $label, array $color, array $scaleData, TCPDF $pdf): TCPDF
     {
-        $line = [
-            'width' => 1.5,
-            'color' => $color,
-        ];
+        $line = ['width' => 1.5, 'color' => $color];
 
         // Trim to remove leading 'LINESTRING(' and trailing ')'
         $linestring = mb_substr($spatial, 11, -1);
@@ -205,10 +202,7 @@ class GisLineString extends GisGeometry
      */
     public function prepareRowAsOl(string $spatial, int $srid, string $label, array $color): string
     {
-        $strokeStyle = [
-            'color' => $color,
-            'width' => 2,
-        ];
+        $strokeStyle = ['color' => $color, 'width' => 2];
 
         $style = 'new ol.style.Style({'
             . 'stroke: new ol.style.Stroke(' . json_encode($strokeStyle) . ')';
@@ -277,10 +271,7 @@ class GisLineString extends GisGeometry
         $noOfPoints = count($pointsArr);
         $coords = ['no_of_points' => $noOfPoints];
         for ($i = 0; $i < $noOfPoints; $i++) {
-            $coords[$i] = [
-                'x' => $pointsArr[$i][0],
-                'y' => $pointsArr[$i][1],
-            ];
+            $coords[$i] = ['x' => $pointsArr[$i][0], 'y' => $pointsArr[$i][1]];
         }
 
         return $coords;
diff --git a/libraries/classes/Gis/GisMultiLineString.php b/libraries/classes/Gis/GisMultiLineString.php
index 06c2857261..6d5456d5d7 100644
--- a/libraries/classes/Gis/GisMultiLineString.php
+++ b/libraries/classes/Gis/GisMultiLineString.php
@@ -141,10 +141,7 @@ class GisMultiLineString extends GisGeometry
      */
     public function prepareRowAsPdf(string $spatial, string $label, array $color, array $scaleData, TCPDF $pdf): TCPDF
     {
-        $line = [
-            'width' => 1.5,
-            'color' => $color,
-        ];
+        $line = ['width' => 1.5, 'color' => $color];
 
         // Trim to remove leading 'MULTILINESTRING((' and trailing '))'
         $multilineString = mb_substr($spatial, 17, -2);
@@ -236,10 +233,7 @@ class GisMultiLineString extends GisGeometry
      */
     public function prepareRowAsOl(string $spatial, int $srid, string $label, array $color): string
     {
-        $strokeStyle = [
-            'color' => $color,
-            'width' => 2,
-        ];
+        $strokeStyle = ['color' => $color, 'width' => 2];
 
         $style = 'new ol.style.Style({'
             . 'stroke: new ol.style.Stroke(' . json_encode($strokeStyle) . ')';
@@ -349,10 +343,7 @@ class GisMultiLineString extends GisGeometry
             $noOfPoints = count($points);
             $coords[$j] = ['no_of_points' => $noOfPoints];
             for ($i = 0; $i < $noOfPoints; $i++) {
-                $coords[$j][$i] = [
-                    'x' => $points[$i][0],
-                    'y' => $points[$i][1],
-                ];
+                $coords[$j][$i] = ['x' => $points[$i][0], 'y' => $points[$i][1]];
             }
         }
 
diff --git a/libraries/classes/Gis/GisMultiPoint.php b/libraries/classes/Gis/GisMultiPoint.php
index ce0ac37191..77037b86e9 100644
--- a/libraries/classes/Gis/GisMultiPoint.php
+++ b/libraries/classes/Gis/GisMultiPoint.php
@@ -131,10 +131,7 @@ class GisMultiPoint extends GisGeometry
         array $scaleData,
         TCPDF $pdf,
     ): TCPDF {
-        $line = [
-            'width' => 1.25,
-            'color' => $color,
-        ];
+        $line = ['width' => 1.25, 'color' => $color];
 
         // Trim to remove leading 'MULTIPOINT(' and trailing ')'
         $multipoint = mb_substr($spatial, 11, -1);
@@ -220,10 +217,7 @@ class GisMultiPoint extends GisGeometry
         array $color,
     ): string {
         $fillStyle = ['color' => 'white'];
-        $strokeStyle = [
-            'color' => $color,
-            'width' => 2,
-        ];
+        $strokeStyle = ['color' => $color, 'width' => 2];
         $style = 'new ol.style.Style({'
             . 'image: new ol.style.Circle({'
             . 'fill: new ol.style.Fill(' . json_encode($fillStyle) . '),'
@@ -231,10 +225,7 @@ class GisMultiPoint extends GisGeometry
             . 'radius: 3'
             . '})';
         if ($label !== '') {
-            $textStyle = [
-                'text' => $label,
-                'offsetY' => -9,
-            ];
+            $textStyle = ['text' => $label, 'offsetY' => -9];
             $style .= ',text: new ol.style.Text(' . json_encode($textStyle) . ')';
         }
 
@@ -318,10 +309,7 @@ class GisMultiPoint extends GisGeometry
         $noOfPoints = count($points);
         $coords = ['no_of_points' => $noOfPoints];
         for ($i = 0; $i < $noOfPoints; $i++) {
-            $coords[$i] = [
-                'x' => $points[$i][0],
-                'y' => $points[$i][1],
-            ];
+            $coords[$i] = ['x' => $points[$i][0], 'y' => $points[$i][1]];
         }
 
         return $coords;
diff --git a/libraries/classes/Gis/GisMultiPolygon.php b/libraries/classes/Gis/GisMultiPolygon.php
index 19386e2c1c..9326546234 100644
--- a/libraries/classes/Gis/GisMultiPolygon.php
+++ b/libraries/classes/Gis/GisMultiPolygon.php
@@ -112,10 +112,7 @@ class GisMultiPolygon extends GisGeometry
                 continue;
             }
 
-            $labelPoint = [
-                $pointsArr[2],
-                $pointsArr[3],
-            ];
+            $labelPoint = [$pointsArr[2], $pointsArr[3]];
         }
 
         // print label if applicable
@@ -165,10 +162,7 @@ class GisMultiPolygon extends GisGeometry
                 continue;
             }
 
-            $labelPoint = [
-                $pointsArr[2],
-                $pointsArr[3],
-            ];
+            $labelPoint = [$pointsArr[2], $pointsArr[3]];
         }
 
         // print label if applicable
@@ -245,10 +239,7 @@ class GisMultiPolygon extends GisGeometry
     {
         $color[] = 0.8;
         $fillStyle = ['color' => $color];
-        $strokeStyle = [
-            'color' => [0, 0, 0],
-            'width' => 0.5,
-        ];
+        $strokeStyle = ['color' => [0, 0, 0], 'width' => 0.5];
         $style = 'new ol.style.Style({'
             . 'fill: new ol.style.Fill(' . json_encode($fillStyle) . '),'
             . 'stroke: new ol.style.Stroke(' . json_encode($strokeStyle) . ')';
@@ -458,10 +449,7 @@ class GisMultiPolygon extends GisGeometry
                 $noOfPoints = count($points);
                 $coords[$k][$j] = ['no_of_points' => $noOfPoints];
                 for ($i = 0; $i < $noOfPoints; $i++) {
-                    $coords[$k][$j][$i] = [
-                        'x' => $points[$i][0],
-                        'y' => $points[$i][1],
-                    ];
+                    $coords[$k][$j][$i] = ['x' => $points[$i][0], 'y' => $points[$i][1]];
                 }
             }
         }
diff --git a/libraries/classes/Gis/GisPoint.php b/libraries/classes/Gis/GisPoint.php
index a7557646ac..e6ef3ff6fb 100644
--- a/libraries/classes/Gis/GisPoint.php
+++ b/libraries/classes/Gis/GisPoint.php
@@ -125,10 +125,7 @@ class GisPoint extends GisGeometry
         array $scaleData,
         TCPDF $pdf,
     ): TCPDF {
-        $line = [
-            'width' => 1.25,
-            'color' => $color,
-        ];
+        $line = ['width' => 1.25, 'color' => $color];
 
         // Trim to remove leading 'POINT(' and trailing ')'
         $point = mb_substr($spatial, 6, -1);
@@ -205,10 +202,7 @@ class GisPoint extends GisGeometry
         array $color,
     ): string {
         $fillStyle = ['color' => 'white'];
-        $strokeStyle = [
-            'color' => $color,
-            'width' => 2,
-        ];
+        $strokeStyle = ['color' => $color, 'width' => 2];
         $style = 'new ol.style.Style({'
             . 'image: new ol.style.Circle({'
             . 'fill: new ol.style.Fill(' . json_encode($fillStyle) . '),'
@@ -216,10 +210,7 @@ class GisPoint extends GisGeometry
             . 'radius: 3'
             . '})';
         if ($label !== '') {
-            $textStyle = [
-                'text' => $label,
-                'offsetY' => -9,
-            ];
+            $textStyle = ['text' => $label, 'offsetY' => -9];
             $style .= ',text: new ol.style.Text(' . json_encode($textStyle) . ')';
         }
 
@@ -283,9 +274,6 @@ class GisPoint extends GisGeometry
         $wktPoint = mb_substr($wkt, 6, -1);
         $points = $this->extractPoints1d($wktPoint, null);
 
-        return [
-            'x' => $points[0][0],
-            'y' => $points[0][1],
-        ];
+        return ['x' => $points[0][0], 'y' => $points[0][1]];
     }
 }
diff --git a/libraries/classes/Gis/GisPolygon.php b/libraries/classes/Gis/GisPolygon.php
index c251f4757c..e732b53dfc 100644
--- a/libraries/classes/Gis/GisPolygon.php
+++ b/libraries/classes/Gis/GisPolygon.php
@@ -206,10 +206,7 @@ class GisPolygon extends GisGeometry
     {
         $color[] = 0.8;
         $fillStyle = ['color' => $color];
-        $strokeStyle = [
-            'color' => [0, 0, 0],
-            'width' => 0.5,
-        ];
+        $strokeStyle = ['color' => [0, 0, 0], 'width' => 0.5];
         $style = 'new ol.style.Style({'
             . 'fill: new ol.style.Fill(' . json_encode($fillStyle) . '),'
             . 'stroke: new ol.style.Stroke(' . json_encode($strokeStyle) . ')';
@@ -479,10 +476,7 @@ class GisPolygon extends GisGeometry
             $noOfPoints = count($points);
             $coords[$j] = ['no_of_points' => $noOfPoints];
             for ($i = 0; $i < $noOfPoints; $i++) {
-                $coords[$j][$i] = [
-                    'x' => $points[$i][0],
-                    'y' => $points[$i][1],
-                ];
+                $coords[$j][$i] = ['x' => $points[$i][0], 'y' => $points[$i][1]];
             }
         }
 
diff --git a/libraries/classes/Gis/GisVisualization.php b/libraries/classes/Gis/GisVisualization.php
index 6f605dcc0d..9bb14b2f49 100644
--- a/libraries/classes/Gis/GisVisualization.php
+++ b/libraries/classes/Gis/GisVisualization.php
@@ -533,12 +533,7 @@ class GisVisualization
             ? ($minMax->maxY + $minMax->minY - $this->height / $scale) / 2
             : $minMax->minY - ($border / $scale);
 
-        return [
-            'scale' => $scale,
-            'x' => $x,
-            'y' => $y,
-            'height' => $this->height,
-        ];
+        return ['scale' => $scale, 'x' => $x, 'y' => $y, 'height' => $this->height];
     }
 
     /**
diff --git a/libraries/classes/Git.php b/libraries/classes/Git.php
index 0a5ac7ba1a..ad7f8d0cd3 100644
--- a/libraries/classes/Git.php
+++ b/libraries/classes/Git.php
@@ -364,16 +364,8 @@ class Git
      */
     private function extractDataFormTextBody(array $commit): array
     {
-        $author = [
-            'name' => '',
-            'email' => '',
-            'date' => '',
-        ];
-        $committer = [
-            'name' => '',
-            'email' => '',
-            'date' => '',
-        ];
+        $author = ['name' => '', 'email' => '', 'date' => ''];
+        $committer = ['name' => '', 'email' => '', 'date' => ''];
 
         do {
             $dataline = array_shift($commit);
@@ -388,11 +380,7 @@ class Git
             $timezone = new DateTimeZone($user[4] ?? '+0000');
             $date = (new DateTimeImmutable())->setTimestamp((int) $user[3])->setTimezone($timezone);
 
-            $user2 = [
-                'name' => trim($user[1]),
-                'email' => trim($user[2]),
-                'date' => $date->format('Y-m-d H:i:s O'),
-            ];
+            $user2 = ['name' => trim($user[1]), 'email' => trim($user[2]), 'date' => $date->format('Y-m-d H:i:s O')];
 
             if ($linetype === 'author') {
                 $author = $user2;
diff --git a/libraries/classes/Html/Generator.php b/libraries/classes/Html/Generator.php
index 23d1b27e8a..fe14d5e174 100644
--- a/libraries/classes/Html/Generator.php
+++ b/libraries/classes/Html/Generator.php
@@ -756,10 +756,7 @@ class Generator
          * The errors found by the lexer and the parser.
          */
         $errors = ParserError::get(
-            [
-                $lexer,
-                $parser,
-            ],
+            [$lexer, $parser],
         );
 
         if ($sqlQuery === '') {
@@ -806,10 +803,7 @@ class Generator
             }
 
             if ($isModifyLink) {
-                $urlParams = [
-                    'sql_query' => $sqlQuery,
-                    'show_query' => 1,
-                ];
+                $urlParams = ['sql_query' => $sqlQuery, 'show_query' => 1];
                 if (strlen($GLOBALS['table']) > 0) {
                     $urlParams['db'] = $GLOBALS['db'];
                     $urlParams['table'] = $GLOBALS['table'];
@@ -849,14 +843,8 @@ class Generator
             // All non-single blanks and  TAB-characters are replaced with their
             // HTML-counterpart
             $serverMessage = str_replace(
-                [
-                    '  ',
-                    "\t",
-                ],
-                [
-                    '&nbsp;&nbsp;',
-                    '&nbsp;&nbsp;&nbsp;&nbsp;',
-                ],
+                ['  ', "\t"],
+                ['&nbsp;&nbsp;', '&nbsp;&nbsp;&nbsp;&nbsp;'],
                 $serverMessage,
             );
 
diff --git a/libraries/classes/Import.php b/libraries/classes/Import.php
index 99d4c7f9e5..b97f92a3e6 100644
--- a/libraries/classes/Import.php
+++ b/libraries/classes/Import.php
@@ -133,10 +133,7 @@ class Import
                 $GLOBALS['my_die'] = [];
             }
 
-            $GLOBALS['my_die'][] = [
-                'sql' => $sql,
-                'error' => $GLOBALS['dbi']->getError(),
-            ];
+            $GLOBALS['my_die'][] = ['sql' => $sql, 'error' => $GLOBALS['dbi']->getError()];
 
             $GLOBALS['msg'] .= __('Error');
 
@@ -302,10 +299,7 @@ class Import
             $reload = true;
         }
 
-        return [
-            $db,
-            $reload,
-        ];
+        return [$db, $reload];
     }
 
     /**
@@ -559,11 +553,7 @@ class Import
         $m = $currSize - 1;
         $d = $decPrecision;
 
-        return [
-            $m,
-            $d,
-            $m . ',' . $d,
-        ];
+        return [$m, $d, $m . ',' . $d];
     }
 
     /**
@@ -932,10 +922,7 @@ class Import
             $sizes[$n] = '10';
         }
 
-        return [
-            $types,
-            $sizes,
-        ];
+        return [$types, $sizes];
     }
 
     /**
@@ -1239,10 +1226,7 @@ class Import
         unset($params);
 
         foreach ($tables as $table) {
-            $params = [
-                'db' => $dbName,
-                'table' => (string) $table[self::TBL_NAME],
-            ];
+            $params = ['db' => $dbName, 'table' => (string) $table[self::TBL_NAME]];
             $tblUrl = Url::getFromRoute('/sql', $params);
             $tblStructUrl = Url::getFromRoute('/table/structure', $params);
             $tblOpsUrl = Url::getFromRoute('/table/operations', $params);
@@ -1410,16 +1394,7 @@ class Import
         }
 
         // List of Transactional Engines.
-        $transactionalEngines = [
-            'INNODB',
-            'FALCON',
-            'NDB',
-            'INFINIDB',
-            'TOKUDB',
-            'XTRADB',
-            'SEQUENCE',
-            'BDB',
-        ];
+        $transactionalEngines = ['INNODB', 'FALCON', 'NDB', 'INFINIDB', 'TOKUDB', 'XTRADB', 'SEQUENCE', 'BDB'];
 
         // Query to check if table is 'Transactional'.
         $checkQuery = 'SELECT `ENGINE` FROM `information_schema`.`tables` '
diff --git a/libraries/classes/Import/Ajax.php b/libraries/classes/Import/Ajax.php
index aa8a0c49ee..3f22d06885 100644
--- a/libraries/classes/Import/Ajax.php
+++ b/libraries/classes/Import/Ajax.php
@@ -61,11 +61,7 @@ final class Ajax
             }
         }
 
-        return [
-            $sessionKey,
-            $uploadId,
-            $plugins,
-        ];
+        return [$sessionKey, $uploadId, $plugins];
     }
 
     /**
diff --git a/libraries/classes/Index.php b/libraries/classes/Index.php
index df20a05f0e..1c5b0f55d9 100644
--- a/libraries/classes/Index.php
+++ b/libraries/classes/Index.php
@@ -237,10 +237,7 @@ class Index
             // $columns[sub_parts][]
             foreach ($columns['names'] as $key => $name) {
                 $subPart = $columns['sub_parts'][$key] ?? '';
-                $addedColumns[] = [
-                    'Column_name' => $name,
-                    'Sub_part' => $subPart,
-                ];
+                $addedColumns[] = ['Column_name' => $name, 'Sub_part' => $subPart];
             }
         } else {
             // coming from SHOW INDEXES
@@ -425,10 +422,7 @@ class Index
      */
     public static function getIndexTypes(): array
     {
-        return [
-            'BTREE',
-            'HASH',
-        ];
+        return ['BTREE', 'HASH'];
     }
 
     public function hasPrimary(): bool
@@ -531,10 +525,7 @@ class Index
      */
     public function getCompareData(): array
     {
-        $data = [
-            'Packed' => $this->packed,
-            'Index_choice' => $this->choice,
-        ];
+        $data = ['Packed' => $this->packed, 'Index_choice' => $this->choice];
 
         foreach ($this->columns as $column) {
             $data['columns'][] = $column->getCompareData();
diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php
index 42724dc751..a65a8b063f 100644
--- a/libraries/classes/InsertEdit.php
+++ b/libraries/classes/InsertEdit.php
@@ -53,10 +53,7 @@ use const PASSWORD_DEFAULT;
 
 class InsertEdit
 {
-    private const FUNC_OPTIONAL_PARAM = [
-        'RAND',
-        'UNIX_TIMESTAMP',
-    ];
+    private const FUNC_OPTIONAL_PARAM = ['RAND', 'UNIX_TIMESTAMP'];
 
     private const FUNC_NO_PARAM = [
         'CONNECTION_ID',
@@ -197,12 +194,7 @@ class InsertEdit
             $foundUniqueKey = true;
         }
 
-        return [
-            $whereClauses,
-            $result,
-            $rows,
-            $foundUniqueKey,
-        ];
+        return [$whereClauses, $result, $rows, $foundUniqueKey];
     }
 
     /**
@@ -268,10 +260,7 @@ class InsertEdit
         // Can be a string on some old configuration storage settings
         $rows = array_fill(0, (int) $GLOBALS['cfg']['InsertRows'], false);
 
-        return [
-            $result,
-            $rows,
-        ];
+        return [$result, $rows];
     }
 
     /**
@@ -375,26 +364,15 @@ class InsertEdit
         $column['Field_title'] = $this->getColumnTitle($column, $commentsMap);
         $column['is_binary'] = $this->isColumn(
             $column,
-            [
-                'binary',
-                'varbinary',
-            ],
+            ['binary', 'varbinary'],
         );
         $column['is_blob'] = $this->isColumn(
             $column,
-            [
-                'blob',
-                'tinyblob',
-                'mediumblob',
-                'longblob',
-            ],
+            ['blob', 'tinyblob', 'mediumblob', 'longblob'],
         );
         $column['is_char'] = $this->isColumn(
             $column,
-            [
-                'char',
-                'varchar',
-            ],
+            ['char', 'varchar'],
         );
 
         [
@@ -456,26 +434,14 @@ class InsertEdit
     private function getEnumSetAndTimestampColumns(array $column, bool $timestampSeen): array
     {
         return match ($column['True_Type']) {
-            'set' => [
-                'set',
-                '',
-                false,
-            ],
-            'enum' => [
-                'enum',
-                '',
-                false,
-            ],
+            'set' => ['set', '', false],
+            'enum' => ['enum', '', false],
             'timestamp' => [
                 $column['Type'],
                 ' text-nowrap',
                 ! $timestampSeen, // can only occur once per table
             ],
-            default => [
-                $column['Type'],
-                ' text-nowrap',
-                false,
-            ],
+            default => [$column['Type'], ' text-nowrap', false],
         };
     }
 
@@ -588,10 +554,7 @@ class InsertEdit
     {
         $values = [];
         foreach ($enumSetValues as $val) {
-            $values[] = [
-                'plain' => $val,
-                'html' => htmlspecialchars($val),
-            ];
+            $values[] = ['plain' => $val, 'html' => htmlspecialchars($val)];
         }
 
         return $values;
@@ -612,19 +575,13 @@ class InsertEdit
         if (! isset($column['values'])) {
             $column['values'] = [];
             foreach ($enumSetValues as $val) {
-                $column['values'][] = [
-                    'plain' => $val,
-                    'html' => htmlspecialchars($val),
-                ];
+                $column['values'][] = ['plain' => $val, 'html' => htmlspecialchars($val)];
             }
 
             $column['select_size'] = min(4, count($column['values']));
         }
 
-        return [
-            $column['values'],
-            $column['select_size'],
-        ];
+        return [$column['values'], $column['select_size']];
     }
 
     /**
@@ -758,10 +715,7 @@ class InsertEdit
             $biggestMaxFileSize = $thisFieldMaxSize;
         }
 
-        return [
-            $htmlOutput,
-            $biggestMaxFileSize,
-        ];
+        return [$htmlOutput, $biggestMaxFileSize];
     }
 
     /**
@@ -1054,13 +1008,7 @@ class InsertEdit
             . $columnNameAppendix . '" value="'
             . htmlspecialchars($currentRow[$column['Field']], ENT_COMPAT) . '">';
 
-        return [
-            $realNullValue,
-            (string) $specialCharsEncoded,
-            (string) $specialChars,
-            (string) $data,
-            $backupField,
-        ];
+        return [$realNullValue, (string) $specialCharsEncoded, (string) $specialChars, (string) $data, $backupField];
     }
 
     /**
@@ -1101,13 +1049,7 @@ class InsertEdit
 
         $specialCharsEncoded = Util::duplicateFirstNewline($specialChars);
 
-        return [
-            $realNullValue,
-            (string) $data,
-            $specialChars,
-            '',
-            $specialCharsEncoded,
-        ];
+        return [$realNullValue, (string) $data, $specialChars, '', $specialCharsEncoded];
     }
 
     /**
@@ -1142,12 +1084,7 @@ class InsertEdit
         $isInsertIgnore = isset($_POST['submit_type'])
             && $_POST['submit_type'] === 'insertignore';
 
-        return [
-            $loopArray,
-            $usingKey,
-            $isInsert,
-            $isInsertIgnore,
-        ];
+        return [$loopArray, $usingKey, $isInsert, $isInsertIgnore];
     }
 
     /**
@@ -1189,11 +1126,7 @@ class InsertEdit
      */
     public function getGotoInclude(string|false $gotoInclude): string
     {
-        $validOptions = [
-            'new_insert',
-            'same_insert',
-            'edit_next',
-        ];
+        $validOptions = ['new_insert', 'same_insert', 'edit_next'];
         if (isset($_POST['after_insert']) && in_array($_POST['after_insert'], $validOptions)) {
             return '/table/change';
         }
@@ -1331,14 +1264,7 @@ class InsertEdit
             $warningMessages = $this->getWarningMessages();
         }
 
-        return [
-            $urlParams,
-            $totalAffectedRows,
-            $lastMessages,
-            $warningMessages,
-            $errorMessages,
-            $returnToSqlQuery,
-        ];
+        return [$urlParams, $totalAffectedRows, $lastMessages, $warningMessages, $errorMessages, $returnToSqlQuery];
     }
 
     /**
@@ -2367,12 +2293,7 @@ class InsertEdit
                 $columnMime = $mimeMap[$tableColumn['Field']];
             }
 
-            $virtual = [
-                'VIRTUAL',
-                'PERSISTENT',
-                'VIRTUAL GENERATED',
-                'STORED GENERATED',
-            ];
+            $virtual = ['VIRTUAL', 'PERSISTENT', 'VIRTUAL GENERATED', 'STORED GENERATED'];
             if (in_array($tableColumn['Extra'], $virtual)) {
                 continue;
             }
diff --git a/libraries/classes/IpAllowDeny.php b/libraries/classes/IpAllowDeny.php
index 321509a2e8..f4bd17bc71 100644
--- a/libraries/classes/IpAllowDeny.php
+++ b/libraries/classes/IpAllowDeny.php
@@ -256,10 +256,7 @@ class IpAllowDeny
         }
 
         // lookup table for some name shortcuts
-        $shortcuts = [
-            'all' => '0.0.0.0/0',
-            'localhost' => '127.0.0.1/8',
-        ];
+        $shortcuts = ['all' => '0.0.0.0/0', 'localhost' => '127.0.0.1/8'];
 
         // Provide some useful shortcuts if server gives us address:
         if (Core::getenv('SERVER_ADDR')) {
diff --git a/libraries/classes/Linter.php b/libraries/classes/Linter.php
index 4506ea3fa0..57bb640f46 100644
--- a/libraries/classes/Linter.php
+++ b/libraries/classes/Linter.php
@@ -85,10 +85,7 @@ class Linter
             $line = $lineNo;
         }
 
-        return [
-            $line,
-            $pos - $lines[$line],
-        ];
+        return [$line, $pos - $lines[$line]];
     }
 
     /**
diff --git a/libraries/classes/ListDatabase.php b/libraries/classes/ListDatabase.php
index 97bc9aba63..7ca79f9d45 100644
--- a/libraries/classes/ListDatabase.php
+++ b/libraries/classes/ListDatabase.php
@@ -47,10 +47,7 @@ class ListDatabase extends ListAbstract
                 continue;
             }
 
-            $list[] = [
-                'name' => $eachItem,
-                'is_selected' => $selected === $eachItem,
-            ];
+            $list[] = ['name' => $eachItem, 'is_selected' => $selected === $eachItem];
         }
 
         return $list;
@@ -140,9 +137,7 @@ class ListDatabase extends ListAbstract
     protected function checkOnlyDatabase(): bool
     {
         if (is_string($GLOBALS['cfg']['Server']['only_db']) && strlen($GLOBALS['cfg']['Server']['only_db']) > 0) {
-            $GLOBALS['cfg']['Server']['only_db'] = [
-                $GLOBALS['cfg']['Server']['only_db'],
-            ];
+            $GLOBALS['cfg']['Server']['only_db'] = [$GLOBALS['cfg']['Server']['only_db']];
         }
 
         if (! is_array($GLOBALS['cfg']['Server']['only_db'])) {
diff --git a/libraries/classes/Menu.php b/libraries/classes/Menu.php
index e61f3e5933..16bd2344e5 100644
--- a/libraries/classes/Menu.php
+++ b/libraries/classes/Menu.php
@@ -94,10 +94,7 @@ class Menu
         // Filter out any tabs that are not allowed
         $tabs = array_intersect_key($tabs, $allowedTabs);
 
-        return $this->template->render('top_menu', [
-            'tabs' => $tabs,
-            'url_params' => $urlParams,
-        ]);
+        return $this->template->render('top_menu', ['tabs' => $tabs, 'url_params' => $urlParams]);
     }
 
     /**
@@ -235,10 +232,7 @@ class Menu
         $tabs['structure']['icon'] = 'b_props';
         $tabs['structure']['route'] = '/table/structure';
         $tabs['structure']['text'] = __('Structure');
-        $tabs['structure']['active'] = in_array($route, [
-            '/table/relation',
-            '/table/structure',
-        ]);
+        $tabs['structure']['active'] = in_array($route, ['/table/relation', '/table/structure']);
 
         $tabs['sql']['icon'] = 'b_sql';
         $tabs['sql']['route'] = '/table/sql';
@@ -248,11 +242,7 @@ class Menu
         $tabs['search']['icon'] = 'b_search';
         $tabs['search']['text'] = __('Search');
         $tabs['search']['route'] = '/table/search';
-        $tabs['search']['active'] = in_array($route, [
-            '/table/find-replace',
-            '/table/search',
-            '/table/zoom-search',
-        ]);
+        $tabs['search']['active'] = in_array($route, ['/table/find-replace', '/table/search', '/table/zoom-search']);
 
         if (! $isSystemSchema && (! $tableIsView || $updatableView)) {
             $tabs['insert']['icon'] = 'b_insrow';
@@ -483,10 +473,7 @@ class Menu
             $tabs['rights']['icon'] = 's_rights';
             $tabs['rights']['route'] = '/server/privileges';
             $tabs['rights']['text'] = __('User accounts');
-            $tabs['rights']['active'] = in_array($route, [
-                '/server/privileges',
-                '/server/user-groups',
-            ]);
+            $tabs['rights']['active'] = in_array($route, ['/server/privileges', '/server/user-groups']);
         }
 
         $tabs['export']['icon'] = 'b_export';
diff --git a/libraries/classes/Message.php b/libraries/classes/Message.php
index fa5c2d2149..399f88cbd4 100644
--- a/libraries/classes/Message.php
+++ b/libraries/classes/Message.php
@@ -62,11 +62,7 @@ class Message implements Stringable
      *
      * @var array
      */
-    public static array $level = [
-        self::SUCCESS => 'success',
-        self::NOTICE => 'notice',
-        self::ERROR => 'error',
-    ];
+    public static array $level = [self::SUCCESS => 'success', self::NOTICE => 'notice', self::ERROR => 'error'];
 
     /**
      * The message number
@@ -689,10 +685,7 @@ class Message implements Stringable
 
         $template = new Template();
 
-        return $template->render('message', [
-            'context' => $context,
-            'message' => $this->getMessage(),
-        ]);
+        return $template->render('message', ['context' => $context, 'message' => $this->getMessage()]);
     }
 
     /**
diff --git a/libraries/classes/Navigation/NavigationTree.php b/libraries/classes/Navigation/NavigationTree.php
index 4e5ec3ddb6..a587d7ff04 100644
--- a/libraries/classes/Navigation/NavigationTree.php
+++ b/libraries/classes/Navigation/NavigationTree.php
@@ -789,10 +789,7 @@ class NavigationTree
                         $newChild->addChild($elm);
                     }
 
-                    $newChildren[] = [
-                        'node' => $newChild,
-                        'replaces_name' => $child->name,
-                    ];
+                    $newChildren[] = ['node' => $newChild, 'replaces_name' => $child->name];
                 }
             }
 
@@ -874,10 +871,7 @@ class NavigationTree
 
         $this->groupTree();
         $children = $this->tree->children;
-        usort($children, [
-            self::class,
-            'sortNode',
-        ]);
+        usort($children, [self::class, 'sortNode']);
         $this->setVisibility();
 
         $nodes = $this->renderNodes($children);
@@ -905,10 +899,7 @@ class NavigationTree
             $listContent = $this->fastFilterHtml($node);
             $listContent .= $this->getPageSelector($node);
             $children = $node->children;
-            usort($children, [
-                self::class,
-                'sortNode',
-            ]);
+            usort($children, [self::class, 'sortNode']);
 
             $listContent .= $this->renderNodes($children, false);
 
@@ -1076,13 +1067,7 @@ class NavigationTree
 
             $paginationParams = $this->getPaginationParamsHtml($node);
 
-            $haveAjax = [
-                'functions',
-                'procedures',
-                'events',
-                'triggers',
-                'indexes',
-            ];
+            $haveAjax = ['functions', 'procedures', 'events', 'triggers', 'indexes'];
             $parent = $node->parents(false, true);
             $isNewView = $parent[0]->realName === 'views' && $node->isNew === true;
             $linkHasAjaxClass = $parent[0]->type == Node::CONTAINER
@@ -1223,20 +1208,13 @@ class NavigationTree
             $options[] = [
                 'title' => $title,
                 'name' => $node->realName,
-                'data' => [
-                    'apath' => $paths['aPath'],
-                    'vpath' => $paths['vPath'],
-                    'pos' => $this->pos,
-                ],
+                'data' => ['apath' => $paths['aPath'], 'vpath' => $paths['vPath'], 'pos' => $this->pos],
                 'isSelected' => $node->realName === $selected,
             ];
         }
 
         $children = $this->tree->children;
-        usort($children, [
-            self::class,
-            'sortNode',
-        ]);
+        usort($children, [self::class, 'sortNode']);
         $this->setVisibility();
 
         $nodes = $this->renderNodes($children);
diff --git a/libraries/classes/Navigation/Nodes/Node.php b/libraries/classes/Navigation/Nodes/Node.php
index 74a15f6c6f..e99c3cf447 100644
--- a/libraries/classes/Navigation/Nodes/Node.php
+++ b/libraries/classes/Navigation/Nodes/Node.php
@@ -96,10 +96,7 @@ class Node
      *   title?: string
      * }
      */
-    public array $links = [
-        'text' => ['route' => '', 'params' => []],
-        'icon' => ['route' => '', 'params' => []],
-    ];
+    public array $links = ['text' => ['route' => '', 'params' => []], 'icon' => ['route' => '', 'params' => []]];
 
     /** @var string HTML title */
     public string $title = '';
@@ -340,12 +337,7 @@ class Node
         $vPath = implode('.', array_reverse($vPath));
         $vPathClean = array_reverse($vPathClean);
 
-        return [
-            'aPath' => $aPath,
-            'aPath_clean' => $aPathClean,
-            'vPath' => $vPath,
-            'vPath_clean' => $vPathClean,
-        ];
+        return ['aPath' => $aPath, 'aPath_clean' => $aPathClean, 'vPath' => $vPath, 'vPath_clean' => $vPathClean];
     }
 
     /**
@@ -492,9 +484,7 @@ class Node
     {
         $databases = [];
         if (! empty($searchClause)) {
-            $databases = [
-                '%' . $GLOBALS['dbi']->escapeString($searchClause) . '%',
-            ];
+            $databases = ['%' . $GLOBALS['dbi']->escapeString($searchClause) . '%'];
         } elseif (! empty($GLOBALS['cfg']['Server']['only_db'])) {
             $databases = $GLOBALS['cfg']['Server']['only_db'];
         } elseif (! empty($GLOBALS['dbs_to_test'])) {
@@ -532,9 +522,7 @@ class Node
 
         if (! empty($GLOBALS['cfg']['Server']['only_db'])) {
             if (is_string($GLOBALS['cfg']['Server']['only_db'])) {
-                $GLOBALS['cfg']['Server']['only_db'] = [
-                    $GLOBALS['cfg']['Server']['only_db'],
-                ];
+                $GLOBALS['cfg']['Server']['only_db'] = [$GLOBALS['cfg']['Server']['only_db']];
             }
 
             $whereClause .= 'AND (';
diff --git a/libraries/classes/Navigation/Nodes/NodeDatabase.php b/libraries/classes/Navigation/Nodes/NodeDatabase.php
index e9161de758..61e7c7b704 100644
--- a/libraries/classes/Navigation/Nodes/NodeDatabase.php
+++ b/libraries/classes/Navigation/Nodes/NodeDatabase.php
@@ -570,10 +570,7 @@ class NodeDatabase extends Node
         $relationParameters = $this->relation->getRelationParameters();
         if ($relationParameters->navigationItemsHidingFeature !== null) {
             if ($this->hiddenCount > 0) {
-                $params = [
-                    'showUnhideDialog' => true,
-                    'dbName' => $this->realName,
-                ];
+                $params = ['showUnhideDialog' => true, 'dbName' => $this->realName];
                 $ret = '<span class="dbItemControls">'
                     . '<a href="' . Url::getFromRoute('/navigation') . '" data-post="'
                     . Url::getCommon($params, '', false) . '"'
diff --git a/libraries/classes/Normalization.php b/libraries/classes/Normalization.php
index ad2a901463..f0cd59e136 100644
--- a/libraries/classes/Normalization.php
+++ b/libraries/classes/Normalization.php
@@ -148,10 +148,7 @@ class Normalization
         foreach ($charsets as $charset) {
             $collationsList = [];
             foreach ($collations[$charset->getName()] as $collation) {
-                $collationsList[] = [
-                    'name' => $collation->getName(),
-                    'description' => $collation->getDescription(),
-                ];
+                $collationsList[] = ['name' => $collation->getName(), 'description' => $collation->getDescription()];
             }
 
             $charsetsList[] = [
@@ -312,12 +309,7 @@ class Normalization
             . '<input class="btn btn-secondary" type="submit" value="' . __('No redundant column')
             . '" onclick="goToFinish1NF();">';
 
-        return [
-            'legendText' => $legendText,
-            'headText' => $headText,
-            'subText' => $subText,
-            'extra' => $extra,
-        ];
+        return ['legendText' => $legendText, 'headText' => $headText, 'subText' => $subText, 'extra' => $extra];
     }
 
     /**
@@ -514,11 +506,7 @@ class Normalization
             htmlspecialchars($table),
         ) . '</h3>';
         if (count($partialDependencies) === 1) {
-            return [
-                'legendText' => __('End of step'),
-                'headText' => $headText,
-                'queryError' => false,
-            ];
+            return ['legendText' => __('End of step'), 'headText' => $headText, 'queryError' => false];
         }
 
         $message = '';
@@ -640,20 +628,13 @@ class Normalization
                     . '( <u>' . htmlspecialchars($key) . '</u>'
                     . (count($dependents) > 0 ? ', ' : '')
                     . htmlspecialchars(implode(', ', $dependents)) . ' )';
-                $newTables[$table][$tableName] = [
-                    'pk' => $key,
-                    'nonpk' => implode(', ', $dependents),
-                ];
+                $newTables[$table][$tableName] = ['pk' => $key, 'nonpk' => implode(', ', $dependents)];
                 $i++;
                 $tableName = 'table' . $i;
             }
         }
 
-        return [
-            'html' => $html,
-            'newTables' => $newTables,
-            'success' => true,
-        ];
+        return ['html' => $html, 'newTables' => $newTables, 'success' => true];
     }
 
     /**
@@ -671,11 +652,7 @@ class Normalization
         $error = false;
         $headText = '<h3>' . __('The third step of normalization is complete.') . '</h3>';
         if (count($newTables) === 0) {
-            return [
-                'legendText' => __('End of step'),
-                'headText' => $headText,
-                'queryError' => false,
-            ];
+            return ['legendText' => __('End of step'), 'headText' => $headText, 'queryError' => false];
         }
 
         $message = '';
@@ -808,10 +785,7 @@ class Normalization
         }
 
         $query2 = trim($query2, ',');
-        $queries = [
-            $query1,
-            $query2,
-        ];
+        $queries = [$query1, $query2];
         $this->dbi->selectDb($db);
         foreach ($queries as $query) {
             if (! $this->dbi->tryQuery($query)) {
@@ -825,10 +799,7 @@ class Normalization
             }
         }
 
-        return [
-            'queryError' => $error,
-            'message' => $message,
-        ];
+        return ['queryError' => $error, 'message' => $message];
     }
 
     /**
@@ -905,12 +876,7 @@ class Normalization
             $extra = '<h3>' . __('Table is already in Third normal form!') . '</h3>';
         }
 
-        return [
-            'legendText' => $legendText,
-            'headText' => $headText,
-            'subText' => $subText,
-            'extra' => $extra,
-        ];
+        return ['legendText' => $legendText, 'headText' => $headText, 'subText' => $subText, 'extra' => $extra];
     }
 
     /**
diff --git a/libraries/classes/OpenDocument.php b/libraries/classes/OpenDocument.php
index f19ebab5b0..15fe8f63e2 100644
--- a/libraries/classes/OpenDocument.php
+++ b/libraries/classes/OpenDocument.php
@@ -163,13 +163,7 @@ EOT;
             . '</manifest:manifest>',
         ];
 
-        $name = [
-            'mimetype',
-            'content.xml',
-            'meta.xml',
-            'styles.xml',
-            'META-INF/manifest.xml',
-        ];
+        $name = ['mimetype', 'content.xml', 'meta.xml', 'styles.xml', 'META-INF/manifest.xml'];
 
         $zipExtension = new ZipExtension();
 
diff --git a/libraries/classes/Operations.php b/libraries/classes/Operations.php
index a3bb3a06fd..3ed4932e9a 100644
--- a/libraries/classes/Operations.php
+++ b/libraries/classes/Operations.php
@@ -447,11 +447,7 @@ class Operations
             return;
         }
 
-        $getFields = [
-            'user',
-            'label',
-            'query',
-        ];
+        $getFields = ['user', 'label', 'query'];
         $whereFields = ['dbase' => $db];
         $newFields = ['dbase' => $newDatabaseName->getName()];
         Table::duplicateInfo('bookmarkwork', 'bookmark', $getFields, $whereFields, $newFields);
@@ -469,28 +465,11 @@ class Operations
 
         $possibleRowFormats = [
             'ARCHIVE' => ['COMPRESSED' => 'COMPRESSED'],
-            'ARIA' => [
-                'FIXED' => 'FIXED',
-                'DYNAMIC' => 'DYNAMIC',
-                'PAGE' => 'PAGE',
-            ],
-            'MARIA' => [
-                'FIXED' => 'FIXED',
-                'DYNAMIC' => 'DYNAMIC',
-                'PAGE' => 'PAGE',
-            ],
-            'MYISAM' => [
-                'FIXED' => 'FIXED',
-                'DYNAMIC' => 'DYNAMIC',
-            ],
-            'PBXT' => [
-                'FIXED' => 'FIXED',
-                'DYNAMIC' => 'DYNAMIC',
-            ],
-            'INNODB' => [
-                'COMPACT' => 'COMPACT',
-                'REDUNDANT' => 'REDUNDANT',
-            ],
+            'ARIA' => ['FIXED' => 'FIXED', 'DYNAMIC' => 'DYNAMIC', 'PAGE' => 'PAGE'],
+            'MARIA' => ['FIXED' => 'FIXED', 'DYNAMIC' => 'DYNAMIC', 'PAGE' => 'PAGE'],
+            'MYISAM' => ['FIXED' => 'FIXED', 'DYNAMIC' => 'DYNAMIC'],
+            'PBXT' => ['FIXED' => 'FIXED', 'DYNAMIC' => 'DYNAMIC'],
+            'INNODB' => ['COMPACT' => 'COMPACT', 'REDUNDANT' => 'REDUNDANT'],
         ];
 
         /** @var Innodb $innodbEnginePlugin */
@@ -599,10 +578,7 @@ class Operations
                 . ' IS NOT NULL';
             $thisUrlParams = array_merge(
                 $urlParams,
-                [
-                    'sql_query' => $joinQuery,
-                    'sql_signature' => Core::signSqlQuery($joinQuery),
-                ],
+                ['sql_query' => $joinQuery, 'sql_signature' => Core::signSqlQuery($joinQuery)],
             );
 
             $foreigners[] = [
diff --git a/libraries/classes/Plugins/Auth/AuthenticationCookie.php b/libraries/classes/Plugins/Auth/AuthenticationCookie.php
index 9e562b9c2d..2156a7d2c2 100644
--- a/libraries/classes/Plugins/Auth/AuthenticationCookie.php
+++ b/libraries/classes/Plugins/Auth/AuthenticationCookie.php
@@ -121,10 +121,7 @@ class AuthenticationCookie extends AuthenticationPlugin
                 'session_expired' => 1,
             ]);
         } else {
-            $loginHeader = $this->template->render('login/header', [
-                'add_class' => '',
-                'session_expired' => 0,
-            ]);
+            $loginHeader = $this->template->render('login/header', ['add_class' => '', 'session_expired' => 0]);
         }
 
         $errorMessages = '';
diff --git a/libraries/classes/Plugins/Export/ExportCsv.php b/libraries/classes/Plugins/Export/ExportCsv.php
index 2c0c71b6a7..f80ec2e9cb 100644
--- a/libraries/classes/Plugins/Export/ExportCsv.php
+++ b/libraries/classes/Plugins/Export/ExportCsv.php
@@ -131,16 +131,8 @@ class ExportCsv extends ExportPlugin
                 $GLOBALS['csv_terminated'] = "\n";
             } else {
                 $GLOBALS['csv_terminated'] = str_replace(
-                    [
-                        '\\r',
-                        '\\n',
-                        '\\t',
-                    ],
-                    [
-                        "\015",
-                        "\012",
-                        "\011",
-                    ],
+                    ['\\r', '\\n', '\\t'],
+                    ["\015", "\012", "\011"],
                     $GLOBALS['csv_terminated'],
                 );
             }
@@ -270,10 +262,7 @@ class ExportCsv extends ExportPlugin
                         isset($GLOBALS[$GLOBALS['what'] . '_removeCRLF']) && $GLOBALS[$GLOBALS['what'] . '_removeCRLF']
                     ) {
                         $field = str_replace(
-                            [
-                                "\r",
-                                "\n",
-                            ],
+                            ["\r", "\n"],
                             '',
                             $field,
                         );
diff --git a/libraries/classes/Plugins/Export/ExportHtmlword.php b/libraries/classes/Plugins/Export/ExportHtmlword.php
index 3e35e3f1c0..2c27f36f65 100644
--- a/libraries/classes/Plugins/Export/ExportHtmlword.php
+++ b/libraries/classes/Plugins/Export/ExportHtmlword.php
@@ -58,11 +58,7 @@ class ExportHtmlword extends ExportPlugin
         // create primary items and add them to the group
         $leaf = new RadioPropertyItem('structure_or_data');
         $leaf->setValues(
-            [
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data'),
-            ],
+            ['structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data')],
         );
         $dumpWhat->addProperty($leaf);
         // add the main group to the root group
diff --git a/libraries/classes/Plugins/Export/ExportJson.php b/libraries/classes/Plugins/Export/ExportJson.php
index 0550bb0300..8684ab43f2 100644
--- a/libraries/classes/Plugins/Export/ExportJson.php
+++ b/libraries/classes/Plugins/Export/ExportJson.php
@@ -310,10 +310,7 @@ class ExportJson extends ExportPlugin
      */
     public function exportRawQuery(string $errorUrl, string|null $db, string $sqlQuery): bool
     {
-        $buffer = $this->encode([
-            'type' => 'raw',
-            'data' => '@@DATA@@',
-        ]);
+        $buffer = $this->encode(['type' => 'raw', 'data' => '@@DATA@@']);
         if ($buffer === false) {
             return false;
         }
diff --git a/libraries/classes/Plugins/Export/ExportLatex.php b/libraries/classes/Plugins/Export/ExportLatex.php
index b26ef6159a..e6754b5f10 100644
--- a/libraries/classes/Plugins/Export/ExportLatex.php
+++ b/libraries/classes/Plugins/Export/ExportLatex.php
@@ -90,11 +90,7 @@ class ExportLatex extends ExportPlugin
         // create primary items and add them to the group
         $leaf = new RadioPropertyItem('structure_or_data');
         $leaf->setValues(
-            [
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data'),
-            ],
+            ['structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data')],
         );
         $dumpWhat->addProperty($leaf);
         // add the main group to the root group
@@ -321,10 +317,7 @@ class ExportLatex extends ExportPlugin
                 . Util::expandUserString(
                     $GLOBALS['latex_data_label'],
                     null,
-                    [
-                        'table' => $tableAlias,
-                        'database' => $dbAlias,
-                    ],
+                    ['table' => $tableAlias, 'database' => $dbAlias],
                 )
                 . '} \\\\';
         }
@@ -539,10 +532,7 @@ class ExportLatex extends ExportPlugin
                 . Util::expandUserString(
                     $GLOBALS['latex_structure_label'],
                     null,
-                    [
-                        'table' => $tableAlias,
-                        'database' => $dbAlias,
-                    ],
+                    ['table' => $tableAlias, 'database' => $dbAlias],
                 )
                 . '} \\\\' . "\n";
         }
@@ -642,16 +632,7 @@ class ExportLatex extends ExportPlugin
      */
     public static function texEscape(string $string): string
     {
-        $escape = [
-            '$',
-            '%',
-            '{',
-            '}',
-            '&',
-            '#',
-            '_',
-            '^',
-        ];
+        $escape = ['$', '%', '{', '}', '&', '#', '_', '^'];
         $cntEscape = count($escape);
         for ($k = 0; $k < $cntEscape; $k++) {
             $string = str_replace($escape[$k], '\\' . $escape[$k], $string);
diff --git a/libraries/classes/Plugins/Export/ExportMediawiki.php b/libraries/classes/Plugins/Export/ExportMediawiki.php
index 282cbe8511..f4b9662870 100644
--- a/libraries/classes/Plugins/Export/ExportMediawiki.php
+++ b/libraries/classes/Plugins/Export/ExportMediawiki.php
@@ -61,11 +61,7 @@ class ExportMediawiki extends ExportPlugin
         );
         $leaf = new RadioPropertyItem('structure_or_data');
         $leaf->setValues(
-            [
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data'),
-            ],
+            ['structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data')],
         );
         $subgroup->setSubgroupHeader($leaf);
         $generalOptions->addProperty($subgroup);
diff --git a/libraries/classes/Plugins/Export/ExportOdt.php b/libraries/classes/Plugins/Export/ExportOdt.php
index b84e85da1d..ffa7d4e6b7 100644
--- a/libraries/classes/Plugins/Export/ExportOdt.php
+++ b/libraries/classes/Plugins/Export/ExportOdt.php
@@ -71,11 +71,7 @@ class ExportOdt extends ExportPlugin
         // create primary items and add them to the group
         $leaf = new RadioPropertyItem('structure_or_data');
         $leaf->setValues(
-            [
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data'),
-            ],
+            ['structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data')],
         );
         $dumpWhat->addProperty($leaf);
         // add the main group to the root group
diff --git a/libraries/classes/Plugins/Export/ExportPdf.php b/libraries/classes/Plugins/Export/ExportPdf.php
index 5e829819b3..67156bdf79 100644
--- a/libraries/classes/Plugins/Export/ExportPdf.php
+++ b/libraries/classes/Plugins/Export/ExportPdf.php
@@ -81,11 +81,7 @@ class ExportPdf extends ExportPlugin
         );
         $leaf = new RadioPropertyItem('structure_or_data');
         $leaf->setValues(
-            [
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data'),
-            ],
+            ['structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data')],
         );
         $dumpWhat->addProperty($leaf);
         // add the group to the root group
diff --git a/libraries/classes/Plugins/Export/ExportSql.php b/libraries/classes/Plugins/Export/ExportSql.php
index d440cbb810..c8e1f0ed0c 100644
--- a/libraries/classes/Plugins/Export/ExportSql.php
+++ b/libraries/classes/Plugins/Export/ExportSql.php
@@ -166,11 +166,7 @@ class ExportSql extends ExportPlugin
             __('Enclose export in a transaction'),
         );
         $leaf->setDoc(
-            [
-                'programs',
-                'mysqldump',
-                'option_mysqldump_single-transaction',
-            ],
+            ['programs', 'mysqldump', 'option_mysqldump_single-transaction'],
         );
         $generalOptions->addProperty($leaf);
 
@@ -180,11 +176,7 @@ class ExportSql extends ExportPlugin
             __('Disable foreign key checks'),
         );
         $leaf->setDoc(
-            [
-                'manual_MySQL_Database_Administration',
-                'server-system-variables',
-                'sysvar_foreign_key_checks',
-            ],
+            ['manual_MySQL_Database_Administration', 'server-system-variables', 'sysvar_foreign_key_checks'],
         );
         $generalOptions->addProperty($leaf);
 
@@ -215,11 +207,7 @@ class ExportSql extends ExportPlugin
         );
         $leaf = new RadioPropertyItem('structure_or_data');
         $leaf->setValues(
-            [
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data'),
-            ],
+            ['structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data')],
         );
         $subgroup->setSubgroupHeader($leaf);
         $generalOptions->addProperty($subgroup);
@@ -388,10 +376,7 @@ class ExportSql extends ExportPlugin
             __('<code>INSERT DELAYED</code> statements'),
         );
         $leaf->setDoc(
-            [
-                'manual_MySQL_Database_Administration',
-                'insert_delayed',
-            ],
+            ['manual_MySQL_Database_Administration', 'insert_delayed'],
         );
         $subgroup->addProperty($leaf);
 
@@ -400,10 +385,7 @@ class ExportSql extends ExportPlugin
             __('<code>INSERT IGNORE</code> statements'),
         );
         $leaf->setDoc(
-            [
-                'manual_MySQL_Database_Administration',
-                'insert',
-            ],
+            ['manual_MySQL_Database_Administration', 'insert'],
         );
         $subgroup->addProperty($leaf);
         $dataOptions->addProperty($subgroup);
@@ -414,11 +396,7 @@ class ExportSql extends ExportPlugin
             __('Function to use when dumping data:'),
         );
         $leaf->setValues(
-            [
-                'INSERT' => 'INSERT',
-                'UPDATE' => 'UPDATE',
-                'REPLACE' => 'REPLACE',
-            ],
+            ['INSERT' => 'INSERT', 'UPDATE' => 'UPDATE', 'REPLACE' => 'REPLACE'],
         );
         $dataOptions->addProperty($leaf);
 
@@ -1060,11 +1038,7 @@ class ExportSql extends ExportPlugin
         $relationParams = $relationParameters->toArray();
 
         if (isset($table)) {
-            $types = [
-                'column_info' => 'db_name',
-                'table_uiprefs' => 'db_name',
-                'tracking' => 'db_name',
-            ];
+            $types = ['column_info' => 'db_name', 'table_uiprefs' => 'db_name', 'tracking' => 'db_name'];
         } else {
             $types = [
                 'bookmark' => 'dbase',
@@ -2731,10 +2705,7 @@ class ExportSql extends ExportPlugin
         );
         $leaf->setValues($values);
         $leaf->setDoc(
-            [
-                'manual_MySQL_Database_Administration',
-                'Server_SQL_mode',
-            ],
+            ['manual_MySQL_Database_Administration', 'Server_SQL_mode'],
         );
         $generalOptions->addProperty($leaf);
     }
diff --git a/libraries/classes/Plugins/Export/ExportTexytext.php b/libraries/classes/Plugins/Export/ExportTexytext.php
index 6119204cc5..11e070d567 100644
--- a/libraries/classes/Plugins/Export/ExportTexytext.php
+++ b/libraries/classes/Plugins/Export/ExportTexytext.php
@@ -57,11 +57,7 @@ class ExportTexytext extends ExportPlugin
         // create primary items and add them to the group
         $leaf = new RadioPropertyItem('structure_or_data');
         $leaf->setValues(
-            [
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data'),
-            ],
+            ['structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data')],
         );
         $dumpWhat->addProperty($leaf);
         // add the main group to the root group
diff --git a/libraries/classes/Plugins/Export/ExportYaml.php b/libraries/classes/Plugins/Export/ExportYaml.php
index 3d5cbb57cc..5ee14fb561 100644
--- a/libraries/classes/Plugins/Export/ExportYaml.php
+++ b/libraries/classes/Plugins/Export/ExportYaml.php
@@ -176,18 +176,8 @@ class ExportYaml extends ExportPlugin
                 }
 
                 $record[$i] = str_replace(
-                    [
-                        '\\',
-                        '"',
-                        "\n",
-                        "\r",
-                    ],
-                    [
-                        '\\\\',
-                        '\"',
-                        '\n',
-                        '\r',
-                    ],
+                    ['\\', '"', "\n", "\r"],
+                    ['\\\\', '\"', '\n', '\r'],
                     $record[$i],
                 );
                 $buffer .= '  ' . $columns[$i] . ': "' . $record[$i] . '"' . "\n";
diff --git a/libraries/classes/Plugins/Export/Helpers/TableProperty.php b/libraries/classes/Plugins/Export/Helpers/TableProperty.php
index 1ab071790a..23b72f1bd9 100644
--- a/libraries/classes/Plugins/Export/Helpers/TableProperty.php
+++ b/libraries/classes/Plugins/Export/Helpers/TableProperty.php
@@ -232,14 +232,8 @@ class TableProperty
     public function formatXml(string $text): string
     {
         $text = str_replace(
-            [
-                '#name#',
-                '#indexName#',
-            ],
-            [
-                htmlspecialchars($this->name, ENT_COMPAT, 'UTF-8'),
-                $this->getIndexName(),
-            ],
+            ['#name#', '#indexName#'],
+            [htmlspecialchars($this->name, ENT_COMPAT, 'UTF-8'), $this->getIndexName()],
             $text,
         );
 
@@ -256,14 +250,7 @@ class TableProperty
     public function format(string $text): string
     {
         return str_replace(
-            [
-                '#ucfirstName#',
-                '#dotNetPrimitiveType#',
-                '#dotNetObjectType#',
-                '#type#',
-                '#notNull#',
-                '#unique#',
-            ],
+            ['#ucfirstName#', '#dotNetPrimitiveType#', '#dotNetObjectType#', '#type#', '#notNull#', '#unique#'],
             [
                 ExportCodegen::cgMakeIdentifier($this->name),
                 $this->getDotNetPrimitiveType(),
diff --git a/libraries/classes/Plugins/ExportPlugin.php b/libraries/classes/Plugins/ExportPlugin.php
index 022f16fdf3..620a787af7 100644
--- a/libraries/classes/Plugins/ExportPlugin.php
+++ b/libraries/classes/Plugins/ExportPlugin.php
@@ -271,9 +271,7 @@ abstract class ExportPlugin implements Plugin
         string $tbl = '',
     ): string {
         if ($db !== '' && isset($aliases[$db])) {
-            $aliases = [
-                $db => $aliases[$db],
-            ];
+            $aliases = [$db => $aliases[$db]];
         }
 
         // search each database
@@ -288,9 +286,7 @@ abstract class ExportPlugin implements Plugin
             }
 
             if ($tbl !== '' && isset($db['tables'][$tbl])) {
-                $db['tables'] = [
-                    $tbl => $db['tables'][$tbl],
-                ];
+                $db['tables'] = [$tbl => $db['tables'][$tbl]];
             }
 
             // search each of its tables
diff --git a/libraries/classes/Plugins/Import/ImportCsv.php b/libraries/classes/Plugins/Import/ImportCsv.php
index bbc28a044d..629398aa9c 100644
--- a/libraries/classes/Plugins/Import/ImportCsv.php
+++ b/libraries/classes/Plugins/Import/ImportCsv.php
@@ -169,11 +169,7 @@ class ImportCsv extends AbstractImportCsv
         $GLOBALS['timeout_passed'] ??= null;
         $GLOBALS['finished'] ??= null;
 
-        $replacements = [
-            '\\n' => "\n",
-            '\\t' => "\t",
-            '\\r' => "\r",
-        ];
+        $replacements = ['\\n' => "\n", '\\t' => "\t", '\\r' => "\r"];
         $GLOBALS['csv_terminated'] = strtr($GLOBALS['csv_terminated'], $replacements);
         $GLOBALS['csv_enclosed'] = strtr($GLOBALS['csv_enclosed'], $replacements);
         $GLOBALS['csv_escaped'] = strtr($GLOBALS['csv_escaped'], $replacements);
@@ -581,11 +577,7 @@ class ImportCsv extends AbstractImportCsv
 
             $tblName = $this->getTableNameFromImport((string) $GLOBALS['db']);
 
-            $tables[] = [
-                $tblName,
-                $colNames,
-                $rows,
-            ];
+            $tables[] = [$tblName, $colNames, $rows];
 
             /* Obtain the best-fit MySQL types for each column */
             $analyses = [];
diff --git a/libraries/classes/Plugins/Import/ImportMediawiki.php b/libraries/classes/Plugins/Import/ImportMediawiki.php
index cbcf4da064..cfd3ce99ce 100644
--- a/libraries/classes/Plugins/Import/ImportMediawiki.php
+++ b/libraries/classes/Plugins/Import/ImportMediawiki.php
@@ -224,11 +224,7 @@ class ImportMediawiki extends ImportPlugin
 
                     // No more processing required at the end of the table
                     if (mb_substr($curBufferLine, 0, 2) === '|}') {
-                        $currentTable = [
-                            $curTableName,
-                            $curTempTableHeaders,
-                            $curTempTable,
-                        ];
+                        $currentTable = [$curTableName, $curTempTableHeaders, $curTempTable];
 
                         // Import the current table data into the database
                         $this->importDataOneTable($currentTable, $sqlStatements);
@@ -305,11 +301,7 @@ class ImportMediawiki extends ImportPlugin
 
             // Create the tables array to be used in Import::buildSql()
             $tables = [];
-            $tables[] = [
-                $table[0],
-                $table[1],
-                $table[2],
-            ];
+            $tables[] = [$table[0], $table[1], $table[2]];
 
             // Obtain the best-fit MySQL types for each column
             $analyses = [];
diff --git a/libraries/classes/Plugins/Import/ImportOds.php b/libraries/classes/Plugins/Import/ImportOds.php
index 97d4ff2747..1c9a927cf6 100644
--- a/libraries/classes/Plugins/Import/ImportOds.php
+++ b/libraries/classes/Plugins/Import/ImportOds.php
@@ -423,11 +423,7 @@ class ImportOds extends ImportPlugin
             $tables[] = [(string) $tblAttr['name']];
 
             /* Store the current sheet in the accumulator */
-            $rows[] = [
-                (string) $tblAttr['name'],
-                $colNames,
-                $tempRows,
-            ];
+            $rows[] = [(string) $tblAttr['name'], $colNames, $tempRows];
             $tempRows = [];
             $colNames = [];
             $maxCols = 0;
diff --git a/libraries/classes/Plugins/Import/ImportShp.php b/libraries/classes/Plugins/Import/ImportShp.php
index 3ff2378846..8c41b62741 100644
--- a/libraries/classes/Plugins/Import/ImportShp.php
+++ b/libraries/classes/Plugins/Import/ImportShp.php
@@ -268,13 +268,7 @@ class ImportShp extends ImportPlugin
             $tableName = 'TBL_NAME';
         }
 
-        $tables = [
-            [
-                $tableName,
-                $colNames,
-                $rows,
-            ],
-        ];
+        $tables = [[$tableName, $colNames, $rows]];
 
         // Use data from shape file to chose best-fit MySQL types for each column
         $analyses = [];
diff --git a/libraries/classes/Plugins/Import/ImportSql.php b/libraries/classes/Plugins/Import/ImportSql.php
index f2a8829656..4cc250a266 100644
--- a/libraries/classes/Plugins/Import/ImportSql.php
+++ b/libraries/classes/Plugins/Import/ImportSql.php
@@ -61,10 +61,7 @@ class ImportSql extends ImportPlugin
             );
             $leaf->setValues($values);
             $leaf->setDoc(
-                [
-                    'manual_MySQL_Database_Administration',
-                    'Server_SQL_mode',
-                ],
+                ['manual_MySQL_Database_Administration', 'Server_SQL_mode'],
             );
             $generalOptions->addProperty($leaf);
             $leaf = new BoolPropertyItem(
@@ -72,11 +69,7 @@ class ImportSql extends ImportPlugin
                 __('Do not use <code>AUTO_INCREMENT</code> for zero values'),
             );
             $leaf->setDoc(
-                [
-                    'manual_MySQL_Database_Administration',
-                    'Server_SQL_mode',
-                    'sqlmode_no_auto_value_on_zero',
-                ],
+                ['manual_MySQL_Database_Administration', 'Server_SQL_mode', 'sqlmode_no_auto_value_on_zero'],
             );
             $generalOptions->addProperty($leaf);
 
diff --git a/libraries/classes/Plugins/Import/ImportXml.php b/libraries/classes/Plugins/Import/ImportXml.php
index 55c482343b..637c3c0880 100644
--- a/libraries/classes/Plugins/Import/ImportXml.php
+++ b/libraries/classes/Plugins/Import/ImportXml.php
@@ -249,11 +249,7 @@ class ImportXml extends ImportPlugin
                     $tempCells[] = (string) $v2;
                 }
 
-                $rows[] = [
-                    (string) $tblAttr['name'],
-                    $tempRow,
-                    $tempCells,
-                ];
+                $rows[] = [(string) $tblAttr['name'], $tempRow, $tempCells];
 
                 $tempRow = [];
                 $tempCells = [];
@@ -317,10 +313,7 @@ class ImportXml extends ImportPlugin
             $options = null;
         } else {
             /* Set database collation/charset */
-            $options = [
-                'db_collation' => $collation,
-                'db_charset' => $charset,
-            ];
+            $options = ['db_collation' => $collation, 'db_charset' => $charset];
         }
 
         $createDb = $GLOBALS['db'] === '';
diff --git a/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php b/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php
index 64c63c9fa4..be50ca7604 100644
--- a/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php
+++ b/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php
@@ -78,18 +78,10 @@ class RelationStatsDia
         // left, right, position
         $value = 12;
         if ($pos != 0) {
-            return [
-                $pos + $value + $pos,
-                $pos + $value + $pos + 1,
-                $pos,
-            ];
+            return [$pos + $value + $pos, $pos + $value + $pos + 1, $pos];
         }
 
-        return [
-            $pos + $value,
-            $pos + $value + 1,
-            $pos,
-        ];
+        return [$pos + $value, $pos + $value + 1, $pos];
     }
 
     /**
@@ -121,11 +113,7 @@ class RelationStatsDia
         }
 
         if ($showColor) {
-            $listOfColors = [
-                'FF0000',
-                '000099',
-                '00FF00',
-            ];
+            $listOfColors = ['FF0000', '000099', '00FF00'];
             shuffle($listOfColors);
             $this->referenceColor = '#' . $listOfColors[0];
         } else {
diff --git a/libraries/classes/Plugins/Schema/Dia/TableStatsDia.php b/libraries/classes/Plugins/Schema/Dia/TableStatsDia.php
index 52e4f17e18..6339870330 100644
--- a/libraries/classes/Plugins/Schema/Dia/TableStatsDia.php
+++ b/libraries/classes/Plugins/Schema/Dia/TableStatsDia.php
@@ -86,11 +86,7 @@ class TableStatsDia extends TableStats
     public function tableDraw(bool $showColor): void
     {
         if ($showColor) {
-            $listOfColors = [
-                'FF0000',
-                '000099',
-                '00FF00',
-            ];
+            $listOfColors = ['FF0000', '000099', '00FF00'];
             shuffle($listOfColors);
             $this->tableColor = '#' . $listOfColors[0];
         } else {
diff --git a/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php
index fdb1c03476..dabbf63741 100644
--- a/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php
+++ b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php
@@ -658,17 +658,7 @@ class PdfRelationSchema extends ExportRelationSchema
                 $this->diagram->Cell($commentsWidth, 8, __('Comments'), 1, 0, 'C');
                 $this->diagram->Cell(45, 8, 'MIME', 1, 1, 'C');
                 $this->diagram->setWidths(
-                    [
-                        25,
-                        20,
-                        20,
-                        10,
-                        20,
-                        25,
-                        45,
-                        $commentsWidth,
-                        45,
-                    ],
+                    [25, 20, 20, 10, 20, 25, 45, $commentsWidth, 45],
                 );
             } else {
                 $this->diagram->Cell(20, 8, __('Column'), 1, 0, 'C');
diff --git a/libraries/classes/Plugins/Schema/Pdf/RelationStatsPdf.php b/libraries/classes/Plugins/Schema/Pdf/RelationStatsPdf.php
index 312deb7244..8bc396330c 100644
--- a/libraries/classes/Plugins/Schema/Pdf/RelationStatsPdf.php
+++ b/libraries/classes/Plugins/Schema/Pdf/RelationStatsPdf.php
@@ -60,38 +60,7 @@ class RelationStatsPdf extends RelationStats
             $j = ($i - $d) / 6;
             $j %= 4;
             $j++;
-            $case = [
-                [
-                    1,
-                    0,
-                    0,
-                ],
-                [
-                    0,
-                    1,
-                    0,
-                ],
-                [
-                    0,
-                    0,
-                    1,
-                ],
-                [
-                    1,
-                    1,
-                    0,
-                ],
-                [
-                    1,
-                    0,
-                    1,
-                ],
-                [
-                    0,
-                    1,
-                    1,
-                ],
-            ];
+            $case = [[1, 0, 0], [0, 1, 0], [0, 0, 1], [1, 1, 0], [1, 0, 1], [0, 1, 1]];
             [$a, $b, $c] = $case[$d];
             $e = 1 - ($j - 1) / 6;
             $this->diagram->setDrawColor($a * 255 * $e, $b * 255 * $e, $c * 255 * $e);
diff --git a/libraries/classes/Plugins/Schema/RelationStats.php b/libraries/classes/Plugins/Schema/RelationStats.php
index 7565ba6c3e..26d457e783 100644
--- a/libraries/classes/Plugins/Schema/RelationStats.php
+++ b/libraries/classes/Plugins/Schema/RelationStats.php
@@ -105,10 +105,6 @@ abstract class RelationStats
         $pos = array_search($column, $table->fields);
 
         // x_left, x_right, y
-        return [
-            $table->x,
-            $table->x + $table->width,
-            $table->y + ($pos + 1.5) * $table->heightCell,
-        ];
+        return [$table->x, $table->x + $table->width, $table->y + ($pos + 1.5) * $table->heightCell];
     }
 }
diff --git a/libraries/classes/Plugins/Schema/SchemaDia.php b/libraries/classes/Plugins/Schema/SchemaDia.php
index a39737a306..fd9e63ae5e 100644
--- a/libraries/classes/Plugins/Schema/SchemaDia.php
+++ b/libraries/classes/Plugins/Schema/SchemaDia.php
@@ -53,10 +53,7 @@ class SchemaDia extends SchemaPlugin
             __('Orientation'),
         );
         $leaf->setValues(
-            [
-                'L' => __('Landscape'),
-                'P' => __('Portrait'),
-            ],
+            ['L' => __('Landscape'), 'P' => __('Portrait')],
         );
         $specificOptions->addProperty($leaf);
 
diff --git a/libraries/classes/Plugins/Schema/SchemaEps.php b/libraries/classes/Plugins/Schema/SchemaEps.php
index c2d9467e01..f917beea1a 100644
--- a/libraries/classes/Plugins/Schema/SchemaEps.php
+++ b/libraries/classes/Plugins/Schema/SchemaEps.php
@@ -61,10 +61,7 @@ class SchemaEps extends SchemaPlugin
             __('Orientation'),
         );
         $leaf->setValues(
-            [
-                'L' => __('Landscape'),
-                'P' => __('Portrait'),
-            ],
+            ['L' => __('Landscape'), 'P' => __('Portrait')],
         );
         $specificOptions->addProperty($leaf);
 
diff --git a/libraries/classes/Plugins/Schema/SchemaPdf.php b/libraries/classes/Plugins/Schema/SchemaPdf.php
index a95949a672..3fabb84321 100644
--- a/libraries/classes/Plugins/Schema/SchemaPdf.php
+++ b/libraries/classes/Plugins/Schema/SchemaPdf.php
@@ -63,10 +63,7 @@ class SchemaPdf extends SchemaPlugin
             __('Orientation'),
         );
         $leaf->setValues(
-            [
-                'L' => __('Landscape'),
-                'P' => __('Portrait'),
-            ],
+            ['L' => __('Landscape'), 'P' => __('Portrait')],
         );
         $specificOptions->addProperty($leaf);
 
@@ -94,11 +91,7 @@ class SchemaPdf extends SchemaPlugin
             __('Order of the tables'),
         );
         $leaf->setValues(
-            [
-                '' => __('None'),
-                'name_asc' => __('Name (Ascending)'),
-                'name_desc' => __('Name (Descending)'),
-            ],
+            ['' => __('None'), 'name_asc' => __('Name (Ascending)'), 'name_desc' => __('Name (Descending)')],
         );
         $specificOptions->addProperty($leaf);
 
diff --git a/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php b/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php
index 3696d7a2d0..2eb83808da 100644
--- a/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php
+++ b/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php
@@ -54,15 +54,7 @@ class RelationStatsSvg extends RelationStats
     public function relationDraw(bool $showColor): void
     {
         if ($showColor) {
-            $listOfColors = [
-                '#c00',
-                '#bbb',
-                '#333',
-                '#cb0',
-                '#0b0',
-                '#0bf',
-                '#b0b',
-            ];
+            $listOfColors = ['#c00', '#bbb', '#333', '#cb0', '#0b0', '#0bf', '#b0b'];
             shuffle($listOfColors);
             $color = $listOfColors[0];
         } else {
diff --git a/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php
index 2f63518c5d..cde843167f 100644
--- a/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php
@@ -69,10 +69,7 @@ abstract class DownloadTransformationsPlugin extends TransformationsPlugin
 
         $link = '<a href="' . Url::getFromRoute(
             '/transformation/wrapper',
-            array_merge($options['wrapper_params'], [
-                'ct' => 'application/octet-stream',
-                'cn' => $cn,
-            ]),
+            array_merge($options['wrapper_params'], ['ct' => 'application/octet-stream', 'cn' => $cn]),
         );
         $link .= '" title="' . htmlspecialchars($cn);
         $link .= '" class="disableAjax">' . htmlspecialchars($cn);
diff --git a/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php
index 930e0874d8..e66d4294e8 100644
--- a/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php
@@ -125,16 +125,7 @@ abstract class ExternalTransformationsPlugin extends TransformationsPlugin
 
         // needs PHP >= 4.3.0
         $newstring = '';
-        $descriptorspec = [
-            0 => [
-                'pipe',
-                'r',
-            ],
-            1 => [
-                'pipe',
-                'w',
-            ],
-        ];
+        $descriptorspec = [0 => ['pipe', 'r'], 1 => ['pipe', 'w']];
         $process = proc_open($program . ' ' . $options[1], $descriptorspec, $pipes);
         if (is_resource($process)) {
             fwrite($pipes[0], $buffer);
diff --git a/libraries/classes/Query/Utilities.php b/libraries/classes/Query/Utilities.php
index d377efac57..9db3c0929e 100644
--- a/libraries/classes/Query/Utilities.php
+++ b/libraries/classes/Query/Utilities.php
@@ -34,12 +34,7 @@ class Utilities
      */
     public static function getSystemSchemas(): array
     {
-        $schemas = [
-            'information_schema',
-            'performance_schema',
-            'mysql',
-            'sys',
-        ];
+        $schemas = ['information_schema', 'performance_schema', 'mysql', 'sys'];
         $systemSchemas = [];
         foreach ($schemas as $schema) {
             if (! self::isSystemSchema($schema, true)) {
diff --git a/libraries/classes/RecentFavoriteTable.php b/libraries/classes/RecentFavoriteTable.php
index f7dd6cdf64..8a213c64b1 100644
--- a/libraries/classes/RecentFavoriteTable.php
+++ b/libraries/classes/RecentFavoriteTable.php
@@ -188,10 +188,7 @@ class RecentFavoriteTable
             if ($this->tableType === 'recent') {
                 $tables = [];
                 foreach ($this->tables as $table) {
-                    $tables[] = [
-                        'db' => $table['db'],
-                        'table' => $table['table'],
-                    ];
+                    $tables[] = ['db' => $table['db'], 'table' => $table['table']];
                 }
 
                 return $this->template->render('recent_favorite_table_recent', ['tables' => $tables]);
@@ -211,10 +208,7 @@ class RecentFavoriteTable
                     'md5' => md5($table['db'] . '.' . $table['table']),
                 ];
 
-                $tables[] = [
-                    'remove_parameters' => $removeParameters,
-                    'table_parameters' => $tableParameters,
-                ];
+                $tables[] = ['remove_parameters' => $removeParameters, 'table_parameters' => $tableParameters];
             }
 
             return $this->template->render('recent_favorite_table_favorite', ['tables' => $tables]);
@@ -361,10 +355,7 @@ class RecentFavoriteTable
     public static function getHtmlUpdateRecentTables(): string
     {
         return '<a class="hide" id="update_recent_tables" href="'
-                    . Url::getFromRoute('/recent-table', [
-                        'ajax_request' => true,
-                        'recent_table' => true,
-                    ])
+                    . Url::getFromRoute('/recent-table', ['ajax_request' => true, 'recent_table' => true])
                 . '"></a>';
     }
 
diff --git a/libraries/classes/Replication/ReplicationGui.php b/libraries/classes/Replication/ReplicationGui.php
index dfde08d2ae..f599447a56 100644
--- a/libraries/classes/Replication/ReplicationGui.php
+++ b/libraries/classes/Replication/ReplicationGui.php
@@ -227,10 +227,7 @@ class ReplicationGui
      */
     public function getHtmlForReplicationChangePrimary(string $submitName): string
     {
-        [
-            $usernameLength,
-            $hostnameLength,
-        ] = $this->getUsernameHostnameLength();
+        [$usernameLength, $hostnameLength] = $this->getUsernameHostnameLength();
 
         return $this->template->render('server/replication/change_primary', [
             'server_id' => time(),
@@ -265,14 +262,8 @@ class ReplicationGui
         $serverReplication = $replicationInfo->getPrimaryStatus();
         if ($type === 'replica') {
             $replicationVariables = $replicationInfo->replicaVariables;
-            $variablesAlerts = [
-                'Slave_IO_Running' => 'No',
-                'Slave_SQL_Running' => 'No',
-            ];
-            $variablesOks = [
-                'Slave_IO_Running' => 'Yes',
-                'Slave_SQL_Running' => 'Yes',
-            ];
+            $variablesAlerts = ['Slave_IO_Running' => 'No', 'Slave_SQL_Running' => 'No'];
+            $variablesOks = ['Slave_IO_Running' => 'Yes', 'Slave_SQL_Running' => 'Yes'];
             $serverReplication = $replicationInfo->getReplicaStatus();
         }
 
@@ -282,11 +273,7 @@ class ReplicationGui
                 ? $serverReplication[0][$variable]
                 : '';
 
-            $variables[$variable] = [
-                'name' => $variable,
-                'status' => '',
-                'value' => $serverReplicationVariable,
-            ];
+            $variables[$variable] = ['name' => $variable, 'status' => '', 'value' => $serverReplicationVariable];
 
             if (isset($variablesAlerts[$variable]) && $variablesAlerts[$variable] === $serverReplicationVariable) {
                 $variables[$variable]['status'] = 'text-danger';
@@ -343,10 +330,7 @@ class ReplicationGui
             }
         }
 
-        return [
-            $usernameLength,
-            $hostnameLength,
-        ];
+        return [$usernameLength, $hostnameLength];
     }
 
     /**
@@ -356,10 +340,7 @@ class ReplicationGui
      */
     public function getHtmlForReplicationPrimaryAddReplicaUser(string|null $postUsername, string|null $hostname): string
     {
-        [
-            $usernameLength,
-            $hostnameLength,
-        ] = $this->getUsernameHostnameLength();
+        [$usernameLength, $hostnameLength] = $this->getUsernameHostnameLength();
 
         $username = '';
         if ($postUsername === '') {
diff --git a/libraries/classes/Replication/ReplicationInfo.php b/libraries/classes/Replication/ReplicationInfo.php
index f48a81e062..742f809254 100644
--- a/libraries/classes/Replication/ReplicationInfo.php
+++ b/libraries/classes/Replication/ReplicationInfo.php
@@ -13,12 +13,7 @@ use function sprintf;
 final class ReplicationInfo
 {
     /** @var string[] */
-    public array $primaryVariables = [
-        'File',
-        'Position',
-        'Binlog_Do_DB',
-        'Binlog_Ignore_DB',
-    ];
+    public array $primaryVariables = ['File', 'Position', 'Binlog_Do_DB', 'Binlog_Ignore_DB'];
 
     /** @var string[] */
     public array $replicaVariables = [
diff --git a/libraries/classes/Sanitize.php b/libraries/classes/Sanitize.php
index f120b4ea6a..ce400620b8 100644
--- a/libraries/classes/Sanitize.php
+++ b/libraries/classes/Sanitize.php
@@ -43,12 +43,7 @@ class Sanitize
     public static function checkLink(string $url, bool $http = false, bool $other = false): bool
     {
         $url = strtolower($url);
-        $validStarts = [
-            'https://',
-            'index.php?route=/url&url=https%3a%2f%2f',
-            './doc/html/',
-            './index.php?',
-        ];
+        $validStarts = ['https://', 'index.php?route=/url&url=https%3a%2f%2f', './doc/html/', './index.php?'];
         $isSetup = self::isSetup();
         // Adjust path to setup script location
         if ($isSetup) {
diff --git a/libraries/classes/SavedSearches.php b/libraries/classes/SavedSearches.php
index 7b14dd21ba..c00951a729 100644
--- a/libraries/classes/SavedSearches.php
+++ b/libraries/classes/SavedSearches.php
@@ -260,10 +260,7 @@ class SavedSearches
         }
 
         //Else, it's an update.
-        $wheres = [
-            'id != ' . $this->getId(),
-            'search_name = ' . $GLOBALS['dbi']->quoteString($this->getSearchName()),
-        ];
+        $wheres = ['id != ' . $this->getId(), 'search_name = ' . $GLOBALS['dbi']->quoteString($this->getSearchName())];
         $existingSearches = $this->getList($savedQueryByExampleSearchesFeature, $wheres);
 
         if ($existingSearches !== []) {
diff --git a/libraries/classes/Scripts.php b/libraries/classes/Scripts.php
index 341e41f487..95d8414263 100644
--- a/libraries/classes/Scripts.php
+++ b/libraries/classes/Scripts.php
@@ -53,11 +53,7 @@ class Scripts
         }
 
         $hasOnload = $this->hasOnloadEvent($filename);
-        $this->files[$hash] = [
-            'has_onload' => (int) $hasOnload,
-            'filename' => $filename,
-            'params' => $params,
-        ];
+        $this->files[$hash] = ['has_onload' => (int) $hasOnload, 'filename' => $filename, 'params' => $params];
     }
 
     /**
@@ -116,10 +112,7 @@ class Scripts
                 continue;
             }
 
-            $retval[] = [
-                'name' => $file['filename'],
-                'fire' => $file['has_onload'],
-            ];
+            $retval[] = ['name' => $file['filename'], 'fire' => $file['has_onload']];
         }
 
         return $retval;
diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php
index d7d7baf9f9..abb5611e7d 100644
--- a/libraries/classes/Server/Privileges.php
+++ b/libraries/classes/Server/Privileges.php
@@ -258,11 +258,7 @@ class Privileges
             }
         } elseif ($allPrivileges && (! isset($_POST['grant_count']) || count($privs) == $_POST['grant_count'])) {
             if ($enableHTML) {
-                $privs = [
-                    '<dfn title="'
-                    . __('Includes all privileges except GRANT.')
-                    . '">ALL PRIVILEGES</dfn>',
-                ];
+                $privs = ['<dfn title="' . __('Includes all privileges except GRANT.') . '">ALL PRIVILEGES</dfn>'];
             } else {
                 $privs = ['ALL PRIVILEGES'];
             }
@@ -279,46 +275,14 @@ class Privileges
     public function getTableGrantsArray(): array
     {
         return [
-            [
-                'Delete',
-                'DELETE',
-                __('Allows deleting data.'),
-            ],
-            [
-                'Create',
-                'CREATE',
-                __('Allows creating new tables.'),
-            ],
-            [
-                'Drop',
-                'DROP',
-                __('Allows dropping tables.'),
-            ],
-            [
-                'Index',
-                'INDEX',
-                __('Allows creating and dropping indexes.'),
-            ],
-            [
-                'Alter',
-                'ALTER',
-                __('Allows altering the structure of existing tables.'),
-            ],
-            [
-                'Create View',
-                'CREATE_VIEW',
-                __('Allows creating new views.'),
-            ],
-            [
-                'Show view',
-                'SHOW_VIEW',
-                __('Allows performing SHOW CREATE VIEW queries.'),
-            ],
-            [
-                'Trigger',
-                'TRIGGER',
-                __('Allows creating and dropping triggers.'),
-            ],
+            ['Delete', 'DELETE', __('Allows deleting data.')],
+            ['Create', 'CREATE', __('Allows creating new tables.')],
+            ['Drop', 'DROP', __('Allows dropping tables.')],
+            ['Index', 'INDEX', __('Allows creating and dropping indexes.')],
+            ['Alter', 'ALTER', __('Allows altering the structure of existing tables.')],
+            ['Create View', 'CREATE_VIEW', __('Allows creating new views.')],
+            ['Show view', 'SHOW_VIEW', __('Allows performing SHOW CREATE VIEW queries.')],
+            ['Trigger', 'TRIGGER', __('Allows creating and dropping triggers.')],
         ];
     }
 
@@ -331,76 +295,20 @@ class Privileges
     public function getGrantsArray(): array
     {
         return [
-            [
-                'Select_priv',
-                'SELECT',
-                __('Allows reading data.'),
-            ],
-            [
-                'Insert_priv',
-                'INSERT',
-                __('Allows inserting and replacing data.'),
-            ],
-            [
-                'Update_priv',
-                'UPDATE',
-                __('Allows changing data.'),
-            ],
-            [
-                'Delete_priv',
-                'DELETE',
-                __('Allows deleting data.'),
-            ],
-            [
-                'Create_priv',
-                'CREATE',
-                __('Allows creating new databases and tables.'),
-            ],
-            [
-                'Drop_priv',
-                'DROP',
-                __('Allows dropping databases and tables.'),
-            ],
-            [
-                'Reload_priv',
-                'RELOAD',
-                __('Allows reloading server settings and flushing the server\'s caches.'),
-            ],
-            [
-                'Shutdown_priv',
-                'SHUTDOWN',
-                __('Allows shutting down the server.'),
-            ],
-            [
-                'Process_priv',
-                'PROCESS',
-                __('Allows viewing processes of all users.'),
-            ],
-            [
-                'File_priv',
-                'FILE',
-                __('Allows importing data from and exporting data into files.'),
-            ],
-            [
-                'References_priv',
-                'REFERENCES',
-                __('Has no effect in this MySQL version.'),
-            ],
-            [
-                'Index_priv',
-                'INDEX',
-                __('Allows creating and dropping indexes.'),
-            ],
-            [
-                'Alter_priv',
-                'ALTER',
-                __('Allows altering the structure of existing tables.'),
-            ],
-            [
-                'Show_db_priv',
-                'SHOW DATABASES',
-                __('Gives access to the complete list of databases.'),
-            ],
+            ['Select_priv', 'SELECT', __('Allows reading data.')],
+            ['Insert_priv', 'INSERT', __('Allows inserting and replacing data.')],
+            ['Update_priv', 'UPDATE', __('Allows changing data.')],
+            ['Delete_priv', 'DELETE', __('Allows deleting data.')],
+            ['Create_priv', 'CREATE', __('Allows creating new databases and tables.')],
+            ['Drop_priv', 'DROP', __('Allows dropping databases and tables.')],
+            ['Reload_priv', 'RELOAD', __('Allows reloading server settings and flushing the server\'s caches.')],
+            ['Shutdown_priv', 'SHUTDOWN', __('Allows shutting down the server.')],
+            ['Process_priv', 'PROCESS', __('Allows viewing processes of all users.')],
+            ['File_priv', 'FILE', __('Allows importing data from and exporting data into files.')],
+            ['References_priv', 'REFERENCES', __('Has no effect in this MySQL version.')],
+            ['Index_priv', 'INDEX', __('Allows creating and dropping indexes.')],
+            ['Alter_priv', 'ALTER', __('Allows altering the structure of existing tables.')],
+            ['Show_db_priv', 'SHOW DATABASES', __('Gives access to the complete list of databases.')],
             [
                 'Super_priv',
                 'SUPER',
@@ -410,58 +318,22 @@ class Privileges
                     . 'like setting global variables or killing threads of other users.',
                 ),
             ],
-            [
-                'Create_tmp_table_priv',
-                'CREATE TEMPORARY TABLES',
-                __('Allows creating temporary tables.'),
-            ],
-            [
-                'Lock_tables_priv',
-                'LOCK TABLES',
-                __('Allows locking tables for the current thread.'),
-            ],
-            [
-                'Repl_slave_priv',
-                'REPLICATION SLAVE',
-                __('Needed for the replication replicas.'),
-            ],
+            ['Create_tmp_table_priv', 'CREATE TEMPORARY TABLES', __('Allows creating temporary tables.')],
+            ['Lock_tables_priv', 'LOCK TABLES', __('Allows locking tables for the current thread.')],
+            ['Repl_slave_priv', 'REPLICATION SLAVE', __('Needed for the replication replicas.')],
             [
                 'Repl_client_priv',
                 'REPLICATION CLIENT',
                 __('Allows the user to ask where the replicas / primaries are.'),
             ],
-            [
-                'Create_view_priv',
-                'CREATE VIEW',
-                __('Allows creating new views.'),
-            ],
-            [
-                'Event_priv',
-                'EVENT',
-                __('Allows to set up events for the event scheduler.'),
-            ],
-            [
-                'Trigger_priv',
-                'TRIGGER',
-                __('Allows creating and dropping triggers.'),
-            ],
+            ['Create_view_priv', 'CREATE VIEW', __('Allows creating new views.')],
+            ['Event_priv', 'EVENT', __('Allows to set up events for the event scheduler.')],
+            ['Trigger_priv', 'TRIGGER', __('Allows creating and dropping triggers.')],
             // for table privs:
-            [
-                'Create View_priv',
-                'CREATE VIEW',
-                __('Allows creating new views.'),
-            ],
-            [
-                'Show_view_priv',
-                'SHOW VIEW',
-                __('Allows performing SHOW CREATE VIEW queries.'),
-            ],
+            ['Create View_priv', 'CREATE VIEW', __('Allows creating new views.')],
+            ['Show_view_priv', 'SHOW VIEW', __('Allows performing SHOW CREATE VIEW queries.')],
             // for table privs:
-            [
-                'Show view_priv',
-                'SHOW VIEW',
-                __('Allows performing SHOW CREATE VIEW queries.'),
-            ],
+            ['Show view_priv', 'SHOW VIEW', __('Allows performing SHOW CREATE VIEW queries.')],
             [
                 'Delete_history_priv',
                 'DELETE HISTORY',
@@ -478,26 +350,10 @@ class Privileges
                 /* l10n: https://mariadb.com/kb/en/library/grant/#table-privileges "Remove historical rows from a table using the DELETE HISTORY statement" */
                 __('Allows deleting historical rows.'),
             ],
-            [
-                'Create_routine_priv',
-                'CREATE ROUTINE',
-                __('Allows creating stored routines.'),
-            ],
-            [
-                'Alter_routine_priv',
-                'ALTER ROUTINE',
-                __('Allows altering and dropping stored routines.'),
-            ],
-            [
-                'Create_user_priv',
-                'CREATE USER',
-                __('Allows creating, dropping and renaming user accounts.'),
-            ],
-            [
-                'Execute_priv',
-                'EXECUTE',
-                __('Allows executing stored routines.'),
-            ],
+            ['Create_routine_priv', 'CREATE ROUTINE', __('Allows creating stored routines.')],
+            ['Alter_routine_priv', 'ALTER ROUTINE', __('Allows altering and dropping stored routines.')],
+            ['Create_user_priv', 'CREATE USER', __('Allows creating, dropping and renaming user accounts.')],
+            ['Execute_priv', 'EXECUTE', __('Allows executing stored routines.')],
         ];
     }
 
@@ -813,10 +669,7 @@ class Privileges
             }
         }
 
-        return [
-            $usernameLength,
-            $hostnameLength,
-        ];
+        return [$usernameLength, $hostnameLength];
     }
 
     /**
@@ -1078,10 +931,7 @@ class Privileges
         );
         $message->addParam('\'' . $username . '\'@\'' . $hostname . '\'');
 
-        return [
-            $message,
-            $sqlQuery,
-        ];
+        return [$message, $sqlQuery];
     }
 
     /**
@@ -1232,10 +1082,7 @@ class Privileges
      */
     private function getSpecificPrivilege(array $row): array
     {
-        $privilege = [
-            'type' => $row['Type'],
-            'database' => $row['Db'],
-        ];
+        $privilege = ['type' => $row['Type'], 'database' => $row['Db']];
         if ($row['Type'] === 'r') {
             $privilege['routine'] = $row['Routine_name'];
             $privilege['has_grant'] = str_contains($row['Proc_priv'], 'Grant');
@@ -1401,10 +1248,7 @@ class Privileges
             $linkClass = 'export_user_anchor ajax';
         }
 
-        $params = [
-            'username' => $username,
-            'hostname' => $hostname,
-        ];
+        $params = ['username' => $username, 'hostname' => $hostname];
         switch ($linktype) {
             case 'edit':
                 $params['dbname'] = $dbname;
@@ -1595,11 +1439,7 @@ class Privileges
         $userHostCondition = $this->getUserHostCondition($username, $hostname);
 
         if ($type === 'database') {
-            $tablesToSearchForUsers = [
-                'tables_priv',
-                'columns_priv',
-                'procs_priv',
-            ];
+            $tablesToSearchForUsers = ['tables_priv', 'columns_priv', 'procs_priv'];
             $dbOrTableName = 'Db';
         } elseif ($type === 'table') {
             $userHostCondition .= ' AND `Db` LIKE ' . $this->dbi->quoteString($dbname);
@@ -1625,12 +1465,7 @@ class Privileges
                 . $userHostCondition;
         }
 
-        $userDefaults = [
-            $dbOrTableName => '',
-            'Grant_priv' => 'N',
-            'privs' => ['USAGE'],
-            'Column_priv' => true,
-        ];
+        $userDefaults = [$dbOrTableName => '', 'Grant_priv' => 'N', 'privs' => ['USAGE'], 'Column_priv' => true];
 
         // for the rights
         $dbRights = [];
@@ -1700,11 +1535,7 @@ class Privileges
      */
     public function parseProcPriv(string $privs): array
     {
-        $result = [
-            'Alter_routine_priv' => 'N',
-            'Execute_priv' => 'N',
-            'Grant_priv' => 'N',
-        ];
+        $result = ['Alter_routine_priv' => 'N', 'Execute_priv' => 'N', 'Grant_priv' => 'N'];
         foreach (explode(',', $privs) as $priv) {
             if ($priv === 'Alter Routine') {
                 $result['Alter_routine_priv'] = 'Y';
@@ -1842,10 +1673,7 @@ class Privileges
 
         if ($type === 'database') {
             $predDbArray = $this->dbi->getDatabaseList();
-            $databasesToSkip = [
-                'information_schema',
-                'performance_schema',
-            ];
+            $databasesToSkip = ['information_schema', 'performance_schema'];
 
             $databases = [];
             $escapedDatabases = [];
@@ -2031,13 +1859,7 @@ class Privileges
         // we also want users not in table `user` but in other table
         $tables = $this->dbi->fetchResult('SHOW TABLES FROM `mysql`;');
 
-        $tablesSearchForUsers = [
-            'user',
-            'db',
-            'tables_priv',
-            'columns_priv',
-            'procs_priv',
-        ];
+        $tablesSearchForUsers = ['user', 'db', 'tables_priv', 'columns_priv', 'procs_priv'];
 
         $dbRightsSqls = [];
         foreach ($tablesSearchForUsers as $tableSearchIn) {
@@ -2049,13 +1871,7 @@ class Privileges
                 . $tableSearchIn . '` ' . $this->rangeOfUsers($initial);
         }
 
-        $userDefaults = [
-            'User' => '',
-            'Host' => '%',
-            'Password' => '?',
-            'Grant_priv' => 'N',
-            'privs' => ['USAGE'],
-        ];
+        $userDefaults = ['User' => '', 'Host' => '%', 'Password' => '?', 'Grant_priv' => 'N', 'privs' => ['USAGE']];
 
         // for the rights
         $dbRights = [];
@@ -2119,10 +1935,7 @@ class Privileges
             }
         }
 
-        return [
-            $sqlQuery,
-            $message,
-        ];
+        return [$sqlQuery, $message];
     }
 
     /**
@@ -2194,10 +2007,7 @@ class Privileges
         $message = Message::success(__('You have updated the privileges for %s.'));
         $message->addParam('\'' . $username . '\'@\'' . $hostname . '\'');
 
-        return [
-            $sqlQuery,
-            $message,
-        ];
+        return [$sqlQuery, $message];
     }
 
     /**
@@ -2335,9 +2145,7 @@ class Privileges
     public function getDataForDeleteUsers(array $queries): array
     {
         if (isset($_POST['change_copy'])) {
-            $selectedUsr = [
-                $_POST['old_username'] . '&amp;#27;' . $_POST['old_hostname'],
-            ];
+            $selectedUsr = [$_POST['old_username'] . '&amp;#27;' . $_POST['old_hostname']];
         } else {
             // null happens when no user was selected
             $selectedUsr = $_POST['selected_usr'] ?? null;
@@ -2696,14 +2504,7 @@ class Privileges
         // check if given $dbname is a wildcard or not
         $databaseNameIsWildcard = is_string($dbname) && preg_match('/(?<!\\\\)(?:_|%)/', $dbname);
 
-        return [
-            $username,
-            $hostname,
-            $dbname,
-            $tablename,
-            $routinename,
-            $databaseNameIsWildcard,
-        ];
+        return [$username, $hostname, $dbname, $tablename, $routinename, $databaseNameIsWildcard];
     }
 
     /**
@@ -2923,10 +2724,7 @@ class Privileges
             $loginInformationFields = $this->getHtmlForLoginInformationFields();
         }
 
-        $params = [
-            'username' => $username,
-            'hostname' => $hostname,
-        ];
+        $params = ['username' => $username, 'hostname' => $hostname];
         $params['dbname'] = $dbname;
         if (! is_array($dbname) && $dbname !== '' && $tablename !== '') {
             $params['tablename'] = $tablename;
@@ -3036,12 +2834,7 @@ class Privileges
             );
 
             $tmpPrivs1 = $this->extractPrivInfo($row);
-            $tmpPrivs2 = [
-                'Select' => [],
-                'Insert' => [],
-                'Update' => [],
-                'References' => [],
-            ];
+            $tmpPrivs2 = ['Select' => [], 'Insert' => [], 'Update' => [], 'References' => []];
 
             while ($row2 = $res2->fetchAssoc()) {
                 $tmpArray = explode(',', $row2['Column_priv']);
@@ -3211,10 +3004,7 @@ class Privileges
             }
         }
 
-        return [
-            $sqlQuery,
-            $message,
-        ];
+        return [$sqlQuery, $message];
     }
 
     /**
diff --git a/libraries/classes/Server/Status/Data.php b/libraries/classes/Server/Status/Data.php
index 3f9f70dc71..50b118cc37 100644
--- a/libraries/classes/Server/Status/Data.php
+++ b/libraries/classes/Server/Status/Data.php
@@ -177,31 +177,19 @@ class Data
         ];
         $links['table'][__('Show open tables')] = [
             'url' => Url::getFromRoute('/sql'),
-            'params' => Url::getCommon([
-                'sql_query' => 'SHOW OPEN TABLES',
-                'goto' => $selfUrl,
-            ], ''),
+            'params' => Url::getCommon(['sql_query' => 'SHOW OPEN TABLES', 'goto' => $selfUrl], ''),
         ];
 
         if ($primaryInfo['status']) {
             $links['repl'][__('Show replica hosts')] = [
                 'url' => Url::getFromRoute('/sql'),
-                'params' => Url::getCommon([
-                    'sql_query' => 'SHOW SLAVE HOSTS',
-                    'goto' => $selfUrl,
-                ], ''),
-            ];
-            $links['repl'][__('Show primary status')] = [
-                'url' => '#replication_primary',
-                'params' => '',
+                'params' => Url::getCommon(['sql_query' => 'SHOW SLAVE HOSTS', 'goto' => $selfUrl], ''),
             ];
+            $links['repl'][__('Show primary status')] = ['url' => '#replication_primary', 'params' => ''];
         }
 
         if ($replicaInfo['status']) {
-            $links['repl'][__('Show replica status')] = [
-                'url' => '#replication_replica',
-                'params' => '',
-            ];
+            $links['repl'][__('Show replica status')] = ['url' => '#replication_replica', 'params' => ''];
         }
 
         $links['repl']['doc'] = 'replication';
@@ -220,10 +208,7 @@ class Data
 
         $links['Slow_queries']['doc'] = 'slow_query_log';
 
-        $links['innodb'][__('Variables')] = [
-            'url' => Url::getFromRoute('/server/engines/InnoDB'),
-            'params' => '',
-        ];
+        $links['innodb'][__('Variables')] = ['url' => Url::getFromRoute('/server/engines/InnoDB'), 'params' => ''];
         $links['innodb'][__('InnoDB Status')] = [
             'url' => Url::getFromRoute('/server/engines/InnoDB/Status'),
             'params' => '',
@@ -337,11 +322,7 @@ class Data
             $sectionUsed['other'] = true;
         }
 
-        return [
-            $allocationMap,
-            $sectionUsed,
-            $usedQueries,
-        ];
+        return [$allocationMap, $sectionUsed, $usedQueries];
     }
 
     public function __construct(private DatabaseInterface $dbi, private Config $config)
diff --git a/libraries/classes/Server/Status/Monitor.php b/libraries/classes/Server/Status/Monitor.php
index b49dbda830..ef7af497da 100644
--- a/libraries/classes/Server/Status/Monitor.php
+++ b/libraries/classes/Server/Status/Monitor.php
@@ -160,11 +160,7 @@ class Monitor
             } /* foreach */
         }
 
-        return [
-            $serverVars,
-            $statusVars,
-            $ret,
-        ];
+        return [$serverVars, $statusVars, $ret];
     }
 
     /**
@@ -246,11 +242,7 @@ class Monitor
                 break;
         }
 
-        return [
-            $serverVars,
-            $statusVars,
-            $ret,
-        ];
+        return [$serverVars, $statusVars, $ret];
     }
 
     /**
@@ -277,10 +269,7 @@ class Monitor
             return null;
         }
 
-        $return = [
-            'rows' => [],
-            'sum' => [],
-        ];
+        $return = ['rows' => [], 'sum' => []];
 
         while ($row = $result->fetchAssoc()) {
             $type = mb_strtolower(
@@ -360,10 +349,7 @@ class Monitor
             return null;
         }
 
-        $return = [
-            'rows' => [],
-            'sum' => [],
-        ];
+        $return = ['rows' => [], 'sum' => []];
         $insertTables = [];
         $insertTablesFirst = -1;
         $i = 0;
diff --git a/libraries/classes/Server/Status/Processes.php b/libraries/classes/Server/Status/Processes.php
index 9abe55ff13..ad3da89aaf 100644
--- a/libraries/classes/Server/Status/Processes.php
+++ b/libraries/classes/Server/Status/Processes.php
@@ -96,47 +96,20 @@ final class Processes
         // This array contains display name and real column name of each
         // sortable column in the table
         $sortableColumns = [
-            [
-                'column_name' => __('ID'),
-                'order_by_field' => 'Id',
-            ],
-            [
-                'column_name' => __('User'),
-                'order_by_field' => 'User',
-            ],
-            [
-                'column_name' => __('Host'),
-                'order_by_field' => 'Host',
-            ],
-            [
-                'column_name' => __('Database'),
-                'order_by_field' => 'Db',
-            ],
-            [
-                'column_name' => __('Command'),
-                'order_by_field' => 'Command',
-            ],
-            [
-                'column_name' => __('Time'),
-                'order_by_field' => 'Time',
-            ],
-            [
-                'column_name' => __('Status'),
-                'order_by_field' => 'State',
-            ],
+            ['column_name' => __('ID'), 'order_by_field' => 'Id'],
+            ['column_name' => __('User'), 'order_by_field' => 'User'],
+            ['column_name' => __('Host'), 'order_by_field' => 'Host'],
+            ['column_name' => __('Database'), 'order_by_field' => 'Db'],
+            ['column_name' => __('Command'), 'order_by_field' => 'Command'],
+            ['column_name' => __('Time'), 'order_by_field' => 'Time'],
+            ['column_name' => __('Status'), 'order_by_field' => 'State'],
         ];
 
         if ($this->dbi->isMariaDB()) {
-            $sortableColumns[] = [
-                'column_name' => __('Progress'),
-                'order_by_field' => 'Progress',
-            ];
+            $sortableColumns[] = ['column_name' => __('Progress'), 'order_by_field' => 'Progress'];
         }
 
-        $sortableColumns[] = [
-            'column_name' => __('SQL query'),
-            'order_by_field' => 'Info',
-        ];
+        $sortableColumns[] = ['column_name' => __('SQL query'), 'order_by_field' => 'Info'];
 
         $sortableColCount = count($sortableColumns);
 
diff --git a/libraries/classes/Server/SysInfo/Linux.php b/libraries/classes/Server/SysInfo/Linux.php
index 84f6937c04..a5914b5ee8 100644
--- a/libraries/classes/Server/SysInfo/Linux.php
+++ b/libraries/classes/Server/SysInfo/Linux.php
@@ -50,10 +50,7 @@ class Linux extends Base
             return ['busy' => 0, 'idle' => 0];
         }
 
-        return [
-            'busy' => (int) $nums[1] + (int) $nums[2] + (int) $nums[3],
-            'idle' => (int) $nums[4],
-        ];
+        return ['busy' => (int) $nums[1] + (int) $nums[2] + (int) $nums[3], 'idle' => (int) $nums[4]];
     }
 
     /**
diff --git a/libraries/classes/Server/SysInfo/SysInfo.php b/libraries/classes/Server/SysInfo/SysInfo.php
index ce3b7ff920..ee30929a4c 100644
--- a/libraries/classes/Server/SysInfo/SysInfo.php
+++ b/libraries/classes/Server/SysInfo/SysInfo.php
@@ -28,10 +28,7 @@ class SysInfo
     public static function getOs(string $phpOs = PHP_OS): string
     {
         // look for common UNIX-like systems
-        $unixLike = [
-            'FreeBSD',
-            'DragonFly',
-        ];
+        $unixLike = ['FreeBSD', 'DragonFly'];
         if (in_array($phpOs, $unixLike)) {
             $phpOs = 'Linux';
         }
diff --git a/libraries/classes/Setup/FormProcessing.php b/libraries/classes/Setup/FormProcessing.php
index 7304ce5697..0efa6d786c 100644
--- a/libraries/classes/Setup/FormProcessing.php
+++ b/libraries/classes/Setup/FormProcessing.php
@@ -65,16 +65,9 @@ class FormProcessing
             $formId = $formDisplay->getConfigFile()->getServerCount();
         }
 
-        $urlParams = [
-            'page' => $page,
-            'formset' => $formset,
-            'id' => $formId,
-        ];
+        $urlParams = ['page' => $page, 'formset' => $formset, 'id' => $formId];
 
         $template = new Template();
-        echo $template->render('setup/error', [
-            'url_params' => $urlParams,
-            'errors' => $formDisplay->displayErrors(),
-        ]);
+        echo $template->render('setup/error', ['url_params' => $urlParams, 'errors' => $formDisplay->displayErrors()]);
     }
 }
diff --git a/libraries/classes/Setup/Index.php b/libraries/classes/Setup/Index.php
index eaeba06586..393f46cec9 100644
--- a/libraries/classes/Setup/Index.php
+++ b/libraries/classes/Setup/Index.php
@@ -30,10 +30,7 @@ class Index
     public static function messagesBegin(): void
     {
         if (! isset($_SESSION['messages']) || ! is_array($_SESSION['messages'])) {
-            $_SESSION['messages'] = [
-                'error' => [],
-                'notice' => [],
-            ];
+            $_SESSION['messages'] = ['error' => [], 'notice' => []];
         } else {
             // reset message states
             foreach ($_SESSION['messages'] as &$messages) {
diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php
index 74ffc26c6e..79e38615bd 100644
--- a/libraries/classes/Sql.php
+++ b/libraries/classes/Sql.php
@@ -224,11 +224,7 @@ class Sql
         if ($foreignData['disp_row'] == null) {
             //Handle the case when number of values
             //is more than $cfg['ForeignKeyMaxLimit']
-            $urlParams = [
-                'db' => $db,
-                'table' => $table,
-                'field' => $column,
-            ];
+            $urlParams = ['db' => $db, 'table' => $table, 'field' => $column];
 
             return $this->template->render('sql/relational_column_dropdown', [
                 'current_value' => $_POST['curr_value'],
@@ -250,12 +246,7 @@ class Sql
     /** @return array<string, int|array> */
     private function getDetailedProfilingStats(array $profilingResults): array
     {
-        $profiling = [
-            'total_time' => 0,
-            'states' => [],
-            'chart' => [],
-            'profile' => [],
-        ];
+        $profiling = ['total_time' => 0, 'states' => [], 'chart' => [], 'profile' => []];
 
         foreach ($profilingResults as $oneResult) {
             $status = ucwords($oneResult['Status']);
@@ -267,10 +258,7 @@ class Sql
             ];
 
             if (! isset($profiling['states'][$status])) {
-                $profiling['states'][$status] = [
-                    'total_time' => $oneResult['Duration'],
-                    'calls' => 1,
-                ];
+                $profiling['states'][$status] = ['total_time' => $oneResult['Duration'], 'calls' => 1];
                 $profiling['chart'][$status] = $oneResult['Duration'];
             } else {
                 $profiling['states'][$status]['calls']++;
@@ -818,13 +806,7 @@ class Sql
             }
         }
 
-        return [
-            $result,
-            $numRows,
-            $unlimNumRows,
-            $profilingResults,
-            $extraData,
-        ];
+        return [$result, $numRows, $unlimNumRows, $profilingResults, $extraData];
     }
 
     /**
@@ -1631,13 +1613,7 @@ class Sql
         $GLOBALS['reload'] = $this->hasCurrentDbChanged($db);
         $this->dbi->selectDb($db);
 
-        [
-            $result,
-            $numRows,
-            $unlimNumRows,
-            $profilingResults,
-            $extraData,
-        ] = $this->executeTheQuery(
+        [$result, $numRows, $unlimNumRows, $profilingResults, $extraData] = $this->executeTheQuery(
             $statementInfo,
             $fullSqlQuery,
             $isGotoFile,
diff --git a/libraries/classes/SqlQueryForm.php b/libraries/classes/SqlQueryForm.php
index 00d8a010aa..93d0f4269e 100644
--- a/libraries/classes/SqlQueryForm.php
+++ b/libraries/classes/SqlQueryForm.php
@@ -171,10 +171,6 @@ class SqlQueryForm
 
         $legend .= ': ' . MySQLDocumentation::show('SELECT');
 
-        return [
-            $legend,
-            $query,
-            $columnsList,
-        ];
+        return [$legend, $query, $columnsList];
     }
 }
diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php
index 457cfd80d8..7d3de89c2e 100644
--- a/libraries/classes/Table.php
+++ b/libraries/classes/Table.php
@@ -1040,10 +1040,7 @@ class Table implements Stringable
                 $tbl = new Table($targetTable, $targetDb, $GLOBALS['dbi']);
 
                 $statement->options = new OptionsArray(
-                    [
-                        $tbl->isView() ? 'VIEW' : 'TABLE',
-                        'IF EXISTS',
-                    ],
+                    [$tbl->isView() ? 'VIEW' : 'TABLE', 'IF EXISTS'],
                 );
 
                 $statement->fields = [$destination];
@@ -1312,47 +1309,19 @@ class Table implements Stringable
         // just once per db
 
         $getFields = ['display_field'];
-        $whereFields = [
-            'db_name' => $sourceDb,
-            'table_name' => $sourceTable,
-        ];
-        $newFields = [
-            'db_name' => $targetDb,
-            'table_name' => $targetTable,
-        ];
+        $whereFields = ['db_name' => $sourceDb, 'table_name' => $sourceTable];
+        $newFields = ['db_name' => $targetDb, 'table_name' => $targetTable];
         self::duplicateInfo('displaywork', 'table_info', $getFields, $whereFields, $newFields);
 
         /** @todo revise this code when we support cross-db relations */
-        $getFields = [
-            'master_field',
-            'foreign_table',
-            'foreign_field',
-        ];
-        $whereFields = [
-            'master_db' => $sourceDb,
-            'master_table' => $sourceTable,
-        ];
-        $newFields = [
-            'master_db' => $targetDb,
-            'foreign_db' => $targetDb,
-            'master_table' => $targetTable,
-        ];
+        $getFields = ['master_field', 'foreign_table', 'foreign_field'];
+        $whereFields = ['master_db' => $sourceDb, 'master_table' => $sourceTable];
+        $newFields = ['master_db' => $targetDb, 'foreign_db' => $targetDb, 'master_table' => $targetTable];
         self::duplicateInfo('relwork', 'relation', $getFields, $whereFields, $newFields);
 
-        $getFields = [
-            'foreign_field',
-            'master_table',
-            'master_field',
-        ];
-        $whereFields = [
-            'foreign_db' => $sourceDb,
-            'foreign_table' => $sourceTable,
-        ];
-        $newFields = [
-            'master_db' => $targetDb,
-            'foreign_db' => $targetDb,
-            'foreign_table' => $targetTable,
-        ];
+        $getFields = ['foreign_field', 'master_table', 'master_field'];
+        $whereFields = ['foreign_db' => $sourceDb, 'foreign_table' => $sourceTable];
+        $newFields = ['master_db' => $targetDb, 'foreign_db' => $targetDb, 'foreign_table' => $targetTable];
         self::duplicateInfo('relwork', 'relation', $getFields, $whereFields, $newFields);
 
         return true;
@@ -1514,10 +1483,7 @@ class Table implements Stringable
         );
         $uniques = $this->dbi->fetchResult(
             $sql,
-            [
-                'Key_name',
-                null,
-            ],
+            ['Key_name', null],
             'Column_name',
         );
 
@@ -2386,12 +2352,7 @@ class Table implements Stringable
             }
         }
 
-        return [
-            $htmlOutput,
-            $previewSqlData,
-            $displayQuery,
-            $seenError,
-        ];
+        return [$htmlOutput, $previewSqlData, $displayQuery, $seenError];
     }
 
     /**
diff --git a/libraries/classes/Table/ColumnsDefinition.php b/libraries/classes/Table/ColumnsDefinition.php
index 543112e087..1882a11e51 100644
--- a/libraries/classes/Table/ColumnsDefinition.php
+++ b/libraries/classes/Table/ColumnsDefinition.php
@@ -84,10 +84,7 @@ final class ColumnsDefinition
 
         $formParams = array_merge(
             $formParams,
-            [
-                'orig_field_where' => $_POST['field_where'] ?? null,
-                'orig_after_field' => $_POST['after_field'] ?? null,
-            ],
+            ['orig_field_where' => $_POST['field_where'] ?? null, 'orig_after_field' => $_POST['after_field'] ?? null],
         );
 
         if (is_array($selected)) {
@@ -113,10 +110,7 @@ final class ColumnsDefinition
             $availableMime = $this->transformations->getAvailableMimeTypes();
         }
 
-        $mimeTypes = [
-            'input_transformation',
-            'transformation',
-        ];
+        $mimeTypes = ['input_transformation', 'transformation'];
         foreach ($mimeTypes as $mimeType) {
             if (! isset($availableMime[$mimeType]) || ! is_array($availableMime[$mimeType])) {
                 continue;
@@ -260,12 +254,7 @@ final class ColumnsDefinition
                 );
             } elseif (isset($fieldsMeta[$columnNumber])) {
                 $columnMeta = $fieldsMeta[$columnNumber];
-                $virtual = [
-                    'VIRTUAL',
-                    'PERSISTENT',
-                    'VIRTUAL GENERATED',
-                    'STORED GENERATED',
-                ];
+                $virtual = ['VIRTUAL', 'PERSISTENT', 'VIRTUAL GENERATED', 'STORED GENERATED'];
                 if (in_array($columnMeta['Extra'], $virtual)) {
                     $tableObj = new Table($GLOBALS['table'], $GLOBALS['db'], $this->dbi);
                     $expressions = $tableObj->getColumnGenerationExpression($columnMeta['Field']);
@@ -394,10 +383,7 @@ final class ColumnsDefinition
         foreach ($charsets as $charset) {
             $collationsList = [];
             foreach ($collations[$charset->getName()] as $collation) {
-                $collationsList[] = [
-                    'name' => $collation->getName(),
-                    'description' => $collation->getDescription(),
-                ];
+                $collationsList[] = ['name' => $collation->getName(), 'description' => $collation->getDescription()];
             }
 
             $charsetsList[] = [
@@ -458,10 +444,7 @@ final class ColumnsDefinition
      */
     public static function decorateColumnMetaDefault(array $columnMeta): array
     {
-        $metaDefault = [
-            'DefaultType' => 'USER_DEFINED',
-            'DefaultValue' => '',
-        ];
+        $metaDefault = ['DefaultType' => 'USER_DEFINED', 'DefaultValue' => ''];
 
         switch ($columnMeta['Default']) {
             case null:
diff --git a/libraries/classes/Table/Indexes.php b/libraries/classes/Table/Indexes.php
index 34d38f17e3..a8c5fe02d2 100644
--- a/libraries/classes/Table/Indexes.php
+++ b/libraries/classes/Table/Indexes.php
@@ -88,10 +88,7 @@ final class Indexes
                 $this->response->addJSON(
                     'index_table',
                     $this->template->render('indexes', [
-                        'url_params' => [
-                            'db' => $db,
-                            'table' => $table,
-                        ],
+                        'url_params' => ['db' => $db, 'table' => $table],
                         'indexes' => $indexes,
                         'indexes_duplicates' => $indexesDuplicates,
                     ]),
diff --git a/libraries/classes/Table/Search.php b/libraries/classes/Table/Search.php
index 0cba54d1e7..d8cbff615b 100644
--- a/libraries/classes/Table/Search.php
+++ b/libraries/classes/Table/Search.php
@@ -264,12 +264,7 @@ final class Search
         string $types,
         string|null $geomFunc = null,
     ): string {
-        $geomUnaryFunctions = [
-            'IsEmpty' => 1,
-            'IsSimple' => 1,
-            'IsRing' => 1,
-            'IsClosed' => 1,
-        ];
+        $geomUnaryFunctions = ['IsEmpty' => 1, 'IsSimple' => 1, 'IsRing' => 1, 'IsClosed' => 1];
         $where = '';
 
         // Get details about the geometry functions
diff --git a/libraries/classes/Template.php b/libraries/classes/Template.php
index 021afa0d3b..2fc849257c 100644
--- a/libraries/classes/Template.php
+++ b/libraries/classes/Template.php
@@ -64,10 +64,7 @@ class Template
         }
 
         $loader = new FilesystemLoader(self::TEMPLATES_FOLDER);
-        $twig = new Environment($loader, [
-            'auto_reload' => true,
-            'cache' => $cacheDir,
-        ]);
+        $twig = new Environment($loader, ['auto_reload' => true, 'cache' => $cacheDir]);
 
         $twig->addRuntimeLoader(new ContainerRuntimeLoader(Core::getContainerBuilder()));
 
diff --git a/libraries/classes/Theme/Theme.php b/libraries/classes/Theme/Theme.php
index 22863cfac9..fa79bbd16c 100644
--- a/libraries/classes/Theme/Theme.php
+++ b/libraries/classes/Theme/Theme.php
@@ -100,11 +100,7 @@ class Theme
         }
 
         // Check that all required data are there
-        $members = [
-            'name',
-            'version',
-            'supports',
-        ];
+        $members = ['name', 'version', 'supports'];
         foreach ($members as $member) {
             if (! isset($data[$member])) {
                 return false;
diff --git a/libraries/classes/Tracking/Tracker.php b/libraries/classes/Tracking/Tracker.php
index 576f9aeb95..7792278d45 100644
--- a/libraries/classes/Tracking/Tracker.php
+++ b/libraries/classes/Tracking/Tracker.php
@@ -220,10 +220,7 @@ class Tracker
 
         $indexes = $GLOBALS['dbi']->getTableIndexes($dbName, $tableName);
 
-        $snapshot = [
-            'COLUMNS' => $columns,
-            'INDEXES' => $indexes,
-        ];
+        $snapshot = ['COLUMNS' => $columns, 'INDEXES' => $indexes];
         $snapshot = serialize($snapshot);
 
         // Get DROP TABLE / DROP VIEW and CREATE TABLE SQL statements
@@ -557,12 +554,7 @@ class Tracker
 
         // PHP 7.4 fix for accessing array offset on null
         if ($mixed === []) {
-            $mixed = [
-                'schema_sql' => null,
-                'data_sql' => null,
-                'tracking' => null,
-                'schema_snapshot' => null,
-            ];
+            $mixed = ['schema_sql' => null, 'data_sql' => null, 'tracking' => null, 'schema_snapshot' => null];
         }
 
         // Parse log
@@ -594,11 +586,7 @@ class Tracker
 
             $statement = rtrim((string) mb_strstr($logEntry, "\n"));
 
-            $ddlog[] = [
-                'date' => $date,
-                'username' => $username,
-                'statement' => $statement,
-            ];
+            $ddlog[] = ['date' => $date, 'username' => $username, 'statement' => $statement];
         }
 
         $dateFrom = $ddlDateFrom;
@@ -629,11 +617,7 @@ class Tracker
 
             $statement = rtrim((string) mb_strstr($logEntry, "\n"));
 
-            $dmlog[] = [
-                'date' => $date,
-                'username' => $username,
-                'statement' => $statement,
-            ];
+            $dmlog[] = ['date' => $date, 'username' => $username, 'statement' => $statement];
         }
 
         $dmlDateTo = $date;
diff --git a/libraries/classes/Tracking/Tracking.php b/libraries/classes/Tracking/Tracking.php
index 57dcf44fe4..cfc0775751 100644
--- a/libraries/classes/Tracking/Tracking.php
+++ b/libraries/classes/Tracking/Tracking.php
@@ -277,13 +277,7 @@ class Tracking
         $str5 = '<input type="hidden" name="list_report" value="1">'
             . '<input class="btn btn-primary" type="submit" value="' . __('Go') . '">';
 
-        return [
-            $str1,
-            $str2,
-            $str3,
-            $str4,
-            $str5,
-        ];
+        return [$str1, $str2, $str3, $str4, $str5];
     }
 
     /**
@@ -320,10 +314,7 @@ class Tracking
         $ddlogCount = 0;
 
         $html = '<form method="post" action="' . Url::getFromRoute('/table/tracking') . '">';
-        $html .= Url::getHiddenInputs($urlParams + [
-            'report' => 'true',
-            'version' => $version,
-        ]);
+        $html .= Url::getHiddenInputs($urlParams + ['report' => 'true', 'version' => $version]);
 
         $html .= sprintf(
             __('Show %1$s with dates from %2$s to %3$s by user %4$s %5$s'),
@@ -394,10 +385,7 @@ class Tracking
         string $users,
     ): string {
         $html = '<form method="post" action="' . Url::getFromRoute('/table/tracking') . '">';
-        $html .= Url::getHiddenInputs($urlParams + [
-            'report' => 'true',
-            'version' => $version,
-        ]);
+        $html .= Url::getHiddenInputs($urlParams + ['report' => 'true', 'version' => $version]);
 
         $html .= sprintf(
             __('Show %1$s with dates from %2$s to %3$s by user %4$s %5$s'),
@@ -509,10 +497,7 @@ class Tracking
             $dateTo,
         );
 
-        return [
-            $html,
-            $lineNumber,
-        ];
+        return [$html, $lineNumber];
     }
 
     /**
@@ -573,10 +558,7 @@ class Tracking
             'drop_image_or_text' => $dropImageOrText,
         ]);
 
-        return [
-            $html,
-            $lineNumber,
-        ];
+        return [$html, $lineNumber];
     }
 
     /**
@@ -613,10 +595,7 @@ class Tracking
         // Unserialize snapshot
         $temp = Core::safeUnserialize($data['schema_snapshot']);
         if ($temp === null) {
-            $temp = [
-                'COLUMNS' => [],
-                'INDEXES' => [],
-            ];
+            $temp = ['COLUMNS' => [], 'INDEXES' => []];
         }
 
         $columns = $temp['COLUMNS'];
diff --git a/libraries/classes/Transformations.php b/libraries/classes/Transformations.php
index 00a0ed7a5c..5b8bb17dfb 100644
--- a/libraries/classes/Transformations.php
+++ b/libraries/classes/Transformations.php
@@ -120,11 +120,7 @@ class Transformations
         }
 
         $stack = [];
-        $subDirs = [
-            'Input/' => 'input_',
-            'Output/' => '',
-            '' => '',
-        ];
+        $subDirs = ['Input/' => 'input_', 'Output/' => '', '' => ''];
 
         foreach ($subDirs as $sd => $prefix) {
             $handle = opendir(ROOT_PATH . 'libraries/classes/Plugins/Transformations/' . $sd);
@@ -245,14 +241,8 @@ class Transformations
     public function fixUpMime(string $value): string
     {
         $value = str_replace(
-            [
-                'jpeg',
-                'png',
-            ],
-            [
-                'JPEG',
-                'PNG',
-            ],
+            ['jpeg', 'png'],
+            ['JPEG', 'PNG'],
             $value,
         );
 
diff --git a/libraries/classes/Twig/AssetExtension.php b/libraries/classes/Twig/AssetExtension.php
index f7fca147ca..2092e51bd6 100644
--- a/libraries/classes/Twig/AssetExtension.php
+++ b/libraries/classes/Twig/AssetExtension.php
@@ -13,9 +13,7 @@ final class AssetExtension extends AbstractExtension
     /** @return TwigFunction[] */
     public function getFunctions(): array
     {
-        return [
-            new TwigFunction('image', $this->getImagePath(...)),
-        ];
+        return [new TwigFunction('image', $this->getImagePath(...))];
     }
 
     public function getImagePath(string|null $filename = null, string|null $fallback = null): string
diff --git a/libraries/classes/TwoFactor.php b/libraries/classes/TwoFactor.php
index fc62468c48..5833626a7e 100644
--- a/libraries/classes/TwoFactor.php
+++ b/libraries/classes/TwoFactor.php
@@ -145,24 +145,15 @@ class TwoFactor
     {
         $result = [];
         if (! class_exists(Google2FA::class)) {
-            $result[] = [
-                'class' => Application::getName(),
-                'dep' => 'pragmarx/google2fa-qrcode',
-            ];
+            $result[] = ['class' => Application::getName(), 'dep' => 'pragmarx/google2fa-qrcode'];
         }
 
         if (! class_exists(ImageRenderer::class)) {
-            $result[] = [
-                'class' => Application::getName(),
-                'dep' => 'bacon/bacon-qr-code',
-            ];
+            $result[] = ['class' => Application::getName(), 'dep' => 'bacon/bacon-qr-code'];
         }
 
         if (! class_exists(U2FServer::class)) {
-            $result[] = [
-                'class' => Key::getName(),
-                'dep' => 'code-lts/u2f-php-server',
-            ];
+            $result[] = ['class' => Key::getName(), 'dep' => 'code-lts/u2f-php-server'];
         }
 
         return $result;
@@ -291,11 +282,7 @@ class TwoFactor
         $backends = [];
         foreach ($all as $name) {
             $cls = $this->getBackendClass($name);
-            $backends[] = [
-                'id' => $cls::$id,
-                'name' => $cls::getName(),
-                'description' => $cls::getDescription(),
-            ];
+            $backends[] = ['id' => $cls::$id, 'name' => $cls::getName(), 'description' => $cls::getDescription()];
         }
 
         return $backends;
diff --git a/libraries/classes/Types.php b/libraries/classes/Types.php
index 9367c0fe1a..c0f58646ca 100644
--- a/libraries/classes/Types.php
+++ b/libraries/classes/Types.php
@@ -37,12 +37,7 @@ class Types
      */
     public function getUnaryOperators(): array
     {
-        return [
-            'IS NULL',
-            'IS NOT NULL',
-            "= ''",
-            "!= ''",
-        ];
+        return ['IS NULL', 'IS NOT NULL', "= ''", "!= ''"];
     }
 
     /**
@@ -62,10 +57,7 @@ class Types
      */
     public function getNullOperators(): array
     {
-        return [
-            'IS NULL',
-            'IS NOT NULL',
-        ];
+        return ['IS NULL', 'IS NOT NULL'];
     }
 
     /**
@@ -75,10 +67,7 @@ class Types
      */
     public function getEnumOperators(): array
     {
-        return [
-            '=',
-            '!=',
-        ];
+        return ['=', '!='];
     }
 
     /**
@@ -139,16 +128,7 @@ class Types
      */
     public function getUUIDOperators(): array
     {
-        return [
-            '=',
-            '!=',
-            'LIKE',
-            'LIKE %...%',
-            'NOT LIKE',
-            'NOT LIKE %...%',
-            'IN (...)',
-            'NOT IN (...)',
-        ];
+        return ['=', '!=', 'LIKE', 'LIKE %...%', 'NOT LIKE', 'NOT LIKE %...%', 'IN (...)', 'NOT IN (...)'];
     }
 
     /**
@@ -640,13 +620,7 @@ class Types
     {
         $serverVersion = $this->dbi->getVersion();
 
-        $attributes = [
-            '',
-            'BINARY',
-            'UNSIGNED',
-            'UNSIGNED ZEROFILL',
-            'on update CURRENT_TIMESTAMP',
-        ];
+        $attributes = ['', 'BINARY', 'UNSIGNED', 'UNSIGNED ZEROFILL', 'on update CURRENT_TIMESTAMP'];
 
         if (Compatibility::supportsCompressedColumns($serverVersion)) {
             $attributes[] = 'COMPRESSED=zlib';
@@ -670,12 +644,7 @@ class Types
         $isUUIDSupported = Compatibility::isUUIDSupported($this->dbi);
 
         // most used types
-        $ret = [
-            'INT',
-            'VARCHAR',
-            'TEXT',
-            'DATE',
-        ];
+        $ret = ['INT', 'VARCHAR', 'TEXT', 'DATE'];
 
         if ($isUUIDSupported) {
             $ret[] = 'UUID';
@@ -700,13 +669,7 @@ class Types
         ];
 
         // Date/Time
-        $ret[_pgettext('date and time types', 'Date and time')] = [
-            'DATE',
-            'DATETIME',
-            'TIMESTAMP',
-            'TIME',
-            'YEAR',
-        ];
+        $ret[_pgettext('date and time types', 'Date and time')] = ['DATE', 'DATETIME', 'TIMESTAMP', 'TIME', 'YEAR'];
 
         // Text
         $stringTypes = [
@@ -765,13 +728,7 @@ class Types
      */
     public function getIntegerTypes(): array
     {
-        return [
-            'tinyint',
-            'smallint',
-            'mediumint',
-            'int',
-            'bigint',
-        ];
+        return ['tinyint', 'smallint', 'mediumint', 'int', 'bigint'];
     }
 
     /**
@@ -781,12 +738,7 @@ class Types
      */
     public function getFloatTypes(): array
     {
-        return [
-            'decimal',
-            'float',
-            'double',
-            'real',
-        ];
+        return ['decimal', 'float', 'double', 'real'];
     }
 
     /**
@@ -801,57 +753,24 @@ class Types
     {
         $minMaxData = [
             'unsigned' => [
-                'tinyint' => [
-                    '0',
-                    '255',
-                ],
-                'smallint' => [
-                    '0',
-                    '65535',
-                ],
-                'mediumint' => [
-                    '0',
-                    '16777215',
-                ],
-                'int' => [
-                    '0',
-                    '4294967295',
-                ],
-                'bigint' => [
-                    '0',
-                    '18446744073709551615',
-                ],
+                'tinyint' => ['0', '255'],
+                'smallint' => ['0', '65535'],
+                'mediumint' => ['0', '16777215'],
+                'int' => ['0', '4294967295'],
+                'bigint' => ['0', '18446744073709551615'],
             ],
             'signed' => [
-                'tinyint' => [
-                    '-128',
-                    '127',
-                ],
-                'smallint' => [
-                    '-32768',
-                    '32767',
-                ],
-                'mediumint' => [
-                    '-8388608',
-                    '8388607',
-                ],
-                'int' => [
-                    '-2147483648',
-                    '2147483647',
-                ],
-                'bigint' => [
-                    '-9223372036854775808',
-                    '9223372036854775807',
-                ],
+                'tinyint' => ['-128', '127'],
+                'smallint' => ['-32768', '32767'],
+                'mediumint' => ['-8388608', '8388607'],
+                'int' => ['-2147483648', '2147483647'],
+                'bigint' => ['-9223372036854775808', '9223372036854775807'],
             ],
         ];
         $relevantArray = $signed
             ? $minMaxData['signed']
             : $minMaxData['unsigned'];
 
-        return $relevantArray[$type] ?? [
-            '',
-            '',
-        ];
+        return $relevantArray[$type] ?? ['', ''];
     }
 }
diff --git a/libraries/classes/UserPassword.php b/libraries/classes/UserPassword.php
index 7130f797b6..43f34992ad 100644
--- a/libraries/classes/UserPassword.php
+++ b/libraries/classes/UserPassword.php
@@ -49,10 +49,7 @@ class UserPassword
             }
         }
 
-        return [
-            'error' => $error,
-            'msg' => $message,
-        ];
+        return ['error' => $error, 'msg' => $message];
     }
 
     /**
diff --git a/libraries/classes/UserPreferences.php b/libraries/classes/UserPreferences.php
index ed8f921037..224fd6bd08 100644
--- a/libraries/classes/UserPreferences.php
+++ b/libraries/classes/UserPreferences.php
@@ -51,10 +51,7 @@ class UserPreferences
         $cf->resetConfigData(); // start with a clean instance
         $cf->setAllowedKeys($formsAllKeys);
         $cf->setCfgUpdateReadMapping(
-            [
-                'Server/hide_db' => 'Servers/1/hide_db',
-                'Server/only_db' => 'Servers/1/only_db',
-            ],
+            ['Server/hide_db' => 'Servers/1/hide_db', 'Server/only_db' => 'Servers/1/only_db'],
         );
         $cf->updateWithGlobalConfig($GLOBALS['cfg']);
     }
@@ -127,10 +124,7 @@ class UserPreferences
             || $relationParameters->db === null
         ) {
             // no pmadb table, use session storage
-            $_SESSION['userconfig'] = [
-                'db' => $configArray,
-                'ts' => time(),
-            ];
+            $_SESSION['userconfig'] = ['db' => $configArray, 'ts' => time()];
             if (isset($_SESSION['cache'][$cacheKey]['userprefs'])) {
                 unset($_SESSION['cache'][$cacheKey]['userprefs']);
             }
diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index 758ebafb3b..14192574ba 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -336,10 +336,7 @@ class Util
             $returnValue = self::formatNumber($value, 0);
         }
 
-        return [
-            trim($returnValue),
-            $unit,
-        ];
+        return [trim($returnValue), $unit];
     }
 
     /**
@@ -820,11 +817,7 @@ class Util
 
         $whereClause = trim((string) preg_replace('|\s?AND$|', '', $preferredCondition));
 
-        return [
-            $whereClause,
-            $clauseIsUnique,
-            $conditionArray,
-        ];
+        return [$whereClause, $clauseIsUnique, $conditionArray];
     }
 
     /**
@@ -1886,12 +1879,7 @@ class Util
             $indexesData[$row['Key_name']][$row['Seq_in_index']]['Sub_part'] = $row['Sub_part'];
         }
 
-        return [
-            $primary,
-            $pkArray,
-            $indexesInfo,
-            $indexesData,
-        ];
+        return [$primary, $pkArray, $indexesInfo, $indexesData];
     }
 
     /**
@@ -2256,18 +2244,12 @@ class Util
                 $orderImg = ' ' . Generator::getImage(
                     's_asc',
                     __('Ascending'),
-                    [
-                        'class' => 'sort_arrow',
-                        'title' => '',
-                    ],
+                    ['class' => 'sort_arrow', 'title' => ''],
                 );
                 $orderImg .= ' ' . Generator::getImage(
                     's_desc',
                     __('Descending'),
-                    [
-                        'class' => 'sort_arrow hide',
-                        'title' => '',
-                    ],
+                    ['class' => 'sort_arrow hide', 'title' => ''],
                 );
                 // but on mouse over, show the reverse order (DESC)
                 $orderLinkParams['onmouseover'] = "$('.sort_arrow').toggle();";
@@ -2279,18 +2261,12 @@ class Util
                 $orderImg = ' ' . Generator::getImage(
                     's_asc',
                     __('Ascending'),
-                    [
-                        'class' => 'sort_arrow hide',
-                        'title' => '',
-                    ],
+                    ['class' => 'sort_arrow hide', 'title' => ''],
                 );
                 $orderImg .= ' ' . Generator::getImage(
                     's_desc',
                     __('Descending'),
-                    [
-                        'class' => 'sort_arrow',
-                        'title' => '',
-                    ],
+                    ['class' => 'sort_arrow', 'title' => ''],
                 );
                 // but on mouse over, show the reverse order (ASC)
                 $orderLinkParams['onmouseover'] = "$('.sort_arrow').toggle();";
@@ -2347,10 +2323,7 @@ class Util
                     continue;
                 }
 
-                [
-                    $keyName,
-                    $value,
-                ] = $keyValueArray;
+                [$keyName, $value] = $keyValueArray;
                 $value = trim(strtolower($value));
                 if (strtolower(trim($keyName)) === 'proto' && in_array($value, ['http', 'https'])) {
                     return $value;
diff --git a/libraries/classes/Utils/Gis.php b/libraries/classes/Utils/Gis.php
index b6030bcad8..b654d7e14d 100644
--- a/libraries/classes/Utils/Gis.php
+++ b/libraries/classes/Utils/Gis.php
@@ -134,30 +134,12 @@ final class Gis
         }
 
         // Unary functions common to all geometry types
-        $funcs['Dimension'] = [
-            'params' => 1,
-            'type' => 'int',
-        ];
-        $funcs['Envelope'] = [
-            'params' => 1,
-            'type' => 'Polygon',
-        ];
-        $funcs['GeometryType'] = [
-            'params' => 1,
-            'type' => 'text',
-        ];
-        $funcs['SRID'] = [
-            'params' => 1,
-            'type' => 'int',
-        ];
-        $funcs['IsEmpty'] = [
-            'params' => 1,
-            'type' => 'int',
-        ];
-        $funcs['IsSimple'] = [
-            'params' => 1,
-            'type' => 'int',
-        ];
+        $funcs['Dimension'] = ['params' => 1, 'type' => 'int'];
+        $funcs['Envelope'] = ['params' => 1, 'type' => 'Polygon'];
+        $funcs['GeometryType'] = ['params' => 1, 'type' => 'text'];
+        $funcs['SRID'] = ['params' => 1, 'type' => 'int'];
+        $funcs['IsEmpty'] = ['params' => 1, 'type' => 'int'];
+        $funcs['IsSimple'] = ['params' => 1, 'type' => 'int'];
 
         $geomType = mb_strtolower(trim((string) $geomType));
         if ($display && $geomType !== 'geometry' && $geomType !== 'multipoint') {
@@ -173,73 +155,28 @@ final class Gis
 
         // Unary functions that are specific to each geometry type
         if ($geomType === 'point') {
-            $funcs[$spatialPrefix . 'X'] = [
-                'params' => 1,
-                'type' => 'float',
-            ];
-            $funcs[$spatialPrefix . 'Y'] = [
-                'params' => 1,
-                'type' => 'float',
-            ];
+            $funcs[$spatialPrefix . 'X'] = ['params' => 1, 'type' => 'float'];
+            $funcs[$spatialPrefix . 'Y'] = ['params' => 1, 'type' => 'float'];
         } elseif ($geomType === 'linestring') {
-            $funcs['EndPoint'] = [
-                'params' => 1,
-                'type' => 'point',
-            ];
-            $funcs['GLength'] = [
-                'params' => 1,
-                'type' => 'float',
-            ];
-            $funcs['NumPoints'] = [
-                'params' => 1,
-                'type' => 'int',
-            ];
-            $funcs['StartPoint'] = [
-                'params' => 1,
-                'type' => 'point',
-            ];
-            $funcs['IsRing'] = [
-                'params' => 1,
-                'type' => 'int',
-            ];
+            $funcs['EndPoint'] = ['params' => 1, 'type' => 'point'];
+            $funcs['GLength'] = ['params' => 1, 'type' => 'float'];
+            $funcs['NumPoints'] = ['params' => 1, 'type' => 'int'];
+            $funcs['StartPoint'] = ['params' => 1, 'type' => 'point'];
+            $funcs['IsRing'] = ['params' => 1, 'type' => 'int'];
         } elseif ($geomType === 'multilinestring') {
-            $funcs['GLength'] = [
-                'params' => 1,
-                'type' => 'float',
-            ];
-            $funcs['IsClosed'] = [
-                'params' => 1,
-                'type' => 'int',
-            ];
+            $funcs['GLength'] = ['params' => 1, 'type' => 'float'];
+            $funcs['IsClosed'] = ['params' => 1, 'type' => 'int'];
         } elseif ($geomType === 'polygon') {
-            $funcs['Area'] = [
-                'params' => 1,
-                'type' => 'float',
-            ];
-            $funcs['ExteriorRing'] = [
-                'params' => 1,
-                'type' => 'linestring',
-            ];
-            $funcs['NumInteriorRings'] = [
-                'params' => 1,
-                'type' => 'int',
-            ];
+            $funcs['Area'] = ['params' => 1, 'type' => 'float'];
+            $funcs['ExteriorRing'] = ['params' => 1, 'type' => 'linestring'];
+            $funcs['NumInteriorRings'] = ['params' => 1, 'type' => 'int'];
         } elseif ($geomType === 'multipolygon') {
-            $funcs['Area'] = [
-                'params' => 1,
-                'type' => 'float',
-            ];
-            $funcs['Centroid'] = [
-                'params' => 1,
-                'type' => 'point',
-            ];
+            $funcs['Area'] = ['params' => 1, 'type' => 'float'];
+            $funcs['Centroid'] = ['params' => 1, 'type' => 'point'];
             // Not yet implemented in MySQL
             //$funcs['PointOnSurface'] = array('params' => 1, 'type' => 'point');
         } elseif ($geomType === 'geometrycollection') {
-            $funcs['NumGeometries'] = [
-                'params' => 1,
-                'type' => 'int',
-            ];
+            $funcs['NumGeometries'] = ['params' => 1, 'type' => 'int'];
         }
 
         // If we are asked for binary functions as well
@@ -249,72 +186,27 @@ final class Gis
                 $funcs[] = ['display' => '--------'];
             }
 
-            $funcs[$spatialPrefix . 'Crosses'] = [
-                'params' => 2,
-                'type' => 'int',
-            ];
-            $funcs[$spatialPrefix . 'Contains'] = [
-                'params' => 2,
-                'type' => 'int',
-            ];
-            $funcs[$spatialPrefix . 'Disjoint'] = [
-                'params' => 2,
-                'type' => 'int',
-            ];
-            $funcs[$spatialPrefix . 'Equals'] = [
-                'params' => 2,
-                'type' => 'int',
-            ];
-            $funcs[$spatialPrefix . 'Intersects'] = [
-                'params' => 2,
-                'type' => 'int',
-            ];
-            $funcs[$spatialPrefix . 'Overlaps'] = [
-                'params' => 2,
-                'type' => 'int',
-            ];
-            $funcs[$spatialPrefix . 'Touches'] = [
-                'params' => 2,
-                'type' => 'int',
-            ];
-            $funcs[$spatialPrefix . 'Within'] = [
-                'params' => 2,
-                'type' => 'int',
-            ];
+            $funcs[$spatialPrefix . 'Crosses'] = ['params' => 2, 'type' => 'int'];
+            $funcs[$spatialPrefix . 'Contains'] = ['params' => 2, 'type' => 'int'];
+            $funcs[$spatialPrefix . 'Disjoint'] = ['params' => 2, 'type' => 'int'];
+            $funcs[$spatialPrefix . 'Equals'] = ['params' => 2, 'type' => 'int'];
+            $funcs[$spatialPrefix . 'Intersects'] = ['params' => 2, 'type' => 'int'];
+            $funcs[$spatialPrefix . 'Overlaps'] = ['params' => 2, 'type' => 'int'];
+            $funcs[$spatialPrefix . 'Touches'] = ['params' => 2, 'type' => 'int'];
+            $funcs[$spatialPrefix . 'Within'] = ['params' => 2, 'type' => 'int'];
 
             if ($display) {
                 $funcs[] = ['display' => '--------'];
             }
 
             // Minimum bounding rectangle functions
-            $funcs['MBRContains'] = [
-                'params' => 2,
-                'type' => 'int',
-            ];
-            $funcs['MBRDisjoint'] = [
-                'params' => 2,
-                'type' => 'int',
-            ];
-            $funcs['MBREquals'] = [
-                'params' => 2,
-                'type' => 'int',
-            ];
-            $funcs['MBRIntersects'] = [
-                'params' => 2,
-                'type' => 'int',
-            ];
-            $funcs['MBROverlaps'] = [
-                'params' => 2,
-                'type' => 'int',
-            ];
-            $funcs['MBRTouches'] = [
-                'params' => 2,
-                'type' => 'int',
-            ];
-            $funcs['MBRWithin'] = [
-                'params' => 2,
-                'type' => 'int',
-            ];
+            $funcs['MBRContains'] = ['params' => 2, 'type' => 'int'];
+            $funcs['MBRDisjoint'] = ['params' => 2, 'type' => 'int'];
+            $funcs['MBREquals'] = ['params' => 2, 'type' => 'int'];
+            $funcs['MBRIntersects'] = ['params' => 2, 'type' => 'int'];
+            $funcs['MBROverlaps'] = ['params' => 2, 'type' => 'int'];
+            $funcs['MBRTouches'] = ['params' => 2, 'type' => 'int'];
+            $funcs['MBRWithin'] = ['params' => 2, 'type' => 'int'];
         }
 
         return $funcs;
diff --git a/libraries/classes/Utils/HttpRequest.php b/libraries/classes/Utils/HttpRequest.php
index 4107046f6c..3379a3c211 100644
--- a/libraries/classes/Utils/HttpRequest.php
+++ b/libraries/classes/Utils/HttpRequest.php
@@ -85,10 +85,7 @@ class HttpRequest
     private function handleContext(array $context): array
     {
         if (strlen($this->proxyUrl) > 0) {
-            $context['http'] = [
-                'proxy' => $this->proxyUrl,
-                'request_fulluri' => true,
-            ];
+            $context['http'] = ['proxy' => $this->proxyUrl, 'request_fulluri' => true];
             if (strlen($this->proxyUser) > 0) {
                 $auth = base64_encode($this->proxyUser . ':' . $this->proxyPass);
                 $context['http']['header'] = 'Proxy-Authorization: Basic '
@@ -227,10 +224,7 @@ class HttpRequest
                 'user_agent' => 'phpMyAdmin',
                 'header' => 'Accept: */*',
             ],
-            'ssl' => [
-                'verify_peer' => true,
-                'verify_peer_name' => true,
-            ],
+            'ssl' => ['verify_peer' => true, 'verify_peer_name' => true],
         ];
         if ($header) {
             $context['http']['header'] .= "\n" . $header;
diff --git a/libraries/classes/VersionInformation.php b/libraries/classes/VersionInformation.php
index 85c4505279..2eafc36e94 100644
--- a/libraries/classes/VersionInformation.php
+++ b/libraries/classes/VersionInformation.php
@@ -67,10 +67,7 @@ class VersionInformation
         }
 
         if ($save) {
-            $_SESSION['cache']['version_check'] = [
-                'response' => $response,
-                'timestamp' => time(),
-            ];
+            $_SESSION['cache']['version_check'] = ['response' => $response, 'timestamp' => time()];
         }
 
         return $data;
@@ -182,10 +179,7 @@ class VersionInformation
                 continue;
             }
 
-            $latestRelease = [
-                'version' => $release->version,
-                'date' => $release->date,
-            ];
+            $latestRelease = ['version' => $release->version, 'date' => $release->date];
         }
 
         // no compatible version
@@ -204,15 +198,7 @@ class VersionInformation
     {
         $operator = null;
         $version = null;
-        $operators = [
-            '<=',
-            '>=',
-            '!=',
-            '<>',
-            '<',
-            '>',
-            '=',
-        ]; // preserve order
+        $operators = ['<=', '>=', '!=', '<>', '<', '>', '=']; // preserve order
         foreach ($operators as $oneOperator) {
             if (strpos($condition, $oneOperator) === 0) {
                 $operator = $oneOperator;
diff --git a/libraries/classes/WebAuthn/CustomServer.php b/libraries/classes/WebAuthn/CustomServer.php
index c73edf9d6a..29863fcab8 100644
--- a/libraries/classes/WebAuthn/CustomServer.php
+++ b/libraries/classes/WebAuthn/CustomServer.php
@@ -435,10 +435,7 @@ final class CustomServer implements Server
             'id' => $credential['id'],
             'rawId' => $rawId,
             'type' => 'public-key',
-            'response' => [
-                'clientDataJSON' => $clientDataJSON,
-                'attestationObject' => $attestationObject,
-            ],
+            'response' => ['clientDataJSON' => $clientDataJSON, 'attestationObject' => $attestationObject],
         ];
     }
 
diff --git a/libraries/classes/ZipExtension.php b/libraries/classes/ZipExtension.php
index d7e7cd2408..ba82ef0989 100644
--- a/libraries/classes/ZipExtension.php
+++ b/libraries/classes/ZipExtension.php
@@ -69,20 +69,14 @@ class ZipExtension
             $errorMessage = __('Error in ZIP archive:') . ' ' . $this->zip->getStatusString();
             $this->zip->close();
 
-            return [
-                'error' => $errorMessage,
-                'data' => $fileData,
-            ];
+            return ['error' => $errorMessage, 'data' => $fileData];
         }
 
         if ($this->zip->numFiles === 0) {
             $errorMessage = __('No files found inside ZIP archive!');
             $this->zip->close();
 
-            return [
-                'error' => $errorMessage,
-                'data' => $fileData,
-            ];
+            return ['error' => $errorMessage, 'data' => $fileData];
         }
 
         /* Is the the zip really an ODS file? */
@@ -96,10 +90,7 @@ class ZipExtension
             $fileData = $firstZipEntry;
             $this->zip->close();
 
-            return [
-                'error' => $errorMessage,
-                'data' => $fileData,
-            ];
+            return ['error' => $errorMessage, 'data' => $fileData];
         }
 
         /* Return the correct contents, not just the first entry */
@@ -118,10 +109,7 @@ class ZipExtension
 
         $this->zip->close();
 
-        return [
-            'error' => $errorMessage,
-            'data' => $fileData,
-        ];
+        return ['error' => $errorMessage, 'data' => $fileData];
     }
 
     /**
diff --git a/libraries/services.php b/libraries/services.php
index 9271491c16..34bd175d61 100644
--- a/libraries/services.php
+++ b/libraries/services.php
@@ -10,108 +10,49 @@ return [
     'services' => [
         'advisor' => [
             'class' => PhpMyAdmin\Advisory\Advisor::class,
-            'arguments' => [
-                '$dbi' => '@dbi',
-                '$expression' => '@expression_language',
-            ],
+            'arguments' => ['$dbi' => '@dbi', '$expression' => '@expression_language'],
         ],
         'browse_foreigners' => [
             'class' => PhpMyAdmin\BrowseForeigners::class,
             'arguments' => ['@template', '@config'],
         ],
-        'config' => [
-            'class' => PhpMyAdmin\Config::class,
-        ],
-        'central_columns' => [
-            'class' => PhpMyAdmin\Database\CentralColumns::class,
-            'arguments' => ['@dbi'],
-        ],
-        'check_user_privileges' => [
-            'class' => PhpMyAdmin\CheckUserPrivileges::class,
-            'arguments' => ['@dbi'],
-        ],
-        'create_add_field' => [
-            'class' => PhpMyAdmin\CreateAddField::class,
-            'arguments' => ['@dbi'],
-        ],
+        'config' => ['class' => PhpMyAdmin\Config::class],
+        'central_columns' => ['class' => PhpMyAdmin\Database\CentralColumns::class, 'arguments' => ['@dbi']],
+        'check_user_privileges' => ['class' => PhpMyAdmin\CheckUserPrivileges::class, 'arguments' => ['@dbi']],
+        'create_add_field' => ['class' => PhpMyAdmin\CreateAddField::class, 'arguments' => ['@dbi']],
         'designer' => [
             'class' => PhpMyAdmin\Database\Designer::class,
-            'arguments' => [
-                '$dbi' => '@dbi',
-                '$relation' => '@relation',
-                '$template' => '@template',
-            ],
+            'arguments' => ['$dbi' => '@dbi', '$relation' => '@relation', '$template' => '@template'],
         ],
         'designer_common' => [
             'class' => PhpMyAdmin\Database\Designer\Common::class,
-            'arguments' => [
-                '$dbi' => '@dbi',
-                '$relation' => '@relation',
-            ],
-        ],
-        'error_handler' => [
-            'class' => PhpMyAdmin\ErrorHandler::class,
+            'arguments' => ['$dbi' => '@dbi', '$relation' => '@relation'],
         ],
+        'error_handler' => ['class' => PhpMyAdmin\ErrorHandler::class],
         'error_report' => [
             'class' => PhpMyAdmin\ErrorReport::class,
-            'arguments' => [
-                '@http_request',
-                '@relation',
-                '@template',
-                '@config',
-            ],
-        ],
-        'events' => [
-            'class' => PhpMyAdmin\Database\Events::class,
-            'arguments' => [
-                '@dbi',
-                '@template',
-                '@response',
-            ],
-        ],
-        'export' => [
-            'class' => PhpMyAdmin\Export::class,
-            'arguments' => ['@dbi'],
+            'arguments' => ['@http_request', '@relation', '@template', '@config'],
         ],
+        'events' => ['class' => PhpMyAdmin\Database\Events::class, 'arguments' => ['@dbi','@template','@response']],
+        'export' => ['class' => PhpMyAdmin\Export::class, 'arguments' => ['@dbi']],
         'export_options' => [
             'class' => PhpMyAdmin\Export\Options::class,
-            'arguments' => [
-                '@relation',
-                '@export_template_model',
-            ],
-        ],
-        'export_template_model' => [
-            'class' => PhpMyAdmin\Export\TemplateModel::class,
-            'arguments' => ['@dbi'],
-        ],
-        'expression_language' => [
-            'class' => Symfony\Component\ExpressionLanguage\ExpressionLanguage::class,
+            'arguments' => ['@relation', '@export_template_model'],
         ],
+        'export_template_model' => ['class' => PhpMyAdmin\Export\TemplateModel::class, 'arguments' => ['@dbi']],
+        'expression_language' => ['class' => Symfony\Component\ExpressionLanguage\ExpressionLanguage::class],
         'file_listing' => ['class' => PhpMyAdmin\FileListing::class],
-        'flash' => [
-            'class' => PhpMyAdmin\FlashMessages::class,
-        ],
-        'http_request' => [
-            'class' => PhpMyAdmin\Utils\HttpRequest::class,
-        ],
-        'import' => [
-            'class' => PhpMyAdmin\Import::class,
-        ],
-        'import_simulate_dml' => [
-            'class' => PhpMyAdmin\Import\SimulateDml::class,
-            'arguments' => ['@dbi'],
-        ],
+        'flash' => ['class' => PhpMyAdmin\FlashMessages::class],
+        'http_request' => ['class' => PhpMyAdmin\Utils\HttpRequest::class],
+        'import' => ['class' => PhpMyAdmin\Import::class],
+        'import_simulate_dml' => ['class' => PhpMyAdmin\Import\SimulateDml::class, 'arguments' => ['@dbi']],
         'insert_edit' => [
             'class' => PhpMyAdmin\InsertEdit::class,
             'arguments' => ['@dbi', '@relation', '@transformations', '@file_listing', '@template'],
         ],
         'navigation' => [
             'class' => PhpMyAdmin\Navigation\Navigation::class,
-            'arguments' => [
-                '@template',
-                '@relation',
-                '@dbi',
-            ],
+            'arguments' => ['@template', '@relation', '@dbi'],
         ],
         'normalization' => [
             'class' => PhpMyAdmin\Normalization::class,
@@ -124,39 +65,19 @@ return [
         ],
         'operations' => [
             'class' => PhpMyAdmin\Operations::class,
-            'arguments' => [
-                '$dbi' => '@dbi',
-                '$relation' => '@relation',
-            ],
+            'arguments' => ['$dbi' => '@dbi', '$relation' => '@relation'],
         ],
         'partitioning_maintenance' => [
             'class' => PhpMyAdmin\Partitioning\Maintenance::class,
             'arguments' => ['$dbi' => '@dbi'],
         ],
-        AuthenticationPluginFactory::class => [
-            'class' => AuthenticationPluginFactory::class,
-        ],
-        'relation' => [
-            'class' => Relation::class,
-            'arguments' => ['$dbi' => '@dbi'],
-        ],
-        'relation_cleanup' => [
-            'class' => RelationCleanup::class,
-            'arguments' => [
-                '@dbi',
-                '@relation',
-            ],
-        ],
-        'replication' => [
-            'class' => PhpMyAdmin\Replication\Replication::class,
-            'arguments' => ['$dbi' => '@dbi'],
-        ],
+        AuthenticationPluginFactory::class => ['class' => AuthenticationPluginFactory::class],
+        'relation' => ['class' => Relation::class, 'arguments' => ['$dbi' => '@dbi']],
+        'relation_cleanup' => ['class' => RelationCleanup::class, 'arguments' => ['@dbi', '@relation']],
+        'replication' => ['class' => PhpMyAdmin\Replication\Replication::class, 'arguments' => ['$dbi' => '@dbi']],
         'replication_gui' => [
             'class' => PhpMyAdmin\Replication\ReplicationGui::class,
-            'arguments' => [
-                '$replication' => '@replication',
-                '$template' => '@template',
-            ],
+            'arguments' => ['$replication' => '@replication', '$template' => '@template'],
         ],
         'response' => [
             'class' => PhpMyAdmin\ResponseRenderer::class,
@@ -164,25 +85,12 @@ return [
         ],
         'routines' => [
             'class' => PhpMyAdmin\Database\Routines::class,
-            'arguments' => [
-                '@dbi',
-                '@template',
-                '@response',
-            ],
-        ],
-        'server_plugins' => [
-            'class' => PhpMyAdmin\Server\Plugins::class,
-            'arguments' => ['@dbi'],
+            'arguments' => ['@dbi', '@template', '@response'],
         ],
+        'server_plugins' => ['class' => PhpMyAdmin\Server\Plugins::class, 'arguments' => ['@dbi']],
         'server_privileges' => [
             'class' => PhpMyAdmin\Server\Privileges::class,
-            'arguments' => [
-                '@template',
-                '@dbi',
-                '@relation',
-                '@relation_cleanup',
-                '@server_plugins',
-            ],
+            'arguments' => ['@template', '@dbi', '@relation', '@relation_cleanup', '@server_plugins'],
         ],
         'server_privileges_account_locking' => [
             'class' => PhpMyAdmin\Server\Privileges\AccountLocking::class,
@@ -190,31 +98,15 @@ return [
         ],
         'sql' => [
             'class' => PhpMyAdmin\Sql::class,
-            'arguments' => [
-                '@dbi',
-                '@relation',
-                '@relation_cleanup',
-                '@operations',
-                '@transformations',
-                '@template',
-            ],
+            'arguments' => ['@dbi', '@relation', '@relation_cleanup', '@operations', '@transformations', '@template'],
         ],
         'sql_query_form' => [
             'class' => PhpMyAdmin\SqlQueryForm::class,
             'arguments' => ['$template' => '@template', '$dbi' => '@dbi'],
         ],
-        'status_data' => [
-            'class' => PhpMyAdmin\Server\Status\Data::class,
-            'arguments' => ['@dbi', '@config'],
-        ],
-        'status_monitor' => [
-            'class' => PhpMyAdmin\Server\Status\Monitor::class,
-            'arguments' => ['@dbi'],
-        ],
-        'status_processes' => [
-            'class' => PhpMyAdmin\Server\Status\Processes::class,
-            'arguments' => ['@dbi'],
-        ],
+        'status_data' => ['class' => PhpMyAdmin\Server\Status\Data::class, 'arguments' => ['@dbi','@config']],
+        'status_monitor' => ['class' => PhpMyAdmin\Server\Status\Monitor::class, 'arguments' => ['@dbi']],
+        'status_processes' => ['class' => PhpMyAdmin\Server\Status\Processes::class, 'arguments' => ['@dbi']],
         'table_columns_definition' => [
             'class' => PhpMyAdmin\Table\ColumnsDefinition::class,
             'arguments' => ['$dbi' => '@dbi', '$relation' => '@relation', '$transformations' => '@transformations'],
@@ -223,18 +115,9 @@ return [
             'class' => PhpMyAdmin\Table\Indexes::class,
             'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
-        'table_maintenance' => [
-            'class' => PhpMyAdmin\Table\Maintenance::class,
-            'arguments' => ['$dbi' => '@dbi'],
-        ],
-        'table_search' => [
-            'class' => PhpMyAdmin\Table\Search::class,
-            'arguments' => ['$dbi' => '@dbi'],
-        ],
-        'template' => [
-            'class' => PhpMyAdmin\Template::class,
-            'arguments' => ['$config' => '@config'],
-        ],
+        'table_maintenance' => ['class' => PhpMyAdmin\Table\Maintenance::class, 'arguments' => ['$dbi' => '@dbi']],
+        'table_search' => ['class' => PhpMyAdmin\Table\Search::class, 'arguments' => ['$dbi' => '@dbi']],
+        'template' => ['class' => PhpMyAdmin\Template::class, 'arguments' => ['$config' => '@config']],
         'tracking' => [
             'class' => PhpMyAdmin\Tracking\Tracking::class,
             'arguments' => [
@@ -247,37 +130,19 @@ return [
         ],
         'tracking_checker' => [
             'class' => PhpMyAdmin\Tracking\TrackingChecker::class,
-            'arguments' => [
-                '$dbi' => '@dbi',
-                '$relation' => '@relation',
-            ],
-        ],
-        'transformations' => [
-            'class' => PhpMyAdmin\Transformations::class,
+            'arguments' => ['$dbi' => '@dbi', '$relation' => '@relation'],
         ],
+        'transformations' => ['class' => PhpMyAdmin\Transformations::class],
         'triggers' => [
             'class' => PhpMyAdmin\Database\Triggers::class,
-            'arguments' => [
-                '@dbi',
-                '@template',
-                '@response',
-            ],
+            'arguments' => ['@dbi', '@template', '@response'],
         ],
         'user_password' => [
             'class' => PhpMyAdmin\UserPassword::class,
-            'arguments' => [
-                '@server_privileges',
-                '@' . AuthenticationPluginFactory::class,
-                '@dbi',
-            ],
-        ],
-        'user_preferences' => [
-            'class' => PhpMyAdmin\UserPreferences::class,
-            'arguments' => ['@dbi'],
-        ],
-        'version_information' => [
-            'class' => PhpMyAdmin\VersionInformation::class,
+            'arguments' => ['@server_privileges', '@' . AuthenticationPluginFactory::class, '@dbi'],
         ],
+        'user_preferences' => ['class' => PhpMyAdmin\UserPreferences::class, 'arguments' => ['@dbi']],
+        'version_information' => ['class' => PhpMyAdmin\VersionInformation::class],
         PhpMyAdmin\DatabaseInterface::class => 'dbi',
         PhpMyAdmin\FlashMessages::class => 'flash',
         PhpMyAdmin\ResponseRenderer::class => 'response',
diff --git a/libraries/services_controllers.php b/libraries/services_controllers.php
index d241e04f89..f08bdf58c5 100644
--- a/libraries/services_controllers.php
+++ b/libraries/services_controllers.php
@@ -52,50 +52,27 @@ return [
         ],
         ChangeLogController::class => [
             'class' => ChangeLogController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template'],
         ],
         CheckRelationsController::class => [
             'class' => CheckRelationsController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$relation' => '@relation',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$relation' => '@relation'],
         ],
         CollationConnectionController::class => [
             'class' => CollationConnectionController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$config' => '@config',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$config' => '@config'],
         ],
         ColumnController::class => [
             'class' => ColumnController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Config\GetConfigController::class => [
             'class' => Config\GetConfigController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$config' => '@config',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$config' => '@config'],
         ],
         Config\SetConfigController::class => [
             'class' => Config\SetConfigController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$config' => '@config',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$config' => '@config'],
         ],
         Console\Bookmark\AddController::class => [
             'class' => Console\Bookmark\AddController::class,
@@ -160,34 +137,19 @@ return [
         ],
         Database\ImportController::class => [
             'class' => Database\ImportController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Database\MultiTableQuery\QueryController::class => [
             'class' => Database\MultiTableQuery\QueryController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template'],
         ],
         Database\MultiTableQuery\TablesController::class => [
             'class' => Database\MultiTableQuery\TablesController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Database\MultiTableQueryController::class => [
             'class' => Database\MultiTableQueryController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Database\Operations\CollationController::class => [
             'class' => Database\Operations\CollationController::class,
@@ -240,19 +202,11 @@ return [
         ],
         Database\SearchController::class => [
             'class' => Database\SearchController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Database\SqlAutoCompleteController::class => [
             'class' => Database\SqlAutoCompleteController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Database\SqlController::class => [
             'class' => Database\SqlController::class,
@@ -264,17 +218,11 @@ return [
         ],
         Database\SqlFormatController::class => [
             'class' => Database\SqlFormatController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template'],
         ],
         Database\Structure\AddPrefixController::class => [
             'class' => Database\Structure\AddPrefixController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template'],
         ],
         Database\Structure\AddPrefixTableController::class => [
             'class' => Database\Structure\AddPrefixTableController::class,
@@ -314,17 +262,11 @@ return [
         ],
         Database\Structure\ChangePrefixFormController::class => [
             'class' => Database\Structure\ChangePrefixFormController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template'],
         ],
         Database\Structure\CopyFormController::class => [
             'class' => Database\Structure\CopyFormController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template'],
         ],
         Database\Structure\CopyTableController::class => [
             'class' => Database\Structure\CopyTableController::class,
@@ -345,11 +287,7 @@ return [
         ],
         Database\Structure\DropFormController::class => [
             'class' => Database\Structure\DropFormController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Database\Structure\DropTableController::class => [
             'class' => Database\Structure\DropTableController::class,
@@ -363,10 +301,7 @@ return [
         ],
         Database\Structure\EmptyFormController::class => [
             'class' => Database\Structure\EmptyFormController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template'],
         ],
         Database\Structure\EmptyTableController::class => [
             'class' => Database\Structure\EmptyTableController::class,
@@ -383,19 +318,11 @@ return [
         ],
         Database\Structure\FavoriteTableController::class => [
             'class' => Database\Structure\FavoriteTableController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$relation' => '@relation',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$relation' => '@relation'],
         ],
         Database\Structure\RealRowCountController::class => [
             'class' => Database\Structure\RealRowCountController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Database\Structure\ReplacePrefixController::class => [
             'class' => Database\Structure\ReplacePrefixController::class,
@@ -408,11 +335,7 @@ return [
         ],
         Database\Structure\ShowCreateController::class => [
             'class' => Database\Structure\ShowCreateController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Database\StructureController::class => [
             'class' => Database\StructureController::class,
@@ -445,10 +368,7 @@ return [
         ],
         DatabaseController::class => [
             'class' => DatabaseController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template'],
         ],
         ErrorReportController::class => [
             'class' => ErrorReportController::class,
@@ -462,18 +382,11 @@ return [
         ],
         Export\CheckTimeOutController::class => [
             'class' => Export\CheckTimeOutController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template'],
         ],
         Export\ExportController::class => [
             'class' => Export\ExportController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$export' => '@export',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$export' => '@export'],
         ],
         Export\TablesController::class => [
             'class' => Export\TablesController::class,
@@ -521,18 +434,11 @@ return [
         ],
         GisDataEditorController::class => [
             'class' => GisDataEditorController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template'],
         ],
         GitInfoController::class => [
             'class' => GitInfoController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$config' => '@config',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$config' => '@config'],
         ],
         HomeController::class => [
             'class' => HomeController::class,
@@ -566,22 +472,14 @@ return [
             'class' => Import\StatusController::class,
             'arguments' => ['$template' => '@template'],
         ],
-        JavaScriptMessagesController::class => [
-            'class' => JavaScriptMessagesController::class,
-        ],
+        JavaScriptMessagesController::class => ['class' => JavaScriptMessagesController::class],
         LicenseController::class => [
             'class' => LicenseController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template'],
         ],
         LintController::class => [
             'class' => LintController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template'],
         ],
         LogoutController::class => [
             'class' => LogoutController::class,
@@ -722,17 +620,11 @@ return [
         ],
         PhpInfoController::class => [
             'class' => PhpInfoController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template'],
         ],
         RecentTablesListController::class => [
             'class' => RecentTablesListController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template'],
         ],
         Preferences\ExportController::class => [
             'class' => Preferences\ExportController::class,
@@ -806,11 +698,7 @@ return [
         ],
         Preferences\TwoFactorController::class => [
             'class' => Preferences\TwoFactorController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$relation' => '@relation',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$relation' => '@relation'],
         ],
         SchemaExportController::class => [
             'class' => SchemaExportController::class,
@@ -818,27 +706,15 @@ return [
         ],
         Server\BinlogController::class => [
             'class' => Server\BinlogController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Server\CollationsController::class => [
             'class' => Server\CollationsController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Server\Databases\CreateController::class => [
             'class' => Server\Databases\CreateController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Server\Databases\DestroyController::class => [
             'class' => Server\Databases\DestroyController::class,
@@ -852,19 +728,11 @@ return [
         ],
         Server\DatabasesController::class => [
             'class' => Server\DatabasesController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Server\EnginesController::class => [
             'class' => Server\EnginesController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Server\ExportController::class => [
             'class' => Server\ExportController::class,
@@ -877,11 +745,7 @@ return [
         ],
         Server\ImportController::class => [
             'class' => Server\ImportController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Server\PluginsController::class => [
             'class' => Server\PluginsController::class,
@@ -928,11 +792,7 @@ return [
         ],
         Server\ShowEngineController::class => [
             'class' => Server\ShowEngineController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Server\SqlController::class => [
             'class' => Server\SqlController::class,
@@ -1087,27 +947,15 @@ return [
         ],
         Server\Variables\GetVariableController::class => [
             'class' => Server\Variables\GetVariableController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Server\Variables\SetVariableController::class => [
             'class' => Server\Variables\SetVariableController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Server\VariablesController::class => [
             'class' => Server\VariablesController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Sql\ColumnPreferencesController::class => [
             'class' => Sql\ColumnPreferencesController::class,
@@ -1193,11 +1041,7 @@ return [
         ],
         Table\ChartController::class => [
             'class' => Table\ChartController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Table\CreateController::class => [
             'class' => Table\CreateController::class,
@@ -1212,25 +1056,15 @@ return [
         ],
         Table\DeleteConfirmController::class => [
             'class' => Table\DeleteConfirmController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template'],
         ],
         Table\DeleteRowsController::class => [
             'class' => Table\DeleteRowsController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Table\DropColumnConfirmationController::class => [
             'class' => Table\DropColumnConfirmationController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template'],
         ],
         Table\DropColumnController::class => [
             'class' => Table\DropColumnController::class,
@@ -1244,11 +1078,7 @@ return [
         ],
         Table\ExportController::class => [
             'class' => Table\ExportController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$export' => '@export_options',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$export' => '@export_options'],
         ],
         Table\ExportRowsController::class => [
             'class' => Table\ExportRowsController::class,
@@ -1260,35 +1090,19 @@ return [
         ],
         Table\FindReplaceController::class => [
             'class' => Table\FindReplaceController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Table\GetFieldController::class => [
             'class' => Table\GetFieldController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Table\GisVisualizationController::class => [
             'class' => Table\GisVisualizationController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Table\ImportController::class => [
             'class' => Table\ImportController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Table\IndexesController::class => [
             'class' => Table\IndexesController::class,
@@ -1431,10 +1245,7 @@ return [
         ],
         Table\RecentFavoriteController::class => [
             'class' => Table\RecentFavoriteController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template'],
         ],
         Table\RelationController::class => [
             'class' => Table\RelationController::class,
@@ -1494,11 +1305,7 @@ return [
         ],
         Table\Structure\BrowseController::class => [
             'class' => Table\Structure\BrowseController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$sql' => '@sql',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$sql' => '@sql'],
         ],
         Table\Structure\CentralColumnsAddController::class => [
             'class' => Table\Structure\CentralColumnsAddController::class,
@@ -1538,11 +1345,7 @@ return [
         ],
         Table\Structure\MoveColumnsController::class => [
             'class' => Table\Structure\MoveColumnsController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         Table\Structure\PartitioningController::class => [
             'class' => Table\Structure\PartitioningController::class,
@@ -1565,10 +1368,7 @@ return [
         ],
         Table\Structure\ReservedWordCheckController::class => [
             'class' => Table\Structure\ReservedWordCheckController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template'],
         ],
         Table\Structure\SaveController::class => [
             'class' => Table\Structure\SaveController::class,
@@ -1639,11 +1439,7 @@ return [
         ],
         TableController::class => [
             'class' => TableController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         ThemesController::class => [
             'class' => ThemesController::class,
@@ -1699,11 +1495,7 @@ return [
         ],
         View\CreateController::class => [
             'class' => View\CreateController::class,
-            'arguments' => [
-                '$response' => '@response',
-                '$template' => '@template',
-                '$dbi' => '@dbi',
-            ],
+            'arguments' => ['$response' => '@response', '$template' => '@template', '$dbi' => '@dbi'],
         ],
         View\OperationsController::class => [
             'class' => View\OperationsController::class,
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 79ab41e36d..6f4d6ca806 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -4776,14 +4776,7 @@
       <code>escapeString</code>
     </DeprecatedMethod>
     <LessSpecificReturnStatement>
-      <code>[
-            $fieldCount,
-            $fieldPrimary,
-            $fieldIndex,
-            $fieldUnique,
-            $fieldFullText,
-            $fieldSpatial,
-        ]</code>
+      <code>[$fieldCount, $fieldPrimary, $fieldIndex, $fieldUnique, $fieldFullText, $fieldSpatial]</code>
     </LessSpecificReturnStatement>
     <MixedArgument>
       <code><![CDATA[$_POST['field_name'][$column['col_index']]]]></code>
@@ -6307,12 +6300,7 @@
       <code>$delUrlParams</code>
     </InvalidArrayOffset>
     <InvalidReturnStatement>
-      <code>[
-            $deleteUrl,
-            $deleteString,
-            $jsConf,
-            $urlParams,
-        ]</code>
+      <code>[$deleteUrl, $deleteString, $jsConf, $urlParams]</code>
     </InvalidReturnStatement>
     <InvalidReturnType>
       <code>array{?string, ?string, ?string}</code>
@@ -6583,11 +6571,7 @@
     </MixedPropertyFetch>
     <MixedReturnTypeCoercion>
       <code>$map</code>
-      <code><![CDATA[[
-            $singleSortOrder,
-            implode(', ', $sortOrderColumns),
-            $orderImg ?? '',
-        ]]]></code>
+      <code><![CDATA[[$singleSortOrder, implode(', ', $sortOrderColumns), $orderImg ?? '']]]></code>
       <code><![CDATA[array<string, string[]>]]></code>
       <code>string[]</code>
     </MixedReturnTypeCoercion>
@@ -8708,17 +8692,13 @@
   </file>
   <file src="libraries/classes/Normalization.php">
     <InvalidReturnStatement>
-      <code><![CDATA[[
-                'legendText' => __('End of step'),
-                'headText' => $headText,
-                'queryError' => false,
-            ]]]></code>
       <code><![CDATA[[
             'legendText' => __('End of step'),
             'headText' => $headText,
             'queryError' => $error,
             'extra' => $message,
         ]]]></code>
+      <code><![CDATA[['legendText' => __('End of step'), 'headText' => $headText, 'queryError' => false]]]></code>
     </InvalidReturnStatement>
     <InvalidReturnType>
       <code>array{legendText: string, headText: string, queryError: bool, extra: Message}</code>
@@ -14746,10 +14726,7 @@
                 $this->centralColumns,
                 CentralColumns::class,
                 'getHtmlForEditTableRow',
-                [
-                    $listDetailCols[0],
-                    0,
-                ],
+                [$listDetailCols[0], 0],
             )]]></code>
     </MixedArgument>
     <MixedArrayAccess>
@@ -14910,15 +14887,7 @@
                 $this->object,
                 DisplayResults::class,
                 'handleNonPrintableContents',
-                [
-                    $category,
-                    $content,
-                    $transformationPlugin,
-                    $transformOptions,
-                    $meta,
-                    $urlParams,
-                    &$isTruncated,
-                ],
+                [$category, $content, $transformationPlugin, $transformOptions, $meta, $urlParams, &$isTruncated],
             )]]></code>
     </MixedArgument>
     <MixedArrayAccess>
@@ -15157,22 +15126,10 @@
   <file src="test/classes/Http/Factory/ServerRequestFactoryTest.php">
     <InvalidConstantAssignmentValue>
       <code><![CDATA[IMPLEMENTATION_CLASSES = [
-        'slim/psr7' => [
-            SlimServerRequestFactory::class,
-            'Slim PSR-7',
-        ],
-        'guzzlehttp/psr7' => [
-            GuzzleHttpFactory::class,
-            'Guzzle PSR-7',
-        ],
-        'nyholm/psr7' => [
-            NyholmPsr17Factory::class,
-            'Nyholm PSR-7',
-        ],
-        'laminas/laminas-diactoros' => [
-            LaminasServerRequestFactory::class,
-            'Laminas diactoros PSR-7',
-        ],
+        'slim/psr7' => [SlimServerRequestFactory::class, 'Slim PSR-7'],
+        'guzzlehttp/psr7' => [GuzzleHttpFactory::class, 'Guzzle PSR-7'],
+        'nyholm/psr7' => [NyholmPsr17Factory::class, 'Nyholm PSR-7'],
+        'laminas/laminas-diactoros' => [LaminasServerRequestFactory::class, 'Laminas diactoros PSR-7'],
     ]]]></code>
     </InvalidConstantAssignmentValue>
     <MixedInferredReturnType>
diff --git a/test/classes/Advisory/AdvisorTest.php b/test/classes/Advisory/AdvisorTest.php
index 7dbcdc915f..fed94a9382 100644
--- a/test/classes/Advisory/AdvisorTest.php
+++ b/test/classes/Advisory/AdvisorTest.php
@@ -38,26 +38,11 @@ class AdvisorTest extends AbstractTestCase
     public static function advisorTimes(): array
     {
         return [
-            [
-                10,
-                '10 per second',
-            ],
-            [
-                0.02,
-                '1.2 per minute',
-            ],
-            [
-                0.003,
-                '10.8 per hour',
-            ],
-            [
-                0.00003,
-                '2.59 per day',
-            ],
-            [
-                0.0000000003,
-                '<0.01 per day',
-            ],
+            [10, '10 per second'],
+            [0.02, '1.2 per minute'],
+            [0.003, '10.8 per hour'],
+            [0.00003, '2.59 per day'],
+            [0.0000000003, '<0.01 per day'],
         ];
     }
 
diff --git a/test/classes/BrowseForeignersTest.php b/test/classes/BrowseForeignersTest.php
index cead575efc..a56f0745ae 100644
--- a/test/classes/BrowseForeignersTest.php
+++ b/test/classes/BrowseForeignersTest.php
@@ -118,10 +118,7 @@ class BrowseForeignersTest extends AbstractTestCase
         $desc = 'foobar<baz';
 
         $this->assertEquals(
-            [
-                'foobar<baz',
-                '',
-            ],
+            ['foobar<baz', ''],
             $this->callFunction(
                 $this->browseForeigners,
                 BrowseForeigners::class,
@@ -135,10 +132,7 @@ class BrowseForeignersTest extends AbstractTestCase
         $browseForeigners = new BrowseForeigners(new Template(), $config);
 
         $this->assertEquals(
-            [
-                'fooba...',
-                'foobar<baz',
-            ],
+            ['fooba...', 'foobar<baz'],
             $this->callFunction(
                 $browseForeigners,
                 BrowseForeigners::class,
diff --git a/test/classes/CacheTest.php b/test/classes/CacheTest.php
index 9e4b6c17c2..4b6d464446 100644
--- a/test/classes/CacheTest.php
+++ b/test/classes/CacheTest.php
@@ -19,18 +19,9 @@ class CacheTest extends AbstractTestCase
     public static function dataProviderCacheKeyValues(): array
     {
         return [
-            'normal key and false value' => [
-                'mykey',
-                false,
-            ],
-            'normal key and null value' => [
-                'mykey',
-                null,
-            ],
-            'normal key and object value' => [
-                'mykey',
-                new stdClass(),
-            ],
+            'normal key and false value' => ['mykey', false],
+            'normal key and null value' => ['mykey', null],
+            'normal key and object value' => ['mykey', new stdClass()],
         ];
     }
 
diff --git a/test/classes/Charsets/CollationTest.php b/test/classes/Charsets/CollationTest.php
index 3a0c06f54c..1b36129296 100644
--- a/test/classes/Charsets/CollationTest.php
+++ b/test/classes/Charsets/CollationTest.php
@@ -53,394 +53,106 @@ class CollationTest extends AbstractTestCase
     public static function providerTestBuildDescription(): array
     {
         return [
-            [
-                'binary',
-                'Binary',
-            ],
-            [
-                'foo_bulgarian_bar',
-                'Bulgarian',
-            ],
-            [
-                'gb2312_chinese',
-                'Simplified Chinese',
-            ],
-            [
-                'gbk_chinese',
-                'Simplified Chinese',
-            ],
-            [
-                'big5_chinese_ci',
-                'Traditional Chinese, case-insensitive',
-            ],
-            [
-                'big5_chinese',
-                'Traditional Chinese',
-            ],
-            [
-                'foo_ci_bar',
-                'Unknown, case-insensitive',
-            ],
-            [
-                'foo_croatian_bar',
-                'Croatian',
-            ],
-            [
-                'foo_czech_bar',
-                'Czech',
-            ],
-            [
-                'foo_danish_bar',
-                'Danish',
-            ],
-            [
-                'foo_english_bar',
-                'English',
-            ],
-            [
-                'foo_esperanto_bar',
-                'Esperanto',
-            ],
-            [
-                'foo_estonian_bar',
-                'Estonian',
-            ],
-            [
-                'foo_german1_bar',
-                'German (dictionary order)',
-            ],
-            [
-                'foo_german2_bar',
-                'German (phone book order)',
-            ],
-            [
-                'foo_hungarian_bar',
-                'Hungarian',
-            ],
-            [
-                'foo_icelandic_bar',
-                'Icelandic',
-            ],
-            [
-                'foo_japanese_bar',
-                'Japanese',
-            ],
-            [
-                'foo_latvian_bar',
-                'Latvian',
-            ],
-            [
-                'foo_lithuanian_bar',
-                'Lithuanian',
-            ],
-            [
-                'foo_korean_bar',
-                'Korean',
-            ],
-            [
-                'foo_persian_bar',
-                'Persian',
-            ],
-            [
-                'foo_polish_bar',
-                'Polish',
-            ],
-            [
-                'foo_roman_bar',
-                'West European',
-            ],
-            [
-                'foo_romanian_bar',
-                'Romanian',
-            ],
-            [
-                'foo_slovak_bar',
-                'Slovak',
-            ],
-            [
-                'foo_slovenian_bar',
-                'Slovenian',
-            ],
-            [
-                'foo_spanish_bar',
-                'Spanish (modern)',
-            ],
-            [
-                'foo_spanish2_bar',
-                'Spanish (traditional)',
-            ],
-            [
-                'foo_swedish_bar',
-                'Swedish',
-            ],
-            [
-                'foo_thai_bar',
-                'Thai',
-            ],
-            [
-                'foo_turkish_bar',
-                'Turkish',
-            ],
-            [
-                'foo_ukrainian_bar',
-                'Ukrainian',
-            ],
-            [
-                'foo_unicode_bar',
-                'Unicode',
-            ],
-            [
-                'ucs2',
-                'Unicode',
-            ],
-            [
-                'utf8',
-                'Unicode',
-            ],
-            [
-                'ascii',
-                'West European',
-            ],
-            [
-                'cp850',
-                'West European',
-            ],
-            [
-                'dec8',
-                'West European',
-            ],
-            [
-                'hp8',
-                'West European',
-            ],
-            [
-                'latin1',
-                'West European',
-            ],
-            [
-                'cp1250',
-                'Central European',
-            ],
-            [
-                'cp852',
-                'Central European',
-            ],
-            [
-                'latin2',
-                'Central European',
-            ],
-            [
-                'macce',
-                'Central European',
-            ],
-            [
-                'cp866',
-                'Russian',
-            ],
-            [
-                'koi8r',
-                'Russian',
-            ],
-            [
-                'gb2312',
-                'Simplified Chinese',
-            ],
-            [
-                'gbk',
-                'Simplified Chinese',
-            ],
-            [
-                'sjis',
-                'Japanese',
-            ],
-            [
-                'ujis',
-                'Japanese',
-            ],
-            [
-                'cp932',
-                'Japanese',
-            ],
-            [
-                'eucjpms',
-                'Japanese',
-            ],
-            [
-                'cp1257',
-                'Baltic',
-            ],
-            [
-                'latin7',
-                'Baltic',
-            ],
-            [
-                'armscii8',
-                'Armenian',
-            ],
-            [
-                'armscii',
-                'Armenian',
-            ],
-            [
-                'big5',
-                'Traditional Chinese',
-            ],
-            [
-                'cp1251',
-                'Cyrillic',
-            ],
-            [
-                'cp1256',
-                'Arabic',
-            ],
-            [
-                'euckr',
-                'Korean',
-            ],
-            [
-                'hebrew',
-                'Hebrew',
-            ],
-            [
-                'geostd8',
-                'Georgian',
-            ],
-            [
-                'greek',
-                'Greek',
-            ],
-            [
-                'keybcs2',
-                'Czech-Slovak',
-            ],
-            [
-                'koi8u',
-                'Ukrainian',
-            ],
-            [
-                'latin5',
-                'Turkish',
-            ],
-            [
-                'swe7',
-                'Swedish',
-            ],
-            [
-                'tis620',
-                'Thai',
-            ],
-            [
-                'foobar',
-                'Unknown',
-            ],
-            [
-                'foo_test_bar',
-                'Unknown',
-            ],
-            [
-                'foo_bin_bar',
-                'Unknown, binary',
-            ],
-            [
-                'utf8mb4_0900_ai_ci',
-                'Unicode (UCA 9.0.0), accent-insensitive, case-insensitive',
-            ],
-            [
-                'utf8mb4_unicode_520_ci',
-                'Unicode (UCA 5.2.0), case-insensitive',
-            ],
-            [
-                'utf8mb4_unicode_ci',
-                'Unicode (UCA 4.0.0), case-insensitive',
-            ],
-            [
-                'utf8mb4_tr_0900_ai_ci',
-                'Turkish (UCA 9.0.0), accent-insensitive, case-insensitive',
-            ],
-            [
-                'utf8mb4_turkish_ci',
-                'Turkish (UCA 4.0.0), case-insensitive',
-            ],
-            [
-                'utf32_thai_520_w2',
-                'Thai (UCA 5.2.0), multi-level',
-            ],
-            [
-                'utf8mb4_czech_ci',
-                'Czech (UCA 4.0.0), case-insensitive',
-            ],
-            [
-                'cp1250_czech_cs',
-                'Czech, case-sensitive',
-            ],
-            [
-                'latin1_general_ci',
-                'West European, case-insensitive',
-            ],
-            [
-                'utf8mb4_bin',
-                'Unicode (UCA 4.0.0), binary',
-            ],
-            [
-                'utf8mb4_croatian_mysql561_ci',
-                'Croatian (MySQL 5.6.1), case-insensitive',
-            ],
-            [
-                'ucs2_general_mysql500_ci',
-                'Unicode (MySQL 5.0.0), case-insensitive',
-            ],
-            [
-                'utf32_general_ci',
-                'Unicode, case-insensitive',
-            ],
-            [
-                'utf8mb4_es_trad_0900_ai_ci',
-                'Spanish (traditional) (UCA 9.0.0), accent-insensitive, case-insensitive',
-            ],
-            [
-                'utf8mb4_es_0900_ai_ci',
-                'Spanish (modern) (UCA 9.0.0), accent-insensitive, case-insensitive',
-            ],
+            ['binary', 'Binary'],
+            ['foo_bulgarian_bar', 'Bulgarian'],
+            ['gb2312_chinese', 'Simplified Chinese'],
+            ['gbk_chinese', 'Simplified Chinese'],
+            ['big5_chinese_ci', 'Traditional Chinese, case-insensitive'],
+            ['big5_chinese', 'Traditional Chinese'],
+            ['foo_ci_bar', 'Unknown, case-insensitive'],
+            ['foo_croatian_bar', 'Croatian'],
+            ['foo_czech_bar', 'Czech'],
+            ['foo_danish_bar', 'Danish'],
+            ['foo_english_bar', 'English'],
+            ['foo_esperanto_bar', 'Esperanto'],
+            ['foo_estonian_bar', 'Estonian'],
+            ['foo_german1_bar', 'German (dictionary order)'],
+            ['foo_german2_bar', 'German (phone book order)'],
+            ['foo_hungarian_bar', 'Hungarian'],
+            ['foo_icelandic_bar', 'Icelandic'],
+            ['foo_japanese_bar', 'Japanese'],
+            ['foo_latvian_bar', 'Latvian'],
+            ['foo_lithuanian_bar', 'Lithuanian'],
+            ['foo_korean_bar', 'Korean'],
+            ['foo_persian_bar', 'Persian'],
+            ['foo_polish_bar', 'Polish'],
+            ['foo_roman_bar', 'West European'],
+            ['foo_romanian_bar', 'Romanian'],
+            ['foo_slovak_bar', 'Slovak'],
+            ['foo_slovenian_bar', 'Slovenian'],
+            ['foo_spanish_bar', 'Spanish (modern)'],
+            ['foo_spanish2_bar', 'Spanish (traditional)'],
+            ['foo_swedish_bar', 'Swedish'],
+            ['foo_thai_bar', 'Thai'],
+            ['foo_turkish_bar', 'Turkish'],
+            ['foo_ukrainian_bar', 'Ukrainian'],
+            ['foo_unicode_bar', 'Unicode'],
+            ['ucs2', 'Unicode'],
+            ['utf8', 'Unicode'],
+            ['ascii', 'West European'],
+            ['cp850', 'West European'],
+            ['dec8', 'West European'],
+            ['hp8', 'West European'],
+            ['latin1', 'West European'],
+            ['cp1250', 'Central European'],
+            ['cp852', 'Central European'],
+            ['latin2', 'Central European'],
+            ['macce', 'Central European'],
+            ['cp866', 'Russian'],
+            ['koi8r', 'Russian'],
+            ['gb2312', 'Simplified Chinese'],
+            ['gbk', 'Simplified Chinese'],
+            ['sjis', 'Japanese'],
+            ['ujis', 'Japanese'],
+            ['cp932', 'Japanese'],
+            ['eucjpms', 'Japanese'],
+            ['cp1257', 'Baltic'],
+            ['latin7', 'Baltic'],
+            ['armscii8', 'Armenian'],
+            ['armscii', 'Armenian'],
+            ['big5', 'Traditional Chinese'],
+            ['cp1251', 'Cyrillic'],
+            ['cp1256', 'Arabic'],
+            ['euckr', 'Korean'],
+            ['hebrew', 'Hebrew'],
+            ['geostd8', 'Georgian'],
+            ['greek', 'Greek'],
+            ['keybcs2', 'Czech-Slovak'],
+            ['koi8u', 'Ukrainian'],
+            ['latin5', 'Turkish'],
+            ['swe7', 'Swedish'],
+            ['tis620', 'Thai'],
+            ['foobar', 'Unknown'],
+            ['foo_test_bar', 'Unknown'],
+            ['foo_bin_bar', 'Unknown, binary'],
+            ['utf8mb4_0900_ai_ci', 'Unicode (UCA 9.0.0), accent-insensitive, case-insensitive'],
+            ['utf8mb4_unicode_520_ci', 'Unicode (UCA 5.2.0), case-insensitive'],
+            ['utf8mb4_unicode_ci', 'Unicode (UCA 4.0.0), case-insensitive'],
+            ['utf8mb4_tr_0900_ai_ci', 'Turkish (UCA 9.0.0), accent-insensitive, case-insensitive'],
+            ['utf8mb4_turkish_ci', 'Turkish (UCA 4.0.0), case-insensitive'],
+            ['utf32_thai_520_w2', 'Thai (UCA 5.2.0), multi-level'],
+            ['utf8mb4_czech_ci', 'Czech (UCA 4.0.0), case-insensitive'],
+            ['cp1250_czech_cs', 'Czech, case-sensitive'],
+            ['latin1_general_ci', 'West European, case-insensitive'],
+            ['utf8mb4_bin', 'Unicode (UCA 4.0.0), binary'],
+            ['utf8mb4_croatian_mysql561_ci', 'Croatian (MySQL 5.6.1), case-insensitive'],
+            ['ucs2_general_mysql500_ci', 'Unicode (MySQL 5.0.0), case-insensitive'],
+            ['utf32_general_ci', 'Unicode, case-insensitive'],
+            ['utf8mb4_es_trad_0900_ai_ci', 'Spanish (traditional) (UCA 9.0.0), accent-insensitive, case-insensitive'],
+            ['utf8mb4_es_0900_ai_ci', 'Spanish (modern) (UCA 9.0.0), accent-insensitive, case-insensitive'],
             [
                 'utf8mb4_de_pb_0900_ai_ci',
                 'German (phone book order) (UCA 9.0.0), accent-insensitive, case-insensitive',
             ],
-            [
-                'utf8mb4_de_0900_ai_ci',
-                'German (dictionary order) (UCA 9.0.0), accent-insensitive, case-insensitive',
-            ],
-            [
-                'utf8_myanmar_ci',
-                'Burmese, case-insensitive',
-            ],
-            [
-                'utf8mb4_la_0900_as_cs',
-                'Classical Latin (UCA 9.0.0), accent-sensitive, case-sensitive',
-            ],
-            [
-                'utf8_sinhala_ci',
-                'Sinhalese, case-insensitive',
-            ],
-            [
-                'utf8_vietnamese_ci',
-                'Vietnamese, case-insensitive',
-            ],
-            [
-                'gb18030_chinese_ci',
-                'Chinese, case-insensitive',
-            ],
-            [
-                'utf8mb4_ja_0900_as_cs_ks',
-                'Japanese (UCA 9.0.0), accent-sensitive, case-sensitive, kana-sensitive',
-            ],
-            [
-                'utf8mb4_unicode_520_nopad_ci',
-                'Unicode (UCA 5.2.0), no-pad, case-insensitive',
-            ],
-            [
-                'utf8mb4_ru_0900_as_cs',
-                'Russian (UCA 9.0.0), accent-sensitive, case-sensitive',
-            ],
+            ['utf8mb4_de_0900_ai_ci', 'German (dictionary order) (UCA 9.0.0), accent-insensitive, case-insensitive'],
+            ['utf8_myanmar_ci', 'Burmese, case-insensitive'],
+            ['utf8mb4_la_0900_as_cs', 'Classical Latin (UCA 9.0.0), accent-sensitive, case-sensitive'],
+            ['utf8_sinhala_ci', 'Sinhalese, case-insensitive'],
+            ['utf8_vietnamese_ci', 'Vietnamese, case-insensitive'],
+            ['gb18030_chinese_ci', 'Chinese, case-insensitive'],
+            ['utf8mb4_ja_0900_as_cs_ks', 'Japanese (UCA 9.0.0), accent-sensitive, case-sensitive, kana-sensitive'],
+            ['utf8mb4_unicode_520_nopad_ci', 'Unicode (UCA 5.2.0), no-pad, case-insensitive'],
+            ['utf8mb4_ru_0900_as_cs', 'Russian (UCA 9.0.0), accent-sensitive, case-sensitive'],
         ];
     }
 }
diff --git a/test/classes/Command/TwigLintCommandTest.php b/test/classes/Command/TwigLintCommandTest.php
index 23e884eb68..25342e9202 100644
--- a/test/classes/Command/TwigLintCommandTest.php
+++ b/test/classes/Command/TwigLintCommandTest.php
@@ -71,16 +71,8 @@ class TwigLintCommandTest extends AbstractTestCase
         sort($filesInfos, SORT_REGULAR);
 
         $this->assertEquals([
-            [
-                'template' => '',
-                'file' => $path . DIRECTORY_SEPARATOR . 'one.txt',
-                'valid' => true,
-            ],
-            [
-                'template' => '',
-                'file' => $path . DIRECTORY_SEPARATOR . 'two.md',
-                'valid' => true,
-            ],
+            ['template' => '', 'file' => $path . DIRECTORY_SEPARATOR . 'one.txt', 'valid' => true],
+            ['template' => '', 'file' => $path . DIRECTORY_SEPARATOR . 'two.md', 'valid' => true],
             [
                 'template' => '0000' . "\n",
                 'file' => $path . DIRECTORY_SEPARATOR . 'subfolder' . DIRECTORY_SEPARATOR . 'zero.txt',
@@ -103,10 +95,7 @@ class TwigLintCommandTest extends AbstractTestCase
         $command->expects($this->exactly(1))
             ->method('findFiles')
             ->willReturn(
-                [
-                    'foo.twig',
-                    'foo-invalid.twig',
-                ],
+                ['foo.twig', 'foo-invalid.twig'],
             );
 
         $command->expects($this->exactly(2))->method('getTemplateContents')->willReturnMap([
@@ -119,11 +108,7 @@ class TwigLintCommandTest extends AbstractTestCase
         ]);
 
         $this->assertEquals([
-            [
-                'template' => '{{ file }}',
-                'file' => 'foo.twig',
-                'valid' => true,
-            ],
+            ['template' => '{{ file }}', 'file' => 'foo.twig', 'valid' => true],
             [
                 'template' => '{{ file }',
                 'file' => 'foo-invalid.twig',
@@ -139,24 +124,15 @@ class TwigLintCommandTest extends AbstractTestCase
 
     public function testGetContext(): void
     {
-        $context = $this->callFunction($this->command, TwigLintCommand::class, 'getContext', [
-            '{{ file }',
-            0,
-        ]);
+        $context = $this->callFunction($this->command, TwigLintCommand::class, 'getContext', ['{{ file }', 0]);
 
         $this->assertEquals([1 => '{{ file }'], $context);
 
-        $context = $this->callFunction($this->command, TwigLintCommand::class, 'getContext', [
-            '{{ file }',
-            3,
-        ]);
+        $context = $this->callFunction($this->command, TwigLintCommand::class, 'getContext', ['{{ file }', 3]);
 
         $this->assertEquals([1 => '{{ file }'], $context);
 
-        $context = $this->callFunction($this->command, TwigLintCommand::class, 'getContext', [
-            '{{ file }',
-            5,
-        ]);
+        $context = $this->callFunction($this->command, TwigLintCommand::class, 'getContext', ['{{ file }', 5]);
 
         $this->assertEquals([], $context);
     }
diff --git a/test/classes/Command/WriteGitRevisionCommandTest.php b/test/classes/Command/WriteGitRevisionCommandTest.php
index 348f6ec4cf..dcd89f2d2e 100644
--- a/test/classes/Command/WriteGitRevisionCommandTest.php
+++ b/test/classes/Command/WriteGitRevisionCommandTest.php
@@ -36,10 +36,7 @@ class WriteGitRevisionCommandTest extends AbstractTestCase
             $this->command,
             WriteGitRevisionCommand::class,
             'getRevisionInfo',
-            [
-                'https://github.com/phpmyadmin/phpmyadmin/commit/%s',
-                'https://github.com/phpmyadmin/phpmyadmin/tree/%s',
-            ],
+            ['https://github.com/phpmyadmin/phpmyadmin/commit/%s', 'https://github.com/phpmyadmin/phpmyadmin/tree/%s'],
         );
         $template = <<<'PHP'
 <?php
diff --git a/test/classes/Config/ConfigFileTest.php b/test/classes/Config/ConfigFileTest.php
index e6bd050279..bb92382bd6 100644
--- a/test/classes/Config/ConfigFileTest.php
+++ b/test/classes/Config/ConfigFileTest.php
@@ -127,10 +127,7 @@ class ConfigFileTest extends AbstractTestCase
         $this->object->set('c', 3);
 
         $this->assertEquals(
-            [
-                'a' => 1,
-                'c' => 3,
-            ],
+            ['a' => 1, 'c' => 3],
             $this->object->getConfig(),
         );
 
@@ -141,11 +138,7 @@ class ConfigFileTest extends AbstractTestCase
         $this->object->set('b', 2);
 
         $this->assertEquals(
-            [
-                'a' => 1,
-                'b' => 2,
-                'c' => 3,
-            ],
+            ['a' => 1, 'b' => 2, 'c' => 3],
             $this->object->getConfig(),
         );
     }
@@ -156,25 +149,14 @@ class ConfigFileTest extends AbstractTestCase
     public function testConfigReadMapping(): void
     {
         $this->object->setCfgUpdateReadMapping(
-            [
-                'Servers/value1' => 'Servers/1/value1',
-                'Servers/value2' => 'Servers/1/value2',
-            ],
+            ['Servers/value1' => 'Servers/1/value1', 'Servers/value2' => 'Servers/1/value2'],
         );
         $this->object->set('Servers/1/passthrough1', 1);
         $this->object->set('Servers/1/passthrough2', 2);
         $this->object->updateWithGlobalConfig(['Servers/value1' => 3]);
 
         $this->assertEquals(
-            [
-                'Servers' => [
-                    1 => [
-                        'passthrough1' => 1,
-                        'passthrough2' => 2,
-                        'value1' => 3,
-                    ],
-                ],
-            ],
+            ['Servers' => [1 => ['passthrough1' => 1, 'passthrough2' => 2, 'value1' => 3]]],
             $this->object->getConfig(),
         );
         $this->assertEquals(
@@ -324,10 +306,7 @@ class ConfigFileTest extends AbstractTestCase
         $this->object->updateWithGlobalConfig(['key' => 'ABC']);
 
         $this->assertEquals(
-            [
-                'key' => 'ABC',
-                'key2' => 'value',
-            ],
+            ['key' => 'ABC', 'key2' => 'value'],
             $this->object->getConfig(),
         );
     }
@@ -397,19 +376,11 @@ class ConfigFileTest extends AbstractTestCase
             $this->object->get('ServerDefault'),
         );
         $this->assertEquals(
-            [
-                'Servers' => [
-                    1 => ['x' => 1],
-                    2 => ['x' => 4],
-                ],
-            ],
+            ['Servers' => [1 => ['x' => 1], 2 => ['x' => 4]]],
             $this->object->getConfig(),
         );
         $this->assertEquals(
-            [
-                'Servers/1/x' => 1,
-                'Servers/2/x' => 4,
-            ],
+            ['Servers/1/x' => 1, 'Servers/2/x' => 4],
             $this->object->getConfigArray(),
         );
     }
@@ -423,10 +394,7 @@ class ConfigFileTest extends AbstractTestCase
         $this->object->set('Servers/2/x', 'b');
 
         $this->assertEquals(
-            [
-                1 => ['x' => 'a'],
-                2 => ['x' => 'b'],
-            ],
+            [1 => ['x' => 'a'], 2 => ['x' => 'b']],
             $this->object->getServers(),
         );
     }
@@ -529,13 +497,7 @@ class ConfigFileTest extends AbstractTestCase
         $defaultValue = $this->object->getDefault(self::SIMPLE_KEY_WITH_DEFAULT_VALUE);
 
         $this->assertEquals(
-            [
-                self::SIMPLE_KEY_WITH_DEFAULT_VALUE => $defaultValue,
-                'Array/test' => [
-                    'x',
-                    'y',
-                ],
-            ],
+            [self::SIMPLE_KEY_WITH_DEFAULT_VALUE => $defaultValue, 'Array/test' => ['x', 'y']],
             $this->object->getConfigArray(),
         );
     }
diff --git a/test/classes/Config/DescriptionTest.php b/test/classes/Config/DescriptionTest.php
index 17d3f59dda..dcb9afd3cb 100644
--- a/test/classes/Config/DescriptionTest.php
+++ b/test/classes/Config/DescriptionTest.php
@@ -44,46 +44,18 @@ class DescriptionTest extends AbstractTestCase
     public static function getValues(): array
     {
         return [
-            'valid name' => [
-                'AllowArbitraryServer',
-                'name',
-                'Allow login to any MySQL server',
-            ],
+            'valid name' => ['AllowArbitraryServer', 'name', 'Allow login to any MySQL server'],
             'valid description' => [
                 'AllowArbitraryServer',
                 'desc',
                 'If enabled, user can enter any MySQL server in login form for cookie auth.',
             ],
-            'valid comment' => [
-                'MaxDbList',
-                'cmt',
-                'Users cannot set a higher value',
-            ],
-            'invalid name' => [
-                'UnknownSetting',
-                'name',
-                'UnknownSetting',
-            ],
-            'invalid description' => [
-                'UnknownSetting',
-                'desc',
-                '',
-            ],
-            'invalid comment' => [
-                'UnknownSetting',
-                'cmt',
-                '',
-            ],
-            'server number' => [
-                'Servers/1/DisableIS',
-                'name',
-                'Disable use of INFORMATION_SCHEMA',
-            ],
-            'composed name' => [
-                'Import/format',
-                'name',
-                'Format of imported file',
-            ],
+            'valid comment' => ['MaxDbList', 'cmt', 'Users cannot set a higher value'],
+            'invalid name' => ['UnknownSetting', 'name', 'UnknownSetting'],
+            'invalid description' => ['UnknownSetting', 'desc', ''],
+            'invalid comment' => ['UnknownSetting', 'cmt', ''],
+            'server number' => ['Servers/1/DisableIS', 'name', 'Disable use of INFORMATION_SCHEMA'],
+            'composed name' => ['Import/format', 'name', 'Format of imported file'],
             'bb code' => [
                 'NavigationLogoLinkWindow',
                 'desc',
@@ -109,14 +81,7 @@ class DescriptionTest extends AbstractTestCase
      */
     public function testAll(): void
     {
-        $nested = [
-            'Export',
-            'Import',
-            'Schema',
-            'DBG',
-            'DefaultTransformations',
-            'SQLQuery',
-        ];
+        $nested = ['Export', 'Import', 'Schema', 'DBG', 'DefaultTransformations', 'SQLQuery'];
 
         $settings = new Settings([]);
         $cfg = $settings->asArray();
diff --git a/test/classes/Config/FormDisplayTemplateTest.php b/test/classes/Config/FormDisplayTemplateTest.php
index cc8169bf0c..b1feca9d5f 100644
--- a/test/classes/Config/FormDisplayTemplateTest.php
+++ b/test/classes/Config/FormDisplayTemplateTest.php
@@ -151,15 +151,8 @@ class FormDisplayTemplateTest extends AbstractTestCase
 
         // select case 1
         $opts['values_escaped'] = true;
-        $opts['values_disabled'] = [
-            1,
-            2,
-        ];
-        $opts['values'] = [
-            1 => 'test',
-            'key1' => true,
-            'key2' => false,
-        ];
+        $opts['values_disabled'] = [1, 2];
+        $opts['values'] = [1 => 'test', 'key1' => true, 'key2' => false];
         $result = $this->formDisplayTemplate->displayInput('test/path', 'testName', 'select', true, '', true, $opts);
         $this->assertStringContainsString('<select name="test/path" id="test/path" class="w-75">', $result);
 
@@ -171,15 +164,8 @@ class FormDisplayTemplateTest extends AbstractTestCase
 
         // select case 2
         $opts['values_escaped'] = false;
-        $opts['values_disabled'] = [
-            1,
-            2,
-        ];
-        $opts['values'] = [
-            'a<b' => 'c&d',
-            'key1' => true,
-            'key2' => false,
-        ];
+        $opts['values_disabled'] = [1, 2];
+        $opts['values'] = ['a<b' => 'c&d', 'key1' => true, 'key2' => false];
         $result = $this->formDisplayTemplate->displayInput('test/path', 'testName', 'select', false, '', true, $opts);
 
         $this->assertStringContainsString('<select name="test/path" id="test/path" class="w-75">', $result);
@@ -192,10 +178,7 @@ class FormDisplayTemplateTest extends AbstractTestCase
             'test/path',
             'testName',
             'list',
-            [
-                'foo',
-                'bar',
-            ],
+            ['foo', 'bar'],
             '',
             true,
             $opts,
@@ -250,13 +233,7 @@ class FormDisplayTemplateTest extends AbstractTestCase
      */
     public function testAddJsValidate(): void
     {
-        $validators = [
-            'one' => [
-                '\\\';',
-                '\r\n\\\'<scrIpt></\' + \'script>',
-            ],
-            'two' => [],
-        ];
+        $validators = ['one' => ['\\\';', '\r\n\\\'<scrIpt></\' + \'script>'], 'two' => []];
 
         $js = [];
 
diff --git a/test/classes/Config/FormDisplayTest.php b/test/classes/Config/FormDisplayTest.php
index c3de68068f..d60e9b873c 100644
--- a/test/classes/Config/FormDisplayTest.php
+++ b/test/classes/Config/FormDisplayTest.php
@@ -57,14 +57,7 @@ class FormDisplayTest extends AbstractTestCase
 
         $attrForms = $reflection->getProperty('forms');
 
-        $array = [
-            'Servers' => [
-                '1' => [
-                    'test' => 1,
-                    1 => ':group:end',
-                ],
-            ],
-        ];
+        $array = ['Servers' => ['1' => ['test' => 1, 1 => ':group:end']]];
 
         $this->object->registerForm('pma_testform', $array, 2);
         $forms = $attrForms->getValue($this->object);
@@ -73,20 +66,14 @@ class FormDisplayTest extends AbstractTestCase
         $attrSystemPaths = $reflection->getProperty('systemPaths');
 
         $this->assertEquals(
-            [
-                'Servers/2/test' => 'Servers/1/test',
-                'Servers/2/:group:end:0' => 'Servers/1/:group:end:0',
-            ],
+            ['Servers/2/test' => 'Servers/1/test', 'Servers/2/:group:end:0' => 'Servers/1/:group:end:0'],
             $attrSystemPaths->getValue($this->object),
         );
 
         $attrTranslatedPaths = $reflection->getProperty('translatedPaths');
 
         $this->assertEquals(
-            [
-                'Servers/2/test' => 'Servers-2-test',
-                'Servers/2/:group:end:0' => 'Servers-2-:group:end:0',
-            ],
+            ['Servers/2/test' => 'Servers-2-test', 'Servers/2/:group:end:0' => 'Servers-2-:group:end:0'],
             $attrTranslatedPaths->getValue($this->object),
         );
     }
@@ -143,13 +130,7 @@ class FormDisplayTest extends AbstractTestCase
 
         $this->assertSame($result, '');
 
-        $arr = [
-            'Servers/1/test' => ['e1'],
-            'foobar' => [
-                'e2',
-                'e3',
-            ],
-        ];
+        $arr = ['Servers/1/test' => ['e1'], 'foobar' => ['e2', 'e3']];
 
         $sysArr = ['Servers/1/test' => 'Servers/1/test2'];
 
@@ -182,14 +163,7 @@ class FormDisplayTest extends AbstractTestCase
 
         $this->object->fixErrors();
 
-        $arr = [
-            'Servers/1/test' => ['e1'],
-            'Servers/2/test' => [
-                'e2',
-                'e3',
-            ],
-            'Servers/3/test' => [],
-        ];
+        $arr = ['Servers/1/test' => ['e1'], 'Servers/2/test' => ['e2', 'e3'], 'Servers/3/test' => []];
 
         $sysArr = ['Servers/1/test' => 'Servers/1/host'];
 
@@ -201,11 +175,7 @@ class FormDisplayTest extends AbstractTestCase
         $this->object->fixErrors();
 
         $this->assertEquals(
-            [
-                'Servers' => [
-                    '1' => ['test' => 'localhost'],
-                ],
-            ],
+            ['Servers' => ['1' => ['test' => 'localhost']]],
             $_SESSION['ConfigFile0'],
         );
     }
@@ -222,10 +192,7 @@ class FormDisplayTest extends AbstractTestCase
         $this->assertTrue(
             $attrValidateSelect->invokeArgs(
                 $this->object,
-                [
-                    &$value,
-                    $arr,
-                ],
+                [&$value, $arr],
             ),
         );
 
@@ -234,10 +201,7 @@ class FormDisplayTest extends AbstractTestCase
         $this->assertTrue(
             $attrValidateSelect->invokeArgs(
                 $this->object,
-                [
-                    &$value,
-                    $arr,
-                ],
+                [&$value, $arr],
             ),
         );
         $this->assertEquals(
@@ -250,10 +214,7 @@ class FormDisplayTest extends AbstractTestCase
         $this->assertTrue(
             $attrValidateSelect->invokeArgs(
                 $this->object,
-                [
-                    &$value,
-                    $arr,
-                ],
+                [&$value, $arr],
             ),
         );
 
@@ -262,10 +223,7 @@ class FormDisplayTest extends AbstractTestCase
         $this->assertFalse(
             $attrValidateSelect->invokeArgs(
                 $this->object,
-                [
-                    &$value,
-                    $arr,
-                ],
+                [&$value, $arr],
             ),
         );
     }
@@ -283,10 +241,7 @@ class FormDisplayTest extends AbstractTestCase
 
         $attrErrors->setValue(
             $this->object,
-            [
-                1,
-                2,
-            ],
+            [1, 2],
         );
 
         $this->assertTrue(
@@ -369,10 +324,7 @@ class FormDisplayTest extends AbstractTestCase
 
         $method->invokeArgs(
             $this->object,
-            [
-                'RecodingEngine',
-                &$opts,
-            ],
+            ['RecodingEngine', &$opts],
         );
 
         $expect['comment'] = '';
@@ -393,10 +345,7 @@ class FormDisplayTest extends AbstractTestCase
         // ZipDump, GZipDump, BZipDump
         $method->invokeArgs(
             $this->object,
-            [
-                'ZipDump',
-                &$opts,
-            ],
+            ['ZipDump', &$opts],
         );
 
         $comment = '';
@@ -415,10 +364,7 @@ class FormDisplayTest extends AbstractTestCase
 
         $method->invokeArgs(
             $this->object,
-            [
-                'GZipDump',
-                &$opts,
-            ],
+            ['GZipDump', &$opts],
         );
 
         $comment = '';
@@ -437,10 +383,7 @@ class FormDisplayTest extends AbstractTestCase
 
         $method->invokeArgs(
             $this->object,
-            [
-                'BZipDump',
-                &$opts,
-            ],
+            ['BZipDump', &$opts],
         );
 
         $comment = '';
@@ -465,30 +408,21 @@ class FormDisplayTest extends AbstractTestCase
 
         $method->invokeArgs(
             $this->object,
-            [
-                'MaxDbList',
-                &$opts,
-            ],
+            ['MaxDbList', &$opts],
         );
 
         $this->assertEquals('maximum 10', $opts['comment']);
 
         $method->invokeArgs(
             $this->object,
-            [
-                'MaxTableList',
-                &$opts,
-            ],
+            ['MaxTableList', &$opts],
         );
 
         $this->assertEquals('maximum 10', $opts['comment']);
 
         $method->invokeArgs(
             $this->object,
-            [
-                'QueryHistoryMax',
-                &$opts,
-            ],
+            ['QueryHistoryMax', &$opts],
         );
 
         $this->assertEquals('maximum 10', $opts['comment']);
diff --git a/test/classes/Config/FormTest.php b/test/classes/Config/FormTest.php
index a857adef2a..dadf8e62a7 100644
--- a/test/classes/Config/FormTest.php
+++ b/test/classes/Config/FormTest.php
@@ -32,10 +32,7 @@ class FormTest extends AbstractTestCase
         $GLOBALS['server'] = 0;
         $this->object = new Form(
             'pma_form_name',
-            [
-                'pma_form1',
-                'pma_form2',
-            ],
+            ['pma_form1', 'pma_form2'],
             new ConfigFile(),
             1,
         );
@@ -90,29 +87,17 @@ class FormTest extends AbstractTestCase
     public function testGetOptionValueList(): void
     {
         $this->assertEquals(
-            [
-                'NHibernate C# DO',
-                'NHibernate XML',
-            ],
+            ['NHibernate C# DO', 'NHibernate XML'],
             $this->object->getOptionValueList('Export/codegen_format'),
         );
 
         $this->assertEquals(
-            [
-                'auto' => 'auto',
-                '1' => 1,
-                '0' => 0,
-            ],
+            ['auto' => 'auto', '1' => 1, '0' => 0],
             $this->object->getOptionValueList('OBGzip'),
         );
 
         $this->assertEquals(
-            [
-                'none' => 'Nowhere',
-                'left' => 'Left',
-                'right' => 'Right',
-                'both' => 'Both',
-            ],
+            ['none' => 'Nowhere', 'left' => 'Left', 'right' => 'Right', 'both' => 'Both'],
             $this->object->getOptionValueList('RowActionLinks'),
         );
     }
@@ -125,14 +110,7 @@ class FormTest extends AbstractTestCase
         $reflection = new ReflectionClass(Form::class);
         $method = $reflection->getMethod('readFormPathsCallback');
 
-        $array = [
-            'foo' => [
-                'bar' => [
-                    'test' => 1,
-                    1 => ':group:end',
-                ],
-            ],
-        ];
+        $array = ['foo' => ['bar' => ['test' => 1, 1 => ':group:end']]];
 
         $method->invoke($this->object, $array, 'foo', 'pref');
 
@@ -160,14 +138,7 @@ class FormTest extends AbstractTestCase
         $reflection = new ReflectionClass(Form::class);
         $method = $reflection->getMethod('readFormPaths');
 
-        $array = [
-            'foo' => [
-                'bar' => [
-                    'test' => 1,
-                    1 => ':group:end',
-                ],
-            ],
-        ];
+        $array = ['foo' => ['bar' => ['test' => 1, 1 => ':group:end']]];
 
         $method->invoke($this->object, $array);
 
@@ -211,12 +182,7 @@ class FormTest extends AbstractTestCase
         $method->invoke($this->object, null);
 
         $this->assertEquals(
-            [
-                'pma_form1' => 'integer',
-                'pma_form2' => 'select',
-                ':group:end:0' => 'group',
-                '1' => 'NULL',
-            ],
+            ['pma_form1' => 'integer', 'pma_form2' => 'select', ':group:end:0' => 'group', '1' => 'NULL'],
             $attrFieldsTypes->getValue($this->object),
         );
     }
diff --git a/test/classes/Config/ServerConfigChecksTest.php b/test/classes/Config/ServerConfigChecksTest.php
index 22a8877723..6f17544a90 100644
--- a/test/classes/Config/ServerConfigChecksTest.php
+++ b/test/classes/Config/ServerConfigChecksTest.php
@@ -89,13 +89,7 @@ class ServerConfigChecksTest extends AbstractTestCase
         );
 
         $this->assertEquals(
-            [
-                'LoginCookieValidity',
-                'GZipDump',
-                'BZipDump',
-                'ZipDump_import',
-                'ZipDump_export',
-            ],
+            ['LoginCookieValidity', 'GZipDump', 'BZipDump', 'ZipDump_import', 'ZipDump_export'],
             array_keys($_SESSION['messages']['error']),
         );
     }
@@ -105,12 +99,7 @@ class ServerConfigChecksTest extends AbstractTestCase
         $_SESSION[$this->sessionID] = [];
         $_SESSION[$this->sessionID]['blowfish_secret'] = null;
         $_SESSION[$this->sessionID]['Servers'] = [
-            '1' => [
-                'host' => 'localhost',
-                'ssl' => true,
-                'auth_type' => 'cookie',
-                'AllowRoot' => false,
-            ],
+            '1' => ['host' => 'localhost', 'ssl' => true, 'auth_type' => 'cookie', 'AllowRoot' => false],
         ];
         $_SESSION[$this->sessionID]['AllowArbitraryServer'] = false;
         $_SESSION[$this->sessionID]['LoginCookieValidity'] = -1;
@@ -144,12 +133,7 @@ class ServerConfigChecksTest extends AbstractTestCase
         $_SESSION[$this->sessionID] = [];
         $_SESSION[$this->sessionID]['blowfish_secret'] = str_repeat('a', SODIUM_CRYPTO_SECRETBOX_KEYBYTES + 1);
         $_SESSION[$this->sessionID]['Servers'] = [
-            '1' => [
-                'host' => 'localhost',
-                'ssl' => true,
-                'auth_type' => 'cookie',
-                'AllowRoot' => false,
-            ],
+            '1' => ['host' => 'localhost', 'ssl' => true, 'auth_type' => 'cookie', 'AllowRoot' => false],
         ];
 
         $configChecker = new ServerConfigChecks($GLOBALS['ConfigFile']);
diff --git a/test/classes/Config/Settings/SchemaTest.php b/test/classes/Config/Settings/SchemaTest.php
index 0e8a577f69..706cf68ca9 100644
--- a/test/classes/Config/Settings/SchemaTest.php
+++ b/test/classes/Config/Settings/SchemaTest.php
@@ -143,12 +143,7 @@ class SchemaTest extends TestCase
                     ['svg_all_tables_same_width', true, true],
                 ],
             ],
-            'valid values 3' => [
-                [
-                    ['format', 'dia', 'dia'],
-                    ['pdf_table_order', 'name_desc', 'name_desc'],
-                ],
-            ],
+            'valid values 3' => [[['format','dia','dia'], ['pdf_table_order','name_desc','name_desc']]],
             'valid values 4' => [[['format', 'svg', 'svg']]],
             'valid values with type coercion' => [
                 [
diff --git a/test/classes/ConfigStorage/RelationParametersTest.php b/test/classes/ConfigStorage/RelationParametersTest.php
index e784107e57..089ea0fec8 100644
--- a/test/classes/ConfigStorage/RelationParametersTest.php
+++ b/test/classes/ConfigStorage/RelationParametersTest.php
@@ -690,12 +690,7 @@ class RelationParametersTest extends TestCase
                 ],
             ],
             'invalid values 3' => [
-                [
-                    'user' => '',
-                    'db' => 'db',
-                    'bookmarkwork' => true,
-                    'bookmark' => ' invalid name ',
-                ],
+                ['user' => '', 'db' => 'db', 'bookmarkwork' => true, 'bookmark' => ' invalid name '],
                 [
                     'version' => Version::VERSION,
                     'user' => null,
@@ -741,10 +736,7 @@ class RelationParametersTest extends TestCase
                 ],
             ],
             'invalid values 4' => [
-                [
-                    'user' => '',
-                    'db' => '',
-                ],
+                ['user' => '', 'db' => ''],
                 [
                     'version' => Version::VERSION,
                     'user' => null,
diff --git a/test/classes/ConfigStorage/RelationTest.php b/test/classes/ConfigStorage/RelationTest.php
index eabbad973e..899c4eefae 100644
--- a/test/classes/ConfigStorage/RelationTest.php
+++ b/test/classes/ConfigStorage/RelationTest.php
@@ -68,16 +68,8 @@ class RelationTest extends AbstractTestCase
             ->getMock();
 
         $getColumnsResult = [
-            [
-                'Field' => 'field1',
-                'Type' => 'int(11)',
-                'Comment' => 'Comment1',
-            ],
-            [
-                'Field' => 'field2',
-                'Type' => 'text',
-                'Comment' => 'Comment1',
-            ],
+            ['Field' => 'field1', 'Type' => 'int(11)', 'Comment' => 'Comment1'],
+            ['Field' => 'field2', 'Type' => 'text', 'Comment' => 'Comment1'],
         ];
         $dbi->expects($this->any())->method('getColumns')
             ->will($this->returnValue($getColumnsResult));
@@ -95,10 +87,7 @@ class RelationTest extends AbstractTestCase
         $db = 'information_schema';
         $table = 'TABLES';
         $this->assertEquals(
-            [
-                'field1' => 'Comment1',
-                'field2' => 'Comment1',
-            ],
+            ['field1' => 'Comment1', 'field2' => 'Comment1'],
             $relation->getComments($db, $table),
         );
     }
@@ -159,16 +148,10 @@ class RelationTest extends AbstractTestCase
             'foreign_keys_data' => [
                 0 => [
                     'constraint' => 'ad',
-                    'index_list' => [
-                        'id',
-                        'value',
-                    ],
+                    'index_list' => ['id', 'value'],
                     'ref_db_name' => 'GSoC14',
                     'ref_table_name' => 'table_1',
-                    'ref_index_list' => [
-                        'id',
-                        'value',
-                    ],
+                    'ref_index_list' => ['id', 'value'],
                     'on_delete' => 'CASCADE',
                     'on_update' => 'CASCADE',
                 ],
@@ -236,17 +219,13 @@ class RelationTest extends AbstractTestCase
         $dummyDbi->removeDefaultResults();
         $dummyDbi->addResult(
             'SHOW TABLES FROM `db_pma`;',
-            [
-                ['pma__userconfig'],
-            ],
+            [['pma__userconfig']],
             ['Tables_in_db_pma'],
         );
 
         $dummyDbi->addResult(
             'SHOW TABLES FROM `db_pma`',
-            [
-                ['pma__userconfig'],
-            ],
+            [['pma__userconfig']],
             ['Tables_in_db_pma'],
         );
 
@@ -309,17 +288,13 @@ class RelationTest extends AbstractTestCase
         $dummyDbi->removeDefaultResults();
         $dummyDbi->addResult(
             'SHOW TABLES FROM `db_pma`;',
-            [
-                ['pma__userconfig'],
-            ],
+            [['pma__userconfig']],
             ['Tables_in_db_pma'],
         );
 
         $dummyDbi->addResult(
             'SHOW TABLES FROM `db_pma`',
-            [
-                ['pma__userconfig'],
-            ],
+            [['pma__userconfig']],
             ['Tables_in_db_pma'],
         );
 
@@ -879,9 +854,7 @@ class RelationTest extends AbstractTestCase
         $dummyDbi->removeDefaultResults();
         $dummyDbi->addResult(
             'SHOW TABLES FROM `db_pma`;',
-            [
-                ['pma__userconfig'],
-            ],
+            [['pma__userconfig']],
             ['Tables_in_db_pma'],
         );
 
@@ -1463,9 +1436,7 @@ class RelationTest extends AbstractTestCase
         $dummyDbi->removeDefaultResults();
         $dummyDbi->addResult(
             'SHOW TABLES FROM `phpmyadmin`;',
-            [
-                ['pma__userconfig'],
-            ],
+            [['pma__userconfig']],
             ['Tables_in_phpmyadmin'],
         );
 
@@ -1522,25 +1493,19 @@ class RelationTest extends AbstractTestCase
         $dummyDbi->removeDefaultResults();
         $dummyDbi->addResult(
             'SHOW TABLES FROM `phpmyadmin`;',
-            [
-                ['pma__userconfig'],
-            ],
+            [['pma__userconfig']],
             ['Tables_in_phpmyadmin'],
         );
 
         $dummyDbi->addResult(
             'SHOW TABLES FROM `phpmyadmin`',
-            [
-                ['pma__userconfig'],
-            ],
+            [['pma__userconfig']],
             ['Tables_in_phpmyadmin'],
         );
 
         $dummyDbi->addResult(
             'SELECT NULL FROM `pma__userconfig` LIMIT 0',
-            [
-                ['NULL'],
-            ],
+            [['NULL']],
             ['NULL'],
         );
 
@@ -1623,17 +1588,13 @@ class RelationTest extends AbstractTestCase
         $dummyDbi->removeDefaultResults();
         $dummyDbi->addResult(
             'SHOW TABLES FROM `phpmyadmin`;',
-            [
-                ['pma__userconfig'],
-            ],
+            [['pma__userconfig']],
             ['Tables_in_phpmyadmin'],
         );
 
         $dummyDbi->addResult(
             'SHOW TABLES FROM `phpmyadmin`',
-            [
-                ['pma__userconfig'],
-            ],
+            [['pma__userconfig']],
             ['Tables_in_phpmyadmin'],
         );
 
@@ -1717,31 +1678,19 @@ class RelationTest extends AbstractTestCase
         $dummyDbi->removeDefaultResults();
         $dummyDbi->addResult(
             'SHOW TABLES FROM `PMA-storage`;',
-            [
-                [
-                    'pma__userconfig_custom',
-                    'pma__usergroups',
-                ],
-            ],
+            [['pma__userconfig_custom', 'pma__usergroups']],
             ['Tables_in_PMA-storage'],
         );
 
         $dummyDbi->addResult(
             'SHOW TABLES FROM `PMA-storage`',
-            [
-                [
-                    'pma__userconfig_custom',
-                    'pma__usergroups',
-                ],
-            ],
+            [['pma__userconfig_custom', 'pma__usergroups']],
             ['Tables_in_PMA-storage'],
         );
 
         $dummyDbi->addResult(
             'SELECT NULL FROM `pma__userconfig_custom` LIMIT 0',
-            [
-                ['NULL'],
-            ],
+            [['NULL']],
             ['NULL'],
         );
 
@@ -1764,20 +1713,13 @@ class RelationTest extends AbstractTestCase
 
         $dummyDbi->addResult(
             'SHOW TABLES FROM `PMA-storage`',
-            [
-                [
-                    'pma__userconfig_custom',
-                    'pma__usergroups',
-                ],
-            ],
+            [['pma__userconfig_custom', 'pma__usergroups']],
             ['Tables_in_PMA-storage'],
         );
 
         $dummyDbi->addResult(
             'SELECT NULL FROM `pma__userconfig_custom` LIMIT 0',
-            [
-                ['NULL'],
-            ],
+            [['NULL']],
             ['NULL'],
         );
 
diff --git a/test/classes/ConfigStorage/UserGroupsTest.php b/test/classes/ConfigStorage/UserGroupsTest.php
index da0dde52bb..b79c4e2b1c 100644
--- a/test/classes/ConfigStorage/UserGroupsTest.php
+++ b/test/classes/ConfigStorage/UserGroupsTest.php
@@ -132,13 +132,7 @@ class UserGroupsTest extends AbstractTestCase
         $resultStub->expects($this->exactly(1))
             ->method('getIterator')
             ->will($this->returnCallback(static function (): Generator {
-                yield from [
-                    [
-                        'usergroup' => 'ug',
-                        'tab' => 'server_sql',
-                        'allowed' => 'Y',
-                    ],
-                ];
+                yield from [['usergroup' => 'ug', 'tab' => 'server_sql', 'allowed' => 'Y']];
             }));
         $dbi->expects($this->any())->method('quoteString')
             ->will($this->returnCallback(static fn (string $string): string => "'" . $string . "'"));
diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php
index 1ce6e53c63..a0a4a81db7 100644
--- a/test/classes/ConfigTest.php
+++ b/test/classes/ConfigTest.php
@@ -243,36 +243,16 @@ class ConfigTest extends AbstractTestCase
     public static function userAgentProvider(): array
     {
         return [
-            [
-                'Opera/9.80 (X11; Linux x86_64; U; pl) Presto/2.7.62 Version/11.00',
-                'Linux',
-                'OPERA',
-                '9.80',
-            ],
+            ['Opera/9.80 (X11; Linux x86_64; U; pl) Presto/2.7.62 Version/11.00', 'Linux', 'OPERA', '9.80'],
             [
                 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US) AppleWebKit/528.16 OmniWeb/622.8.0.112941',
                 'Mac',
                 'OMNIWEB',
                 '622',
             ],
-            [
-                'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1)',
-                'Win',
-                'IE',
-                '8.0',
-            ],
-            [
-                'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)',
-                'Win',
-                'IE',
-                '9.0',
-            ],
-            [
-                'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Win64; x64; Trident/6.0)',
-                'Win',
-                'IE',
-                '10.0',
-            ],
+            ['Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1)', 'Win', 'IE', '8.0'],
+            ['Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)', 'Win', 'IE', '9.0'],
+            ['Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Win64; x64; Trident/6.0)', 'Win', 'IE', '10.0'],
             [
                 'Mozilla/5.0 (IE 11.0; Windows NT 6.3; Trident/7.0; .NET4.0E; .NET4.0C; rv:11.0) like Gecko',
                 'Win',
@@ -301,29 +281,14 @@ class ConfigTest extends AbstractTestCase
                 'SAFARI',
                 '5.0.419',
             ],
-            [
-                'Mozilla/5.0 (Windows; U; Win95; en-US; rv:1.9b) Gecko/20031208',
-                'Win',
-                'GECKO',
-                '1.9',
-            ],
+            ['Mozilla/5.0 (Windows; U; Win95; en-US; rv:1.9b) Gecko/20031208', 'Win', 'GECKO', '1.9'],
             [
                 'Mozilla/5.0 (compatible; Konqueror/4.5; NetBSD 5.0.2; X11; amd64; en_US) KHTML/4.5.4 (like Gecko)',
                 'Other',
                 'KONQUEROR',
             ],
-            [
-                'Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20100101 Firefox/5.0',
-                'Linux',
-                'FIREFOX',
-                '5.0',
-            ],
-            [
-                'Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20100101 Firefox/12.0',
-                'Linux',
-                'FIREFOX',
-                '12.0',
-            ],
+            ['Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20100101 Firefox/5.0', 'Linux', 'FIREFOX', '5.0'],
+            ['Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20100101 Firefox/12.0', 'Linux', 'FIREFOX', '12.0'],
             /** @todo Is this version really expected? */
             [
                 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.4+ (KHTML, like G'
@@ -425,16 +390,7 @@ class ConfigTest extends AbstractTestCase
      */
     public static function serverNames(): array
     {
-        return [
-            [
-                'Microsoft-IIS 7.0',
-                1,
-            ],
-            [
-                'Apache/2.2.17',
-                0,
-            ],
-        ];
+        return [['Microsoft-IIS 7.0', 1], ['Apache/2.2.17', 0]];
     }
 
     /**
@@ -588,201 +544,21 @@ class ConfigTest extends AbstractTestCase
     public static function httpsParams(): array
     {
         return [
-            [
-                'http',
-                '',
-                '',
-                '',
-                '',
-                '',
-                'http',
-                '',
-                '',
-                80,
-                false,
-            ],
-            [
-                'http',
-                '',
-                '',
-                'http://',
-                '',
-                '',
-                'http',
-                '',
-                '',
-                80,
-                false,
-            ],
-            [
-                'http',
-                '',
-                '',
-                '',
-                '',
-                '',
-                'http',
-                '',
-                '',
-                443,
-                true,
-            ],
-            [
-                'http',
-                '',
-                '',
-                '',
-                '',
-                '',
-                'https',
-                '',
-                '',
-                80,
-                true,
-            ],
-            [
-                'http',
-                '',
-                '',
-                '',
-                '',
-                'on',
-                'http',
-                '',
-                '',
-                80,
-                true,
-            ],
-            [
-                'http',
-                '',
-                '',
-                '',
-                'on',
-                '',
-                'http',
-                '',
-                '',
-                80,
-                true,
-            ],
-            [
-                'http',
-                '',
-                '',
-                'https://',
-                '',
-                '',
-                'http',
-                '',
-                '',
-                80,
-                true,
-            ],
-            [
-                'http',
-                'on',
-                '',
-                '',
-                '',
-                '',
-                'http',
-                '',
-                '',
-                80,
-                true,
-            ],
-            [
-                'https',
-                '',
-                '',
-                '',
-                '',
-                '',
-                'http',
-                '',
-                '',
-                80,
-                true,
-            ],
-            [
-                'http',
-                '',
-                '',
-                '',
-                '',
-                '',
-                '',
-                'https',
-                '',
-                80,
-                true,
-            ],
-            [
-                'http',
-                '',
-                '',
-                '',
-                '',
-                '',
-                'https',
-                'http',
-                '',
-                80,
-                true,
-            ],
-            [
-                'https',
-                '',
-                '',
-                '',
-                '',
-                '',
-                '',
-                '',
-                '',
-                80,
-                true,
-            ],
-            [
-                'http',
-                '',
-                '',
-                '',
-                '',
-                '',
-                '',
-                '',
-                '',
-                8080,
-                false,
-            ],
-            [
-                '',
-                '',
-                '',
-                '',
-                '',
-                '',
-                '',
-                '',
-                'https://127.0.0.1',
-                80,
-                true,
-            ],
-            [
-                '',
-                '',
-                '',
-                '',
-                '',
-                '',
-                '',
-                '',
-                'http://127.0.0.1',
-                80,
-                false,
-            ],
+            ['http', '', '', '', '', '', 'http', '', '', 80, false],
+            ['http', '', '', 'http://', '', '', 'http', '', '', 80, false],
+            ['http', '', '', '', '', '', 'http', '', '', 443, true],
+            ['http', '', '', '', '', '', 'https', '', '', 80, true],
+            ['http', '', '', '', '', 'on', 'http', '', '', 80, true],
+            ['http', '', '', '', 'on', '', 'http', '', '', 80, true],
+            ['http', '', '', 'https://', '', '', 'http', '', '', 80, true],
+            ['http', 'on', '', '', '', '', 'http', '', '', 80, true],
+            ['https', '', '', '', '', '', 'http', '', '', 80, true],
+            ['http', '', '', '', '', '', '', 'https', '', 80, true],
+            ['http', '', '', '', '', '', 'https', 'http', '', 80, true],
+            ['https', '', '', '', '', '', '', '', '', 80, true],
+            ['http', '', '', '', '', '', '', '', '', 8080, false],
+            ['', '', '', '', '', '', '', '', 'https://127.0.0.1', 80, true],
+            ['', '', '', '', '', '', '', '', 'http://127.0.0.1', 80, false],
             [
                 '',
                 '',
@@ -825,56 +601,16 @@ class ConfigTest extends AbstractTestCase
     public static function rootUris(): array
     {
         return [
-            [
-                '',
-                '',
-                '/',
-            ],
-            [
-                '/',
-                '',
-                '/',
-            ],
-            [
-                '/index.php',
-                '',
-                '/',
-            ],
-            [
-                '/foo/bar/phpmyadmin/index.php',
-                '',
-                '/foo/bar/phpmyadmin/',
-            ],
-            [
-                '/foo/bar/phpmyadmin/',
-                '',
-                '/foo/bar/phpmyadmin/',
-            ],
-            [
-                '/foo/bar/phpmyadmin',
-                '',
-                '/foo/bar/phpmyadmin/',
-            ],
-            [
-                'http://example.net/',
-                'http://example.net/phpmyadmin/',
-                '/phpmyadmin/',
-            ],
-            [
-                'http://example.net/',
-                'http://example.net/phpmyadmin',
-                '/phpmyadmin/',
-            ],
-            [
-                'http://example.net/',
-                '/phpmyadmin2',
-                '/phpmyadmin2/',
-            ],
-            [
-                'http://example.net/',
-                '/phpmyadmin3/',
-                '/phpmyadmin3/',
-            ],
+            ['', '', '/'],
+            ['/', '', '/'],
+            ['/index.php', '', '/'],
+            ['/foo/bar/phpmyadmin/index.php', '', '/foo/bar/phpmyadmin/'],
+            ['/foo/bar/phpmyadmin/', '', '/foo/bar/phpmyadmin/'],
+            ['/foo/bar/phpmyadmin', '', '/foo/bar/phpmyadmin/'],
+            ['http://example.net/', 'http://example.net/phpmyadmin/', '/phpmyadmin/'],
+            ['http://example.net/', 'http://example.net/phpmyadmin', '/phpmyadmin/'],
+            ['http://example.net/', '/phpmyadmin2', '/phpmyadmin2/'],
+            ['http://example.net/', '/phpmyadmin3/', '/phpmyadmin3/'],
         ];
     }
 
@@ -903,14 +639,8 @@ class ConfigTest extends AbstractTestCase
     public static function configPaths(): array
     {
         return [
-            [
-                TEST_PATH . 'test/test_data/config.inc.php',
-                true,
-            ],
-            [
-                TEST_PATH . 'test/test_data/config-nonexisting.inc.php',
-                false,
-            ],
+            [TEST_PATH . 'test/test_data/config.inc.php', true],
+            [TEST_PATH . 'test/test_data/config-nonexisting.inc.php', false],
         ];
     }
 
@@ -1075,21 +805,9 @@ class ConfigTest extends AbstractTestCase
     public static function serverSettingsProvider(): array
     {
         return [
-            'empty' => [
-                [],
-                [],
-            ],
-            'only_host' => [
-                [1 => ['host' => '127.0.0.1']],
-                ['host' => '127.0.0.1'],
-            ],
-            'empty_host' => [
-                [1 => ['host' => '']],
-                [
-                    'verbose' => 'Server 1',
-                    'host' => '',
-                ],
-            ],
+            'empty' => [[], []],
+            'only_host' => [[1 => ['host' => '127.0.0.1']], ['host' => '127.0.0.1']],
+            'empty_host' => [[1 => ['host' => '']], ['verbose' => 'Server 1', 'host' => '']],
         ];
     }
 
@@ -1159,51 +877,13 @@ class ConfigTest extends AbstractTestCase
     public static function selectServerProvider(): array
     {
         return [
-            'zero' => [
-                [],
-                '0',
-                1,
-            ],
-            'number' => [
-                [1 => []],
-                '1',
-                1,
-            ],
-            'host' => [
-                [2 => ['host' => '127.0.0.1']],
-                '127.0.0.1',
-                2,
-            ],
-            'verbose' => [
-                [
-                    1 => [
-                        'verbose' => 'Server 1',
-                        'host' => '',
-                    ],
-                ],
-                'Server 1',
-                1,
-            ],
-            'md5' => [
-                [
-                    66 => [
-                        'verbose' => 'Server 1',
-                        'host' => '',
-                    ],
-                ],
-                '753f173bd4ac8a45eae0fe9a4fbe0fc0',
-                66,
-            ],
-            'nonexisting_string' => [
-                [1 => []],
-                'invalid',
-                1,
-            ],
-            'nonexisting' => [
-                [1 => []],
-                '100',
-                1,
-            ],
+            'zero' => [[], '0', 1],
+            'number' => [[1 => []], '1', 1],
+            'host' => [[2 => ['host' => '127.0.0.1']], '127.0.0.1', 2],
+            'verbose' => [[1 => ['verbose' => 'Server 1', 'host' => '']], 'Server 1', 1],
+            'md5' => [[66 => ['verbose' => 'Server 1', 'host' => '']], '753f173bd4ac8a45eae0fe9a4fbe0fc0', 66],
+            'nonexisting_string' => [[1 => []], 'invalid', 1],
+            'nonexisting' => [[1 => []], '100', 1],
         ];
     }
 
diff --git a/test/classes/Controllers/AbstractControllerTest.php b/test/classes/Controllers/AbstractControllerTest.php
index 4b06f24564..233210f284 100644
--- a/test/classes/Controllers/AbstractControllerTest.php
+++ b/test/classes/Controllers/AbstractControllerTest.php
@@ -91,10 +91,7 @@ class AbstractControllerTest extends AbstractTestCase
         $this->assertSame(404, $response->getHttpResponseCode());
         $this->assertFalse($response->hasSuccessState());
         $this->assertSame('', $response->getHTMLResult());
-        $this->assertSame([
-            'isErrorResponse' => true,
-            'message' => 'Error message.',
-        ], $response->getJSONResult());
+        $this->assertSame(['isErrorResponse' => true, 'message' => 'Error message.'], $response->getJSONResult());
     }
 
     public function testSendErrorResponseWithHtml(): void
diff --git a/test/classes/Controllers/CollationConnectionControllerTest.php b/test/classes/Controllers/CollationConnectionControllerTest.php
index 15a84ef431..4fc4abb510 100644
--- a/test/classes/Controllers/CollationConnectionControllerTest.php
+++ b/test/classes/Controllers/CollationConnectionControllerTest.php
@@ -18,9 +18,7 @@ class CollationConnectionControllerTest extends AbstractTestCase
     public function testInvoke(): void
     {
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParsedBodyParam')->willReturnMap([
-            ['collation_connection', null, 'utf8mb4_general_ci'],
-        ]);
+        $request->method('getParsedBodyParam')->willReturnMap([['collation_connection', null, 'utf8mb4_general_ci']]);
 
         $response = $this->createMock(ResponseRenderer::class);
         $response->expects($this->once())->method('header')
diff --git a/test/classes/Controllers/Database/MultiTableQuery/TablesControllerTest.php b/test/classes/Controllers/Database/MultiTableQuery/TablesControllerTest.php
index cd29e15685..9b05364755 100644
--- a/test/classes/Controllers/Database/MultiTableQuery/TablesControllerTest.php
+++ b/test/classes/Controllers/Database/MultiTableQuery/TablesControllerTest.php
@@ -38,10 +38,7 @@ class TablesControllerTest extends AbstractTestCase
 
     public function testGetForeignKeyConstrainsForTable(): void
     {
-        $_GET['tables'] = [
-            'table1',
-            'table2',
-        ];
+        $_GET['tables'] = ['table1', 'table2'];
         $_GET['db'] = 'test';
 
         /** @var TablesController $multiTableQueryController */
diff --git a/test/classes/Controllers/Database/PrivilegesControllerTest.php b/test/classes/Controllers/Database/PrivilegesControllerTest.php
index e4fe2f21f9..72c0c095b3 100644
--- a/test/classes/Controllers/Database/PrivilegesControllerTest.php
+++ b/test/classes/Controllers/Database/PrivilegesControllerTest.php
@@ -64,9 +64,7 @@ class PrivilegesControllerTest extends AbstractTestCase
             ->willReturn($privileges);
 
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParam')->willReturnMap([
-            ['db', null, 'test_db'],
-        ]);
+        $request->method('getParam')->willReturnMap([['db', null, 'test_db']]);
 
         $response = new ResponseRenderer();
         (new PrivilegesController(
@@ -119,9 +117,7 @@ class PrivilegesControllerTest extends AbstractTestCase
     public function testWithInvalidDatabaseName(): void
     {
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParam')->willReturnMap([
-            ['db', null, ''],
-        ]);
+        $request->method('getParam')->willReturnMap([['db', null, '']]);
 
         $response = new ResponseRenderer();
         (new PrivilegesController(
diff --git a/test/classes/Controllers/Database/Structure/FavoriteTableControllerTest.php b/test/classes/Controllers/Database/Structure/FavoriteTableControllerTest.php
index 88229e57b5..5cd1d6c64f 100644
--- a/test/classes/Controllers/Database/Structure/FavoriteTableControllerTest.php
+++ b/test/classes/Controllers/Database/Structure/FavoriteTableControllerTest.php
@@ -56,14 +56,7 @@ class FavoriteTableControllerTest extends AbstractTestCase
 
         // The user hash for test
         $user = 'abcdefg';
-        $favoriteTable = [
-            $user => [
-                [
-                    'db' => 'db',
-                    'table' => 'table',
-                ],
-            ],
-        ];
+        $favoriteTable = [$user => [['db' => 'db', 'table' => 'table']]];
 
         $json = $method->invokeArgs($controller, [$favoriteInstance, $user, $favoriteTable]);
 
diff --git a/test/classes/Controllers/Database/StructureControllerTest.php b/test/classes/Controllers/Database/StructureControllerTest.php
index e085e12a8e..67aab7cf2a 100644
--- a/test/classes/Controllers/Database/StructureControllerTest.php
+++ b/test/classes/Controllers/Database/StructureControllerTest.php
@@ -95,10 +95,7 @@ class StructureControllerTest extends AbstractTestCase
         ];
         [$currentTable, , , $sumSize] = $method->invokeArgs(
             $controller,
-            [
-                $currentTable,
-                10,
-            ],
+            [$currentTable, 10],
         );
 
         $this->assertTrue($currentTable['COUNTED']);
@@ -108,10 +105,7 @@ class StructureControllerTest extends AbstractTestCase
         $currentTable['ENGINE'] = 'MYISAM';
         [$currentTable, , , $sumSize] = $method->invokeArgs(
             $controller,
-            [
-                $currentTable,
-                10,
-            ],
+            [$currentTable, 10],
         );
 
         $this->assertFalse($currentTable['COUNTED']);
@@ -159,23 +153,10 @@ class StructureControllerTest extends AbstractTestCase
         $property = $class->getProperty('dbIsSystemSchema');
         $property->setValue($controller, true);
 
-        $currentTable = [
-            'Data_length' => 16384,
-            'Index_length' => 0,
-            'Name' => 'table',
-            'Data_free' => 300,
-        ];
+        $currentTable = ['Data_length' => 16384, 'Index_length' => 0, 'Name' => 'table', 'Data_free' => 300];
         [$currentTable, , , , , $overheadSize, $sumSize] = $method->invokeArgs(
             $controller,
-            [
-                $currentTable,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-            ],
+            [$currentTable, 0, 0, 0, 0, 0, 0],
         );
         $this->assertEquals(6, $currentTable['Rows']);
         $this->assertEquals(16384, $sumSize);
@@ -184,15 +165,7 @@ class StructureControllerTest extends AbstractTestCase
         unset($currentTable['Data_free']);
         [$currentTable, , , , , $overheadSize] = $method->invokeArgs(
             $controller,
-            [
-                $currentTable,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-            ],
+            [$currentTable, 0, 0, 0, 0, 0, 0],
         );
         $this->assertEquals(0, $overheadSize);
 
@@ -206,15 +179,7 @@ class StructureControllerTest extends AbstractTestCase
         );
         [$currentTable, , , , , , $sumSize] = $method->invokeArgs(
             $controller,
-            [
-                $currentTable,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-            ],
+            [$currentTable, 0, 0, 0, 0, 0, 0],
         );
         $this->assertEquals(0, $sumSize);
 
@@ -228,15 +193,7 @@ class StructureControllerTest extends AbstractTestCase
         );
         [$currentTable] = $method->invokeArgs(
             $controller,
-            [
-                $currentTable,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-            ],
+            [$currentTable, 0, 0, 0, 0, 0, 0],
         );
         $this->assertArrayNotHasKey('Row', $currentTable);
     }
@@ -293,12 +250,7 @@ class StructureControllerTest extends AbstractTestCase
             $this->createStub(TrackingChecker::class),
         );
 
-        $_SESSION['tmpval']['favoriteTables'][$GLOBALS['server']] = [
-            [
-                'db' => 'db',
-                'table' => 'table',
-            ],
-        ];
+        $_SESSION['tmpval']['favoriteTables'][$GLOBALS['server']] = [['db' => 'db', 'table' => 'table']];
 
         $this->assertFalse(
             $method->invokeArgs($controller, ['']),
@@ -380,20 +332,12 @@ class StructureControllerTest extends AbstractTestCase
         $structureController = $GLOBALS['containerBuilder']->get(StructureController::class);
 
         $this->assertSame(
-            [
-                [],
-                '',
-                '',
-                0,
-            ],
+            [[], '', '', 0],
             $this->callFunction(
                 $structureController,
                 StructureController::class,
                 'getValuesForMroongaTable',
-                [
-                    [],
-                    0,
-                ],
+                [[], 0],
             ),
         );
 
@@ -407,35 +351,18 @@ class StructureControllerTest extends AbstractTestCase
         );
 
         $this->assertSame(
-            [
-                [
-                    'Data_length' => 45,
-                    'Index_length' => 60,
-                ],
-                '105',
-                'B',
-                105,
-            ],
+            [['Data_length' => 45, 'Index_length' => 60], '105', 'B', 105],
             $this->callFunction(
                 $structureController,
                 StructureController::class,
                 'getValuesForMroongaTable',
-                [
-                    [
-                        'Data_length' => 45,
-                        'Index_length' => 60,
-                    ],
-                    0,
-                ],
+                [['Data_length' => 45, 'Index_length' => 60], 0],
             ),
         );
 
         $this->assertSame(
             [
-                [
-                    'Data_length' => 45,
-                    'Index_length' => 60,
-                ],
+                ['Data_length' => 45, 'Index_length' => 60],
                 '105',
                 'B',
                 180, //105 + 75
@@ -444,13 +371,7 @@ class StructureControllerTest extends AbstractTestCase
                 $structureController,
                 StructureController::class,
                 'getValuesForMroongaTable',
-                [
-                    [
-                        'Data_length' => 45,
-                        'Index_length' => 60,
-                    ],
-                    75,
-                ],
+                [['Data_length' => 45, 'Index_length' => 60], 75],
             ),
         );
     }
diff --git a/test/classes/Controllers/LintControllerTest.php b/test/classes/Controllers/LintControllerTest.php
index 06e9f0bd39..2f147c58c7 100644
--- a/test/classes/Controllers/LintControllerTest.php
+++ b/test/classes/Controllers/LintControllerTest.php
@@ -28,10 +28,7 @@ class LintControllerTest extends AbstractTestCase
     public function testWithoutParams(): void
     {
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParsedBodyParam')->willReturnMap([
-            ['sql_query', '', ''],
-            ['options', null, null],
-        ]);
+        $request->method('getParsedBodyParam')->willReturnMap([['sql_query', '', ''], ['options', null, null]]);
 
         $this->getLintController()($request);
 
diff --git a/test/classes/Controllers/NavigationControllerTest.php b/test/classes/Controllers/NavigationControllerTest.php
index 8b60beb83e..fdc9d18ef8 100644
--- a/test/classes/Controllers/NavigationControllerTest.php
+++ b/test/classes/Controllers/NavigationControllerTest.php
@@ -76,9 +76,7 @@ class NavigationControllerTest extends AbstractTestCase
                 . 'DB_first_level ASC LIMIT 0, 100) t2 WHERE TRUE AND 1 = LOCATE('
                 . "CONCAT(DB_first_level, '_'), CONCAT(SCHEMA_NAME, '_')) "
                 . 'ORDER BY SCHEMA_NAME ASC',
-            [
-                ['air-balloon_burner_dev2'],
-            ],
+            [['air-balloon_burner_dev2']],
             ['SCHEMA_NAME'],
         );
         $sqlCount = 'SELECT COUNT(*) FROM ( SELECT DISTINCT SUBSTRING_INDEX(SCHEMA_NAME, \'_\', 1) '
@@ -228,11 +226,7 @@ class NavigationControllerTest extends AbstractTestCase
                 . 'DB_first_level ASC LIMIT 0, 100) t2 WHERE TRUE AND 1 = LOCATE('
                 . "CONCAT(DB_first_level, '_'), CONCAT(SCHEMA_NAME, '_')) "
                 . 'ORDER BY SCHEMA_NAME ASC',
-            [
-                ['air-balloon_burner_dev'],
-                ['air-balloon_burner_dev2'],
-                ['air-balloon_dev'],
-            ],
+            [['air-balloon_burner_dev'], ['air-balloon_burner_dev2'], ['air-balloon_dev']],
             ['SCHEMA_NAME'],
         );
 
diff --git a/test/classes/Controllers/Normalization/CreateNewColumnControllerTest.php b/test/classes/Controllers/Normalization/CreateNewColumnControllerTest.php
index fe1cc17b85..5be86c64a4 100644
--- a/test/classes/Controllers/Normalization/CreateNewColumnControllerTest.php
+++ b/test/classes/Controllers/Normalization/CreateNewColumnControllerTest.php
@@ -30,9 +30,7 @@ class CreateNewColumnControllerTest extends AbstractTestCase
         $response = new ResponseRenderer();
         $template = new Template();
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParsedBodyParam')->willReturnMap([
-            ['numFields', null, '1'],
-        ]);
+        $request->method('getParsedBodyParam')->willReturnMap([['numFields', null, '1']]);
 
         $controller = new CreateNewColumnController(
             $response,
diff --git a/test/classes/Controllers/Normalization/FirstNormalForm/FirstStepControllerTest.php b/test/classes/Controllers/Normalization/FirstNormalForm/FirstStepControllerTest.php
index 177a6e1078..5063bf7929 100644
--- a/test/classes/Controllers/Normalization/FirstNormalForm/FirstStepControllerTest.php
+++ b/test/classes/Controllers/Normalization/FirstNormalForm/FirstStepControllerTest.php
@@ -36,9 +36,7 @@ class FirstStepControllerTest extends AbstractTestCase
         $response = new ResponseRenderer();
         $template = new Template();
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParsedBodyParam')->willReturnMap([
-            ['normalizeTo', null, $normalizeTo],
-        ]);
+        $request->method('getParsedBodyParam')->willReturnMap([['normalizeTo', null, $normalizeTo]]);
 
         $controller = new FirstStepController(
             $response,
@@ -69,13 +67,6 @@ class FirstStepControllerTest extends AbstractTestCase
     /** @return array<int, array{string|null, '1nf'|'2nf'|'3nf'}> */
     public static function providerForTestDefault(): iterable
     {
-        return [
-            [null, '1nf'],
-            ['', '1nf'],
-            ['invalid', '1nf'],
-            ['1nf', '1nf'],
-            ['2nf', '2nf'],
-            ['3nf', '3nf'],
-        ];
+        return [[null, '1nf'], ['', '1nf'], ['invalid', '1nf'], ['1nf', '1nf'], ['2nf', '2nf'], ['3nf', '3nf']];
     }
 }
diff --git a/test/classes/Controllers/Normalization/ThirdNormalForm/CreateNewTablesControllerTest.php b/test/classes/Controllers/Normalization/ThirdNormalForm/CreateNewTablesControllerTest.php
index 095d2156f1..63cce12eb5 100644
--- a/test/classes/Controllers/Normalization/ThirdNormalForm/CreateNewTablesControllerTest.php
+++ b/test/classes/Controllers/Normalization/ThirdNormalForm/CreateNewTablesControllerTest.php
@@ -45,9 +45,7 @@ class CreateNewTablesControllerTest extends AbstractTestCase
         $response = new ResponseRenderer();
         $template = new Template();
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParsedBodyParam')->willReturnMap([
-            ['newTables', null, $newTables],
-        ]);
+        $request->method('getParsedBodyParam')->willReturnMap([['newTables', null, $newTables]]);
 
         $controller = new CreateNewTablesController(
             $response,
diff --git a/test/classes/Controllers/Normalization/ThirdNormalForm/FirstStepControllerTest.php b/test/classes/Controllers/Normalization/ThirdNormalForm/FirstStepControllerTest.php
index 7a71e97c32..0228d1947f 100644
--- a/test/classes/Controllers/Normalization/ThirdNormalForm/FirstStepControllerTest.php
+++ b/test/classes/Controllers/Normalization/ThirdNormalForm/FirstStepControllerTest.php
@@ -29,9 +29,7 @@ class FirstStepControllerTest extends AbstractTestCase
         $response = new ResponseRenderer();
         $template = new Template();
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParsedBodyParam')->willReturnMap([
-            ['tables', null, ['test_table']],
-        ]);
+        $request->method('getParsedBodyParam')->willReturnMap([['tables', null, ['test_table']]]);
 
         $controller = new FirstStepController(
             $response,
diff --git a/test/classes/Controllers/Normalization/ThirdNormalForm/NewTablesControllerTest.php b/test/classes/Controllers/Normalization/ThirdNormalForm/NewTablesControllerTest.php
index b04697b50c..c248e3f5dd 100644
--- a/test/classes/Controllers/Normalization/ThirdNormalForm/NewTablesControllerTest.php
+++ b/test/classes/Controllers/Normalization/ThirdNormalForm/NewTablesControllerTest.php
@@ -23,27 +23,11 @@ class NewTablesControllerTest extends AbstractTestCase
         $GLOBALS['db'] = 'test_db';
         $GLOBALS['table'] = 'test_table';
         $tables = json_encode([
-            'test_table' => [
-                'event',
-                'event',
-                'event',
-                'event',
-                'NameOfVenue',
-                'event',
-                'period',
-                'event',
-                'event',
-            ],
+            'test_table' => ['event', 'event', 'event', 'event', 'NameOfVenue', 'event', 'period', 'event', 'event'],
         ]);
         $pd = json_encode([
             '' => [],
-            'event' => [
-                'TypeOfEvent',
-                'period',
-                'Start_time',
-                'NameOfVenue',
-                'LocationOfVenue',
-            ],
+            'event' => ['TypeOfEvent', 'period', 'Start_time', 'NameOfVenue', 'LocationOfVenue'],
             'NameOfVenue' => ['DateOfEvent'],
             'period' => ['NumberOfGuests'],
         ]);
@@ -53,10 +37,7 @@ class NewTablesControllerTest extends AbstractTestCase
         $response = new ResponseRenderer();
         $template = new Template();
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParsedBodyParam')->willReturnMap([
-            ['tables', null, $tables],
-            ['pd', null, $pd],
-        ]);
+        $request->method('getParsedBodyParam')->willReturnMap([['tables', null, $tables], ['pd', null, $pd]]);
 
         $controller = new NewTablesController(
             $response,
diff --git a/test/classes/Controllers/SchemaExportControllerTest.php b/test/classes/Controllers/SchemaExportControllerTest.php
index 7e0c9037a9..31413bedaa 100644
--- a/test/classes/Controllers/SchemaExportControllerTest.php
+++ b/test/classes/Controllers/SchemaExportControllerTest.php
@@ -19,10 +19,7 @@ class SchemaExportControllerTest extends AbstractTestCase
         $GLOBALS['dbi'] = $this->createDatabaseInterface();
 
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParsedBodyParam')->willReturnMap([
-            ['db', null, 'test_db'],
-            ['export_type', null, 'svg'],
-        ]);
+        $request->method('getParsedBodyParam')->willReturnMap([['db', null, 'test_db'], ['export_type', null, 'svg']]);
         $export = $this->createStub(Export::class);
         $export->method('getExportSchemaInfo')->willReturn([
             'fileName' => 'file.svg',
diff --git a/test/classes/Controllers/Server/BinlogControllerTest.php b/test/classes/Controllers/Server/BinlogControllerTest.php
index 4e6aede596..cd1d61524c 100644
--- a/test/classes/Controllers/Server/BinlogControllerTest.php
+++ b/test/classes/Controllers/Server/BinlogControllerTest.php
@@ -53,10 +53,7 @@ class BinlogControllerTest extends AbstractTestCase
         $controller = new BinlogController($response, new Template(), $GLOBALS['dbi']);
 
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParsedBodyParam')->willReturnMap([
-            ['log', null, 'index1'],
-            ['pos', 0, '3'],
-        ]);
+        $request->method('getParsedBodyParam')->willReturnMap([['log', null, 'index1'], ['pos', 0, '3']]);
         $this->dummyDbi->addSelectDb('mysql');
         $controller($request);
         $this->dummyDbi->assertAllSelectsConsumed();
diff --git a/test/classes/Controllers/Server/PrivilegesControllerTest.php b/test/classes/Controllers/Server/PrivilegesControllerTest.php
index e07d25eb3d..8fd5f6ea88 100644
--- a/test/classes/Controllers/Server/PrivilegesControllerTest.php
+++ b/test/classes/Controllers/Server/PrivilegesControllerTest.php
@@ -69,14 +69,9 @@ class PrivilegesControllerTest extends AbstractTestCase
 
         $request = $this->createStub(ServerRequest::class);
 
-        $request->method('getParsedBodyParam')->willReturnMap([
-            ['old_username', '', ''],
-            ['old_hostname', '', ''],
-        ]);
+        $request->method('getParsedBodyParam')->willReturnMap([['old_username', '', ''], ['old_hostname', '', '']]);
 
-        $request->method('getQueryParam')->willReturnMap([
-            ['initial', '', ''],
-        ]);
+        $request->method('getQueryParam')->willReturnMap([['initial', '', '']]);
 
         $response = new ResponseRenderer();
         (new PrivilegesController($response, new Template(), new Relation($this->dbi), $this->dbi))($request);
diff --git a/test/classes/Controllers/Server/Status/AdvisorControllerTest.php b/test/classes/Controllers/Server/Status/AdvisorControllerTest.php
index cbe73d5861..3ebc9ab4ec 100644
--- a/test/classes/Controllers/Server/Status/AdvisorControllerTest.php
+++ b/test/classes/Controllers/Server/Status/AdvisorControllerTest.php
@@ -56,9 +56,7 @@ class AdvisorControllerTest extends AbstractTestCase
 
         $controller($this->createStub(ServerRequest::class));
 
-        $expected = $this->template->render('server/status/advisor/index', [
-            'data' => [],
-        ]);
+        $expected = $this->template->render('server/status/advisor/index', ['data' => []]);
 
         $this->assertSame(
             $expected,
diff --git a/test/classes/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php b/test/classes/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php
index ae67ce20e9..dc468d9bc0 100644
--- a/test/classes/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php
+++ b/test/classes/Controllers/Server/Status/Monitor/GeneralLogControllerTest.php
@@ -48,17 +48,9 @@ class GeneralLogControllerTest extends AbstractTestCase
 
     public function testGeneralLog(): void
     {
-        $value = [
-            'sql_text' => 'insert sql_text',
-            '#' => 10,
-            'argument' => 'argument argument2',
-        ];
+        $value = ['sql_text' => 'insert sql_text', '#' => 10, 'argument' => 'argument argument2'];
 
-        $value2 = [
-            'sql_text' => 'update sql_text',
-            '#' => 11,
-            'argument' => 'argument3 argument4',
-        ];
+        $value2 = ['sql_text' => 'update sql_text', '#' => 11, 'argument' => 'argument3 argument4'];
 
         $response = new ResponseRenderer();
         $response->setAjax(true);
@@ -83,15 +75,8 @@ class GeneralLogControllerTest extends AbstractTestCase
         $this->dummyDbi->assertAllSelectsConsumed();
         $ret = $response->getJSONResult();
 
-        $resultRows = [
-            $value,
-            $value2,
-        ];
-        $resultSum = [
-            'argument' => 10,
-            'TOTAL' => 21,
-            'argument3' => 11,
-        ];
+        $resultRows = [$value, $value2];
+        $resultSum = ['argument' => 10, 'TOTAL' => 21, 'argument3' => 11];
 
         $this->assertEquals(2, $ret['message']['numRows']);
         $this->assertEquals($resultRows, $ret['message']['rows']);
diff --git a/test/classes/Controllers/Server/Status/Monitor/LogVarsControllerTest.php b/test/classes/Controllers/Server/Status/Monitor/LogVarsControllerTest.php
index 05ba5baa62..0ef268a1b3 100644
--- a/test/classes/Controllers/Server/Status/Monitor/LogVarsControllerTest.php
+++ b/test/classes/Controllers/Server/Status/Monitor/LogVarsControllerTest.php
@@ -67,9 +67,7 @@ class LogVarsControllerTest extends AbstractTestCase
         );
 
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParsedBodyParam')->willReturnMap([
-            ['varName', null, 'varName'],
-        ]);
+        $request->method('getParsedBodyParam')->willReturnMap([['varName', null, 'varName']]);
 
         $this->dummyDbi->addSelectDb('mysql');
         $controller($request);
diff --git a/test/classes/Controllers/Server/Status/Monitor/QueryAnalyzerControllerTest.php b/test/classes/Controllers/Server/Status/Monitor/QueryAnalyzerControllerTest.php
index 27c34e0e4d..c4b6ff91b4 100644
--- a/test/classes/Controllers/Server/Status/Monitor/QueryAnalyzerControllerTest.php
+++ b/test/classes/Controllers/Server/Status/Monitor/QueryAnalyzerControllerTest.php
@@ -31,11 +31,7 @@ class QueryAnalyzerControllerTest extends AbstractTestCase
         $GLOBALS['cached_affected_rows'] = 'cached_affected_rows';
         SessionCache::set('profiling_supported', true);
 
-        $value = [
-            'sql_text' => 'insert sql_text',
-            '#' => 10,
-            'argument' => 'argument argument2',
-        ];
+        $value = ['sql_text' => 'insert sql_text', '#' => 10, 'argument' => 'argument argument2'];
 
         $response = new ResponseRenderer();
         $response->setAjax(true);
@@ -47,10 +43,7 @@ class QueryAnalyzerControllerTest extends AbstractTestCase
         $controller = new QueryAnalyzerController($response, new Template(), $statusData, new Monitor($dbi), $dbi);
 
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParsedBodyParam')->willReturnMap([
-            ['database', '', 'database'],
-            ['query', '', 'query'],
-        ]);
+        $request->method('getParsedBodyParam')->willReturnMap([['database', '', 'database'], ['query', '', 'query']]);
 
         $dummyDbi->addSelectDb('mysql');
         $dummyDbi->addSelectDb('database');
diff --git a/test/classes/Controllers/Server/Status/Monitor/SlowLogControllerTest.php b/test/classes/Controllers/Server/Status/Monitor/SlowLogControllerTest.php
index b026083e76..c457a07fa6 100644
--- a/test/classes/Controllers/Server/Status/Monitor/SlowLogControllerTest.php
+++ b/test/classes/Controllers/Server/Status/Monitor/SlowLogControllerTest.php
@@ -60,31 +60,15 @@ class SlowLogControllerTest extends AbstractTestCase
         );
 
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParsedBodyParam')->willReturnMap([
-            ['time_start', null, '0'],
-            ['time_end', null, '10'],
-        ]);
+        $request->method('getParsedBodyParam')->willReturnMap([['time_start', null, '0'], ['time_end', null, '10']]);
 
         $this->dummyDbi->addSelectDb('mysql');
         $controller($request);
         $this->dummyDbi->assertAllSelectsConsumed();
         $ret = $response->getJSONResult();
 
-        $resultRows = [
-            [
-                'sql_text' => 'insert sql_text',
-                '#' => 11,
-            ],
-            [
-                'sql_text' => 'update sql_text',
-                '#' => 10,
-            ],
-        ];
-        $resultSum = [
-            'insert' => 11,
-            'TOTAL' => 21,
-            'update' => 10,
-        ];
+        $resultRows = [['sql_text' => 'insert sql_text', '#' => 11], ['sql_text' => 'update sql_text', '#' => 10]];
+        $resultSum = ['insert' => 11, 'TOTAL' => 21, 'update' => 10];
         $this->assertEquals(2, $ret['message']['numRows']);
         $this->assertEquals($resultRows, $ret['message']['rows']);
         $this->assertEquals($resultSum, $ret['message']['sum']);
diff --git a/test/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php b/test/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php
index f630c1519e..2e4a9ce3c6 100644
--- a/test/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php
+++ b/test/classes/Controllers/Server/Status/Processes/RefreshControllerTest.php
@@ -71,10 +71,7 @@ class RefreshControllerTest extends AbstractTestCase
             ['order_by_field', '', 'process'],
             ['sort_order', '', 'DESC'],
         ]);
-        $request->method('hasBodyParam')->willReturnMap([
-            ['full', true],
-            ['showExecuting', false],
-        ]);
+        $request->method('hasBodyParam')->willReturnMap([['full', true], ['showExecuting', false]]);
 
         $controller($request);
         $html = $response->getHTMLResult();
diff --git a/test/classes/Controllers/Server/Status/ProcessesControllerTest.php b/test/classes/Controllers/Server/Status/ProcessesControllerTest.php
index 1e4277e1bc..bf5d58c286 100644
--- a/test/classes/Controllers/Server/Status/ProcessesControllerTest.php
+++ b/test/classes/Controllers/Server/Status/ProcessesControllerTest.php
@@ -91,10 +91,7 @@ class ProcessesControllerTest extends AbstractTestCase
             ['order_by_field', '', 'Db'],
             ['sort_order', '', 'ASC'],
         ]);
-        $request->method('hasBodyParam')->willReturnMap([
-            ['full', true],
-            ['showExecuting', false],
-        ]);
+        $request->method('hasBodyParam')->willReturnMap([['full', true], ['showExecuting', false]]);
 
         $this->dummyDbi->addSelectDb('mysql');
         $controller($request);
@@ -111,10 +108,7 @@ class ProcessesControllerTest extends AbstractTestCase
             ['order_by_field', '', 'Host'],
             ['sort_order', '', 'DESC'],
         ]);
-        $request->method('hasBodyParam')->willReturnMap([
-            ['full', true],
-            ['showExecuting', false],
-        ]);
+        $request->method('hasBodyParam')->willReturnMap([['full', true], ['showExecuting', false]]);
 
         $this->dummyDbi->addSelectDb('mysql');
         $controller($request);
diff --git a/test/classes/Controllers/Server/VariablesControllerTest.php b/test/classes/Controllers/Server/VariablesControllerTest.php
index 1bd4daa8c6..11c9218d6a 100644
--- a/test/classes/Controllers/Server/VariablesControllerTest.php
+++ b/test/classes/Controllers/Server/VariablesControllerTest.php
@@ -55,26 +55,11 @@ class VariablesControllerTest extends AbstractTestCase
             'big_tables' => 'OFF',
         ];
 
-        $serverGlobalVariables = [
-            'auto_increment_increment' => '0',
-            'auto_increment_offset' => '12',
-        ];
+        $serverGlobalVariables = ['auto_increment_increment' => '0', 'auto_increment_offset' => '12'];
 
         $fetchResult = [
-            [
-                'SHOW SESSION VARIABLES;',
-                0,
-                1,
-                Connection::TYPE_USER,
-                $serverSessionVariables,
-            ],
-            [
-                'SHOW GLOBAL VARIABLES;',
-                0,
-                1,
-                Connection::TYPE_USER,
-                $serverGlobalVariables,
-            ],
+            ['SHOW SESSION VARIABLES;', 0, 1, Connection::TYPE_USER, $serverSessionVariables],
+            ['SHOW GLOBAL VARIABLES;', 0, 1, Connection::TYPE_USER, $serverGlobalVariables],
         ];
 
         $dbi->expects($this->any())->method('fetchResult')
@@ -142,10 +127,7 @@ class VariablesControllerTest extends AbstractTestCase
         $nameForValueNotByte = 'not_a_byte_variable';
 
         //name is_numeric and the value type is byte
-        $args = [
-            $nameForValueByte,
-            '3',
-        ];
+        $args = [$nameForValueByte, '3'];
         $voidProviderMock = $this->getMockBuilder(ServerVariablesVoidProvider::class)->getMock();
 
         $voidProviderMock
@@ -167,10 +149,7 @@ class VariablesControllerTest extends AbstractTestCase
         $this->assertTrue($isHtmlFormatted);
 
         //name is_numeric and the value type is not byte
-        $args = [
-            $nameForValueNotByte,
-            '3',
-        ];
+        $args = [$nameForValueNotByte, '3'];
         [$formattedValue, $isHtmlFormatted] = $this->callFunction(
             $controller,
             VariablesController::class,
@@ -181,10 +160,7 @@ class VariablesControllerTest extends AbstractTestCase
         $this->assertFalse($isHtmlFormatted);
 
         //value is not a number
-        $args = [
-            $nameForValueNotByte,
-            'value',
-        ];
+        $args = [$nameForValueNotByte, 'value'];
         [$formattedValue, $isHtmlFormatted] = $this->callFunction(
             $controller,
             VariablesController::class,
@@ -213,10 +189,7 @@ class VariablesControllerTest extends AbstractTestCase
         $nameForValueNotByte = 'wsrep_thread_count';
 
         //name is_numeric and the value type is byte
-        $args = [
-            $nameForValueByte,
-            '3',
-        ];
+        $args = [$nameForValueByte, '3'];
 
         [$formattedValue, $isHtmlFormatted] = $this->callFunction(
             $controller,
@@ -229,10 +202,7 @@ class VariablesControllerTest extends AbstractTestCase
         $this->assertTrue($isHtmlFormatted);
 
         //name is_numeric and the value type is not byte
-        $args = [
-            $nameForValueNotByte,
-            '3',
-        ];
+        $args = [$nameForValueNotByte, '3'];
         [$formattedValue, $isHtmlFormatted] = $this->callFunction(
             $controller,
             VariablesController::class,
@@ -243,10 +213,7 @@ class VariablesControllerTest extends AbstractTestCase
         $this->assertFalse($isHtmlFormatted);
 
         //value is not a number
-        $args = [
-            $nameForValueNotByte,
-            'value',
-        ];
+        $args = [$nameForValueNotByte, 'value'];
         [$formattedValue, $isHtmlFormatted] = $this->callFunction(
             $controller,
             VariablesController::class,
@@ -270,10 +237,7 @@ class VariablesControllerTest extends AbstractTestCase
         $nameForValueByte = 'wsrep_replicated_bytes';
 
         //name is_numeric and the value type is byte
-        $args = [
-            $nameForValueByte,
-            '3',
-        ];
+        $args = [$nameForValueByte, '3'];
 
         [$formattedValue, $isHtmlFormatted] = $this->callFunction(
             $controller,
diff --git a/test/classes/Controllers/Sql/EnumValuesControllerTest.php b/test/classes/Controllers/Sql/EnumValuesControllerTest.php
index 545b7a8bd2..e4ae42e173 100644
--- a/test/classes/Controllers/Sql/EnumValuesControllerTest.php
+++ b/test/classes/Controllers/Sql/EnumValuesControllerTest.php
@@ -78,14 +78,7 @@ class EnumValuesControllerTest extends AbstractTestCase
                     '',
                 ],
             ],
-            [
-                'Field',
-                'Type',
-                'Null',
-                'Key',
-                'Default',
-                'Extra',
-            ],
+            ['Field', 'Type', 'Null', 'Key', 'Default', 'Extra'],
         );
 
         $GLOBALS['db'] = 'cvv';
diff --git a/test/classes/Controllers/Sql/SetValuesControllerTest.php b/test/classes/Controllers/Sql/SetValuesControllerTest.php
index 86b0d155af..8f3853b478 100644
--- a/test/classes/Controllers/Sql/SetValuesControllerTest.php
+++ b/test/classes/Controllers/Sql/SetValuesControllerTest.php
@@ -79,14 +79,7 @@ class SetValuesControllerTest extends AbstractTestCase
                     '',
                 ],
             ],
-            [
-                'Field',
-                'Type',
-                'Null',
-                'Key',
-                'Default',
-                'Extra',
-            ],
+            ['Field', 'Type', 'Null', 'Key', 'Default', 'Extra'],
         );
 
         $request = $this->createStub(ServerRequest::class);
diff --git a/test/classes/Controllers/Table/ChartControllerTest.php b/test/classes/Controllers/Table/ChartControllerTest.php
index 3d0c457735..03de26ee4d 100644
--- a/test/classes/Controllers/Table/ChartControllerTest.php
+++ b/test/classes/Controllers/Table/ChartControllerTest.php
@@ -60,12 +60,7 @@ class ChartControllerTest extends AbstractTestCase
         $dummyDbi->addSelectDb('test_db');
         $dummyDbi->addResult(
             'SELECT * FROM `test_db`.`table_for_chart`;',
-            [
-                ['1', '7', '2022-02-08'],
-                ['2', '5', '2022-02-09'],
-                ['3', '3', '2022-02-10'],
-                ['4', '9', '2022-02-11'],
-            ],
+            [['1', '7', '2022-02-08'], ['2', '5', '2022-02-09'], ['3', '3', '2022-02-10'], ['4', '9', '2022-02-11']],
             ['id', 'amount', 'date'],
             $fieldsMeta,
         );
diff --git a/test/classes/Controllers/Table/DeleteRowsControllerTest.php b/test/classes/Controllers/Table/DeleteRowsControllerTest.php
index b309da8c97..aa6819b4f9 100644
--- a/test/classes/Controllers/Table/DeleteRowsControllerTest.php
+++ b/test/classes/Controllers/Table/DeleteRowsControllerTest.php
@@ -50,9 +50,7 @@ class DeleteRowsControllerTest extends AbstractTestCase
         $GLOBALS['dbi'] = $dbi;
 
         $request = $this->createStub(ServerRequest::class);
-        $request->method('hasBodyParam')->willReturnMap([
-            ['original_sql_query', true],
-        ]);
+        $request->method('hasBodyParam')->willReturnMap([['original_sql_query', true]]);
         $request->method('getParsedBodyParam')->willReturnMap([
             ['original_sql_query', '', 'SELECT * FROM `test_db`.`test_table`'],
         ]);
diff --git a/test/classes/Controllers/Table/DropColumnConfirmationControllerTest.php b/test/classes/Controllers/Table/DropColumnConfirmationControllerTest.php
index 396f4959d1..53cf3672bc 100644
--- a/test/classes/Controllers/Table/DropColumnConfirmationControllerTest.php
+++ b/test/classes/Controllers/Table/DropColumnConfirmationControllerTest.php
@@ -69,10 +69,7 @@ class DropColumnConfirmationControllerTest extends AbstractTestCase
 
         $this->assertSame(400, $response->getHttpResponseCode());
         $this->assertFalse($response->hasSuccessState());
-        $this->assertSame([
-            'isErrorResponse' => true,
-            'message' => 'No column selected.',
-        ], $response->getJSONResult());
+        $this->assertSame(['isErrorResponse' => true, 'message' => 'No column selected.'], $response->getJSONResult());
         $this->assertSame('', $response->getHTMLResult());
     }
 
diff --git a/test/classes/Controllers/Table/FindReplaceControllerTest.php b/test/classes/Controllers/Table/FindReplaceControllerTest.php
index 284c525aec..c8bea9cadc 100644
--- a/test/classes/Controllers/Table/FindReplaceControllerTest.php
+++ b/test/classes/Controllers/Table/FindReplaceControllerTest.php
@@ -35,18 +35,8 @@ class FindReplaceControllerTest extends AbstractTestCase
         $dbi->types = new Types($dbi);
 
         $columns = [
-            [
-                'Field' => 'Field1',
-                'Type' => 'Type1',
-                'Null' => 'Null1',
-                'Collation' => 'Collation1',
-            ],
-            [
-                'Field' => 'Field2',
-                'Type' => 'Type2',
-                'Null' => 'Null2',
-                'Collation' => 'Collation2',
-            ],
+            ['Field' => 'Field1', 'Type' => 'Type1', 'Null' => 'Null1', 'Collation' => 'Collation1'],
+            ['Field' => 'Field2', 'Type' => 'Type2', 'Null' => 'Null2', 'Collation' => 'Collation2'],
         ];
         $dbi->expects($this->any())->method('getColumns')
             ->will($this->returnValue($columns));
diff --git a/test/classes/Controllers/Table/GetFieldControllerTest.php b/test/classes/Controllers/Table/GetFieldControllerTest.php
index abcc6a456b..f1512a82fc 100644
--- a/test/classes/Controllers/Table/GetFieldControllerTest.php
+++ b/test/classes/Controllers/Table/GetFieldControllerTest.php
@@ -33,10 +33,7 @@ class GetFieldControllerTest extends AbstractTestCase
         $dummyDbi->addSelectDb('test_db');
         $dummyDbi->addResult(
             'SHOW COLUMNS FROM `test_db`.`table_with_blob`',
-            [
-                ['id', 'int(11)', 'NO', 'PRI', null, 'auto_increment'],
-                ['file', 'blob', 'NO', '', null, ''],
-            ],
+            [['id', 'int(11)', 'NO', 'PRI', null, 'auto_increment'], ['file', 'blob', 'NO', '', null, '']],
             ['Field', 'Type', 'Null', 'Key', 'Default', 'Extra'],
         );
         $dummyDbi->addResult(
diff --git a/test/classes/Controllers/Table/IndexesControllerTest.php b/test/classes/Controllers/Table/IndexesControllerTest.php
index 5e61aba223..bfb5b17166 100644
--- a/test/classes/Controllers/Table/IndexesControllerTest.php
+++ b/test/classes/Controllers/Table/IndexesControllerTest.php
@@ -42,31 +42,16 @@ class IndexesControllerTest extends AbstractTestCase
         $GLOBALS['text_dir'] = 'ltr';
         $GLOBALS['cfg']['Server']['pmadb'] = '';
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
-        $GLOBALS['urlParams'] = [
-            'db' => 'db',
-            'server' => 1,
-        ];
+        $GLOBALS['urlParams'] = ['db' => 'db', 'server' => 1];
 
         $dbi = $this->getMockBuilder(DatabaseInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $indexs = [
-            [
-                'Schema' => 'Schema1',
-                'Key_name' => 'Key_name1',
-                'Column_name' => 'Column_name1',
-            ],
-            [
-                'Schema' => 'Schema2',
-                'Key_name' => 'Key_name2',
-                'Column_name' => 'Column_name2',
-            ],
-            [
-                'Schema' => 'Schema3',
-                'Key_name' => 'Key_name3',
-                'Column_name' => 'Column_name3',
-            ],
+            ['Schema' => 'Schema1', 'Key_name' => 'Key_name1', 'Column_name' => 'Column_name1'],
+            ['Schema' => 'Schema2', 'Key_name' => 'Key_name2', 'Column_name' => 'Column_name2'],
+            ['Schema' => 'Schema3', 'Key_name' => 'Key_name3', 'Column_name' => 'Column_name3'],
         ];
 
         $dbi->expects($this->any())->method('getTableIndexes')
@@ -116,11 +101,7 @@ class IndexesControllerTest extends AbstractTestCase
         //Url::getHiddenInputs
         $this->assertStringContainsString(
             Url::getHiddenInputs(
-                [
-                    'db' => 'db',
-                    'table' => 'table',
-                    'create_index' => 1,
-                ],
+                ['db' => 'db', 'table' => 'table', 'create_index' => 1],
             ),
             $html,
         );
diff --git a/test/classes/Controllers/Table/Maintenance/AnalyzeControllerTest.php b/test/classes/Controllers/Table/Maintenance/AnalyzeControllerTest.php
index 3737687ab8..c364777ce0 100644
--- a/test/classes/Controllers/Table/Maintenance/AnalyzeControllerTest.php
+++ b/test/classes/Controllers/Table/Maintenance/AnalyzeControllerTest.php
@@ -36,14 +36,6 @@ class AnalyzeControllerTest extends AbstractTestCase
     /** @return array<int, array{string[][]|string[]|string|null}> */
     public static function providerForTestNoTableSelected(): array
     {
-        return [
-            [null],
-            [''],
-            ['table'],
-            [[]],
-            [['']],
-            [['table', '']],
-            [[['table']]],
-        ];
+        return [[null], [''], ['table'], [[]], [['']], [['table', '']], [[['table']]]];
     }
 }
diff --git a/test/classes/Controllers/Table/Maintenance/CheckControllerTest.php b/test/classes/Controllers/Table/Maintenance/CheckControllerTest.php
index 386279d07f..fa04d08302 100644
--- a/test/classes/Controllers/Table/Maintenance/CheckControllerTest.php
+++ b/test/classes/Controllers/Table/Maintenance/CheckControllerTest.php
@@ -36,14 +36,6 @@ class CheckControllerTest extends AbstractTestCase
     /** @return array<int, array{string[][]|string[]|string|null}> */
     public static function providerForTestNoTableSelected(): array
     {
-        return [
-            [null],
-            [''],
-            ['table'],
-            [[]],
-            [['']],
-            [['table', '']],
-            [[['table']]],
-        ];
+        return [[null], [''], ['table'], [[]], [['']], [['table', '']], [[['table']]]];
     }
 }
diff --git a/test/classes/Controllers/Table/Maintenance/ChecksumControllerTest.php b/test/classes/Controllers/Table/Maintenance/ChecksumControllerTest.php
index cb29d9580a..aab70771ec 100644
--- a/test/classes/Controllers/Table/Maintenance/ChecksumControllerTest.php
+++ b/test/classes/Controllers/Table/Maintenance/ChecksumControllerTest.php
@@ -36,14 +36,6 @@ class ChecksumControllerTest extends AbstractTestCase
     /** @return array<int, array{string[][]|string[]|string|null}> */
     public static function providerForTestNoTableSelected(): array
     {
-        return [
-            [null],
-            [''],
-            ['table'],
-            [[]],
-            [['']],
-            [['table', '']],
-            [[['table']]],
-        ];
+        return [[null], [''], ['table'], [[]], [['']], [['table', '']], [[['table']]]];
     }
 }
diff --git a/test/classes/Controllers/Table/Maintenance/OptimizeControllerTest.php b/test/classes/Controllers/Table/Maintenance/OptimizeControllerTest.php
index d6c82184ee..a7a65c4309 100644
--- a/test/classes/Controllers/Table/Maintenance/OptimizeControllerTest.php
+++ b/test/classes/Controllers/Table/Maintenance/OptimizeControllerTest.php
@@ -36,14 +36,6 @@ class OptimizeControllerTest extends AbstractTestCase
     /** @return array<int, array{string[][]|string[]|string|null}> */
     public static function providerForTestNoTableSelected(): array
     {
-        return [
-            [null],
-            [''],
-            ['table'],
-            [[]],
-            [['']],
-            [['table', '']],
-            [[['table']]],
-        ];
+        return [[null], [''], ['table'], [[]], [['']], [['table', '']], [[['table']]]];
     }
 }
diff --git a/test/classes/Controllers/Table/Maintenance/RepairControllerTest.php b/test/classes/Controllers/Table/Maintenance/RepairControllerTest.php
index 82ffece561..3d2f9834ea 100644
--- a/test/classes/Controllers/Table/Maintenance/RepairControllerTest.php
+++ b/test/classes/Controllers/Table/Maintenance/RepairControllerTest.php
@@ -36,14 +36,6 @@ class RepairControllerTest extends AbstractTestCase
     /** @return array<int, array{string[][]|string[]|string|null}> */
     public static function providerForTestNoTableSelected(): array
     {
-        return [
-            [null],
-            [''],
-            ['table'],
-            [[]],
-            [['']],
-            [['table', '']],
-            [[['table']]],
-        ];
+        return [[null], [''], ['table'], [[]], [['']], [['table', '']], [[['table']]]];
     }
 }
diff --git a/test/classes/Controllers/Table/PrivilegesControllerTest.php b/test/classes/Controllers/Table/PrivilegesControllerTest.php
index 5fabf179cc..774dad85f0 100644
--- a/test/classes/Controllers/Table/PrivilegesControllerTest.php
+++ b/test/classes/Controllers/Table/PrivilegesControllerTest.php
@@ -46,10 +46,7 @@ class PrivilegesControllerTest extends AbstractTestCase
             ->willReturn($privileges);
 
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParam')->willReturnMap([
-            ['db', null, 'db'],
-            ['table', null, 'table'],
-        ]);
+        $request->method('getParam')->willReturnMap([['db', null, 'db'], ['table', null, 'table']]);
 
         $response = new ResponseRenderer();
         (new PrivilegesController(
@@ -63,10 +60,7 @@ class PrivilegesControllerTest extends AbstractTestCase
         $this->assertStringContainsString($GLOBALS['db'] . '.' . $GLOBALS['table'], $actual);
 
         //validate 2: Url::getCommon
-        $item = Url::getCommon([
-            'db' => $GLOBALS['db'],
-            'table' => $GLOBALS['table'],
-        ], '');
+        $item = Url::getCommon(['db' => $GLOBALS['db'], 'table' => $GLOBALS['table']], '');
         $this->assertStringContainsString($item, $actual);
 
         //validate 3: items
@@ -109,10 +103,7 @@ class PrivilegesControllerTest extends AbstractTestCase
     public function testWithInvalidDatabaseName(): void
     {
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParam')->willReturnMap([
-            ['db', null, ''],
-            ['table', null, 'table'],
-        ]);
+        $request->method('getParam')->willReturnMap([['db', null, ''], ['table', null, 'table']]);
 
         $response = new ResponseRenderer();
         (new PrivilegesController(
@@ -130,10 +121,7 @@ class PrivilegesControllerTest extends AbstractTestCase
     public function testWithInvalidTableName(): void
     {
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParam')->willReturnMap([
-            ['db', null, 'db'],
-            ['table', null, ''],
-        ]);
+        $request->method('getParam')->willReturnMap([['db', null, 'db'], ['table', null, '']]);
 
         $response = new ResponseRenderer();
         (new PrivilegesController(
diff --git a/test/classes/Controllers/Table/RelationControllerTest.php b/test/classes/Controllers/Table/RelationControllerTest.php
index 91ef1c8568..1271961e91 100644
--- a/test/classes/Controllers/Table/RelationControllerTest.php
+++ b/test/classes/Controllers/Table/RelationControllerTest.php
@@ -58,11 +58,7 @@ class RelationControllerTest extends AbstractTestCase
      */
     public function testGetDropdownValueForTableActionIsView(): void
     {
-        $viewColumns = [
-            'viewCol',
-            'viewCol2',
-            'viewCol3',
-        ];
+        $viewColumns = ['viewCol', 'viewCol2', 'viewCol3'];
         $tableMock = $this->getMockBuilder(Table::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -136,12 +132,7 @@ class RelationControllerTest extends AbstractTestCase
         $resultStub->expects($this->any())
             ->method('getIterator')
             ->will($this->returnCallback(static function (): Generator {
-                yield from [
-                    [
-                        'Engine' => 'InnoDB',
-                        'Name' => 'table',
-                    ],
-                ];
+                yield from [['Engine' => 'InnoDB', 'Name' => 'table']];
             }));
 
         $ctrl = new RelationController(
diff --git a/test/classes/Controllers/Table/ReplaceControllerTest.php b/test/classes/Controllers/Table/ReplaceControllerTest.php
index 1ce08ef861..7b86a4f96e 100644
--- a/test/classes/Controllers/Table/ReplaceControllerTest.php
+++ b/test/classes/Controllers/Table/ReplaceControllerTest.php
@@ -72,39 +72,19 @@ class ReplaceControllerTest extends AbstractTestCase
         $_POST['table'] = $GLOBALS['table'];
         $_POST['ajax_request'] = 'true';
         $_POST['clause_is_unique'] = 1;
-        $_POST['where_clause'] = [
-            '`test`.`ser` = 2',
-            '`test`.`ser` = 1',
-        ];
+        $_POST['where_clause'] = ['`test`.`ser` = 2', '`test`.`ser` = 1'];
         $_POST['rel_fields_list'] = '';
         $_POST['do_transformations'] = true;
         $_POST['transform_fields_list'] = '0%5Bvc%5D=sss%20s%20s&1%5Bvc%5D=zzff%20s%20sf%0A';
         $_POST['relational_display'] = 'K';
         $_POST['goto'] = 'index.php?route=/sql';
         $_POST['submit_type'] = 'save';
-        $_POST['fields'] = [
-            'multi_edit' => [
-                0 => ['zzff s sf'],
-                1 => ['sss s s'],
-            ],
-        ];
-        $_POST['fields_name'] = [
-            'multi_edit' => [
-                0 => ['vc'],
-                1 => ['vc'],
-            ],
-        ];
-        $_POST['fields_null'] = [
-            'multi_edit' => [
-                0 => [],
-                1 => [],
-            ],
-        ];
+        $_POST['fields'] = ['multi_edit' => [0 => ['zzff s sf'], 1 => ['sss s s']]];
+        $_POST['fields_name'] = ['multi_edit' => [0 => ['vc'], 1 => ['vc']]];
+        $_POST['fields_null'] = ['multi_edit' => [0 => [], 1 => []]];
 
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParsedBodyParam')->willReturnMap([
-            ['sql_query', null, ''],
-        ]);
+        $request->method('getParsedBodyParam')->willReturnMap([['sql_query', null, '']]);
 
         $dummyDbi = $this->createDbiDummy();
         $dbi = $this->createDatabaseInterface($dummyDbi);
diff --git a/test/classes/Controllers/Table/SearchControllerTest.php b/test/classes/Controllers/Table/SearchControllerTest.php
index 2a4a25d3e8..3ef25cb2dc 100644
--- a/test/classes/Controllers/Table/SearchControllerTest.php
+++ b/test/classes/Controllers/Table/SearchControllerTest.php
@@ -62,18 +62,8 @@ class SearchControllerTest extends AbstractTestCase
         $dbi->types = new Types($dbi);
 
         $columns = [
-            [
-                'Field' => 'Field1',
-                'Type' => 'Type1',
-                'Null' => 'Null1',
-                'Collation' => 'Collation1',
-            ],
-            [
-                'Field' => 'Field2',
-                'Type' => 'Type2',
-                'Null' => 'Null2',
-                'Collation' => 'Collation2',
-            ],
+            ['Field' => 'Field1', 'Type' => 'Type1', 'Null' => 'Null1', 'Collation' => 'Collation1'],
+            ['Field' => 'Field2', 'Type' => 'Type2', 'Null' => 'Null2', 'Collation' => 'Collation2'],
         ];
         $dbi->expects($this->any())->method('getColumns')
             ->will($this->returnValue($columns));
@@ -153,16 +143,8 @@ class SearchControllerTest extends AbstractTestCase
 
         $this->dummyDbi->addResult(
             'SELECT * FROM `PMA`.`PMA_BookMark` WHERE `col1` = 1;',
-            [
-                [
-                    1,
-                    2,
-                ],
-            ],
-            [
-                'col1',
-                'col2',
-            ],
+            [[1, 2]],
+            ['col1', 'col2'],
             [
                 new FieldMetadata(MYSQLI_TYPE_LONG, 0, (object) ['length' => 11]),
                 new FieldMetadata(MYSQLI_TYPE_LONG, 0, (object) ['length' => 11]),
@@ -179,10 +161,7 @@ class SearchControllerTest extends AbstractTestCase
         $_POST['table'] = 'PMA_BookMark';
         $_POST['where_clause'] = '`col1` = 1';
         $_POST['where_clause_sign'] = Core::signSqlQuery($_POST['where_clause']);
-        $expected = [
-            'col1' => 1,
-            'col2' => 2,
-        ];
+        $expected = ['col1' => 1, 'col2' => 2];
         $ctrl->getDataRowAction();
 
         $json = $this->getResponseJsonResult();
diff --git a/test/classes/Controllers/Table/Structure/SpatialControllerTest.php b/test/classes/Controllers/Table/Structure/SpatialControllerTest.php
index c130c5fda3..d45404ccf5 100644
--- a/test/classes/Controllers/Table/Structure/SpatialControllerTest.php
+++ b/test/classes/Controllers/Table/Structure/SpatialControllerTest.php
@@ -29,9 +29,7 @@ class SpatialControllerTest extends AbstractTestCase
         $dbi = $this->createDatabaseInterface($dbiDummy);
         $GLOBALS['dbi'] = $dbi;
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParsedBodyParam')->willReturnMap([
-            ['selected_fld', [], ['test_field']],
-        ]);
+        $request->method('getParsedBodyParam')->willReturnMap([['selected_fld', [], ['test_field']]]);
         $controllerStub = $this->createMock(StructureController::class);
         $controllerStub->expects($this->once())->method('__invoke')->with($request);
 
@@ -59,9 +57,7 @@ class SpatialControllerTest extends AbstractTestCase
         $dbi = $this->createDatabaseInterface($dbiDummy);
         $GLOBALS['dbi'] = $dbi;
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParsedBodyParam')->willReturnMap([
-            ['selected_fld', [], ['test_field1', 'test_field2']],
-        ]);
+        $request->method('getParsedBodyParam')->willReturnMap([['selected_fld', [], ['test_field1', 'test_field2']]]);
         $controllerStub = $this->createMock(StructureController::class);
         $controllerStub->expects($this->once())->method('__invoke')->with($request);
 
@@ -86,9 +82,7 @@ class SpatialControllerTest extends AbstractTestCase
         $dbi = $this->createDatabaseInterface();
         $GLOBALS['dbi'] = $dbi;
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParsedBodyParam')->willReturnMap([
-            ['selected_fld', [], null],
-        ]);
+        $request->method('getParsedBodyParam')->willReturnMap([['selected_fld', [], null]]);
         $controllerStub = $this->createMock(StructureController::class);
         $controllerStub->expects($this->never())->method('__invoke');
         $response = new ResponseRenderer();
@@ -119,9 +113,7 @@ class SpatialControllerTest extends AbstractTestCase
         $dbi = $this->createDatabaseInterface($dbiDummy);
         $GLOBALS['dbi'] = $dbi;
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParsedBodyParam')->willReturnMap([
-            ['selected_fld', [], ['test_field']],
-        ]);
+        $request->method('getParsedBodyParam')->willReturnMap([['selected_fld', [], ['test_field']]]);
         $controllerStub = $this->createMock(StructureController::class);
         $controllerStub->expects($this->once())->method('__invoke')->with($request);
 
diff --git a/test/classes/Controllers/Table/Structure/UniqueControllerTest.php b/test/classes/Controllers/Table/Structure/UniqueControllerTest.php
index dd1104b8bf..5f1ab8f5ac 100644
--- a/test/classes/Controllers/Table/Structure/UniqueControllerTest.php
+++ b/test/classes/Controllers/Table/Structure/UniqueControllerTest.php
@@ -29,9 +29,7 @@ class UniqueControllerTest extends AbstractTestCase
         $dbi = $this->createDatabaseInterface($dbiDummy);
         $GLOBALS['dbi'] = $dbi;
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParsedBodyParam')->willReturnMap([
-            ['selected_fld', [], ['test_field']],
-        ]);
+        $request->method('getParsedBodyParam')->willReturnMap([['selected_fld', [], ['test_field']]]);
         $controllerStub = $this->createMock(StructureController::class);
         $controllerStub->expects($this->once())->method('__invoke')->with($request);
 
@@ -59,9 +57,7 @@ class UniqueControllerTest extends AbstractTestCase
         $dbi = $this->createDatabaseInterface($dbiDummy);
         $GLOBALS['dbi'] = $dbi;
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParsedBodyParam')->willReturnMap([
-            ['selected_fld', [], ['test_field1', 'test_field2']],
-        ]);
+        $request->method('getParsedBodyParam')->willReturnMap([['selected_fld', [], ['test_field1', 'test_field2']]]);
         $controllerStub = $this->createMock(StructureController::class);
         $controllerStub->expects($this->once())->method('__invoke')->with($request);
 
@@ -86,9 +82,7 @@ class UniqueControllerTest extends AbstractTestCase
         $dbi = $this->createDatabaseInterface();
         $GLOBALS['dbi'] = $dbi;
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParsedBodyParam')->willReturnMap([
-            ['selected_fld', [], null],
-        ]);
+        $request->method('getParsedBodyParam')->willReturnMap([['selected_fld', [], null]]);
         $controllerStub = $this->createMock(StructureController::class);
         $controllerStub->expects($this->never())->method('__invoke');
         $response = new ResponseRenderer();
@@ -119,9 +113,7 @@ class UniqueControllerTest extends AbstractTestCase
         $dbi = $this->createDatabaseInterface($dbiDummy);
         $GLOBALS['dbi'] = $dbi;
         $request = $this->createStub(ServerRequest::class);
-        $request->method('getParsedBodyParam')->willReturnMap([
-            ['selected_fld', [], ['test_field']],
-        ]);
+        $request->method('getParsedBodyParam')->willReturnMap([['selected_fld', [], ['test_field']]]);
         $controllerStub = $this->createMock(StructureController::class);
         $controllerStub->expects($this->once())->method('__invoke')->with($request);
 
diff --git a/test/classes/Controllers/ThemeSetControllerTest.php b/test/classes/Controllers/ThemeSetControllerTest.php
index 82928137c9..6a886a721b 100644
--- a/test/classes/Controllers/ThemeSetControllerTest.php
+++ b/test/classes/Controllers/ThemeSetControllerTest.php
@@ -77,13 +77,6 @@ class ThemeSetControllerTest extends AbstractTestCase
      */
     public static function providerForTestWithoutTheme(): iterable
     {
-        return [
-            [true, null],
-            [true, ''],
-            [true, ['theme_name']],
-            [false, null],
-            [false, ''],
-            [false, ['theme_name']],
-        ];
+        return [[true, null], [true, ''], [true, ['theme_name']], [false, null], [false, ''], [false, ['theme_name']]];
     }
 }
diff --git a/test/classes/CoreTest.php b/test/classes/CoreTest.php
index 67dfb0b531..e1a93c1aff 100644
--- a/test/classes/CoreTest.php
+++ b/test/classes/CoreTest.php
@@ -51,27 +51,8 @@ class CoreTest extends AbstractNetworkTestCase
         $arr = [
             'int' => 1,
             'str' => 'str_val',
-            'arr' => [
-                'val1',
-                'val2',
-                'val3',
-            ],
-            'sarr' => [
-                'arr1' => [
-                    1,
-                    2,
-                    3,
-                ],
-                [
-                    3,
-                    [
-                        'a',
-                        'b',
-                        'c',
-                    ],
-                    4,
-                ],
-            ],
+            'arr' => ['val1', 'val2', 'val3'],
+            'sarr' => ['arr1' => [1, 2, 3], [3, ['a', 'b', 'c'], 4]],
         ];
 
         $this->assertEquals(
@@ -153,27 +134,8 @@ class CoreTest extends AbstractNetworkTestCase
         $arr = [
             'int' => 1,
             'str' => 'str_val',
-            'arr' => [
-                'val1',
-                'val2',
-                'val3',
-            ],
-            'sarr' => [
-                'arr1' => [
-                    1,
-                    2,
-                    3,
-                ],
-                [
-                    3,
-                    [
-                        'a',
-                        'b',
-                        'c',
-                    ],
-                    4,
-                ],
-            ],
+            'arr' => ['val1', 'val2', 'val3'],
+            'sarr' => ['arr1' => [1, 2, 3], [3, ['a', 'b', 'c'], 4]],
         ];
 
         Core::arrayWrite('int', $arr, 5);
@@ -221,27 +183,8 @@ class CoreTest extends AbstractNetworkTestCase
         $arr = [
             'int' => 1,
             'str' => 'str_val',
-            'arr' => [
-                'val1',
-                'val2',
-                'val3',
-            ],
-            'sarr' => [
-                'arr1' => [
-                    1,
-                    2,
-                    3,
-                ],
-                [
-                    3,
-                    [
-                        'a',
-                        'b',
-                        'c',
-                    ],
-                    4,
-                ],
-            ],
+            'arr' => ['val1', 'val2', 'val3'],
+            'sarr' => ['arr1' => [1, 2, 3], [3, ['a', 'b', 'c'], 4]],
         ];
 
         Core::arrayRemove('int', $arr);
@@ -312,54 +255,14 @@ class CoreTest extends AbstractNetworkTestCase
     public static function providerTestGotoNowhere(): array
     {
         return [
-            [
-                '',
-                [],
-                false,
-                false,
-            ],
-            [
-                '',
-                [],
-                true,
-                false,
-            ],
-            [
-                'shell.php',
-                ['index.php'],
-                false,
-                false,
-            ],
-            [
-                'shell.php',
-                ['index.php'],
-                true,
-                false,
-            ],
-            [
-                'index.php?sql.php&test=true',
-                ['index.php'],
-                false,
-                true,
-            ],
-            [
-                'index.php?sql.php&test=true',
-                ['index.php'],
-                true,
-                false,
-            ],
-            [
-                'index.php%3Fsql.php%26test%3Dtrue',
-                ['index.php'],
-                false,
-                true,
-            ],
-            [
-                'index.php%3Fsql.php%26test%3Dtrue',
-                ['index.php'],
-                true,
-                false,
-            ],
+            ['', [], false, false],
+            ['', [], true, false],
+            ['shell.php', ['index.php'], false, false],
+            ['shell.php', ['index.php'], true, false],
+            ['index.php?sql.php&test=true', ['index.php'], false, true],
+            ['index.php?sql.php&test=true', ['index.php'], true, false],
+            ['index.php%3Fsql.php%26test%3Dtrue', ['index.php'], false, true],
+            ['index.php%3Fsql.php%26test%3Dtrue', ['index.php'], true, false],
         ];
     }
 
@@ -386,54 +289,18 @@ class CoreTest extends AbstractNetworkTestCase
     public static function providerTestGetRealSize(): array
     {
         return [
-            [
-                '0',
-                0,
-            ],
-            [
-                '1kb',
-                1024,
-            ],
-            [
-                '1024k',
-                1024 * 1024,
-            ],
-            [
-                '8m',
-                8 * 1024 * 1024,
-            ],
-            [
-                '12gb',
-                12 * 1024 * 1024 * 1024,
-            ],
-            [
-                '1024',
-                1024,
-            ],
-            [
-                '8000m',
-                8 * 1000 * 1024 * 1024,
-            ],
-            [
-                '8G',
-                8 * 1024 * 1024 * 1024,
-            ],
-            [
-                '2048',
-                2048,
-            ],
-            [
-                '2048K',
-                2048 * 1024,
-            ],
-            [
-                '2048K',
-                2048 * 1024,
-            ],
-            [
-                '102400K',
-                102400 * 1024,
-            ],
+            ['0', 0],
+            ['1kb', 1024],
+            ['1024k', 1024 * 1024],
+            ['8m', 8 * 1024 * 1024],
+            ['12gb', 12 * 1024 * 1024 * 1024],
+            ['1024', 1024],
+            ['8000m', 8 * 1000 * 1024 * 1024],
+            ['8G', 8 * 1024 * 1024 * 1024],
+            ['2048', 2048],
+            ['2048K', 2048 * 1024],
+            ['2048K', 2048 * 1024],
+            ['102400K', 102400 * 1024],
         ];
     }
 
@@ -471,22 +338,10 @@ class CoreTest extends AbstractNetworkTestCase
     public static function providerTestLinkURL(): array
     {
         return [
-            [
-                'https://wiki.phpmyadmin.net',
-                'index.php?route=/url&url=https%3A%2F%2Fwiki.phpmyadmin.net',
-            ],
-            [
-                'https://wiki.phpmyadmin.net',
-                'index.php?route=/url&url=https%3A%2F%2Fwiki.phpmyadmin.net',
-            ],
-            [
-                'wiki.phpmyadmin.net',
-                'wiki.phpmyadmin.net',
-            ],
-            [
-                'index.php?db=phpmyadmin',
-                'index.php?db=phpmyadmin',
-            ],
+            ['https://wiki.phpmyadmin.net', 'index.php?route=/url&url=https%3A%2F%2Fwiki.phpmyadmin.net'],
+            ['https://wiki.phpmyadmin.net', 'index.php?route=/url&url=https%3A%2F%2Fwiki.phpmyadmin.net'],
+            ['wiki.phpmyadmin.net', 'wiki.phpmyadmin.net'],
+            ['index.php?db=phpmyadmin', 'index.php?db=phpmyadmin'],
         ];
     }
 
@@ -642,51 +497,20 @@ class CoreTest extends AbstractNetworkTestCase
     public static function provideTestSafeUnserialize(): array
     {
         return [
-            [
-                's:6:"foobar";',
-                'foobar',
-            ],
-            [
-                'foobar',
-                null,
-            ],
-            [
-                'b:0;',
-                false,
-            ],
-            [
-                'O:1:"a":1:{s:5:"value";s:3:"100";}',
-                null,
-            ],
-            [
-                'O:8:"stdClass":1:{s:5:"field";O:8:"stdClass":0:{}}',
-                null,
-            ],
+            ['s:6:"foobar";', 'foobar'],
+            ['foobar', null],
+            ['b:0;', false],
+            ['O:1:"a":1:{s:5:"value";s:3:"100";}', null],
+            ['O:8:"stdClass":1:{s:5:"field";O:8:"stdClass":0:{}}', null],
             [
                 'a:2:{i:0;s:90:"1234567890;a3456789012345678901234567890123456789012'
                 . '34567890123456789012345678901234567890";i:1;O:8:"stdClass":0:{}}',
                 null,
             ],
-            [
-                serialize([1, 2, 3]),
-                [
-                    1,
-                    2,
-                    3,
-                ],
-            ],
-            [
-                serialize('string""'),
-                'string""',
-            ],
-            [
-                serialize(['foo' => 'bar']),
-                ['foo' => 'bar'],
-            ],
-            [
-                serialize(['1', new stdClass(), '2']),
-                null,
-            ],
+            [serialize([1, 2, 3]), [1, 2, 3]],
+            [serialize('string""'), 'string""'],
+            [serialize(['foo' => 'bar']), ['foo' => 'bar']],
+            [serialize(['1', new stdClass(), '2']), null],
         ];
     }
 
@@ -714,22 +538,10 @@ class CoreTest extends AbstractNetworkTestCase
     public static function provideTestSanitizeMySQLHost(): array
     {
         return [
-            [
-                'p:foo.bar',
-                'foo.bar',
-            ],
-            [
-                'p:p:foo.bar',
-                'foo.bar',
-            ],
-            [
-                'bar.baz',
-                'bar.baz',
-            ],
-            [
-                'P:example.com',
-                'example.com',
-            ],
+            ['p:foo.bar', 'foo.bar'],
+            ['p:p:foo.bar', 'foo.bar'],
+            ['bar.baz', 'bar.baz'],
+            ['P:example.com', 'example.com'],
         ];
     }
 
@@ -937,12 +749,7 @@ class CoreTest extends AbstractNetworkTestCase
     /** @return array<int, array<int, array<string, string|mixed[]>>> */
     public static function providerForTestPopulateRequestWithEncryptedQueryParamsWithInvalidParam(): array
     {
-        return [
-            [[], []],
-            [['eq' => []], []],
-            [['eq' => ''], []],
-            [['eq' => 'invalid'], []],
-        ];
+        return [[[], []], [['eq' => []], []], [['eq' => ''], []], [['eq' => 'invalid'], []]];
     }
 
     /**
diff --git a/test/classes/CreateAddFieldTest.php b/test/classes/CreateAddFieldTest.php
index 710d63f4c9..a39a887c84 100644
--- a/test/classes/CreateAddFieldTest.php
+++ b/test/classes/CreateAddFieldTest.php
@@ -47,17 +47,10 @@ class CreateAddFieldTest extends AbstractTestCase
     public static function providerGetPartitionsDefinition(): array
     {
         return [
-            [
-                '',
-                [],
-            ],
+            ['', []],
             [
                 ' PARTITION BY HASH (EXPR()) PARTITIONS 2',
-                [
-                    'partition_by' => 'HASH',
-                    'partition_expr' => 'EXPR()',
-                    'partition_count' => '2',
-                ],
+                ['partition_by' => 'HASH', 'partition_expr' => 'EXPR()', 'partition_count' => '2'],
             ],
             [
                 ' PARTITION BY LIST (EXPR2()) PARTITIONS 2 ( PARTITION p0,  PARTITION p1)',
@@ -320,12 +313,7 @@ class CreateAddFieldTest extends AbstractTestCase
      */
     public static function providerGetNumberOfFieldsFromRequest(): array
     {
-        return [
-            [
-                4,
-                [],
-            ],
-        ];
+        return [[4, []]];
     }
 
     /**
@@ -434,16 +422,7 @@ class CreateAddFieldTest extends AbstractTestCase
                             'Key_block_size' => '',
                             'Parser' => '',
                             'Index_type' => '',
-                            'columns' => [
-                                [
-                                    'col_index' => '0',
-                                    'size' => '12',
-                                ],
-                                [
-                                    'col_index' => '0',
-                                    'size' => '',
-                                ],
-                            ],
+                            'columns' => [['col_index' => '0','size' => '12'], ['col_index' => '0','size' => '']],
                         ],
                         [
                             'Key_name' => 'un3',
@@ -452,12 +431,7 @@ class CreateAddFieldTest extends AbstractTestCase
                             'Key_block_size' => '',
                             'Parser' => 'Parser 1',
                             'Index_type' => 'BTREE',
-                            'columns' => [
-                                [
-                                    'col_index' => '0',
-                                    'size' => '12',
-                                ],
-                            ],
+                            'columns' => [['col_index' => '0', 'size' => '12']],
                         ],
                         [
                             'Key_name' => 'un3.1',
@@ -466,12 +440,7 @@ class CreateAddFieldTest extends AbstractTestCase
                             'Key_block_size' => '',
                             'Parser' => 'Parser 1',
                             'Index_type' => 'BTREE',
-                            'columns' => [
-                                [
-                                    'col_index' => '0',
-                                    'size' => '12',
-                                ],
-                            ],
+                            'columns' => [['col_index' => '0', 'size' => '12']],
                         ],
                         [
                             'Key_name' => 'un2',
@@ -480,12 +449,7 @@ class CreateAddFieldTest extends AbstractTestCase
                             'Key_block_size' => '32',
                             'Parser' => '',
                             'Index_type' => 'BTREE',
-                            'columns' => [
-                                [
-                                    'col_index' => '0',
-                                    'size' => '12',
-                                ],
-                            ],
+                            'columns' => [['col_index' => '0', 'size' => '12']],
                         ],
                     ]),
                     'indexes' => json_encode([]),
diff --git a/test/classes/Database/CentralColumnsTest.php b/test/classes/Database/CentralColumnsTest.php
index ce00e13a4e..b03c245209 100644
--- a/test/classes/Database/CentralColumnsTest.php
+++ b/test/classes/Database/CentralColumnsTest.php
@@ -133,21 +133,9 @@ class CentralColumnsTest extends AbstractTestCase
             ->will(
                 $this->returnValue(
                     [
-                        'id' => [
-                            'Field' => 'id',
-                            'Type' => 'integer',
-                            'Null' => 'NO',
-                        ],
-                        'col1' => [
-                            'Field' => 'col1',
-                            'Type' => 'varchar(100)',
-                            'Null' => 'YES',
-                        ],
-                        'col2' => [
-                            'Field' => 'col2',
-                            'Type' => 'DATETIME',
-                            'Null' => 'NO',
-                        ],
+                        'id' => ['Field' => 'id', 'Type' => 'integer', 'Null' => 'NO'],
+                        'col1' => ['Field' => 'col1', 'Type' => 'varchar(100)', 'Null' => 'YES'],
+                        'col2' => ['Field' => 'col2', 'Type' => 'DATETIME', 'Null' => 'NO'],
                     ],
                 ),
             );
@@ -174,11 +162,7 @@ class CentralColumnsTest extends AbstractTestCase
     public function testGetParams(): void
     {
         $this->assertSame(
-            [
-                'user' => 'pma_user',
-                'db' => 'phpmyadmin',
-                'table' => 'pma_central_columns',
-            ],
+            ['user' => 'pma_user', 'db' => 'phpmyadmin', 'table' => 'pma_central_columns'],
             $this->centralColumns->getParams(),
         );
     }
@@ -287,10 +271,7 @@ class CentralColumnsTest extends AbstractTestCase
                 $this->returnValue(['id', 'col1']),
             );
         $this->assertEquals(
-            [
-                'id',
-                'col1',
-            ],
+            ['id', 'col1'],
             $this->centralColumns->getFromTable(
                 $db,
                 $table,
@@ -370,38 +351,14 @@ class CentralColumnsTest extends AbstractTestCase
     {
         $params = [];
         $params['db'] = 'phpmyadmin';
-        $params['orig_col_name'] = [
-            'col1',
-            'col2',
-        ];
-        $params['field_name'] = [
-            'col1',
-            'col2',
-        ];
-        $params['field_default_type'] = [
-            '',
-            '',
-        ];
-        $params['col_extra'] = [
-            '',
-            '',
-        ];
-        $params['field_length'] = [
-            '',
-            '',
-        ];
-        $params['field_attribute'] = [
-            '',
-            '',
-        ];
-        $params['field_type'] = [
-            '',
-            '',
-        ];
-        $params['field_collation'] = [
-            '',
-            '',
-        ];
+        $params['orig_col_name'] = ['col1', 'col2'];
+        $params['field_name'] = ['col1', 'col2'];
+        $params['field_default_type'] = ['', ''];
+        $params['col_extra'] = ['', ''];
+        $params['field_length'] = ['', ''];
+        $params['field_attribute'] = ['', ''];
+        $params['field_type'] = ['', ''];
+        $params['field_collation'] = ['', ''];
         $this->assertTrue(
             $this->centralColumns->updateMultipleColumn($params),
         );
@@ -425,31 +382,21 @@ class CentralColumnsTest extends AbstractTestCase
                 $this->returnValue($this->columnData),
             );
         $result = $this->centralColumns->getHtmlForEditingPage(
-            [
-                'col1',
-                'col2',
-            ],
+            ['col1', 'col2'],
             'phpmyadmin',
         );
         $listDetailCols = $this->callFunction(
             $this->centralColumns,
             CentralColumns::class,
             'findExistingColNames',
-            [
-                'phpmyadmin',
-                "'col1','col2'",
-                true,
-            ],
+            ['phpmyadmin', "'col1','col2'", true],
         );
         $this->assertStringContainsString(
             $this->callFunction(
                 $this->centralColumns,
                 CentralColumns::class,
                 'getHtmlForEditTableRow',
-                [
-                    $listDetailCols[0],
-                    0,
-                ],
+                [$listDetailCols[0], 0],
             ),
             $result,
         );
@@ -529,11 +476,7 @@ class CentralColumnsTest extends AbstractTestCase
                 $this->centralColumns,
                 CentralColumns::class,
                 'findExistingColNames',
-                [
-                    'phpmyadmin',
-                    "'col1'",
-                    true,
-                ],
+                ['phpmyadmin', "'col1'", true],
             ),
         );
     }
diff --git a/test/classes/Database/Designer/CommonTest.php b/test/classes/Database/Designer/CommonTest.php
index e3888f5ab8..95a023d85c 100644
--- a/test/classes/Database/Designer/CommonTest.php
+++ b/test/classes/Database/Designer/CommonTest.php
@@ -340,12 +340,7 @@ class CommonTest extends AbstractTestCase
 
         $this->dummyDbi->addResult(
             'SHOW CREATE TABLE `db\'2`.`table\'2`',
-            [
-                [
-                    'table\'2',
-                    $createTableString,
-                ],
-            ],
+            [['table\'2', $createTableString]],
             ['Table', 'Create Table'],
         );
     }
@@ -369,10 +364,7 @@ class CommonTest extends AbstractTestCase
 
         $result = $this->designerCommon->removeRelation('db\'1.table\'1', 'field\'1', 'db\'2.table\'2', 'field\'2');
 
-        $this->assertSame([
-            false,
-            'Error: Relational features are disabled!',
-        ], $result);
+        $this->assertSame([false, 'Error: Relational features are disabled!'], $result);
     }
 
     public function testRemoveRelationWorkingRelationDb(): void
@@ -414,10 +406,7 @@ class CommonTest extends AbstractTestCase
 
         $result = $this->designerCommon->removeRelation('db\'1.table\'1', 'field\'1', 'db\'2.table\'2', 'field\'2');
 
-        $this->assertSame([
-            true,
-            'Internal relationship has been removed.',
-        ], $result);
+        $this->assertSame([true, 'Internal relationship has been removed.'], $result);
     }
 
     public function testRemoveRelationWorkingRelationDbFoundFk(): void
@@ -479,10 +468,7 @@ class CommonTest extends AbstractTestCase
 
         $result = $this->designerCommon->removeRelation('db\'1.table\'1', 'field\'1', 'db\'2.table\'2', 'field\'2');
 
-        $this->assertSame([
-            true,
-            'FOREIGN KEY relationship has been removed.',
-        ], $result);
+        $this->assertSame([true, 'FOREIGN KEY relationship has been removed.'], $result);
     }
 
     public function testRemoveRelationWorkingRelationDbDeleteFails(): void
@@ -524,9 +510,6 @@ class CommonTest extends AbstractTestCase
 
         $result = $this->designerCommon->removeRelation('db\'1.table\'1', 'field\'1', 'db\'2.table\'2', 'field\'2');
 
-        $this->assertSame([
-            false,
-            'Error: Internal relationship could not be removed!<br>',
-        ], $result);
+        $this->assertSame([false, 'Error: Internal relationship could not be removed!<br>'], $result);
     }
 }
diff --git a/test/classes/Database/DesignerTest.php b/test/classes/Database/DesignerTest.php
index fe17df7052..ac54e42e23 100644
--- a/test/classes/Database/DesignerTest.php
+++ b/test/classes/Database/DesignerTest.php
@@ -29,10 +29,7 @@ class DesignerTest extends AbstractTestCase
 
         $GLOBALS['server'] = 1;
         $GLOBALS['cfg']['ServerDefault'] = 1;
-        $GLOBALS['cfg']['PDFPageSizes'] = [
-            'A3',
-            'A4',
-        ];
+        $GLOBALS['cfg']['PDFPageSizes'] = ['A3', 'A4'];
         $GLOBALS['cfg']['PDFDefaultPageSize'] = 'A4';
         $GLOBALS['cfg']['Schema']['pdf_orientation'] = 'L';
         $GLOBALS['cfg']['Schema']['pdf_paper'] = 'A4';
@@ -75,14 +72,8 @@ class DesignerTest extends AbstractTestCase
         $resultStub->expects($this->exactly(3))
             ->method('fetchAssoc')
             ->willReturnOnConsecutiveCalls(
-                [
-                    'page_nr' => '1',
-                    'page_descr' => 'page1',
-                ],
-                [
-                    'page_nr' => '2',
-                    'page_descr' => 'page2',
-                ],
+                ['page_nr' => '1', 'page_descr' => 'page1'],
+                ['page_nr' => '2', 'page_descr' => 'page2'],
                 [],
             );
 
@@ -107,10 +98,7 @@ class DesignerTest extends AbstractTestCase
         $result = $method->invokeArgs($this->designer, [$db]);
 
         $this->assertEquals(
-            [
-                '1' => 'page1',
-                '2' => 'page2',
-            ],
+            ['1' => 'page1', '2' => 'page2'],
             $result,
         );
     }
diff --git a/test/classes/Database/QbeTest.php b/test/classes/Database/QbeTest.php
index f16015d981..2d276233da 100644
--- a/test/classes/Database/QbeTest.php
+++ b/test/classes/Database/QbeTest.php
@@ -185,11 +185,7 @@ class QbeTest extends AbstractTestCase
                 $object,
                 Qbe::class,
                 'getIndexes',
-                [
-                    ['`table1`', 'table2'],
-                    ['column1', 'column2', 'column3'],
-                    ['column2'],
-                ],
+                [['`table1`', 'table2'], ['column1', 'column2', 'column3'], ['column2']],
             ),
         );
     }
@@ -207,11 +203,7 @@ class QbeTest extends AbstractTestCase
                 $object,
                 Qbe::class,
                 'getLeftJoinColumnCandidates',
-                [
-                    ['`table1`', 'table2'],
-                    ['column1', 'column2', 'column3'],
-                    ['column2'],
-                ],
+                [['`table1`', 'table2'], ['column1', 'column2', 'column3'], ['column2']],
             ),
         );
     }
@@ -226,12 +218,7 @@ class QbeTest extends AbstractTestCase
                 $object,
                 Qbe::class,
                 'getMasterTable',
-                [
-                    ['table1', 'table2'],
-                    ['column1', 'column2', 'column3'],
-                    ['column2'],
-                    ['qbe_test'],
-                ],
+                [['table1', 'table2'], ['column1', 'column2', 'column3'], ['column2'], ['qbe_test']],
             ),
         );
     }
@@ -240,12 +227,7 @@ class QbeTest extends AbstractTestCase
     {
         $GLOBALS['dbi'] = $this->createDatabaseInterface();
         $object = new Qbe(new Relation($GLOBALS['dbi']), new Template(), $GLOBALS['dbi'], 'pma_test');
-        $_POST['criteriaColumn'] = [
-            'table1.id',
-            'table1.value',
-            'table1.name',
-            'table1.deleted',
-        ];
+        $_POST['criteriaColumn'] = ['table1.id', 'table1.value', 'table1.name', 'table1.deleted'];
         $this->assertEquals(
             ['where_clause_tables' => [], 'where_clause_columns' => []],
             $this->callFunction($object, Qbe::class, 'getWhereClauseTablesAndColumns', []),
@@ -263,12 +245,7 @@ class QbeTest extends AbstractTestCase
         $dbiDummy->addResult('SHOW CREATE TABLE `pma_test`.`table1`', [[$createTableStatement]]);
         $GLOBALS['dbi'] = $this->createDatabaseInterface($dbiDummy);
         $object = new Qbe(new Relation($GLOBALS['dbi']), new Template(), $GLOBALS['dbi'], 'pma_test');
-        $_POST['criteriaColumn'] = [
-            'table1.id',
-            'table1.value',
-            'table1.name',
-            'table1.deleted',
-        ];
+        $_POST['criteriaColumn'] = ['table1.id', 'table1.value', 'table1.name', 'table1.deleted'];
         $this->assertEquals('`table1`', $this->callFunction($object, Qbe::class, 'getFromClause', [['`table1`.`id`']]));
     }
 
@@ -283,12 +260,7 @@ class QbeTest extends AbstractTestCase
         $dbiDummy->addResult('SHOW CREATE TABLE `pma_test`.`table1`', [[$createTableStatement]]);
         $GLOBALS['dbi'] = $this->createDatabaseInterface($dbiDummy);
         $object = new Qbe(new Relation($GLOBALS['dbi']), new Template(), $GLOBALS['dbi'], 'pma_test');
-        $_POST['criteriaColumn'] = [
-            'table1.id',
-            'table1.value',
-            'table1.name',
-            'table1.deleted',
-        ];
+        $_POST['criteriaColumn'] = ['table1.id', 'table1.value', 'table1.name', 'table1.deleted'];
         $this->assertEquals(
             'FROM `table1`' . "\n",
             $this->callFunction($object, Qbe::class, 'getSQLQuery', [['`table1`.`id`']]),
diff --git a/test/classes/Database/RoutinesTest.php b/test/classes/Database/RoutinesTest.php
index e755330518..e7c31bfaae 100644
--- a/test/classes/Database/RoutinesTest.php
+++ b/test/classes/Database/RoutinesTest.php
@@ -143,30 +143,12 @@ class RoutinesTest extends AbstractTestCase
                     'item_type' => 'PROCEDURE',
                     'item_type_toggle' => 'FUNCTION',
                     'item_original_type' => 'PROCEDURE',
-                    'item_param_dir' => [
-                        0 => 'IN',
-                        1 => 'FAIL',
-                    ],
-                    'item_param_name' => [
-                        0 => 'bar',
-                        1 => 'baz',
-                    ],
-                    'item_param_type' => [
-                        0 => 'INT',
-                        1 => 'FAIL',
-                    ],
-                    'item_param_length' => [
-                        0 => '20',
-                        1 => '',
-                    ],
-                    'item_param_opts_num' => [
-                        0 => 'UNSIGNED',
-                        1 => '',
-                    ],
-                    'item_param_opts_text' => [
-                        0 => '',
-                        1 => 'latin1',
-                    ],
+                    'item_param_dir' => [0 => 'IN', 1 => 'FAIL'],
+                    'item_param_name' => [0 => 'bar', 1 => 'baz'],
+                    'item_param_type' => [0 => 'INT', 1 => 'FAIL'],
+                    'item_param_length' => [0 => '20', 1 => ''],
+                    'item_param_opts_num' => [0 => 'UNSIGNED', 1 => ''],
+                    'item_param_opts_text' => [0 => '', 1 => 'latin1'],
                     'item_returntype' => '',
                     'item_isdeterministic' => 'ON',
                     'item_securitytype' => 'INVOKER',
@@ -185,30 +167,12 @@ class RoutinesTest extends AbstractTestCase
                     'item_type_toggle' => 'FUNCTION',
                     'item_original_type' => 'PROCEDURE',
                     'item_num_params' => 2,
-                    'item_param_dir' => [
-                        0 => 'IN',
-                        1 => '',
-                    ],
-                    'item_param_name' => [
-                        0 => 'bar',
-                        1 => 'baz',
-                    ],
-                    'item_param_type' => [
-                        0 => 'INT',
-                        1 => '',
-                    ],
-                    'item_param_length' => [
-                        0 => '20',
-                        1 => '',
-                    ],
-                    'item_param_opts_num' => [
-                        0 => 'UNSIGNED',
-                        1 => '',
-                    ],
-                    'item_param_opts_text' => [
-                        0 => '',
-                        1 => 'latin1',
-                    ],
+                    'item_param_dir' => [0 => 'IN', 1 => ''],
+                    'item_param_name' => [0 => 'bar', 1 => 'baz'],
+                    'item_param_type' => [0 => 'INT', 1 => ''],
+                    'item_param_length' => [0 => '20', 1 => ''],
+                    'item_param_opts_num' => [0 => 'UNSIGNED', 1 => ''],
+                    'item_param_opts_text' => [0 => '', 1 => 'latin1'],
                     'item_returntype' => '',
                     'item_isdeterministic' => ' checked=\'checked\'',
                     'item_securitytype_definer' => '',
@@ -229,30 +193,12 @@ class RoutinesTest extends AbstractTestCase
                     'item_type' => 'FUNCTION',
                     'item_type_toggle' => 'PROCEDURE',
                     'item_original_type' => 'FUNCTION',
-                    'item_param_dir' => [
-                        0 => '',
-                        1 => '',
-                    ],
-                    'item_param_name' => [
-                        0 => 'bar',
-                        1 => 'baz',
-                    ],
-                    'item_param_type' => [
-                        0 => '<s>XSS</s>',
-                        1 => 'TEXT',
-                    ],
-                    'item_param_length' => [
-                        0 => '10,10',
-                        1 => '',
-                    ],
-                    'item_param_opts_num' => [
-                        0 => 'UNSIGNED',
-                        1 => '',
-                    ],
-                    'item_param_opts_text' => [
-                        0 => '',
-                        1 => 'utf8',
-                    ],
+                    'item_param_dir' => [0 => '', 1 => ''],
+                    'item_param_name' => [0 => 'bar', 1 => 'baz'],
+                    'item_param_type' => [0 => '<s>XSS</s>', 1 => 'TEXT'],
+                    'item_param_length' => [0 => '10,10', 1 => ''],
+                    'item_param_opts_num' => [0 => 'UNSIGNED', 1 => ''],
+                    'item_param_opts_text' => [0 => '', 1 => 'utf8'],
                     'item_returntype' => 'VARCHAR',
                     'item_isdeterministic' => '',
                     'item_securitytype' => 'DEFINER',
@@ -272,26 +218,11 @@ class RoutinesTest extends AbstractTestCase
                     'item_original_type' => 'FUNCTION',
                     'item_num_params' => '2',
                     'item_param_dir' => [],
-                    'item_param_name' => [
-                        0 => 'bar',
-                        1 => 'baz',
-                    ],
-                    'item_param_type' => [
-                        0 => '',
-                        1 => 'TEXT',
-                    ],
-                    'item_param_length' => [
-                        0 => '10,10',
-                        1 => '',
-                    ],
-                    'item_param_opts_num' => [
-                        0 => 'UNSIGNED',
-                        1 => '',
-                    ],
-                    'item_param_opts_text' => [
-                        0 => '',
-                        1 => 'utf8',
-                    ],
+                    'item_param_name' => [0 => 'bar', 1 => 'baz'],
+                    'item_param_type' => [0 => '', 1 => 'TEXT'],
+                    'item_param_length' => [0 => '10,10', 1 => ''],
+                    'item_param_opts_num' => [0 => 'UNSIGNED', 1 => ''],
+                    'item_param_opts_text' => [0 => '', 1 => 'utf8'],
                     'item_returntype' => 'VARCHAR',
                     'item_isdeterministic' => '',
                     'item_securitytype_definer' => ' selected=\'selected\'',
@@ -360,31 +291,11 @@ class RoutinesTest extends AbstractTestCase
         ];
 
         return [
-            [
-                $data,
-                0,
-                '<select name="item_param_dir[0]"',
-            ],
-            [
-                $data,
-                0,
-                '<input name="item_param_name[0]"',
-            ],
-            [
-                $data,
-                0,
-                '<select name="item_param_type[0]"',
-            ],
-            [
-                $data,
-                0,
-                '<select name="item_param_opts_num[0]"',
-            ],
-            [
-                $data,
-                0,
-                '<a href="#" class="routine_param_remove_anchor"',
-            ],
+            [$data, 0, '<select name="item_param_dir[0]"'],
+            [$data, 0, '<input name="item_param_name[0]"'],
+            [$data, 0, '<select name="item_param_type[0]"'],
+            [$data, 0, '<select name="item_param_opts_num[0]"'],
+            [$data, 0, '<a href="#" class="routine_param_remove_anchor"'],
         ];
     }
 
@@ -440,26 +351,11 @@ class RoutinesTest extends AbstractTestCase
         ];
 
         return [
-            [
-                $data,
-                '<select name="item_param_dir[%s]"',
-            ],
-            [
-                $data,
-                '<input name="item_param_name[%s]"',
-            ],
-            [
-                $data,
-                '<select name="item_param_dir[%s]"',
-            ],
-            [
-                $data,
-                '<select name="item_param_opts_num[%s]"',
-            ],
-            [
-                $data,
-                '<a href="#" class="routine_param_remove_anchor"',
-            ],
+            [$data, '<select name="item_param_dir[%s]"'],
+            [$data, '<input name="item_param_name[%s]"'],
+            [$data, '<select name="item_param_dir[%s]"'],
+            [$data, '<select name="item_param_opts_num[%s]"'],
+            [$data, '<a href="#" class="routine_param_remove_anchor"'],
         ];
     }
 
@@ -513,70 +409,22 @@ class RoutinesTest extends AbstractTestCase
         ];
 
         return [
-            [
-                $data,
-                '<input name="add_item"',
-            ],
-            [
-                $data,
-                '<input type="text" name="item_name"',
-            ],
-            [
-                $data,
-                '<input name="item_type"',
-            ],
-            [
-                $data,
-                'name="routine_changetype"',
-            ],
-            [
-                $data,
-                'name="routine_addparameter"',
-            ],
-            [
-                $data,
-                'name="routine_removeparameter"',
-            ],
-            [
-                $data,
-                'select name="item_returntype"',
-            ],
-            [
-                $data,
-                'name="item_returnlength"',
-            ],
-            [
-                $data,
-                'select name="item_returnopts_num"',
-            ],
-            [
-                $data,
-                '<textarea name="item_definition"',
-            ],
-            [
-                $data,
-                'name="item_isdeterministic"',
-            ],
-            [
-                $data,
-                'name="item_definer"',
-            ],
-            [
-                $data,
-                'select name="item_securitytype"',
-            ],
-            [
-                $data,
-                'select name="item_sqldataaccess"',
-            ],
-            [
-                $data,
-                'name="item_comment"',
-            ],
-            [
-                $data,
-                'name="editor_process_add"',
-            ],
+            [$data, '<input name="add_item"'],
+            [$data, '<input type="text" name="item_name"'],
+            [$data, '<input name="item_type"'],
+            [$data, 'name="routine_changetype"'],
+            [$data, 'name="routine_addparameter"'],
+            [$data, 'name="routine_removeparameter"'],
+            [$data, 'select name="item_returntype"'],
+            [$data, 'name="item_returnlength"'],
+            [$data, 'select name="item_returnopts_num"'],
+            [$data, '<textarea name="item_definition"'],
+            [$data, 'name="item_isdeterministic"'],
+            [$data, 'name="item_definer"'],
+            [$data, 'select name="item_securitytype"'],
+            [$data, 'select name="item_sqldataaccess"'],
+            [$data, 'name="item_comment"'],
+            [$data, 'name="editor_process_add"'],
         ];
     }
 
@@ -630,70 +478,22 @@ class RoutinesTest extends AbstractTestCase
         ];
 
         return [
-            [
-                $data,
-                'name="edit_item"',
-            ],
-            [
-                $data,
-                'name="item_name"',
-            ],
-            [
-                $data,
-                '<input name="item_type" type="hidden" value="FUNCTION"',
-            ],
-            [
-                $data,
-                'name="routine_changetype"',
-            ],
-            [
-                $data,
-                'name="routine_addparameter"',
-            ],
-            [
-                $data,
-                'name="routine_removeparameter"',
-            ],
-            [
-                $data,
-                'name="item_returntype"',
-            ],
-            [
-                $data,
-                'name="item_returnlength"',
-            ],
-            [
-                $data,
-                'name="item_returnopts_num"',
-            ],
-            [
-                $data,
-                '<textarea name="item_definition"',
-            ],
-            [
-                $data,
-                'name="item_isdeterministic"',
-            ],
-            [
-                $data,
-                'name="item_definer"',
-            ],
-            [
-                $data,
-                '<select name="item_securitytype"',
-            ],
-            [
-                $data,
-                '<select name="item_sqldataaccess"',
-            ],
-            [
-                $data,
-                'name="item_comment"',
-            ],
-            [
-                $data,
-                'name="editor_process_edit"',
-            ],
+            [$data, 'name="edit_item"'],
+            [$data, 'name="item_name"'],
+            [$data, '<input name="item_type" type="hidden" value="FUNCTION"'],
+            [$data, 'name="routine_changetype"'],
+            [$data, 'name="routine_addparameter"'],
+            [$data, 'name="routine_removeparameter"'],
+            [$data, 'name="item_returntype"'],
+            [$data, 'name="item_returnlength"'],
+            [$data, 'name="item_returnopts_num"'],
+            [$data, '<textarea name="item_definition"'],
+            [$data, 'name="item_isdeterministic"'],
+            [$data, 'name="item_definer"'],
+            [$data, '<select name="item_securitytype"'],
+            [$data, '<select name="item_sqldataaccess"'],
+            [$data, 'name="item_comment"'],
+            [$data, 'name="editor_process_edit"'],
         ];
     }
 
@@ -749,66 +549,21 @@ class RoutinesTest extends AbstractTestCase
         ];
 
         return [
-            [
-                $data,
-                'name="edit_item"',
-            ],
-            [
-                $data,
-                'name="item_name"',
-            ],
-            [
-                $data,
-                '<select name="item_type"',
-            ],
-            [
-                $data,
-                'id="addRoutineParameterButton"',
-            ],
-            [
-                $data,
-                '<select name="item_returntype"',
-            ],
-            [
-                $data,
-                'name="item_returnlength"',
-            ],
-            [
-                $data,
-                '<select name="item_returnopts_num"',
-            ],
-            [
-                $data,
-                '<textarea name="item_definition"',
-            ],
-            [
-                $data,
-                'name="item_isdeterministic"',
-            ],
-            [
-                $data,
-                'name="item_definer"',
-            ],
-            [
-                $data,
-                '<select name="item_securitytype"',
-            ],
-            [
-                $data,
-                '<select name="item_sqldataaccess"',
-            ],
-            [
-                $data,
-                'name="item_comment"',
-            ],
-            [
-                $data,
-                'name="ajax_request"',
-            ],
-            [
-                $data,
-                'name="editor_process_edit"',
-            ],
+            [$data, 'name="edit_item"'],
+            [$data, 'name="item_name"'],
+            [$data, '<select name="item_type"'],
+            [$data, 'id="addRoutineParameterButton"'],
+            [$data, '<select name="item_returntype"'],
+            [$data, 'name="item_returnlength"'],
+            [$data, '<select name="item_returnopts_num"'],
+            [$data, '<textarea name="item_definition"'],
+            [$data, 'name="item_isdeterministic"'],
+            [$data, 'name="item_definer"'],
+            [$data, '<select name="item_securitytype"'],
+            [$data, '<select name="item_sqldataaccess"'],
+            [$data, 'name="item_comment"'],
+            [$data, 'name="ajax_request"'],
+            [$data, 'name="editor_process_edit"'],
         ];
     }
 
@@ -861,12 +616,7 @@ class RoutinesTest extends AbstractTestCase
             'item_sqldataaccess' => 'NO SQL',
         ];
 
-        return [
-            [
-                $data,
-                '<input name="item_type" type="hidden" value="PROCEDURE"',
-            ],
-        ];
+        return [[$data, '<input name="item_type" type="hidden" value="PROCEDURE"']];
     }
 
     /**
@@ -903,22 +653,8 @@ class RoutinesTest extends AbstractTestCase
             'item_definer' => '',
             'item_type' => 'PROCEDURE',
             'item_num_params' => 6,
-            'item_param_dir' => [
-                0 => 'IN',
-                1 => 'OUT',
-                2 => 'IN',
-                3 => 'IN',
-                4 => 'IN',
-                5 => 'IN',
-            ],
-            'item_param_name' => [
-                0 => 'foo',
-                1 => 'foa',
-                2 => 'fob',
-                3 => 'foc',
-                4 => 'fod',
-                5 => 'foe',
-            ],
+            'item_param_dir' => [0 => 'IN', 1 => 'OUT', 2 => 'IN', 3 => 'IN', 4 => 'IN', 5 => 'IN'],
+            'item_param_name' => [0 => 'foo', 1 => 'foa', 2 => 'fob', 3 => 'foc', 4 => 'fod', 5 => 'foe'],
             'item_param_type' => [
                 0 => 'DATE',
                 1 => 'VARCHAR',
@@ -927,44 +663,17 @@ class RoutinesTest extends AbstractTestCase
                 4 => 'ENUM',
                 5 => 'SET',
             ],
-            'item_param_length' => [
-                0 => '',
-                1 => '22',
-                2 => '',
-                3 => '',
-                4 => "'a','b'",
-                5 => "'a','b'",
-            ],
+            'item_param_length' => [0 => '', 1 => '22', 2 => '', 3 => '', 4 => "'a','b'", 5 => "'a','b'"],
             'item_param_length_arr' => [
                 0 => [],
                 1 => ['22'],
                 2 => [],
                 3 => [],
-                4 => [
-                    "'a'",
-                    "'b'",
-                ],
-                5 => [
-                    "'a'",
-                    "'b'",
-                ],
-            ],
-            'item_param_opts_num' => [
-                0 => '',
-                1 => '',
-                2 => '',
-                3 => '',
-                4 => '',
-                5 => '',
-            ],
-            'item_param_opts_text' => [
-                0 => '',
-                1 => 'utf8',
-                2 => '',
-                3 => '',
-                4 => '',
-                5 => '',
+                4 => ["'a'", "'b'"],
+                5 => ["'a'", "'b'"],
             ],
+            'item_param_opts_num' => [0 => '', 1 => '', 2 => '', 3 => '', 4 => '', 5 => ''],
+            'item_param_opts_text' => [0 => '', 1 => 'utf8', 2 => '', 3 => '', 4 => '', 5 => ''],
             'item_returntype' => '',
             'item_isdeterministic' => '',
             'item_securitytype_definer' => '',
@@ -973,38 +682,14 @@ class RoutinesTest extends AbstractTestCase
         ];
 
         return [
-            [
-                $data,
-                'name="item_name"',
-            ],
-            [
-                $data,
-                'name="funcs[foo]"',
-            ],
-            [
-                $data,
-                '<input class="datefield" type="text" name="params[foo]">',
-            ],
-            [
-                $data,
-                'name="funcs[fob]"',
-            ],
-            [
-                $data,
-                '<input class="datetimefield" type="text" name="params[fob]"',
-            ],
-            [
-                $data,
-                'name="params[fod][]"',
-            ],
-            [
-                $data,
-                'name="params[foe][]"',
-            ],
-            [
-                $data,
-                'name="execute_routine"',
-            ],
+            [$data, 'name="item_name"'],
+            [$data, 'name="funcs[foo]"'],
+            [$data, '<input class="datefield" type="text" name="params[foo]">'],
+            [$data, 'name="funcs[fob]"'],
+            [$data, '<input class="datetimefield" type="text" name="params[fob]"'],
+            [$data, 'name="params[fod][]"'],
+            [$data, 'name="params[foe][]"'],
+            [$data, 'name="execute_routine"'],
         ];
     }
 
@@ -1042,22 +727,8 @@ class RoutinesTest extends AbstractTestCase
             'item_definer' => '',
             'item_type' => 'PROCEDURE',
             'item_num_params' => 6,
-            'item_param_dir' => [
-                0 => 'IN',
-                1 => 'OUT',
-                2 => 'IN',
-                3 => 'IN',
-                4 => 'IN',
-                5 => 'IN',
-            ],
-            'item_param_name' => [
-                0 => 'foo',
-                1 => 'foa',
-                2 => 'fob',
-                3 => 'foc',
-                4 => 'fod',
-                5 => 'foe',
-            ],
+            'item_param_dir' => [0 => 'IN', 1 => 'OUT', 2 => 'IN', 3 => 'IN', 4 => 'IN', 5 => 'IN'],
+            'item_param_name' => [0 => 'foo', 1 => 'foa', 2 => 'fob', 3 => 'foc', 4 => 'fod', 5 => 'foe'],
             'item_param_type' => [
                 0 => 'DATE',
                 1 => 'VARCHAR',
@@ -1066,44 +737,17 @@ class RoutinesTest extends AbstractTestCase
                 4 => 'ENUM',
                 5 => 'SET',
             ],
-            'item_param_length' => [
-                0 => '',
-                1 => '22',
-                2 => '',
-                3 => '',
-                4 => "'a','b'",
-                5 => "'a','b'",
-            ],
+            'item_param_length' => [0 => '', 1 => '22', 2 => '', 3 => '', 4 => "'a','b'", 5 => "'a','b'"],
             'item_param_length_arr' => [
                 0 => [],
                 1 => ['22'],
                 2 => [],
                 3 => [],
-                4 => [
-                    "'a'",
-                    "'b'",
-                ],
-                5 => [
-                    "'a'",
-                    "'b'",
-                ],
-            ],
-            'item_param_opts_num' => [
-                0 => '',
-                1 => '',
-                2 => '',
-                3 => '',
-                4 => '',
-                5 => '',
-            ],
-            'item_param_opts_text' => [
-                0 => '',
-                1 => 'utf8',
-                2 => '',
-                3 => '',
-                4 => '',
-                5 => '',
+                4 => ["'a'", "'b'"],
+                5 => ["'a'", "'b'"],
             ],
+            'item_param_opts_num' => [0 => '', 1 => '', 2 => '', 3 => '', 4 => '', 5 => ''],
+            'item_param_opts_text' => [0 => '', 1 => 'utf8', 2 => '', 3 => '', 4 => '', 5 => ''],
             'item_returntype' => '',
             'item_isdeterministic' => '',
             'item_securitytype_definer' => '',
@@ -1111,16 +755,7 @@ class RoutinesTest extends AbstractTestCase
             'item_sqldataaccess' => '',
         ];
 
-        return [
-            [
-                $data,
-                'name="execute_routine"',
-            ],
-            [
-                $data,
-                'name="ajax_request"',
-            ],
-        ];
+        return [[$data, 'name="execute_routine"'], [$data, 'name="ajax_request"']];
     }
 
     /**
@@ -1148,21 +783,9 @@ class RoutinesTest extends AbstractTestCase
             ->will(
                 $this->returnValueMap(
                     [
-                        [
-                            'foo',
-                            Connection::TYPE_USER,
-                            'foo',
-                        ],
-                        [
-                            "foo's bar",
-                            Connection::TYPE_USER,
-                            "foo\'s bar",
-                        ],
-                        [
-                            '',
-                            Connection::TYPE_USER,
-                            '',
-                        ],
+                        ['foo', Connection::TYPE_USER, 'foo'],
+                        ["foo's bar", Connection::TYPE_USER, "foo\'s bar"],
+                        ['', Connection::TYPE_USER, ''],
                     ],
                 ),
             );
@@ -1229,30 +852,12 @@ class RoutinesTest extends AbstractTestCase
                     'item_definer' => 'someuser@somehost',
                     'item_type' => 'PROCEDURE',
                     'item_num_params' => '2',
-                    'item_param_dir' => [
-                        'IN',
-                        'INOUT',
-                    ],
-                    'item_param_name' => [
-                        'pa`ram',
-                        'par 2',
-                    ],
-                    'item_param_type' => [
-                        'INT',
-                        'ENUM',
-                    ],
-                    'item_param_length' => [
-                        '10',
-                        '\'a\', \'b\'',
-                    ],
-                    'item_param_opts_num' => [
-                        'ZEROFILL',
-                        '',
-                    ],
-                    'item_param_opts_text' => [
-                        'utf8',
-                        'latin1',
-                    ],
+                    'item_param_dir' => ['IN', 'INOUT'],
+                    'item_param_name' => ['pa`ram', 'par 2'],
+                    'item_param_type' => ['INT', 'ENUM'],
+                    'item_param_length' => ['10', '\'a\', \'b\''],
+                    'item_param_opts_num' => ['ZEROFILL', ''],
+                    'item_param_opts_text' => ['utf8', 'latin1'],
                     'item_returntype' => '',
                     'item_securitytype' => 'DEFINER',
                     'item_sqldataaccess' => 'foobar',
@@ -1352,30 +957,12 @@ class RoutinesTest extends AbstractTestCase
                     'item_definer' => '',
                     'item_type' => 'PROCEDURE',
                     'item_num_params' => '2',
-                    'item_param_dir' => [
-                        'FAIL',
-                        'INOUT',
-                    ], // invalid direction
-                    'item_param_name' => [
-                        'pa`ram',
-                        'goo',
-                    ],
-                    'item_param_type' => [
-                        'INT',
-                        'ENUM',
-                    ],
-                    'item_param_length' => [
-                        '10',
-                        '',
-                    ], // missing ENUM values
-                    'item_param_opts_num' => [
-                        'ZEROFILL',
-                        '',
-                    ],
-                    'item_param_opts_text' => [
-                        'utf8',
-                        'latin1',
-                    ],
+                    'item_param_dir' => ['FAIL', 'INOUT'], // invalid direction
+                    'item_param_name' => ['pa`ram', 'goo'],
+                    'item_param_type' => ['INT', 'ENUM'],
+                    'item_param_length' => ['10', ''], // missing ENUM values
+                    'item_param_opts_num' => ['ZEROFILL', ''],
+                    'item_param_opts_text' => ['utf8', 'latin1'],
                     'item_returntype' => '',
                     'item_securitytype' => 'DEFINER',
                     'item_sqldataaccess' => 'foobar', // invalid, will just be ignored without throwing errors
@@ -1457,11 +1044,7 @@ class RoutinesTest extends AbstractTestCase
         $dbiDummy = $this->createDbiDummy();
         $dbiDummy->addResult(
             'SHOW FUNCTION STATUS;',
-            [
-                ['db_test', 'test_func', 'FUNCTION'],
-                ['test_db', '', 'FUNCTION'],
-                ['test_db', 'test_func', 'PROCEDURE'],
-            ],
+            [['db_test', 'test_func', 'FUNCTION'], ['test_db', '', 'FUNCTION'], ['test_db', 'test_func', 'PROCEDURE']],
             ['Db', 'Name', 'Type'],
         );
 
diff --git a/test/classes/Database/SearchTest.php b/test/classes/Database/SearchTest.php
index f0dc049ef5..5e1cf51c1e 100644
--- a/test/classes/Database/SearchTest.php
+++ b/test/classes/Database/SearchTest.php
@@ -34,10 +34,7 @@ class SearchTest extends AbstractTestCase
         $dbi->expects($this->any())
             ->method('getColumns')
             ->with('pma', 'table1')
-            ->will($this->returnValue([
-                ['Field' => 'column1'],
-                ['Field' => 'column2'],
-            ]));
+            ->will($this->returnValue([['Field' => 'column1'], ['Field' => 'column2']]));
 
         $dbi->expects($this->any())
             ->method('quoteString')
diff --git a/test/classes/Database/TriggersTest.php b/test/classes/Database/TriggersTest.php
index ca5e78a85b..7d696e2c04 100644
--- a/test/classes/Database/TriggersTest.php
+++ b/test/classes/Database/TriggersTest.php
@@ -240,10 +240,7 @@ class TriggersTest extends AbstractTestCase
             'item_definer' => '',
         ];
 
-        return [
-            [$data, 'name="editor_process_edit"'],
-            [$data, 'name="ajax_request"'],
-        ];
+        return [[$data, 'name="editor_process_edit"'], [$data, 'name="ajax_request"']];
     }
 
     /**
@@ -292,16 +289,7 @@ class TriggersTest extends AbstractTestCase
     public static function providerGetQueryFromRequest(): array
     {
         return [
-            [
-                '',
-                '',
-                '',
-                '',
-                '',
-                '',
-                'CREATE TRIGGER ON  FOR EACH ROW ',
-                5,
-            ],
+            ['', '', '', '', '', '', 'CREATE TRIGGER ON  FOR EACH ROW ', 5],
             [
                 'root',
                 'trigger',
diff --git a/test/classes/DatabaseInterfaceTest.php b/test/classes/DatabaseInterfaceTest.php
index 0d7857a2ef..e7ee5e890c 100644
--- a/test/classes/DatabaseInterfaceTest.php
+++ b/test/classes/DatabaseInterfaceTest.php
@@ -75,33 +75,9 @@ class DatabaseInterfaceTest extends AbstractTestCase
     public static function currentUserData(): array
     {
         return [
-            [
-                [['pma@localhost']],
-                'pma@localhost',
-                [
-                    'pma',
-                    'localhost',
-                ],
-                false,
-            ],
-            [
-                [['@localhost']],
-                '@localhost',
-                [
-                    '',
-                    'localhost',
-                ],
-                false,
-            ],
-            [
-                false,
-                '@',
-                [
-                    '',
-                    '',
-                ],
-                true,
-            ],
+            [[['pma@localhost']], 'pma@localhost', ['pma', 'localhost'], false],
+            [[['@localhost']], '@localhost', ['', 'localhost'], false],
+            [false, '@', ['', ''], true],
         ];
     }
 
@@ -277,36 +253,12 @@ class DatabaseInterfaceTest extends AbstractTestCase
     public static function errorData(): array
     {
         return [
-            [
-                2002,
-                'msg',
-                'The server is not responding',
-            ],
-            [
-                2003,
-                'msg',
-                'The server is not responding',
-            ],
-            [
-                1698,
-                'msg',
-                'index.php?route=/logout',
-            ],
-            [
-                1005,
-                'msg',
-                'index.php?route=/server/engines',
-            ],
-            [
-                1005,
-                'errno: 13',
-                'Please check privileges',
-            ],
-            [
-                -1,
-                'error message',
-                'error message',
-            ],
+            [2002, 'msg', 'The server is not responding'],
+            [2003, 'msg', 'The server is not responding'],
+            [1698, 'msg', 'index.php?route=/logout'],
+            [1005, 'msg', 'index.php?route=/server/engines'],
+            [1005, 'errno: 13', 'Please check privileges'],
+            [-1, 'error message', 'error message'],
         ];
     }
 
@@ -343,22 +295,10 @@ class DatabaseInterfaceTest extends AbstractTestCase
     public static function isAmazonRdsData(): array
     {
         return [
-            [
-                [['/usr']],
-                false,
-            ],
-            [
-                [['E:/mysql']],
-                false,
-            ],
-            [
-                [['/rdsdbbin/mysql/']],
-                true,
-            ],
-            [
-                [['/rdsdbbin/mysql-5.7.18/']],
-                true,
-            ],
+            [[['/usr']], false],
+            [[['E:/mysql']], false],
+            [[['/rdsdbbin/mysql/']], true],
+            [[['/rdsdbbin/mysql-5.7.18/']], true],
         ];
     }
 
@@ -384,30 +324,10 @@ class DatabaseInterfaceTest extends AbstractTestCase
     public static function versionData(): array
     {
         return [
-            [
-                '5.0.5',
-                50005,
-                5,
-                true,
-            ],
-            [
-                '5.05.01',
-                50501,
-                5,
-                false,
-            ],
-            [
-                '5.6.35',
-                50635,
-                5,
-                false,
-            ],
-            [
-                '10.1.22-MariaDB-',
-                100122,
-                10,
-                false,
-            ],
+            ['5.0.5', 50005, 5, true],
+            ['5.05.01', 50501, 5, false],
+            ['5.6.35', 50635, 5, false],
+            ['10.1.22-MariaDB-', 100122, 10, false],
         ];
     }
 
@@ -589,16 +509,12 @@ class DatabaseInterfaceTest extends AbstractTestCase
         $dummyDbi->addResult('SHOW DATABASES', [['db1'], ['db2']], ['Database']);
         $dummyDbi->addResult(
             'SELECT @@collation_database',
-            [
-                ['utf8_general_ci'],
-            ],
+            [['utf8_general_ci']],
             ['@@collation_database'],
         );
         $dummyDbi->addResult(
             'SELECT @@collation_database',
-            [
-                ['utf8_general_ci'],
-            ],
+            [['utf8_general_ci']],
             ['@@collation_database'],
         );
         $dummyDbi->addResult(
@@ -831,24 +747,8 @@ class DatabaseInterfaceTest extends AbstractTestCase
                 true,
                 false,
             ],
-            [
-                [
-                    '@@version' => '7.10.3',
-                    '@@version_comment' => 'MySQL Community Server (GPL)',
-                ],
-                71003,
-                false,
-                false,
-            ],
-            [
-                [
-                    '@@version' => '5.5.0',
-                    '@@version_comment' => '',
-                ],
-                50500,
-                false,
-                false,
-            ],
+            [['@@version' => '7.10.3', '@@version_comment' => 'MySQL Community Server (GPL)'], 71003, false, false],
+            [['@@version' => '5.5.0', '@@version_comment' => ''], 50500, false, false],
         ];
     }
 
diff --git a/test/classes/Dbal/DbiDummyTest.php b/test/classes/Dbal/DbiDummyTest.php
index e91307be53..3c2a3bdab1 100644
--- a/test/classes/Dbal/DbiDummyTest.php
+++ b/test/classes/Dbal/DbiDummyTest.php
@@ -79,16 +79,7 @@ class DbiDummyTest extends AbstractTestCase
      */
     public static function schemaData(): array
     {
-        return [
-            [
-                'information_schema',
-                true,
-            ],
-            [
-                'pma_test',
-                false,
-            ],
-        ];
+        return [['information_schema', true], ['pma_test', false]];
     }
 
     /**
@@ -115,16 +106,8 @@ class DbiDummyTest extends AbstractTestCase
     public static function errorData(): array
     {
         return [
-            [
-                1234,
-                '',
-                '#1234 - ',
-            ],
-            [
-                1234,
-                'foobar',
-                '#1234 - foobar',
-            ],
+            [1234, '', '#1234 - '],
+            [1234, 'foobar', '#1234 - foobar'],
             [
                 2002,
                 'foobar',
diff --git a/test/classes/Dbal/WarningTest.php b/test/classes/Dbal/WarningTest.php
index cbdb1c7b61..e273591526 100644
--- a/test/classes/Dbal/WarningTest.php
+++ b/test/classes/Dbal/WarningTest.php
@@ -38,41 +38,11 @@ class WarningTest extends TestCase
                 'No database selected',
                 'Error: #1046 No database selected',
             ],
-            [
-                ['Level' => 'Warning', 'Code' => '0', 'Message' => ''],
-                'Warning',
-                0,
-                '',
-                'Warning: #0',
-            ],
-            [
-                ['Level' => 'Note', 'Code' => '1', 'Message' => 'Message'],
-                'Note',
-                1,
-                'Message',
-                'Note: #1 Message',
-            ],
-            [
-                ['Level' => 'Invalid', 'Code' => 'Invalid', 'Message' => 'Invalid'],
-                '?',
-                0,
-                'Invalid',
-                '?: #0 Invalid',
-            ],
-            [
-                ['Level' => 'Unknown', 'Code' => '-1', 'Message' => ''],
-                '?',
-                0,
-                '',
-                '?: #0',
-            ],
-            [
-                [],
-                '?',
-                0,
-                '',
-                '?: #0',
-            ],
+            [['Level' => 'Warning','Code' => '0','Message' => ''], 'Warning', 0, '', 'Warning: #0'],
+            [['Level' => 'Note','Code' => '1','Message' => 'Message'], 'Note', 1, 'Message', 'Note: #1 Message'],
+            [['Level' => 'Invalid','Code' => 'Invalid','Message' => 'Invalid'], '?', 0, 'Invalid', '?: #0 Invalid'],
+            [['Level' => 'Unknown','Code' => '-1','Message' => ''], '?', 0, '', '?: #0'],
+            [[], '?', 0, '', '?: #0'],
         ];
     }
 }
diff --git a/test/classes/Display/ResultsTest.php b/test/classes/Display/ResultsTest.php
index 5fe235fe19..cc8f43ac38 100644
--- a/test/classes/Display/ResultsTest.php
+++ b/test/classes/Display/ResultsTest.php
@@ -148,10 +148,7 @@ class ResultsTest extends AbstractTestCase
     {
         $_SESSION['tmpval']['max_rows'] = DisplayResults::ALL_ROWS;
         $this->assertEquals(
-            [
-                0,
-                0,
-            ],
+            [0, 0],
             $this->callFunction(
                 $this->object,
                 DisplayResults::class,
@@ -169,10 +166,7 @@ class ResultsTest extends AbstractTestCase
         $_SESSION['tmpval']['max_rows'] = 5;
         $_SESSION['tmpval']['pos'] = 4;
         $this->assertEquals(
-            [
-                9,
-                0,
-            ],
+            [9, 0],
             $this->callFunction(
                 $this->object,
                 DisplayResults::class,
@@ -194,11 +188,7 @@ class ResultsTest extends AbstractTestCase
                 'information_schema',
                 'routines',
                 'circumference',
-                [
-                    'routine_name' => 'circumference',
-                    'routine_schema' => 'data',
-                    'routine_type' => 'FUNCTION',
-                ],
+                ['routine_name' => 'circumference', 'routine_schema' => 'data', 'routine_type' => 'FUNCTION'],
                 'routine_name',
                 'index.php?route=/database/routines&item_name=circumference&db=data'
                 . '&item_type=FUNCTION&server=0&lang=en',
@@ -207,11 +197,7 @@ class ResultsTest extends AbstractTestCase
                 'information_schema',
                 'routines',
                 'area',
-                [
-                    'routine_name' => 'area',
-                    'routine_schema' => 'data',
-                    'routine_type' => 'PROCEDURE',
-                ],
+                ['routine_name' => 'area', 'routine_schema' => 'data', 'routine_type' => 'PROCEDURE'],
                 'routine_name',
                 'index.php?route=/database/routines&item_name=area&db=data&item_type=PROCEDURE&server=0&lang=en',
             ],
@@ -244,14 +230,8 @@ class ResultsTest extends AbstractTestCase
                     'routine_name' => [
                         'link_param' => 'item_name',
                         'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'routine_schema',
-                            ],
-                            1 => [
-                                'param_info' => 'item_type',
-                                'column_name' => 'routine_type',
-                            ],
+                            0 => ['param_info' => 'db', 'column_name' => 'routine_schema'],
+                            1 => ['param_info' => 'item_type', 'column_name' => 'routine_type'],
                         ],
                         'default_page' => 'index.php?route=/database/routines',
                     ],
@@ -260,14 +240,8 @@ class ResultsTest extends AbstractTestCase
                     'column_name' => [
                         'link_param' => 'table_schema',
                         'link_dependancy_params' => [
-                            0 => [
-                                'param_info' => 'db',
-                                'column_name' => 'table_schema',
-                            ],
-                            1 => [
-                                'param_info' => 'db2',
-                                'column_name' => 'table_schema',
-                            ],
+                            0 => ['param_info' => 'db', 'column_name' => 'table_schema'],
+                            1 => ['param_info' => 'db2', 'column_name' => 'table_schema'],
                         ],
                         'default_page' => 'index.php',
                     ],
@@ -281,11 +255,7 @@ class ResultsTest extends AbstractTestCase
                 $this->object,
                 DisplayResults::class,
                 'getSpecialLinkUrl',
-                [
-                    $specialSchemaLinks[$db][$table][$fieldName],
-                    $columnValue,
-                    $rowInfo,
-                ],
+                [$specialSchemaLinks[$db][$table][$fieldName], $columnValue, $rowInfo],
             ),
         );
     }
@@ -297,12 +267,7 @@ class ResultsTest extends AbstractTestCase
      */
     public static function dataProviderForTestGetRowInfoForSpecialLinks(): array
     {
-        $columnNames = [
-            'host',
-            'db',
-            'user',
-            'select_privilages',
-        ];
+        $columnNames = ['host', 'db', 'user', 'select_privilages'];
         $fieldsMeta = [];
 
         foreach ($columnNames as $columnName) {
@@ -315,24 +280,9 @@ class ResultsTest extends AbstractTestCase
             [
                 $fieldsMeta,
                 count($fieldsMeta),
-                [
-                    0 => 'localhost',
-                    1 => 'phpmyadmin',
-                    2 => 'pmauser',
-                    3 => 'Y',
-                ],
-                [
-                    0 => '0',
-                    1 => '3',
-                    2 => '1',
-                    3 => '2',
-                ],
-                [
-                    'host' => 'localhost',
-                    'select_privilages' => 'Y',
-                    'db' => 'phpmyadmin',
-                    'user' => 'pmauser',
-                ],
+                [0 => 'localhost', 1 => 'phpmyadmin', 2 => 'pmauser', 3 => 'Y'],
+                [0 => '0', 1 => '3', 2 => '1', 3 => '2'],
+                ['host' => 'localhost', 'select_privilages' => 'Y', 'db' => 'phpmyadmin', 'user' => 'pmauser'],
             ],
         ];
     }
@@ -364,10 +314,7 @@ class ResultsTest extends AbstractTestCase
                 $this->object,
                 DisplayResults::class,
                 'getRowInfoForSpecialLinks',
-                [
-                    $row,
-                    $colOrder,
-                ],
+                [$row, $colOrder],
             ),
         );
     }
@@ -397,46 +344,10 @@ class ResultsTest extends AbstractTestCase
     public static function dataProviderForTestGetPartialText(): array
     {
         return [
-            [
-                'P',
-                10,
-                'foo',
-                [
-                    false,
-                    'foo',
-                    3,
-                ],
-            ],
-            [
-                'P',
-                1,
-                'foo',
-                [
-                    true,
-                    'f...',
-                    3,
-                ],
-            ],
-            [
-                'F',
-                10,
-                'foo',
-                [
-                    false,
-                    'foo',
-                    3,
-                ],
-            ],
-            [
-                'F',
-                1,
-                'foo',
-                [
-                    false,
-                    'foo',
-                    3,
-                ],
-            ],
+            ['P', 10, 'foo', [false, 'foo', 3]],
+            ['P', 1, 'foo', [true, 'f...', 3]],
+            ['F', 10, 'foo', [false, 'foo', 3]],
+            ['F', 1, 'foo', [false, 'foo', 3]],
         ];
     }
 
@@ -484,25 +395,10 @@ class ResultsTest extends AbstractTestCase
     {
         $transformationPlugin = new Text_Plain_Link();
         $meta = new FieldMetadata(MYSQLI_TYPE_BLOB, 0, (object) ['orgtable' => 'bar']);
-        $urlParams = [
-            'db' => 'foo',
-            'table' => 'bar',
-            'where_clause' => 'where_clause',
-        ];
+        $urlParams = ['db' => 'foo', 'table' => 'bar', 'where_clause' => 'where_clause'];
 
         return [
-            [
-                true,
-                true,
-                'BLOB',
-                '1001',
-                null,
-                [],
-                $meta,
-                $urlParams,
-                false,
-                'class="disableAjax">1001</a>',
-            ],
+            [true, true, 'BLOB', '1001', null, [], $meta, $urlParams, false, 'class="disableAjax">1001</a>'],
             [
                 true,
                 true,
@@ -515,42 +411,9 @@ class ResultsTest extends AbstractTestCase
                 false,
                 'class="disableAjax">0x123456</a>',
             ],
-            [
-                true,
-                false,
-                'BLOB',
-                '1001',
-                null,
-                [],
-                $meta,
-                $urlParams,
-                false,
-                'class="disableAjax">[BLOB - 4 B]</a>',
-            ],
-            [
-                false,
-                false,
-                'BINARY',
-                '1001',
-                $transformationPlugin,
-                [],
-                $meta,
-                $urlParams,
-                false,
-                '1001',
-            ],
-            [
-                false,
-                true,
-                'GEOMETRY',
-                null,
-                null,
-                [],
-                $meta,
-                $urlParams,
-                false,
-                '[GEOMETRY - NULL]',
-            ],
+            [true, false, 'BLOB', '1001', null, [], $meta, $urlParams, false, 'class="disableAjax">[BLOB - 4 B]</a>'],
+            [false, false, 'BINARY', '1001', $transformationPlugin, [], $meta, $urlParams, false, '1001'],
+            [false, true, 'GEOMETRY', null, null, [], $meta, $urlParams, false, '[GEOMETRY - NULL]'],
         ];
     }
 
@@ -588,15 +451,7 @@ class ResultsTest extends AbstractTestCase
                 $this->object,
                 DisplayResults::class,
                 'handleNonPrintableContents',
-                [
-                    $category,
-                    $content,
-                    $transformationPlugin,
-                    $transformOptions,
-                    $meta,
-                    $urlParams,
-                    &$isTruncated,
-                ],
+                [$category, $content, $transformationPlugin, $transformOptions, $meta, $urlParams, &$isTruncated],
             ),
         );
     }
@@ -646,11 +501,7 @@ class ResultsTest extends AbstractTestCase
         $meta3->orgname = 'datetime';
         $meta3 = new FieldMetadata(MYSQLI_TYPE_DATETIME, 0, $meta3);
 
-        $urlParams = [
-            'db' => 'foo',
-            'table' => 'tbl',
-            'where_clause' => 'where_clause',
-        ];
+        $urlParams = ['db' => 'foo', 'table' => 'tbl', 'where_clause' => 'where_clause'];
 
         return [
             [
@@ -846,14 +697,8 @@ class ResultsTest extends AbstractTestCase
             ->method('fetchResult')
             ->willReturn(
                 [
-                    'db.table.1' => [
-                        'mimetype' => '',
-                        'transformation' => 'output/text_plain_dateformat.php',
-                    ],
-                    'db.table.2' => [
-                        'mimetype' => '',
-                        'transformation' => 'output/text_plain_bool2text.php',
-                    ],
+                    'db.table.1' => ['mimetype' => '', 'transformation' => 'output/text_plain_dateformat.php'],
+                    'db.table.2' => ['mimetype' => '', 'transformation' => 'output/text_plain_bool2text.php'],
                 ],
             );
 
@@ -867,19 +712,7 @@ class ResultsTest extends AbstractTestCase
             $this->object,
             DisplayResults::class,
             'getRowValues',
-            [
-                [
-                    3600,
-                    'true',
-                ],
-                0,
-                false,
-                [],
-                'disabled',
-                false,
-                $query,
-                StatementInfo::fromArray(Query::getAll($query)),
-            ],
+            [[3600, 'true'], 0, false, [], 'disabled', false, $query, StatementInfo::fromArray(Query::getAll($query))],
         );
 
         // Dateformat
@@ -895,13 +728,7 @@ class ResultsTest extends AbstractTestCase
         // The URL params
         // The column name
         return [
-            [
-                '',
-                '',
-                ['sql_query' => ''],
-                'colname',
-                '',
-            ],
+            ['', '', ['sql_query' => ''], 'colname', ''],
             [
                 'SELECT * FROM `gis_all` ORDER BY `gis_all`.`shape` DESC, `gis_all`.`name` ASC',
                 'SELECT * FROM `gis_all` ORDER BY `gis_all`.`name` ASC',
@@ -969,10 +796,7 @@ class ResultsTest extends AbstractTestCase
             $this->object,
             DisplayResults::class,
             'getSortOrderHiddenInputs',
-            [
-                $urlParams,
-                $colName,
-            ],
+            [$urlParams, $colName],
         );
         $out = urldecode(htmlspecialchars_decode($output));
         $this->assertStringContainsString(
@@ -1009,22 +833,14 @@ class ResultsTest extends AbstractTestCase
             $this->object,
             DisplayResults::class,
             'buildValueDisplay',
-            [
-                'my_class',
-                false,
-                '  special value  ',
-            ],
+            ['my_class', false, '  special value  '],
         );
         $this->assertSame('<td class="text-start my_class">  special value  </td>' . "\n", $output);
         $output = $this->callFunction(
             $this->object,
             DisplayResults::class,
             'buildValueDisplay',
-            [
-                'my_class',
-                false,
-                '0x11e6ac0cfb1e8bf3bf48b827ebdafb0b',
-            ],
+            ['my_class', false, '0x11e6ac0cfb1e8bf3bf48b827ebdafb0b'],
         );
         $this->assertSame('<td class="text-start my_class">0x11e6ac0cfb1e8bf3bf48b827ebdafb0b</td>' . "\n", $output);
         $output = $this->callFunction(
diff --git a/test/classes/Engines/BdbTest.php b/test/classes/Engines/BdbTest.php
index 4dd576a35c..84c164d27a 100644
--- a/test/classes/Engines/BdbTest.php
+++ b/test/classes/Engines/BdbTest.php
@@ -46,9 +46,7 @@ class BdbTest extends AbstractTestCase
         $this->assertEquals(
             $this->object->getVariables(),
             [
-                'version_bdb' => [
-                    'title' => __('Version information'),
-                ],
+                'version_bdb' => ['title' => __('Version information')],
                 'bdb_cache_size' => ['type' => 1],
                 'bdb_home' => [],
                 'bdb_log_buffer_size' => ['type' => 1],
diff --git a/test/classes/Engines/InnodbTest.php b/test/classes/Engines/InnodbTest.php
index 55d6754177..08bbc0a92f 100644
--- a/test/classes/Engines/InnodbTest.php
+++ b/test/classes/Engines/InnodbTest.php
@@ -49,9 +49,7 @@ class InnodbTest extends AbstractTestCase
                     'title' => __('Data home directory'),
                     'desc' => __('The common part of the directory path for all InnoDB data files.'),
                 ],
-                'innodb_data_file_path' => [
-                    'title' => __('Data files'),
-                ],
+                'innodb_data_file_path' => ['title' => __('Data files')],
                 'innodb_autoextend_increment' => [
                     'title' => __('Autoextend increment'),
                     'desc' => __(
@@ -65,10 +63,7 @@ class InnodbTest extends AbstractTestCase
                     'desc' => __('The size of the memory buffer InnoDB uses to cache data and indexes of its tables.'),
                     'type' => 1,
                 ],
-                'innodb_additional_mem_pool_size' => [
-                    'title' => 'innodb_additional_mem_pool_size',
-                    'type' => 1,
-                ],
+                'innodb_additional_mem_pool_size' => ['title' => 'innodb_additional_mem_pool_size', 'type' => 1],
                 'innodb_buffer_pool_awe_mem_mb' => ['type' => 1],
                 'innodb_checksums' => [],
                 'innodb_commit_concurrency' => [],
@@ -124,10 +119,7 @@ class InnodbTest extends AbstractTestCase
         );
         $this->object->support = 2;
         $this->assertEquals(
-            [
-                'Bufferpool' => 'Buffer Pool',
-                'Status' => 'InnoDB Status',
-            ],
+            ['Bufferpool' => 'Buffer Pool', 'Status' => 'InnoDB Status'],
             $this->object->getInfoPages(),
         );
     }
diff --git a/test/classes/Engines/MemoryTest.php b/test/classes/Engines/MemoryTest.php
index 55e3219772..7fe673faeb 100644
--- a/test/classes/Engines/MemoryTest.php
+++ b/test/classes/Engines/MemoryTest.php
@@ -43,9 +43,7 @@ class MemoryTest extends AbstractTestCase
     {
         $this->assertEquals(
             $this->object->getVariables(),
-            [
-                'max_heap_table_size' => ['type' => 1],
-            ],
+            ['max_heap_table_size' => ['type' => 1]],
         );
     }
 }
diff --git a/test/classes/Engines/NdbclusterTest.php b/test/classes/Engines/NdbclusterTest.php
index b8aa792782..336cabf9c8 100644
--- a/test/classes/Engines/NdbclusterTest.php
+++ b/test/classes/Engines/NdbclusterTest.php
@@ -43,9 +43,7 @@ class NdbclusterTest extends AbstractTestCase
     {
         $this->assertEquals(
             $this->object->getVariables(),
-            [
-                'ndb_connectstring' => [],
-            ],
+            ['ndb_connectstring' => []],
         );
     }
 
diff --git a/test/classes/Engines/PbxtTest.php b/test/classes/Engines/PbxtTest.php
index d072fb0c47..3a9a7a30f5 100644
--- a/test/classes/Engines/PbxtTest.php
+++ b/test/classes/Engines/PbxtTest.php
@@ -180,29 +180,7 @@ class PbxtTest extends AbstractTestCase
      */
     public static function providerFortTestResolveTypeSize(): array
     {
-        return [
-            [
-                '8MB',
-                [
-                    0 => '8,192',
-                    1 => 'KiB',
-                ],
-            ],
-            [
-                '10mb',
-                [
-                    0 => '-1',
-                    1 => 'B',
-                ],
-            ],
-            [
-                'A4',
-                [
-                    0 => '0',
-                    1 => 'B',
-                ],
-            ],
-        ];
+        return [['8MB', [0 => '8,192', 1 => 'KiB']], ['10mb', [0 => '-1', 1 => 'B']], ['A4', [0 => '0', 1 => 'B']]];
     }
 
     /**
diff --git a/test/classes/ErrorHandlerTest.php b/test/classes/ErrorHandlerTest.php
index 92f08f3778..6147d187fa 100644
--- a/test/classes/ErrorHandlerTest.php
+++ b/test/classes/ErrorHandlerTest.php
@@ -58,22 +58,8 @@ class ErrorHandlerTest extends AbstractTestCase
     public static function providerForTestHandleError(): array
     {
         return [
-            [
-                E_RECOVERABLE_ERROR,
-                'Compile Error',
-                'error.txt',
-                12,
-                'Compile Error',
-                '',
-            ],
-            [
-                E_USER_NOTICE,
-                'User notice',
-                'error.txt',
-                12,
-                'User notice',
-                'User notice',
-            ],
+            [E_RECOVERABLE_ERROR, 'Compile Error', 'error.txt', 12, 'Compile Error', ''],
+            [E_USER_NOTICE, 'User notice', 'error.txt', 12, 'User notice', 'User notice'],
         ];
     }
 
@@ -222,9 +208,7 @@ class ErrorHandlerTest extends AbstractTestCase
 
         // Gives the last element
         $this->assertEquals(
-            [
-                $firstKey => $elements[$firstKey],
-            ],
+            [$firstKey => $elements[$firstKey]],
             $elements,
         );
         $this->assertEquals(9, count($this->object->getCurrentErrors()));
diff --git a/test/classes/ErrorReportTest.php b/test/classes/ErrorReportTest.php
index ab5bfcdc51..ff3ef254eb 100644
--- a/test/classes/ErrorReportTest.php
+++ b/test/classes/ErrorReportTest.php
@@ -69,10 +69,7 @@ class ErrorReportTest extends AbstractTestCase
         $actual = $this->errorReport->getData('php');
         $this->assertEquals([], $actual);
 
-        $_SESSION['prev_errors'] = [
-            new Error(0, 'error 0', 'file', 1),
-            new Error(1, 'error 1', 'file', 2),
-        ];
+        $_SESSION['prev_errors'] = [new Error(0, 'error 0', 'file', 1), new Error(1, 'error 1', 'file', 2)];
 
         $report = [
             'pma_version' => Version::VERSION,
@@ -286,13 +283,7 @@ class ErrorReportTest extends AbstractTestCase
     public static function urlsToSanitize(): array
     {
         return [
-            [
-                '',
-                [
-                    'index.php?',
-                    'index.php',
-                ],
-            ],
+            ['', ['index.php?', 'index.php']],
             [
                 'http://localhost/js/vendor/codemirror/addon/hint/show-hint.js?v=4.8.6-dev',
                 [
@@ -300,47 +291,17 @@ class ErrorReportTest extends AbstractTestCase
                     'js/vendor/codemirror/addon/hint/show-hint.js',
                 ],
             ],
-            [
-                'http://pma.7.3.local/tbl_sql.php?db=aaaaa&table=a&server=14',
-                [
-                    'tbl_sql.php?',
-                    'tbl_sql.php',
-                ],
-            ],
-            [
-                'http://pma.7.3.local/tbl_sql.php?db=aaaaa;table=a;server=14',
-                [
-                    'tbl_sql.php?',
-                    'tbl_sql.php',
-                ],
-            ],
-            [
-                'https://pma.7.3.local/tbl_sql.php?db=aaaaa;table=a;server=14',
-                [
-                    'tbl_sql.php?',
-                    'tbl_sql.php',
-                ],
-            ],
-            [
-                'https://pma.7.3.local/fileDotPhp.php?db=aaaaa;table=a;server=14',
-                [
-                    'fileDotPhp.php?',
-                    'fileDotPhp.php',
-                ],
-            ],
+            ['http://pma.7.3.local/tbl_sql.php?db=aaaaa&table=a&server=14', ['tbl_sql.php?', 'tbl_sql.php']],
+            ['http://pma.7.3.local/tbl_sql.php?db=aaaaa;table=a;server=14', ['tbl_sql.php?', 'tbl_sql.php']],
+            ['https://pma.7.3.local/tbl_sql.php?db=aaaaa;table=a;server=14', ['tbl_sql.php?', 'tbl_sql.php']],
+            ['https://pma.7.3.local/fileDotPhp.php?db=aaaaa;table=a;server=14', ['fileDotPhp.php?','fileDotPhp.php']],
             [
                 'https://pma.7.3.local/secretFolder/fileDotPhp.php?db=aaaaa;table=a;server=14',
-                [
-                    'fileDotPhp.php?',
-                    'fileDotPhp.php',
-                ],
+                ['fileDotPhp.php?', 'fileDotPhp.php'],
             ],
             [
                 'http://7.2.local/@williamdes/theREALphpMyAdminREPO/js/vendor/jquery/jquery-ui.min.js?v=5.0.0-dev',
-                [
-                    'js/vendor/jquery/jquery-ui.min.js?v=5.0.0-dev',
-                    'js/vendor/jquery/jquery-ui.min.js',
-                ],
+                ['js/vendor/jquery/jquery-ui.min.js?v=5.0.0-dev', 'js/vendor/jquery/jquery-ui.min.js'],
             ],
         ];
     }
diff --git a/test/classes/ErrorTest.php b/test/classes/ErrorTest.php
index 6925b8312f..2c46c47f12 100644
--- a/test/classes/ErrorTest.php
+++ b/test/classes/ErrorTest.php
@@ -42,14 +42,7 @@ class ErrorTest extends AbstractTestCase
      */
     public function testSetBacktrace(): void
     {
-        $bt = [
-            [
-                'file' => 'bt1',
-                'line' => 2,
-                'function' => 'bar',
-                'args' => ['foo' => $this],
-            ],
-        ];
+        $bt = [['file' => 'bt1', 'line' => 2, 'function' => 'bar', 'args' => ['foo' => $this]]];
         $this->object->setBacktrace($bt);
         $bt[0]['args']['foo'] = '<Class:PhpMyAdmin\Tests\ErrorTest>';
         $this->assertEquals($bt, $this->object->getBacktrace());
@@ -86,19 +79,13 @@ class ErrorTest extends AbstractTestCase
     public static function filePathProvider(): array
     {
         return [
-            [
-                './ChangeLog',
-                '.' . DIRECTORY_SEPARATOR . 'ChangeLog',
-            ],
+            ['./ChangeLog', '.' . DIRECTORY_SEPARATOR . 'ChangeLog'],
             [
                 __FILE__,
                 '.' . DIRECTORY_SEPARATOR . 'test' . DIRECTORY_SEPARATOR
                     . 'classes' . DIRECTORY_SEPARATOR . 'ErrorTest.php',
             ],
-            [
-                './NONEXISTING',
-                'NONEXISTING',
-            ],
+            ['./NONEXISTING', 'NONEXISTING'],
         ];
     }
 
@@ -165,30 +152,10 @@ class ErrorTest extends AbstractTestCase
     public function testGetBacktrace(): void
     {
         $bt = [
-            [
-                'file' => 'bt1',
-                'line' => 2,
-                'function' => 'bar',
-                'args' => ['foo' => 1],
-            ],
-            [
-                'file' => 'bt2',
-                'line' => 2,
-                'function' => 'bar',
-                'args' => ['foo' => 2],
-            ],
-            [
-                'file' => 'bt3',
-                'line' => 2,
-                'function' => 'bar',
-                'args' => ['foo' => 3],
-            ],
-            [
-                'file' => 'bt4',
-                'line' => 2,
-                'function' => 'bar',
-                'args' => ['foo' => 4],
-            ],
+            ['file' => 'bt1', 'line' => 2, 'function' => 'bar', 'args' => ['foo' => 1]],
+            ['file' => 'bt2', 'line' => 2, 'function' => 'bar', 'args' => ['foo' => 2]],
+            ['file' => 'bt3', 'line' => 2, 'function' => 'bar', 'args' => ['foo' => 3]],
+            ['file' => 'bt4', 'line' => 2, 'function' => 'bar', 'args' => ['foo' => 4]],
         ];
 
         $this->object->setBacktrace($bt);
diff --git a/test/classes/Export/OptionsTest.php b/test/classes/Export/OptionsTest.php
index 0d64b58dcd..dae9ea38d3 100644
--- a/test/classes/Export/OptionsTest.php
+++ b/test/classes/Export/OptionsTest.php
@@ -96,11 +96,7 @@ class OptionsTest extends AbstractTestCase
             'export_type' => $exportType,
             'db' => $db,
             'table' => $table,
-            'templates' => [
-                'is_enabled' => '',
-                'templates' => [],
-                'selected' => null,
-            ],
+            'templates' => ['is_enabled' => '', 'templates' => [], 'selected' => null],
             'sql_query' => '',
             'hidden_inputs' => [
                 'db' => $db,
diff --git a/test/classes/ExportTest.php b/test/classes/ExportTest.php
index 0f5d3c16ec..de3c2b2786 100644
--- a/test/classes/ExportTest.php
+++ b/test/classes/ExportTest.php
@@ -29,57 +29,24 @@ class ExportTest extends AbstractTestCase
             'test_db' => [
                 'alias' => 'aliastest',
                 'tables' => [
-                    'foo' => [
-                        'alias' => 'foobar',
-                        'columns' => [
-                            'bar' => 'foo',
-                            'baz' => 'barbaz',
-                        ],
-                    ],
-                    'bar' => [
-                        'alias' => 'foobaz',
-                        'columns' => [
-                            'a' => 'a_alias',
-                            'b' => 'b',
-                        ],
-                    ],
+                    'foo' => ['alias' => 'foobar', 'columns' => ['bar' => 'foo', 'baz' => 'barbaz']],
+                    'bar' => ['alias' => 'foobaz', 'columns' => ['a' => 'a_alias', 'b' => 'b']],
                 ],
             ],
         ];
         $aliases2 = [
             'test_db' => [
                 'alias' => 'test',
-                'tables' => [
-                    'foo' => [
-                        'columns' => ['bar' => 'foobar'],
-                    ],
-                    'baz' => [
-                        'columns' => ['a' => 'x'],
-                    ],
-                ],
+                'tables' => ['foo' => ['columns' => ['bar' => 'foobar']], 'baz' => ['columns' => ['a' => 'x']]],
             ],
         ];
         $expected = [
             'test_db' => [
                 'alias' => 'test',
                 'tables' => [
-                    'foo' => [
-                        'alias' => 'foobar',
-                        'columns' => [
-                            'bar' => 'foobar',
-                            'baz' => 'barbaz',
-                        ],
-                    ],
-                    'bar' => [
-                        'alias' => 'foobaz',
-                        'columns' => [
-                            'a' => 'a_alias',
-                            'b' => 'b',
-                        ],
-                    ],
-                    'baz' => [
-                        'columns' => ['a' => 'x'],
-                    ],
+                    'foo' => ['alias' => 'foobar', 'columns' => ['bar' => 'foobar', 'baz' => 'barbaz']],
+                    'bar' => ['alias' => 'foobaz', 'columns' => ['a' => 'a_alias', 'b' => 'b']],
+                    'baz' => ['columns' => ['a' => 'x']],
                 ],
             ],
         ];
@@ -97,24 +64,15 @@ class ExportTest extends AbstractTestCase
             new Transformations(),
         );
         $finalFileName = $export->getFinalFilenameAndMimetypeForFilename($exportPlugin, 'zip', 'myfilename');
-        $this->assertSame([
-            'myfilename.php.zip',
-            'application/zip',
-        ], $finalFileName);
+        $this->assertSame(['myfilename.php.zip', 'application/zip'], $finalFileName);
         $finalFileName = $export->getFinalFilenameAndMimetypeForFilename($exportPlugin, 'gzip', 'myfilename');
-        $this->assertSame([
-            'myfilename.php.gz',
-            'application/x-gzip',
-        ], $finalFileName);
+        $this->assertSame(['myfilename.php.gz', 'application/x-gzip'], $finalFileName);
         $finalFileName = $export->getFinalFilenameAndMimetypeForFilename(
             $exportPlugin,
             'gzip',
             'export.db1.table1.file',
         );
-        $this->assertSame([
-            'export.db1.table1.file.php.gz',
-            'application/x-gzip',
-        ], $finalFileName);
+        $this->assertSame(['export.db1.table1.file.php.gz', 'application/x-gzip'], $finalFileName);
     }
 
     public function testExportDatabase(): void
diff --git a/test/classes/FileListingTest.php b/test/classes/FileListingTest.php
index bffa971776..0f18779cd7 100644
--- a/test/classes/FileListingTest.php
+++ b/test/classes/FileListingTest.php
@@ -36,10 +36,7 @@ class FileListingTest extends AbstractTestCase
         }
 
         $this->assertSame(
-            [
-                'one.txt',
-                'two.md',
-            ],
+            ['one.txt', 'two.md'],
             array_values($dirContent),
         );
     }
diff --git a/test/classes/FileTest.php b/test/classes/FileTest.php
index 5fe00a5986..66010e6007 100644
--- a/test/classes/FileTest.php
+++ b/test/classes/FileTest.php
@@ -72,18 +72,9 @@ class FileTest extends AbstractTestCase
     public static function compressedFiles(): array
     {
         return [
-            [
-                './test/test_data/test.gz',
-                'application/gzip',
-            ],
-            [
-                './test/test_data/test.bz2',
-                'application/bzip2',
-            ],
-            [
-                './test/test_data/test.zip',
-                'application/zip',
-            ],
+            ['./test/test_data/test.gz', 'application/gzip'],
+            ['./test/test_data/test.bz2', 'application/bzip2'],
+            ['./test/test_data/test.zip', 'application/zip'],
         ];
     }
 }
diff --git a/test/classes/FlashMessagesTest.php b/test/classes/FlashMessagesTest.php
index e52521b5b8..651ac8fe88 100644
--- a/test/classes/FlashMessagesTest.php
+++ b/test/classes/FlashMessagesTest.php
@@ -50,18 +50,12 @@ class FlashMessagesTest extends AbstractTestCase
 
     public function testGetMessages(): void
     {
-        $_SESSION[self::STORAGE_KEY] = [
-            'error' => ['Error1', 'Error2'],
-            'warning' => ['Warning'],
-        ];
+        $_SESSION[self::STORAGE_KEY] = ['error' => ['Error1', 'Error2'], 'warning' => ['Warning']];
         $flash = new FlashMessages();
         $flash->addMessage('notice', 'Notice');
         $messages = $flash->getMessages();
         $this->assertEquals(
-            [
-                'error' => ['Error1', 'Error2'],
-                'warning' => ['Warning'],
-            ],
+            ['error' => ['Error1', 'Error2'], 'warning' => ['Warning']],
             $messages,
         );
     }
diff --git a/test/classes/FontTest.php b/test/classes/FontTest.php
index bf5b50f67a..48a31375aa 100644
--- a/test/classes/FontTest.php
+++ b/test/classes/FontTest.php
@@ -244,12 +244,7 @@ class FontTest extends AbstractTestCase
                 'a',
                 'arial',
                 10,
-                [
-                    [
-                        'chars' => 'a',
-                        'modifier' => 0.61,
-                    ],
-                ],
+                [['chars' => 'a', 'modifier' => 0.61]],
             ),
         );
 
@@ -260,12 +255,7 @@ class FontTest extends AbstractTestCase
                 'a',
                 'arial',
                 10,
-                [
-                    [
-                        'chars' => ['a'],
-                        'modifier' => 0.61,
-                    ],
-                ],
+                [['chars' => ['a'], 'modifier' => 0.61]],
             ),
         );
     }
diff --git a/test/classes/FooterTest.php b/test/classes/FooterTest.php
index ef3a01c075..c5e7f4abe3 100644
--- a/test/classes/FooterTest.php
+++ b/test/classes/FooterTest.php
@@ -70,16 +70,8 @@ class FooterTest extends AbstractTestCase
     {
         $GLOBALS['cfg']['DBG']['sql'] = true;
         $_SESSION['debug']['queries'] = [
-            [
-                'count' => 1,
-                'time' => 0.2,
-                'query' => 'SELECT * FROM `pma_bookmark` WHERE 1',
-            ],
-            [
-                'count' => 1,
-                'time' => 2.5,
-                'query' => 'SELECT * FROM `db` WHERE 1',
-            ],
+            ['count' => 1, 'time' => 0.2, 'query' => 'SELECT * FROM `pma_bookmark` WHERE 1'],
+            ['count' => 1, 'time' => 2.5, 'query' => 'SELECT * FROM `db` WHERE 1'],
         ];
 
         $this->assertEquals(
diff --git a/test/classes/Gis/GisFactoryTest.php b/test/classes/Gis/GisFactoryTest.php
index 81b64f6af8..adefabb1e5 100644
--- a/test/classes/Gis/GisFactoryTest.php
+++ b/test/classes/Gis/GisFactoryTest.php
@@ -39,34 +39,13 @@ class GisFactoryTest extends AbstractTestCase
     public static function providerForTestFactory(): array
     {
         return [
-            [
-                'MULTIPOLYGON',
-                GisMultiPolygon::class,
-            ],
-            [
-                'POLYGON',
-                GisPolygon::class,
-            ],
-            [
-                'MULTILINESTRING',
-                GisMultiLineString::class,
-            ],
-            [
-                'LINESTRING',
-                GisLineString::class,
-            ],
-            [
-                'MULTIPOINT',
-                GisMultiPoint::class,
-            ],
-            [
-                'POINT',
-                GisPoint::class,
-            ],
-            [
-                'GEOMETRYCOLLECTION',
-                GisGeometryCollection::class,
-            ],
+            ['MULTIPOLYGON', GisMultiPolygon::class],
+            ['POLYGON', GisPolygon::class],
+            ['MULTILINESTRING', GisMultiLineString::class],
+            ['LINESTRING', GisLineString::class],
+            ['MULTIPOINT', GisMultiPoint::class],
+            ['POINT', GisPoint::class],
+            ['GEOMETRYCOLLECTION', GisGeometryCollection::class],
         ];
     }
 }
diff --git a/test/classes/Gis/GisGeometryCollectionTest.php b/test/classes/Gis/GisGeometryCollectionTest.php
index 3b7f23e86f..97a4294a42 100644
--- a/test/classes/Gis/GisGeometryCollectionTest.php
+++ b/test/classes/Gis/GisGeometryCollectionTest.php
@@ -71,28 +71,11 @@ class GisGeometryCollectionTest extends GisGeomTestCase
         $temp1 = [
             0 => [
                 'gis_type' => 'LINESTRING',
-                'LINESTRING' => [
-                    'no_of_points' => 2,
-                    0 => [
-                        'x' => 5.02,
-                        'y' => 8.45,
-                    ],
-                    1 => [
-                        'x' => 6.14,
-                        'y' => 0.15,
-                    ],
-                ],
+                'LINESTRING' => ['no_of_points' => 2, 0 => ['x' => 5.02,'y' => 8.45], 1 => ['x' => 6.14,'y' => 0.15]],
             ],
         ];
 
-        return [
-            [
-                $temp1,
-                0,
-                null,
-                'GEOMETRYCOLLECTION(LINESTRING(5.02 8.45,6.14 0.15))',
-            ],
-        ];
+        return [[$temp1, 0, null, 'GEOMETRYCOLLECTION(LINESTRING(5.02 8.45,6.14 0.15))']];
     }
 
     /**
@@ -134,14 +117,8 @@ class GisGeometryCollectionTest extends GisGeomTestCase
                         'gis_type' => 'LINESTRING',
                         'LINESTRING' => [
                             'no_of_points' => 2,
-                            0 => [
-                                'x' => 5.02,
-                                'y' => 8.45,
-                            ],
-                            1 => [
-                                'x' => 6.14,
-                                'y' => 0.15,
-                            ],
+                            0 => ['x' => 5.02, 'y' => 8.45],
+                            1 => ['x' => 6.14, 'y' => 0.15],
                         ],
                     ],
                     1 => [
@@ -150,33 +127,15 @@ class GisGeometryCollectionTest extends GisGeomTestCase
                             'no_of_lines' => 2,
                             0 => [
                                 'no_of_points' => 3,
-                                0 => [
-                                    'x' => 36.0,
-                                    'y' => 14.0,
-                                ],
-                                1 => [
-                                    'x' => 47.0,
-                                    'y' => 23.0,
-                                ],
-                                2 => [
-                                    'x' => 62.0,
-                                    'y' => 75.0,
-                                ],
+                                0 => ['x' => 36.0, 'y' => 14.0],
+                                1 => ['x' => 47.0, 'y' => 23.0],
+                                2 => ['x' => 62.0, 'y' => 75.0],
                             ],
                             1 => [
                                 'no_of_points' => 3,
-                                0 => [
-                                    'x' => 36.0,
-                                    'y' => 10.0,
-                                ],
-                                1 => [
-                                    'x' => 17.0,
-                                    'y' => 23.0,
-                                ],
-                                2 => [
-                                    'x' => 178.0,
-                                    'y' => 53.0,
-                                ],
+                                0 => ['x' => 36.0, 'y' => 10.0],
+                                1 => ['x' => 17.0, 'y' => 23.0],
+                                2 => ['x' => 178.0, 'y' => 53.0],
                             ],
                         ],
                     ],
@@ -184,14 +143,8 @@ class GisGeometryCollectionTest extends GisGeomTestCase
                         'gis_type' => 'MULTIPOINT',
                         'MULTIPOINT' => [
                             'no_of_points' => 2,
-                            0 => [
-                                'x' => 5.02,
-                                'y' => 8.45,
-                            ],
-                            1 => [
-                                'x' => 6.14,
-                                'y' => 0.15,
-                            ],
+                            0 => ['x' => 5.02, 'y' => 8.45],
+                            1 => ['x' => 6.14, 'y' => 0.15],
                         ],
                     ],
                     3 => [
@@ -202,123 +155,51 @@ class GisGeometryCollectionTest extends GisGeomTestCase
                                 'no_of_lines' => 2,
                                 0 => [
                                     'no_of_points' => 5,
-                                    0 => [
-                                        'x' => 35.0,
-                                        'y' => 10.0,
-                                    ],
-                                    1 => [
-                                        'x' => 10.0,
-                                        'y' => 20.0,
-                                    ],
-                                    2 => [
-                                        'x' => 15.0,
-                                        'y' => 40.0,
-                                    ],
-                                    3 => [
-                                        'x' => 45.0,
-                                        'y' => 45.0,
-                                    ],
-                                    4 => [
-                                        'x' => 35.0,
-                                        'y' => 10.0,
-                                    ],
+                                    0 => ['x' => 35.0, 'y' => 10.0],
+                                    1 => ['x' => 10.0, 'y' => 20.0],
+                                    2 => ['x' => 15.0, 'y' => 40.0],
+                                    3 => ['x' => 45.0, 'y' => 45.0],
+                                    4 => ['x' => 35.0, 'y' => 10.0],
                                 ],
                                 1 => [
                                     'no_of_points' => 4,
-                                    0 => [
-                                        'x' => 20.0,
-                                        'y' => 30.0,
-                                    ],
-                                    1 => [
-                                        'x' => 35.0,
-                                        'y' => 32.0,
-                                    ],
-                                    2 => [
-                                        'x' => 30.0,
-                                        'y' => 20.0,
-                                    ],
-                                    3 => [
-                                        'x' => 20.0,
-                                        'y' => 30.0,
-                                    ],
+                                    0 => ['x' => 20.0, 'y' => 30.0],
+                                    1 => ['x' => 35.0, 'y' => 32.0],
+                                    2 => ['x' => 30.0, 'y' => 20.0],
+                                    3 => ['x' => 20.0, 'y' => 30.0],
                                 ],
                             ],
                             1 => [
                                 'no_of_lines' => 1,
                                 0 => [
                                     'no_of_points' => 4,
-                                    0 => [
-                                        'x' => 123.0,
-                                        'y' => 0.0,
-                                    ],
-                                    1 => [
-                                        'x' => 23.0,
-                                        'y' => 30.0,
-                                    ],
-                                    2 => [
-                                        'x' => 17.0,
-                                        'y' => 63.0,
-                                    ],
-                                    3 => [
-                                        'x' => 123.0,
-                                        'y' => 0.0,
-                                    ],
+                                    0 => ['x' => 123.0, 'y' => 0.0],
+                                    1 => ['x' => 23.0, 'y' => 30.0],
+                                    2 => ['x' => 17.0, 'y' => 63.0],
+                                    3 => ['x' => 123.0, 'y' => 0.0],
                                 ],
                             ],
                         ],
                     ],
-                    4 => [
-                        'gis_type' => 'POINT',
-                        'POINT' => [
-                            'x' => 5.02,
-                            'y' => 8.45,
-                        ],
-                    ],
+                    4 => ['gis_type' => 'POINT', 'POINT' => ['x' => 5.02, 'y' => 8.45]],
                     5 => [
                         'gis_type' => 'POLYGON',
                         'POLYGON' => [
                             'no_of_lines' => 2,
                             0 => [
                                 'no_of_points' => 5,
-                                0 => [
-                                    'x' => 35.0,
-                                    'y' => 10.0,
-                                ],
-                                1 => [
-                                    'x' => 10.0,
-                                    'y' => 20.0,
-                                ],
-                                2 => [
-                                    'x' => 15.0,
-                                    'y' => 40.0,
-                                ],
-                                3 => [
-                                    'x' => 45.0,
-                                    'y' => 45.0,
-                                ],
-                                4 => [
-                                    'x' => 35.0,
-                                    'y' => 10.0,
-                                ],
+                                0 => ['x' => 35.0, 'y' => 10.0],
+                                1 => ['x' => 10.0, 'y' => 20.0],
+                                2 => ['x' => 15.0, 'y' => 40.0],
+                                3 => ['x' => 45.0, 'y' => 45.0],
+                                4 => ['x' => 35.0, 'y' => 10.0],
                             ],
                             1 => [
                                 'no_of_points' => 4,
-                                0 => [
-                                    'x' => 20.0,
-                                    'y' => 30.0,
-                                ],
-                                1 => [
-                                    'x' => 35.0,
-                                    'y' => 32.0,
-                                ],
-                                2 => [
-                                    'x' => 30.0,
-                                    'y' => 20.0,
-                                ],
-                                3 => [
-                                    'x' => 20.0,
-                                    'y' => 30.0,
-                                ],
+                                0 => ['x' => 20.0, 'y' => 30.0],
+                                1 => ['x' => 35.0, 'y' => 32.0],
+                                2 => ['x' => 30.0, 'y' => 20.0],
+                                3 => ['x' => 20.0, 'y' => 30.0],
                             ],
                         ],
                     ],
@@ -432,12 +313,7 @@ class GisGeometryCollectionTest extends GisGeomTestCase
                 'GEOMETRYCOLLECTION(POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 30)))',
                 'svg',
                 [176, 46, 224],
-                [
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150,
-                ],
+                ['x' => 12, 'y' => 69, 'scale' => 2, 'height' => 150],
                 '<path d=" M 46, 268 L -4, 248 L 6, 208 L 66, 198 Z  M 16,'
                 . ' 228 L 46, 224 L 36, 248 Z " name="svg" id="svg1234567890'
                 . '" class="polygon vector" stroke="black" stroke-width="0.5"'
diff --git a/test/classes/Gis/GisGeometryTest.php b/test/classes/Gis/GisGeometryTest.php
index 9d997f05f9..d0bf9944a0 100644
--- a/test/classes/Gis/GisGeometryTest.php
+++ b/test/classes/Gis/GisGeometryTest.php
@@ -54,10 +54,7 @@ class GisGeometryTest extends AbstractTestCase
                 $this->object,
                 GisGeometry::class,
                 'setMinMax',
-                [
-                    $pointSet,
-                    $minMax,
-                ],
+                [$pointSet, $minMax],
             ),
         );
     }
@@ -70,16 +67,8 @@ class GisGeometryTest extends AbstractTestCase
     public static function providerForTestSetMinMax(): array
     {
         return [
-            [
-                '12 35,48 75,69 23,25 45,14 53,35 78',
-                null,
-                new ScaleData(69, 12, 78, 23),
-            ],
-            [
-                '12 35,48 75,69 23,25 45,14 53,35 78',
-                new ScaleData(29, 2, 128, 23),
-                new ScaleData(69, 2, 128, 23),
-            ],
+            ['12 35,48 75,69 23,25 45,14 53,35 78', null, new ScaleData(69, 12, 78, 23)],
+            ['12 35,48 75,69 23,25 45,14 53,35 78', new ScaleData(29, 2, 128, 23), new ScaleData(69, 2, 128, 23)],
         ];
     }
 
@@ -114,25 +103,13 @@ class GisGeometryTest extends AbstractTestCase
         return [
             [
                 "'MULTIPOINT(125 50,156 25,178 43,175 80)',125",
-                [
-                    'srid' => 125,
-                    'wkt' => 'MULTIPOINT(125 50,156 25,178 43,175 80)',
-                ],
+                ['srid' => 125, 'wkt' => 'MULTIPOINT(125 50,156 25,178 43,175 80)'],
             ],
             [
                 'MULTIPOINT(125 50,156 25,178 43,175 80)',
-                [
-                    'srid' => 0,
-                    'wkt' => 'MULTIPOINT(125 50,156 25,178 43,175 80)',
-                ],
-            ],
-            [
-                'foo',
-                [
-                    'srid' => 0,
-                    'wkt' => '',
-                ],
+                ['srid' => 0, 'wkt' => 'MULTIPOINT(125 50,156 25,178 43,175 80)'],
             ],
+            ['foo', ['srid' => 0, 'wkt' => '']],
         ];
     }
 
@@ -156,11 +133,7 @@ class GisGeometryTest extends AbstractTestCase
             $this->object,
             GisGeometry::class,
             'extractPointsInternal',
-            [
-                $pointSet,
-                $scaleData,
-                $linear,
-            ],
+            [$pointSet, $scaleData, $linear],
         );
         $this->assertEquals($output, $points);
     }
@@ -174,84 +147,18 @@ class GisGeometryTest extends AbstractTestCase
     {
         return [
             // with no scale data
-            [
-                '12 35,48 75,69 23',
-                null,
-                false,
-                [
-                    0 => [
-                        12,
-                        35,
-                    ],
-                    1 => [
-                        48,
-                        75,
-                    ],
-                    2 => [
-                        69,
-                        23,
-                    ],
-                ],
-            ],
+            ['12 35,48 75,69 23', null, false, [0 => [12, 35], 1 => [48, 75], 2 => [69, 23]]],
             // with scale data
             [
                 '12 35,48 75,69 23',
-                [
-                    'x' => 5,
-                    'y' => 5,
-                    'scale' => 2,
-                    'height' => 200,
-                ],
+                ['x' => 5, 'y' => 5, 'scale' => 2, 'height' => 200],
                 false,
-                [
-                    0 => [
-                        14,
-                        140,
-                    ],
-                    1 => [
-                        86,
-                        60,
-                    ],
-                    2 => [
-                        128,
-                        164,
-                    ],
-                ],
+                [0 => [14, 140], 1 => [86, 60], 2 => [128, 164]],
             ],
             // linear output
-            [
-                '12 35,48 75,69 23',
-                null,
-                true,
-                [
-                    12,
-                    35,
-                    48,
-                    75,
-                    69,
-                    23,
-                ],
-            ],
+            ['12 35,48 75,69 23', null, true, [12, 35, 48, 75, 69, 23]],
             // if a single part of a coordinate is empty
-            [
-                '12 35,48 75,69 ',
-                null,
-                false,
-                [
-                    0 => [
-                        12,
-                        35,
-                    ],
-                    1 => [
-                        48,
-                        75,
-                    ],
-                    2 => [
-                        0,
-                        0,
-                    ],
-                ],
-            ],
+            ['12 35,48 75,69 ', null, false, [0 => [12, 35], 1 => [48, 75], 2 => [0, 0]]],
         ];
     }
 }
diff --git a/test/classes/Gis/GisLineStringTest.php b/test/classes/Gis/GisLineStringTest.php
index 8f3dab1938..e0693ded7c 100644
--- a/test/classes/Gis/GisLineStringTest.php
+++ b/test/classes/Gis/GisLineStringTest.php
@@ -27,14 +27,8 @@ class GisLineStringTest extends GisGeomTestCase
             0 => [
                 'LINESTRING' => [
                     'no_of_points' => 2,
-                    0 => [
-                        'x' => 5.02,
-                        'y' => 8.45,
-                    ],
-                    1 => [
-                        'x' => 6.14,
-                        'y' => 0.15,
-                    ],
+                    0 => ['x' => 5.02, 'y' => 8.45],
+                    1 => ['x' => 6.14, 'y' => 0.15],
                 ],
             ],
         ];
@@ -51,33 +45,13 @@ class GisLineStringTest extends GisGeomTestCase
         unset($temp4[0]['LINESTRING'][2]['x']);
 
         return [
-            [
-                $temp1,
-                0,
-                null,
-                'LINESTRING(5.02 8.45,6.14 0.15)',
-            ],
+            [$temp1, 0, null, 'LINESTRING(5.02 8.45,6.14 0.15)'],
             // if a coordinate is missing, default is empty string
-            [
-                $temp2,
-                0,
-                null,
-                'LINESTRING(5.02 8.45,6.14 0.15,1.56 )',
-            ],
+            [$temp2, 0, null, 'LINESTRING(5.02 8.45,6.14 0.15,1.56 )'],
             // if no_of_points is not valid, it is considered as 2
-            [
-                $temp3,
-                0,
-                null,
-                'LINESTRING(5.02 8.45,6.14 0.15)',
-            ],
+            [$temp3, 0, null, 'LINESTRING(5.02 8.45,6.14 0.15)'],
             // missing coordinates are replaced with provided values (3rd parameter)
-            [
-                $temp4,
-                0,
-                '0',
-                'LINESTRING(5.02 8.45,6.14 0.15,0 0)',
-            ],
+            [$temp4, 0, '0', 'LINESTRING(5.02 8.45,6.14 0.15,0 0)'],
         ];
     }
 
@@ -126,14 +100,8 @@ class GisLineStringTest extends GisGeomTestCase
                     0 => [
                         'LINESTRING' => [
                             'no_of_points' => 2,
-                            0 => [
-                                'x' => 5.02,
-                                'y' => 8.45,
-                            ],
-                            1 => [
-                                'x' => 6.14,
-                                'y' => 0.15,
-                            ],
+                            0 => ['x' => 5.02, 'y' => 8.45],
+                            1 => ['x' => 6.14, 'y' => 0.15],
                         ],
                     ],
                 ],
@@ -162,12 +130,7 @@ class GisLineStringTest extends GisGeomTestCase
      */
     public static function providerForTestScaleRow(): array
     {
-        return [
-            [
-                'LINESTRING(12 35,48 75,69 23,25 45,14 53,35 78)',
-                new ScaleData(69, 12, 78, 23),
-            ],
-        ];
+        return [['LINESTRING(12 35,48 75,69 23,25 45,14 53,35 78)', new ScaleData(69, 12, 78, 23)]];
     }
 
     /** @requires extension gd */
@@ -272,12 +235,7 @@ class GisLineStringTest extends GisGeomTestCase
                 'LINESTRING(12 35,48 75,69 23,25 45,14 53,35 78)',
                 'svg',
                 [176, 46, 224],
-                [
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150,
-                ],
+                ['x' => 12, 'y' => 69, 'scale' => 2, 'height' => 150],
                 '<polyline points="0,218 72,138 114,242 26,198 4,182 46,132 " '
                 . 'name="svg" id="svg1234567890" class="linestring vector" fill="none" '
                 . 'stroke="#b02ee0" stroke-width="2"/>',
diff --git a/test/classes/Gis/GisMultiLineStringTest.php b/test/classes/Gis/GisMultiLineStringTest.php
index 2826c29701..7f5d022d79 100644
--- a/test/classes/Gis/GisMultiLineStringTest.php
+++ b/test/classes/Gis/GisMultiLineStringTest.php
@@ -27,28 +27,8 @@ class GisMultiLineStringTest extends GisGeomTestCase
             0 => [
                 'MULTILINESTRING' => [
                     'no_of_lines' => 2,
-                    0 => [
-                        'no_of_points' => 2,
-                        0 => [
-                            'x' => 5.02,
-                            'y' => 8.45,
-                        ],
-                        1 => [
-                            'x' => 6.14,
-                            'y' => 0.15,
-                        ],
-                    ],
-                    1 => [
-                        'no_of_points' => 2,
-                        0 => [
-                            'x' => 1.23,
-                            'y' => 4.25,
-                        ],
-                        1 => [
-                            'x' => 9.15,
-                            'y' => 0.47,
-                        ],
-                    ],
+                    0 => ['no_of_points' => 2, 0 => ['x' => 5.02, 'y' => 8.45], 1 => ['x' => 6.14, 'y' => 0.15]],
+                    1 => ['no_of_points' => 2, 0 => ['x' => 1.23, 'y' => 4.25], 1 => ['x' => 9.15, 'y' => 0.47]],
                 ],
             ],
         ];
@@ -63,40 +43,15 @@ class GisMultiLineStringTest extends GisGeomTestCase
         $temp3[0]['MULTILINESTRING'][1]['no_of_points'] = 1;
 
         return [
-            [
-                $temp,
-                0,
-                null,
-                'MULTILINESTRING((5.02 8.45,6.14 0.15),(1.23 4.25,9.15 0.47))',
-            ],
+            [$temp, 0, null, 'MULTILINESTRING((5.02 8.45,6.14 0.15),(1.23 4.25,9.15 0.47))'],
             // if a coordinate is missing, default is empty string
-            [
-                $temp1,
-                0,
-                null,
-                'MULTILINESTRING((5.02 8.45,6.14 0.15),(1.23 4.25,9.15 ))',
-            ],
+            [$temp1, 0, null, 'MULTILINESTRING((5.02 8.45,6.14 0.15),(1.23 4.25,9.15 ))'],
             // missing coordinates are replaced with provided values (3rd parameter)
-            [
-                $temp1,
-                0,
-                '0',
-                'MULTILINESTRING((5.02 8.45,6.14 0.15),(1.23 4.25,9.15 0))',
-            ],
+            [$temp1, 0, '0', 'MULTILINESTRING((5.02 8.45,6.14 0.15),(1.23 4.25,9.15 0))'],
             // at least one line should be there
-            [
-                $temp2,
-                0,
-                null,
-                'MULTILINESTRING((5.02 8.45,6.14 0.15))',
-            ],
+            [$temp2, 0, null, 'MULTILINESTRING((5.02 8.45,6.14 0.15))'],
             // a line should have at least two points
-            [
-                $temp3,
-                0,
-                '0',
-                'MULTILINESTRING((5.02 8.45,6.14 0.15),(1.23 4.25,9.15 0.47))',
-            ],
+            [$temp3, 0, '0', 'MULTILINESTRING((5.02 8.45,6.14 0.15),(1.23 4.25,9.15 0.47))'],
         ];
     }
 
@@ -124,30 +79,8 @@ class GisMultiLineStringTest extends GisGeomTestCase
         $rowData = [
             'numparts' => 2,
             'parts' => [
-                0 => [
-                    'points' => [
-                        0 => [
-                            'x' => 5.02,
-                            'y' => 8.45,
-                        ],
-                        1 => [
-                            'x' => 6.14,
-                            'y' => 0.15,
-                        ],
-                    ],
-                ],
-                1 => [
-                    'points' => [
-                        0 => [
-                            'x' => 1.23,
-                            'y' => 4.25,
-                        ],
-                        1 => [
-                            'x' => 9.15,
-                            'y' => 0.47,
-                        ],
-                    ],
-                ],
+                0 => ['points' => [0 => ['x' => 5.02, 'y' => 8.45], 1 => ['x' => 6.14, 'y' => 0.15]]],
+                1 => ['points' => [0 => ['x' => 1.23, 'y' => 4.25], 1 => ['x' => 9.15, 'y' => 0.47]]],
             ],
         ];
 
@@ -187,28 +120,8 @@ class GisMultiLineStringTest extends GisGeomTestCase
                     0 => [
                         'MULTILINESTRING' => [
                             'no_of_lines' => 2,
-                            0 => [
-                                'no_of_points' => 2,
-                                0 => [
-                                    'x' => 5.02,
-                                    'y' => 8.45,
-                                ],
-                                1 => [
-                                    'x' => 6.14,
-                                    'y' => 0.15,
-                                ],
-                            ],
-                            1 => [
-                                'no_of_points' => 2,
-                                0 => [
-                                    'x' => 1.23,
-                                    'y' => 4.25,
-                                ],
-                                1 => [
-                                    'x' => 9.15,
-                                    'y' => 0.47,
-                                ],
-                            ],
+                            0 => ['no_of_points' => 2, 0 => ['x' => 5.02,'y' => 8.45], 1 => ['x' => 6.14,'y' => 0.15]],
+                            1 => ['no_of_points' => 2, 0 => ['x' => 1.23,'y' => 4.25], 1 => ['x' => 9.15,'y' => 0.47]],
                         ],
                     ],
                 ],
@@ -237,12 +150,7 @@ class GisMultiLineStringTest extends GisGeomTestCase
      */
     public static function providerForTestScaleRow(): array
     {
-        return [
-            [
-                'MULTILINESTRING((36 14,47 23,62 75),(36 10,17 23,178 53))',
-                new ScaleData(178, 17, 75, 10),
-            ],
-        ];
+        return [['MULTILINESTRING((36 14,47 23,62 75),(36 10,17 23,178 53))', new ScaleData(178, 17, 75, 10)]];
     }
 
     /** @requires extension gd */
@@ -347,12 +255,7 @@ class GisMultiLineStringTest extends GisGeomTestCase
                 'MULTILINESTRING((36 14,47 23,62 75),(36 10,17 23,178 53))',
                 'svg',
                 [176, 46, 224],
-                [
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150,
-                ],
+                ['x' => 12, 'y' => 69, 'scale' => 2, 'height' => 150],
                 '<polyline points="48,260 70,242 100,138 " name="svg" '
                 . 'class="linestring vector" fill="none" stroke="#b02ee0" '
                 . 'stroke-width="2" id="svg1234567890"/><polyline points="48,268 10,'
diff --git a/test/classes/Gis/GisMultiPointTest.php b/test/classes/Gis/GisMultiPointTest.php
index 9eae7d3c2c..c942c3d023 100644
--- a/test/classes/Gis/GisMultiPointTest.php
+++ b/test/classes/Gis/GisMultiPointTest.php
@@ -29,14 +29,8 @@ class GisMultiPointTest extends GisGeomTestCase
             0 => [
                 'MULTIPOINT' => [
                     'no_of_points' => 2,
-                    0 => [
-                        'x' => 5.02,
-                        'y' => 8.45,
-                    ],
-                    1 => [
-                        'x' => 1.56,
-                        'y' => 4.36,
-                    ],
+                    0 => ['x' => 5.02, 'y' => 8.45],
+                    1 => ['x' => 1.56, 'y' => 4.36],
                 ],
             ],
         ];
@@ -45,18 +39,8 @@ class GisMultiPointTest extends GisGeomTestCase
         $gisData2[0]['MULTIPOINT']['no_of_points'] = -1;
 
         return [
-            [
-                $gisData1,
-                0,
-                null,
-                'MULTIPOINT(5.02 8.45,1.56 4.36)',
-            ],
-            [
-                $gisData2,
-                0,
-                null,
-                'MULTIPOINT(5.02 8.45)',
-            ],
+            [$gisData1, 0, null, 'MULTIPOINT(5.02 8.45,1.56 4.36)'],
+            [$gisData2, 0, null, 'MULTIPOINT(5.02 8.45)'],
         ];
     }
 
@@ -81,19 +65,7 @@ class GisMultiPointTest extends GisGeomTestCase
      */
     public function testGetShape(): void
     {
-        $gisData = [
-            'numpoints' => 2,
-            'points' => [
-                0 => [
-                    'x' => 5.02,
-                    'y' => 8.45,
-                ],
-                1 => [
-                    'x' => 6.14,
-                    'y' => 0.15,
-                ],
-            ],
-        ];
+        $gisData = ['numpoints' => 2, 'points' => [0 => ['x' => 5.02, 'y' => 8.45], 1 => ['x' => 6.14, 'y' => 0.15]]];
 
         $object = GisMultiPoint::singleton();
         $this->assertEquals('MULTIPOINT(5.02 8.45,6.14 0.15)', $object->getShape($gisData));
@@ -128,14 +100,8 @@ class GisMultiPointTest extends GisGeomTestCase
                     0 => [
                         'MULTIPOINT' => [
                             'no_of_points' => 2,
-                            0 => [
-                                'x' => 5.02,
-                                'y' => 8.45,
-                            ],
-                            1 => [
-                                'x' => 6.14,
-                                'y' => 0.15,
-                            ],
+                            0 => ['x' => 5.02, 'y' => 8.45],
+                            1 => ['x' => 6.14, 'y' => 0.15],
                         ],
                     ],
                 ],
@@ -164,12 +130,7 @@ class GisMultiPointTest extends GisGeomTestCase
      */
     public static function providerForTestScaleRow(): array
     {
-        return [
-            [
-                'MULTIPOINT(12 35,48 75,69 23,25 45,14 53,35 78)',
-                new ScaleData(69, 12, 78, 23),
-            ],
-        ];
+        return [['MULTIPOINT(12 35,48 75,69 23,25 45,14 53,35 78)', new ScaleData(69, 12, 78, 23)]];
     }
 
     /** @requires extension gd */
@@ -276,12 +237,7 @@ class GisMultiPointTest extends GisGeomTestCase
                 'MULTIPOINT(12 35,48 75,69 23,25 45,14 53,35 78)',
                 'svg',
                 [176, 46, 224],
-                [
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150,
-                ],
+                ['x' => 12, 'y' => 69, 'scale' => 2, 'height' => 150],
                 '<circle cx="72" cy="138" r="3" name="svg" class="multipoint '
                 . 'vector" fill="white" stroke="#b02ee0" stroke-width="2" id="'
                 . 'svg1234567890"/><circle cx="114" cy="242" r="3" name="svg" class="mult'
diff --git a/test/classes/Gis/GisMultiPolygonTest.php b/test/classes/Gis/GisMultiPolygonTest.php
index cb55966202..5d2a344107 100644
--- a/test/classes/Gis/GisMultiPolygonTest.php
+++ b/test/classes/Gis/GisMultiPolygonTest.php
@@ -30,67 +30,28 @@ class GisMultiPolygonTest extends GisGeomTestCase
                     'no_of_lines' => 2,
                     0 => [
                         'no_of_points' => 5,
-                        0 => [
-                            'x' => 35,
-                            'y' => 10,
-                        ],
-                        1 => [
-                            'x' => 10,
-                            'y' => 20,
-                        ],
-                        2 => [
-                            'x' => 15,
-                            'y' => 40,
-                        ],
-                        3 => [
-                            'x' => 45,
-                            'y' => 45,
-                        ],
-                        4 => [
-                            'x' => 35,
-                            'y' => 10,
-                        ],
+                        0 => ['x' => 35, 'y' => 10],
+                        1 => ['x' => 10, 'y' => 20],
+                        2 => ['x' => 15, 'y' => 40],
+                        3 => ['x' => 45, 'y' => 45],
+                        4 => ['x' => 35, 'y' => 10],
                     ],
                     1 => [
                         'no_of_points' => 4,
-                        0 => [
-                            'x' => 20,
-                            'y' => 30,
-                        ],
-                        1 => [
-                            'x' => 35,
-                            'y' => 32,
-                        ],
-                        2 => [
-                            'x' => 30,
-                            'y' => 20,
-                        ],
-                        3 => [
-                            'x' => 20,
-                            'y' => 30,
-                        ],
+                        0 => ['x' => 20, 'y' => 30],
+                        1 => ['x' => 35, 'y' => 32],
+                        2 => ['x' => 30, 'y' => 20],
+                        3 => ['x' => 20, 'y' => 30],
                     ],
                 ],
                 1 => [
                     'no_of_lines' => 1,
                     0 => [
                         'no_of_points' => 4,
-                        0 => [
-                            'x' => 123,
-                            'y' => 0,
-                        ],
-                        1 => [
-                            'x' => 23,
-                            'y' => 30,
-                        ],
-                        2 => [
-                            'x' => 17,
-                            'y' => 63,
-                        ],
-                        3 => [
-                            'x' => 123,
-                            'y' => 0,
-                        ],
+                        0 => ['x' => 123, 'y' => 0],
+                        1 => ['x' => 23, 'y' => 30],
+                        2 => ['x' => 17, 'y' => 63],
+                        3 => ['x' => 123, 'y' => 0],
                     ],
                 ],
             ],
@@ -120,9 +81,7 @@ class GisMultiPolygonTest extends GisGeomTestCase
      */
     public static function providerForTestGenerateWkt(): array
     {
-        $temp = [
-            0 => self::getData(),
-        ];
+        $temp = [0 => self::getData()];
 
         $temp1 = $temp;
         $temp1[0]['MULTIPOLYGON']['no_of_polygons'] = 0;
@@ -142,12 +101,7 @@ class GisMultiPolygonTest extends GisGeomTestCase
                     . ',(20 30,35 32,30 20,20 30)),((123 0,23 30,17 63,123 0)))',
             ],
             // at lease one polygon should be there
-            [
-                $temp1,
-                0,
-                null,
-                'MULTIPOLYGON(((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 30)))',
-            ],
+            [$temp1, 0, null, 'MULTIPOLYGON(((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 30)))'],
             // a polygon should have at least one ring
             [
                 $temp2,
@@ -192,10 +146,7 @@ class GisMultiPolygonTest extends GisGeomTestCase
             [
                 "'MULTIPOLYGON(((35 10,10 20,15 40,45 45,35 10),"
                 . "(20 30,35 32,30 20,20 30)),((123 0,23 30,17 63,123 0)))',124",
-                [
-                    'srid' => 124,
-                    0 => self::getData(),
-                ],
+                ['srid' => 124, 0 => self::getData()],
             ],
         ];
     }
@@ -227,66 +178,27 @@ class GisMultiPolygonTest extends GisGeomTestCase
                     'parts' => [
                         0 => [
                             'points' => [
-                                0 => [
-                                    'x' => 10,
-                                    'y' => 10,
-                                ],
-                                1 => [
-                                    'x' => 10,
-                                    'y' => 40,
-                                ],
-                                2 => [
-                                    'x' => 50,
-                                    'y' => 40,
-                                ],
-                                3 => [
-                                    'x' => 50,
-                                    'y' => 10,
-                                ],
-                                4 => [
-                                    'x' => 10,
-                                    'y' => 10,
-                                ],
+                                0 => ['x' => 10, 'y' => 10],
+                                1 => ['x' => 10, 'y' => 40],
+                                2 => ['x' => 50, 'y' => 40],
+                                3 => ['x' => 50, 'y' => 10],
+                                4 => ['x' => 10, 'y' => 10],
                             ],
                         ],
                         1 => [
                             'points' => [
-                                0 => [
-                                    'x' => 60,
-                                    'y' => 40,
-                                ],
-                                1 => [
-                                    'x' => 75,
-                                    'y' => 65,
-                                ],
-                                2 => [
-                                    'x' => 90,
-                                    'y' => 40,
-                                ],
-                                3 => [
-                                    'x' => 60,
-                                    'y' => 40,
-                                ],
+                                0 => ['x' => 60, 'y' => 40],
+                                1 => ['x' => 75, 'y' => 65],
+                                2 => ['x' => 90, 'y' => 40],
+                                3 => ['x' => 60, 'y' => 40],
                             ],
                         ],
                         2 => [
                             'points' => [
-                                0 => [
-                                    'x' => 20,
-                                    'y' => 20,
-                                ],
-                                1 => [
-                                    'x' => 40,
-                                    'y' => 20,
-                                ],
-                                2 => [
-                                    'x' => 25,
-                                    'y' => 30,
-                                ],
-                                3 => [
-                                    'x' => 20,
-                                    'y' => 20,
-                                ],
+                                0 => ['x' => 20, 'y' => 20],
+                                1 => ['x' => 40, 'y' => 20],
+                                2 => ['x' => 25, 'y' => 30],
+                                3 => ['x' => 20, 'y' => 20],
                             ],
                         ],
                     ],
@@ -439,12 +351,7 @@ class GisMultiPolygonTest extends GisGeomTestCase
                 . ' -60,-90 -90,-60 -90,-60 -60)))',
                 'svg',
                 [176, 46, 224],
-                [
-                    'x' => -50,
-                    'y' => -50,
-                    'scale' => 2,
-                    'height' => 400,
-                ],
+                ['x' => -50, 'y' => -50, 'scale' => 2, 'height' => 400],
                 '<path d=" M 110, 290 L 290, 290 L 290, 110 L 110, 110 Z  M 120, 280 L 120, 220 L 180, 220 L 180, 28'
                 . '0 Z  M 220, 180 L 280, 180 L 280, 120 L 220, 120 Z " name="svg" class="multipolygon vector" stroke='
                 . '"black" stroke-width="0.5" fill="#b02ee0" fill-rule="evenodd" fill-opacity="0.8" id="svg1234567890"'
diff --git a/test/classes/Gis/GisPointTest.php b/test/classes/Gis/GisPointTest.php
index eca1af01d0..045e681043 100644
--- a/test/classes/Gis/GisPointTest.php
+++ b/test/classes/Gis/GisPointTest.php
@@ -26,50 +26,11 @@ class GisPointTest extends GisGeomTestCase
     public static function providerForTestGenerateWkt(): array
     {
         return [
-            [
-                [
-                    0 => [
-                        'POINT' => [
-                            'x' => 5.02,
-                            'y' => 8.45,
-                        ],
-                    ],
-                ],
-                0,
-                null,
-                'POINT(5.02 8.45)',
-            ],
-            [
-                [
-                    0 => [
-                        'POINT' => [
-                            'x' => 5.02,
-                            'y' => 8.45,
-                        ],
-                    ],
-                ],
-                1,
-                null,
-                'POINT( )',
-            ],
-            [
-                [0 => ['POINT' => ['x' => 5.02]]],
-                0,
-                null,
-                'POINT(5.02 )',
-            ],
-            [
-                [0 => ['POINT' => ['y' => 8.45]]],
-                0,
-                null,
-                'POINT( 8.45)',
-            ],
-            [
-                [0 => ['POINT' => []]],
-                0,
-                null,
-                'POINT( )',
-            ],
+            [[0 => ['POINT' => ['x' => 5.02, 'y' => 8.45]]], 0, null, 'POINT(5.02 8.45)'],
+            [[0 => ['POINT' => ['x' => 5.02, 'y' => 8.45]]], 1, null, 'POINT( )'],
+            [[0 => ['POINT' => ['x' => 5.02]]], 0, null, 'POINT(5.02 )'],
+            [[0 => ['POINT' => ['y' => 8.45]]], 0, null, 'POINT( 8.45)'],
+            [[0 => ['POINT' => []]], 0, null, 'POINT( )'],
         ];
     }
 
@@ -110,15 +71,7 @@ class GisPointTest extends GisGeomTestCase
      */
     public static function providerForTestGetShape(): array
     {
-        return [
-            [
-                [
-                    'x' => 5.02,
-                    'y' => 8.45,
-                ],
-                'POINT(5.02 8.45)',
-            ],
-        ];
+        return [[['x' => 5.02, 'y' => 8.45], 'POINT(5.02 8.45)']];
     }
 
     /**
@@ -142,20 +95,7 @@ class GisPointTest extends GisGeomTestCase
      */
     public static function providerForTestGenerateParams(): array
     {
-        return [
-            [
-                "'POINT(5.02 8.45)',124",
-                [
-                    'srid' => 124,
-                    0 => [
-                        'POINT' => [
-                            'x' => 5.02,
-                            'y' => 8.45,
-                        ],
-                    ],
-                ],
-            ],
-        ];
+        return [["'POINT(5.02 8.45)',124", ['srid' => 124, 0 => ['POINT' => ['x' => 5.02, 'y' => 8.45]]]]];
     }
 
     /**
@@ -179,12 +119,7 @@ class GisPointTest extends GisGeomTestCase
      */
     public static function providerForTestScaleRow(): array
     {
-        return [
-            [
-                'POINT(12 35)',
-                new ScaleData(12, 12, 35, 35),
-            ],
-        ];
+        return [['POINT(12 35)', new ScaleData(12, 12, 35, 35)]];
     }
 
     /** @requires extension gd */
@@ -286,20 +221,7 @@ class GisPointTest extends GisGeomTestCase
      */
     public static function providerForPrepareRowAsSvg(): array
     {
-        return [
-            [
-                'POINT(12 35)',
-                'svg',
-                [176, 46, 224],
-                [
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150,
-                ],
-                '',
-            ],
-        ];
+        return [['POINT(12 35)', 'svg', [176, 46, 224], ['x' => 12, 'y' => 69, 'scale' => 2, 'height' => 150], '']];
     }
 
     /**
diff --git a/test/classes/Gis/GisPolygonTest.php b/test/classes/Gis/GisPolygonTest.php
index b58d169d93..c760c8f028 100644
--- a/test/classes/Gis/GisPolygonTest.php
+++ b/test/classes/Gis/GisPolygonTest.php
@@ -28,45 +28,18 @@ class GisPolygonTest extends GisGeomTestCase
                 'no_of_lines' => 2,
                 0 => [
                     'no_of_points' => 5,
-                    0 => [
-                        'x' => 35,
-                        'y' => 10,
-                    ],
-                    1 => [
-                        'x' => 10,
-                        'y' => 20,
-                    ],
-                    2 => [
-                        'x' => 15,
-                        'y' => 40,
-                    ],
-                    3 => [
-                        'x' => 45,
-                        'y' => 45,
-                    ],
-                    4 => [
-                        'x' => 35,
-                        'y' => 10,
-                    ],
+                    0 => ['x' => 35, 'y' => 10],
+                    1 => ['x' => 10, 'y' => 20],
+                    2 => ['x' => 15, 'y' => 40],
+                    3 => ['x' => 45, 'y' => 45],
+                    4 => ['x' => 35, 'y' => 10],
                 ],
                 1 => [
                     'no_of_points' => 4,
-                    0 => [
-                        'x' => 20,
-                        'y' => 30,
-                    ],
-                    1 => [
-                        'x' => 35,
-                        'y' => 32,
-                    ],
-                    2 => [
-                        'x' => 30,
-                        'y' => 20,
-                    ],
-                    3 => [
-                        'x' => 20,
-                        'y' => 30,
-                    ],
+                    0 => ['x' => 20, 'y' => 30],
+                    1 => ['x' => 35, 'y' => 32],
+                    2 => ['x' => 30, 'y' => 20],
+                    3 => ['x' => 20, 'y' => 30],
                 ],
             ],
         ];
@@ -95,9 +68,7 @@ class GisPolygonTest extends GisGeomTestCase
      */
     public static function providerForTestGenerateWkt(): array
     {
-        $temp = [
-            0 => self::getData(),
-        ];
+        $temp = [0 => self::getData()];
 
         $temp1 = $temp;
         unset($temp1[0]['POLYGON'][1][3]['y']);
@@ -109,47 +80,17 @@ class GisPolygonTest extends GisGeomTestCase
         $temp3[0]['POLYGON'][1]['no_of_points'] = 3;
 
         return [
-            [
-                $temp,
-                0,
-                null,
-                'POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 30))',
-            ],
+            [$temp, 0, null, 'POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 30))'],
             // values at undefined index
-            [
-                $temp,
-                1,
-                null,
-                'POLYGON(( , , , ))',
-            ],
+            [$temp, 1, null, 'POLYGON(( , , , ))'],
             // if a coordinate is missing, default is empty string
-            [
-                $temp1,
-                0,
-                null,
-                'POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 ))',
-            ],
+            [$temp1, 0, null, 'POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 ))'],
             // missing coordinates are replaced with provided values (3rd parameter)
-            [
-                $temp1,
-                0,
-                '0',
-                'POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 0))',
-            ],
+            [$temp1, 0, '0', 'POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 0))'],
             // should have at least one ring
-            [
-                $temp2,
-                0,
-                '0',
-                'POLYGON((35 10,10 20,15 40,45 45,35 10))',
-            ],
+            [$temp2, 0, '0', 'POLYGON((35 10,10 20,15 40,45 45,35 10))'],
             // a ring should have at least four points
-            [
-                $temp3,
-                0,
-                '0',
-                'POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 30))',
-            ],
+            [$temp3, 0, '0', 'POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 30))'],
         ];
     }
 
@@ -177,10 +118,7 @@ class GisPolygonTest extends GisGeomTestCase
         return [
             [
                 '\'POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 30))\',124',
-                [
-                    'srid' => 124,
-                    0 => self::getData(),
-                ],
+                ['srid' => 124, 0 => self::getData()],
             ],
         ];
     }
@@ -207,63 +145,19 @@ class GisPolygonTest extends GisGeomTestCase
     public static function providerForTestArea(): array
     {
         return [
-            [
-                [
-                    0 => [
-                        'x' => 35,
-                        'y' => 10,
-                    ],
-                    1 => [
-                        'x' => 10,
-                        'y' => 10,
-                    ],
-                    2 => [
-                        'x' => 15,
-                        'y' => 40,
-                    ],
-                ],
-                -375.00,
-            ],
+            [[0 => ['x' => 35, 'y' => 10], 1 => ['x' => 10, 'y' => 10], 2 => ['x' => 15, 'y' => 40]], -375.00],
             // first point of the ring repeated as the last point
             [
                 [
-                    0 => [
-                        'x' => 35,
-                        'y' => 10,
-                    ],
-                    1 => [
-                        'x' => 10,
-                        'y' => 10,
-                    ],
-                    2 => [
-                        'x' => 15,
-                        'y' => 40,
-                    ],
-                    3 => [
-                        'x' => 35,
-                        'y' => 10,
-                    ],
+                    0 => ['x' => 35, 'y' => 10],
+                    1 => ['x' => 10, 'y' => 10],
+                    2 => ['x' => 15, 'y' => 40],
+                    3 => ['x' => 35, 'y' => 10],
                 ],
                 -375.00,
             ],
             // anticlockwise gives positive area
-            [
-                [
-                    0 => [
-                        'x' => 15,
-                        'y' => 40,
-                    ],
-                    1 => [
-                        'x' => 10,
-                        'y' => 10,
-                    ],
-                    2 => [
-                        'x' => 35,
-                        'y' => 10,
-                    ],
-                ],
-                375.00,
-            ],
+            [[0 => ['x' => 15, 'y' => 40], 1 => ['x' => 10, 'y' => 10], 2 => ['x' => 35, 'y' => 10]], 375.00],
         ];
     }
 
@@ -290,61 +184,21 @@ class GisPolygonTest extends GisGeomTestCase
     public static function providerForTestIsPointInsidePolygon(): array
     {
         $ring = [
-            0 => [
-                'x' => 35,
-                'y' => 10,
-            ],
-            1 => [
-                'x' => 10,
-                'y' => 10,
-            ],
-            2 => [
-                'x' => 15,
-                'y' => 40,
-            ],
-            3 => [
-                'x' => 35,
-                'y' => 10,
-            ],
+            0 => ['x' => 35, 'y' => 10],
+            1 => ['x' => 10, 'y' => 10],
+            2 => ['x' => 15, 'y' => 40],
+            3 => ['x' => 35, 'y' => 10],
         ];
 
         return [
             // point inside the ring
-            [
-                [
-                    'x' => 20,
-                    'y' => 15,
-                ],
-                $ring,
-                true,
-            ],
+            [['x' => 20, 'y' => 15], $ring, true],
             // point on an edge of the ring
-            [
-                [
-                    'x' => 20,
-                    'y' => 10,
-                ],
-                $ring,
-                false,
-            ],
+            [['x' => 20, 'y' => 10], $ring, false],
             // point on a vertex of the ring
-            [
-                [
-                    'x' => 10,
-                    'y' => 10,
-                ],
-                $ring,
-                false,
-            ],
+            [['x' => 10, 'y' => 10], $ring, false],
             // point outside the ring
-            [
-                [
-                    'x' => 5,
-                    'y' => 10,
-                ],
-                $ring,
-                false,
-            ],
+            [['x' => 5, 'y' => 10], $ring, false],
         ];
     }
 
@@ -374,14 +228,7 @@ class GisPolygonTest extends GisGeomTestCase
         unset($temp['POLYGON'][0]['no_of_points']);
         unset($temp['POLYGON'][1]['no_of_points']);
 
-        return [
-            [
-                $temp['POLYGON'][0],
-            ],
-            [
-                $temp['POLYGON'][1],
-            ],
-        ];
+        return [[$temp['POLYGON'][0]], [$temp['POLYGON'][1]]];
     }
 
     /**
@@ -406,14 +253,8 @@ class GisPolygonTest extends GisGeomTestCase
     public static function providerForTestScaleRow(): array
     {
         return [
-            [
-                'POLYGON((123 0,23 30,17 63,123 0))',
-                new ScaleData(123, 17, 63, 0),
-            ],
-            [
-                'POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 30)))',
-                new ScaleData(45, 10, 45, 10),
-            ],
+            ['POLYGON((123 0,23 30,17 63,123 0))', new ScaleData(123, 17, 63, 0)],
+            ['POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 30)))', new ScaleData(45, 10, 45, 10)],
         ];
     }
 
@@ -520,12 +361,7 @@ class GisPolygonTest extends GisGeomTestCase
                 'POLYGON((123 0,23 30,17 63,123 0),(99 12,30 35,25 55,99 12))',
                 'svg',
                 [176, 46, 224],
-                [
-                    'x' => 12,
-                    'y' => 69,
-                    'scale' => 2,
-                    'height' => 150,
-                ],
+                ['x' => 12, 'y' => 69, 'scale' => 2, 'height' => 150],
                 '<path d=" M 222, 288 L 22, 228 L 10, 162 Z  M 174, 264 L 36, 218 L 26, 178 Z " name="svg" id="svg12'
                 . '34567890" class="polygon vector" stroke="black" stroke-width="0.5" fill="#b02ee0" fill-rule="evenod'
                 . 'd" fill-opacity="0.8"/>',
@@ -598,27 +434,6 @@ class GisPolygonTest extends GisGeomTestCase
      */
     public static function providerForIsOuterRing(): array
     {
-        return [
-            [
-                [
-                    [
-                        'x' => 0,
-                        'y' => 0,
-                    ],
-                    [
-                        'x' => 0,
-                        'y' => 1,
-                    ],
-                    [
-                        'x' => 1,
-                        'y' => 1,
-                    ],
-                    [
-                        'x' => 1,
-                        'y' => 0,
-                    ],
-                ],
-            ],
-        ];
+        return [[[['x' => 0, 'y' => 0], ['x' => 0, 'y' => 1], ['x' => 1, 'y' => 1], ['x' => 1, 'y' => 0]]]];
     }
 }
diff --git a/test/classes/Gis/GisVisualizationTest.php b/test/classes/Gis/GisVisualizationTest.php
index 32a4be7b31..aae3c45735 100644
--- a/test/classes/Gis/GisVisualizationTest.php
+++ b/test/classes/Gis/GisVisualizationTest.php
@@ -42,12 +42,7 @@ class GisVisualizationTest extends AbstractTestCase
             ],
         );
         $this->assertSame(
-            [
-                'scale' => 1,
-                'x' => -300.0,
-                'y' => -225.0,
-                'height' => 450,
-            ],
+            ['scale' => 1, 'x' => -300.0, 'y' => -225.0, 'height' => 450],
             $dataSet,
         );
 
@@ -66,12 +61,7 @@ class GisVisualizationTest extends AbstractTestCase
             ],
         );
         $this->assertSame(
-            [
-                'scale' => 2.1,
-                'x' => -45.35714285714286,
-                'y' => 42.85714285714286,
-                'height' => 450,
-            ],
+            ['scale' => 2.1, 'x' => -45.35714285714286, 'y' => 42.85714285714286, 'height' => 450],
             $dataSet,
         );
 
@@ -88,12 +78,7 @@ class GisVisualizationTest extends AbstractTestCase
             ],
         );
         $this->assertSame(
-            [
-                'scale' => 32.30769230769231,
-                'x' => -2.7857142857142865,
-                'y' => -0.4642857142857143,
-                'height' => 450,
-            ],
+            ['scale' => 32.30769230769231, 'x' => -2.7857142857142865, 'y' => -0.4642857142857143, 'height' => 450],
             $dataSet,
         );
     }
diff --git a/test/classes/GitTest.php b/test/classes/GitTest.php
index 34583b3a40..8d89c32b52 100644
--- a/test/classes/GitTest.php
+++ b/test/classes/GitTest.php
@@ -465,16 +465,8 @@ class GitTest extends AbstractTestCase
         );
 
         $this->assertSame([
-            [
-                'name' => 'William Desportes',
-                'email' => 'williamdes@wdes.fr',
-                'date' => '2022-07-13 14:56:40 +0200',
-            ],
-            [
-                'name' => 'William Desportes',
-                'email' => 'williamdes@wdes.fr',
-                'date' => '2022-07-13 14:56:40 +0200',
-            ],
+            ['name' => 'William Desportes', 'email' => 'williamdes@wdes.fr', 'date' => '2022-07-13 14:56:40 +0200'],
+            ['name' => 'William Desportes', 'email' => 'williamdes@wdes.fr', 'date' => '2022-07-13 14:56:40 +0200'],
             'Remove ignore config.inc.php for psalm because '
                 . 'it fails the CI  Signed-off-by: William Desportes <williamdes@wdes.fr>',
         ], $extractedData);
diff --git a/test/classes/Html/GeneratorTest.php b/test/classes/Html/GeneratorTest.php
index 79c07837fb..106a40a62c 100644
--- a/test/classes/Html/GeneratorTest.php
+++ b/test/classes/Html/GeneratorTest.php
@@ -192,10 +192,7 @@ class GeneratorTest extends AbstractTestCase
         $GLOBALS['cfg']['LinkLengthLimit'] = $limit;
         try {
             $result = call_user_func_array(
-                [
-                    Generator::class,
-                    'linkOrButton',
-                ],
+                [Generator::class, 'linkOrButton'],
                 $params,
             );
             $this->assertEquals($match, $result);
@@ -212,35 +209,13 @@ class GeneratorTest extends AbstractTestCase
     public static function linksOrButtons(): array
     {
         return [
+            [['index.php', null, 'text'], 1000, '<a href="index.php" >text</a>'],
             [
-                [
-                    'index.php',
-                    null,
-                    'text',
-                ],
-                1000,
-                '<a href="index.php" >text</a>',
-            ],
-            [
-                [
-                    'index.php',
-                    ['some' => 'parameter'],
-                    'text',
-                ],
+                ['index.php', ['some' => 'parameter'], 'text'],
                 20,
                 '<a href="index.php" data-post="some=parameter&lang=en">text</a>',
             ],
-            [
-                [
-                    'index.php',
-                    null,
-                    'text',
-                    [],
-                    'target',
-                ],
-                1000,
-                '<a href="index.php" target="target">text</a>',
-            ],
+            [['index.php', null, 'text', [], 'target'], 1000, '<a href="index.php" target="target">text</a>'],
             [
                 [
                     'https://mariadb.org/explain_analyzer/analyze/?client=phpMyAdmin&amp;raw_explain=%2B---%2B',
@@ -268,50 +243,28 @@ class GeneratorTest extends AbstractTestCase
                 . ' target="target">text</a>',
             ],
             [
-                [
-                    'index.php?route=/url&url=http://phpmyadmin.net/',
-                    null,
-                    'text',
-                    [],
-                    '_blank',
-                ],
+                ['index.php?route=/url&url=http://phpmyadmin.net/', null, 'text', [], '_blank'],
                 1000,
                 '<a href="index.php?route=/url&url=http://phpmyadmin.net/" target="_blank"'
                 . ' rel="noopener noreferrer">text</a>',
             ],
             [
-                [
-                    'index.php?route=/server/databases',
-                    ['some' => 'parameter'],
-                    'text',
-                ],
+                ['index.php?route=/server/databases', ['some' => 'parameter'], 'text'],
                 20,
                 '<a href="index.php" data-post="route=/server/databases&some=parameter&lang=en">text</a>',
             ],
             [
-                [
-                    'index.php?route=/server/databases',
-                    null,
-                    'text',
-                ],
+                ['index.php?route=/server/databases', null, 'text'],
                 20,
                 '<a href="index.php" data-post="route=/server/databases">text</a>',
             ],
             [
-                [
-                    'index.php?route=/server/databases',
-                    ['some' => 'parameter'],
-                    'text',
-                ],
+                ['index.php?route=/server/databases', ['some' => 'parameter'], 'text'],
                 100,
                 '<a href="index.php?route=/server/databases&some=parameter&lang=en" >text</a>',
             ],
             [
-                [
-                    'index.php?route=/server/databases',
-                    null,
-                    'text',
-                ],
+                ['index.php?route=/server/databases', null, 'text'],
                 100,
                 '<a href="index.php?route=/server/databases" >text</a>',
             ],
@@ -352,19 +305,13 @@ class GeneratorTest extends AbstractTestCase
         . ' target="documentation"><img src="themes/dot.gif" title="Documentation" alt="Documentation"'
         . ' class="icon ic_b_help"></a>';
 
-        $GLOBALS['cfg']['Server'] = [
-            'ssl' => false,
-            'host' => '127.0.0.1',
-        ];
+        $GLOBALS['cfg']['Server'] = ['ssl' => false, 'host' => '127.0.0.1'];
         $this->assertEquals(
             $sslNotUsed,
             Generator::getServerSSL(),
         );
 
-        $GLOBALS['cfg']['Server'] = [
-            'ssl' => false,
-            'host' => 'custom.host',
-        ];
+        $GLOBALS['cfg']['Server'] = ['ssl' => false, 'host' => 'custom.host'];
         $GLOBALS['cfg']['MysqlSslWarningSafeHosts'] = ['localhost', '127.0.0.1'];
 
         $this->assertEquals(
@@ -372,10 +319,7 @@ class GeneratorTest extends AbstractTestCase
             Generator::getServerSSL(),
         );
 
-        $GLOBALS['cfg']['Server'] = [
-            'ssl' => false,
-            'host' => 'custom.host',
-        ];
+        $GLOBALS['cfg']['Server'] = ['ssl' => false, 'host' => 'custom.host'];
         $GLOBALS['cfg']['MysqlSslWarningSafeHosts'] = ['localhost', '127.0.0.1', 'custom.host'];
 
         $this->assertEquals(
@@ -383,22 +327,14 @@ class GeneratorTest extends AbstractTestCase
             Generator::getServerSSL(),
         );
 
-        $GLOBALS['cfg']['Server'] = [
-            'ssl' => false,
-            'ssl_verify' => true,
-            'host' => 'custom.host',
-        ];
+        $GLOBALS['cfg']['Server'] = ['ssl' => false, 'ssl_verify' => true, 'host' => 'custom.host'];
 
         $this->assertEquals(
             $sslNotUsed,
             Generator::getServerSSL(),
         );
 
-        $GLOBALS['cfg']['Server'] = [
-            'ssl' => true,
-            'ssl_verify' => false,
-            'host' => 'custom.host',
-        ];
+        $GLOBALS['cfg']['Server'] = ['ssl' => true, 'ssl_verify' => false, 'host' => 'custom.host'];
 
         $this->assertEquals(
             '<span class="text-danger">SSL is used with disabled verification</span>'
@@ -408,11 +344,7 @@ class GeneratorTest extends AbstractTestCase
             Generator::getServerSSL(),
         );
 
-        $GLOBALS['cfg']['Server'] = [
-            'ssl' => true,
-            'ssl_verify' => true,
-            'host' => 'custom.host',
-        ];
+        $GLOBALS['cfg']['Server'] = ['ssl' => true, 'ssl_verify' => true, 'host' => 'custom.host'];
 
         $this->assertEquals(
             '<span class="text-danger">SSL is used without certification authority</span>'
@@ -497,26 +429,8 @@ class GeneratorTest extends AbstractTestCase
                 true,
                 'NOW',
             ],
-            [
-                [
-                    'True_Type' => 'uuid',
-                    'first_timestamp' => false,
-                    'Key' => '',
-                    'Type' => '',
-                ],
-                true,
-                '',
-            ],
-            [
-                [
-                    'True_Type' => '',
-                    'first_timestamp' => false,
-                    'Key' => 'PRI',
-                    'Type' => 'char(36)',
-                ],
-                true,
-                'UUID',
-            ],
+            [['True_Type' => 'uuid', 'first_timestamp' => false, 'Key' => '', 'Type' => ''], true, ''],
+            [['True_Type' => '', 'first_timestamp' => false, 'Key' => 'PRI', 'Type' => 'char(36)'], true, 'UUID'],
         ];
     }
 }
diff --git a/test/classes/Http/Factory/ServerRequestFactoryTest.php b/test/classes/Http/Factory/ServerRequestFactoryTest.php
index c949c08969..64a37ee2f8 100644
--- a/test/classes/Http/Factory/ServerRequestFactoryTest.php
+++ b/test/classes/Http/Factory/ServerRequestFactoryTest.php
@@ -20,22 +20,10 @@ use function class_exists;
 class ServerRequestFactoryTest extends AbstractTestCase
 {
     private const IMPLEMENTATION_CLASSES = [
-        'slim/psr7' => [
-            SlimServerRequestFactory::class,
-            'Slim PSR-7',
-        ],
-        'guzzlehttp/psr7' => [
-            GuzzleHttpFactory::class,
-            'Guzzle PSR-7',
-        ],
-        'nyholm/psr7' => [
-            NyholmPsr17Factory::class,
-            'Nyholm PSR-7',
-        ],
-        'laminas/laminas-diactoros' => [
-            LaminasServerRequestFactory::class,
-            'Laminas diactoros PSR-7',
-        ],
+        'slim/psr7' => [SlimServerRequestFactory::class, 'Slim PSR-7'],
+        'guzzlehttp/psr7' => [GuzzleHttpFactory::class, 'Guzzle PSR-7'],
+        'nyholm/psr7' => [NyholmPsr17Factory::class, 'Nyholm PSR-7'],
+        'laminas/laminas-diactoros' => [LaminasServerRequestFactory::class, 'Laminas diactoros PSR-7'],
     ];
 
     public static function dataProviderPsr7Implementations(): array
@@ -105,10 +93,7 @@ class ServerRequestFactoryTest extends AbstractTestCase
             'baz',
             $request->getParam('blob'),
         );
-        $this->assertSame([
-            'foo' => 'bar',
-            'blob' => 'baz',
-        ], $request->getQueryParams());
+        $this->assertSame(['foo' => 'bar', 'blob' => 'baz'], $request->getQueryParams());
     }
 
     public function testCreateServerRequestFromGlobals(): void
@@ -168,16 +153,9 @@ class ServerRequestFactoryTest extends AbstractTestCase
             'baz',
             $request->getParam('blob'),
         );
-        $this->assertSame([
-            'foo' => 'bar',
-            'blob' => 'baz',
-        ], $request->getQueryParams());
+        $this->assertSame(['foo' => 'bar', 'blob' => 'baz'], $request->getQueryParams());
 
-        $this->assertSame([
-            'input1' => 'value1',
-            'input2' => 'value2',
-            'input3' => '',
-        ], $request->getParsedBody());
+        $this->assertSame(['input1' => 'value1', 'input2' => 'value2', 'input3' => ''], $request->getParsedBody());
 
         $this->assertNull($request->getParsedBodyParam('foo'));
         $this->assertSame('value1', $request->getParsedBodyParam('input1'));
diff --git a/test/classes/Import/SimulateDmlTest.php b/test/classes/Import/SimulateDmlTest.php
index c0a62de025..df3b3b273c 100644
--- a/test/classes/Import/SimulateDmlTest.php
+++ b/test/classes/Import/SimulateDmlTest.php
@@ -64,10 +64,7 @@ class SimulateDmlTest extends AbstractTestCase
                 'UPDATE `table_1` SET `id` = 20 WHERE `id` > 10',
                 'SELECT `id` FROM `table_1` WHERE `id` > 10 AND (`id` <> 20)',
             ],
-            'delete statement' => [
-                'DELETE FROM `table_1` WHERE `id` > 10',
-                'SELECT * FROM `table_1` WHERE `id` > 10',
-            ],
+            'delete statement' => ['DELETE FROM `table_1` WHERE `id` > 10', 'SELECT * FROM `table_1` WHERE `id` > 10'],
         ];
     }
 }
diff --git a/test/classes/ImportTest.php b/test/classes/ImportTest.php
index 5c77a23b3c..cd29e55fac 100644
--- a/test/classes/ImportTest.php
+++ b/test/classes/ImportTest.php
@@ -81,58 +81,37 @@ class ImportTest extends AbstractTestCase
     public function testLookForUse(): void
     {
         $this->assertEquals(
-            [
-                null,
-                null,
-            ],
+            [null, null],
             $this->import->lookForUse(null, null, null),
         );
 
         $this->assertEquals(
-            [
-                'myDb',
-                null,
-            ],
+            ['myDb', null],
             $this->import->lookForUse(null, 'myDb', null),
         );
 
         $this->assertEquals(
-            [
-                'myDb',
-                true,
-            ],
+            ['myDb', true],
             $this->import->lookForUse(null, 'myDb', true),
         );
 
         $this->assertEquals(
-            [
-                'myDb',
-                true,
-            ],
+            ['myDb', true],
             $this->import->lookForUse('select 1 from myTable', 'myDb', true),
         );
 
         $this->assertEquals(
-            [
-                'anotherDb',
-                true,
-            ],
+            ['anotherDb', true],
             $this->import->lookForUse('use anotherDb', 'myDb', false),
         );
 
         $this->assertEquals(
-            [
-                'anotherDb',
-                true,
-            ],
+            ['anotherDb', true],
             $this->import->lookForUse('use anotherDb', 'myDb', true),
         );
 
         $this->assertEquals(
-            [
-                'anotherDb',
-                true,
-            ],
+            ['anotherDb', true],
             $this->import->lookForUse('use `anotherDb`;', 'myDb', true),
         );
     }
@@ -157,32 +136,7 @@ class ImportTest extends AbstractTestCase
      */
     public static function provGetColumnAlphaName(): array
     {
-        return [
-            [
-                'A',
-                1,
-            ],
-            [
-                'Z',
-                0,
-            ],
-            [
-                'AA',
-                27,
-            ],
-            [
-                'AZ',
-                52,
-            ],
-            [
-                'BA',
-                53,
-            ],
-            [
-                'BB',
-                54,
-            ],
-        ];
+        return [['A', 1], ['Z', 0], ['AA', 27], ['AZ', 52], ['BA', 53], ['BB', 54]];
     }
 
     /**
@@ -205,32 +159,7 @@ class ImportTest extends AbstractTestCase
      */
     public static function provGetColumnNumberFromName(): array
     {
-        return [
-            [
-                1,
-                'A',
-            ],
-            [
-                26,
-                'Z',
-            ],
-            [
-                27,
-                'AA',
-            ],
-            [
-                52,
-                'AZ',
-            ],
-            [
-                53,
-                'BA',
-            ],
-            [
-                54,
-                'BB',
-            ],
-        ];
+        return [[1, 'A'], [26, 'Z'], [27, 'AA'], [52, 'AZ'], [53, 'BA'], [54, 'BB']];
     }
 
     /**
@@ -253,24 +182,7 @@ class ImportTest extends AbstractTestCase
      */
     public static function provGetDecimalPrecision(): array
     {
-        return [
-            [
-                2,
-                '2,1',
-            ],
-            [
-                6,
-                '6,2',
-            ],
-            [
-                6,
-                '6,0',
-            ],
-            [
-                16,
-                '16,2',
-            ],
-        ];
+        return [[2, '2,1'], [6, '6,2'], [6, '6,0'], [16, '16,2']];
     }
 
     /**
@@ -293,24 +205,7 @@ class ImportTest extends AbstractTestCase
      */
     public static function provGetDecimalScale(): array
     {
-        return [
-            [
-                1,
-                '2,1',
-            ],
-            [
-                2,
-                '6,2',
-            ],
-            [
-                0,
-                '6,0',
-            ],
-            [
-                20,
-                '30,20',
-            ],
-        ];
+        return [[1, '2,1'], [2, '6,2'], [0, '6,0'], [20, '30,20']];
     }
 
     /**
@@ -333,40 +228,7 @@ class ImportTest extends AbstractTestCase
      */
     public static function provGetDecimalSize(): array
     {
-        return [
-            [
-                [
-                    2,
-                    1,
-                    '2,1',
-                ],
-                '2.1',
-            ],
-            [
-                [
-                    2,
-                    1,
-                    '2,1',
-                ],
-                '6.2',
-            ],
-            [
-                [
-                    3,
-                    1,
-                    '3,1',
-                ],
-                '10.0',
-            ],
-            [
-                [
-                    4,
-                    2,
-                    '4,2',
-                ],
-                '30.20',
-            ],
-        ];
+        return [[[2, 1, '2,1'], '2.1'], [[2, 1, '2,1'], '6.2'], [[3, 1, '3,1'], '10.0'], [[4, 2, '4,2'], '30.20']];
     }
 
     /**
@@ -393,87 +255,27 @@ class ImportTest extends AbstractTestCase
     public static function provDetectType(): array
     {
         $data = [
-            [
-                Import::NONE,
-                null,
-                'NULL',
-            ],
-            [
-                Import::NONE,
-                Import::NONE,
-                'NULL',
-            ],
-            [
-                Import::INT,
-                Import::INT,
-                'NULL',
-            ],
-            [
-                Import::VARCHAR,
-                Import::VARCHAR,
-                'NULL',
-            ],
-            [
-                Import::VARCHAR,
-                null,
-                null,
-            ],
-            [
-                Import::VARCHAR,
-                Import::INT,
-                null,
-            ],
-            [
-                Import::INT,
-                Import::INT,
-                '10',
-            ],
-            [
-                Import::DECIMAL,
-                Import::DECIMAL,
-                '10.2',
-            ],
-            [
-                Import::DECIMAL,
-                Import::INT,
-                '10.2',
-            ],
-            [
-                Import::VARCHAR,
-                Import::VARCHAR,
-                'test',
-            ],
-            [
-                Import::VARCHAR,
-                Import::INT,
-                'test',
-            ],
+            [Import::NONE, null, 'NULL'],
+            [Import::NONE, Import::NONE, 'NULL'],
+            [Import::INT, Import::INT, 'NULL'],
+            [Import::VARCHAR, Import::VARCHAR, 'NULL'],
+            [Import::VARCHAR, null, null],
+            [Import::VARCHAR, Import::INT, null],
+            [Import::INT, Import::INT, '10'],
+            [Import::DECIMAL, Import::DECIMAL, '10.2'],
+            [Import::DECIMAL, Import::INT, '10.2'],
+            [Import::VARCHAR, Import::VARCHAR, 'test'],
+            [Import::VARCHAR, Import::INT, 'test'],
         ];
 
         if (PHP_INT_MAX > 2147483647) {
-            $data[] = [
-                Import::BIGINT,
-                Import::BIGINT,
-                '2147483648',
-            ];
-            $data[] = [
-                Import::BIGINT,
-                Import::INT,
-                '2147483648',
-            ];
+            $data[] = [Import::BIGINT, Import::BIGINT, '2147483648'];
+            $data[] = [Import::BIGINT, Import::INT, '2147483648'];
         } else {
             // To be fixed ?
             // Can not detect a BIGINT since the value is over PHP_INT_MAX
-            $data[] = [
-                Import::VARCHAR,
-                Import::BIGINT,
-                '2147483648',
-            ];
-            $data[] = [
-                Import::VARCHAR,
-                Import::INT,
-                '2147483648',
-            ];
+            $data[] = [Import::VARCHAR, Import::BIGINT, '2147483648'];
+            $data[] = [Import::VARCHAR, Import::INT, '2147483648'];
         }
 
         return $data;
@@ -499,34 +301,13 @@ class ImportTest extends AbstractTestCase
     public static function providerContentWithByteOrderMarks(): array
     {
         return [
-            [
-                "\xEF\xBB\xBF blabla上海",
-                ' blabla上海',
-            ],
-            [
-                "\xEF\xBB\xBF blabla",
-                ' blabla',
-            ],
-            [
-                "\xEF\xBB\xBF blabla\xEF\xBB\xBF",
-                " blabla\xEF\xBB\xBF",
-            ],
-            [
-                "\xFE\xFF blabla",
-                ' blabla',
-            ],
-            [
-                "\xFE\xFF blabla\xFE\xFF",
-                " blabla\xFE\xFF",
-            ],
-            [
-                "\xFF\xFE blabla",
-                ' blabla',
-            ],
-            [
-                "\xFF\xFE blabla\xFF\xFE",
-                " blabla\xFF\xFE",
-            ],
+            ["\xEF\xBB\xBF blabla上海", ' blabla上海'],
+            ["\xEF\xBB\xBF blabla", ' blabla'],
+            ["\xEF\xBB\xBF blabla\xEF\xBB\xBF", " blabla\xEF\xBB\xBF"],
+            ["\xFE\xFF blabla", ' blabla'],
+            ["\xFE\xFF blabla\xFE\xFF", " blabla\xFE\xFF"],
+            ["\xFF\xFE blabla", ' blabla'],
+            ["\xFF\xFE blabla\xFF\xFE", " blabla\xFF\xFE"],
             [
                 "\xEF\xBB\xBF\x44\x52\x4F\x50\x20\x54\x41\x42\x4C\x45\x20\x49\x46\x20\x45\x58\x49\x53\x54\x53",
                 'DROP TABLE IF EXISTS',
@@ -571,10 +352,7 @@ class ImportTest extends AbstractTestCase
 
         $this->import->runQuery('', $sqlData);
 
-        $this->assertSame([
-            'SELECT 1;',
-            'SELECT 2;',
-        ], $sqlData);
+        $this->assertSame(['SELECT 1;', 'SELECT 2;'], $sqlData);
 
         $this->assertSame('SELECT 2;', $GLOBALS['sql_query']);
         $this->assertSame('SELECT 1;SELECT 2;', $GLOBALS['complete_query']);
diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php
index 02f8dc7669..2cb0980f6b 100644
--- a/test/classes/InsertEditTest.php
+++ b/test/classes/InsertEditTest.php
@@ -121,10 +121,7 @@ class InsertEditTest extends AbstractTestCase
      */
     public function testGetFormParametersForInsertForm(): void
     {
-        $whereClause = [
-            'foo' => 'bar ',
-            '1' => ' test',
-        ];
+        $whereClause = ['foo' => 'bar ', '1' => ' test'];
         $_POST['clause_is_unique'] = false;
         $_POST['sql_query'] = 'SELECT a';
         $GLOBALS['goto'] = 'index.php';
@@ -157,10 +154,7 @@ class InsertEditTest extends AbstractTestCase
      */
     public function testGetFormParametersForInsertFormGet(): void
     {
-        $whereClause = [
-            'foo' => 'bar ',
-            '1' => ' test',
-        ];
+        $whereClause = ['foo' => 'bar ', '1' => ' test'];
         $_GET['clause_is_unique'] = false;
         $_GET['sql_query'] = 'SELECT a';
         $_GET['sql_signature'] = Core::signSqlQuery($_GET['sql_query']);
@@ -205,11 +199,7 @@ class InsertEditTest extends AbstractTestCase
         );
 
         $this->assertEquals(
-            [
-                1,
-                2,
-                3,
-            ],
+            [1, 2, 3],
             $this->callFunction(
                 $this->insertEdit,
                 InsertEdit::class,
@@ -234,10 +224,7 @@ class InsertEditTest extends AbstractTestCase
      */
     public function testAnalyzeWhereClause(): void
     {
-        $clauses = [
-            'a=1',
-            'b="fo\o"',
-        ];
+        $clauses = ['a=1', 'b="fo\o"'];
 
         $resultStub1 = $this->createMock(DummyResult::class);
         $resultStub2 = $this->createMock(DummyResult::class);
@@ -277,29 +264,11 @@ class InsertEditTest extends AbstractTestCase
             $this->insertEdit,
             InsertEdit::class,
             'analyzeWhereClauses',
-            [
-                $clauses,
-                'table',
-                'db',
-            ],
+            [$clauses, 'table', 'db'],
         );
 
         $this->assertSame(
-            [
-                [
-                    'a=1',
-                    'b="fo\\\\o"',
-                ],
-                [
-                    $resultStub1,
-                    $resultStub2,
-                ],
-                [
-                    ['assoc1'],
-                    ['assoc2'],
-                ],
-                false,
-            ],
+            [['a=1', 'b="fo\\\\o"'], [$resultStub1, $resultStub2], [['assoc1'], ['assoc2']], false],
             $result,
         );
     }
@@ -338,13 +307,7 @@ class InsertEditTest extends AbstractTestCase
             $this->insertEdit,
             InsertEdit::class,
             'showEmptyResultMessageOrSetUniqueCondition',
-            [
-                ['1' => ['1' => 1]],
-                1,
-                [],
-                'SELECT',
-                ['1' => $resultStub],
-            ],
+            [['1' => ['1' => 1]], 1, [], 'SELECT', ['1' => $resultStub]],
         );
 
         $this->assertTrue($result);
@@ -365,13 +328,7 @@ class InsertEditTest extends AbstractTestCase
             $this->insertEdit,
             InsertEdit::class,
             'showEmptyResultMessageOrSetUniqueCondition',
-            [
-                [false],
-                0,
-                ['1'],
-                'SELECT',
-                ['1' => 'result1'],
-            ],
+            [[false], 0, ['1'], 'SELECT', ['1' => 'result1']],
         );
 
         $response->setValue($restoreInstance);
@@ -382,38 +339,7 @@ class InsertEditTest extends AbstractTestCase
     /** @return list<array{int|string, array<bool>}> */
     public static function dataProviderConfigValueInsertRows(): array
     {
-        return [
-            [
-                2,
-                [
-                    false,
-                    false,
-                ],
-            ],
-            [
-                '2',
-                [
-                    false,
-                    false,
-                ],
-            ],
-            [
-                3,
-                [
-                    false,
-                    false,
-                    false,
-                ],
-            ],
-            [
-                '3',
-                [
-                    false,
-                    false,
-                    false,
-                ],
-            ],
-        ];
+        return [[2, [false, false]], ['2', [false, false]], [3, [false, false, false]], ['3', [false, false, false]]];
     }
 
     /**
@@ -455,10 +381,7 @@ class InsertEditTest extends AbstractTestCase
         );
 
         $this->assertEquals(
-            [
-                $resultStub,
-                $rowsValue,
-            ],
+            [$resultStub, $rowsValue],
             $result,
         );
     }
@@ -468,20 +391,13 @@ class InsertEditTest extends AbstractTestCase
      */
     public function testUrlParamsInEditMode(): void
     {
-        $whereClauseArray = [
-            'foo=1',
-            'bar=2',
-        ];
+        $whereClauseArray = ['foo=1', 'bar=2'];
         $_POST['sql_query'] = 'SELECT 1';
 
         $result = $this->insertEdit->urlParamsInEditMode([1], $whereClauseArray);
 
         $this->assertEquals(
-            [
-                '0' => 1,
-                'where_clause' => 'bar=2',
-                'sql_query' => 'SELECT 1',
-            ],
+            ['0' => 1, 'where_clause' => 'bar=2', 'sql_query' => 'SELECT 1'],
             $result,
         );
     }
@@ -540,21 +456,13 @@ class InsertEditTest extends AbstractTestCase
      */
     public function testAnalyzeTableColumnsArray(): void
     {
-        $column = [
-            'Field' => '1<2',
-            'Field_md5' => 'pswd',
-            'Type' => 'float(10, 1)',
-        ];
+        $column = ['Field' => '1<2', 'Field_md5' => 'pswd', 'Type' => 'float(10, 1)'];
 
         $result = $this->callFunction(
             $this->insertEdit,
             InsertEdit::class,
             'analyzeTableColumnsArray',
-            [
-                $column,
-                [],
-                false,
-            ],
+            [$column, [], false],
         );
 
         $this->assertEquals($result['Field_md5'], '4342210df36bf2ff2c4e2a997a6d4089');
@@ -591,10 +499,7 @@ class InsertEditTest extends AbstractTestCase
                 $this->insertEdit,
                 InsertEdit::class,
                 'getColumnTitle',
-                [
-                    $column,
-                    [],
-                ],
+                [$column, []],
             ),
             'f1&lt;',
         );
@@ -606,10 +511,7 @@ class InsertEditTest extends AbstractTestCase
             $this->insertEdit,
             InsertEdit::class,
             'getColumnTitle',
-            [
-                $column,
-                $comments,
-            ],
+            [$column, $comments],
         );
 
         $result = $this->parseString($result);
@@ -625,10 +527,7 @@ class InsertEditTest extends AbstractTestCase
     public function testIsColumn(): void
     {
         $column = [];
-        $types = [
-            'binary',
-            'varbinary',
-        ];
+        $types = ['binary', 'varbinary'];
 
         $column['Type'] = 'binaryfoo';
         $this->assertTrue($this->insertEdit->isColumn($column, $types));
@@ -642,10 +541,7 @@ class InsertEditTest extends AbstractTestCase
         $column['Type'] = 'barbinaryfoo';
         $this->assertFalse($this->insertEdit->isColumn($column, $types));
 
-        $types = [
-            'char',
-            'varchar',
-        ];
+        $types = ['char', 'varchar'];
 
         $column['Type'] = 'char(10)';
         $this->assertTrue($this->insertEdit->isColumn($column, $types));
@@ -656,12 +552,7 @@ class InsertEditTest extends AbstractTestCase
         $column['Type'] = 'foochar';
         $this->assertFalse($this->insertEdit->isColumn($column, $types));
 
-        $types = [
-            'blob',
-            'tinyblob',
-            'mediumblob',
-            'longblob',
-        ];
+        $types = ['blob', 'tinyblob', 'mediumblob', 'longblob'];
 
         $column['Type'] = 'blob';
         $this->assertTrue($this->insertEdit->isColumn($column, $types));
@@ -690,113 +581,71 @@ class InsertEditTest extends AbstractTestCase
         $column = [];
         $column['True_Type'] = 'set';
         $this->assertEquals(
-            [
-                'set',
-                '',
-                false,
-            ],
+            ['set', '', false],
             $this->callFunction(
                 $this->insertEdit,
                 InsertEdit::class,
                 'getEnumSetAndTimestampColumns',
-                [
-                    $column,
-                    false,
-                ],
+                [$column, false],
             ),
         );
 
         $column['True_Type'] = 'enum';
         $this->assertEquals(
-            [
-                'enum',
-                '',
-                false,
-            ],
+            ['enum', '', false],
             $this->callFunction(
                 $this->insertEdit,
                 InsertEdit::class,
                 'getEnumSetAndTimestampColumns',
-                [
-                    $column,
-                    false,
-                ],
+                [$column, false],
             ),
         );
 
         $column['True_Type'] = 'timestamp';
         $column['Type'] = 'date';
         $this->assertEquals(
-            [
-                'date',
-                ' text-nowrap',
-                true,
-            ],
+            ['date', ' text-nowrap', true],
             $this->callFunction(
                 $this->insertEdit,
                 InsertEdit::class,
                 'getEnumSetAndTimestampColumns',
-                [
-                    $column,
-                    false,
-                ],
+                [$column, false],
             ),
         );
 
         $column['True_Type'] = 'timestamp';
         $column['Type'] = 'date';
         $this->assertEquals(
-            [
-                'date',
-                ' text-nowrap',
-                false,
-            ],
+            ['date', ' text-nowrap', false],
             $this->callFunction(
                 $this->insertEdit,
                 InsertEdit::class,
                 'getEnumSetAndTimestampColumns',
-                [
-                    $column,
-                    true,
-                ],
+                [$column, true],
             ),
         );
 
         $column['True_Type'] = 'SET';
         $column['Type'] = 'num';
         $this->assertEquals(
-            [
-                'num',
-                ' text-nowrap',
-                false,
-            ],
+            ['num', ' text-nowrap', false],
             $this->callFunction(
                 $this->insertEdit,
                 InsertEdit::class,
                 'getEnumSetAndTimestampColumns',
-                [
-                    $column,
-                    false,
-                ],
+                [$column, false],
             ),
         );
 
         $column['True_Type'] = '';
         $column['Type'] = 'num';
         $this->assertEquals(
-            [
-                'num',
-                ' text-nowrap',
-                false,
-            ],
+            ['num', ' text-nowrap', false],
             $this->callFunction(
                 $this->insertEdit,
                 InsertEdit::class,
                 'getEnumSetAndTimestampColumns',
-                [
-                    $column,
-                    false,
-                ],
+                [$column, false],
             ),
         );
     }
@@ -807,9 +656,7 @@ class InsertEditTest extends AbstractTestCase
     public function testGetNullifyCodeForNullColumn(): void
     {
         $column = $foreignData = [];
-        $foreigners = [
-            'foreign_keys_data' => [],
-        ];
+        $foreigners = ['foreign_keys_data' => []];
         $column['Field'] = 'f';
         $column['True_Type'] = 'enum';
         $column['Type'] = 'ababababababababababa';
@@ -819,11 +666,7 @@ class InsertEditTest extends AbstractTestCase
                 $this->insertEdit,
                 InsertEdit::class,
                 'getNullifyCodeForNullColumn',
-                [
-                    $column,
-                    $foreigners,
-                    [],
-                ],
+                [$column, $foreigners, []],
             ),
         );
 
@@ -835,11 +678,7 @@ class InsertEditTest extends AbstractTestCase
                 $this->insertEdit,
                 InsertEdit::class,
                 'getNullifyCodeForNullColumn',
-                [
-                    $column,
-                    $foreigners,
-                    [],
-                ],
+                [$column, $foreigners, []],
             ),
         );
 
@@ -850,11 +689,7 @@ class InsertEditTest extends AbstractTestCase
                 $this->insertEdit,
                 InsertEdit::class,
                 'getNullifyCodeForNullColumn',
-                [
-                    $column,
-                    $foreigners,
-                    [],
-                ],
+                [$column, $foreigners, []],
             ),
         );
 
@@ -867,11 +702,7 @@ class InsertEditTest extends AbstractTestCase
                 $this->insertEdit,
                 InsertEdit::class,
                 'getNullifyCodeForNullColumn',
-                [
-                    $column,
-                    $foreigners,
-                    $foreignData,
-                ],
+                [$column, $foreigners, $foreignData],
             ),
         );
     }
@@ -895,19 +726,7 @@ class InsertEditTest extends AbstractTestCase
             $this->insertEdit,
             InsertEdit::class,
             'getTextarea',
-            [
-                $column,
-                'a',
-                'b',
-                '',
-                2,
-                0,
-                1,
-                'abc/',
-                'foobar',
-                'CHAR',
-                false,
-            ],
+            [$column, 'a', 'b', '', 2, 0, 1, 'abc/', 'foobar', 'CHAR', false],
         );
 
         $result = $this->parseString($result);
@@ -925,10 +744,7 @@ class InsertEditTest extends AbstractTestCase
      */
     public function testGetColumnEnumValues(): void
     {
-        $enumSetValues = [
-            '<abc>',
-            '"foo"',
-        ];
+        $enumSetValues = ['<abc>', '"foo"'];
 
         $result = $this->callFunction(
             $this->insertEdit,
@@ -937,16 +753,7 @@ class InsertEditTest extends AbstractTestCase
             [$enumSetValues],
         );
         $this->assertEquals(
-            [
-                [
-                    'plain' => '<abc>',
-                    'html' => '&lt;abc&gt;',
-                ],
-                [
-                    'plain' => '"foo"',
-                    'html' => '&quot;foo&quot;',
-                ],
-            ],
+            [['plain' => '<abc>', 'html' => '&lt;abc&gt;'], ['plain' => '"foo"', 'html' => '&quot;foo&quot;']],
             $result,
         );
     }
@@ -957,60 +764,30 @@ class InsertEditTest extends AbstractTestCase
     public function testGetColumnSetValueAndSelectSize(): void
     {
         $column = [];
-        $enumSetValues = [
-            'a',
-            '<',
-        ];
+        $enumSetValues = ['a', '<'];
         $result = $this->callFunction(
             $this->insertEdit,
             InsertEdit::class,
             'getColumnSetValueAndSelectSize',
-            [
-                [],
-                $enumSetValues,
-            ],
+            [[], $enumSetValues],
         );
 
         $this->assertEquals(
-            [
-                [
-                    [
-                        'plain' => 'a',
-                        'html' => 'a',
-                    ],
-                    [
-                        'plain' => '<',
-                        'html' => '&lt;',
-                    ],
-                ],
-                2,
-            ],
+            [[['plain' => 'a', 'html' => 'a'], ['plain' => '<', 'html' => '&lt;']], 2],
             $result,
         );
 
-        $column['values'] = [
-            1,
-            2,
-        ];
+        $column['values'] = [1, 2];
         $column['select_size'] = 3;
         $result = $this->callFunction(
             $this->insertEdit,
             InsertEdit::class,
             'getColumnSetValueAndSelectSize',
-            [
-                $column,
-                $enumSetValues,
-            ],
+            [$column, $enumSetValues],
         );
 
         $this->assertEquals(
-            [
-                [
-                    1,
-                    2,
-                ],
-                3,
-            ],
+            [[1, 2], 3],
             $result,
         );
     }
@@ -1028,18 +805,7 @@ class InsertEditTest extends AbstractTestCase
             $this->insertEdit,
             InsertEdit::class,
             'getHtmlInput',
-            [
-                $column,
-                'a',
-                'b',
-                30,
-                'c',
-                23,
-                2,
-                0,
-                'DATE',
-                false,
-            ],
+            [$column, 'a', 'b', 30, 'c', 23, 2, 0, 'DATE', false],
         );
 
         $this->assertEquals(
@@ -1055,18 +821,7 @@ class InsertEditTest extends AbstractTestCase
             $this->insertEdit,
             InsertEdit::class,
             'getHtmlInput',
-            [
-                $column,
-                'a',
-                'b',
-                30,
-                'c',
-                23,
-                2,
-                0,
-                'DATE',
-                false,
-            ],
+            [$column, 'a', 'b', 30, 'c', 23, 2, 0, 'DATE', false],
         );
         $this->assertEquals(
             '<input type="text" name="fieldsa" value="b" size="30" data-type="DATE"'
@@ -1081,18 +836,7 @@ class InsertEditTest extends AbstractTestCase
             $this->insertEdit,
             InsertEdit::class,
             'getHtmlInput',
-            [
-                $column,
-                'a',
-                'b',
-                30,
-                'c',
-                23,
-                2,
-                0,
-                'DATE',
-                false,
-            ],
+            [$column, 'a', 'b', 30, 'c', 23, 2, 0, 'DATE', false],
         );
         $this->assertEquals(
             '<input type="text" name="fieldsa" value="b" size="30" data-type="DATE"'
@@ -1108,18 +852,7 @@ class InsertEditTest extends AbstractTestCase
             $this->insertEdit,
             InsertEdit::class,
             'getHtmlInput',
-            [
-                $column,
-                'a',
-                'b',
-                11,
-                'c',
-                23,
-                2,
-                0,
-                'INT',
-                false,
-            ],
+            [$column, 'a', 'b', 11, 'c', 23, 2, 0, 'INT', false],
         );
         $this->assertEquals(
             '<input type="text" name="fieldsa" value="b" size="11" min="-2147483648" max="2147483647" data-type="INT"'
@@ -1139,17 +872,11 @@ class InsertEditTest extends AbstractTestCase
             $this->insertEdit,
             InsertEdit::class,
             'getMaxUploadSize',
-            [
-                $pmaType,
-                256,
-            ],
+            [$pmaType, 256],
         );
 
         $this->assertEquals(
-            [
-                "(Max: 256B)\n",
-                256,
-            ],
+            ["(Max: 256B)\n", 256],
             $result,
         );
 
@@ -1160,17 +887,11 @@ class InsertEditTest extends AbstractTestCase
             $this->insertEdit,
             InsertEdit::class,
             'getMaxUploadSize',
-            [
-                $pmaType,
-                20,
-            ],
+            [$pmaType, 20],
         );
 
         $this->assertEquals(
-            [
-                "(Max: 250B)\n",
-                250,
-            ],
+            ["(Max: 250B)\n", 250],
             $result,
         );
     }
@@ -1394,10 +1115,7 @@ class InsertEditTest extends AbstractTestCase
                 $this->insertEdit,
                 InsertEdit::class,
                 'getColumnSize',
-                [
-                    $column,
-                    $specInBrackets,
-                ],
+                [$column, $specInBrackets],
             ),
         );
 
@@ -1412,10 +1130,7 @@ class InsertEditTest extends AbstractTestCase
                 $this->insertEdit,
                 InsertEdit::class,
                 'getColumnSize',
-                [
-                    $column,
-                    $specInBrackets,
-                ],
+                [$column, $specInBrackets],
             ),
         );
     }
@@ -1506,24 +1221,11 @@ class InsertEditTest extends AbstractTestCase
             $this->insertEdit,
             InsertEdit::class,
             'getSpecialCharsAndBackupFieldForExistingRow',
-            [
-                $currentRow,
-                $column,
-                [],
-                [],
-                'a',
-                false,
-            ],
+            [$currentRow, $column, [], [], 'a', false],
         );
 
         $this->assertEquals(
-            [
-                true,
-                null,
-                null,
-                null,
-                '<input type="hidden" name="fields_preva" value="">',
-            ],
+            [true, null, null, null, '<input type="hidden" name="fields_preva" value="">'],
             $result,
         );
 
@@ -1538,24 +1240,11 @@ class InsertEditTest extends AbstractTestCase
             $this->insertEdit,
             InsertEdit::class,
             'getSpecialCharsAndBackupFieldForExistingRow',
-            [
-                $currentRow,
-                $column,
-                $extractedColumnSpec,
-                [],
-                'a',
-                false,
-            ],
+            [$currentRow, $column, $extractedColumnSpec, [], 'a', false],
         );
 
         $this->assertEquals(
-            [
-                false,
-                '',
-                '00000000000001111011',
-                null,
-                '<input type="hidden" name="fields_preva" value="123">',
-            ],
+            [false, '', '00000000000001111011', null, '<input type="hidden" name="fields_preva" value="123">'],
             $result,
         );
 
@@ -1564,24 +1253,11 @@ class InsertEditTest extends AbstractTestCase
             $this->insertEdit,
             InsertEdit::class,
             'getSpecialCharsAndBackupFieldForExistingRow',
-            [
-                $currentRow,
-                $column,
-                $extractedColumnSpec,
-                [],
-                'a',
-                true,
-            ],
+            [$currentRow, $column, $extractedColumnSpec, [], 'a', true],
         );
 
         $this->assertEquals(
-            [
-                false,
-                '',
-                'abcd',
-                null,
-                '<input type="hidden" name="fields_preva" value="abcd">',
-            ],
+            [false, '', 'abcd', null, '<input type="hidden" name="fields_preva" value="abcd">'],
             $result,
         );
 
@@ -1607,24 +1283,11 @@ class InsertEditTest extends AbstractTestCase
             $this->insertEdit,
             InsertEdit::class,
             'getSpecialCharsAndBackupFieldForExistingRow',
-            [
-                $currentRow,
-                $column,
-                $extractedColumnSpec,
-                ['int'],
-                'a',
-                false,
-            ],
+            [$currentRow, $column, $extractedColumnSpec, ['int'], 'a', false],
         );
 
         $this->assertEquals(
-            [
-                false,
-                '',
-                "'',",
-                null,
-                '<input type="hidden" name="fields_preva" value="\'\',">',
-            ],
+            [false, '', "'',", null, '<input type="hidden" name="fields_preva" value="\'\',">'],
             $result,
         );
 
@@ -1641,14 +1304,7 @@ class InsertEditTest extends AbstractTestCase
             $this->insertEdit,
             InsertEdit::class,
             'getSpecialCharsAndBackupFieldForExistingRow',
-            [
-                $currentRow,
-                $column,
-                $extractedColumnSpec,
-                ['int'],
-                'a',
-                false,
-            ],
+            [$currentRow, $column, $extractedColumnSpec, ['int'], 'a', false],
         );
 
         $this->assertEquals(
@@ -1669,14 +1325,7 @@ class InsertEditTest extends AbstractTestCase
             $this->insertEdit,
             InsertEdit::class,
             'getSpecialCharsAndBackupFieldForExistingRow',
-            [
-                $currentRow,
-                $column,
-                $extractedColumnSpec,
-                ['int'],
-                'a',
-                false,
-            ],
+            [$currentRow, $column, $extractedColumnSpec, ['int'], 'a', false],
         );
 
         $this->assertEquals(
@@ -1727,102 +1376,32 @@ class InsertEditTest extends AbstractTestCase
     {
         return [
             'bit' => [
-                [
-                    'True_Type' => 'bit',
-                    'Default' => 'b\'101\'',
-                    'is_binary' => true,
-                ],
-                [
-                    false,
-                    'b\'101\'',
-                    '101',
-                    '',
-                    '101',
-                ],
-            ],
-            'char' => [
-                [
-                    'True_Type' => 'char',
-                    'is_binary' => true,
-                ],
-                [
-                    true,
-                    '',
-                    '',
-                    '',
-                    '',
-                ],
+                ['True_Type' => 'bit', 'Default' => 'b\'101\'', 'is_binary' => true],
+                [false, 'b\'101\'', '101', '', '101'],
             ],
+            'char' => [['True_Type' => 'char', 'is_binary' => true], [true, '', '', '', '']],
             'time with CURRENT_TIMESTAMP value' => [
-                [
-                    'True_Type' => 'time',
-                    'Default' => 'CURRENT_TIMESTAMP',
-                ],
-                [
-                    false,
-                    'CURRENT_TIMESTAMP',
-                    'CURRENT_TIMESTAMP',
-                    '',
-                    'CURRENT_TIMESTAMP',
-                ],
+                ['True_Type' => 'time', 'Default' => 'CURRENT_TIMESTAMP'],
+                [false, 'CURRENT_TIMESTAMP', 'CURRENT_TIMESTAMP', '', 'CURRENT_TIMESTAMP'],
             ],
             'time with current_timestamp() value' => [
-                [
-                    'True_Type' => 'time',
-                    'Default' => 'current_timestamp()',
-                ],
-                [
-                    false,
-                    'current_timestamp()',
-                    'current_timestamp()',
-                    '',
-                    'current_timestamp()',
-                ],
+                ['True_Type' => 'time', 'Default' => 'current_timestamp()'],
+                [false, 'current_timestamp()', 'current_timestamp()', '', 'current_timestamp()'],
             ],
             'time with no dot value' => [
-                [
-                    'True_Type' => 'time',
-                    'Default' => '10',
-                ],
-                [
-                    false,
-                    '10',
-                    '10.000000',
-                    '',
-                    '10.000000',
-                ],
+                ['True_Type' => 'time', 'Default' => '10'],
+                [false, '10', '10.000000', '', '10.000000'],
             ],
             'time with dot value' => [
-                [
-                    'True_Type' => 'time',
-                    'Default' => '10.08',
-                ],
-                [
-                    false,
-                    '10.08',
-                    '10.080000',
-                    '',
-                    '10.080000',
-                ],
+                ['True_Type' => 'time', 'Default' => '10.08'],
+                [false, '10.08', '10.080000', '', '10.080000'],
             ],
             'any text with escape text default' => [
-                [
-                    'True_Type' => 'text',
-                    'Default' => '"lorem\"ipsem"',
-                ],
-                [
-                    false,
-                    '"lorem\"ipsem"',
-                    'lorem"ipsem',
-                    '',
-                    'lorem"ipsem',
-                ],
+                ['True_Type' => 'text', 'Default' => '"lorem\"ipsem"'],
+                [false, '"lorem\"ipsem"', 'lorem"ipsem', '', 'lorem"ipsem'],
             ],
             'varchar with html special chars' => [
-                [
-                    'True_Type' => 'varchar',
-                    'Default' => 'hello world<br><b>lorem</b> ipsem',
-                ],
+                ['True_Type' => 'varchar', 'Default' => 'hello world<br><b>lorem</b> ipsem'],
                 [
                     false,
                     'hello world<br><b>lorem</b> ipsem',
@@ -1845,33 +1424,17 @@ class InsertEditTest extends AbstractTestCase
         $result = $this->insertEdit->getParamsForUpdateOrInsert();
 
         $this->assertEquals(
-            [
-                ['LIMIT 1'],
-                true,
-                true,
-                false,
-            ],
+            [['LIMIT 1'], true, true, false],
             $result,
         );
 
         // case 2 (else)
         unset($_POST['where_clause']);
-        $_POST['fields']['multi_edit'] = [
-            'a' => 'b',
-            'c' => 'd',
-        ];
+        $_POST['fields']['multi_edit'] = ['a' => 'b', 'c' => 'd'];
         $result = $this->insertEdit->getParamsForUpdateOrInsert();
 
         $this->assertEquals(
-            [
-                [
-                    'a',
-                    'c',
-                ],
-                false,
-                true,
-                false,
-            ],
+            [['a', 'c'], false, true, false],
             $result,
         );
     }
@@ -1984,14 +1547,8 @@ class InsertEditTest extends AbstractTestCase
     {
         $GLOBALS['db'] = 'db';
         $GLOBALS['table'] = 'table';
-        $queryFields = [
-            'a',
-            'b',
-        ];
-        $valueSets = [
-            1,
-            2,
-        ];
+        $queryFields = ['a', 'b'];
+        $valueSets = [1, 2];
 
         $this->assertEquals(
             ['INSERT IGNORE INTO `table` (a, b) VALUES (1), (2)'],
@@ -2009,10 +1566,7 @@ class InsertEditTest extends AbstractTestCase
      */
     public function testExecuteSqlQuery(): void
     {
-        $query = [
-            'SELECT * FROM `test_db`.`test_table`;',
-            'SELECT * FROM `test_db`.`test_table_yaml`;',
-        ];
+        $query = ['SELECT * FROM `test_db`.`test_table`;', 'SELECT * FROM `test_db`.`test_table_yaml`;'];
         $GLOBALS['sql_query'] = 'SELECT * FROM `test_db`.`test_table`;';
         $GLOBALS['cfg']['IgnoreMultiSubmitErrors'] = false;
         $_POST['submit_type'] = '';
@@ -2036,10 +1590,7 @@ class InsertEditTest extends AbstractTestCase
      */
     public function testExecuteSqlQueryWithTryQuery(): void
     {
-        $query = [
-            'SELECT * FROM `test_db`.`test_table`;',
-            'SELECT * FROM `test_db`.`test_table_yaml`;',
-        ];
+        $query = ['SELECT * FROM `test_db`.`test_table`;', 'SELECT * FROM `test_db`.`test_table_yaml`;'];
         $GLOBALS['sql_query'] = 'SELECT * FROM `test_db`.`test_table`;';
         $GLOBALS['cfg']['IgnoreMultiSubmitErrors'] = true;
         $_POST['submit_type'] = '';
@@ -2181,13 +1732,8 @@ class InsertEditTest extends AbstractTestCase
     public function testTransformEditedValues(): void
     {
         $_SESSION[' HMAC_secret '] = hash('sha1', 'test');
-        $editedValues = [
-            ['c' => 'cname'],
-        ];
-        $GLOBALS['cfg']['DefaultTransformations']['PreApPend'] = [
-            '',
-            '',
-        ];
+        $editedValues = [['c' => 'cname']];
+        $GLOBALS['cfg']['DefaultTransformations']['PreApPend'] = ['', ''];
         $GLOBALS['cfg']['ServerDefault'] = 1;
         $_POST['where_clause'] = '1';
         $_POST['where_clause_sign'] = Core::signSqlQuery($_POST['where_clause']);
@@ -2204,10 +1750,7 @@ class InsertEditTest extends AbstractTestCase
         );
 
         $this->assertEquals(
-            [
-                'a' => 'b',
-                'transformations' => ['cnameoption ,, quoted'],
-            ],
+            ['a' => 'b', 'transformations' => ['cnameoption ,, quoted']],
             $result,
         );
     }
@@ -2881,10 +2424,7 @@ class InsertEditTest extends AbstractTestCase
         $dbi->expects($this->once())
             ->method('getColumns')
             ->with('db', 'table')
-            ->will($this->returnValue([
-                ['a' => 'b', 'c' => 'd'],
-                ['e' => 'f', 'g' => 'h'],
-            ]));
+            ->will($this->returnValue([['a' => 'b', 'c' => 'd'], ['e' => 'f', 'g' => 'h']]));
 
         $GLOBALS['dbi'] = $dbi;
         $this->insertEdit = new InsertEdit(
@@ -2898,10 +2438,7 @@ class InsertEditTest extends AbstractTestCase
         $result = $this->insertEdit->getTableColumns('db', 'table');
 
         $this->assertEquals(
-            [
-                ['a' => 'b', 'c' => 'd'],
-                ['e' => 'f', 'g' => 'h'],
-            ],
+            [['a' => 'b', 'c' => 'd'], ['e' => 'f', 'g' => 'h']],
             $result,
         );
     }
@@ -2951,16 +2488,7 @@ class InsertEditTest extends AbstractTestCase
         $result = $this->insertEdit->determineInsertOrEdit('1', 'db', 'table');
 
         $this->assertEquals(
-            [
-                false,
-                null,
-                [1],
-                null,
-                [$resultStub],
-                [[]],
-                false,
-                'edit_next',
-            ],
+            [false, null, [1], null, [$resultStub], [[]], false, 'edit_next'],
             $result,
         );
 
@@ -2974,19 +2502,7 @@ class InsertEditTest extends AbstractTestCase
         $response->setValue($restoreInstance);
 
         $this->assertEquals(
-            [
-                true,
-                null,
-                [],
-                null,
-                $resultStub,
-                [
-                    false,
-                    false,
-                ],
-                false,
-                'edit_next',
-            ],
+            [true, null, [], null, $resultStub, [false, false], false, 'edit_next'],
             $result,
         );
     }
@@ -3007,12 +2523,7 @@ class InsertEditTest extends AbstractTestCase
             ->with('db', 'table', true)
             ->will(
                 $this->returnValue(
-                    [
-                        [
-                            'Comment' => 'b',
-                            'Field' => 'd',
-                        ],
-                    ],
+                    [['Comment' => 'b', 'Field' => 'd']],
                 ),
             );
 
diff --git a/test/classes/IpAllowDenyTest.php b/test/classes/IpAllowDenyTest.php
index c4fb013f4f..a48a9d7d91 100644
--- a/test/classes/IpAllowDenyTest.php
+++ b/test/classes/IpAllowDenyTest.php
@@ -83,42 +83,17 @@ class IpAllowDenyTest extends AbstractTestCase
     {
         return [
             // Nothing set
-            [
-                null,
-                null,
-                false,
-            ],
+            [null, null, false],
             // Remote IP set
-            [
-                '101.0.0.25',
-                null,
-                '101.0.0.25',
-            ],
+            ['101.0.0.25', null, '101.0.0.25'],
             // Proxy
-            [
-                '101.0.0.25',
-                '192.168.10.10',
-                '192.168.10.10',
-            ],
+            ['101.0.0.25', '192.168.10.10', '192.168.10.10'],
             // Several proxies
-            [
-                '101.0.0.25',
-                '192.168.10.1, 192.168.100.100',
-                '192.168.10.1',
-            ],
+            ['101.0.0.25', '192.168.10.1, 192.168.100.100', '192.168.10.1'],
             // Invalid proxy
-            [
-                '101.0.0.25',
-                'invalid',
-                false,
-            ],
+            ['101.0.0.25', 'invalid', false],
             // Direct IP with proxy enabled
-            [
-                '101.0.0.25',
-                '192.168.10.10',
-                '101.0.0.25',
-                '10.10.10.10',
-            ],
+            ['101.0.0.25', '192.168.10.10', '101.0.0.25', '10.10.10.10'],
         ];
     }
 
diff --git a/test/classes/LinterTest.php b/test/classes/LinterTest.php
index b576e54f40..c972517894 100644
--- a/test/classes/LinterTest.php
+++ b/test/classes/LinterTest.php
@@ -49,31 +49,19 @@ class LinterTest extends AbstractTestCase
         //      ( d, 4), ( e, 5), (\n, 6),
         //      (\n, 7).
         $this->assertEquals(
-            [
-                1,
-                0,
-            ],
+            [1, 0],
             Linter::findLineNumberAndColumn([0, 4, 7], 4),
         );
         $this->assertEquals(
-            [
-                1,
-                1,
-            ],
+            [1, 1],
             Linter::findLineNumberAndColumn([0, 4, 7], 5),
         );
         $this->assertEquals(
-            [
-                1,
-                2,
-            ],
+            [1, 2],
             Linter::findLineNumberAndColumn([0, 4, 7], 6),
         );
         $this->assertEquals(
-            [
-                2,
-                0,
-            ],
+            [2, 0],
             Linter::findLineNumberAndColumn([0, 4, 7], 7),
         );
     }
@@ -99,14 +87,8 @@ class LinterTest extends AbstractTestCase
     public static function lintProvider(): array
     {
         return [
-            [
-                [],
-                '',
-            ],
-            [
-                [],
-                'SELECT * FROM tbl',
-            ],
+            [[], ''],
+            [[], 'SELECT * FROM tbl'],
             [
                 [
                     [
diff --git a/test/classes/ListDatabaseTest.php b/test/classes/ListDatabaseTest.php
index faba061a6f..6bf5962278 100644
--- a/test/classes/ListDatabaseTest.php
+++ b/test/classes/ListDatabaseTest.php
@@ -52,23 +52,13 @@ class ListDatabaseTest extends AbstractTestCase
 
         $GLOBALS['db'] = 'db';
         $this->assertEquals(
-            [
-                [
-                    'name' => 'single_db',
-                    'is_selected' => false,
-                ],
-            ],
+            [['name' => 'single_db', 'is_selected' => false]],
             $arr->getList(),
         );
 
         $GLOBALS['db'] = 'single_db';
         $this->assertEquals(
-            [
-                [
-                    'name' => 'single_db',
-                    'is_selected' => true,
-                ],
-            ],
+            [['name' => 'single_db', 'is_selected' => true]],
             $arr->getList(),
         );
     }
diff --git a/test/classes/MessageTest.php b/test/classes/MessageTest.php
index e8b4b3df06..5e4934bfaa 100644
--- a/test/classes/MessageTest.php
+++ b/test/classes/MessageTest.php
@@ -164,19 +164,12 @@ class MessageTest extends AbstractTestCase
         );
         $this->object->addParam('test');
         $this->assertEquals(
-            [
-                Message::notice('test'),
-                'test',
-            ],
+            [Message::notice('test'), 'test'],
             $this->object->getParams(),
         );
         $this->object->addParam('test');
         $this->assertEquals(
-            [
-                Message::notice('test'),
-                'test',
-                Message::notice('test'),
-            ],
+            [Message::notice('test'), 'test', Message::notice('test')],
             $this->object->getParams(),
         );
     }
@@ -203,19 +196,12 @@ class MessageTest extends AbstractTestCase
     {
         $this->object->addText('test', '*');
         $this->assertEquals(
-            [
-                '*',
-                Message::notice('test'),
-            ],
+            ['*', Message::notice('test')],
             $this->object->getAddedMessages(),
         );
         $this->object->addText('test', '');
         $this->assertEquals(
-            [
-                '*',
-                Message::notice('test'),
-                Message::notice('test'),
-            ],
+            ['*', Message::notice('test'), Message::notice('test')],
             $this->object->getAddedMessages(),
         );
     }
@@ -232,11 +218,7 @@ class MessageTest extends AbstractTestCase
         );
         $this->object->addHtml('<b>test</b>');
         $this->assertEquals(
-            [
-                Message::notice('test&lt;&gt;'),
-                ' ',
-                Message::rawNotice('<b>test</b>'),
-            ],
+            [Message::notice('test&lt;&gt;'), ' ', Message::rawNotice('<b>test</b>')],
             $this->object->getAddedMessages(),
         );
         $this->object->addMessage(Message::notice('test<>'));
@@ -258,11 +240,7 @@ class MessageTest extends AbstractTestCase
         $this->object->addMessages($messages, '');
 
         $this->assertEquals(
-            [
-                Message::notice('Test1'),
-                Message::error('PMA_Test2'),
-                Message::notice('Test3'),
-            ],
+            [Message::notice('Test1'), Message::error('PMA_Test2'), Message::notice('Test3')],
             $this->object->getAddedMessages(),
         );
     }
@@ -272,19 +250,11 @@ class MessageTest extends AbstractTestCase
      */
     public function testAddMessagesString(): void
     {
-        $messages = [
-            'test1',
-            'test<b>',
-            'test2',
-        ];
+        $messages = ['test1', 'test<b>', 'test2'];
         $this->object->addMessagesString($messages, '');
 
         $this->assertEquals(
-            [
-                Message::notice('test1'),
-                Message::notice('test&lt;b&gt;'),
-                Message::notice('test2'),
-            ],
+            [Message::notice('test1'), Message::notice('test&lt;b&gt;'), Message::notice('test2')],
             $this->object->getAddedMessages(),
         );
 
@@ -316,10 +286,7 @@ class MessageTest extends AbstractTestCase
             Message::sanitize($this->object),
         );
         $this->assertEquals(
-            [
-                'test&amp;string&lt;&gt;',
-                'test&amp;string&lt;&gt;',
-            ],
+            ['test&amp;string&lt;&gt;', 'test&amp;string&lt;&gt;'],
             Message::sanitize([$this->object, $this->object]),
         );
     }
@@ -332,30 +299,15 @@ class MessageTest extends AbstractTestCase
     public static function decodeBBDataProvider(): array
     {
         return [
-            [
-                '[em]test[/em][em]aa[em/][em]test[/em]',
-                '<em>test</em><em>aa[em/]<em>test</em>',
-            ],
-            [
-                '[strong]test[/strong][strong]test[/strong]',
-                '<strong>test</strong><strong>test</strong>',
-            ],
-            [
-                '[code]test[/code][code]test[/code]',
-                '<code>test</code><code>test</code>',
-            ],
-            [
-                '[kbd]test[/kbd][br][sup]test[/sup]',
-                '<kbd>test</kbd><br><sup>test</sup>',
-            ],
+            ['[em]test[/em][em]aa[em/][em]test[/em]', '<em>test</em><em>aa[em/]<em>test</em>'],
+            ['[strong]test[/strong][strong]test[/strong]', '<strong>test</strong><strong>test</strong>'],
+            ['[code]test[/code][code]test[/code]', '<code>test</code><code>test</code>'],
+            ['[kbd]test[/kbd][br][sup]test[/sup]', '<kbd>test</kbd><br><sup>test</sup>'],
             [
                 '[a@https://example.com/@Documentation]link[/a]',
                 '<a href="index.php?route=/url&url=https%3A%2F%2Fexample.com%2F" target="Documentation">link</a>',
             ],
-            [
-                '[a@./non-existing@Documentation]link[/a]',
-                '[a@./non-existing@Documentation]link</a>',
-            ],
+            ['[a@./non-existing@Documentation]link[/a]', '[a@./non-existing@Documentation]link</a>'],
             [
                 '[doc@foo]link[/doc]',
                 '<a href="index.php?route=/url&url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2F'
diff --git a/test/classes/MimeTest.php b/test/classes/MimeTest.php
index 4ef004b3f5..616b13fc05 100644
--- a/test/classes/MimeTest.php
+++ b/test/classes/MimeTest.php
@@ -35,22 +35,10 @@ class MimeTest extends AbstractTestCase
     public static function providerForTestDetect(): array
     {
         return [
-            [
-                'pma',
-                'application/octet-stream',
-            ],
-            [
-                'GIF',
-                'image/gif',
-            ],
-            [
-                "\x89PNG",
-                'image/png',
-            ],
-            [
-                chr(0xff) . chr(0xd8),
-                'image/jpeg',
-            ],
+            ['pma', 'application/octet-stream'],
+            ['GIF', 'image/gif'],
+            ["\x89PNG", 'image/png'],
+            [chr(0xff) . chr(0xd8), 'image/jpeg'],
         ];
     }
 }
diff --git a/test/classes/Navigation/Nodes/NodeDatabaseTest.php b/test/classes/Navigation/Nodes/NodeDatabaseTest.php
index 8366864537..c203bd0335 100644
--- a/test/classes/Navigation/Nodes/NodeDatabaseTest.php
+++ b/test/classes/Navigation/Nodes/NodeDatabaseTest.php
@@ -33,10 +33,7 @@ class NodeDatabaseTest extends AbstractTestCase
         $parent = new NodeDatabase('default');
         $this->assertEquals(
             [
-                'text' => [
-                    'route' => '/database/structure',
-                    'params' => ['db' => null],
-                ],
+                'text' => ['route' => '/database/structure', 'params' => ['db' => null]],
                 'icon' => ['route' => '/database/operations', 'params' => ['db' => null]],
                 'title' => 'Structure',
             ],
diff --git a/test/classes/Navigation/Nodes/NodeTest.php b/test/classes/Navigation/Nodes/NodeTest.php
index 48c74a8053..425d28f6f5 100644
--- a/test/classes/Navigation/Nodes/NodeTest.php
+++ b/test/classes/Navigation/Nodes/NodeTest.php
@@ -157,10 +157,7 @@ class NodeTest extends AbstractTestCase
         $this->assertEquals($child->parents(), [$parent]); // exclude self
         $this->assertEquals(
             $child->parents(true),
-            [
-                $child,
-                $parent,
-            ],
+            [$child, $parent],
         ); // include self
     }
 
@@ -278,10 +275,7 @@ class NodeTest extends AbstractTestCase
         unset($GLOBALS['cfg']['Server']['only_db']);
 
         // When only_db directive is present and it's an array of dbs
-        $GLOBALS['cfg']['Server']['only_db'] = [
-            'onlyDbOne',
-            'onlyDbTwo',
-        ];
+        $GLOBALS['cfg']['Server']['only_db'] = ['onlyDbOne', 'onlyDbTwo'];
         $this->assertEquals(
             'WHERE TRUE AND ( `SCHEMA_NAME` LIKE \'onlyDbOne\' OR `SCHEMA_NAME` LIKE \'onlyDbTwo\' ) ',
             $method->invoke($node, 'SCHEMA_NAME'),
diff --git a/test/classes/NormalizationTest.php b/test/classes/NormalizationTest.php
index d8e2eb4e21..f3830f1775 100644
--- a/test/classes/NormalizationTest.php
+++ b/test/classes/NormalizationTest.php
@@ -77,37 +77,13 @@ class NormalizationTest extends AbstractTestCase
             ->method('getColumnNames')
             ->will($this->returnValue(['id', 'col1', 'col2']));
         $map = [
-            [
-                'PMA_db',
-                'PMA_table1',
-                Connection::TYPE_USER,
-                [],
-            ],
-            [
-                'PMA_db',
-                'PMA_table',
-                Connection::TYPE_USER,
-                [
-                    [
-                        'Key_name' => 'PRIMARY',
-                        'Column_name' => 'id',
-                    ],
-                ],
-            ],
+            ['PMA_db', 'PMA_table1', Connection::TYPE_USER, []],
+            ['PMA_db', 'PMA_table', Connection::TYPE_USER, [['Key_name' => 'PRIMARY', 'Column_name' => 'id']]],
             [
                 'PMA_db',
                 'PMA_table2',
                 Connection::TYPE_USER,
-                [
-                    [
-                        'Key_name' => 'PRIMARY',
-                        'Column_name' => 'id',
-                    ],
-                    [
-                        'Key_name' => 'PRIMARY',
-                        'Column_name' => 'col1',
-                    ],
-                ],
+                [['Key_name' => 'PRIMARY','Column_name' => 'id'], ['Key_name' => 'PRIMARY','Column_name' => 'col1']],
             ],
         ];
         $dbi->expects($this->any())
@@ -312,10 +288,7 @@ class NormalizationTest extends AbstractTestCase
         $this->assertArrayHasKey('legendText', $result);
         $this->assertArrayHasKey('headText', $result);
         $this->assertArrayHasKey('queryError', $result);
-        $partialDependencies = [
-            'id' => ['col2'],
-            'col1' => ['col2'],
-        ];
+        $partialDependencies = ['id' => ['col2'], 'col1' => ['col2']];
         $result1 = $this->normalization->createNewTablesFor2NF($partialDependencies, $tablesName, $table, $db);
         $this->assertArrayHasKey('extra', $result1);
         $this->assertEquals(__('End of step'), $result1['legendText']);
@@ -333,37 +306,19 @@ class NormalizationTest extends AbstractTestCase
         $dependencies->col1 = ['col2'];
         $result = $this->normalization->getHtmlForNewTables3NF($dependencies, $tables, $db);
         $this->assertEquals(
-            [
-                'html' => '',
-                'success' => true,
-                'newTables' => [],
-            ],
+            ['html' => '', 'success' => true, 'newTables' => []],
             $result,
         );
-        $tables = [
-            'PMA_table' => [
-                'col1',
-                'PMA_table',
-            ],
-        ];
+        $tables = ['PMA_table' => ['col1', 'PMA_table']];
         // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-        $dependencies->PMA_table = [
-            'col4',
-            'col5',
-        ];
+        $dependencies->PMA_table = ['col4', 'col5'];
         $result1 = $this->normalization->getHtmlForNewTables3NF($dependencies, $tables, $db);
         $this->assertStringContainsString('<input type="text" name="PMA_table"', $result1['html']);
         $this->assertEquals(
             [
                 'PMA_table' => [
-                    'PMA_table' => [
-                        'pk' => 'col1',
-                        'nonpk' => 'col2',
-                    ],
-                    'table2' => [
-                        'pk' => 'id',
-                        'nonpk' => 'col4, col5',
-                    ],
+                    'PMA_table' => ['pk' => 'col1', 'nonpk' => 'col2'],
+                    'table2' => ['pk' => 'id', 'nonpk' => 'col4, col5'],
                 ],
             ],
             $result1['newTables'],
@@ -378,14 +333,8 @@ class NormalizationTest extends AbstractTestCase
         $db = 'PMA_db';
         $newTables = [
             'PMA_table' => [
-                'PMA_table' => [
-                    'pk' => 'id',
-                    'nonpk' => 'col1, col2',
-                ],
-                'table1' => [
-                    'pk' => 'col2',
-                    'nonpk' => 'col3, col4',
-                ],
+                'PMA_table' => ['pk' => 'id', 'nonpk' => 'col1, col2'],
+                'table1' => ['pk' => 'col2', 'nonpk' => 'col3, col4'],
             ],
         ];
         $result = $this->normalization->createNewTablesFor3NF($newTables, $db);
@@ -459,11 +408,7 @@ class NormalizationTest extends AbstractTestCase
      */
     public function testGetAllCombinationPartialKeys(): void
     {
-        $primaryKey = [
-            'id',
-            'col1',
-            'col2',
-        ];
+        $primaryKey = ['id', 'col1', 'col2'];
         $result = $this->callFunction(
             $this->normalization,
             Normalization::class,
@@ -472,15 +417,7 @@ class NormalizationTest extends AbstractTestCase
         );
 
         $this->assertEquals(
-            [
-                '',
-                'id',
-                'col1',
-                'col1,id',
-                'col2',
-                'col2,id',
-                'col2,col1',
-            ],
+            ['', 'id', 'col1', 'col1,id', 'col2', 'col2,id', 'col2,col1'],
             $result,
         );
     }
diff --git a/test/classes/OpenDocumentTest.php b/test/classes/OpenDocumentTest.php
index 74d6495c1a..c2865bd930 100644
--- a/test/classes/OpenDocumentTest.php
+++ b/test/classes/OpenDocumentTest.php
@@ -34,10 +34,7 @@ class OpenDocumentTest extends AbstractTestCase
             'data' => 'application/vnd.oasis.opendocument.text',
         ], $zipExtension->getContents($tmpFile));
 
-        $this->assertSame([
-            'error' => '',
-            'data' => '<data>',
-        ], $zipExtension->getContents($tmpFile, '/content\.xml/'));
+        $this->assertSame(['error' => '', 'data' => '<data>'], $zipExtension->getContents($tmpFile, '/content\.xml/'));
 
         $dateTimeCreation = (new DateTime())->format('Y-m-d\TH:i');
         $this->assertStringContainsString(
diff --git a/test/classes/Partitioning/PartitionTest.php b/test/classes/Partitioning/PartitionTest.php
index 79eaa7bd7d..2cddd79eda 100644
--- a/test/classes/Partitioning/PartitionTest.php
+++ b/test/classes/Partitioning/PartitionTest.php
@@ -62,11 +62,7 @@ class PartitionTest extends AbstractTestCase
                 true,
                 50600,
                 false,
-                [
-                    ['Name' => 'mysql_native_password'],
-                    ['Name' => 'partition'],
-                    ['Name' => 'InnoDB'],
-                ],
+                [['Name' => 'mysql_native_password'], ['Name' => 'partition'], ['Name' => 'InnoDB']],
             ],
             '5.6.0 without partitioning support' => [
                 false,
diff --git a/test/classes/Plugins/Auth/AuthenticationConfigTest.php b/test/classes/Plugins/Auth/AuthenticationConfigTest.php
index 9bd76ce2da..1c322bdc91 100644
--- a/test/classes/Plugins/Auth/AuthenticationConfigTest.php
+++ b/test/classes/Plugins/Auth/AuthenticationConfigTest.php
@@ -58,10 +58,7 @@ class AuthenticationConfigTest extends AbstractTestCase
 
     public function testAuthCheck(): void
     {
-        $GLOBALS['cfg']['Server'] = [
-            'user' => 'username',
-            'password' => 'password',
-        ];
+        $GLOBALS['cfg']['Server'] = ['user' => 'username', 'password' => 'password'];
         $this->assertTrue(
             $this->object->readCredentials(),
         );
diff --git a/test/classes/Plugins/Auth/AuthenticationCookieTest.php b/test/classes/Plugins/Auth/AuthenticationCookieTest.php
index b39faeb7ff..345016cc52 100644
--- a/test/classes/Plugins/Auth/AuthenticationCookieTest.php
+++ b/test/classes/Plugins/Auth/AuthenticationCookieTest.php
@@ -105,12 +105,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
         $mockHeader = $this->getMockBuilder(Header::class)
             ->disableOriginalConstructor()
             ->onlyMethods(
-                [
-                    'setBodyId',
-                    'setTitle',
-                    'disableMenuAndConsole',
-                    'disableWarnings',
-                ],
+                ['setBodyId', 'setTitle', 'disableMenuAndConsole', 'disableWarnings'],
             )
             ->getMock();
 
@@ -141,10 +136,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
             ->with()
             ->will($this->returnValue($mockHeader));
 
-        $GLOBALS['cfg']['Servers'] = [
-            1,
-            2,
-        ];
+        $GLOBALS['cfg']['Servers'] = [1, 2];
 
         // mock error handler
 
@@ -394,11 +386,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
     {
         $GLOBALS['config']->set('is_https', false);
         $GLOBALS['cfg']['LoginCookieDeleteAll'] = false;
-        $GLOBALS['cfg']['Servers'] = [
-            1,
-            2,
-            3,
-        ];
+        $GLOBALS['cfg']['Servers'] = [1, 2, 3];
         $GLOBALS['cfg']['Server']['LogoutURL'] = 'https://example.com/logout';
         $GLOBALS['cfg']['Server']['auth_type'] = 'cookie';
 
@@ -642,13 +630,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
     public function testAuthSetUser(): void
     {
         $this->object->user = 'pmaUser2';
-        $arr = [
-            'host' => 'a',
-            'port' => 1,
-            'socket' => true,
-            'ssl' => true,
-            'user' => 'pmaUser2',
-        ];
+        $arr = ['host' => 'a', 'port' => 1, 'socket' => true, 'ssl' => true, 'user' => 'pmaUser2'];
 
         $GLOBALS['cfg']['Server'] = $arr;
         $GLOBALS['cfg']['Server']['user'] = 'pmaUser';
@@ -678,13 +660,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
     public function testAuthSetUserWithHeaders(): void
     {
         $this->object->user = 'pmaUser2';
-        $arr = [
-            'host' => 'a',
-            'port' => 1,
-            'socket' => true,
-            'ssl' => true,
-            'user' => 'pmaUser2',
-        ];
+        $arr = ['host' => 'a', 'port' => 1, 'socket' => true, 'ssl' => true, 'user' => 'pmaUser2'];
 
         $GLOBALS['cfg']['Server'] = $arr;
         $GLOBALS['cfg']['Server']['host'] = 'b';
@@ -742,16 +718,8 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
                 'Your password is too long. To prevent denial-of-service attacks,'
                 . ' phpMyAdmin restricts passwords to less than 2000 characters.',
             ],
-            [
-                str_repeat('a', 256),
-                true,
-                null,
-            ],
-            [
-                '',
-                true,
-                null,
-            ],
+            [str_repeat('a', 256), true, null],
+            ['', true, null],
         ];
     }
 
@@ -1040,55 +1008,17 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
     public static function checkRulesProvider(): array
     {
         return [
-            'nopass-ok' => [
-                'testUser',
-                '',
-                '1.2.3.4',
-                true,
-                true,
-                [],
-                '',
-            ],
-            'nopass' => [
-                'testUser',
-                '',
-                '1.2.3.4',
-                true,
-                false,
-                [],
-                'Login without a password is forbidden',
-            ],
-            'root-ok' => [
-                'root',
-                'root',
-                '1.2.3.4',
-                true,
-                true,
-                [],
-                '',
-            ],
-            'root' => [
-                'root',
-                'root',
-                '1.2.3.4',
-                false,
-                true,
-                [],
-                'Access denied!',
-            ],
+            'nopass-ok' => ['testUser', '', '1.2.3.4', true, true, [], ''],
+            'nopass' => ['testUser', '', '1.2.3.4', true, false, [], 'Login without a password is forbidden'],
+            'root-ok' => ['root', 'root', '1.2.3.4', true, true, [], ''],
+            'root' => ['root', 'root', '1.2.3.4', false, true, [], 'Access denied!'],
             'rules-deny-allow-ok' => [
                 'root',
                 'root',
                 '1.2.3.4',
                 true,
                 true,
-                [
-                    'order' => 'deny,allow',
-                    'rules' => [
-                        'allow root 1.2.3.4',
-                        'deny % from all',
-                    ],
-                ],
+                ['order' => 'deny,allow', 'rules' => ['allow root 1.2.3.4', 'deny % from all']],
                 '',
             ],
             'rules-deny-allow-reject' => [
@@ -1097,13 +1027,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
                 '1.2.3.4',
                 true,
                 true,
-                [
-                    'order' => 'deny,allow',
-                    'rules' => [
-                        'allow root 1.2.3.4',
-                        'deny % from all',
-                    ],
-                ],
+                ['order' => 'deny,allow', 'rules' => ['allow root 1.2.3.4', 'deny % from all']],
                 'Access denied!',
             ],
             'rules-allow-deny-ok' => [
@@ -1112,13 +1036,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
                 '1.2.3.4',
                 true,
                 true,
-                [
-                    'order' => 'allow,deny',
-                    'rules' => [
-                        'deny user from all',
-                        'allow root 1.2.3.4',
-                    ],
-                ],
+                ['order' => 'allow,deny', 'rules' => ['deny user from all', 'allow root 1.2.3.4']],
                 '',
             ],
             'rules-allow-deny-reject' => [
@@ -1127,13 +1045,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
                 '1.2.3.4',
                 true,
                 true,
-                [
-                    'order' => 'allow,deny',
-                    'rules' => [
-                        'deny user from all',
-                        'allow root 1.2.3.4',
-                    ],
-                ],
+                ['order' => 'allow,deny', 'rules' => ['deny user from all', 'allow root 1.2.3.4']],
                 'Access denied!',
             ],
             'rules-explicit-ok' => [
@@ -1142,13 +1054,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
                 '1.2.3.4',
                 true,
                 true,
-                [
-                    'order' => 'explicit',
-                    'rules' => [
-                        'deny user from all',
-                        'allow root 1.2.3.4',
-                    ],
-                ],
+                ['order' => 'explicit', 'rules' => ['deny user from all', 'allow root 1.2.3.4']],
                 '',
             ],
             'rules-explicit-reject' => [
@@ -1157,13 +1063,7 @@ class AuthenticationCookieTest extends AbstractNetworkTestCase
                 '1.2.3.4',
                 true,
                 true,
-                [
-                    'order' => 'explicit',
-                    'rules' => [
-                        'deny user from all',
-                        'allow root 1.2.3.4',
-                    ],
-                ],
+                ['order' => 'explicit', 'rules' => ['deny user from all', 'allow root 1.2.3.4']],
                 'Access denied!',
             ],
         ];
diff --git a/test/classes/Plugins/Auth/AuthenticationHttpTest.php b/test/classes/Plugins/Auth/AuthenticationHttpTest.php
index ceb9af874c..a8fbf9b8e1 100644
--- a/test/classes/Plugins/Auth/AuthenticationHttpTest.php
+++ b/test/classes/Plugins/Auth/AuthenticationHttpTest.php
@@ -57,11 +57,7 @@ class AuthenticationHttpTest extends AbstractNetworkTestCase
         $mockHeader = $this->getMockBuilder(Header::class)
             ->disableOriginalConstructor()
             ->onlyMethods(
-                [
-                    'setBodyId',
-                    'setTitle',
-                    'disableMenuAndConsole',
-                ],
+                ['setBodyId', 'setTitle', 'disableMenuAndConsole'],
             )
             ->getMock();
 
@@ -204,16 +200,7 @@ class AuthenticationHttpTest extends AbstractNetworkTestCase
     public static function readCredentialsProvider(): array
     {
         return [
-            [
-                'Basic ' . base64_encode('foo:bar'),
-                'pswd',
-                'PHP_AUTH_USER',
-                'PHP_AUTH_PW',
-                false,
-                '',
-                'bar',
-                'foo',
-            ],
+            ['Basic ' . base64_encode('foo:bar'), 'pswd', 'PHP_AUTH_USER', 'PHP_AUTH_PW', false, '', 'bar', 'foo'],
             [
                 'Basic ' . base64_encode('foobar'),
                 'pswd',
@@ -223,15 +210,7 @@ class AuthenticationHttpTest extends AbstractNetworkTestCase
                 'Basic Zm9vYmFy',
                 'pswd',
             ],
-            [
-                'Basic ' . base64_encode('foobar:'),
-                'pswd',
-                'AUTH_USER',
-                'AUTH_PASSWORD',
-                true,
-                'foobar',
-                false,
-            ],
+            ['Basic ' . base64_encode('foobar:'), 'pswd', 'AUTH_USER', 'AUTH_PASSWORD', true, 'foobar', false],
             [
                 'Basic ' . base64_encode(':foobar'),
                 'pswd',
@@ -241,15 +220,7 @@ class AuthenticationHttpTest extends AbstractNetworkTestCase
                 'Basic OmZvb2Jhcg==',
                 'pswd',
             ],
-            [
-                'BasicTest',
-                'pswd',
-                'Authorization',
-                'AUTH_PASSWORD',
-                true,
-                'BasicTest',
-                'pswd',
-            ],
+            ['BasicTest', 'pswd', 'Authorization', 'AUTH_PASSWORD', true, 'BasicTest', 'pswd'],
         ];
     }
 
@@ -277,27 +248,16 @@ class AuthenticationHttpTest extends AbstractNetworkTestCase
         // case 2
         $this->object->user = 'testUser';
         $this->object->password = 'testPass';
-        $GLOBALS['cfg']['Servers'][1] = [
-            'host' => 'a',
-            'user' => 'testUser',
-            'foo' => 'bar',
-        ];
+        $GLOBALS['cfg']['Servers'][1] = ['host' => 'a', 'user' => 'testUser', 'foo' => 'bar'];
 
-        $GLOBALS['cfg']['Server'] = [
-            'host' => 'a',
-            'user' => 'user2',
-        ];
+        $GLOBALS['cfg']['Server'] = ['host' => 'a', 'user' => 'user2'];
 
         $this->assertTrue(
             $this->object->storeCredentials(),
         );
 
         $this->assertEquals(
-            [
-                'user' => 'testUser',
-                'password' => 'testPass',
-                'host' => 'a',
-            ],
+            ['user' => 'testUser', 'password' => 'testPass', 'host' => 'a'],
             $GLOBALS['cfg']['Server'],
         );
 
@@ -307,27 +267,16 @@ class AuthenticationHttpTest extends AbstractNetworkTestCase
         $GLOBALS['server'] = 3;
         $this->object->user = 'testUser';
         $this->object->password = 'testPass';
-        $GLOBALS['cfg']['Servers'][1] = [
-            'host' => 'a',
-            'user' => 'testUsers',
-            'foo' => 'bar',
-        ];
+        $GLOBALS['cfg']['Servers'][1] = ['host' => 'a', 'user' => 'testUsers', 'foo' => 'bar'];
 
-        $GLOBALS['cfg']['Server'] = [
-            'host' => 'a',
-            'user' => 'user2',
-        ];
+        $GLOBALS['cfg']['Server'] = ['host' => 'a', 'user' => 'user2'];
 
         $this->assertTrue(
             $this->object->storeCredentials(),
         );
 
         $this->assertEquals(
-            [
-                'user' => 'testUser',
-                'password' => 'testPass',
-                'host' => 'a',
-            ],
+            ['user' => 'testUser', 'password' => 'testPass', 'host' => 'a'],
             $GLOBALS['cfg']['Server'],
         );
 
diff --git a/test/classes/Plugins/Export/ExportCodegenTest.php b/test/classes/Plugins/Export/ExportCodegenTest.php
index 2ed88c5bce..9575c869a6 100644
--- a/test/classes/Plugins/Export/ExportCodegenTest.php
+++ b/test/classes/Plugins/Export/ExportCodegenTest.php
@@ -63,10 +63,7 @@ class ExportCodegenTest extends AbstractTestCase
         $attrCgFormats = new ReflectionProperty(ExportCodegen::class, 'cgFormats');
 
         $this->assertEquals(
-            [
-                'NHibernate C# DO',
-                'NHibernate XML',
-            ],
+            ['NHibernate C# DO', 'NHibernate XML'],
             $attrCgFormats->getValue($this->object),
         );
     }
@@ -147,10 +144,7 @@ class ExportCodegenTest extends AbstractTestCase
         );
 
         $this->assertEquals(
-            [
-                'NHibernate C# DO',
-                'NHibernate XML',
-            ],
+            ['NHibernate C# DO', 'NHibernate XML'],
             $select->getValues(),
         );
     }
@@ -333,10 +327,7 @@ class ExportCodegenTest extends AbstractTestCase
         $setter->invoke($this->object, [1, 2]);
 
         $this->assertEquals(
-            [
-                1,
-                2,
-            ],
+            [1, 2],
             $getter->invoke($this->object),
         );
     }
diff --git a/test/classes/Plugins/Export/ExportHtmlwordTest.php b/test/classes/Plugins/Export/ExportHtmlwordTest.php
index d3b115ee50..46b59a7abf 100644
--- a/test/classes/Plugins/Export/ExportHtmlwordTest.php
+++ b/test/classes/Plugins/Export/ExportHtmlwordTest.php
@@ -147,11 +147,7 @@ class ExportHtmlwordTest extends AbstractTestCase
         );
 
         $this->assertEquals(
-            [
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data'),
-            ],
+            ['structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data')],
             $property->getValues(),
         );
 
@@ -333,16 +329,7 @@ class ExportHtmlwordTest extends AbstractTestCase
 
         // case 1
 
-        $keys = [
-            [
-                'Non_unique' => 0,
-                'Column_name' => 'name1',
-            ],
-            [
-                'Non_unique' => 1,
-                'Column_name' => 'name2',
-            ],
-        ];
+        $keys = [['Non_unique' => 0, 'Column_name' => 'name1'], ['Non_unique' => 1, 'Column_name' => 'name2']];
 
         $dbi = $this->getMockBuilder(DatabaseInterface::class)
             ->disableOriginalConstructor()
@@ -383,16 +370,7 @@ class ExportHtmlwordTest extends AbstractTestCase
             ->setConstructorArgs([new Relation($GLOBALS['dbi']), new Export($GLOBALS['dbi']), new Transformations()])
             ->getMock();
 
-        $keys = [
-            [
-                'Non_unique' => 0,
-                'Column_name' => 'name1',
-            ],
-            [
-                'Non_unique' => 1,
-                'Column_name' => 'name2',
-            ],
-        ];
+        $keys = [['Non_unique' => 0, 'Column_name' => 'name1'], ['Non_unique' => 1, 'Column_name' => 'name2']];
 
         // case 1
 
@@ -406,13 +384,7 @@ class ExportHtmlwordTest extends AbstractTestCase
             ->method('fetchResult')
             ->willReturnOnConsecutiveCalls(
                 [],
-                [
-                    'fieldname' => [
-                        'values' => 'test-',
-                        'transformation' => 'testfoo',
-                        'mimetype' => 'test<',
-                    ],
-                ],
+                ['fieldname' => ['values' => 'test-', 'transformation' => 'testfoo', 'mimetype' => 'test<']],
             );
 
         $dbi->expects($this->once())
@@ -484,19 +456,8 @@ class ExportHtmlwordTest extends AbstractTestCase
         $dbi->expects($this->exactly(2))
             ->method('fetchResult')
             ->willReturnOnConsecutiveCalls(
-                [
-                    'fieldname' => [
-                        'foreign_table' => 'ftable',
-                        'foreign_field' => 'ffield',
-                    ],
-                ],
-                [
-                    'field' => [
-                        'values' => 'test-',
-                        'transformation' => 'testfoo',
-                        'mimetype' => 'test<',
-                    ],
-                ],
+                ['fieldname' => ['foreign_table' => 'ftable', 'foreign_field' => 'ffield']],
+                ['field' => ['values' => 'test-', 'transformation' => 'testfoo', 'mimetype' => 'test<']],
             );
 
         $dbi->expects($this->once())
@@ -741,12 +702,7 @@ class ExportHtmlwordTest extends AbstractTestCase
     {
         $method = new ReflectionMethod(ExportHtmlword::class, 'formatOneColumnDefinition');
 
-        $cols = [
-            'Null' => 'Yes',
-            'Field' => 'field',
-            'Key' => 'PRI',
-            'Type' => 'set(abc)enum123',
-        ];
+        $cols = ['Null' => 'Yes', 'Field' => 'field', 'Key' => 'PRI', 'Type' => 'set(abc)enum123'];
 
         $uniqueKeys = ['field'];
 
@@ -757,13 +713,7 @@ class ExportHtmlwordTest extends AbstractTestCase
             $method->invoke($this->object, $cols, $uniqueKeys),
         );
 
-        $cols = [
-            'Null' => 'NO',
-            'Field' => 'fields',
-            'Key' => 'COMP',
-            'Type' => '',
-            'Default' => 'def',
-        ];
+        $cols = ['Null' => 'NO', 'Field' => 'fields', 'Key' => 'COMP', 'Type' => '', 'Default' => 'def'];
 
         $uniqueKeys = ['field'];
 
diff --git a/test/classes/Plugins/Export/ExportLatexTest.php b/test/classes/Plugins/Export/ExportLatexTest.php
index 41c1b2ce11..aa578afa67 100644
--- a/test/classes/Plugins/Export/ExportLatexTest.php
+++ b/test/classes/Plugins/Export/ExportLatexTest.php
@@ -171,11 +171,7 @@ class ExportLatexTest extends AbstractTestCase
         );
 
         $this->assertEquals(
-            [
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data'),
-            ],
+            ['structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data')],
             $property->getValues(),
         );
 
@@ -543,16 +539,7 @@ class ExportLatexTest extends AbstractTestCase
 
     public function testExportStructure(): void
     {
-        $keys = [
-            [
-                'Non_unique' => 0,
-                'Column_name' => 'name1',
-            ],
-            [
-                'Non_unique' => 1,
-                'Column_name' => 'name2',
-            ],
-        ];
+        $keys = [['Non_unique' => 0, 'Column_name' => 'name1'], ['Non_unique' => 1, 'Column_name' => 'name2']];
 
         // case 1
 
@@ -571,29 +558,12 @@ class ExportLatexTest extends AbstractTestCase
             ->method('fetchResult')
             ->willReturnOnConsecutiveCalls(
                 [],
-                [
-                    'name1' => [
-                        'values' => 'test-',
-                        'transformation' => 'testfoo',
-                        'mimetype' => 'testmimetype_',
-                    ],
-                ],
+                ['name1' => ['values' => 'test-', 'transformation' => 'testfoo', 'mimetype' => 'testmimetype_']],
             );
 
         $columns = [
-            [
-                'Null' => 'Yes',
-                'Field' => 'name1',
-                'Key' => 'PRI',
-                'Type' => 'set(abc)enum123',
-            ],
-            [
-                'Null' => 'NO',
-                'Field' => 'fields',
-                'Key' => 'COMP',
-                'Type' => '',
-                'Default' => 'def',
-            ],
+            ['Null' => 'Yes', 'Field' => 'name1', 'Key' => 'PRI', 'Type' => 'set(abc)enum123'],
+            ['Null' => 'NO', 'Field' => 'fields', 'Key' => 'COMP', 'Type' => '', 'Default' => 'def'],
         ];
         $dbi->expects($this->once())
             ->method('getColumns')
@@ -678,20 +648,8 @@ class ExportLatexTest extends AbstractTestCase
         $dbi->expects($this->exactly(2))
             ->method('fetchResult')
             ->willReturnOnConsecutiveCalls(
-                [
-                    'name1' => [
-                        'foreign_table' => 'ftable',
-                        'foreign_field' => 'ffield',
-                    ],
-                    'foreign_keys_data' => [],
-                ],
-                [
-                    'field' => [
-                        'values' => 'test-',
-                        'transformation' => 'testfoo',
-                        'mimetype' => 'test<',
-                    ],
-                ],
+                ['name1' => ['foreign_table' => 'ftable', 'foreign_field' => 'ffield'], 'foreign_keys_data' => []],
+                ['field' => ['values' => 'test-', 'transformation' => 'testfoo', 'mimetype' => 'test<']],
             );
 
         $dbi->expects($this->once())
diff --git a/test/classes/Plugins/Export/ExportMediawikiTest.php b/test/classes/Plugins/Export/ExportMediawikiTest.php
index 10d1e03687..cd66f42d8b 100644
--- a/test/classes/Plugins/Export/ExportMediawikiTest.php
+++ b/test/classes/Plugins/Export/ExportMediawikiTest.php
@@ -147,11 +147,7 @@ class ExportMediawikiTest extends AbstractTestCase
         );
 
         $this->assertEquals(
-            [
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data'),
-            ],
+            ['structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data')],
             $sgHeader->getValues(),
         );
 
@@ -238,14 +234,7 @@ class ExportMediawikiTest extends AbstractTestCase
                 'Default' => '',
                 'Extra' => '',
             ],
-            [
-                'Null' => 'NO',
-                'Field' => 'fields',
-                'Key' => 'COMP',
-                'Type' => '',
-                'Default' => 'def',
-                'Extra' => 'ext',
-            ],
+            ['Null' => 'NO', 'Field' => 'fields', 'Key' => 'COMP', 'Type' => '', 'Default' => 'def', 'Extra' => 'ext'],
         ];
 
         $dbi->expects($this->once())
diff --git a/test/classes/Plugins/Export/ExportOdsTest.php b/test/classes/Plugins/Export/ExportOdsTest.php
index 6e99729e18..ce800434d2 100644
--- a/test/classes/Plugins/Export/ExportOdsTest.php
+++ b/test/classes/Plugins/Export/ExportOdsTest.php
@@ -254,16 +254,7 @@ class ExportOdsTest extends AbstractTestCase
         $resultStub->expects($this->exactly(2))
             ->method('fetchRow')
             ->willReturnOnConsecutiveCalls(
-                [
-                    null,
-                    '01-01-2000',
-                    '01-01-2000',
-                    '01-01-2000 10:00:00',
-                    '01-01-2014 10:02:00',
-                    't>s',
-                    'a&b',
-                    '<',
-                ],
+                [null, '01-01-2000', '01-01-2000', '01-01-2000 10:00:00', '01-01-2014 10:02:00', 't>s', 'a&b', '<'],
                 [],
             );
 
diff --git a/test/classes/Plugins/Export/ExportOdtTest.php b/test/classes/Plugins/Export/ExportOdtTest.php
index c18d869a09..b808176aab 100644
--- a/test/classes/Plugins/Export/ExportOdtTest.php
+++ b/test/classes/Plugins/Export/ExportOdtTest.php
@@ -164,11 +164,7 @@ class ExportOdtTest extends AbstractTestCase
         );
 
         $this->assertEquals(
-            [
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data'),
-            ],
+            ['structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data')],
             $property->getValues(),
         );
 
@@ -387,12 +383,7 @@ class ExportOdtTest extends AbstractTestCase
         $resultStub->expects($this->exactly(2))
             ->method('fetchRow')
             ->willReturnOnConsecutiveCalls(
-                [
-                    null,
-                    'a<b',
-                    'a>b',
-                    'a&b',
-                ],
+                [null, 'a<b', 'a>b', 'a&b'],
                 [],
             );
 
@@ -595,13 +586,7 @@ class ExportOdtTest extends AbstractTestCase
             ->method('fetchResult')
             ->willReturnOnConsecutiveCalls(
                 [],
-                [
-                    'fieldname' => [
-                        'values' => 'test-',
-                        'transformation' => 'testfoo',
-                        'mimetype' => 'test<',
-                    ],
-                ],
+                ['fieldname' => ['values' => 'test-', 'transformation' => 'testfoo', 'mimetype' => 'test<']],
             );
 
         $columns = ['Field' => 'fieldname'];
@@ -685,19 +670,8 @@ class ExportOdtTest extends AbstractTestCase
         $dbi->expects($this->exactly(2))
             ->method('fetchResult')
             ->willReturnOnConsecutiveCalls(
-                [
-                    'fieldname' => [
-                        'foreign_table' => 'ftable',
-                        'foreign_field' => 'ffield',
-                    ],
-                ],
-                [
-                    'field' => [
-                        'values' => 'test-',
-                        'transformation' => 'testfoo',
-                        'mimetype' => 'test<',
-                    ],
-                ],
+                ['fieldname' => ['foreign_table' => 'ftable', 'foreign_field' => 'ffield']],
+                ['field' => ['values' => 'test-', 'transformation' => 'testfoo', 'mimetype' => 'test<']],
             );
 
         $columns = ['Field' => 'fieldname'];
@@ -949,12 +923,7 @@ class ExportOdtTest extends AbstractTestCase
     {
         $method = new ReflectionMethod(ExportOdt::class, 'formatOneColumnDefinition');
 
-        $cols = [
-            'Null' => 'Yes',
-            'Field' => 'field',
-            'Key' => 'PRI',
-            'Type' => 'set(abc)enum123',
-        ];
+        $cols = ['Null' => 'Yes', 'Field' => 'field', 'Key' => 'PRI', 'Type' => 'set(abc)enum123'];
 
         $colAlias = 'alias';
 
@@ -968,13 +937,7 @@ class ExportOdtTest extends AbstractTestCase
             $method->invoke($this->object, $cols, $colAlias),
         );
 
-        $cols = [
-            'Null' => 'NO',
-            'Field' => 'fields',
-            'Key' => 'COMP',
-            'Type' => '',
-            'Default' => 'def',
-        ];
+        $cols = ['Null' => 'NO', 'Field' => 'fields', 'Key' => 'COMP', 'Type' => '', 'Default' => 'def'];
 
         $this->assertEquals(
             '<table:table-row><table:table-cell office:value-type="string">' .
diff --git a/test/classes/Plugins/Export/ExportPdfTest.php b/test/classes/Plugins/Export/ExportPdfTest.php
index 26e669e433..13bcc4502f 100644
--- a/test/classes/Plugins/Export/ExportPdfTest.php
+++ b/test/classes/Plugins/Export/ExportPdfTest.php
@@ -151,11 +151,7 @@ class ExportPdfTest extends AbstractTestCase
         );
 
         $this->assertEquals(
-            [
-                'structure' => __('structure'),
-                'data' => __('data'),
-                'structure_and_data' => __('structure and data'),
-            ],
+            ['structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data')],
             $property->getValues(),
         );
     }
diff --git a/test/classes/Plugins/Export/ExportSqlTest.php b/test/classes/Plugins/Export/ExportSqlTest.php
index fe666c5cdc..f435846507 100644
--- a/test/classes/Plugins/Export/ExportSqlTest.php
+++ b/test/classes/Plugins/Export/ExportSqlTest.php
@@ -201,10 +201,7 @@ class ExportSqlTest extends AbstractTestCase
         $this->assertInstanceOf(SelectPropertyItem::class, $property);
 
         $this->assertEquals(
-            [
-                'v1' => 'v1',
-                'v2' => 'v2',
-            ],
+            ['v1' => 'v1', 'v2' => 'v2'],
             $property->getValues(),
         );
 
@@ -901,19 +898,8 @@ SQL;
         $dbi->expects($this->exactly(2))
             ->method('fetchResult')
             ->willReturnOnConsecutiveCalls(
-                [
-                    'foo' => [
-                        'foreign_table' => 'ftable',
-                        'foreign_field' => 'ffield',
-                    ],
-                ],
-                [
-                    'fieldname' => [
-                        'values' => 'test-',
-                        'transformation' => 'testfoo',
-                        'mimetype' => 'test<',
-                    ],
-                ],
+                ['foo' => ['foreign_table' => 'ftable', 'foreign_field' => 'ffield']],
+                ['fieldname' => ['values' => 'test-', 'transformation' => 'testfoo', 'mimetype' => 'test<']],
             );
 
         $GLOBALS['dbi'] = $dbi;
@@ -1108,13 +1094,7 @@ SQL;
         $resultStub->expects($this->exactly(2))
             ->method('fetchRow')
             ->willReturnOnConsecutiveCalls(
-                [
-                    null,
-                    'test',
-                    '10',
-                    '6',
-                    "\x00\x0a\x0d\x1a",
-                ],
+                [null, 'test', '10', '6', "\x00\x0a\x0d\x1a"],
                 [],
             );
         $dbi->expects($this->any())->method('quoteString')
@@ -1215,10 +1195,7 @@ SQL;
         $resultStub->expects($this->exactly(2))
             ->method('fetchRow')
             ->willReturnOnConsecutiveCalls(
-                [
-                    null,
-                    null,
-                ],
+                [null, null],
                 [],
             );
 
@@ -1404,10 +1381,7 @@ SQL;
         $aliases = [
             'a' => [
                 'alias' => 'aliastest',
-                'tables' => [
-                    'foo' => ['alias' => 'qwerty'],
-                    'bar' => ['alias' => 'f'],
-                ],
+                'tables' => ['foo' => ['alias' => 'qwerty'], 'bar' => ['alias' => 'f']],
             ],
         ];
         $db = 'a';
@@ -1438,17 +1412,8 @@ SQL;
             'a' => [
                 'alias' => 'aliastest',
                 'tables' => [
-                    'foo' => [
-                        'alias' => 'qwerty',
-                        'columns' => [
-                            'baz' => 'p',
-                            'pqr' => 'pphymdain',
-                        ],
-                    ],
-                    'bar' => [
-                        'alias' => 'f',
-                        'columns' => ['xy' => 'n'],
-                    ],
+                    'foo' => ['alias' => 'qwerty', 'columns' => ['baz' => 'p', 'pqr' => 'pphymdain']],
+                    'bar' => ['alias' => 'f', 'columns' => ['xy' => 'n']],
                 ],
             ],
         ];
@@ -1480,17 +1445,8 @@ SQL;
             'a' => [
                 'alias' => 'aliastest',
                 'tables' => [
-                    'foo' => [
-                        'alias' => 'bartest',
-                        'columns' => [
-                            'baz' => 'p',
-                            'pqr' => 'pphymdain',
-                        ],
-                    ],
-                    'bar' => [
-                        'alias' => 'f',
-                        'columns' => ['xy' => 'n'],
-                    ],
+                    'foo' => ['alias' => 'bartest', 'columns' => ['baz' => 'p', 'pqr' => 'pphymdain']],
+                    'bar' => ['alias' => 'f', 'columns' => ['xy' => 'n']],
                 ],
             ],
         ];
diff --git a/test/classes/Plugins/Export/ExportTexytextTest.php b/test/classes/Plugins/Export/ExportTexytextTest.php
index 92a2f0504b..0f4b84571f 100644
--- a/test/classes/Plugins/Export/ExportTexytextTest.php
+++ b/test/classes/Plugins/Export/ExportTexytextTest.php
@@ -260,16 +260,7 @@ class ExportTexytextTest extends AbstractTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $keys = [
-            [
-                'Non_unique' => 0,
-                'Column_name' => 'cname',
-            ],
-            [
-                'Non_unique' => 1,
-                'Column_name' => 'cname2',
-            ],
-        ];
+        $keys = [['Non_unique' => 0, 'Column_name' => 'cname'], ['Non_unique' => 1, 'Column_name' => 'cname2']];
 
         $dbi->expects($this->once())
             ->method('getTableIndexes')
@@ -279,19 +270,8 @@ class ExportTexytextTest extends AbstractTestCase
         $dbi->expects($this->exactly(2))
             ->method('fetchResult')
             ->willReturnOnConsecutiveCalls(
-                [
-                    'fname' => [
-                        'foreign_table' => '<ftable',
-                        'foreign_field' => 'ffield>',
-                    ],
-                ],
-                [
-                    'fname' => [
-                        'values' => 'test-',
-                        'transformation' => 'testfoo',
-                        'mimetype' => 'test<',
-                    ],
-                ],
+                ['fname' => ['foreign_table' => '<ftable', 'foreign_field' => 'ffield>']],
+                ['fname' => ['values' => 'test-', 'transformation' => 'testfoo', 'mimetype' => 'test<']],
             );
 
         $dbi->expects($this->once())
@@ -302,10 +282,7 @@ class ExportTexytextTest extends AbstractTestCase
                 ),
             );
 
-        $columns = [
-            'Field' => 'fname',
-            'Comment' => 'comm',
-        ];
+        $columns = ['Field' => 'fname', 'Comment' => 'comm'];
 
         $dbi->expects($this->exactly(2))
             ->method('getColumns')
@@ -475,12 +452,7 @@ class ExportTexytextTest extends AbstractTestCase
 
     public function testFormatOneColumnDefinition(): void
     {
-        $cols = [
-            'Null' => 'Yes',
-            'Field' => 'field',
-            'Key' => 'PRI',
-            'Type' => 'set(abc)enum123',
-        ];
+        $cols = ['Null' => 'Yes', 'Field' => 'field', 'Key' => 'PRI', 'Type' => 'set(abc)enum123'];
 
         $uniqueKeys = ['field'];
 
@@ -489,13 +461,7 @@ class ExportTexytextTest extends AbstractTestCase
             $this->object->formatOneColumnDefinition($cols, $uniqueKeys),
         );
 
-        $cols = [
-            'Null' => 'NO',
-            'Field' => 'fields',
-            'Key' => 'COMP',
-            'Type' => '',
-            'Default' => 'def',
-        ];
+        $cols = ['Null' => 'NO', 'Field' => 'fields', 'Key' => 'COMP', 'Type' => '', 'Default' => 'def'];
 
         $uniqueKeys = ['field'];
 
diff --git a/test/classes/Plugins/Export/ExportXmlTest.php b/test/classes/Plugins/Export/ExportXmlTest.php
index 6b57d6ea4f..016a00ee60 100644
--- a/test/classes/Plugins/Export/ExportXmlTest.php
+++ b/test/classes/Plugins/Export/ExportXmlTest.php
@@ -183,15 +183,8 @@ class ExportXmlTest extends AbstractTestCase
         $GLOBALS['db'] = 'd<"b';
 
         $result = [
-            0 => [
-                'DEFAULT_COLLATION_NAME' => 'utf8_general_ci',
-                'DEFAULT_CHARACTER_SET_NAME' => 'utf-8',
-
-            ],
-            'table' => [
-                null,
-                '"tbl"',
-            ],
+            0 => ['DEFAULT_COLLATION_NAME' => 'utf8_general_ci', 'DEFAULT_CHARACTER_SET_NAME' => 'utf-8'],
+            'table' => [null, '"tbl"'],
         ];
         $dbi = $this->getMockBuilder(DatabaseInterface::class)
             ->disableOriginalConstructor()
@@ -280,26 +273,10 @@ class ExportXmlTest extends AbstractTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $result1 = [
-            [
-                'DEFAULT_COLLATION_NAME' => 'utf8_general_ci',
-                'DEFAULT_CHARACTER_SET_NAME' => 'utf-8',
+        $result1 = [['DEFAULT_COLLATION_NAME' => 'utf8_general_ci', 'DEFAULT_CHARACTER_SET_NAME' => 'utf-8']];
+        $result2 = ['t1' => [null, '"tbl"']];
 
-            ],
-        ];
-        $result2 = [
-            't1' => [
-                null,
-                '"tbl"',
-            ],
-        ];
-
-        $result3 = [
-            't2' => [
-                null,
-                '"tbl"',
-            ],
-        ];
+        $result3 = ['t2' => [null, '"tbl"']];
 
         $dbi->expects($this->exactly(3))
             ->method('fetchResult')
@@ -315,10 +292,7 @@ class ExportXmlTest extends AbstractTestCase
 
         $GLOBALS['dbi'] = $dbi;
 
-        $GLOBALS['tables'] = [
-            't1',
-            't2',
-        ];
+        $GLOBALS['tables'] = ['t1', 't2'];
 
         ob_start();
         $this->assertTrue(
diff --git a/test/classes/Plugins/Export/Helpers/TablePropertyTest.php b/test/classes/Plugins/Export/Helpers/TablePropertyTest.php
index 1ed8aab840..99aa4fea8e 100644
--- a/test/classes/Plugins/Export/Helpers/TablePropertyTest.php
+++ b/test/classes/Plugins/Export/Helpers/TablePropertyTest.php
@@ -20,14 +20,7 @@ class TablePropertyTest extends AbstractTestCase
         parent::setUp();
 
         $GLOBALS['server'] = 0;
-        $row = [
-            ' name ',
-            'int ',
-            true,
-            ' PRI',
-            '0',
-            'mysql',
-        ];
+        $row = [' name ', 'int ', true, ' PRI', '0', 'mysql'];
         $this->object = new TableProperty($row);
     }
 
@@ -96,20 +89,7 @@ class TablePropertyTest extends AbstractTestCase
      */
     public static function isNotNullProvider(): array
     {
-        return [
-            [
-                'NO',
-                'true',
-            ],
-            [
-                '',
-                'false',
-            ],
-            [
-                'no',
-                'false',
-            ],
-        ];
+        return [['NO', 'true'], ['', 'false'], ['no', 'false']];
     }
 
     /**
@@ -135,28 +115,7 @@ class TablePropertyTest extends AbstractTestCase
      */
     public static function isUniqueProvider(): array
     {
-        return [
-            [
-                'PRI',
-                'true',
-            ],
-            [
-                'UNI',
-                'true',
-            ],
-            [
-                '',
-                'false',
-            ],
-            [
-                'pri',
-                'false',
-            ],
-            [
-                'uni',
-                'false',
-            ],
-        ];
+        return [['PRI', 'true'], ['UNI', 'true'], ['', 'false'], ['pri', 'false'], ['uni', 'false']];
     }
 
     /**
@@ -183,50 +142,17 @@ class TablePropertyTest extends AbstractTestCase
     public static function getDotNetPrimitiveTypeProvider(): array
     {
         return [
-            [
-                'int',
-                'int',
-            ],
-            [
-                'long',
-                'long',
-            ],
-            [
-                'char',
-                'string',
-            ],
-            [
-                'varchar',
-                'string',
-            ],
-            [
-                'text',
-                'string',
-            ],
-            [
-                'longtext',
-                'string',
-            ],
-            [
-                'tinyint',
-                'bool',
-            ],
-            [
-                'datetime',
-                'DateTime',
-            ],
-            [
-                '',
-                'unknown',
-            ],
-            [
-                'dummy',
-                'unknown',
-            ],
-            [
-                'INT',
-                'unknown',
-            ],
+            ['int', 'int'],
+            ['long', 'long'],
+            ['char', 'string'],
+            ['varchar', 'string'],
+            ['text', 'string'],
+            ['longtext', 'string'],
+            ['tinyint', 'bool'],
+            ['datetime', 'DateTime'],
+            ['', 'unknown'],
+            ['dummy', 'unknown'],
+            ['INT', 'unknown'],
         ];
     }
 
@@ -254,50 +180,17 @@ class TablePropertyTest extends AbstractTestCase
     public static function getDotNetObjectTypeProvider(): array
     {
         return [
-            [
-                'int',
-                'Int32',
-            ],
-            [
-                'long',
-                'Long',
-            ],
-            [
-                'char',
-                'String',
-            ],
-            [
-                'varchar',
-                'String',
-            ],
-            [
-                'text',
-                'String',
-            ],
-            [
-                'longtext',
-                'String',
-            ],
-            [
-                'tinyint',
-                'Boolean',
-            ],
-            [
-                'datetime',
-                'DateTime',
-            ],
-            [
-                '',
-                'Unknown',
-            ],
-            [
-                'dummy',
-                'Unknown',
-            ],
-            [
-                'INT',
-                'Unknown',
-            ],
+            ['int', 'Int32'],
+            ['long', 'Long'],
+            ['char', 'String'],
+            ['varchar', 'String'],
+            ['text', 'String'],
+            ['longtext', 'String'],
+            ['tinyint', 'Boolean'],
+            ['datetime', 'DateTime'],
+            ['', 'Unknown'],
+            ['dummy', 'Unknown'],
+            ['INT', 'Unknown'],
         ];
     }
 
diff --git a/test/classes/Plugins/Import/ImportOdsTest.php b/test/classes/Plugins/Import/ImportOdsTest.php
index 881b6cc136..e30bd6f423 100644
--- a/test/classes/Plugins/Import/ImportOdsTest.php
+++ b/test/classes/Plugins/Import/ImportOdsTest.php
@@ -151,10 +151,7 @@ class ImportOdsTest extends AbstractTestCase
 
     public static function dataProviderOdsEmptyRows(): array
     {
-        return [
-            'remove empty columns' => [true],
-            'keep empty columns' => [false],
-        ];
+        return ['remove empty columns' => [true], 'keep empty columns' => [false]];
     }
 
     /**
diff --git a/test/classes/Plugins/Transformations/TransformationPluginsTest.php b/test/classes/Plugins/Transformations/TransformationPluginsTest.php
index f0864b7be4..d1403390bc 100644
--- a/test/classes/Plugins/Transformations/TransformationPluginsTest.php
+++ b/test/classes/Plugins/Transformations/TransformationPluginsTest.php
@@ -53,10 +53,7 @@ class TransformationPluginsTest extends AbstractTestCase
         // For Application Octetstream Download plugin
 
         $GLOBALS['fields_meta'] = [];
-        $GLOBALS['row'] = [
-            'pma' => 'aaa',
-            'pca' => 'bbb',
-        ];
+        $GLOBALS['row'] = ['pma' => 'aaa', 'pca' => 'bbb'];
 
         // For Image_*_Inline plugin
         parent::setGlobalConfig();
@@ -76,11 +73,7 @@ class TransformationPluginsTest extends AbstractTestCase
 
         return [
             // Test data for PhpMyAdmin\Plugins\Transformations\Input\Image_JPEG_Upload plugin
-            [
-                new Image_JPEG_Upload(),
-                'getName',
-                'Image upload',
-            ],
+            [new Image_JPEG_Upload(), 'getName', 'Image upload'],
             [
                 new Image_JPEG_Upload(),
                 'getInfo',
@@ -88,38 +81,16 @@ class TransformationPluginsTest extends AbstractTestCase
                 . ' The options are the width and height of the thumbnail'
                 . ' in pixels. Defaults to 100 X 100.',
             ],
-            [
-                new Image_JPEG_Upload(),
-                'getMIMEType',
-                'Image',
-            ],
-            [
-                new Image_JPEG_Upload(),
-                'getMIMESubtype',
-                'JPEG',
-            ],
-            [
-                new Image_JPEG_Upload(),
-                'getScripts',
-                ['transformations/image_upload.js'],
-            ],
+            [new Image_JPEG_Upload(), 'getMIMEType', 'Image'],
+            [new Image_JPEG_Upload(), 'getMIMESubtype', 'JPEG'],
+            [new Image_JPEG_Upload(), 'getScripts', ['transformations/image_upload.js']],
             [
                 new Image_JPEG_Upload(),
                 'getInputHtml',
                 '<img src="" width="150" height="100" '
                 . 'alt="Image preview here"><br><input type="file" '
                 . 'name="fields_uploadtest" accept="image/*" class="image-upload">',
-                [
-                    [],
-                    0,
-                    'test',
-                    ['150'],
-                    '',
-                    'ltr',
-                    0,
-                    0,
-                    0,
-                ],
+                [[], 0, 'test', ['150'], '', 'ltr', 0, 0, 0],
             ],
             [
                 new Image_JPEG_Upload(),
@@ -135,10 +106,7 @@ class TransformationPluginsTest extends AbstractTestCase
                     [],
                     0,
                     '2ndtest',
-                    [
-                        'wrapper_link' => '?table=a',
-                        'wrapper_params' => ['key' => 'value'],
-                    ],
+                    ['wrapper_link' => '?table=a', 'wrapper_params' => ['key' => 'value']],
                     'something',
                     'ltr',
                     0,
@@ -147,46 +115,20 @@ class TransformationPluginsTest extends AbstractTestCase
                 ],
             ],
             // Test data for TextPlainFileupload plugin
-            [
-                new Text_Plain_FileUpload(),
-                'getName',
-                'Text file upload',
-            ],
+            [new Text_Plain_FileUpload(), 'getName', 'Text file upload'],
             [
                 new Text_Plain_FileUpload(),
                 'getInfo',
                 'File upload functionality for TEXT columns. It does not have a textarea for input.',
             ],
-            [
-                new Text_Plain_FileUpload(),
-                'getMIMEType',
-                'Text',
-            ],
-            [
-                new Text_Plain_FileUpload(),
-                'getMIMESubtype',
-                'Plain',
-            ],
-            [
-                new Text_Plain_FileUpload(),
-                'getScripts',
-                [],
-            ],
+            [new Text_Plain_FileUpload(), 'getMIMEType', 'Text'],
+            [new Text_Plain_FileUpload(), 'getMIMESubtype', 'Plain'],
+            [new Text_Plain_FileUpload(), 'getScripts', []],
             [
                 new Text_Plain_FileUpload(),
                 'getInputHtml',
                 '<input type="file" name="fields_uploadtest">',
-                [
-                    [],
-                    0,
-                    'test',
-                    [],
-                    '',
-                    'ltr',
-                    0,
-                    0,
-                    0,
-                ],
+                [[], 0, 'test', [], '', 'ltr', 0, 0, 0],
             ],
             [
                 new Text_Plain_FileUpload(),
@@ -195,24 +137,10 @@ class TransformationPluginsTest extends AbstractTestCase
                 . 'value="something"><input type="hidden" name="fields2ndtest" '
                 . 'value="something"><input type="file" '
                 . 'name="fields_upload2ndtest">',
-                [
-                    [],
-                    0,
-                    '2ndtest',
-                    [],
-                    'something',
-                    'ltr',
-                    0,
-                    0,
-                    0,
-                ],
+                [[], 0, '2ndtest', [], 'something', 'ltr', 0, 0, 0],
             ],
             // Test data for Text_Plain_Regexvalidation plugin
-            [
-                new Text_Plain_RegexValidation(),
-                'getName',
-                'Regex Validation',
-            ],
+            [new Text_Plain_RegexValidation(), 'getName', 'Regex Validation'],
             [
                 new Text_Plain_RegexValidation(),
                 'getInfo',
@@ -220,38 +148,11 @@ class TransformationPluginsTest extends AbstractTestCase
                 . 'and performs insert only if string matches it. '
                 . 'The first option is the Regular Expression.',
             ],
-            [
-                new Text_Plain_RegexValidation(),
-                'getMIMEType',
-                'Text',
-            ],
-            [
-                new Text_Plain_RegexValidation(),
-                'getMIMESubtype',
-                'Plain',
-            ],
-            [
-                new Text_Plain_RegexValidation(),
-                'getInputHtml',
-                '',
-                [
-                    [],
-                    0,
-                    '',
-                    [],
-                    '',
-                    'ltr',
-                    0,
-                    0,
-                    0,
-                ],
-            ],
+            [new Text_Plain_RegexValidation(), 'getMIMEType', 'Text'],
+            [new Text_Plain_RegexValidation(), 'getMIMESubtype', 'Plain'],
+            [new Text_Plain_RegexValidation(), 'getInputHtml', '', [[], 0, '', [], '', 'ltr', 0, 0, 0]],
             // Test data for PhpMyAdmin\Plugins\Transformations\Output\Application_Octetstream_Download plugin
-            [
-                new Application_Octetstream_Download(),
-                'getName',
-                'Download',
-            ],
+            [new Application_Octetstream_Download(), 'getName', 'Download'],
             [
                 new Application_Octetstream_Download(),
                 'getInfo',
@@ -261,22 +162,10 @@ class TransformationPluginsTest extends AbstractTestCase
                 . ' you use the second option, you need to set the first option to'
                 . ' the empty string.',
             ],
-            [
-                new Application_Octetstream_Download(),
-                'getMIMEType',
-                'Application',
-            ],
-            [
-                new Application_Octetstream_Download(),
-                'getMIMESubtype',
-                'OctetStream',
-            ],
+            [new Application_Octetstream_Download(), 'getMIMEType', 'Application'],
+            [new Application_Octetstream_Download(), 'getMIMESubtype', 'OctetStream'],
             // Test data for PhpMyAdmin\Plugins\Transformations\Output\Application_Octetstream_Hex plugin
-            [
-                new Application_Octetstream_Hex(),
-                'getName',
-                'Hex',
-            ],
+            [new Application_Octetstream_Hex(), 'getName', 'Hex'],
             [
                 new Application_Octetstream_Hex(),
                 'getInfo',
@@ -284,92 +173,36 @@ class TransformationPluginsTest extends AbstractTestCase
                 . ' parameter specifies how often space will be added (defaults'
                 . ' to 2 nibbles).',
             ],
-            [
-                new Application_Octetstream_Hex(),
-                'getMIMEType',
-                'Application',
-            ],
-            [
-                new Application_Octetstream_Hex(),
-                'getMIMESubtype',
-                'OctetStream',
-            ],
+            [new Application_Octetstream_Hex(), 'getMIMEType', 'Application'],
+            [new Application_Octetstream_Hex(), 'getMIMESubtype', 'OctetStream'],
             // Test data for PhpMyAdmin\Plugins\Transformations\Output\Image_JPEG_Inline plugin
-            [
-                new Image_JPEG_Inline(),
-                'getName',
-                'Inline',
-            ],
+            [new Image_JPEG_Inline(), 'getName', 'Inline'],
             [
                 new Image_JPEG_Inline(),
                 'getInfo',
                 'Displays a clickable thumbnail. The options are the maximum width'
                 . ' and height in pixels. The original aspect ratio is preserved.',
             ],
-            [
-                new Image_JPEG_Inline(),
-                'getMIMEType',
-                'Image',
-            ],
-            [
-                new Image_JPEG_Inline(),
-                'getMIMESubtype',
-                'JPEG',
-            ],
+            [new Image_JPEG_Inline(), 'getMIMEType', 'Image'],
+            [new Image_JPEG_Inline(), 'getMIMESubtype', 'JPEG'],
             // Test data for PhpMyAdmin\Plugins\Transformations\Output\Image_JPEG_Link plugin
-            [
-                new Image_JPEG_Link(),
-                'getName',
-                'ImageLink',
-            ],
-            [
-                new Image_JPEG_Link(),
-                'getInfo',
-                'Displays a link to download this image.',
-            ],
-            [
-                new Image_JPEG_Link(),
-                'getMIMEType',
-                'Image',
-            ],
-            [
-                new Image_JPEG_Link(),
-                'getMIMESubtype',
-                'JPEG',
-            ],
-            [
-                new Image_JPEG_Link(),
-                'applyTransformationNoWrap',
-                null,
-            ],
+            [new Image_JPEG_Link(), 'getName', 'ImageLink'],
+            [new Image_JPEG_Link(), 'getInfo', 'Displays a link to download this image.'],
+            [new Image_JPEG_Link(), 'getMIMEType', 'Image'],
+            [new Image_JPEG_Link(), 'getMIMESubtype', 'JPEG'],
+            [new Image_JPEG_Link(), 'applyTransformationNoWrap', null],
             // Test data for PhpMyAdmin\Plugins\Transformations\Output\Image_PNG_Inline plugin
-            [
-                new Image_PNG_Inline(),
-                'getName',
-                'Inline',
-            ],
+            [new Image_PNG_Inline(), 'getName', 'Inline'],
             [
                 new Image_PNG_Inline(),
                 'getInfo',
                 'Displays a clickable thumbnail. The options are the maximum width'
                 . ' and height in pixels. The original aspect ratio is preserved.',
             ],
-            [
-                new Image_PNG_Inline(),
-                'getMIMEType',
-                'Image',
-            ],
-            [
-                new Image_PNG_Inline(),
-                'getMIMESubtype',
-                'PNG',
-            ],
+            [new Image_PNG_Inline(), 'getMIMEType', 'Image'],
+            [new Image_PNG_Inline(), 'getMIMESubtype', 'PNG'],
             // Test data for PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Dateformat plugin
-            [
-                new Text_Plain_Dateformat(),
-                'getName',
-                'Date Format',
-            ],
+            [new Text_Plain_Dateformat(), 'getName', 'Date Format'],
             [
                 new Text_Plain_Dateformat(),
                 'getInfo',
@@ -383,22 +216,10 @@ class TransformationPluginsTest extends AbstractTestCase
                 . ' documentation for PHP\'s strftime() function and for "utc" it'
                 . ' is done using gmdate() function.',
             ],
-            [
-                new Text_Plain_Dateformat(),
-                'getMIMEType',
-                'Text',
-            ],
-            [
-                new Text_Plain_Dateformat(),
-                'getMIMESubtype',
-                'Plain',
-            ],
+            [new Text_Plain_Dateformat(), 'getMIMEType', 'Text'],
+            [new Text_Plain_Dateformat(), 'getMIMESubtype', 'Plain'],
             // Test data for PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_External plugin
-            [
-                new Text_Plain_External(),
-                'getName',
-                'External',
-            ],
+            [new Text_Plain_External(), 'getName', 'External'],
             [
                 new Text_Plain_External(),
                 'getInfo',
@@ -416,72 +237,34 @@ class TransformationPluginsTest extends AbstractTestCase
                 . ' will prevent wrapping and ensure that the output appears all on'
                 . ' one line (Default 1).',
             ],
+            [new Text_Plain_External(), 'getMIMEType', 'Text'],
+            [new Text_Plain_External(), 'getMIMESubtype', 'Plain'],
             [
                 new Text_Plain_External(),
-                'getMIMEType',
-                'Text',
-            ],
-            [
-                new Text_Plain_External(),
-                'getMIMESubtype',
-                'Plain',
+                'applyTransformationNoWrap',
+                true,
+                [['/dev/null -i -wrap -q', '/dev/null -i -wrap -q']],
             ],
             [
                 new Text_Plain_External(),
                 'applyTransformationNoWrap',
                 true,
-                [
-                    [
-                        '/dev/null -i -wrap -q',
-                        '/dev/null -i -wrap -q',
-                    ],
-                ],
+                [['/dev/null -i -wrap -q', '/dev/null -i -wrap -q', '/dev/null -i -wrap -q', 1]],
             ],
             [
                 new Text_Plain_External(),
                 'applyTransformationNoWrap',
                 true,
-                [
-                    [
-                        '/dev/null -i -wrap -q',
-                        '/dev/null -i -wrap -q',
-                        '/dev/null -i -wrap -q',
-                        1,
-                    ],
-                ],
-            ],
-            [
-                new Text_Plain_External(),
-                'applyTransformationNoWrap',
-                true,
-                [
-                    [
-                        '/dev/null -i -wrap -q',
-                        '/dev/null -i -wrap -q',
-                        '/dev/null -i -wrap -q',
-                        '1',
-                    ],
-                ],
+                [['/dev/null -i -wrap -q', '/dev/null -i -wrap -q', '/dev/null -i -wrap -q', '1']],
             ],
             [
                 new Text_Plain_External(),
                 'applyTransformationNoWrap',
                 false,
-                [
-                    [
-                        '/dev/null -i -wrap -q',
-                        '/dev/null -i -wrap -q',
-                        '/dev/null -i -wrap -q',
-                        2,
-                    ],
-                ],
+                [['/dev/null -i -wrap -q', '/dev/null -i -wrap -q', '/dev/null -i -wrap -q', 2]],
             ],
             // Test data for PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Formatted plugin
-            [
-                new Text_Plain_Formatted(),
-                'getName',
-                'Formatted',
-            ],
+            [new Text_Plain_Formatted(), 'getName', 'Formatted'],
             [
                 new Text_Plain_Formatted(),
                 'getInfo',
@@ -489,22 +272,10 @@ class TransformationPluginsTest extends AbstractTestCase
                 . ' through htmlspecialchars(). That is, the column is assumed'
                 . ' to contain valid HTML.',
             ],
-            [
-                new Text_Plain_Formatted(),
-                'getMIMEType',
-                'Text',
-            ],
-            [
-                new Text_Plain_Formatted(),
-                'getMIMESubtype',
-                'Plain',
-            ],
+            [new Text_Plain_Formatted(), 'getMIMEType', 'Text'],
+            [new Text_Plain_Formatted(), 'getMIMESubtype', 'Plain'],
             // Test data for PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Imagelink plugin
-            [
-                new Text_Plain_Imagelink(),
-                'getName',
-                'Image Link',
-            ],
+            [new Text_Plain_Imagelink(), 'getName', 'Image Link'],
             [
                 new Text_Plain_Imagelink(),
                 'getInfo',
@@ -514,43 +285,15 @@ class TransformationPluginsTest extends AbstractTestCase
                 . 'The second and third options'
                 . ' are the width and the height in pixels.',
             ],
-            [
-                new Text_Plain_Imagelink(),
-                'getMIMEType',
-                'Text',
-            ],
-            [
-                new Text_Plain_Imagelink(),
-                'getMIMESubtype',
-                'Plain',
-            ],
+            [new Text_Plain_Imagelink(), 'getMIMEType', 'Text'],
+            [new Text_Plain_Imagelink(), 'getMIMESubtype', 'Plain'],
             // Test data for PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Sql plugin
-            [
-                new Text_Plain_Sql(),
-                'getName',
-                'SQL',
-            ],
-            [
-                new Text_Plain_Sql(),
-                'getInfo',
-                'Formats text as SQL query with syntax highlighting.',
-            ],
-            [
-                new Text_Plain_Sql(),
-                'getMIMEType',
-                'Text',
-            ],
-            [
-                new Text_Plain_Sql(),
-                'getMIMESubtype',
-                'Plain',
-            ],
+            [new Text_Plain_Sql(), 'getName', 'SQL'],
+            [new Text_Plain_Sql(), 'getInfo', 'Formats text as SQL query with syntax highlighting.'],
+            [new Text_Plain_Sql(), 'getMIMEType', 'Text'],
+            [new Text_Plain_Sql(), 'getMIMESubtype', 'Plain'],
             // Test data for PhpMyAdmin\Plugins\Transformations\Text_Plain_Link plugin
-            [
-                new Text_Plain_Link(),
-                'getName',
-                'TextLink',
-            ],
+            [new Text_Plain_Link(), 'getName', 'TextLink'],
             [
                 new Text_Plain_Link(),
                 'getInfo',
@@ -558,44 +301,20 @@ class TransformationPluginsTest extends AbstractTestCase
                 . ' is a URL prefix like "https://www.example.com/".'
                 . ' The second option is a title for the link.',
             ],
-            [
-                new Text_Plain_Link(),
-                'getMIMEType',
-                'Text',
-            ],
-            [
-                new Text_Plain_Link(),
-                'getMIMESubtype',
-                'Plain',
-            ],
+            [new Text_Plain_Link(), 'getMIMEType', 'Text'],
+            [new Text_Plain_Link(), 'getMIMESubtype', 'Plain'],
             // Test data for PhpMyAdmin\Plugins\Transformations\Text_Plain_Longtoipv4 plugin
-            [
-                new Text_Plain_Longtoipv4(),
-                'getName',
-                'Long To IPv4',
-            ],
+            [new Text_Plain_Longtoipv4(), 'getName', 'Long To IPv4'],
             [
                 new Text_Plain_Longtoipv4(),
                 'getInfo',
                 'Converts an (IPv4) Internet network address stored as a BIGINT'
                 . ' into a string in Internet standard dotted format.',
             ],
-            [
-                new Text_Plain_Longtoipv4(),
-                'getMIMEType',
-                'Text',
-            ],
-            [
-                new Text_Plain_Longtoipv4(),
-                'getMIMESubtype',
-                'Plain',
-            ],
+            [new Text_Plain_Longtoipv4(), 'getMIMEType', 'Text'],
+            [new Text_Plain_Longtoipv4(), 'getMIMESubtype', 'Plain'],
             // Test data for Text_Plain_PreApPend plugin
-            [
-                new Text_Plain_PreApPend(),
-                'getName',
-                'PreApPend',
-            ],
+            [new Text_Plain_PreApPend(), 'getName', 'PreApPend'],
             [
                 new Text_Plain_PreApPend(),
                 'getInfo',
@@ -603,22 +322,10 @@ class TransformationPluginsTest extends AbstractTestCase
                 . ' to be prepended, second is appended (enclosed in single'
                 . ' quotes, default empty string).',
             ],
-            [
-                new Text_Plain_PreApPend(),
-                'getMIMEType',
-                'Text',
-            ],
-            [
-                new Text_Plain_PreApPend(),
-                'getMIMESubtype',
-                'Plain',
-            ],
+            [new Text_Plain_PreApPend(), 'getMIMEType', 'Text'],
+            [new Text_Plain_PreApPend(), 'getMIMESubtype', 'Plain'],
             // Test data for PhpMyAdmin\Plugins\Transformations\Text_Plain_Substring plugin
-            [
-                new Text_Plain_Substring(),
-                'getName',
-                'Substring',
-            ],
+            [new Text_Plain_Substring(), 'getName', 'Substring'],
             [
                 new Text_Plain_Substring(),
                 'getInfo',
@@ -629,75 +336,16 @@ class TransformationPluginsTest extends AbstractTestCase
                 . 'the string to append and/or prepend when truncation occurs '
                 . '(Default: "…").',
             ],
-            [
-                new Text_Plain_Substring(),
-                'getMIMEType',
-                'Text',
-            ],
-            [
-                new Text_Plain_Substring(),
-                'getMIMESubtype',
-                'Plain',
-            ],
+            [new Text_Plain_Substring(), 'getMIMEType', 'Text'],
+            [new Text_Plain_Substring(), 'getMIMESubtype', 'Plain'],
+            [new Text_Plain_Substring(), 'getOptions', ['foo', 'bar', 'baz'], [[], ['foo', 'bar', 'baz']]],
             [
                 new Text_Plain_Substring(),
                 'getOptions',
-                [
-                    'foo',
-                    'bar',
-                    'baz',
-                ],
-                [
-                    [],
-                    [
-                        'foo',
-                        'bar',
-                        'baz',
-                    ],
-                ],
-            ],
-            [
-                new Text_Plain_Substring(),
-                'getOptions',
-                [
-                    'foo',
-                    'bar',
-                    'baz',
-                ],
-                [
-                    [
-                        'foo',
-                        'bar',
-                        'baz',
-                    ],
-                    [
-                        'foo',
-                        'bar',
-                        'baz',
-                    ],
-                ],
-            ],
-            [
-                new Text_Plain_Substring(),
-                'getOptions',
-                [
-                    'foo',
-                    'bar',
-                    'baz',
-                ],
-                [
-                    [
-                        'foo',
-                        'bar',
-                        'baz',
-                    ],
-                    [
-                        1,
-                        2,
-                        3,
-                    ],
-                ],
+                ['foo', 'bar', 'baz'],
+                [['foo', 'bar', 'baz'], ['foo', 'bar', 'baz']],
             ],
+            [new Text_Plain_Substring(), 'getOptions', ['foo','bar','baz'], [['foo','bar','baz'],[1,2,3]]],
         ];
     }
 
@@ -734,41 +382,12 @@ class TransformationPluginsTest extends AbstractTestCase
         $GLOBALS['cfg']['CodemirrorEnable'] = false;
 
         $result = [
-            [
-                new Image_JPEG_Upload(),
-                [
-                    'test',
-                    [
-                        150,
-                        100,
-                    ],
-                ],
-                'test',
-            ],
-            [
-                new Text_Plain_FileUpload(),
-                [
-                    'test',
-                    [],
-                ],
-                'test',
-            ],
+            [new Image_JPEG_Upload(), ['test', [150, 100]], 'test'],
+            [new Text_Plain_FileUpload(), ['test', []], 'test'],
+            [new Text_Plain_RegexValidation(), ['phpMyAdmin', ['/php/i']], 'phpMyAdmin', true, ''],
             [
                 new Text_Plain_RegexValidation(),
-                [
-                    'phpMyAdmin',
-                    ['/php/i'],
-                ],
-                'phpMyAdmin',
-                true,
-                '',
-            ],
-            [
-                new Text_Plain_RegexValidation(),
-                [
-                    'qwerty',
-                    ['/^a/'],
-                ],
+                ['qwerty', ['/^a/']],
                 'qwerty',
                 false,
                 'Validation failed for the input string qwerty.',
@@ -777,11 +396,7 @@ class TransformationPluginsTest extends AbstractTestCase
                 new Application_Octetstream_Download(),
                 [
                     'PMA_BUFFER',
-                    [
-                        0 => 'filename',
-                        'wrapper_link' => 'PMA_wrapper_link',
-                        'wrapper_params' => ['key' => 'value'],
-                    ],
+                    [0 => 'filename', 'wrapper_link' => 'PMA_wrapper_link', 'wrapper_params' => ['key' => 'value']],
                 ],
                 '<a href="index.php?route=/transformation/wrapper&key=value'
                 . '&ct=application%2Foctet-stream&cn=filename&lang=en" '
@@ -802,30 +417,9 @@ class TransformationPluginsTest extends AbstractTestCase
                 . '&ct=application%2Foctet-stream&cn=binary_file.dat&lang=en" '
                 . 'title="binary_file.dat" class="disableAjax">binary_file.dat</a>',
             ],
-            [
-                new Application_Octetstream_Hex(),
-                [
-                    '11111001',
-                    [3],
-                ],
-                '313 131 313 130 303 1 ',
-            ],
-            [
-                new Application_Octetstream_Hex(),
-                [
-                    '11111001',
-                    [0],
-                ],
-                '3131313131303031',
-            ],
-            [
-                new Application_Octetstream_Hex(),
-                [
-                    '11111001',
-                    [],
-                ],
-                '31 31 31 31 31 30 30 31 ',
-            ],
+            [new Application_Octetstream_Hex(), ['11111001', [3]], '313 131 313 130 303 1 '],
+            [new Application_Octetstream_Hex(), ['11111001', [0]], '3131313131303031'],
+            [new Application_Octetstream_Hex(), ['11111001', []], '31 31 31 31 31 30 30 31 '],
             [
                 new Image_JPEG_Link(),
                 [
@@ -843,51 +437,27 @@ class TransformationPluginsTest extends AbstractTestCase
             ],
             [
                 new Text_Plain_Dateformat(),
-                [
-                    12345,
-                    [0],
-                    new FieldMetadata(MYSQLI_TYPE_TINY, 0, (object) []),
-                ],
+                [12345, [0], new FieldMetadata(MYSQLI_TYPE_TINY, 0, (object) [])],
                 '<dfn onclick="alert(&quot;12345&quot;);" title="12345">Jan 01, 1970 at 03:25 AM</dfn>',
             ],
             [
                 new Text_Plain_Dateformat(),
-                [
-                    12345678,
-                    [0],
-                    new FieldMetadata(MYSQLI_TYPE_STRING, 0, (object) []),
-                ],
+                [12345678, [0], new FieldMetadata(MYSQLI_TYPE_STRING, 0, (object) [])],
                 '<dfn onclick="alert(&quot;12345678&quot;);" title="12345678">May 23, 1970 at 09:21 PM</dfn>',
             ],
             [
                 new Text_Plain_Dateformat(),
-                [
-                    123456789,
-                    [0],
-                    new FieldMetadata(-1, 0, (object) []),
-                ],
+                [123456789, [0], new FieldMetadata(-1, 0, (object) [])],
                 '<dfn onclick="alert(&quot;123456789&quot;);" title="123456789">Nov 29, 1973 at 09:33 PM</dfn>',
             ],
             [
                 new Text_Plain_Dateformat(),
-                [
-                    '20100201',
-                    [0],
-                    new FieldMetadata(-1, 0, (object) []),
-                ],
+                ['20100201', [0], new FieldMetadata(-1, 0, (object) [])],
                 '<dfn onclick="alert(&quot;20100201&quot;);" title="20100201">Feb 01, 2010 at 12:00 AM</dfn>',
             ],
             [
                 new Text_Plain_Dateformat(),
-                [
-                    '1617153941',
-                    [
-                        '0',
-                        '%B %d, %Y at %I:%M %p',
-                        'local',
-                    ],
-                    new FieldMetadata(-1, 0, (object) []),
-                ],
+                ['1617153941', ['0', '%B %d, %Y at %I:%M %p', 'local'], new FieldMetadata(-1, 0, (object) [])],
                 '<dfn onclick="alert(&quot;1617153941&quot;);" title="1617153941">Mar 31, 2021 at 01:25 AM</dfn>',
             ],
             [
@@ -918,304 +488,71 @@ class TransformationPluginsTest extends AbstractTestCase
             ],
             [
                 new Text_Plain_Dateformat(),
-                [
-                    '1617153941',
-                    [
-                        '0',
-                        'H:i:s Y-d-m',
-                        'utc',
-                    ],
-                    new FieldMetadata(-1, 0, (object) []),
-                ],
+                ['1617153941', ['0', 'H:i:s Y-d-m', 'utc'], new FieldMetadata(-1, 0, (object) [])],
                 '<dfn onclick="alert(&quot;1617153941&quot;);" title="1617153941">01:25:41 2021-31-03</dfn>',
             ],
             [
                 new Text_Plain_External(),
-                [
-                    'PMA_BUFFER',
-                    [
-                        '/dev/null -i -wrap -q',
-                        '/dev/null -i -wrap -q',
-                    ],
-                ],
+                ['PMA_BUFFER', ['/dev/null -i -wrap -q', '/dev/null -i -wrap -q']],
                 'PMA_BUFFER',
             ],
             [
                 new Text_Plain_Formatted(),
-                [
-                    "<a ref='https://www.example.com/'>PMA_BUFFER</a>",
-                    [
-                        'option1',
-                        'option2',
-                    ],
-                ],
+                ["<a ref='https://www.example.com/'>PMA_BUFFER</a>", ['option1', 'option2']],
                 "<iframe srcdoc=\"<a ref='https://www.example.com/'>PMA_BUFFER</a>\" sandbox=\"\"></iframe>",
             ],
             [
                 new Text_Plain_Formatted(),
-                [
-                    '<a ref="https://www.example.com/">PMA_BUFFER</a>',
-                    [
-                        'option1',
-                        'option2',
-                    ],
-                ],
+                ['<a ref="https://www.example.com/">PMA_BUFFER</a>', ['option1', 'option2']],
                 "<iframe srcdoc=\"<a ref='https://www.example.com/'>PMA_BUFFER</a>\" sandbox=\"\"></iframe>",
             ],
             [
                 new Text_Plain_Imagelink(),
-                [
-                    'PMA_IMAGE',
-                    [
-                        'http://image/',
-                        '200',
-                    ],
-                ],
+                ['PMA_IMAGE', ['http://image/', '200']],
                 '<a href="http://image/PMA_IMAGE" rel="noopener noreferrer" target="_blank">' . "\n"
                 . '    <img src="http://image/PMA_IMAGE" border="0" width="200" height="50">' . "\n"
                 . '    PMA_IMAGE' . "\n"
                 . '</a>' . "\n",
             ],
-            [
-                new Text_Plain_Imagelink(),
-                [
-                    'PMA_IMAGE',
-                    [
-                        './image/',
-                        '200',
-                    ],
-                ],
-                './image/PMA_IMAGE',
-            ],
+            [new Text_Plain_Imagelink(), ['PMA_IMAGE', ['./image/', '200']], './image/PMA_IMAGE'],
             [
                 new Text_Plain_Sql(),
-                [
-                    'select *',
-                    [
-                        'option1',
-                        'option2',
-                    ],
-                ],
+                ['select *', ['option1', 'option2']],
                 '<code class="sql"><pre>' . "\n"
                 . 'select *' . "\n"
                 . '</pre></code>',
             ],
+            [new Text_Plain_Link(), ['PMA_TXT_LINK', ['./php/', 'text_name']], './php/PMA_TXT_LINK'],
+            [new Text_Plain_Link(), ['PMA_TXT_LINK', []], 'PMA_TXT_LINK'],
             [
                 new Text_Plain_Link(),
-                [
-                    'PMA_TXT_LINK',
-                    [
-                        './php/',
-                        'text_name',
-                    ],
-                ],
-                './php/PMA_TXT_LINK',
-            ],
-            [
-                new Text_Plain_Link(),
-                [
-                    'PMA_TXT_LINK',
-                    [],
-                ],
-                'PMA_TXT_LINK',
-            ],
-            [
-                new Text_Plain_Link(),
-                [
-                    'https://example.com/PMA_TXT_LINK',
-                    [],
-                ],
+                ['https://example.com/PMA_TXT_LINK', []],
                 '<a href="https://example.com/PMA_TXT_LINK" title=""'
                 . ' target="_blank" rel="noopener noreferrer">https://example.com/PMA_TXT_LINK</a>',
             ],
-            [
-                new Text_Plain_Link(),
-                [
-                    'PMA_TXT_LINK',
-                    [
-                        './php/',
-                        'text_name',
-                    ],
-                ],
-                './php/PMA_TXT_LINK',
-            ],
-            [
-                new Text_Plain_Longtoipv4(),
-                [
-                    42949672,
-                    [
-                        'option1',
-                        'option2',
-                    ],
-                ],
-                '2.143.92.40',
-            ],
-            [
-                new Text_Plain_Longtoipv4(),
-                [
-                    4294967295,
-                    [
-                        'option1',
-                        'option2',
-                    ],
-                ],
-                '255.255.255.255',
-            ],
-            [
-                new Text_Plain_PreApPend(),
-                [
-                    'My',
-                    [
-                        'php',
-                        'Admin',
-                    ],
-                ],
-                'phpMyAdmin',
-            ],
-            [
-                new Text_Plain_Substring(),
-                [
-                    'PMA_BUFFER',
-                    [
-                        1,
-                        3,
-                        'suffix',
-                    ],
-                ],
-                'suffixMA_suffix',
-            ],
-            [
-                new Text_Plain_Substring(),
-                [
-                    'PMA_BUFFER',
-                    [
-                        '1',
-                        '3',
-                        'suffix',
-                    ],
-                ],
-                'suffixMA_suffix',
-            ],
-            [
-                new Text_Plain_Substring(),
-                [
-                    'PMA_BUFFER',
-                    ['2'],
-                ],
-                '…A_BUFFER',
-            ],
-            [
-                new Text_Plain_Substring(),
-                [
-                    'PMA_BUFFER',
-                    [2],
-                ],
-                '…A_BUFFER',
-            ],
-            [
-                new Text_Plain_Substring(),
-                [
-                    'PMA_BUFFER',
-                    [0],
-                ],
-                'PMA_BUFFER',
-            ],
-            [
-                new Text_Plain_Substring(),
-                [
-                    'PMA_BUFFER',
-                    ['0'],
-                ],
-                'PMA_BUFFER',
-            ],
-            [
-                new Text_Plain_Substring(),
-                [
-                    'PMA_BUFFER',
-                    [
-                        -1,
-                    ],
-                ],
-                '…R…',
-            ],
-            [
-                new Text_Plain_Substring(),
-                [
-                    'PMA_BUFFER',
-                    ['-1'],
-                ],
-                '…R…',
-            ],
-            [
-                new Text_Plain_Substring(),
-                [
-                    'PMA_BUFFER',
-                    [
-                        0,
-                        2,
-                    ],
-                ],
-                'PM…',
-            ],
-            [
-                new Text_Plain_Substring(),
-                [
-                    'PMA_BUFFER',
-                    [
-                        '0',
-                        '2',
-                    ],
-                ],
-                'PM…',
-            ],
-            [
-                new Text_Plain_Substring(),
-                [
-                    2,
-                    [],
-                ],
-                '2',
-            ],
-            [
-                new Text_Plain_Longtoipv4(),
-                [168496141],
-                '10.11.12.13',
-            ],
-            [
-                new Text_Plain_Longtoipv4(),
-                ['168496141'],
-                '10.11.12.13',
-            ],
-            [
-                new Text_Plain_Longtoipv4(),
-                ['my ip'],
-                'my ip',
-            ],
-            [
-                new Text_Plain_Longtoipv4(),
-                ['<my ip>'],
-                '&lt;my ip&gt;',
-            ],
-            [
-                new Text_Plain_Iptolong(),
-                ['10.11.12.13'],
-                168496141,
-            ],
-            [
-                new Text_Plain_Iptolong(),
-                ['10.11.12.913'],
-                '10.11.12.913',
-            ],
-            [
-                new Text_Plain_Iptolong(),
-                ['my ip'],
-                'my ip',
-            ],
-            [
-                new Text_Plain_Iptolong(),
-                ['<my ip>'],
-                '<my ip>',
-            ],
+            [new Text_Plain_Link(), ['PMA_TXT_LINK', ['./php/', 'text_name']], './php/PMA_TXT_LINK'],
+            [new Text_Plain_Longtoipv4(), [42949672, ['option1', 'option2']], '2.143.92.40'],
+            [new Text_Plain_Longtoipv4(), [4294967295, ['option1', 'option2']], '255.255.255.255'],
+            [new Text_Plain_PreApPend(), ['My', ['php', 'Admin']], 'phpMyAdmin'],
+            [new Text_Plain_Substring(), ['PMA_BUFFER', [1, 3, 'suffix']], 'suffixMA_suffix'],
+            [new Text_Plain_Substring(), ['PMA_BUFFER', ['1', '3', 'suffix']], 'suffixMA_suffix'],
+            [new Text_Plain_Substring(), ['PMA_BUFFER', ['2']], '…A_BUFFER'],
+            [new Text_Plain_Substring(), ['PMA_BUFFER', [2]], '…A_BUFFER'],
+            [new Text_Plain_Substring(), ['PMA_BUFFER', [0]], 'PMA_BUFFER'],
+            [new Text_Plain_Substring(), ['PMA_BUFFER', ['0']], 'PMA_BUFFER'],
+            [new Text_Plain_Substring(), ['PMA_BUFFER', [-1]], '…R…'],
+            [new Text_Plain_Substring(), ['PMA_BUFFER', ['-1']], '…R…'],
+            [new Text_Plain_Substring(), ['PMA_BUFFER', [0, 2]], 'PM…'],
+            [new Text_Plain_Substring(), ['PMA_BUFFER', ['0', '2']], 'PM…'],
+            [new Text_Plain_Substring(), [2, []], '2'],
+            [new Text_Plain_Longtoipv4(), [168496141], '10.11.12.13'],
+            [new Text_Plain_Longtoipv4(), ['168496141'], '10.11.12.13'],
+            [new Text_Plain_Longtoipv4(), ['my ip'], 'my ip'],
+            [new Text_Plain_Longtoipv4(), ['<my ip>'], '&lt;my ip&gt;'],
+            [new Text_Plain_Iptolong(), ['10.11.12.13'], 168496141],
+            [new Text_Plain_Iptolong(), ['10.11.12.913'], '10.11.12.913'],
+            [new Text_Plain_Iptolong(), ['my ip'], 'my ip'],
+            [new Text_Plain_Iptolong(), ['<my ip>'], '<my ip>'],
         ];
 
         if (function_exists('imagecreatetruecolor')) {
diff --git a/test/classes/Properties/Options/OptionsPropertyOneItemTest.php b/test/classes/Properties/Options/OptionsPropertyOneItemTest.php
index c695b1a431..ed3ee6cd0c 100644
--- a/test/classes/Properties/Options/OptionsPropertyOneItemTest.php
+++ b/test/classes/Properties/Options/OptionsPropertyOneItemTest.php
@@ -44,10 +44,7 @@ class OptionsPropertyOneItemTest extends AbstractTestCase
         $this->stub->setValues([1, 2]);
 
         $this->assertEquals(
-            [
-                1,
-                2,
-            ],
+            [1, 2],
             $this->stub->getValues(),
         );
     }
diff --git a/test/classes/RoutingTest.php b/test/classes/RoutingTest.php
index 3213d05300..64c1734c97 100644
--- a/test/classes/RoutingTest.php
+++ b/test/classes/RoutingTest.php
@@ -87,48 +87,13 @@ class RoutingTest extends AbstractTestCase
                 '/; cookieinj=value/',
                 '/phpmyadmin/index.php',
             ],
-            [
-                '',
-                '/phpmyadmin/index.php/;%20cookieinj=value///',
-                '/; cookieinj=value/',
-                '/phpmyadmin/index.php',
-            ],
-            [
-                '',
-                '//example.com/../phpmyadmin/index.php',
-                '',
-                '/phpmyadmin/index.php',
-            ],
-            [
-                '',
-                '//example.com/../../.././phpmyadmin/index.php',
-                '',
-                '/phpmyadmin/index.php',
-            ],
-            [
-                '',
-                '/page.php/malicouspathinfo?malicouspathinfo',
-                'malicouspathinfo',
-                '/page.php',
-            ],
-            [
-                '/phpmyadmin/./index.php',
-                '/phpmyadmin/./index.php',
-                '',
-                '/phpmyadmin/index.php',
-            ],
-            [
-                '/phpmyadmin/index.php',
-                '/phpmyadmin/index.php',
-                '',
-                '/phpmyadmin/index.php',
-            ],
-            [
-                '',
-                '/phpmyadmin/index.php',
-                '',
-                '/phpmyadmin/index.php',
-            ],
+            ['', '/phpmyadmin/index.php/;%20cookieinj=value///', '/; cookieinj=value/', '/phpmyadmin/index.php'],
+            ['', '//example.com/../phpmyadmin/index.php', '', '/phpmyadmin/index.php'],
+            ['', '//example.com/../../.././phpmyadmin/index.php', '', '/phpmyadmin/index.php'],
+            ['', '/page.php/malicouspathinfo?malicouspathinfo', 'malicouspathinfo', '/page.php'],
+            ['/phpmyadmin/./index.php', '/phpmyadmin/./index.php', '', '/phpmyadmin/index.php'],
+            ['/phpmyadmin/index.php', '/phpmyadmin/index.php', '', '/phpmyadmin/index.php'],
+            ['', '/phpmyadmin/index.php', '', '/phpmyadmin/index.php'],
         ];
     }
 }
diff --git a/test/classes/SanitizeTest.php b/test/classes/SanitizeTest.php
index 2c55a1cd74..afc347e3c5 100644
--- a/test/classes/SanitizeTest.php
+++ b/test/classes/SanitizeTest.php
@@ -73,22 +73,10 @@ class SanitizeTest extends AbstractTestCase
     public static function docLinks(): array
     {
         return [
-            [
-                'foo',
-                'setup.html%23foo',
-            ],
-            [
-                'cfg_TitleTable',
-                'config.html%23cfg_TitleTable',
-            ],
-            [
-                'faq3-11',
-                'faq.html%23faq3-11',
-            ],
-            [
-                'bookmarks@',
-                'bookmarks.html',
-            ],
+            ['foo', 'setup.html%23foo'],
+            ['cfg_TitleTable', 'config.html%23cfg_TitleTable'],
+            ['faq3-11', 'faq.html%23faq3-11'],
+            ['bookmarks@', 'bookmarks.html'],
         ];
     }
 
@@ -194,55 +182,15 @@ class SanitizeTest extends AbstractTestCase
     public static function variables(): array
     {
         return [
-            [
-                'foo',
-                true,
-                "foo = true;\n",
-            ],
-            [
-                'foo',
-                false,
-                "foo = false;\n",
-            ],
-            [
-                'foo',
-                100,
-                "foo = 100;\n",
-            ],
-            [
-                'foo',
-                0,
-                "foo = 0;\n",
-            ],
-            [
-                'foo',
-                'text',
-                "foo = \"text\";\n",
-            ],
-            [
-                'foo',
-                'quote"',
-                "foo = \"quote\\\"\";\n",
-            ],
-            [
-                'foo',
-                'apostroph\'',
-                "foo = \"apostroph'\";\n",
-            ],
-            [
-                'foo',
-                [
-                    '1',
-                    '2',
-                    '3',
-                ],
-                "foo = [\"1\",\"2\",\"3\"];\n",
-            ],
-            [
-                'foo',
-                'bar"baz',
-                "foo = \"bar\\\"baz\";\n",
-            ],
+            ['foo', true, "foo = true;\n"],
+            ['foo', false, "foo = false;\n"],
+            ['foo', 100, "foo = 100;\n"],
+            ['foo', 0, "foo = 0;\n"],
+            ['foo', 'text', "foo = \"text\";\n"],
+            ['foo', 'quote"', "foo = \"quote\\\"\";\n"],
+            ['foo', 'apostroph\'', "foo = \"apostroph'\";\n"],
+            ['foo', ['1', '2', '3'], "foo = [\"1\",\"2\",\"3\"];\n"],
+            ['foo', 'bar"baz', "foo = \"bar\\\"baz\";\n"],
         ];
     }
 
@@ -255,10 +203,7 @@ class SanitizeTest extends AbstractTestCase
         $_REQUEST['foo'] = 'bar';
         $_REQUEST['allow'] = 'all';
         $_REQUEST['second'] = 1;
-        $allowList = [
-            'allow',
-            'second',
-        ];
+        $allowList = ['allow', 'second'];
         Sanitize::removeRequestVars($allowList);
         $this->assertArrayNotHasKey('foo', $_REQUEST);
         $this->assertArrayNotHasKey('second', $_REQUEST);
@@ -277,102 +222,22 @@ class SanitizeTest extends AbstractTestCase
         // Allow http links
         // Allow other links
         return [
-            [
-                false,
-                'foo',
-                false,
-                false,
-            ],
-            [
-                true,
-                './doc/html/',
-                false,
-                false,
-            ],
-            [
-                false,
-                'index.php',
-                false,
-                false,
-            ],
-            [
-                false,
-                './index.php',
-                false,
-                false,
-            ],
-            [
-                true,
-                './index.php?',
-                false,
-                false,
-            ],
-            [
-                true,
-                './index.php?route=/server/sql',
-                false,
-                false,
-            ],
-            [
-                false,
-                'index.php?route=/server/sql',
-                false,
-                false,
-            ],
-            [
-                false,
-                'ftp://ftp.example.com',
-                false,
-                false,
-            ],
-            [
-                true,
-                'ftp://ftp.example.com',
-                false,
-                true,
-            ],
-            [
-                false,
-                'mailto:admin@domain.tld',
-                false,
-                false,
-            ],
-            [
-                true,
-                'mailto:admin@domain.tld',
-                false,
-                true,
-            ],
-            [
-                false,
-                'index.php?route=/url&url=https://example.com',
-                false,
-                false,
-            ],
-            [
-                true,
-                'index.php?route=/url&url=https%3a%2f%2fexample.com',
-                false,
-                false,
-            ],
-            [
-                true,
-                'https://example.com',
-                false,
-                false,
-            ],
-            [
-                false,
-                'http://example.com',
-                false,
-                false,
-            ],
-            [
-                true,
-                'http://example.com',
-                true,
-                false,
-            ],
+            [false, 'foo', false, false],
+            [true, './doc/html/', false, false],
+            [false, 'index.php', false, false],
+            [false, './index.php', false, false],
+            [true, './index.php?', false, false],
+            [true, './index.php?route=/server/sql', false, false],
+            [false, 'index.php?route=/server/sql', false, false],
+            [false, 'ftp://ftp.example.com', false, false],
+            [true, 'ftp://ftp.example.com', false, true],
+            [false, 'mailto:admin@domain.tld', false, false],
+            [true, 'mailto:admin@domain.tld', false, true],
+            [false, 'index.php?route=/url&url=https://example.com', false, false],
+            [true, 'index.php?route=/url&url=https%3a%2f%2fexample.com', false, false],
+            [true, 'https://example.com', false, false],
+            [false, 'http://example.com', false, false],
+            [true, 'http://example.com', true, false],
         ];
     }
 
diff --git a/test/classes/ScriptsTest.php b/test/classes/ScriptsTest.php
index 9f1f4ce02f..b766529fc2 100644
--- a/test/classes/ScriptsTest.php
+++ b/test/classes/ScriptsTest.php
@@ -85,16 +85,7 @@ class ScriptsTest extends AbstractTestCase
 
         $this->object->addFile('common.js');
         $this->assertEquals(
-            [
-                [
-                    'name' => 'vendor/codemirror/lib/codemirror.js',
-                    'fire' => 0,
-                ],
-                [
-                    'name' => 'common.js',
-                    'fire' => 1,
-                ],
-            ],
+            [['name' => 'vendor/codemirror/lib/codemirror.js', 'fire' => 0], ['name' => 'common.js', 'fire' => 1]],
             $this->object->getFiles(),
         );
     }
@@ -113,13 +104,7 @@ class ScriptsTest extends AbstractTestCase
         // Add one script file
         $file = 'common.js';
         $hash = 'd7716810d825f4b55d18727c3ccb24e6';
-        $files = [
-            $hash => [
-                'has_onload' => 1,
-                'filename' => 'common.js',
-                'params' => [],
-            ],
-        ];
+        $files = [$hash => ['has_onload' => 1, 'filename' => 'common.js', 'params' => []]];
         $this->object->addFile($file);
         $this->assertEquals($files, $reflection->getValue($this->object));
     }
@@ -131,22 +116,10 @@ class ScriptsTest extends AbstractTestCase
     {
         $reflection = new ReflectionProperty(Scripts::class, 'files');
 
-        $filenames = [
-            'common.js',
-            'sql.js',
-            'common.js',
-        ];
+        $filenames = ['common.js', 'sql.js', 'common.js'];
         $files = [
-            'd7716810d825f4b55d18727c3ccb24e6' => [
-                'has_onload' => 1,
-                'filename' => 'common.js',
-                'params' => [],
-            ],
-            '347a57484fcd6ea6d8a125e6e1d31f78' => [
-                'has_onload' => 1,
-                'filename' => 'sql.js',
-                'params' => [],
-            ],
+            'd7716810d825f4b55d18727c3ccb24e6' => ['has_onload' => 1, 'filename' => 'common.js', 'params' => []],
+            '347a57484fcd6ea6d8a125e6e1d31f78' => ['has_onload' => 1, 'filename' => 'sql.js', 'params' => []],
         ];
         $this->object->addFiles($filenames);
         $this->assertEquals($files, $reflection->getValue($this->object));
diff --git a/test/classes/Server/PrivilegesTest.php b/test/classes/Server/PrivilegesTest.php
index 4bf93f4c3c..4571cc69f2 100644
--- a/test/classes/Server/PrivilegesTest.php
+++ b/test/classes/Server/PrivilegesTest.php
@@ -70,12 +70,7 @@ class PrivilegesTest extends AbstractTestCase
         //pre variable have been defined
         $_POST['pred_tablename'] = 'PMA_pred__tablename';
         $_POST['pred_dbname'] = ['PMA_pred_dbname'];
-        [,,
-            $dbname,
-            $tablename,
-            $routinename,
-            $dbnameIsWildcard,
-        ] = $serverPrivileges->getDataForDBInfo();
+        [, , $dbname, $tablename, $routinename, $dbnameIsWildcard] = $serverPrivileges->getDataForDBInfo();
         $this->assertEquals('PMA_pred_dbname', $dbname);
         $this->assertEquals('PMA_pred__tablename', $tablename);
         $this->assertTrue($dbnameIsWildcard);
@@ -83,12 +78,7 @@ class PrivilegesTest extends AbstractTestCase
         // Escaped database
         $_POST['pred_tablename'] = 'PMA_pred__tablename';
         $_POST['pred_dbname'] = ['PMA\_pred\_dbname'];
-        [,,
-            $dbname,
-            $tablename,
-            $routinename,
-            $dbnameIsWildcard,
-        ] = $serverPrivileges->getDataForDBInfo();
+        [, , $dbname, $tablename, $routinename, $dbnameIsWildcard] = $serverPrivileges->getDataForDBInfo();
         $this->assertEquals('PMA\_pred\_dbname', $dbname);
         $this->assertEquals('PMA_pred__tablename', $tablename);
         $this->assertEquals(false, $dbnameIsWildcard);
@@ -96,11 +86,7 @@ class PrivilegesTest extends AbstractTestCase
         // Multiselect database - pred
         unset($_POST['pred_tablename'], $_REQUEST['tablename'], $_REQUEST['dbname']);
         $_POST['pred_dbname'] = ['PMA\_pred\_dbname', 'PMADbname2'];
-        [,,
-            $dbname,
-            $tablename,,
-            $dbnameIsWildcard,
-        ] = $serverPrivileges->getDataForDBInfo();
+        [, , $dbname, $tablename, , $dbnameIsWildcard] = $serverPrivileges->getDataForDBInfo();
         $this->assertEquals(['PMA\_pred\_dbname', 'PMADbname2'], $dbname);
         $this->assertEquals(null, $tablename);
         $this->assertEquals(false, $dbnameIsWildcard);
@@ -108,11 +94,7 @@ class PrivilegesTest extends AbstractTestCase
         // Multiselect database
         unset($_POST['pred_tablename'], $_REQUEST['tablename'], $_POST['pred_dbname']);
         $_REQUEST['dbname'] = ['PMA\_dbname', 'PMADbname2'];
-        [,,
-            $dbname,
-            $tablename,,
-            $dbnameIsWildcard,
-        ] = $serverPrivileges->getDataForDBInfo();
+        [, , $dbname, $tablename, , $dbnameIsWildcard] = $serverPrivileges->getDataForDBInfo();
         $this->assertEquals(['PMA\_dbname', 'PMADbname2'], $dbname);
         $this->assertEquals(null, $tablename);
         $this->assertEquals(false, $dbnameIsWildcard);
@@ -155,19 +137,11 @@ class PrivilegesTest extends AbstractTestCase
 
         $ret = $serverPrivileges->getTableGrantsArray();
         $this->assertEquals(
-            [
-                'Delete',
-                'DELETE',
-                __('Allows deleting data.'),
-            ],
+            ['Delete', 'DELETE', __('Allows deleting data.')],
             $ret[0],
         );
         $this->assertEquals(
-            [
-                'Create',
-                'CREATE',
-                __('Allows creating new tables.'),
-            ],
+            ['Create', 'CREATE', __('Allows creating new tables.')],
             $ret[1],
         );
     }
@@ -178,19 +152,11 @@ class PrivilegesTest extends AbstractTestCase
 
         $ret = $serverPrivileges->getGrantsArray();
         $this->assertEquals(
-            [
-                'Select_priv',
-                'SELECT',
-                __('Allows reading data.'),
-            ],
+            ['Select_priv', 'SELECT', __('Allows reading data.')],
             $ret[0],
         );
         $this->assertEquals(
-            [
-                'Insert_priv',
-                'INSERT',
-                __('Allows inserting and replacing data.'),
-            ],
+            ['Insert_priv', 'INSERT', __('Allows inserting and replacing data.')],
             $ret[1],
         );
     }
@@ -312,10 +278,7 @@ class PrivilegesTest extends AbstractTestCase
 
         $dbi = $this->createDatabaseInterface($dummyDbi);
 
-        $dbi->setVersion([
-            '@@version' => '5.7.6',
-            '@@version_comment' => 'MySQL Community Server (GPL)',
-        ]);
+        $dbi->setVersion(['@@version' => '5.7.6', '@@version_comment' => 'MySQL Community Server (GPL)']);
 
         $serverPrivileges = $this->getPrivileges($dbi);
 
@@ -363,10 +326,7 @@ class PrivilegesTest extends AbstractTestCase
 
         $dbi = $this->createDatabaseInterface($dummyDbi);
 
-        $dbi->setVersion([
-            '@@version' => '5.5.6',
-            '@@version_comment' => 'MySQL Community Server (GPL)',
-        ]);
+        $dbi->setVersion(['@@version' => '5.5.6', '@@version_comment' => 'MySQL Community Server (GPL)']);
 
         $serverPrivileges = $this->getPrivileges($dbi);
 
@@ -680,10 +640,7 @@ class PrivilegesTest extends AbstractTestCase
         $dummyDbi->addResult('SET `old_passwords` = 0;', []);
         $dbi = $this->createDatabaseInterface($dummyDbi);
 
-        $dbi->setVersion([
-            '@@version' => '8.0.11',
-            '@@version_comment' => 'MySQL Community Server - GPL',
-        ]);
+        $dbi->setVersion(['@@version' => '8.0.11', '@@version_comment' => 'MySQL Community Server - GPL']);
 
         $serverPrivileges = $this->getPrivileges($dbi);
 
@@ -717,10 +674,7 @@ class PrivilegesTest extends AbstractTestCase
 
         $dbi = $this->createDatabaseInterface();
 
-        $dbi->setVersion([
-            '@@version' => '8.0.16',
-            '@@version_comment' => 'MySQL Community Server - GPL',
-        ]);
+        $dbi->setVersion(['@@version' => '8.0.16', '@@version_comment' => 'MySQL Community Server - GPL']);
 
         $serverPrivileges = $this->getPrivileges($dbi);
 
@@ -754,10 +708,7 @@ class PrivilegesTest extends AbstractTestCase
 
         $dbi = $this->createDatabaseInterface($dummyDbi);
 
-        $dbi->setVersion([
-            '@@version' => '5.7.6',
-            '@@version_comment' => 'MySQL Community Server (GPL)',
-        ]);
+        $dbi->setVersion(['@@version' => '5.7.6', '@@version_comment' => 'MySQL Community Server (GPL)']);
 
         $serverPrivileges = $this->getPrivileges($dbi);
 
@@ -880,14 +831,8 @@ class PrivilegesTest extends AbstractTestCase
             ->disableOriginalConstructor()
             ->getMock();
         $fieldsInfo = [
-            [
-                'COLUMN_NAME' => 'Host',
-                'CHARACTER_MAXIMUM_LENGTH' => 80,
-            ],
-            [
-                'COLUMN_NAME' => 'User',
-                'CHARACTER_MAXIMUM_LENGTH' => 40,
-            ],
+            ['COLUMN_NAME' => 'Host', 'CHARACTER_MAXIMUM_LENGTH' => 80],
+            ['COLUMN_NAME' => 'User', 'CHARACTER_MAXIMUM_LENGTH' => 40],
         ];
         $dbi->expects($this->any())->method('fetchResult')
             ->will($this->returnValue($fieldsInfo));
@@ -954,14 +899,8 @@ class PrivilegesTest extends AbstractTestCase
             ->disableOriginalConstructor()
             ->getMock();
         $fieldsInfo = [
-            [
-                'COLUMN_NAME' => 'Host',
-                'CHARACTER_MAXIMUM_LENGTH' => 80,
-            ],
-            [
-                'COLUMN_NAME' => 'User',
-                'CHARACTER_MAXIMUM_LENGTH' => 40,
-            ],
+            ['COLUMN_NAME' => 'Host', 'CHARACTER_MAXIMUM_LENGTH' => 80],
+            ['COLUMN_NAME' => 'User', 'CHARACTER_MAXIMUM_LENGTH' => 40],
         ];
         $dbi->expects($this->any())->method('fetchResult')
             ->will($this->returnValue($fieldsInfo));
@@ -1333,10 +1272,7 @@ class PrivilegesTest extends AbstractTestCase
 
         $ret = $serverPrivileges->getDataForDeleteUsers($queries);
 
-        $item = [
-            "# Deleting 'old_username'@'old_hostname' ...",
-            "DROP USER 'old_username'@'old_hostname';",
-        ];
+        $item = ["# Deleting 'old_username'@'old_hostname' ...", "DROP USER 'old_username'@'old_hostname';"];
         $this->assertEquals($item, $ret);
     }
 
@@ -1500,10 +1436,7 @@ class PrivilegesTest extends AbstractTestCase
             ),
             $actual,
         );
-        $item = Url::getCommon([
-            'db' => 'sakila',
-            'reload' => 1,
-        ], '');
+        $item = Url::getCommon(['db' => 'sakila', 'reload' => 1], '');
         $this->assertStringContainsString($item, $actual);
         $this->assertStringContainsString('sakila', $actual);
 
@@ -1519,11 +1452,7 @@ class PrivilegesTest extends AbstractTestCase
             ),
             $actual,
         );
-        $item = Url::getCommon([
-            'db' => 'sakila',
-            'table' => 'actor',
-            'reload' => 1,
-        ], '');
+        $item = Url::getCommon(['db' => 'sakila', 'table' => 'actor', 'reload' => 1], '');
         $this->assertStringContainsString($item, $actual);
         $this->assertStringContainsString('table', $actual);
         $item = Util::getTitleForTarget($GLOBALS['cfg']['DefaultTabTable']);
@@ -1617,9 +1546,7 @@ class PrivilegesTest extends AbstractTestCase
         );
         $dummyDbi->addResult(
             'SELECT 1 FROM `mysql`.`user`',
-            [
-                ['1'],
-            ],
+            [['1']],
         );
         $serverPrivileges = $this->getPrivileges($this->createDatabaseInterface($dummyDbi));
         $actual = $serverPrivileges->getHtmlForUserOverview('ltr', '');
@@ -1751,10 +1678,7 @@ class PrivilegesTest extends AbstractTestCase
             ->method('fetchAssoc')
             ->will(
                 $this->onConsecutiveCalls(
-                    [
-                        'User' => 'pmauser',
-                        'Host' => 'local',
-                    ],
+                    ['User' => 'pmauser', 'Host' => 'local'],
                     [],
                 ),
             );
@@ -1943,38 +1867,14 @@ class PrivilegesTest extends AbstractTestCase
     public static function providerUnEscapeMysqlWildcards(): array
     {
         return [
-            [
-                '\_test',
-                '_test',
-            ],
-            [
-                '\_\\',
-                '_\\',
-            ],
-            [
-                '\\_\%',
-                '_%',
-            ],
-            [
-                '\\\_',
-                '\_',
-            ],
-            [
-                '\\\_\\\%',
-                '\_\%',
-            ],
-            [
-                '\_\\%\_\_\%',
-                '_%__%',
-            ],
-            [
-                '\%\_',
-                '%_',
-            ],
-            [
-                '\\\%\\\_',
-                '\%\_',
-            ],
+            ['\_test', '_test'],
+            ['\_\\', '_\\'],
+            ['\\_\%', '_%'],
+            ['\\\_', '\_'],
+            ['\\\_\\\%', '\_\%'],
+            ['\_\\%\_\_\%', '_%__%'],
+            ['\%\_', '%_'],
+            ['\\\%\\\_', '\%\_'],
         ];
     }
 
diff --git a/test/classes/Server/SelectTest.php b/test/classes/Server/SelectTest.php
index c62da08d85..272c64d11c 100644
--- a/test/classes/Server/SelectTest.php
+++ b/test/classes/Server/SelectTest.php
@@ -105,18 +105,9 @@ class SelectTest extends AbstractTestCase
     public static function renderDataProvider(): array
     {
         return [
-            'only options, don\'t omit fieldset' => [
-                false,
-                false,
-            ],
-            'not only options, omits fieldset' => [
-                true,
-                true,
-            ],
-            'not only options, don\'t omit fieldset' => [
-                true,
-                false,
-            ],
+            'only options, don\'t omit fieldset' => [false, false],
+            'not only options, omits fieldset' => [true, true],
+            'not only options, don\'t omit fieldset' => [true, false],
         ];
     }
 }
diff --git a/test/classes/Server/SysInfo/SysInfoTest.php b/test/classes/Server/SysInfo/SysInfoTest.php
index 90e1593601..13a53d2c34 100644
--- a/test/classes/Server/SysInfo/SysInfoTest.php
+++ b/test/classes/Server/SysInfo/SysInfoTest.php
@@ -34,24 +34,7 @@ class SysInfoTest extends AbstractTestCase
      */
     public static function sysInfoOsProvider(): array
     {
-        return [
-            [
-                'FreeBSD',
-                'Linux',
-            ],
-            [
-                'Linux',
-                'Linux',
-            ],
-            [
-                'Winnt',
-                'Winnt',
-            ],
-            [
-                'SunOS',
-                'SunOS',
-            ],
-        ];
+        return [['FreeBSD', 'Linux'], ['Linux', 'Linux'], ['Winnt', 'Winnt'], ['SunOS', 'SunOS']];
     }
 
     /**
diff --git a/test/classes/Setup/ConfigGeneratorTest.php b/test/classes/Setup/ConfigGeneratorTest.php
index acb738d992..41d466c314 100644
--- a/test/classes/Setup/ConfigGeneratorTest.php
+++ b/test/classes/Setup/ConfigGeneratorTest.php
@@ -33,18 +33,8 @@ class ConfigGeneratorTest extends AbstractTestCase
 
         $GLOBALS['server'] = 0;
         $cf = new ConfigFile();
-        $_SESSION['ConfigFile0'] = [
-            'a',
-            'b',
-            'c',
-        ];
-        $_SESSION['ConfigFile0']['Servers'] = [
-            [
-                1,
-                2,
-                3,
-            ],
-        ];
+        $_SESSION['ConfigFile0'] = ['a', 'b', 'c'];
+        $_SESSION['ConfigFile0']['Servers'] = [[1, 2, 3]];
 
         $cf->setPersistKeys(['1/', 2]);
 
@@ -95,11 +85,7 @@ class ConfigGeneratorTest extends AbstractTestCase
             $method->invoke(
                 null,
                 'var_name',
-                [
-                    1,
-                    2,
-                    3,
-                ],
+                [1, 2, 3],
                 "\n",
             ),
         );
@@ -110,10 +96,7 @@ class ConfigGeneratorTest extends AbstractTestCase
             $method->invoke(
                 null,
                 'var_name',
-                [
-                    '1a' => 'foo',
-                    'b' => 'bar',
-                ],
+                ['1a' => 'foo', 'b' => 'bar'],
                 "\n",
             ),
         );
@@ -152,21 +135,14 @@ class ConfigGeneratorTest extends AbstractTestCase
         $this->assertFalse(
             $method->invoke(
                 null,
-                [
-                    'a' => 1,
-                    'b' => 2,
-                ],
+                ['a' => 1, 'b' => 2],
             ),
         );
 
         $this->assertFalse(
             $method->invoke(
                 null,
-                [
-                    0 => 1,
-                    1 => 2,
-                    3 => 3,
-                ],
+                [0 => 1, 1 => 2, 3 => 3],
             ),
         );
 
@@ -180,11 +156,7 @@ class ConfigGeneratorTest extends AbstractTestCase
         $this->assertTrue(
             $method->invoke(
                 null,
-                [
-                    1,
-                    2,
-                    3,
-                ],
+                [1, 2, 3],
             ),
         );
     }
@@ -197,25 +169,13 @@ class ConfigGeneratorTest extends AbstractTestCase
         $reflection = new ReflectionClass(ConfigGenerator::class);
         $method = $reflection->getMethod('exportZeroBasedArray');
 
-        $arr = [
-            1,
-            2,
-            3,
-            4,
-        ];
+        $arr = [1, 2, 3, 4];
 
         $result = $method->invoke(null, $arr, "\n");
 
         $this->assertEquals('[1, 2, 3, 4]', $result);
 
-        $arr = [
-            1,
-            2,
-            3,
-            4,
-            7,
-            'foo',
-        ];
+        $arr = [1, 2, 3, 4, 7, 'foo'];
 
         $result = $method->invoke(null, $arr, "\n");
 
diff --git a/test/classes/Setup/FormProcessingTest.php b/test/classes/Setup/FormProcessingTest.php
index 80dc05c4d7..4935b3ab19 100644
--- a/test/classes/Setup/FormProcessingTest.php
+++ b/test/classes/Setup/FormProcessingTest.php
@@ -35,11 +35,7 @@ class FormProcessingTest extends AbstractNetworkTestCase
     public function testProcessFormSet(): void
     {
         $this->mockResponse(
-            [
-                ['status: 303 See Other'],
-                ['Location: ../setup/index.php?route=%2Fsetup&lang=en'],
-                303,
-            ],
+            [['status: 303 See Other'], ['Location: ../setup/index.php?route=%2Fsetup&lang=en'], 303],
         );
 
         // case 1
diff --git a/test/classes/Setup/IndexTest.php b/test/classes/Setup/IndexTest.php
index f7f3dc219a..98caf7f0eb 100644
--- a/test/classes/Setup/IndexTest.php
+++ b/test/classes/Setup/IndexTest.php
@@ -25,30 +25,12 @@ class IndexTest extends AbstractTestCase
      */
     public function testPMAmessagesBegin(): void
     {
-        $_SESSION['messages'] = [
-            [
-                ['foo'],
-                ['bar'],
-            ],
-        ];
+        $_SESSION['messages'] = [[['foo'], ['bar']]];
 
         SetupIndex::messagesBegin();
 
         $this->assertEquals(
-            [
-                [
-                    [
-                        0 => 'foo',
-                        'fresh' => false,
-                        'active' => false,
-                    ],
-                    [
-                        0 => 'bar',
-                        'fresh' => false,
-                        'active' => false,
-                    ],
-                ],
-            ],
+            [[[0 => 'foo', 'fresh' => false, 'active' => false], [0 => 'bar', 'fresh' => false, 'active' => false]]],
             $_SESSION['messages'],
         );
 
@@ -57,10 +39,7 @@ class IndexTest extends AbstractTestCase
         unset($_SESSION['messages']);
         SetupIndex::messagesBegin();
         $this->assertEquals(
-            [
-                'error' => [],
-                'notice' => [],
-            ],
+            ['error' => [], 'notice' => []],
             $_SESSION['messages'],
         );
     }
@@ -73,12 +52,7 @@ class IndexTest extends AbstractTestCase
         SetupIndex::messagesSet('type', '123', 'testTitle', 'msg');
 
         $this->assertEquals(
-            [
-                'fresh' => true,
-                'active' => true,
-                'title' => 'testTitle',
-                'message' => 'msg',
-            ],
+            ['fresh' => true, 'active' => true, 'title' => 'testTitle', 'message' => 'msg'],
             $_SESSION['messages']['type']['123'],
         );
     }
@@ -88,30 +62,12 @@ class IndexTest extends AbstractTestCase
      */
     public function testPMAmessagesEnd(): void
     {
-        $_SESSION['messages'] = [
-            [
-                [
-                    'msg' => 'foo',
-                    'active' => false,
-                ],
-                [
-                    'msg' => 'bar',
-                    'active' => true,
-                ],
-            ],
-        ];
+        $_SESSION['messages'] = [[['msg' => 'foo', 'active' => false], ['msg' => 'bar', 'active' => true]]];
 
         SetupIndex::messagesEnd();
 
         $this->assertEquals(
-            [
-                [
-                    '1' => [
-                        'msg' => 'bar',
-                        'active' => 1,
-                    ],
-                ],
-            ],
+            [['1' => ['msg' => 'bar', 'active' => 1]]],
             $_SESSION['messages'],
         );
     }
@@ -123,34 +79,14 @@ class IndexTest extends AbstractTestCase
     {
         $_SESSION['messages'] = [
             'type' => [
-                [
-                    'title' => 'foo',
-                    'message' => '123',
-                    'fresh' => false,
-                ],
-                [
-                    'title' => 'bar',
-                    'message' => '321',
-                    'fresh' => true,
-                ],
+                ['title' => 'foo', 'message' => '123', 'fresh' => false],
+                ['title' => 'bar', 'message' => '321', 'fresh' => true],
             ],
         ];
 
         $expected = [
-            [
-                'id' => 0,
-                'title' => 'foo',
-                'type' => 'type',
-                'message' => '123',
-                'is_hidden' => true,
-            ],
-            [
-                'id' => 1,
-                'title' => 'bar',
-                'type' => 'type',
-                'message' => '321',
-                'is_hidden' => false,
-            ],
+            ['id' => 0, 'title' => 'foo', 'type' => 'type', 'message' => '123', 'is_hidden' => true],
+            ['id' => 1, 'title' => 'bar', 'type' => 'type', 'message' => '321', 'is_hidden' => false],
         ];
 
         $this->assertEquals($expected, SetupIndex::messagesShowHtml());
diff --git a/test/classes/SqlQueryFormTest.php b/test/classes/SqlQueryFormTest.php
index 4d1f797d8a..789081ea18 100644
--- a/test/classes/SqlQueryFormTest.php
+++ b/test/classes/SqlQueryFormTest.php
@@ -38,16 +38,8 @@ class SqlQueryFormTest extends AbstractTestCase
         $this->dummyDbi = $this->createDbiDummy();
         $this->dummyDbi->addResult(
             'SHOW FULL COLUMNS FROM `PMA_db`.`PMA_table`',
-            [
-                [
-                    'field1',
-                    'Comment1',
-                ],
-            ],
-            [
-                'Field',
-                'Comment',
-            ],
+            [['field1', 'Comment1']],
+            ['Field', 'Comment'],
         );
 
         $this->dummyDbi->addResult(
diff --git a/test/classes/SqlTest.php b/test/classes/SqlTest.php
index 7fee495adf..aa5ced0f00 100644
--- a/test/classes/SqlTest.php
+++ b/test/classes/SqlTest.php
@@ -235,30 +235,18 @@ class SqlTest extends AbstractTestCase
         $col3 = new stdClass();
         $col3->table = 'table3';
 
-        $fieldsMeta = [
-            $col1,
-            $col2,
-            $col3,
-        ];
+        $fieldsMeta = [$col1, $col2, $col3];
         $this->assertFalse(
             $this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fieldsMeta]),
         );
 
         // should not matter on where the odd column occurs
-        $fieldsMeta = [
-            $col2,
-            $col3,
-            $col1,
-        ];
+        $fieldsMeta = [$col2, $col3, $col1];
         $this->assertFalse(
             $this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fieldsMeta]),
         );
 
-        $fieldsMeta = [
-            $col3,
-            $col1,
-            $col2,
-        ];
+        $fieldsMeta = [$col3, $col1, $col2];
         $this->assertFalse(
             $this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fieldsMeta]),
         );
@@ -275,11 +263,7 @@ class SqlTest extends AbstractTestCase
         $col2->table = 'table1';
         $col3 = new stdClass();
         $col3->table = 'table1';
-        $fieldsMeta = [
-            $col1,
-            $col2,
-            $col3,
-        ];
+        $fieldsMeta = [$col1, $col2, $col3];
 
         $this->assertTrue(
             $this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fieldsMeta]),
@@ -299,30 +283,18 @@ class SqlTest extends AbstractTestCase
         $col3 = new stdClass();
         $col3->table = 'table1';
 
-        $fieldsMeta = [
-            $col1,
-            $col2,
-            $col3,
-        ];
+        $fieldsMeta = [$col1, $col2, $col3];
         $this->assertTrue(
             $this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fieldsMeta]),
         );
 
         // should not matter on where the function column occurs
-        $fieldsMeta = [
-            $col2,
-            $col3,
-            $col1,
-        ];
+        $fieldsMeta = [$col2, $col3, $col1];
         $this->assertTrue(
             $this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fieldsMeta]),
         );
 
-        $fieldsMeta = [
-            $col3,
-            $col1,
-            $col2,
-        ];
+        $fieldsMeta = [$col3, $col1, $col2];
         $this->assertTrue(
             $this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fieldsMeta]),
         );
@@ -340,11 +312,7 @@ class SqlTest extends AbstractTestCase
         $col2->table = '';
         $col3 = new stdClass();
         $col3->table = '';
-        $fieldsMeta = [
-            $col1,
-            $col2,
-            $col3,
-        ];
+        $fieldsMeta = [$col1, $col2, $col3];
 
         $this->assertFalse(
             $this->callFunction($this->sql, Sql::class, 'resultSetHasJustOneTable', [$fieldsMeta]),
@@ -387,168 +355,34 @@ class SqlTest extends AbstractTestCase
                     . 'where al.successfull = 1 group by al.user_id ) AS `last_log` ON last_log.id = l.id'
                     . ' ) as cnt',
             ],
-            [
-                'SELECT * FROM company_users WHERE id != 0 LIMIT 0, 10',
-                ['max_rows' => 250],
-                -1,
-                -1,
-            ],
-            [
-                'SELECT * FROM company_users WHERE id != 0',
-                [
-                    'max_rows' => 250,
-                    'pos' => -1,
-                ],
-                -1,
-                -2,
-            ],
-            [
-                'SELECT * FROM company_users WHERE id != 0',
-                [
-                    'max_rows' => 250,
-                    'pos' => -1,
-                ],
-                -1,
-                -2,
-            ],
-            [
-                'SELECT * FROM company_users WHERE id != 0',
-                [
-                    'max_rows' => 250,
-                    'pos' => 250,
-                ],
-                -1,
-                249,
-            ],
-            [
-                'SELECT * FROM company_users WHERE id != 0',
-                [
-                    'max_rows' => 250,
-                    'pos' => 4,
-                ],
-                2,
-                6,
-            ],
-            [
-                'SELECT * FROM company_users WHERE id != 0',
-                [
-                    'max_rows' => 'all',
-                    'pos' => 4,
-                ],
-                2,
-                2,
-            ],
-            [
-                null,
-                [],
-                2,
-                0,
-            ],
-            [
-
-                'SELECT * FROM company_users LIMIT 1,4',
-                [
-                    'max_rows' => 10,
-                    'pos' => 4,
-                ],
-                20,
-                20,
-
-            ],
-            [
-
-                'SELECT * FROM company_users',
-                [
-                    'max_rows' => 10,
-                    'pos' => 4,
-                ],
-                20,
-                4,
-            ],
-            [
-
-                'SELECT * FROM company_users WHERE not_working_count != 0',
-                [
-                    'max_rows' => 10,
-                    'pos' => 4,
-                ],
-                20,
-                0,
-            ],
-            [
-
-                'SELECT * FROM company_users WHERE working_count = 0',
-                [
-                    'max_rows' => 10,
-                    'pos' => 4,
-                ],
-                20,
-                15,
-
-            ],
-            [
-                'UPDATE company_users SET a=1 WHERE working_count = 0',
-                [
-                    'max_rows' => 10,
-                    'pos' => 4,
-                ],
-                20,
-                20,
-            ],
-            [
-                'UPDATE company_users SET a=1 WHERE working_count = 0',
-                [
-                    'max_rows' => 'all',
-                    'pos' => 4,
-                ],
-                20,
-                20,
-            ],
-            [
-                'UPDATE company_users SET a=1 WHERE working_count = 0',
-                ['max_rows' => 15],
-                20,
-                20,
-            ],
-            [
-                'SELECT * FROM company_users WHERE id != 0',
-                [
-                    'max_rows' => 250,
-                    'pos' => 4,
-                ],
-                2,
-                6,
-                true,
-            ],
+            ['SELECT * FROM company_users WHERE id != 0 LIMIT 0, 10', ['max_rows' => 250], -1, -1],
+            ['SELECT * FROM company_users WHERE id != 0', ['max_rows' => 250, 'pos' => -1], -1, -2],
+            ['SELECT * FROM company_users WHERE id != 0', ['max_rows' => 250, 'pos' => -1], -1, -2],
+            ['SELECT * FROM company_users WHERE id != 0', ['max_rows' => 250, 'pos' => 250], -1, 249],
+            ['SELECT * FROM company_users WHERE id != 0', ['max_rows' => 250, 'pos' => 4], 2, 6],
+            ['SELECT * FROM company_users WHERE id != 0', ['max_rows' => 'all', 'pos' => 4], 2, 2],
+            [null, [], 2, 0],
+            ['SELECT * FROM company_users LIMIT 1,4', ['max_rows' => 10, 'pos' => 4], 20, 20],
+            ['SELECT * FROM company_users', ['max_rows' => 10, 'pos' => 4], 20, 4],
+            ['SELECT * FROM company_users WHERE not_working_count != 0', ['max_rows' => 10, 'pos' => 4], 20, 0],
+            ['SELECT * FROM company_users WHERE working_count = 0', ['max_rows' => 10, 'pos' => 4], 20, 15],
+            ['UPDATE company_users SET a=1 WHERE working_count = 0', ['max_rows' => 10, 'pos' => 4], 20, 20],
+            ['UPDATE company_users SET a=1 WHERE working_count = 0', ['max_rows' => 'all', 'pos' => 4], 20, 20],
+            ['UPDATE company_users SET a=1 WHERE working_count = 0', ['max_rows' => 15], 20, 20],
+            ['SELECT * FROM company_users WHERE id != 0', ['max_rows' => 250, 'pos' => 4], 2, 6, true],
             [
                 'SELECT *, (SELECT COUNT(*) FROM tbl1) as c1, (SELECT 1 FROM tbl2) as c2 '
                 . 'FROM company_users WHERE id != 0',
-                [
-                    'max_rows' => 250,
-                    'pos' => 4,
-                ],
+                ['max_rows' => 250, 'pos' => 4],
                 2,
                 6,
                 true,
             ],
-            [
-
-                'SELECT * FROM company_users',
-                [
-                    'max_rows' => 10,
-                    'pos' => 4,
-                ],
-                20,
-                18,
-                true,
-            ],
+            ['SELECT * FROM company_users', ['max_rows' => 10, 'pos' => 4], 20, 18, true],
             [
                 'SELECT *, 1, (SELECT COUNT(*) FROM tbl1) as c1, '
                 . '(SELECT 1 FROM tbl2) as c2 FROM company_users WHERE subquery_case = 0',
-                [
-                    'max_rows' => 10,
-                    'pos' => 4,
-                ],
+                ['max_rows' => 10, 'pos' => 4],
                 20,
                 42,
 
diff --git a/test/classes/StorageEngineTest.php b/test/classes/StorageEngineTest.php
index 3cdcb6346c..034650b3f9 100644
--- a/test/classes/StorageEngineTest.php
+++ b/test/classes/StorageEngineTest.php
@@ -71,26 +71,14 @@ class StorageEngineTest extends AbstractTestCase
     {
         $this->assertEquals(
             [
-                'dummy' => [
-                    'Engine' => 'dummy',
-                    'Support' => 'YES',
-                    'Comment' => 'dummy comment',
-                ],
-                'dummy2' => [
-                    'Engine' => 'dummy2',
-                    'Support' => 'NO',
-                    'Comment' => 'dummy2 comment',
-                ],
+                'dummy' => ['Engine' => 'dummy', 'Support' => 'YES', 'Comment' => 'dummy comment'],
+                'dummy2' => ['Engine' => 'dummy2', 'Support' => 'NO', 'Comment' => 'dummy2 comment'],
                 'FEDERATED' => [
                     'Engine' => 'FEDERATED',
                     'Support' => 'NO',
                     'Comment' => 'Federated MySQL storage engine',
                 ],
-                'Pbxt' => [
-                    'Engine' => 'Pbxt',
-                    'Support' => 'NO',
-                    'Comment' => 'Pbxt storage engine',
-                ],
+                'Pbxt' => ['Engine' => 'Pbxt', 'Support' => 'NO', 'Comment' => 'Pbxt storage engine'],
             ],
             $this->object->getStorageEngines(),
         );
@@ -101,13 +89,7 @@ class StorageEngineTest extends AbstractTestCase
         $actual = $this->object->getArray();
 
         $this->assertEquals(
-            [
-                'dummy' => [
-                    'name' => 'dummy',
-                    'comment' => 'dummy comment',
-                    'is_default' => false,
-                ],
-            ],
+            ['dummy' => ['name' => 'dummy', 'comment' => 'dummy comment', 'is_default' => false]],
             $actual,
         );
     }
@@ -135,58 +117,19 @@ class StorageEngineTest extends AbstractTestCase
     public static function providerGetEngine(): array
     {
         return [
-            [
-                StorageEngine::class,
-                'unknown engine',
-            ],
-            [
-                Bdb::class,
-                'Bdb',
-            ],
-            [
-                Berkeleydb::class,
-                'Berkeleydb',
-            ],
-            [
-                Binlog::class,
-                'Binlog',
-            ],
-            [
-                Innobase::class,
-                'Innobase',
-            ],
-            [
-                Innodb::class,
-                'Innodb',
-            ],
-            [
-                Memory::class,
-                'Memory',
-            ],
-            [
-                Merge::class,
-                'Merge',
-            ],
-            [
-                MrgMyisam::class,
-                'Mrg_Myisam',
-            ],
-            [
-                Myisam::class,
-                'Myisam',
-            ],
-            [
-                Ndbcluster::class,
-                'Ndbcluster',
-            ],
-            [
-                Pbxt::class,
-                'Pbxt',
-            ],
-            [
-                PerformanceSchema::class,
-                'Performance_Schema',
-            ],
+            [StorageEngine::class, 'unknown engine'],
+            [Bdb::class, 'Bdb'],
+            [Berkeleydb::class, 'Berkeleydb'],
+            [Binlog::class, 'Binlog'],
+            [Innobase::class, 'Innobase'],
+            [Innodb::class, 'Innodb'],
+            [Memory::class, 'Memory'],
+            [Merge::class, 'Merge'],
+            [MrgMyisam::class, 'Mrg_Myisam'],
+            [Myisam::class, 'Myisam'],
+            [Ndbcluster::class, 'Ndbcluster'],
+            [Pbxt::class, 'Pbxt'],
+            [PerformanceSchema::class, 'Performance_Schema'],
         ];
     }
 
@@ -321,10 +264,7 @@ class StorageEngineTest extends AbstractTestCase
     public function testResolveTypeSize(): void
     {
         $this->assertEquals(
-            [
-                0 => 12,
-                1 => 'B',
-            ],
+            [0 => 12, 1 => 'B'],
             $this->object->resolveTypeSize(12),
         );
     }
@@ -358,71 +298,20 @@ class StorageEngineTest extends AbstractTestCase
                         'name' => 'WGS84GeoPoint',
                         'opened' => true,
                         'n_elements' => 4,
-                        'type' => [
-                            'id' => 32,
-                            'name' => 'type',
-                        ],
-                        'flags' => [
-                            'value' => 24,
-                            'names' => 'KEY_GEO_POINT',
-                        ],
+                        'type' => ['id' => 32, 'name' => 'type'],
+                        'flags' => ['value' => 24, 'names' => 'KEY_GEO_POINT'],
                         'path' => null,
                         'size' => 8,
                     ],
-                    'mroonga_operations' => [
-                        'type' => [
-                            'id' => 51,
-                            'name' => 'table:no_key',
-                        ],
-                    ],
-                    'mroonga_operations.type' => [
-                        'type' => [
-                            'id' => 65,
-                            'name' => 'column:var_size',
-                        ],
-                    ],
-                    'mroonga_operations.table' => [
-                        'type' => [
-                            'id' => 65,
-                            'name' => 'column:var_size',
-                        ],
-                    ],
-                    'mroonga_operations.record' => [
-                        'type' => [
-                            'id' => 64,
-                            'name' => 'column:fix_size',
-                        ],
-                    ],
-                    'idx_correo' => [
-                        'type' => [
-                            'id' => 49,
-                            'name' => 'table:pat_key',
-                        ],
-                    ],
-                    'idx_correo.id' => [
-                        'type' => [
-                            'id' => 64,
-                            'name' => 'column:fix_size',
-                        ],
-                    ],
-                    'idx_correo.search' => [
-                        'type' => [
-                            'id' => 65,
-                            'name' => 'column:var_size',
-                        ],
-                    ],
-                    'idx_correo#idx_correo_search' => [
-                        'type' => [
-                            'id' => 49,
-                            'name' => 'table:pat_key',
-                        ],
-                    ],
-                    'idx_correo#idx_correo_search.index' => [
-                        'type' => [
-                            'id' => 72,
-                            'name' => 'column:index',
-                        ],
-                    ],
+                    'mroonga_operations' => ['type' => ['id' => 51, 'name' => 'table:no_key']],
+                    'mroonga_operations.type' => ['type' => ['id' => 65, 'name' => 'column:var_size']],
+                    'mroonga_operations.table' => ['type' => ['id' => 65, 'name' => 'column:var_size']],
+                    'mroonga_operations.record' => ['type' => ['id' => 64, 'name' => 'column:fix_size']],
+                    'idx_correo' => ['type' => ['id' => 49, 'name' => 'table:pat_key']],
+                    'idx_correo.id' => ['type' => ['id' => 64, 'name' => 'column:fix_size']],
+                    'idx_correo.search' => ['type' => ['id' => 65, 'name' => 'column:var_size']],
+                    'idx_correo#idx_correo_search' => ['type' => ['id' => 49, 'name' => 'table:pat_key']],
+                    'idx_correo#idx_correo_search.index' => ['type' => ['id' => 72, 'name' => 'column:index']],
                 ]),
             ],
         ]);
@@ -432,20 +321,9 @@ class StorageEngineTest extends AbstractTestCase
                 (string) json_encode([
                     'id' => 265,
                     'name' => 'idx_correo',
-                    'type' => [
-                        'id' => 49,
-                        'name' => 'table:pat_key',
-                    ],
+                    'type' => ['id' => 49, 'name' => 'table:pat_key'],
                     'key' => [
-                        'type' => [
-                            'id' => 8,
-                            'name' => 'Int32',
-                            'type' => [
-                                'id' => 32,
-                                'name' => 'type',
-                            ],
-                            'size' => 4,
-                        ],
+                        'type' => ['id' => 8, 'name' => 'Int32', 'type' => ['id' => 32,'name' => 'type'], 'size' => 4],
                         'total_size' => 0,
                         'max_total_size' => 4294967294,
                     ],
@@ -464,18 +342,12 @@ class StorageEngineTest extends AbstractTestCase
                     'table' => [
                         'id' => 265,
                         'name' => 'idx_correo',
-                        'type' => [
-                            'id' => 49,
-                            'name' => 'table:pat_key',
-                        ],
+                        'type' => ['id' => 49, 'name' => 'table:pat_key'],
                         'key' => [
                             'type' => [
                                 'id' => 8,
                                 'name' => 'Int32',
-                                'type' => [
-                                    'id' => 32,
-                                    'name' => 'type',
-                                ],
+                                'type' => ['id' => 32, 'name' => 'type'],
                                 'size' => 4,
                             ],
                             'total_size' => 0,
@@ -486,23 +358,9 @@ class StorageEngineTest extends AbstractTestCase
                         'disk_usage' => 4243456,
                     ],
                     'full_name' => 'idx_correo.id',
-                    'type' => [
-                        'name' => 'scalar',
-                        'raw' => [
-                            'id' => 64,
-                            'name' => 'column:fix_size',
-                        ],
-                    ],
+                    'type' => ['name' => 'scalar', 'raw' => ['id' => 64, 'name' => 'column:fix_size']],
                     'value' => [
-                        'type' => [
-                            'id' => 8,
-                            'name' => 'Int32',
-                            'type' => [
-                                'id' => 32,
-                                'name' => 'type',
-                            ],
-                            'size' => 4,
-                        ],
+                        'type' => ['id' => 8, 'name' => 'Int32', 'type' => ['id' => 32,'name' => 'type'], 'size' => 4],
                         'compress' => null,
                     ],
                     'disk_usage' => 4096,
@@ -518,18 +376,12 @@ class StorageEngineTest extends AbstractTestCase
                     'table' => [
                         'id' => 265,
                         'name' => 'idx_correo',
-                        'type' => [
-                            'id' => 49,
-                            'name' => 'table:pat_key',
-                        ],
+                        'type' => ['id' => 49, 'name' => 'table:pat_key'],
                         'key' => [
                             'type' => [
                                 'id' => 8,
                                 'name' => 'Int32',
-                                'type' => [
-                                    'id' => 32,
-                                    'name' => 'type',
-                                ],
+                                'type' => ['id' => 32, 'name' => 'type'],
                                 'size' => 4,
                             ],
                             'total_size' => 0,
@@ -540,21 +392,12 @@ class StorageEngineTest extends AbstractTestCase
                         'disk_usage' => 4243456,
                     ],
                     'full_name' => 'idx_correo.search',
-                    'type' => [
-                        'name' => 'scalar',
-                        'raw' => [
-                            'id' => 65,
-                            'name' => 'column:var_size',
-                        ],
-                    ],
+                    'type' => ['name' => 'scalar', 'raw' => ['id' => 65, 'name' => 'column:var_size']],
                     'value' => [
                         'type' => [
                             'id' => 16,
                             'name' => 'LongText',
-                            'type' => [
-                                'id' => 32,
-                                'name' => 'type',
-                            ],
+                            'type' => ['id' => 32, 'name' => 'type'],
                             'size' => 2147483648,
                         ],
                         'compress' => null,
@@ -569,18 +412,12 @@ class StorageEngineTest extends AbstractTestCase
                 (string) json_encode([
                     'id' => 268,
                     'name' => 'idx_correo#idx_correo_search',
-                    'type' => [
-                        'id' => 49,
-                        'name' => 'table:pat_key',
-                    ],
+                    'type' => ['id' => 49, 'name' => 'table:pat_key'],
                     'key' => [
                         'type' => [
                             'id' => 14,
                             'name' => 'ShortText',
-                            'type' => [
-                                'id' => 32,
-                                'name' => 'type',
-                            ],
+                            'type' => ['id' => 32, 'name' => 'type'],
                             'size' => 4096,
                         ],
                         'total_size' => 0,
@@ -601,18 +438,12 @@ class StorageEngineTest extends AbstractTestCase
                     'table' => [
                         'id' => 268,
                         'name' => 'idx_correo#idx_correo_search',
-                        'type' => [
-                            'id' => 49,
-                            'name' => 'table:pat_key',
-                        ],
+                        'type' => ['id' => 49, 'name' => 'table:pat_key'],
                         'key' => [
                             'type' => [
                                 'id' => 14,
                                 'name' => 'ShortText',
-                                'type' => [
-                                    'id' => 32,
-                                    'name' => 'type',
-                                ],
+                                'type' => ['id' => 32, 'name' => 'type'],
                                 'size' => 4096,
                             ],
                             'total_size' => 0,
@@ -623,21 +454,12 @@ class StorageEngineTest extends AbstractTestCase
                         'disk_usage' => 4243456,
                     ],
                     'full_name' => 'idx_correo#idx_correo_search.index',
-                    'type' => [
-                        'name' => 'index',
-                        'raw' => [
-                            'id' => 72,
-                            'name' => 'column:index',
-                        ],
-                    ],
+                    'type' => ['name' => 'index', 'raw' => ['id' => 72, 'name' => 'column:index']],
                     'value' => [
                         'type' => [
                             'id' => 265,
                             'name' => 'idx_correo',
-                            'type' => [
-                                'id' => 49,
-                                'name' => 'table:pat_key',
-                            ],
+                            'type' => ['id' => 49, 'name' => 'table:pat_key'],
                             'size' => 4,
                         ],
                         'section' => false,
@@ -681,18 +503,12 @@ class StorageEngineTest extends AbstractTestCase
                             'table' => [
                                 'id' => 265,
                                 'name' => 'idx_correo',
-                                'type' => [
-                                    'id' => 49,
-                                    'name' => 'table:pat_key',
-                                ],
+                                'type' => ['id' => 49, 'name' => 'table:pat_key'],
                                 'key' => [
                                     'type' => [
                                         'id' => 8,
                                         'name' => 'Int32',
-                                        'type' => [
-                                            'id' => 32,
-                                            'name' => 'type',
-                                        ],
+                                        'type' => ['id' => 32, 'name' => 'type'],
                                         'size' => 4,
                                     ],
                                     'total_size' => 0,
diff --git a/test/classes/Stubs/DbiDummy.php b/test/classes/Stubs/DbiDummy.php
index 3374d7eeff..ca763003d2 100644
--- a/test/classes/Stubs/DbiDummy.php
+++ b/test/classes/Stubs/DbiDummy.php
@@ -535,22 +535,10 @@ class DbiDummy implements DbiExtension
          * Array of queries this "driver" supports
          */
         $this->dummyQueries = [
-            [
-                'query' => 'SELECT 1',
-                'result' => [['1']],
-            ],
-            [
-                'query' => 'SELECT CURRENT_USER();',
-                'result' => [['pma_test@localhost']],
-            ],
-            [
-                'query' => "SHOW VARIABLES LIKE 'lower_case_table_names'",
-                'result' => [['lower_case_table_names', '1']],
-            ],
-            [
-                'query' => 'SELECT 1 FROM mysql.user LIMIT 1',
-                'result' => [['1']],
-            ],
+            ['query' => 'SELECT 1', 'result' => [['1']]],
+            ['query' => 'SELECT CURRENT_USER();', 'result' => [['pma_test@localhost']]],
+            ['query' => "SHOW VARIABLES LIKE 'lower_case_table_names'", 'result' => [['lower_case_table_names','1']]],
+            ['query' => 'SELECT 1 FROM mysql.user LIMIT 1', 'result' => [['1']]],
             [
                 'query' => 'SELECT 1 FROM `INFORMATION_SCHEMA`.`USER_PRIVILEGES`'
                     . " WHERE `PRIVILEGE_TYPE` = 'CREATE USER'"
@@ -572,40 +560,15 @@ class DbiDummy implements DbiExtension
             ],
             [
                 'query' => 'SHOW MASTER LOGS',
-                'result' => [
-                    [
-                        'Log_name' => 'index1',
-                        'File_size' => 100,
-                    ],
-                    [
-                        'Log_name' => 'index2',
-                        'File_size' => 200,
-                    ],
-                ],
+                'result' => [['Log_name' => 'index1','File_size' => 100], ['Log_name' => 'index2','File_size' => 200]],
             ],
             [
                 'query' => 'SHOW STORAGE ENGINES',
                 'result' => [
-                    [
-                        'Engine' => 'dummy',
-                        'Support' => 'YES',
-                        'Comment' => 'dummy comment',
-                    ],
-                    [
-                        'Engine' => 'dummy2',
-                        'Support' => 'NO',
-                        'Comment' => 'dummy2 comment',
-                    ],
-                    [
-                        'Engine' => 'FEDERATED',
-                        'Support' => 'NO',
-                        'Comment' => 'Federated MySQL storage engine',
-                    ],
-                    [
-                        'Engine' => 'Pbxt',
-                        'Support' => 'NO',
-                        'Comment' => 'Pbxt storage engine',
-                    ],
+                    ['Engine' => 'dummy', 'Support' => 'YES', 'Comment' => 'dummy comment'],
+                    ['Engine' => 'dummy2', 'Support' => 'NO', 'Comment' => 'dummy2 comment'],
+                    ['Engine' => 'FEDERATED', 'Support' => 'NO', 'Comment' => 'Federated MySQL storage engine'],
+                    ['Engine' => 'Pbxt', 'Support' => 'NO', 'Comment' => 'Pbxt storage engine'],
                 ],
             ],
             [
@@ -613,237 +576,67 @@ class DbiDummy implements DbiExtension
                     . ' LIKE \'Innodb\\_buffer\\_pool\\_%\''
                     . ' OR Variable_name = \'Innodb_page_size\';',
                 'result' => [
-                    [
-                        'Innodb_buffer_pool_pages_data',
-                        0,
-                    ],
-                    [
-                        'Innodb_buffer_pool_pages_dirty',
-                        0,
-                    ],
-                    [
-                        'Innodb_buffer_pool_pages_flushed',
-                        0,
-                    ],
-                    [
-                        'Innodb_buffer_pool_pages_free',
-                        0,
-                    ],
-                    [
-                        'Innodb_buffer_pool_pages_misc',
-                        0,
-                    ],
-                    [
-                        'Innodb_buffer_pool_pages_total',
-                        4096,
-                    ],
-                    [
-                        'Innodb_buffer_pool_read_ahead_rnd',
-                        0,
-                    ],
-                    [
-                        'Innodb_buffer_pool_read_ahead',
-                        0,
-                    ],
-                    [
-                        'Innodb_buffer_pool_read_ahead_evicted',
-                        0,
-                    ],
-                    [
-                        'Innodb_buffer_pool_read_requests',
-                        64,
-                    ],
-                    [
-                        'Innodb_buffer_pool_reads',
-                        32,
-                    ],
-                    [
-                        'Innodb_buffer_pool_wait_free',
-                        0,
-                    ],
-                    [
-                        'Innodb_buffer_pool_write_requests',
-                        64,
-                    ],
-                    [
-                        'Innodb_page_size',
-                        16384,
-                    ],
+                    ['Innodb_buffer_pool_pages_data', 0],
+                    ['Innodb_buffer_pool_pages_dirty', 0],
+                    ['Innodb_buffer_pool_pages_flushed', 0],
+                    ['Innodb_buffer_pool_pages_free', 0],
+                    ['Innodb_buffer_pool_pages_misc', 0],
+                    ['Innodb_buffer_pool_pages_total', 4096],
+                    ['Innodb_buffer_pool_read_ahead_rnd', 0],
+                    ['Innodb_buffer_pool_read_ahead', 0],
+                    ['Innodb_buffer_pool_read_ahead_evicted', 0],
+                    ['Innodb_buffer_pool_read_requests', 64],
+                    ['Innodb_buffer_pool_reads', 32],
+                    ['Innodb_buffer_pool_wait_free', 0],
+                    ['Innodb_buffer_pool_write_requests', 64],
+                    ['Innodb_page_size', 16384],
                 ],
             ],
-            [
-                'query' => 'SHOW ENGINE INNODB STATUS;',
-                'result' => false,
-            ],
-            [
-                'query' => 'SELECT @@innodb_version;',
-                'result' => [
-                    ['1.1.8'],
-                ],
-            ],
-            [
-                'query' => 'SELECT @@disabled_storage_engines',
-                'result' => [
-                    [''],
-                ],
-            ],
-            [
-                'query' => 'SHOW GLOBAL VARIABLES ;',
-                'result' => [],
-            ],
+            ['query' => 'SHOW ENGINE INNODB STATUS;', 'result' => false],
+            ['query' => 'SELECT @@innodb_version;', 'result' => [['1.1.8']]],
+            ['query' => 'SELECT @@disabled_storage_engines', 'result' => [['']]],
+            ['query' => 'SHOW GLOBAL VARIABLES ;', 'result' => []],
             [
                 'query' => 'SHOW GLOBAL VARIABLES LIKE \'innodb_file_per_table\';',
-                'result' => [
-                    [
-                        'innodb_file_per_table',
-                        'OFF',
-                    ],
-                ],
+                'result' => [['innodb_file_per_table', 'OFF']],
             ],
             [
                 'query' => 'SHOW GLOBAL VARIABLES LIKE \'innodb_file_format\';',
-                'result' => [
-                    [
-                        'innodb_file_format',
-                        'Antelope',
-                    ],
-                ],
-            ],
-            [
-                'query' => 'SELECT @@collation_server',
-                'result' => [
-                    ['utf8_general_ci'],
-                ],
-            ],
-            [
-                'query' => 'SELECT @@lc_messages;',
-                'result' => [],
+                'result' => [['innodb_file_format', 'Antelope']],
             ],
+            ['query' => 'SELECT @@collation_server', 'result' => [['utf8_general_ci']]],
+            ['query' => 'SELECT @@lc_messages;', 'result' => []],
             [
                 'query' => 'SHOW SESSION VARIABLES LIKE \'FOREIGN_KEY_CHECKS\';',
-                'result' => [
-                    [
-                        'foreign_key_checks',
-                        'ON',
-                    ],
-                ],
-            ],
-            [
-                'query' => 'SHOW TABLES FROM `pma_test`;',
-                'result' => [
-                    ['table1'],
-                    ['table2'],
-                ],
-            ],
-            [
-                'query' => 'SHOW TABLES FROM `pmadb`',
-                'result' => [
-                    ['column_info'],
-                ],
+                'result' => [['foreign_key_checks', 'ON']],
             ],
+            ['query' => 'SHOW TABLES FROM `pma_test`;', 'result' => [['table1'], ['table2']]],
+            ['query' => 'SHOW TABLES FROM `pmadb`', 'result' => [['column_info']]],
             [
                 'query' => 'SHOW COLUMNS FROM `pma_test`.`table1`',
-                'columns' => [
-                    'Field',
-                    'Type',
-                    'Null',
-                    'Key',
-                    'Default',
-                    'Extra',
-                ],
+                'columns' => ['Field', 'Type', 'Null', 'Key', 'Default', 'Extra'],
                 'result' => [
-                    [
-                        'i',
-                        'int(11)',
-                        'NO',
-                        'PRI',
-                        'NULL',
-                        'auto_increment',
-                    ],
-                    [
-                        'o',
-                        'int(11)',
-                        'NO',
-                        'MUL',
-                        'NULL',
-                        '',
-                    ],
+                    ['i', 'int(11)', 'NO', 'PRI', 'NULL', 'auto_increment'],
+                    ['o', 'int(11)', 'NO', 'MUL', 'NULL', ''],
                 ],
             ],
-            [
-                'query' => 'SHOW INDEXES FROM `pma_test`.`table1` WHERE (Non_unique = 0)',
-                'result' => [],
-            ],
+            ['query' => 'SHOW INDEXES FROM `pma_test`.`table1` WHERE (Non_unique = 0)', 'result' => []],
             [
                 'query' => 'SHOW COLUMNS FROM `pma_test`.`table2`',
-                'columns' => [
-                    'Field',
-                    'Type',
-                    'Null',
-                    'Key',
-                    'Default',
-                    'Extra',
-                ],
+                'columns' => ['Field', 'Type', 'Null', 'Key', 'Default', 'Extra'],
                 'result' => [
-                    [
-                        'i',
-                        'int(11)',
-                        'NO',
-                        'PRI',
-                        'NULL',
-                        'auto_increment',
-                    ],
-                    [
-                        'o',
-                        'int(11)',
-                        'NO',
-                        'MUL',
-                        'NULL',
-                        '',
-                    ],
+                    ['i', 'int(11)', 'NO', 'PRI', 'NULL', 'auto_increment'],
+                    ['o', 'int(11)', 'NO', 'MUL', 'NULL', ''],
                 ],
             ],
-            [
-                'query' => 'SHOW INDEXES FROM `pma_test`.`table1`',
-                'result' => [],
-            ],
-            [
-                'query' => 'SHOW INDEXES FROM `pma_test`.`table2`',
-                'result' => [],
-            ],
+            ['query' => 'SHOW INDEXES FROM `pma_test`.`table1`', 'result' => []],
+            ['query' => 'SHOW INDEXES FROM `pma_test`.`table2`', 'result' => []],
             [
                 'query' => 'SHOW COLUMNS FROM `pma`.`table1`',
-                'columns' => [
-                    'Field',
-                    'Type',
-                    'Null',
-                    'Key',
-                    'Default',
-                    'Extra',
-                    'Privileges',
-                    'Comment',
-                ],
+                'columns' => ['Field', 'Type', 'Null', 'Key', 'Default', 'Extra', 'Privileges', 'Comment'],
                 'result' => [
-                    [
-                        'i',
-                        'int(11)',
-                        'NO',
-                        'PRI',
-                        'NULL',
-                        'auto_increment',
-                        'select,insert,update,references',
-                        '',
-                    ],
-                    [
-                        'o',
-                        'varchar(100)',
-                        'NO',
-                        'MUL',
-                        'NULL',
-                        '',
-                        'select,insert,update,references',
-                        '',
-                    ],
+                    ['i', 'int(11)', 'NO', 'PRI', 'NULL', 'auto_increment', 'select,insert,update,references', ''],
+                    ['o', 'varchar(100)', 'NO', 'MUL', 'NULL', '', 'select,insert,update,references', ''],
                 ],
             ],
             [
@@ -852,37 +645,12 @@ class DbiDummy implements DbiExtension
                     . ' `DESCRIPTION` AS `Description`,'
                     . ' `MAXLEN` AS `Maxlen`'
                     . ' FROM `information_schema`.`CHARACTER_SETS`',
-                'columns' => [
-                    'Charset',
-                    'Default collation',
-                    'Description',
-                    'Maxlen',
-                ],
+                'columns' => ['Charset', 'Default collation', 'Description', 'Maxlen'],
                 'result' => [
-                    [
-                        'armscii8',
-                        'ARMSCII-8 Armenian',
-                        'armscii8_general_ci',
-                        '1',
-                    ],
-                    [
-                        'utf8',
-                        'utf8_general_ci',
-                        'UTF-8 Unicode',
-                        '3',
-                    ],
-                    [
-                        'utf8mb4',
-                        'UTF-8 Unicode',
-                        'utf8mb4_0900_ai_ci',
-                        '4',
-                    ],
-                    [
-                        'latin1',
-                        'latin1_swedish_ci',
-                        'cp1252 West European',
-                        '1',
-                    ],
+                    ['armscii8', 'ARMSCII-8 Armenian', 'armscii8_general_ci', '1'],
+                    ['utf8', 'utf8_general_ci', 'UTF-8 Unicode', '3'],
+                    ['utf8mb4', 'UTF-8 Unicode', 'utf8mb4_0900_ai_ci', '4'],
+                    ['latin1', 'latin1_swedish_ci', 'cp1252 West European', '1'],
                 ],
             ],
             [
@@ -893,55 +661,13 @@ class DbiDummy implements DbiExtension
                     . ' `IS_COMPILED` AS `Compiled`,'
                     . ' `SORTLEN` AS `Sortlen`'
                     . ' FROM `information_schema`.`COLLATIONS`',
-                'columns' => [
-                    'Collation',
-                    'Charset',
-                    'Id',
-                    'Default',
-                    'Compiled',
-                    'Sortlen',
-                ],
+                'columns' => ['Collation', 'Charset', 'Id', 'Default', 'Compiled', 'Sortlen'],
                 'result' => [
-                    [
-                        'utf8mb4_general_ci',
-                        'utf8mb4',
-                        '45',
-                        'Yes',
-                        'Yes',
-                        '1',
-                    ],
-                    [
-                        'armscii8_general_ci',
-                        'armscii8',
-                        '32',
-                        'Yes',
-                        'Yes',
-                        '1',
-                    ],
-                    [
-                        'utf8_general_ci',
-                        'utf8',
-                        '33',
-                        'Yes',
-                        'Yes',
-                        '1',
-                    ],
-                    [
-                        'utf8_bin',
-                        'utf8',
-                        '83',
-                        '',
-                        'Yes',
-                        '1',
-                    ],
-                    [
-                        'latin1_swedish_ci',
-                        'latin1',
-                        '8',
-                        'Yes',
-                        'Yes',
-                        '1',
-                    ],
+                    ['utf8mb4_general_ci', 'utf8mb4', '45', 'Yes', 'Yes', '1'],
+                    ['armscii8_general_ci', 'armscii8', '32', 'Yes', 'Yes', '1'],
+                    ['utf8_general_ci', 'utf8', '33', 'Yes', 'Yes', '1'],
+                    ['utf8_bin', 'utf8', '83', '', 'Yes', '1'],
+                    ['latin1_swedish_ci', 'latin1', '8', 'Yes', 'Yes', '1'],
                 ],
             ],
             [
@@ -967,24 +693,7 @@ class DbiDummy implements DbiExtension
                     'input_transformation',
                     'input_transformation_options',
                 ],
-                'result' => [
-                    [
-                        'o',
-                        'text/plain',
-                        'sql',
-                        '',
-                        'regex',
-                        '/pma/i',
-                    ],
-                    [
-                        'col',
-                        't',
-                        'o/p',
-                        '',
-                        'i/p',
-                        '',
-                    ],
-                ],
+                'result' => [['o','text/plain','sql','','regex','/pma/i'], ['col','t','o/p','','i/p','']],
             ],
             [
                 'query' => 'SELECT `column_name`, `mimetype`, `transformation`,'
@@ -1005,22 +714,8 @@ class DbiDummy implements DbiExtension
                     'input_transformation_options',
                 ],
                 'result' => [
-                    [
-                        'vc',
-                        '',
-                        'output/text_plain_json.php',
-                        '',
-                        'Input/Text_Plain_JsonEditor.php',
-                        '',
-                    ],
-                    [
-                        'vc',
-                        '',
-                        'output/text_plain_formatted.php',
-                        '',
-                        'Text_Plain_Substring.php',
-                        '1',
-                    ],
+                    ['vc', '', 'output/text_plain_json.php', '', 'Input/Text_Plain_JsonEditor.php', ''],
+                    ['vc', '', 'output/text_plain_formatted.php', '', 'Text_Plain_Substring.php', '1'],
                 ],
             ],
             [
@@ -1042,22 +737,8 @@ class DbiDummy implements DbiExtension
                     'input_transformation_options',
                 ],
                 'result' => [
-                    [
-                        'vc',
-                        '',
-                        'output/text_plain_json.php',
-                        '',
-                        'Input/Text_Plain_JsonEditor.php',
-                        '',
-                    ],
-                    [
-                        'vc',
-                        '',
-                        'output/text_plain_formatted.php',
-                        '',
-                        'Text_Plain_Substring.php',
-                        '1',
-                    ],
+                    ['vc', '', 'output/text_plain_json.php', '', 'Input/Text_Plain_JsonEditor.php', ''],
+                    ['vc', '', 'output/text_plain_formatted.php', '', 'Text_Plain_Substring.php', '1'],
                 ],
             ],
             [
@@ -1259,10 +940,7 @@ class DbiDummy implements DbiExtension
                 ],
                 'result' => [],
             ],
-            [
-                'query' => 'SELECT COUNT(*) FROM `pma_test`.`table1`',
-                'result' => [],
-            ],
+            ['query' => 'SELECT COUNT(*) FROM `pma_test`.`table1`', 'result' => []],
             [
                 'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
                     . '`USER_PRIVILEGES`'
@@ -1309,10 +987,7 @@ class DbiDummy implements DbiExtension
                     . ' AND TABLE_SCHEMA=\'pma\\\\_test\' AND TABLE_NAME=\'table1\'',
                 'result' => [],
             ],
-            [
-                'query' => 'RENAME TABLE `pma_test`.`table1` TO `pma_test`.`table3`;',
-                'result' => [],
-            ],
+            ['query' => 'RENAME TABLE `pma_test`.`table1` TO `pma_test`.`table3`;', 'result' => []],
             [
                 'query' => 'SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION,'
                     . ' EVENT_OBJECT_TABLE, ACTION_TIMING, ACTION_STATEMENT, '
@@ -1322,10 +997,7 @@ class DbiDummy implements DbiExtension
                     . ' AND EVENT_OBJECT_TABLE = \'table1\';',
                 'result' => [],
             ],
-            [
-                'query' => 'SHOW TABLES FROM `pma`;',
-                'result' => [],
-            ],
+            ['query' => 'SHOW TABLES FROM `pma`;', 'result' => []],
             [
                 'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
                     . "`SCHEMA_PRIVILEGES` WHERE GRANTEE='''pma_test''@''localhost'''"
@@ -1348,30 +1020,17 @@ class DbiDummy implements DbiExtension
                 'query' => 'SELECT DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA'
                     . ' WHERE SCHEMA_NAME = \'pma_test\' LIMIT 1',
                 'columns' => ['DEFAULT_COLLATION_NAME'],
-                'result' => [
-                    ['utf8_general_ci'],
-                ],
-            ],
-            [
-                'query' => 'SELECT @@collation_database',
-                'columns' => ['@@collation_database'],
-                'result' => [
-                    ['bar'],
-                ],
-            ],
-            [
-                'query' => 'SHOW TABLES FROM `phpmyadmin`',
-                'result' => [],
+                'result' => [['utf8_general_ci']],
             ],
+            ['query' => 'SELECT @@collation_database', 'columns' => ['@@collation_database'], 'result' => [['bar']]],
+            ['query' => 'SHOW TABLES FROM `phpmyadmin`', 'result' => []],
             [
                 'query' => 'SELECT tracking_active FROM `pmadb`.`tracking`' .
                     " WHERE db_name = 'pma_test_db'" .
                     " AND table_name = 'pma_test_table'" .
                     ' ORDER BY version DESC LIMIT 1',
                 'columns' => ['tracking_active'],
-                'result' => [
-                    [1],
-                ],
+                'result' => [[1]],
             ],
             [
                 'query' => 'SELECT tracking_active FROM `pmadb`.`tracking`' .
@@ -1431,10 +1090,7 @@ class DbiDummy implements DbiExtension
                     ],
                 ],
             ],
-            [
-                'query' => 'SHOW GRANTS',
-                'result' => [],
-            ],
+            ['query' => 'SHOW GRANTS', 'result' => []],
             [
                 'query' => 'SELECT `SCHEMA_NAME` FROM `INFORMATION_SCHEMA`.`SCHEMATA`, '
                     . '(SELECT DB_first_level FROM ( SELECT DISTINCT '
@@ -1444,17 +1100,13 @@ class DbiDummy implements DbiExtension
                     . "CONCAT(DB_first_level, '_'), CONCAT(SCHEMA_NAME, '_')) "
                     . 'ORDER BY SCHEMA_NAME ASC',
                 'columns' => ['SCHEMA_NAME'],
-                'result' => [
-                    ['test'],
-                ],
+                'result' => [['test']],
             ],
             [
                 'query' => 'SELECT COUNT(*) FROM ( SELECT DISTINCT SUBSTRING_INDEX('
                     . "SCHEMA_NAME, '_', 1) DB_first_level "
                     . 'FROM INFORMATION_SCHEMA.SCHEMATA WHERE TRUE ) t',
-                'result' => [
-                    [1],
-                ],
+                'result' => [[1]],
             ],
             [
                 'query' => 'SELECT `PARTITION_METHOD` '
@@ -1525,58 +1177,22 @@ class DbiDummy implements DbiExtension
             ],
             [
                 'query' => "SHOW FULL TABLES FROM `default` WHERE `Table_type` IN('BASE TABLE', 'SYSTEM VERSIONED')",
-                'result' => [
-                    [
-                        'test1',
-                        'BASE TABLE',
-                    ],
-                    [
-                        'test2',
-                        'BASE TABLE',
-                    ],
-                ],
+                'result' => [['test1', 'BASE TABLE'], ['test2', 'BASE TABLE']],
             ],
             [
                 'query' => 'SHOW FULL TABLES FROM `default` '
                     . "WHERE `Table_type` NOT IN('BASE TABLE', 'SYSTEM VERSIONED')",
                 'result' => [],
             ],
-            [
-                'query' => "SHOW FUNCTION STATUS WHERE `Db`='default'",
-                'result' => [['Name' => 'testFunction']],
-            ],
-            [
-                'query' => "SHOW PROCEDURE STATUS WHERE `Db`='default'",
-                'result' => [],
-            ],
-            [
-                'query' => 'SHOW EVENTS FROM `default`',
-                'result' => [],
-            ],
-            [
-                'query' => 'FLUSH PRIVILEGES',
-                'result' => [],
-            ],
-            [
-                'query' => 'SELECT * FROM `mysql`.`db` LIMIT 1',
-                'result' => [],
-            ],
-            [
-                'query' => 'SELECT * FROM `mysql`.`columns_priv` LIMIT 1',
-                'result' => [],
-            ],
-            [
-                'query' => 'SELECT * FROM `mysql`.`tables_priv` LIMIT 1',
-                'result' => [],
-            ],
-            [
-                'query' => 'SELECT * FROM `mysql`.`procs_priv` LIMIT 1',
-                'result' => [],
-            ],
-            [
-                'query' => 'DELETE FROM `mysql`.`db` WHERE `host` = "" AND `Db` = "" AND `User` = ""',
-                'result' => true,
-            ],
+            ['query' => "SHOW FUNCTION STATUS WHERE `Db`='default'", 'result' => [['Name' => 'testFunction']]],
+            ['query' => "SHOW PROCEDURE STATUS WHERE `Db`='default'", 'result' => []],
+            ['query' => 'SHOW EVENTS FROM `default`', 'result' => []],
+            ['query' => 'FLUSH PRIVILEGES', 'result' => []],
+            ['query' => 'SELECT * FROM `mysql`.`db` LIMIT 1', 'result' => []],
+            ['query' => 'SELECT * FROM `mysql`.`columns_priv` LIMIT 1', 'result' => []],
+            ['query' => 'SELECT * FROM `mysql`.`tables_priv` LIMIT 1', 'result' => []],
+            ['query' => 'SELECT * FROM `mysql`.`procs_priv` LIMIT 1', 'result' => []],
+            ['query' => 'DELETE FROM `mysql`.`db` WHERE `host` = "" AND `Db` = "" AND `User` = ""', 'result' => true],
             [
                 'query' => 'DELETE FROM `mysql`.`columns_priv` WHERE `host` = "" AND `Db` = "" AND `User` = ""',
                 'result' => true,
@@ -1599,9 +1215,7 @@ class DbiDummy implements DbiExtension
             ],
             [
                 'query' => 'SELECT @@default_authentication_plugin',
-                'result' => [
-                    ['@@default_authentication_plugin' => 'mysql_native_password'],
-                ],
+                'result' => [['@@default_authentication_plugin' => 'mysql_native_password']],
             ],
             [
                 'query' => 'SELECT TABLE_NAME FROM information_schema.VIEWS WHERE '
@@ -1628,10 +1242,7 @@ class DbiDummy implements DbiExtension
                     . "AND t.`TABLE_NAME` = 'table' ORDER BY Name ASC",
                 'result' => [],
             ],
-            [
-                'query' => "SHOW TABLE STATUS FROM `db` WHERE `Name` LIKE 'table%'",
-                'result' => [],
-            ],
+            ['query' => "SHOW TABLE STATUS FROM `db` WHERE `Name` LIKE 'table%'", 'result' => []],
             [
                 'query' => "SHOW TABLE STATUS FROM `my_dataset` WHERE `Name` LIKE 'company\\\\_users%'",
                 'columns' => [
@@ -1745,23 +1356,8 @@ class DbiDummy implements DbiExtension
                     . ' FROM (SELECT BINARY s.SCHEMA_NAME AS BIN_NAME, s.DEFAULT_COLLATION_NAME'
                     . ' FROM `information_schema`.SCHEMATA s GROUP BY BINARY s.SCHEMA_NAME,'
                     . ' s.DEFAULT_COLLATION_NAME ORDER BY BINARY `SCHEMA_NAME` ASC) a',
-                'columns' => [
-                    'BIN_NAME',
-                    'DEFAULT_COLLATION_NAME',
-                    'SCHEMA_NAME',
-                ],
-                'result' => [
-                    [
-                        'sakila',
-                        'utf8_general_ci',
-                        'sakila',
-                    ],
-                    [
-                        'employees',
-                        'latin1_swedish_ci',
-                        'employees',
-                    ],
-                ],
+                'columns' => ['BIN_NAME', 'DEFAULT_COLLATION_NAME', 'SCHEMA_NAME'],
+                'result' => [['sakila','utf8_general_ci','sakila'], ['employees','latin1_swedish_ci','employees']],
             ],
 
             [
@@ -1788,17 +1384,7 @@ class DbiDummy implements DbiExtension
                     'SCHEMA_NAME',
                 ],
                 'result' => [
-                    [
-                        'sakila',
-                        'utf8_general_ci',
-                        '23',
-                        '47274',
-                        '4358144',
-                        '2392064',
-                        '6750208',
-                        '0',
-                        'sakila',
-                    ],
+                    ['sakila', 'utf8_general_ci', '23', '47274', '4358144', '2392064', '6750208', '0', 'sakila'],
                     [
                         'employees',
                         'latin1_swedish_ci',
@@ -1812,14 +1398,8 @@ class DbiDummy implements DbiExtension
                     ],
                 ],
             ],
-            [
-                'query' => 'SELECT @@have_partitioning;',
-                'result' => [],
-            ],
-            [
-                'query' => 'SELECT @@lower_case_table_names',
-                'result' => [['0']],
-            ],
+            ['query' => 'SELECT @@have_partitioning;', 'result' => []],
+            ['query' => 'SELECT @@lower_case_table_names', 'result' => [['0']]],
             [
                 'query' => 'SELECT `PLUGIN_NAME`, `PLUGIN_DESCRIPTION` FROM `information_schema`.`PLUGINS`'
                     . ' WHERE `PLUGIN_TYPE` = \'AUTHENTICATION\';',
@@ -1833,10 +1413,7 @@ class DbiDummy implements DbiExtension
                     ['unknown_auth_plugin', 'Unknown authentication'],
                 ],
             ],
-            [
-                'query' => 'SHOW TABLES FROM `db`;',
-                'result' => [],
-            ],
+            ['query' => 'SHOW TABLES FROM `db`;', 'result' => []],
             [
                 'query' => 'SELECT `PRIVILEGE_TYPE` FROM '
                     . '`INFORMATION_SCHEMA`.`SCHEMA_PRIVILEGES` '
@@ -1876,10 +1453,7 @@ class DbiDummy implements DbiExtension
                     . "CONCAT(SCHEMA_NAME, '_')) ORDER BY SCHEMA_NAME ASC",
                 'result' => [],
             ],
-            [
-                'query' => 'SELECT @@ndb_version_string',
-                'result' => [['ndb-7.4.10']],
-            ],
+            ['query' => 'SELECT @@ndb_version_string', 'result' => [['ndb-7.4.10']]],
             [
                 'query' => 'SELECT *, `COLUMN_NAME` AS `Field`, `COLUMN_TYPE` AS'
                     . ' `Type`, `COLLATION_NAME` AS `Collation`, `IS_NULLABLE` AS'
@@ -1908,28 +1482,17 @@ class DbiDummy implements DbiExtension
                 'query' => 'SELECT `item_name`, `item_type` FROM `pmadb`.`navigationhiding`'
                     . " WHERE `username`='user' AND `db_name`='db' AND `table_name`=''",
                 'result' => [
-                    [
-                        'item_name' => 'tableName',
-                        'item_type' => 'table',
-                    ],
-                    [
-                        'item_name' => 'viewName',
-                        'item_type' => 'view',
-                    ],
+                    ['item_name' => 'tableName', 'item_type' => 'table'],
+                    ['item_name' => 'viewName', 'item_type' => 'view'],
                 ],
             ],
             [
                 'query' => 'SELECT `Table_priv` FROM `mysql`.`tables_priv` WHERE `User` ='
                     . ' \'PMA_username\' AND `Host` = \'PMA_hostname\' AND `Db` ='
                     . ' \'PMA_db\' AND `Table_name` = \'PMA_table\';',
-                'result' => [
-                    ['Table_priv' => 'Select,Insert,Update,References,Create View,Show view'],
-                ],
-            ],
-            [
-                'query' => 'SHOW COLUMNS FROM `my_db`.`test_tbl`',
-                'result' => [],
+                'result' => [['Table_priv' => 'Select,Insert,Update,References,Create View,Show view']],
             ],
+            ['query' => 'SHOW COLUMNS FROM `my_db`.`test_tbl`', 'result' => []],
             [
                 'query' => 'SHOW COLUMNS FROM `mysql`.`tables_priv` LIKE \'Table_priv\';',
                 'result' => [
@@ -1938,63 +1501,19 @@ class DbiDummy implements DbiExtension
             ],
             [
                 'query' => 'SHOW COLUMNS FROM `PMA_db`.`PMA_table`;',
-                'columns' => [
-                    'Field',
-                    'Type',
-                    'Null',
-                    'Key',
-                    'Default',
-                    'Extra',
-                ],
+                'columns' => ['Field', 'Type', 'Null', 'Key', 'Default', 'Extra'],
                 'result' => [
-                    [
-                        'id',
-                        'int(11)',
-                        'NO',
-                        'PRI',
-                        null,
-                        'auto_increment',
-                    ],
-                    [
-                        'name',
-                        'varchar(20)',
-                        'NO',
-                        '',
-                        null,
-                        '',
-                    ],
-                    [
-                        'datetimefield',
-                        'datetime',
-                        'NO',
-                        '',
-                        null,
-                        '',
-                    ],
+                    ['id', 'int(11)', 'NO', 'PRI', null, 'auto_increment'],
+                    ['name', 'varchar(20)', 'NO', '', null, ''],
+                    ['datetimefield', 'datetime', 'NO', '', null, ''],
                 ],
             ],
             [
                 'query' => 'SELECT `Column_name`, `Column_priv` FROM `mysql`.`columns_priv`'
                     . ' WHERE `User` = \'PMA_username\' AND `Host` = \'PMA_hostname\' AND'
                     . ' `Db` = \'PMA_db\' AND `Table_name` = \'PMA_table\';',
-                'columns' => [
-                    'Column_name',
-                    'Column_priv',
-                ],
-                'result' => [
-                    [
-                        'id',
-                        'Select',
-                    ],
-                    [
-                        'name',
-                        'Select',
-                    ],
-                    [
-                        'datetimefield',
-                        'Select',
-                    ],
-                ],
+                'columns' => ['Column_name', 'Column_priv'],
+                'result' => [['id', 'Select'], ['name', 'Select'], ['datetimefield', 'Select']],
             ],
             [
                 'query' => 'SHOW GLOBAL STATUS',
@@ -2026,10 +1545,7 @@ class DbiDummy implements DbiExtension
                     . ' db, sql_text, COUNT(sql_text) AS \'#\' FROM `mysql`.`slow_log` WHERE'
                     . ' start_time > FROM_UNIXTIME(0) AND start_time < FROM_UNIXTIME(10) GROUP BY start_time, user_host, db, sql_text',
                 'columns' => ['sql_text', '#'],
-                'result' => [
-                    ['insert sql_text', 11],
-                    ['update sql_text', 10],
-                ],
+                'result' => [['insert sql_text',11], ['update sql_text',10]],
             ],
             [
                 'query' => 'SELECT TIME(event_time) as event_time, user_host, thread_id,'
@@ -2043,20 +1559,12 @@ class DbiDummy implements DbiExtension
                     ['update sql_text', 11, 'argument3 argument4'],
                 ],
             ],
-            [
-                'query' => 'SET PROFILING=1;',
-                'result' => [],
-            ],
-            [
-                'query' => 'query',
-                'result' => [],
-            ],
+            ['query' => 'SET PROFILING=1;', 'result' => []],
+            ['query' => 'query', 'result' => []],
             [
                 'query' => 'EXPLAIN query',
                 'columns' => ['sql_text', '#', 'argument'],
-                'result' => [
-                    ['insert sql_text', 10, 'argument argument2'],
-                ],
+                'result' => [['insert sql_text',10,'argument argument2']],
             ],
             [
                 'query' => 'SELECT seq,state,duration FROM INFORMATION_SCHEMA.PROFILING WHERE QUERY_ID=1 ORDER BY seq',
@@ -2082,21 +1590,13 @@ class DbiDummy implements DbiExtension
                 'query' => 'SELECT * FROM `db`.`table` WHERE `username` = \'user\''
                     . ' AND `export_type` = \'type\' ORDER BY `template_name`;',
                 'columns' => ['id', 'username', 'export_type', 'template_name', 'template_data'],
-                'result' => [
-                    ['1', 'user1', 'type1', 'name1', 'data1'],
-                    ['2', 'user2', 'type2', 'name2', 'data2'],
-                ],
-            ],
-            [
-                'query' => 'DELETE FROM `db`.`table` WHERE `id` = 1 AND `username` = \'user\';',
-                'result' => [],
+                'result' => [['1','user1','type1','name1','data1'], ['2','user2','type2','name2','data2']],
             ],
+            ['query' => 'DELETE FROM `db`.`table` WHERE `id` = 1 AND `username` = \'user\';', 'result' => []],
             [
                 'query' => 'SELECT * FROM `db`.`table` WHERE `id` = 1 AND `username` = \'user\';',
                 'columns' => ['id', 'username', 'export_type', 'template_name', 'template_data'],
-                'result' => [
-                    ['1', 'user1', 'type1', 'name1', 'data1'],
-                ],
+                'result' => [['1','user1','type1','name1','data1']],
             ],
             [
                 'query' => 'UPDATE `db`.`table` SET `template_data` = \'data\''
@@ -2106,32 +1606,17 @@ class DbiDummy implements DbiExtension
             [
                 'query' => 'SHOW SLAVE HOSTS',
                 'columns' => ['Server_id', 'Host'],
-                'result' => [
-                    ['Server_id1', 'Host1'],
-                    ['Server_id2', 'Host2'],
-                ],
-            ],
-            [
-                'query' => 'SHOW ALL SLAVES STATUS',
-                'result' => [],
+                'result' => [['Server_id1','Host1'], ['Server_id2','Host2']],
             ],
+            ['query' => 'SHOW ALL SLAVES STATUS', 'result' => []],
             [
                 'query' => 'SHOW COLUMNS FROM `mysql`.`user`',
                 'columns' => ['Field', 'Type', 'Null'],
                 'result' => [['host', 'char(60)', 'NO']],
             ],
-            [
-                'query' => 'SHOW INDEXES FROM `mysql`.`user`',
-                'result' => [],
-            ],
-            [
-                'query' => 'SHOW INDEXES FROM `my_db`.`test_tbl`',
-                'result' => [],
-            ],
-            [
-                'query' => 'SELECT USER();',
-                'result' => [],
-            ],
+            ['query' => 'SHOW INDEXES FROM `mysql`.`user`', 'result' => []],
+            ['query' => 'SHOW INDEXES FROM `my_db`.`test_tbl`', 'result' => []],
+            ['query' => 'SELECT USER();', 'result' => []],
             [
                 'query' => 'SHOW PROCESSLIST',
                 'columns' => ['Id', 'User', 'Host', 'db', 'Command', 'Time', 'State', 'Info'],
@@ -2152,10 +1637,7 @@ class DbiDummy implements DbiExtension
                 'columns' => ['Id', 'User', 'Host', 'db', 'Command', 'Time', 'State', 'Info'],
                 'result' => [['Id1', 'User1', 'Host1', 'db1', 'Command1', 'Time1', 'State1', 'Info1']],
             ],
-            [
-                'query' => 'SELECT UNIX_TIMESTAMP() - 36000',
-                'result' => [],
-            ],
+            ['query' => 'SELECT UNIX_TIMESTAMP() - 36000', 'result' => []],
             [
                 'query' => 'SELECT MAX(version) FROM `pmadb`.`tracking` WHERE `db_name` = \'db\''
                     . ' AND `table_name` = \'hello_world\'',
@@ -2220,16 +1702,8 @@ class DbiDummy implements DbiExtension
                 'columns' => ['column'],
                 'result' => [['row1'], ['row2']],
             ],
-            [
-                'query' => 'SELECT * FROM `PMA`.`table_1` LIMIT 1',
-                'columns' => ['column'],
-                'result' => [['table']],
-            ],
-            [
-                'query' => 'SELECT * FROM `PMA`.`table_2` LIMIT 1',
-                'columns' => ['column'],
-                'result' => [['table']],
-            ],
+            ['query' => 'SELECT * FROM `PMA`.`table_1` LIMIT 1', 'columns' => ['column'], 'result' => [['table']]],
+            ['query' => 'SELECT * FROM `PMA`.`table_2` LIMIT 1', 'columns' => ['column'], 'result' => [['table']]],
             [
                 'query' => 'SELECT `ENGINE` FROM `information_schema`.`tables` WHERE `table_name` = \'table_1\''
                     . ' AND `table_schema` = \'PMA\' AND UPPER(`engine`)'
@@ -2262,52 +1736,17 @@ class DbiDummy implements DbiExtension
             [
                 'query' => 'SHOW FULL COLUMNS FROM `testdb`.`mytable` LIKE \'\\\\_id\'',
                 'columns' => ['Field', 'Type', 'Collation', 'Null', 'Key', 'Default', 'Extra', 'Privileges', 'Comment'],
-                'result' => [
-                    [
-                        '_id',
-                        'tinyint(4)',
-                        null,
-                        'NO',
-                        '',
-                        null,
-                        '',
-                        'select,insert,update,references',
-                        '',
-                    ],
-                ],
+                'result' => [['_id', 'tinyint(4)', null, 'NO', '', null, '', 'select,insert,update,references', '']],
             ],
             [
                 'query' => 'SHOW FULL COLUMNS FROM `testdb`.`mytable`',
                 'columns' => ['Field', 'Type', 'Collation', 'Null', 'Key', 'Default', 'Extra', 'Privileges', 'Comment'],
                 'result' => [
-                    [
-                        'aid',
-                        'tinyint(4)',
-                        null,
-                        'NO',
-                        'PRI',
-                        null,
-                        '',
-                        'select,insert,update,references',
-                        '',
-                    ],
-                    [
-                        '_id',
-                        'tinyint(4)',
-                        null,
-                        'NO',
-                        '',
-                        null,
-                        '',
-                        'select,insert,update,references',
-                        '',
-                    ],
+                    ['aid', 'tinyint(4)', null, 'NO', 'PRI', null, '', 'select,insert,update,references', ''],
+                    ['_id', 'tinyint(4)', null, 'NO', '', null, '', 'select,insert,update,references', ''],
                 ],
             ],
-            [
-                'query' => 'SHOW INDEXES FROM `testdb`.`mytable`',
-                'result' => [],
-            ],
+            ['query' => 'SHOW INDEXES FROM `testdb`.`mytable`', 'result' => []],
             [
                 'query' => 'SHOW CREATE TABLE `testdb`.`mytable`',
                 'columns' => ['Table', 'Create Table'],
@@ -2322,16 +1761,7 @@ class DbiDummy implements DbiExtension
                     ],
                 ],
             ],
-            [
-                'query' => 'SELECT * FROM `testdb`.`mytable` LIMIT 1',
-                'columns' => ['aid', '_id'],
-                'result' => [
-                    [
-                        1,
-                        1,
-                    ],
-                ],
-            ],
+            ['query' => 'SELECT * FROM `testdb`.`mytable` LIMIT 1', 'columns' => ['aid','_id'], 'result' => [[1,1]]],
             [
                 'query' => 'SHOW CREATE TABLE `test_db`.`test_table`',
                 'columns' => ['Table', 'Create Table'],
@@ -2433,10 +1863,7 @@ class DbiDummy implements DbiExtension
             [
                 'query' => 'SHOW PROCEDURE STATUS;',
                 'columns' => ['Db', 'Name', 'Type'],
-                'result' => [
-                    ['test_db', 'test_proc1', 'PROCEDURE'],
-                    ['test_db', 'test_proc2', 'PROCEDURE'],
-                ],
+                'result' => [['test_db','test_proc1','PROCEDURE'], ['test_db','test_proc2','PROCEDURE']],
             ],
             [
                 'query' => 'SHOW FUNCTION STATUS;',
@@ -2458,34 +1885,13 @@ class DbiDummy implements DbiExtension
                 'columns' => ['Function', 'Create Function'],
                 'result' => [['test_func', 'CREATE FUNCTION `test_func` (p INT) RETURNS int(11) BEGIN END']],
             ],
-            [
-                'query' => 'USE `test_db`',
-                'result' => [],
-            ],
-            [
-                'query' => 'SET SQL_QUOTE_SHOW_CREATE = 0',
-                'result' => [],
-            ],
-            [
-                'query' => 'SET SQL_QUOTE_SHOW_CREATE = 1',
-                'result' => [],
-            ],
-            [
-                'query' => 'UPDATE `test_tbl` SET `vc` = \'…zff s sf\' WHERE `test`.`ser` = 2',
-                'result' => [],
-            ],
-            [
-                'query' => 'UPDATE `test_tbl` SET `vc` = \'…ss s s\' WHERE `test`.`ser` = 1',
-                'result' => [],
-            ],
-            [
-                'query' => 'SELECT LAST_INSERT_ID();',
-                'result' => [],
-            ],
-            [
-                'query' => 'SHOW WARNINGS',
-                'result' => [],
-            ],
+            ['query' => 'USE `test_db`', 'result' => []],
+            ['query' => 'SET SQL_QUOTE_SHOW_CREATE = 0', 'result' => []],
+            ['query' => 'SET SQL_QUOTE_SHOW_CREATE = 1', 'result' => []],
+            ['query' => 'UPDATE `test_tbl` SET `vc` = \'…zff s sf\' WHERE `test`.`ser` = 2', 'result' => []],
+            ['query' => 'UPDATE `test_tbl` SET `vc` = \'…ss s s\' WHERE `test`.`ser` = 1', 'result' => []],
+            ['query' => 'SELECT LAST_INSERT_ID();', 'result' => []],
+            ['query' => 'SHOW WARNINGS', 'result' => []],
             [
                 'query' => 'SELECT * FROM `information_schema`.`bookmark` WHERE dbase = \'my_db\''
                 . ' AND (user = \'user\') AND `label` = \'test_tbl\' LIMIT 1',
@@ -2496,61 +1902,29 @@ class DbiDummy implements DbiExtension
                 . ' AND `db_name` = \'my_db\' AND `table_name` = \'test_tbl\'',
                 'result' => [],
             ],
-            [
-                'query' => 'SELECT DATABASE()',
-                'result' => [],
-            ],
+            ['query' => 'SELECT DATABASE()', 'result' => []],
             [
                 'query' => 'SELECT * FROM `test_tbl` LIMIT 0, 25',
                 'columns' => ['vc', 'text', 'ser'],
-                'result' => [
-                    [
-                        'sss s s  ',
-                        '…z',
-                        '1',
-                    ],
-                    [
-                        'zzff s sf',
-                        '…zff',
-                        '2',
-                    ],
-                ],
-            ],
-            [
-                'query' => 'SELECT @@have_profiling',
-                'result' => [],
+                'result' => [['sss s s  ', '…z', '1'], ['zzff s sf', '…zff', '2']],
             ],
+            ['query' => 'SELECT @@have_profiling', 'result' => []],
             [
                 'query' => 'SELECT 1 FROM information_schema.VIEWS'
                     . ' WHERE TABLE_SCHEMA = \'my_db\' AND TABLE_NAME = \'test_tbl\'',
                 'result' => [],
             ],
-            [
-                'query' => 'SHOW FULL COLUMNS FROM `my_db`.`test_tbl`',
-                'result' => [],
-            ],
-            [
-                'query' => 'SHOW TABLE STATUS FROM `my_db` WHERE `Name` LIKE \'test\\\\_tbl%\'',
-                'result' => [],
-            ],
-            [
-                'query' => 'SHOW CREATE TABLE `my_db`.`test_tbl`',
-                'result' => [],
-            ],
-            [
-                'query' => 'SELECT COUNT(*) FROM `my_db`.`test_tbl`',
-                'result' => [],
-            ],
+            ['query' => 'SHOW FULL COLUMNS FROM `my_db`.`test_tbl`', 'result' => []],
+            ['query' => 'SHOW TABLE STATUS FROM `my_db` WHERE `Name` LIKE \'test\\\\_tbl%\'', 'result' => []],
+            ['query' => 'SHOW CREATE TABLE `my_db`.`test_tbl`', 'result' => []],
+            ['query' => 'SELECT COUNT(*) FROM `my_db`.`test_tbl`', 'result' => []],
             [
                 'query' => 'SELECT `master_field`, `foreign_db`, `foreign_table`, `foreign_field`'
                 . ' FROM `information_schema`.`relation`'
                 . ' WHERE `master_db` = \'my_db\' AND `master_table` = \'test_tbl\'',
                 'result' => [],
             ],
-            [
-                'query' => 'SELECT `test_tbl`.`vc` FROM `my_db`.`test_tbl` WHERE `test`.`ser` = 2',
-                'result' => [],
-            ],
+            ['query' => 'SELECT `test_tbl`.`vc` FROM `my_db`.`test_tbl` WHERE `test`.`ser` = 2', 'result' => []],
             [
                 'query' => 'SELECT * FROM `pmadb`.`usergroups` ORDER BY `usergroup` ASC',
                 'columns' => ['usergroup', 'tab', 'allowed'],
@@ -2579,78 +1953,37 @@ class DbiDummy implements DbiExtension
                 'query' => 'SELECT COUNT(*) FROM (SELECT 1 FROM company_users WHERE not_working_count != 0 ) as cnt',
                 'result' => false,
             ],
-            [
-                'query' => 'SELECT COUNT(*) FROM (SELECT 1 FROM company_users ) as cnt',
-                'result' => [
-                    [4],
-                ],
-            ],
+            ['query' => 'SELECT COUNT(*) FROM (SELECT 1 FROM company_users ) as cnt', 'result' => [[4]]],
             [
                 'query' => 'SELECT COUNT(*) FROM (SELECT 1 FROM company_users WHERE working_count = 0 ) as cnt',
-                'result' => [
-                    [15],
-                ],
-            ],
-            [
-                'query' => 'SELECT COUNT(*) FROM `my_dataset`.`company_users`',
-                'result' => [
-                    [18],
-                ],
+                'result' => [[15]],
             ],
+            ['query' => 'SELECT COUNT(*) FROM `my_dataset`.`company_users`', 'result' => [[18]]],
             [
                 'query' => 'SELECT COUNT(*) FROM ('
                 . 'SELECT *, 1, (SELECT COUNT(*) FROM tbl1) AS `c1`, '
                 . '(SELECT 1 FROM tbl2) AS `c2` FROM company_users WHERE subquery_case = 0 ) as cnt',
-                'result' => [
-                    [42],
-                ],
+                'result' => [[42]],
             ],
             [
                 'query' => 'CREATE TABLE `event` SELECT DISTINCT `eventID`, `Start_time`,'
                 . ' `DateOfEvent`, `NumberOfGuests`, `NameOfVenue`, `LocationOfVenue` FROM `test_tbl`;',
                 'result' => [],
             ],
-            [
-                'query' => 'ALTER TABLE `event` ADD PRIMARY KEY(`eventID`);',
-                'result' => [],
-            ],
+            ['query' => 'ALTER TABLE `event` ADD PRIMARY KEY(`eventID`);', 'result' => []],
             [
                 'query' => 'CREATE TABLE `table2` SELECT DISTINCT `Start_time`,'
                             . ' `TypeOfEvent`, `period` FROM `test_tbl`;',
                 'result' => [],
             ],
-            [
-                'query' => 'ALTER TABLE `table2` ADD PRIMARY KEY(`Start_time`);',
-                'result' => [],
-            ],
-            [
-                'query' => 'DROP TABLE `test_tbl`',
-                'result' => [],
-            ],
-            [
-                'query' => 'CREATE TABLE `batch_log2` SELECT DISTINCT `ID`, `task` FROM `test_tbl`;',
-                'result' => [],
-            ],
-            [
-                'query' => 'ALTER TABLE `batch_log2` ADD PRIMARY KEY(`ID`, `task`);',
-                'result' => [],
-            ],
-            [
-                'query' => 'CREATE TABLE `table2` SELECT DISTINCT `task`, `timestamp` FROM `test_tbl`;',
-                'result' => [],
-            ],
-            [
-                'query' => 'ALTER TABLE `table2` ADD PRIMARY KEY(`task`);',
-                'result' => [],
-            ],
-            [
-                'query' => 'CREATE DATABASE `test_db_error`;',
-                'result' => false,
-            ],
-            [
-                'query' => 'CREATE DATABASE `test_db` DEFAULT CHARSET=utf8 COLLATE utf8_general_ci;',
-                'result' => [],
-            ],
+            ['query' => 'ALTER TABLE `table2` ADD PRIMARY KEY(`Start_time`);', 'result' => []],
+            ['query' => 'DROP TABLE `test_tbl`', 'result' => []],
+            ['query' => 'CREATE TABLE `batch_log2` SELECT DISTINCT `ID`, `task` FROM `test_tbl`;', 'result' => []],
+            ['query' => 'ALTER TABLE `batch_log2` ADD PRIMARY KEY(`ID`, `task`);', 'result' => []],
+            ['query' => 'CREATE TABLE `table2` SELECT DISTINCT `task`, `timestamp` FROM `test_tbl`;', 'result' => []],
+            ['query' => 'ALTER TABLE `table2` ADD PRIMARY KEY(`task`);', 'result' => []],
+            ['query' => 'CREATE DATABASE `test_db_error`;', 'result' => false],
+            ['query' => 'CREATE DATABASE `test_db` DEFAULT CHARSET=utf8 COLLATE utf8_general_ci;', 'result' => []],
             [
                 'query' => 'SHOW TABLE STATUS FROM `test_db`',
                 'columns' => ['Name', 'Engine', 'Version', 'Row_format', 'Rows', 'Avg_row_length', 'Data_length', 'Max_data_length', 'Index_length', 'Data_free', 'Auto_increment', 'Create_time', 'Update_time', 'Check_time', 'Collation', 'Checksum', 'Create_options', 'Comment', 'Max_index_length', 'Temporary'],
diff --git a/test/classes/SystemDatabaseTest.php b/test/classes/SystemDatabaseTest.php
index 9a34f4a0db..a6eccdbbbd 100644
--- a/test/classes/SystemDatabaseTest.php
+++ b/test/classes/SystemDatabaseTest.php
@@ -99,9 +99,7 @@ class SystemDatabaseTest extends AbstractTestCase
             );
 
         $db = 'PMA_db';
-        $columnMap = [
-            new SystemColumn('table_name', 'column_name', null),
-        ];
+        $columnMap = [new SystemColumn('table_name', 'column_name', null)];
         $viewName = 'view_name';
 
         $ret = $this->sysDb->getNewTransformationDataSql($resultStub, $columnMap, $viewName, $db);
@@ -125,22 +123,13 @@ class SystemDatabaseTest extends AbstractTestCase
             [true],
             [],
             [
-                (object) [
-                    'table' => 'meta1_table',
-                    'name' => 'meta1_name',
-                ],
-                (object) [
-                    'table' => 'meta2_table',
-                    'name' => 'meta2_name',
-                ],
+                (object) ['table' => 'meta1_table', 'name' => 'meta1_name'],
+                (object) ['table' => 'meta2_table', 'name' => 'meta2_name'],
             ],
         );
 
         $sqlQuery = 'PMA_sql_query';
-        $viewColumns = [
-            'view_columns1',
-            'view_columns2',
-        ];
+        $viewColumns = ['view_columns1', 'view_columns2'];
 
         $systemDatabase = new SystemDatabase($dbi);
         $columnMap = $systemDatabase->getColumnMapFromSql($sqlQuery, $viewColumns);
diff --git a/test/classes/Table/ColumnsDefinitionTest.php b/test/classes/Table/ColumnsDefinitionTest.php
index e3dcced82f..c34b2e4d4b 100644
--- a/test/classes/Table/ColumnsDefinitionTest.php
+++ b/test/classes/Table/ColumnsDefinitionTest.php
@@ -230,73 +230,30 @@ SQL;
     {
         return [
             'when Default is null and Null is YES' => [
-                [
-                    'Default' => null,
-                    'Null' => 'YES',
-                ],
-                [
-                    'DefaultType' => 'NULL',
-                    'DefaultValue' => '',
-                ],
+                ['Default' => null, 'Null' => 'YES'],
+                ['DefaultType' => 'NULL', 'DefaultValue' => ''],
             ],
             'when Default is null and Null is NO' => [
-                [
-                    'Default' => null,
-                    'Null' => 'NO',
-                ],
-                [
-                    'DefaultType' => 'NONE',
-                    'DefaultValue' => '',
-                ],
+                ['Default' => null, 'Null' => 'NO'],
+                ['DefaultType' => 'NONE', 'DefaultValue' => ''],
             ],
             'when Default is CURRENT_TIMESTAMP' => [
                 ['Default' => 'CURRENT_TIMESTAMP'],
-                [
-                    'DefaultType' => 'CURRENT_TIMESTAMP',
-                    'DefaultValue' => '',
-                ],
+                ['DefaultType' => 'CURRENT_TIMESTAMP', 'DefaultValue' => ''],
             ],
             'when Default is current_timestamp' => [
                 ['Default' => 'current_timestamp()'],
-                [
-                    'DefaultType' => 'CURRENT_TIMESTAMP',
-                    'DefaultValue' => '',
-                ],
-            ],
-            'when Default is UUID' => [
-                ['Default' => 'UUID'],
-                [
-                    'DefaultType' => 'UUID',
-                    'DefaultValue' => '',
-                ],
-            ],
-            'when Default is uuid()' => [
-                ['Default' => 'uuid()'],
-                [
-                    'DefaultType' => 'UUID',
-                    'DefaultValue' => '',
-                ],
+                ['DefaultType' => 'CURRENT_TIMESTAMP', 'DefaultValue' => ''],
             ],
+            'when Default is UUID' => [['Default' => 'UUID'], ['DefaultType' => 'UUID', 'DefaultValue' => '']],
+            'when Default is uuid()' => [['Default' => 'uuid()'], ['DefaultType' => 'UUID', 'DefaultValue' => '']],
             'when Default is anything else and Type is text' => [
-                [
-                    'Default' => '"some\/thing"',
-                    'Type' => 'text',
-                ],
-                [
-                    'Default' => 'some/thing',
-                    'DefaultType' => 'USER_DEFINED',
-                    'DefaultValue' => '"some\/thing"',
-                ],
+                ['Default' => '"some\/thing"', 'Type' => 'text'],
+                ['Default' => 'some/thing', 'DefaultType' => 'USER_DEFINED', 'DefaultValue' => '"some\/thing"'],
             ],
             'when Default is anything else and Type is not text' => [
-                [
-                    'Default' => '"some\/thing"',
-                    'Type' => 'something',
-                ],
-                [
-                    'DefaultType' => 'USER_DEFINED',
-                    'DefaultValue' => '"some\/thing"',
-                ],
+                ['Default' => '"some\/thing"', 'Type' => 'something'],
+                ['DefaultType' => 'USER_DEFINED', 'DefaultValue' => '"some\/thing"'],
             ],
         ];
     }
diff --git a/test/classes/Table/IndexesTest.php b/test/classes/Table/IndexesTest.php
index 4956db8ff6..20fda7b701 100644
--- a/test/classes/Table/IndexesTest.php
+++ b/test/classes/Table/IndexesTest.php
@@ -31,31 +31,16 @@ class IndexesTest extends AbstractTestCase
         $GLOBALS['text_dir'] = 'ltr';
         $GLOBALS['cfg']['Server']['pmadb'] = '';
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
-        $GLOBALS['urlParams'] = [
-            'db' => 'db',
-            'server' => 1,
-        ];
+        $GLOBALS['urlParams'] = ['db' => 'db', 'server' => 1];
 
         $dbi = $this->getMockBuilder(DatabaseInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $indexs = [
-            [
-                'Schema' => 'Schema1',
-                'Key_name' => 'Key_name1',
-                'Column_name' => 'Column_name1',
-            ],
-            [
-                'Schema' => 'Schema2',
-                'Key_name' => 'Key_name2',
-                'Column_name' => 'Column_name2',
-            ],
-            [
-                'Schema' => 'Schema3',
-                'Key_name' => 'Key_name3',
-                'Column_name' => 'Column_name3',
-            ],
+            ['Schema' => 'Schema1', 'Key_name' => 'Key_name1', 'Column_name' => 'Column_name1'],
+            ['Schema' => 'Schema2', 'Key_name' => 'Key_name2', 'Column_name' => 'Column_name2'],
+            ['Schema' => 'Schema3', 'Key_name' => 'Key_name3', 'Column_name' => 'Column_name3'],
         ];
 
         $dbi->expects($this->any())->method('getTableIndexes')
diff --git a/test/classes/Table/SearchTest.php b/test/classes/Table/SearchTest.php
index 9da3ef037a..25368e4172 100644
--- a/test/classes/Table/SearchTest.php
+++ b/test/classes/Table/SearchTest.php
@@ -42,42 +42,10 @@ class SearchTest extends AbstractTestCase
             $this->search->buildSqlQuery(),
         );
 
-        $_POST['criteriaValues'] = [
-            'value1',
-            'value2',
-            'value3',
-            'value4',
-            'value5',
-            'value6',
-            'value7,value8',
-        ];
-        $_POST['criteriaColumnNames'] = [
-            'name',
-            'id',
-            'index',
-            'index2',
-            'index3',
-            'index4',
-            'index5',
-        ];
-        $_POST['criteriaColumnTypes'] = [
-            'varchar',
-            'int',
-            'enum',
-            'type1',
-            'type2',
-            'type3',
-            'type4',
-        ];
-        $_POST['criteriaColumnCollations'] = [
-            'char1',
-            'char2',
-            'char3',
-            'char4',
-            'char5',
-            'char6',
-            'char7',
-        ];
+        $_POST['criteriaValues'] = ['value1', 'value2', 'value3', 'value4', 'value5', 'value6', 'value7,value8'];
+        $_POST['criteriaColumnNames'] = ['name', 'id', 'index', 'index2', 'index3', 'index4', 'index5'];
+        $_POST['criteriaColumnTypes'] = ['varchar', 'int', 'enum', 'type1', 'type2', 'type3', 'type4'];
+        $_POST['criteriaColumnCollations'] = ['char1', 'char2', 'char3', 'char4', 'char5', 'char6', 'char7'];
         $_POST['criteriaColumnOperators'] = [
             '!=',
             '>',
@@ -116,30 +84,10 @@ class SearchTest extends AbstractTestCase
         );
 
         unset($_POST['customWhereClause']);
-        $_POST['criteriaColumnNames'] = [
-            'b',
-            'a',
-            'c',
-            'd',
-        ];
-        $_POST['criteriaColumnOperators'] = [
-            '<=',
-            '=',
-            'IS NULL',
-            'IS NOT NULL',
-        ];
-        $_POST['criteriaValues'] = [
-            '10',
-            '2',
-            '',
-            '',
-        ];
-        $_POST['criteriaColumnTypes'] = [
-            'int(11)',
-            'int(11)',
-            'int(11)',
-            'int(11)',
-        ];
+        $_POST['criteriaColumnNames'] = ['b', 'a', 'c', 'd'];
+        $_POST['criteriaColumnOperators'] = ['<=', '=', 'IS NULL', 'IS NOT NULL'];
+        $_POST['criteriaValues'] = ['10', '2', '', ''];
+        $_POST['criteriaColumnTypes'] = ['int(11)', 'int(11)', 'int(11)', 'int(11)'];
 
         $this->assertEquals(
             'SELECT *  FROM `PMA` WHERE `b` <= 10 AND `a` = 2 AND `c` IS NULL AND `d` IS NOT NULL',
diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php
index 5db6c69d79..02fe58139b 100644
--- a/test/classes/TableTest.php
+++ b/test/classes/TableTest.php
@@ -77,54 +77,28 @@ class TableTest extends AbstractTestCase
                 null,
                 null,
                 Connection::TYPE_USER,
-                [
-                    [
-                        'COLUMN_NAME' => 'COLUMN_NAME',
-                        'DATA_TYPE' => 'DATA_TYPE',
-                    ],
-                ],
+                [['COLUMN_NAME' => 'COLUMN_NAME', 'DATA_TYPE' => 'DATA_TYPE']],
             ],
             [
                 $getUniqueColumnsSql . ' WHERE (Non_unique = 0)',
-                [
-                    'Key_name',
-                    null,
-                ],
+                ['Key_name', null],
                 'Column_name',
                 Connection::TYPE_USER,
-                [
-                    ['index1'],
-                    ['index3'],
-                    ['index5'],
-                ],
+                [['index1'], ['index3'], ['index5']],
             ],
             [
                 $getUniqueColumnsSql,
                 'Column_name',
                 'Column_name',
                 Connection::TYPE_USER,
-                [
-                    'column1',
-                    'column3',
-                    'column5',
-                    'ACCESSIBLE',
-                    'ADD',
-                    'ALL',
-                ],
+                ['column1', 'column3', 'column5', 'ACCESSIBLE', 'ADD', 'ALL'],
             ],
             [
                 'SHOW COLUMNS FROM `PMA`.`PMA_BookMark`',
                 'Field',
                 'Field',
                 Connection::TYPE_USER,
-                [
-                    'column1',
-                    'column3',
-                    'column5',
-                    'ACCESSIBLE',
-                    'ADD',
-                    'ALL',
-                ],
+                ['column1', 'column3', 'column5', 'ACCESSIBLE', 'ADD', 'ALL'],
             ],
             [
                 'SHOW COLUMNS FROM `PMA`.`PMA_BookMark`',
@@ -217,36 +191,11 @@ class TableTest extends AbstractTestCase
         ];
 
         $fetchValue = [
-            [
-                $sqlIsViewTrue,
-                0,
-                Connection::TYPE_USER,
-                'PMA_BookMark',
-            ],
-            [
-                $sqlCopyData,
-                0,
-                Connection::TYPE_USER,
-                false,
-            ],
-            [
-                $sqlIsViewFalse,
-                0,
-                Connection::TYPE_USER,
-                false,
-            ],
-            [
-                $sqlIsUpdatableViewTrue,
-                0,
-                Connection::TYPE_USER,
-                'PMA_BookMark',
-            ],
-            [
-                $sqlIsUpdatableViewFalse,
-                0,
-                Connection::TYPE_USER,
-                false,
-            ],
+            [$sqlIsViewTrue, 0, Connection::TYPE_USER, 'PMA_BookMark'],
+            [$sqlCopyData, 0, Connection::TYPE_USER, false],
+            [$sqlIsViewFalse, 0, Connection::TYPE_USER, false],
+            [$sqlIsUpdatableViewTrue, 0, Connection::TYPE_USER, 'PMA_BookMark'],
+            [$sqlIsUpdatableViewFalse, 0, Connection::TYPE_USER, false],
             [
                 "SELECT 1 FROM information_schema.VIEWS WHERE TABLE_SCHEMA = 'aa' AND TABLE_NAME = 'ad'",
                 0,
@@ -436,49 +385,16 @@ class TableTest extends AbstractTestCase
     public static function dataValidateName(): array
     {
         return [
-            [
-                'test',
-                true,
-            ],
-            [
-                'te/st',
-                false,
-            ],
-            [
-                'te.st',
-                false,
-            ],
-            [
-                'te\\st',
-                false,
-            ],
-            [
-                'te st',
-                false,
-            ],
-            [
-                '  te st',
-                true,
-                true,
-            ],
-            [
-                'test ',
-                false,
-            ],
-            [
-                'te.st',
-                false,
-            ],
-            [
-                'test ',
-                false,
-                true,
-            ],
-            [
-                'te.st ',
-                false,
-                true,
-            ],
+            ['test', true],
+            ['te/st', false],
+            ['te.st', false],
+            ['te\\st', false],
+            ['te st', false],
+            ['  te st', true, true],
+            ['test ', false],
+            ['te.st', false],
+            ['test ', false, true],
+            ['te.st ', false, true],
         ];
     }
 
@@ -968,18 +884,9 @@ class TableTest extends AbstractTestCase
      */
     public function testDuplicateInfo(): void
     {
-        $getFields = [
-            'filed0',
-            'field6',
-        ];
-        $whereFields = [
-            'field2',
-            'filed5',
-        ];
-        $newFields = [
-            'field3',
-            'filed4',
-        ];
+        $getFields = ['filed0', 'field6'];
+        $whereFields = ['field2', 'filed5'];
+        $newFields = ['field3', 'filed4'];
 
         $relationParameters = RelationParameters::fromArray([
             'db' => 'PMA_db',
@@ -1177,11 +1084,7 @@ class TableTest extends AbstractTestCase
 
         $table = new Table($table, $db, $GLOBALS['dbi']);
         $return = $table->getUniqueColumns();
-        $expect = [
-            '`PMA`.`PMA_BookMark`.`index1`',
-            '`PMA`.`PMA_BookMark`.`index3`',
-            '`PMA`.`PMA_BookMark`.`index5`',
-        ];
+        $expect = ['`PMA`.`PMA_BookMark`.`index1`', '`PMA`.`PMA_BookMark`.`index3`', '`PMA`.`PMA_BookMark`.`index5`'];
         $this->assertEquals($expect, $return);
     }
 
@@ -1243,16 +1146,10 @@ class TableTest extends AbstractTestCase
     public function testGetSQLToCreateForeignKey(): void
     {
         $table = 'PMA_table';
-        $field = [
-            'PMA_field1',
-            'PMA_field2',
-        ];
+        $field = ['PMA_field1', 'PMA_field2'];
         $foreignDb = 'foreignDb';
         $foreignTable = 'foreignTable';
-        $foreignField = [
-            'foreignField1',
-            'foreignField2',
-        ];
+        $foreignField = ['foreignField1', 'foreignField2'];
 
         $tableObj = new Table('PMA_table', 'db', $GLOBALS['dbi']);
 
@@ -1260,13 +1157,7 @@ class TableTest extends AbstractTestCase
             $tableObj,
             Table::class,
             'getSQLToCreateForeignKey',
-            [
-                $table,
-                $field,
-                $foreignDb,
-                $foreignTable,
-                $foreignField,
-            ],
+            [$table, $field, $foreignDb, $foreignTable, $foreignField],
         );
         $sqlExcepted = 'ALTER TABLE `PMA_table` ADD  '
             . 'FOREIGN KEY (`PMA_field1`, `PMA_field2`) REFERENCES '
@@ -1278,13 +1169,7 @@ class TableTest extends AbstractTestCase
             $tableObj,
             Table::class,
             'getSQLToCreateForeignKey',
-            [
-                $table,
-                $field,
-                'db',
-                $foreignTable,
-                $foreignField,
-            ],
+            [$table, $field, 'db', $foreignTable, $foreignField],
         );
         $sqlExcepted = 'ALTER TABLE `PMA_table` ADD  '
             . 'FOREIGN KEY (`PMA_field1`, `PMA_field2`) REFERENCES '
@@ -1349,11 +1234,7 @@ class TableTest extends AbstractTestCase
         $this->assertEquals($expect, $return);
 
         $return = $table->getReservedColumnNames();
-        $expect = [
-            'ACCESSIBLE',
-            'ADD',
-            'ALL',
-        ];
+        $expect = ['ACCESSIBLE', 'ADD', 'ALL'];
         $this->assertEquals($expect, $return);
     }
 
@@ -1380,10 +1261,7 @@ class TableTest extends AbstractTestCase
             ->willReturnOnConsecutiveCalls(
                 [['`one_pk`']],
                 [], // No Uniques found
-                [
-                    '`one_ind`',
-                    '`sec_ind`',
-                ],
+                ['`one_ind`', '`sec_ind`'],
                 [], // No Uniques found
                 [], // No Indexed found
             );
@@ -1480,16 +1358,8 @@ class TableTest extends AbstractTestCase
         unset($GLOBALS['sql_drop_table']);
 
         $getTableMap = [
-            [
-                $targetDb,
-                $targetTable,
-                new Table($targetTable, $targetDb, $GLOBALS['dbi']),
-            ],
-            [
-                'aa',
-                'ad',
-                new Table('ad', 'aa', $GLOBALS['dbi']),
-            ],
+            [$targetDb, $targetTable, new Table($targetTable, $targetDb, $GLOBALS['dbi'])],
+            ['aa', 'ad', new Table('ad', 'aa', $GLOBALS['dbi'])],
         ];
 
         $GLOBALS['dbi']->expects($this->any())->method('getTable')
@@ -1537,13 +1407,7 @@ class TableTest extends AbstractTestCase
                     true,
                     $resultStub,
                 ],
-                [
-                    'USE `aa`',
-                    Connection::TYPE_USER,
-                    DatabaseInterface::QUERY_BUFFERED,
-                    true,
-                    $resultStub,
-                ],
+                ['USE `aa`', Connection::TYPE_USER, DatabaseInterface::QUERY_BUFFERED, true, $resultStub],
             ]));
         $resultStub->expects($this->any())
             ->method('fetchRow')
@@ -1661,10 +1525,7 @@ class TableTest extends AbstractTestCase
         $dbi = new DatabaseInterface($extension);
         $tblObject = new Table($targetTable, $targetDb, $dbi);
         $tblObject->getStatusInfo(null, true);
-        $expect = [
-            'pack_keys' => 'DEFAULT',
-            'row_format' => 'REDUNDANT',
-        ];
+        $expect = ['pack_keys' => 'DEFAULT', 'row_format' => 'REDUNDANT'];
         $createOptions = $dbi->getTable($targetDb, $targetTable)->getCreateOptions();
         $this->assertEquals($expect, $createOptions);
     }
diff --git a/test/classes/TemplateTest.php b/test/classes/TemplateTest.php
index d6b87ef469..695d849ce2 100644
--- a/test/classes/TemplateTest.php
+++ b/test/classes/TemplateTest.php
@@ -50,10 +50,7 @@ class TemplateTest extends AbstractTestCase
      */
     public function testSet(string $data): void
     {
-        $result = $this->template->render($data, [
-            'variable1' => 'value1',
-            'variable2' => 'value2',
-        ]);
+        $result = $this->template->render($data, ['variable1' => 'value1', 'variable2' => 'value2']);
         $this->assertStringContainsString('value1', $result);
         $this->assertStringContainsString('value2', $result);
     }
@@ -65,9 +62,7 @@ class TemplateTest extends AbstractTestCase
      */
     public static function providerTestSet(): array
     {
-        return [
-            ['test/add_data'],
-        ];
+        return [['test/add_data']];
     }
 
     /**
@@ -94,13 +89,7 @@ class TemplateTest extends AbstractTestCase
      */
     public static function providerTestDynamicRender(): array
     {
-        return [
-            [
-                'test/echo',
-                'variable',
-                'value',
-            ],
-        ];
+        return [['test/echo', 'variable', 'value']];
     }
 
     /**
@@ -135,12 +124,7 @@ class TemplateTest extends AbstractTestCase
      */
     public static function providerTestRender(): array
     {
-        return [
-            [
-                'test/static',
-                'static content',
-            ],
-        ];
+        return [['test/static', 'static content']];
     }
 
     /**
@@ -168,41 +152,13 @@ class TemplateTest extends AbstractTestCase
     public static function providerTestRenderGettext(): array
     {
         return [
-            [
-                'test/gettext/gettext',
-                [],
-                'Text',
-            ],
-            [
-                'test/gettext/pgettext',
-                [],
-                'Text',
-            ],
-            [
-                'test/gettext/notes',
-                [],
-                'Text',
-            ],
-            [
-                'test/gettext/plural',
-                ['table_count' => 1],
-                'One table',
-            ],
-            [
-                'test/gettext/plural',
-                ['table_count' => 2],
-                '2 tables',
-            ],
-            [
-                'test/gettext/plural_notes',
-                ['table_count' => 1],
-                'One table',
-            ],
-            [
-                'test/gettext/plural_notes',
-                ['table_count' => 2],
-                '2 tables',
-            ],
+            ['test/gettext/gettext', [], 'Text'],
+            ['test/gettext/pgettext', [], 'Text'],
+            ['test/gettext/notes', [], 'Text'],
+            ['test/gettext/plural', ['table_count' => 1], 'One table'],
+            ['test/gettext/plural', ['table_count' => 2], '2 tables'],
+            ['test/gettext/plural_notes', ['table_count' => 1], 'One table'],
+            ['test/gettext/plural_notes', ['table_count' => 2], '2 tables'],
         ];
     }
 }
diff --git a/test/classes/Theme/ThemeTest.php b/test/classes/Theme/ThemeTest.php
index 61a38c4595..cd03e67404 100644
--- a/test/classes/Theme/ThemeTest.php
+++ b/test/classes/Theme/ThemeTest.php
@@ -245,26 +245,10 @@ class ThemeTest extends AbstractTestCase
     public static function providerForGetImgPath(): array
     {
         return [
-            [
-                null,
-                null,
-                '',
-            ],
-            [
-                'screen.png',
-                null,
-                './themes/pmahomme/img/screen.png',
-            ],
-            [
-                'arrow_ltr.png',
-                null,
-                './themes/pmahomme/img/arrow_ltr.png',
-            ],
-            [
-                'logo_right.png',
-                'pma_logo.png',
-                './themes/pmahomme/img/pma_logo.png',
-            ],
+            [null, null, ''],
+            ['screen.png', null, './themes/pmahomme/img/screen.png'],
+            ['arrow_ltr.png', null, './themes/pmahomme/img/arrow_ltr.png'],
+            ['logo_right.png', 'pma_logo.png', './themes/pmahomme/img/pma_logo.png'],
         ];
     }
 }
diff --git a/test/classes/Tracking/TrackerTest.php b/test/classes/Tracking/TrackerTest.php
index a72d4bd8e9..4f5301bfdb 100644
--- a/test/classes/Tracking/TrackerTest.php
+++ b/test/classes/Tracking/TrackerTest.php
@@ -126,20 +126,7 @@ class TrackerTest extends AbstractTestCase
      */
     public static function getTableNameData(): array
     {
-        return [
-            [
-                '`tbl`;',
-                'tbl',
-            ],
-            [
-                ' `pma.table` ',
-                'table',
-            ],
-            [
-                " `pma.table\nfoobar` ",
-                'table',
-            ],
-        ];
+        return [['`tbl`;', 'tbl'], [' `pma.table` ', 'table'], [" `pma.table\nfoobar` ", 'table']];
     }
 
     /**
@@ -216,28 +203,14 @@ class TrackerTest extends AbstractTestCase
          */
 
         $getColumnsResult = [
-            [
-                'Field' => 'field1',
-                'Type' => 'int(11)',
-                'Key' => 'PRI',
-            ],
-            [
-                'Field' => 'field2',
-                'Type' => 'text',
-                'Key' => '',
-            ],
+            ['Field' => 'field1', 'Type' => 'int(11)', 'Key' => 'PRI'],
+            ['Field' => 'field2', 'Type' => 'text', 'Key' => ''],
         ];
         $dbi->expects($this->once())->method('getColumns')
             ->with('pma_test', 'pma_tbl')
             ->will($this->returnValue($getColumnsResult));
 
-        $getIndexesResult = [
-            [
-                'Table' => 'pma_tbl',
-                'Field' => 'field1',
-                'Key' => 'PRIMARY',
-            ],
-        ];
+        $getIndexesResult = [['Table' => 'pma_tbl', 'Field' => 'field1', 'Key' => 'PRIMARY']];
         $dbi->expects($this->once())->method('getTableIndexes')
             ->with('pma_test', 'pma_tbl')
             ->will($this->returnValue($getIndexesResult));
@@ -398,14 +371,8 @@ class TrackerTest extends AbstractTestCase
         $date = Util::date('Y-m-d H:i:s');
 
         $newData = [
-            [
-                'username' => 'user1',
-                'statement' => 'test_statement1',
-            ],
-            [
-                'username' => 'user2',
-                'statement' => 'test_statement2',
-            ],
+            ['username' => 'user1', 'statement' => 'test_statement1'],
+            ['username' => 'user2', 'statement' => 'test_statement2'],
         ];
 
         $sqlQuery2 = 'UPDATE `pmadb`.`tracking`' .
@@ -421,16 +388,7 @@ class TrackerTest extends AbstractTestCase
         $dbi->method('queryAsControlUser')
             ->will(
                 $this->returnValueMap(
-                    [
-                        [
-                            $sqlQuery1,
-                            $resultStub1,
-                        ],
-                        [
-                            $sqlQuery2,
-                            $resultStub2,
-                        ],
-                    ],
+                    [[$sqlQuery1, $resultStub1], [$sqlQuery2, $resultStub2]],
                 ),
             );
 
@@ -505,21 +463,9 @@ class TrackerTest extends AbstractTestCase
             ->will(
                 $this->returnValueMap(
                     [
-                        [
-                            "pma'db",
-                            Connection::TYPE_USER,
-                            "pma\'db",
-                        ],
-                        [
-                            "pma'table",
-                            Connection::TYPE_USER,
-                            "pma\'table",
-                        ],
-                        [
-                            '1.0',
-                            Connection::TYPE_USER,
-                            '1.0',
-                        ],
+                        ["pma'db", Connection::TYPE_USER, "pma\'db"],
+                        ["pma'table", Connection::TYPE_USER, "pma\'table"],
+                        ['1.0', Connection::TYPE_USER, '1.0'],
                     ],
                 ),
             );
@@ -552,16 +498,8 @@ class TrackerTest extends AbstractTestCase
                 'date_from' => '20-03-2013 23:33:58',
                 'date_to' => '20-03-2013 23:39:58',
                 'ddlog' => [
-                    [
-                        'date' => '20-03-2013 23:33:58',
-                        'username' => 'user1',
-                        'statement' => "\nstat1",
-                    ],
-                    [
-                        'date' => '20-03-2013 23:39:58',
-                        'username' => 'user2',
-                        'statement' => '',
-                    ],
+                    ['date' => '20-03-2013 23:33:58', 'username' => 'user1', 'statement' => "\nstat1"],
+                    ['date' => '20-03-2013 23:39:58', 'username' => 'user2', 'statement' => ''],
                 ],
                 'dmlog' => [],
                 'schema_snapshot' => 'dataschema',
@@ -582,43 +520,18 @@ class TrackerTest extends AbstractTestCase
             'date_from' => '20-03-2012 23:33:58',
             'date_to' => '20-03-2013 23:39:58',
             'ddlog' => [
-                [
-                    'date' => '20-03-2012 23:33:58',
-                    'username' => 'user1',
-                    'statement' => '',
-                ],
-                [
-                    'date' => '20-03-2012 23:39:58',
-                    'username' => 'user2',
-                    'statement' => '',
-                ],
+                ['date' => '20-03-2012 23:33:58', 'username' => 'user1', 'statement' => ''],
+                ['date' => '20-03-2012 23:39:58', 'username' => 'user2', 'statement' => ''],
             ],
             'dmlog' => [
-                [
-                    'date' => '20-03-2013 23:33:58',
-                    'username' => 'user3',
-                    'statement' => '',
-                ],
-                [
-                    'date' => '20-03-2013 23:39:58',
-                    'username' => 'user4',
-                    'statement' => '',
-                ],
+                ['date' => '20-03-2013 23:33:58', 'username' => 'user3', 'statement' => ''],
+                ['date' => '20-03-2013 23:39:58', 'username' => 'user4', 'statement' => ''],
             ],
             'schema_snapshot' => 'dataschema',
             'tracking' => 'SELECT, DELETE',
         ];
 
-        return [
-            [
-                $fetchArrayReturn[0],
-                $data[0],
-            ],
-            [
-                $fetchArrayReturn[1],
-                $data[1],
-            ],
-        ];
+        return [[$fetchArrayReturn[0], $data[0]], [$fetchArrayReturn[1], $data[1]]];
     }
 
     /**
@@ -683,130 +596,26 @@ class TrackerTest extends AbstractTestCase
             "db1"
         );
         */
-        $query[] = [
-            'CREATE VIEW v AS SELECT * FROM t;',
-            'DDL',
-            'CREATE VIEW',
-            'v',
-        ];
-        $query[] = [
-            'ALTER VIEW db1.v AS SELECT col1, col2, col3, col4 FROM t',
-            'DDL',
-            'ALTER VIEW',
-            'v',
-        ];
-        $query[] = [
-            'DROP VIEW db1.v;',
-            'DDL',
-            'DROP VIEW',
-            'v',
-        ];
-        $query[] = [
-            'DROP VIEW IF EXISTS db1.v;',
-            'DDL',
-            'DROP VIEW',
-            'v',
-        ];
-        $query[] = [
-            'CREATE DATABASE db1;',
-            'DDL',
-            'CREATE DATABASE',
-            '',
-            'db1',
-        ];
-        $query[] = [
-            'ALTER DATABASE db1;',
-            'DDL',
-            'ALTER DATABASE',
-            '',
-        ];
-        $query[] = [
-            'DROP DATABASE db1;',
-            'DDL',
-            'DROP DATABASE',
-            '',
-            'db1',
-        ];
-        $query[] = [
-            'CREATE TABLE db1.t1 (c1 INT);',
-            'DDL',
-            'CREATE TABLE',
-            't1',
-        ];
-        $query[] = [
-            'ALTER TABLE db1.t1 ADD c2 TEXT;',
-            'DDL',
-            'ALTER TABLE',
-            't1',
-        ];
-        $query[] = [
-            'DROP TABLE db1.t1',
-            'DDL',
-            'DROP TABLE',
-            't1',
-        ];
-        $query[] = [
-            'DROP TABLE IF EXISTS db1.t1',
-            'DDL',
-            'DROP TABLE',
-            't1',
-        ];
-        $query[] = [
-            'CREATE INDEX ind ON db1.t1 (c2(10));',
-            'DDL',
-            'CREATE INDEX',
-            't1',
-        ];
-        $query[] = [
-            'CREATE UNIQUE INDEX ind ON db1.t1 (c2(10));',
-            'DDL',
-            'CREATE INDEX',
-            't1',
-        ];
-        $query[] = [
-            'CREATE SPATIAL INDEX ind ON db1.t1 (c2(10));',
-            'DDL',
-            'CREATE INDEX',
-            't1',
-        ];
-        $query[] = [
-            'DROP INDEX ind ON db1.t1;',
-            'DDL',
-            'DROP INDEX',
-            't1',
-        ];
-        $query[] = [
-            'RENAME TABLE db1.t1 TO db1.t2',
-            'DDL',
-            'RENAME TABLE',
-            't1',
-            '',
-            't2',
-        ];
-        $query[] = [
-            'UPDATE db1.t1 SET a = 2',
-            'DML',
-            'UPDATE',
-            't1',
-        ];
-        $query[] = [
-            'INSERT INTO db1.t1 (a, b, c) VALUES(1, 2, 3)',
-            'DML',
-            'INSERT',
-            't1',
-        ];
-        $query[] = [
-            'DELETE FROM db1.t1',
-            'DML',
-            'DELETE',
-            't1',
-        ];
-        $query[] = [
-            'TRUNCATE db1.t1',
-            'DML',
-            'TRUNCATE',
-            't1',
-        ];
+        $query[] = ['CREATE VIEW v AS SELECT * FROM t;', 'DDL', 'CREATE VIEW', 'v'];
+        $query[] = ['ALTER VIEW db1.v AS SELECT col1, col2, col3, col4 FROM t', 'DDL', 'ALTER VIEW', 'v'];
+        $query[] = ['DROP VIEW db1.v;', 'DDL', 'DROP VIEW', 'v'];
+        $query[] = ['DROP VIEW IF EXISTS db1.v;', 'DDL', 'DROP VIEW', 'v'];
+        $query[] = ['CREATE DATABASE db1;', 'DDL', 'CREATE DATABASE', '', 'db1'];
+        $query[] = ['ALTER DATABASE db1;', 'DDL', 'ALTER DATABASE', ''];
+        $query[] = ['DROP DATABASE db1;', 'DDL', 'DROP DATABASE', '', 'db1'];
+        $query[] = ['CREATE TABLE db1.t1 (c1 INT);', 'DDL', 'CREATE TABLE', 't1'];
+        $query[] = ['ALTER TABLE db1.t1 ADD c2 TEXT;', 'DDL', 'ALTER TABLE', 't1'];
+        $query[] = ['DROP TABLE db1.t1', 'DDL', 'DROP TABLE', 't1'];
+        $query[] = ['DROP TABLE IF EXISTS db1.t1', 'DDL', 'DROP TABLE', 't1'];
+        $query[] = ['CREATE INDEX ind ON db1.t1 (c2(10));', 'DDL', 'CREATE INDEX', 't1'];
+        $query[] = ['CREATE UNIQUE INDEX ind ON db1.t1 (c2(10));', 'DDL', 'CREATE INDEX', 't1'];
+        $query[] = ['CREATE SPATIAL INDEX ind ON db1.t1 (c2(10));', 'DDL', 'CREATE INDEX', 't1'];
+        $query[] = ['DROP INDEX ind ON db1.t1;', 'DDL', 'DROP INDEX', 't1'];
+        $query[] = ['RENAME TABLE db1.t1 TO db1.t2', 'DDL', 'RENAME TABLE', 't1', '', 't2'];
+        $query[] = ['UPDATE db1.t1 SET a = 2', 'DML', 'UPDATE', 't1'];
+        $query[] = ['INSERT INTO db1.t1 (a, b, c) VALUES(1, 2, 3)', 'DML', 'INSERT', 't1'];
+        $query[] = ['DELETE FROM db1.t1', 'DML', 'DELETE', 't1'];
+        $query[] = ['TRUNCATE db1.t1', 'DML', 'TRUNCATE', 't1'];
         $query[] = [
             'create table event(' . "\n"
             . 'eventID varchar(10) not null,' . "\n"
diff --git a/test/classes/Tracking/TrackingTest.php b/test/classes/Tracking/TrackingTest.php
index 3a8f59ae6c..32cca40084 100644
--- a/test/classes/Tracking/TrackingTest.php
+++ b/test/classes/Tracking/TrackingTest.php
@@ -71,16 +71,8 @@ class TrackingTest extends AbstractTestCase
     public function testFilter(): void
     {
         $data = [
-            [
-                'date' => '2012-01-01 12:34:56',
-                'username' => 'username1',
-                'statement' => 'statement1',
-            ],
-            [
-                'date' => '2013-01-01 12:34:56',
-                'username' => 'username2',
-                'statement' => 'statement2',
-            ],
+            ['date' => '2012-01-01 12:34:56', 'username' => 'username1', 'statement' => 'statement1'],
+            ['date' => '2013-01-01 12:34:56', 'username' => 'username2', 'statement' => 'statement2'],
         ];
         $filterUsers = ['username1'];
 
@@ -275,10 +267,7 @@ class TrackingTest extends AbstractTestCase
 
         $this->assertStringContainsString($data['tracking'], $html);
 
-        $version = Url::getHiddenInputs($urlParams + [
-            'report' => 'true',
-            'version' => '10',
-        ]);
+        $version = Url::getHiddenInputs($urlParams + ['report' => 'true', 'version' => '10']);
 
         $this->assertStringContainsString($version, $html);
 
@@ -311,13 +300,7 @@ class TrackingTest extends AbstractTestCase
     {
         $data = [
             'tracking' => 'tracking',
-            'dmlog' => [
-                [
-                    'statement' => 'statement',
-                    'date' => '2013-01-01 12:34:56',
-                    'username' => 'username',
-                ],
-            ],
+            'dmlog' => [['statement' => 'statement', 'date' => '2013-01-01 12:34:56', 'username' => 'username']],
             'ddlog' => ['ddlog'],
         ];
         $urlParams = [];
@@ -363,13 +346,7 @@ class TrackingTest extends AbstractTestCase
     {
         $data = [
             'tracking' => 'tracking',
-            'ddlog' => [
-                [
-                    'statement' => 'statement',
-                    'date' => '2013-01-01 12:34:56',
-                    'username' => 'username',
-                ],
-            ],
+            'ddlog' => [['statement' => 'statement', 'date' => '2013-01-01 12:34:56', 'username' => 'username']],
             'dmlog' => ['dmlog'],
         ];
         $filterUsers = ['*'];
@@ -529,20 +506,8 @@ class TrackingTest extends AbstractTestCase
     {
         $data = [
             'tracking' => 'tracking',
-            'ddlog' => [
-                [
-                    'statement' => 'statement1',
-                    'date' => '2012-01-01 12:34:56',
-                    'username' => 'username3',
-                ],
-            ],
-            'dmlog' => [
-                [
-                    'statement' => 'statement1',
-                    'date' => '2013-01-01 12:34:56',
-                    'username' => 'username3',
-                ],
-            ],
+            'ddlog' => [['statement' => 'statement1', 'date' => '2012-01-01 12:34:56', 'username' => 'username3']],
+            'dmlog' => [['statement' => 'statement1', 'date' => '2013-01-01 12:34:56', 'username' => 'username3']],
         ];
         $filterUsers = ['*'];
 
diff --git a/test/classes/TransformationsTest.php b/test/classes/TransformationsTest.php
index 4e40b6dca2..70cfdfb28e 100644
--- a/test/classes/TransformationsTest.php
+++ b/test/classes/TransformationsTest.php
@@ -24,10 +24,7 @@ class TransformationsTest extends AbstractTestCase
         $GLOBALS['dbi'] = $this->createDatabaseInterface();
         $GLOBALS['table'] = 'table';
         $GLOBALS['db'] = 'db';
-        $GLOBALS['cfg'] = [
-            'ServerDefault' => 1,
-            'ActionLinksMode' => 'icons',
-        ];
+        $GLOBALS['cfg'] = ['ServerDefault' => 1, 'ActionLinksMode' => 'icons'];
         $GLOBALS['server'] = 1;
         $GLOBALS['cfg']['Server']['pmadb'] = 'pmadb';
         $GLOBALS['cfg']['Server']['user'] = 'user';
@@ -63,39 +60,11 @@ class TransformationsTest extends AbstractTestCase
     public static function getOptionsData(): array
     {
         return [
-            [
-                'option1 , option2 ',
-                [
-                    'option1 ',
-                    ' option2 ',
-                ],
-            ],
-            [
-                "'option1' ,' option2' ",
-                [
-                    'option1',
-                    ' option2',
-                ],
-            ],
-            [
-                "'2,3' ,' ,, option ,,' ",
-                [
-                    '2,3',
-                    ' ,, option ,,',
-                ],
-            ],
-            [
-                "'',,",
-                [
-                    '',
-                    '',
-                    '',
-                ],
-            ],
-            [
-                '',
-                [],
-            ],
+            ['option1 , option2 ', ['option1 ', ' option2 ']],
+            ["'option1' ,' option2' ", ['option1', ' option2']],
+            ["'2,3' ,' ,, option ,,' ", ['2,3', ' ,, option ,,']],
+            ["'',,", ['', '', '']],
+            ['', []],
         ];
     }
 
@@ -279,26 +248,11 @@ class TransformationsTest extends AbstractTestCase
     public static function fixupData(): array
     {
         return [
-            [
-                'text_plain_bool2text.php',
-                'Text_Plain_Bool2Text.php',
-            ],
-            [
-                'application_octetstream_download.php',
-                'Application_Octetstream_Download.php',
-            ],
-            [
-                'text_plain_json.php',
-                'Text_Plain_Json.php',
-            ],
-            [
-                'image_jpeg_link.php',
-                'Image_JPEG_Link.php',
-            ],
-            [
-                'text_plain_dateformat.php',
-                'Text_Plain_Dateformat.php',
-            ],
+            ['text_plain_bool2text.php', 'Text_Plain_Bool2Text.php'],
+            ['application_octetstream_download.php', 'Application_Octetstream_Download.php'],
+            ['text_plain_json.php', 'Text_Plain_Json.php'],
+            ['image_jpeg_link.php', 'Image_JPEG_Link.php'],
+            ['text_plain_dateformat.php', 'Text_Plain_Dateformat.php'],
         ];
     }
 
@@ -321,18 +275,9 @@ class TransformationsTest extends AbstractTestCase
     public static function providerGetDescription(): array
     {
         return [
-            [
-                '../../../../test',
-                '',
-            ],
-            [
-                'Input/Text_Plain_SqlEditor',
-                'Syntax highlighted CodeMirror editor for SQL.',
-            ],
-            [
-                'Output/Text_Plain_Sql',
-                'Formats text as SQL query with syntax highlighting.',
-            ],
+            ['../../../../test', ''],
+            ['Input/Text_Plain_SqlEditor', 'Syntax highlighted CodeMirror editor for SQL.'],
+            ['Output/Text_Plain_Sql', 'Formats text as SQL query with syntax highlighting.'],
         ];
     }
 
@@ -354,19 +299,6 @@ class TransformationsTest extends AbstractTestCase
 
     public static function providerGetName(): array
     {
-        return [
-            [
-                '../../../../test',
-                '',
-            ],
-            [
-                'Input/Text_Plain_SqlEditor',
-                'SQL',
-            ],
-            [
-                'Output/Text_Plain_Sql',
-                'SQL',
-            ],
-        ];
+        return [['../../../../test', ''], ['Input/Text_Plain_SqlEditor', 'SQL'], ['Output/Text_Plain_Sql', 'SQL']];
     }
 }
diff --git a/test/classes/TwoFactorTest.php b/test/classes/TwoFactorTest.php
index b7ff56110c..8a9596c319 100644
--- a/test/classes/TwoFactorTest.php
+++ b/test/classes/TwoFactorTest.php
@@ -38,10 +38,7 @@ class TwoFactorTest extends AbstractTestCase
         $GLOBALS['db'] = '';
         $GLOBALS['table'] = 'table';
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
-        $GLOBALS['cfg']['DBG'] = [
-            'simple2fa' => false,
-            'sql' => false,
-        ];
+        $GLOBALS['cfg']['DBG'] = ['simple2fa' => false, 'sql' => false];
         $GLOBALS['cfg']['NaturalOrder'] = true;
         $this->initStorageConfigAndData();
     }
@@ -98,9 +95,7 @@ class TwoFactorTest extends AbstractTestCase
 
         $this->dummyDbi->addResult(
             'SELECT NULL FROM `pma__userconfig` LIMIT 0',
-            [
-                ['NULL'],
-            ],
+            [['NULL']],
             ['NULL'],
         );
     }
@@ -131,19 +126,14 @@ class TwoFactorTest extends AbstractTestCase
     {
         $this->dummyDbi->addResult(
             'SELECT `username` FROM `phpmyadmin`.`pma__userconfig` WHERE `username` = \'groot\'',
-            [
-                ['groot'],
-            ],
+            [['groot']],
             ['username'],
         );
 
         $jsonData = (string) json_encode([
             'Console\\\\\\/Mode' => 'collapse',
             'lang' => 'fr',
-            '2fa' => [
-                'backend' => $backend,
-                'settings' => $backendSettings,
-            ],
+            '2fa' => ['backend' => $backend, 'settings' => $backendSettings],
         ], JSON_UNESCAPED_SLASHES);
         $jsonData = str_replace('"', '\"', $jsonData);
 
@@ -160,14 +150,7 @@ class TwoFactorTest extends AbstractTestCase
             'SELECT `config_data`, UNIX_TIMESTAMP(`timevalue`) ts'
             . ' FROM `phpmyadmin`.`pma__userconfig` WHERE `username` = \'groot\'',
             $config === null ? [] : [
-                [
-                    (string) json_encode([
-                        'Console\/Mode' => 'collapse',
-                        'lang' => 'fr',
-                        '2fa' => $config,
-                    ]),
-                    '1628632378',
-                ],
+                [(string) json_encode(['Console\/Mode' => 'collapse', 'lang' => 'fr', '2fa' => $config]), '1628632378'],
             ],
             ['config_data', 'ts'],
         );
@@ -287,9 +270,7 @@ class TwoFactorTest extends AbstractTestCase
 
         $this->dummyDbi->assertAllQueriesConsumed();
         $this->loadResultForConfig([]);
-        $this->loadQueriesForConfigure('application', [
-            'secret' => $object->config['settings']['secret'],
-        ]);
+        $this->loadQueriesForConfigure('application', ['secret' => $object->config['settings']['secret']]);
 
         $this->assertTrue($object->configure('application'));
 
diff --git a/test/classes/TypesByDatabaseVersionTest.php b/test/classes/TypesByDatabaseVersionTest.php
index 7ea258cc32..5eb3ff86bd 100644
--- a/test/classes/TypesByDatabaseVersionTest.php
+++ b/test/classes/TypesByDatabaseVersionTest.php
@@ -650,13 +650,7 @@ class TypesByDatabaseVersionTest extends AbstractTestCase
                         'BOOLEAN',
                         'SERIAL',
                     ],
-                    'Date and time' => [
-                        'DATE',
-                        'DATETIME',
-                        'TIMESTAMP',
-                        'TIME',
-                        'YEAR',
-                    ],
+                    'Date and time' => ['DATE', 'DATETIME', 'TIMESTAMP', 'TIME', 'YEAR'],
                     'String' => [
                         'CHAR',
                         'VARCHAR',
@@ -713,13 +707,7 @@ class TypesByDatabaseVersionTest extends AbstractTestCase
                         'BOOLEAN',
                         'SERIAL',
                     ],
-                    'Date and time' => [
-                        'DATE',
-                        'DATETIME',
-                        'TIMESTAMP',
-                        'TIME',
-                        'YEAR',
-                    ],
+                    'Date and time' => ['DATE', 'DATETIME', 'TIMESTAMP', 'TIME', 'YEAR'],
                     'String' => [
                         'CHAR',
                         'VARCHAR',
@@ -777,13 +765,7 @@ class TypesByDatabaseVersionTest extends AbstractTestCase
                         'BOOLEAN',
                         'SERIAL',
                     ],
-                    'Date and time' => [
-                        'DATE',
-                        'DATETIME',
-                        'TIMESTAMP',
-                        'TIME',
-                        'YEAR',
-                    ],
+                    'Date and time' => ['DATE', 'DATETIME', 'TIMESTAMP', 'TIME', 'YEAR'],
                     'String' => [
                         'CHAR',
                         'VARCHAR',
@@ -840,13 +822,7 @@ class TypesByDatabaseVersionTest extends AbstractTestCase
                         'BOOLEAN',
                         'SERIAL',
                     ],
-                    'Date and time' => [
-                        'DATE',
-                        'DATETIME',
-                        'TIMESTAMP',
-                        'TIME',
-                        'YEAR',
-                    ],
+                    'Date and time' => ['DATE', 'DATETIME', 'TIMESTAMP', 'TIME', 'YEAR'],
                     'String' => [
                         'CHAR',
                         'VARCHAR',
@@ -904,13 +880,7 @@ class TypesByDatabaseVersionTest extends AbstractTestCase
                         'BOOLEAN',
                         'SERIAL',
                     ],
-                    'Date and time' => [
-                        'DATE',
-                        'DATETIME',
-                        'TIMESTAMP',
-                        'TIME',
-                        'YEAR',
-                    ],
+                    'Date and time' => ['DATE', 'DATETIME', 'TIMESTAMP', 'TIME', 'YEAR'],
                     'String' => [
                         'CHAR',
                         'VARCHAR',
@@ -971,13 +941,7 @@ class TypesByDatabaseVersionTest extends AbstractTestCase
                         'BOOLEAN',
                         'SERIAL',
                     ],
-                    'Date and time' => [
-                        'DATE',
-                        'DATETIME',
-                        'TIMESTAMP',
-                        'TIME',
-                        'YEAR',
-                    ],
+                    'Date and time' => ['DATE', 'DATETIME', 'TIMESTAMP', 'TIME', 'YEAR'],
                     'String' => [
                         'CHAR',
                         'VARCHAR',
diff --git a/test/classes/TypesTest.php b/test/classes/TypesTest.php
index 6c9da6b3fa..10ee705131 100644
--- a/test/classes/TypesTest.php
+++ b/test/classes/TypesTest.php
@@ -38,12 +38,7 @@ class TypesTest extends AbstractTestCase
     public function testGetUnaryOperators(): void
     {
         $this->assertEquals(
-            [
-                'IS NULL',
-                'IS NOT NULL',
-                "= ''",
-                "!= ''",
-            ],
+            ['IS NULL', 'IS NOT NULL', "= ''", "!= ''"],
             $this->object->getUnaryOperators(),
         );
     }
@@ -54,10 +49,7 @@ class TypesTest extends AbstractTestCase
     public function testGetNullOperators(): void
     {
         $this->assertEquals(
-            [
-                'IS NULL',
-                'IS NOT NULL',
-            ],
+            ['IS NULL', 'IS NOT NULL'],
             $this->object->getNullOperators(),
         );
     }
@@ -68,10 +60,7 @@ class TypesTest extends AbstractTestCase
     public function testGetEnumOperators(): void
     {
         $this->assertEquals(
-            [
-                '=',
-                '!=',
-            ],
+            ['=', '!='],
             $this->object->getEnumOperators(),
         );
     }
@@ -135,16 +124,7 @@ class TypesTest extends AbstractTestCase
     public function testGetUUIDOperators(): void
     {
         $this->assertEquals(
-            [
-                '=',
-                '!=',
-                'LIKE',
-                'LIKE %...%',
-                'NOT LIKE',
-                'NOT LIKE %...%',
-                'IN (...)',
-                'NOT IN (...)',
-            ],
+            ['=', '!=', 'LIKE', 'LIKE %...%', 'NOT LIKE', 'NOT LIKE %...%', 'IN (...)', 'NOT IN (...)'],
             $this->object->getUUIDOperators(),
         );
     }
@@ -174,14 +154,7 @@ class TypesTest extends AbstractTestCase
     public static function providerForGetTypeOperators(): array
     {
         return [
-            [
-                'enum',
-                false,
-                [
-                    '=',
-                    '!=',
-                ],
-            ],
+            ['enum', false, ['=', '!=']],
             [
                 'CHAR',
                 true,
@@ -204,28 +177,12 @@ class TypesTest extends AbstractTestCase
                     'IS NULL',
                     'IS NOT NULL',
                 ],
-                [
-                    'int',
-                    false,
-                    [
-                        '=',
-                        '!=',
-                    ],
-                ],
+                ['int', false, ['=', '!=']],
             ],
             [
                 'UUID',
                 false,
-                [
-                    '=',
-                    '!=',
-                    'LIKE',
-                    'LIKE %...%',
-                    'NOT LIKE',
-                    'NOT LIKE %...%',
-                    'IN (...)',
-                    'NOT IN (...)',
-                ],
+                ['=', '!=', 'LIKE', 'LIKE %...%', 'NOT LIKE', 'NOT LIKE %...%', 'IN (...)', 'NOT IN (...)'],
             ],
             [
                 'UUID',
@@ -276,12 +233,7 @@ class TypesTest extends AbstractTestCase
     public static function providerForTestGetTypeOperatorsHtml(): array
     {
         return [
-            [
-                'enum',
-                false,
-                '=',
-                '<option value="=" selected="selected">=</option><option value="!=">!=</option>',
-            ],
+            ['enum', false, '=', '<option value="=" selected="selected">=</option><option value="!=">!=</option>'],
         ];
     }
 
@@ -524,10 +476,7 @@ class TypesTest extends AbstractTestCase
                     'YEARWEEK',
                 ],
             ],
-            [
-                'UNKNOWN',
-                [],
-            ],
+            ['UNKNOWN', []],
         ];
     }
 
@@ -714,13 +663,7 @@ class TypesTest extends AbstractTestCase
     public function testGetAttributes(): void
     {
         $this->assertEquals(
-            [
-                '',
-                'BINARY',
-                'UNSIGNED',
-                'UNSIGNED ZEROFILL',
-                'on update CURRENT_TIMESTAMP',
-            ],
+            ['', 'BINARY', 'UNSIGNED', 'UNSIGNED ZEROFILL', 'on update CURRENT_TIMESTAMP'],
             $this->object->getAttributes(),
         );
     }
@@ -752,13 +695,7 @@ class TypesTest extends AbstractTestCase
                     'BOOLEAN',
                     'SERIAL',
                 ],
-                'Date and time' => [
-                    'DATE',
-                    'DATETIME',
-                    'TIMESTAMP',
-                    'TIME',
-                    'YEAR',
-                ],
+                'Date and time' => ['DATE', 'DATETIME', 'TIMESTAMP', 'TIME', 'YEAR'],
                 'String' => [
                     'CHAR',
                     'VARCHAR',
@@ -817,34 +754,13 @@ class TypesTest extends AbstractTestCase
     public static function providerFortTestGetTypeClass(): array
     {
         return [
-            [
-                'SERIAL',
-                'NUMBER',
-            ],
-            [
-                'YEAR',
-                'DATE',
-            ],
-            [
-                'GEOMETRYCOLLECTION',
-                'SPATIAL',
-            ],
-            [
-                'SET',
-                'CHAR',
-            ],
-            [
-                'JSON',
-                'JSON',
-            ],
-            [
-                'UUID',
-                'UUID',
-            ],
-            [
-                'UNKNOWN',
-                '',
-            ],
+            ['SERIAL', 'NUMBER'],
+            ['YEAR', 'DATE'],
+            ['GEOMETRYCOLLECTION', 'SPATIAL'],
+            ['SET', 'CHAR'],
+            ['JSON', 'JSON'],
+            ['UUID', 'UUID'],
+            ['UNKNOWN', ''],
         ];
     }
 }
diff --git a/test/classes/UrlTest.php b/test/classes/UrlTest.php
index 1c5d2c4c0a..e6f44f7779 100644
--- a/test/classes/UrlTest.php
+++ b/test/classes/UrlTest.php
@@ -59,10 +59,7 @@ class UrlTest extends AbstractTestCase
         $expected = '?db=db'
             . $separator . 'table=table'
             . $separator . $expected;
-        $params = [
-            'db' => 'db',
-            'table' => 'table',
-        ];
+        $params = ['db' => 'db', 'table' => 'table'];
         $this->assertEquals($expected, Url::getCommon($params));
     }
 
@@ -82,10 +79,7 @@ class UrlTest extends AbstractTestCase
         $this->assertEquals(
             $expected,
             Url::getCommonRaw(
-                [
-                    'db' => 'db',
-                    'table' => 'table',
-                ],
+                ['db' => 'db', 'table' => 'table'],
                 '#ABC#',
             ),
         );
diff --git a/test/classes/UserPreferencesTest.php b/test/classes/UserPreferencesTest.php
index 4c6fe66bf6..09ffbc998b 100644
--- a/test/classes/UserPreferencesTest.php
+++ b/test/classes/UserPreferencesTest.php
@@ -37,10 +37,7 @@ class UserPreferencesTest extends AbstractNetworkTestCase
      */
     public function testPageInit(): void
     {
-        $GLOBALS['cfg'] = [
-            'Server/hide_db' => 'testval123',
-            'Server/port' => '213',
-        ];
+        $GLOBALS['cfg'] = ['Server/hide_db' => 'testval123', 'Server/port' => '213'];
         $GLOBALS['cfg']['AvailableCharsets'] = [];
         $GLOBALS['cfg']['UserprefsDeveloperTab'] = null;
 
@@ -48,11 +45,7 @@ class UserPreferencesTest extends AbstractNetworkTestCase
         $userPreferences->pageInit(new ConfigFile());
 
         $this->assertEquals(
-            [
-                'Servers' => [
-                    1 => ['hide_db' => 'testval123'],
-                ],
-            ],
+            ['Servers' => [1 => ['hide_db' => 'testval123']]],
             $_SESSION['ConfigFile' . $GLOBALS['server']],
         );
     }
@@ -107,10 +100,7 @@ class UserPreferencesTest extends AbstractNetworkTestCase
             ->with($query, DatabaseInterface::FETCH_ASSOC, Connection::TYPE_CONTROL)
             ->will(
                 $this->returnValue(
-                    [
-                        'ts' => '123',
-                        'config_data' => json_encode([1, 2]),
-                    ],
+                    ['ts' => '123', 'config_data' => json_encode([1, 2])],
                 ),
             );
         $dbi->expects($this->any())
@@ -123,14 +113,7 @@ class UserPreferencesTest extends AbstractNetworkTestCase
         $result = $userPreferences->load();
 
         $this->assertEquals(
-            [
-                'config_data' => [
-                    1,
-                    2,
-                ],
-                'mtime' => 123,
-                'type' => 'db',
-            ],
+            ['config_data' => [1, 2], 'mtime' => 123, 'type' => 'db'],
             $result,
         );
     }
@@ -261,10 +244,7 @@ class UserPreferencesTest extends AbstractNetworkTestCase
      */
     public function testApply(): void
     {
-        $GLOBALS['cfg']['UserprefsDisallow'] = [
-            'test' => 'val',
-            'foo' => 'bar',
-        ];
+        $GLOBALS['cfg']['UserprefsDisallow'] = ['test' => 'val', 'foo' => 'bar'];
         $GLOBALS['cfg']['UserprefsDeveloperTab'] = null;
 
         $userPreferences = new UserPreferences($GLOBALS['dbi']);
@@ -279,9 +259,7 @@ class UserPreferencesTest extends AbstractNetworkTestCase
         );
 
         $this->assertEquals(
-            [
-                'Server' => ['hide_db' => 1],
-            ],
+            ['Server' => ['hide_db' => 1]],
             $result,
         );
     }
@@ -299,9 +277,7 @@ class UserPreferencesTest extends AbstractNetworkTestCase
         );
 
         $this->assertEquals(
-            [
-                'DBG' => ['sql' => true],
-            ],
+            ['DBG' => ['sql' => true]],
             $result,
         );
     }
@@ -316,10 +292,7 @@ class UserPreferencesTest extends AbstractNetworkTestCase
 
         $_SESSION['userconfig'] = [];
         $_SESSION['userconfig']['ts'] = '123';
-        $_SESSION['userconfig']['db'] = [
-            'Server/hide_db' => true,
-            'Server/only_db' => true,
-        ];
+        $_SESSION['userconfig']['db'] = ['Server/hide_db' => true, 'Server/only_db' => true];
 
         $GLOBALS['server'] = 2;
         $_SESSION['relation'][$GLOBALS['server']] = RelationParameters::fromArray([])->toArray();
diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php
index c0f0eb4c6a..08845e416f 100644
--- a/test/classes/UtilTest.php
+++ b/test/classes/UtilTest.php
@@ -58,12 +58,7 @@ class UtilTest extends AbstractTestCase
     public function testListPHPExtensions(): void
     {
         $this->assertSame(
-            [
-                'mysqli',
-                'curl',
-                'mbstring',
-                'sodium',
-            ],
+            ['mysqli', 'curl', 'mbstring', 'sodium'],
             Util::listPHPExtensions(),
         );
     }
@@ -298,11 +293,7 @@ class UtilTest extends AbstractTestCase
                     ]),
                 ],
                 [123],
-                [
-                    '`table`.`col` = 123',
-                    false,
-                    ['`table`.`col`' => '= 123'],
-                ],
+                ['`table`.`col` = 123', false, ['`table`.`col`' => '= 123']],
             ],
             'field type is unknown, value is string - escape string' => [
                 [
@@ -313,11 +304,7 @@ class UtilTest extends AbstractTestCase
                     ]),
                 ],
                 ['test'],
-                [
-                    "`table`.`col` = 'test'",
-                    false,
-                    ['`table`.`col`' => "= 'test'"],
-                ],
+                ["`table`.`col` = 'test'", false, ['`table`.`col`' => "= 'test'"]],
             ],
             'field type is varchar, value is string - escape string' => [
                 [
@@ -328,11 +315,7 @@ class UtilTest extends AbstractTestCase
                     ]),
                 ],
                 ['test'],
-                [
-                    "`table`.`col` = 'test'",
-                    false,
-                    ['`table`.`col`' => "= 'test'"],
-                ],
+                ["`table`.`col` = 'test'", false, ['`table`.`col`' => "= 'test'"]],
             ],
             'field type is varchar, value is string with double quote - escape string' => [
                 [
@@ -343,11 +326,7 @@ class UtilTest extends AbstractTestCase
                     ]),
                 ],
                 ['"test"'],
-                [
-                    "`table`.`col` = '\\\"test\\\"'",
-                    false,
-                    ['`table`.`col`' => "= '\\\"test\\\"'"],
-                ],
+                ["`table`.`col` = '\\\"test\\\"'", false, ['`table`.`col`' => "= '\\\"test\\\"'"]],
             ],
             'field type is varchar, value is string with single quote - escape string' => [
                 [
@@ -358,11 +337,7 @@ class UtilTest extends AbstractTestCase
                     ]),
                 ],
                 ["'test'"],
-                [
-                    "`table`.`col` = '\'test\''",
-                    false,
-                    ['`table`.`col`' => "= '\'test\''"],
-                ],
+                ["`table`.`col` = '\'test\''", false, ['`table`.`col`' => "= '\'test\''"]],
             ],
             'group by multiple columns and field type is mixed' => [
                 [
@@ -381,10 +356,7 @@ class UtilTest extends AbstractTestCase
                 [
                     "`table`.`col` = 'test' AND `table`.`status_id` = 2",
                     false,
-                    [
-                        '`table`.`col`' => "= 'test'",
-                        '`table`.`status_id`' => '= 2',
-                    ],
+                    ['`table`.`col`' => "= 'test'", '`table`.`status_id`' => '= 2'],
                 ],
             ],
         ];
@@ -430,20 +402,7 @@ class UtilTest extends AbstractTestCase
      */
     public static function charsetQueryData(): array
     {
-        return [
-            [
-                'a_b_c_d',
-                ' CHARSET=a COLLATE a_b_c_d',
-            ],
-            [
-                'a_',
-                ' CHARSET=a COLLATE a_',
-            ],
-            [
-                'a',
-                ' CHARSET=a',
-            ],
-        ];
+        return [['a_b_c_d', ' CHARSET=a COLLATE a_b_c_d'], ['a_', ' CHARSET=a COLLATE a_'], ['a', ' CHARSET=a']];
     }
 
     /**
@@ -493,38 +452,14 @@ class UtilTest extends AbstractTestCase
     public static function providerConvertBitDefaultValue(): array
     {
         return [
-            [
-                null,
-                '',
-            ],
-            [
-                "b'",
-                '',
-            ],
-            [
-                "b'01'",
-                '01',
-            ],
-            [
-                "b'010111010'",
-                '010111010',
-            ],
-            'database name starting with b' => [
-                'big database',
-                'big database',
-            ],
-            "database name containing b'" => [
-                "a b'ig database",
-                "a b'ig database",
-            ],
-            'database name in single quotes' => [
-                "'a*database*name'",
-                "'a*database*name'",
-            ],
-            "database name with multiple b'" => [
-                "b'ens datab'ase'",
-                "b'ens datab'ase'",
-            ],
+            [null, ''],
+            ["b'", ''],
+            ["b'01'", '01'],
+            ["b'010111010'", '010111010'],
+            'database name starting with b' => ['big database', 'big database'],
+            "database name containing b'" => ["a b'ig database", "a b'ig database"],
+            'database name in single quotes' => ["'a*database*name'", "'a*database*name'"],
+            "database name with multiple b'" => ["b'ens datab'ase'", "b'ens datab'ase'"],
         ];
     }
 
@@ -540,12 +475,7 @@ class UtilTest extends AbstractTestCase
     {
         parent::setGlobalConfig();
 
-        $GLOBALS['cfg'] = [
-            'Server' => [
-                'host' => 'host&',
-                'verbose' => 'verbose',
-            ],
-        ];
+        $GLOBALS['cfg'] = ['Server' => ['host' => 'host&', 'verbose' => 'verbose']];
         $GLOBALS['db'] = 'database';
         $GLOBALS['table'] = 'table';
 
@@ -571,30 +501,12 @@ class UtilTest extends AbstractTestCase
     public static function providerExpandUserString(): array
     {
         return [
-            [
-                '@SERVER@',
-                'host&',
-            ],
-            [
-                '@VSERVER@',
-                'verbose',
-            ],
-            [
-                '@DATABASE@',
-                'database',
-            ],
-            [
-                '@TABLE@',
-                'table',
-            ],
-            [
-                '@IGNORE@',
-                '@IGNORE@',
-            ],
-            [
-                '@PHPMYADMIN@',
-                'phpMyAdmin ' . Version::VERSION,
-            ],
+            ['@SERVER@', 'host&'],
+            ['@VSERVER@', 'verbose'],
+            ['@DATABASE@', 'database'],
+            ['@TABLE@', 'table'],
+            ['@IGNORE@', '@IGNORE@'],
+            ['@PHPMYADMIN@', 'phpMyAdmin ' . Version::VERSION],
         ];
     }
 
@@ -633,10 +545,7 @@ class UtilTest extends AbstractTestCase
                     'unsigned' => false,
                     'zerofill' => false,
                     'spec_in_brackets' => "'a','b'",
-                    'enum_set_values' => [
-                        'a',
-                        'b',
-                    ],
+                    'enum_set_values' => ['a', 'b'],
                     'attribute' => ' ',
                     'can_contain_collation' => true,
                     'displayed_type' => "set('a', 'b')",
@@ -651,10 +560,7 @@ class UtilTest extends AbstractTestCase
                     'unsigned' => false,
                     'zerofill' => false,
                     'spec_in_brackets' => "'\'a','b'",
-                    'enum_set_values' => [
-                        "'a",
-                        'b',
-                    ],
+                    'enum_set_values' => ["'a", 'b'],
                     'attribute' => ' ',
                     'can_contain_collation' => true,
                     'displayed_type' => "set('\'a', 'b')",
@@ -669,10 +575,7 @@ class UtilTest extends AbstractTestCase
                     'unsigned' => false,
                     'zerofill' => false,
                     'spec_in_brackets' => "'''a','b'",
-                    'enum_set_values' => [
-                        "'a",
-                        'b',
-                    ],
+                    'enum_set_values' => ["'a", 'b'],
                     'attribute' => ' ',
                     'can_contain_collation' => true,
                     'displayed_type' => "set('''a', 'b')",
@@ -687,11 +590,7 @@ class UtilTest extends AbstractTestCase
                     'unsigned' => false,
                     'zerofill' => false,
                     'spec_in_brackets' => "'a&b', 'b''c\\'d', 'e\\\\f'",
-                    'enum_set_values' => [
-                        'a&b',
-                        'b\'c\'d',
-                        'e\\f',
-                    ],
+                    'enum_set_values' => ['a&b', 'b\'c\'d', 'e\\f'],
                     'attribute' => ' ',
                     'can_contain_collation' => true,
                     'displayed_type' => "enum('a&amp;b', 'b''c\\'d', 'e\\\\f')",
@@ -783,24 +682,7 @@ class UtilTest extends AbstractTestCase
      */
     public static function providerExtractValueFromFormattedSize(): array
     {
-        return [
-            [
-                100,
-                -1,
-            ],
-            [
-                '10GB',
-                10737418240,
-            ],
-            [
-                '15MB',
-                15728640,
-            ],
-            [
-                '256K',
-                262144,
-            ],
-        ];
+        return [[100, -1], ['10GB', 10737418240], ['15MB', 15728640], ['256K', 262144]];
     }
 
     public function testFormatByteDownWithNullValue(): void
@@ -834,168 +716,24 @@ class UtilTest extends AbstractTestCase
     public static function providerFormatByteDown(): array
     {
         return [
-            [
-                '0',
-                6,
-                0,
-                [
-                    '0',
-                    __('B'),
-                ],
-            ],
-            [
-                'A4',
-                6,
-                0,
-                [
-                    '0',
-                    __('B'),
-                ],
-            ],
-            [
-                10,
-                2,
-                2,
-                [
-                    '10',
-                    __('B'),
-                ],
-            ],
-            [
-                100,
-                2,
-                0,
-                [
-                    '0',
-                    __('KiB'),
-                ],
-            ],
-            [
-                100,
-                3,
-                0,
-                [
-                    '100',
-                    __('B'),
-                ],
-            ],
-            [
-                100,
-                2,
-                2,
-                [
-                    '0.10',
-                    __('KiB'),
-                ],
-            ],
-            [
-                1034,
-                3,
-                2,
-                [
-                    '1.01',
-                    __('KiB'),
-                ],
-            ],
-            [
-                100233,
-                3,
-                3,
-                [
-                    '97.884',
-                    __('KiB'),
-                ],
-            ],
-            [
-                '100233',
-                3,
-                3,
-                [
-                    '97.884',
-                    __('KiB'),
-                ],
-            ],
-            [
-                '102400K',
-                3,
-                3,
-                [
-                    '100.000',
-                    __('KiB'),
-                ],
-            ],
-            [
-                '102401K',
-                3,
-                3,
-                [
-                    '100.001',
-                    __('KiB'),
-                ],
-            ],
-            [
-                '153600K',
-                3,
-                3,
-                [
-                    '150.000',
-                    __('KiB'),
-                ],
-            ],
-            [
-                '153600K',
-                3,
-                0,
-                [
-                    '150',
-                    __('KiB'),
-                ],
-            ],
-            [
-                102400 * 1024,
-                3,
-                0,
-                [
-                    '100',
-                    __('MiB'),
-                ],
-            ],
-            [
-                2206451,
-                1,
-                2,
-                [
-                    '2.10',
-                    __('MiB'),
-                ],
-            ],
-            [
-                21474836480,
-                4,
-                0,
-                [
-                    '20',
-                    __('GiB'),
-                ],
-            ],
-            [
-                floatval(52) + floatval(2048),
-                3,
-                1,
-                [
-                    '2.1',
-                    'KiB',
-                ],
-            ],
-            [
-                '' . (floatval(52) + floatval(2048)),
-                3,
-                1,
-                [
-                    '2.1',
-                    'KiB',
-                ],
-            ],
+            ['0', 6, 0, ['0', __('B')]],
+            ['A4', 6, 0, ['0', __('B')]],
+            [10, 2, 2, ['10', __('B')]],
+            [100, 2, 0, ['0', __('KiB')]],
+            [100, 3, 0, ['100', __('B')]],
+            [100, 2, 2, ['0.10', __('KiB')]],
+            [1034, 3, 2, ['1.01', __('KiB')]],
+            [100233, 3, 3, ['97.884', __('KiB')]],
+            ['100233', 3, 3, ['97.884', __('KiB')]],
+            ['102400K', 3, 3, ['100.000', __('KiB')]],
+            ['102401K', 3, 3, ['100.001', __('KiB')]],
+            ['153600K', 3, 3, ['150.000', __('KiB')]],
+            ['153600K', 3, 0, ['150', __('KiB')]],
+            [102400 * 1024, 3, 0, ['100', __('MiB')]],
+            [2206451, 1, 2, ['2.10', __('MiB')]],
+            [21474836480, 4, 0, ['20', __('GiB')]],
+            [floatval(52) + floatval(2048), 3, 1, ['2.1', 'KiB']],
+            ['' . (floatval(52) + floatval(2048)), 3, 1, ['2.1', 'KiB']],
         ];
     }
 
@@ -1081,114 +819,24 @@ class UtilTest extends AbstractTestCase
     public static function providerFormatNumber(): array
     {
         return [
-            [
-                10,
-                2,
-                2,
-                '10  ',
-            ],
-            [
-                100,
-                2,
-                0,
-                '100  ',
-            ],
-            [
-                100,
-                2,
-                2,
-                '100  ',
-            ],
-            [
-                '100',
-                2,
-                2,
-                '100  ',
-            ],
-            [
-                -1000.454,
-                4,
-                2,
-                '-1,000.45  ',
-            ],
-            [
-                '-1000.454',
-                4,
-                2,
-                '-1,000.45  ',
-            ],
-            [
-                0.00003,
-                3,
-                2,
-                '30 µ',
-            ],
-            [
-                0.003,
-                3,
-                3,
-                '3 m',
-            ],
-            [
-                -0.003,
-                6,
-                0,
-                '-3,000 µ',
-            ],
-            [
-                100.98,
-                0,
-                2,
-                '100.98',
-            ],
-            [
-                21010101,
-                0,
-                2,
-                '21,010,101.00',
-            ],
-            [
-                1100000000,
-                5,
-                0,
-                '1,100 M',
-            ],
-            [
-                '1100000000',
-                5,
-                0,
-                '1,100 M',
-            ],
-            [
-                20000,
-                2,
-                2,
-                '20 k',
-            ],
-            [
-                20011,
-                2,
-                2,
-                '20.01 k',
-            ],
-            [
-                123456789,
-                6,
-                0,
-                '123,457 k',
-            ],
-            [
-                -123456789,
-                4,
-                2,
-                '-123.46 M',
-            ],
-            [
-                0,
-                6,
-                0,
-                '0',
-            ],
+            [10, 2, 2, '10  '],
+            [100, 2, 0, '100  '],
+            [100, 2, 2, '100  '],
+            ['100', 2, 2, '100  '],
+            [-1000.454, 4, 2, '-1,000.45  '],
+            ['-1000.454', 4, 2, '-1,000.45  '],
+            [0.00003, 3, 2, '30 µ'],
+            [0.003, 3, 3, '3 m'],
+            [-0.003, 6, 0, '-3,000 µ'],
+            [100.98, 0, 2, '100.98'],
+            [21010101, 0, 2, '21,010,101.00'],
+            [1100000000, 5, 0, '1,100 M'],
+            ['1100000000', 5, 0, '1,100 M'],
+            [20000, 2, 2, '20 k'],
+            [20011, 2, 2, '20.01 k'],
+            [123456789, 6, 0, '123,457 k'],
+            [-123456789, 4, 2, '-123.46 M'],
+            [0, 6, 0, '0'],
         ];
     }
 
@@ -1217,51 +865,15 @@ class UtilTest extends AbstractTestCase
     public static function providerGetFormattedMaximumUploadSize(): array
     {
         return [
-            [
-                10,
-                __('B'),
-                '10',
-            ],
-            [
-                100,
-                __('B'),
-                '100',
-            ],
-            [
-                1024,
-                __('B'),
-                '1,024',
-            ],
-            [
-                102400,
-                __('KiB'),
-                '100',
-            ],
-            [
-                10240000,
-                __('MiB'),
-                '10',
-            ],
-            [
-                2147483648,
-                __('MiB'),
-                '2,048',
-            ],
-            [
-                21474836480,
-                __('GiB'),
-                '20',
-            ],
-            [
-                '153600K',
-                __('KiB'),
-                '150',
-            ],
-            [
-                '157286400',
-                __('MiB'),
-                '150',
-            ],
+            [10, __('B'), '10'],
+            [100, __('B'), '100'],
+            [1024, __('B'), '1,024'],
+            [102400, __('KiB'), '100'],
+            [10240000, __('MiB'), '10'],
+            [2147483648, __('MiB'), '2,048'],
+            [21474836480, __('GiB'), '20'],
+            ['153600K', __('KiB'), '150'],
+            ['157286400', __('MiB'), '150'],
             [
                 // Equals to Core::getRealSize of '102400K'
                 // according to PHP FAQ on "shorthandbytes"
@@ -1296,30 +908,12 @@ class UtilTest extends AbstractTestCase
     public static function providerGetTitleForTarget(): array
     {
         return [
-            [
-                'structure',
-                __('Structure'),
-            ],
-            [
-                'sql',
-                __('SQL'),
-            ],
-            [
-                'search',
-                __('Search'),
-            ],
-            [
-                'insert',
-                __('Insert'),
-            ],
-            [
-                'browse',
-                __('Browse'),
-            ],
-            [
-                'operations',
-                __('Operations'),
-            ],
+            ['structure', __('Structure')],
+            ['sql', __('SQL')],
+            ['search', __('Search')],
+            ['insert', __('Insert')],
+            ['browse', __('Browse')],
+            ['operations', __('Operations')],
         ];
     }
 
@@ -1363,48 +957,12 @@ class UtilTest extends AbstractTestCase
         $hasJaTranslations = file_exists(LOCALE_PATH . '/cs/LC_MESSAGES/phpmyadmin.mo');
 
         return [
-            [
-                1227455558,
-                '',
-                'Nov 23, 2008 at 03:52 PM',
-                'Europe/London',
-                'en',
-            ],
-            [
-                1227455558,
-                '%Y-%m-%d %H:%M:%S %a',
-                '2008-11-23 15:52:38 Sun',
-                'Europe/London',
-                'en',
-            ],
-            [
-                1227455558,
-                '%Y-%m-%d %H:%M:%S %a',
-                '2008-11-23 16:52:38 Sun',
-                'Europe/Paris',
-                'en',
-            ],
-            [
-                1227455558,
-                '%Y-%m-%d %H:%M:%S %a',
-                '2008-11-24 00:52:38 Mon',
-                'Asia/Tokyo',
-                'en',
-            ],
-            [
-                1227455558,
-                '%a %A %b %B',
-                'Mon Mon Nov Nov',
-                'Asia/Tokyo',
-                'en',
-            ],
-            [
-                1227455558,
-                '%a %A %b %B %P',
-                'Mon Mon Nov Nov AM',
-                'Asia/Tokyo',
-                'en',
-            ],
+            [1227455558, '', 'Nov 23, 2008 at 03:52 PM', 'Europe/London', 'en'],
+            [1227455558, '%Y-%m-%d %H:%M:%S %a', '2008-11-23 15:52:38 Sun', 'Europe/London', 'en'],
+            [1227455558, '%Y-%m-%d %H:%M:%S %a', '2008-11-23 16:52:38 Sun', 'Europe/Paris', 'en'],
+            [1227455558, '%Y-%m-%d %H:%M:%S %a', '2008-11-24 00:52:38 Mon', 'Asia/Tokyo', 'en'],
+            [1227455558, '%a %A %b %B', 'Mon Mon Nov Nov', 'Asia/Tokyo', 'en'],
+            [1227455558, '%a %A %b %B %P', 'Mon Mon Nov Nov AM', 'Asia/Tokyo', 'en'],
             [
                 1227455558,
                 '%Y-%m-%d %H:%M:%S %a',
@@ -1426,27 +984,9 @@ class UtilTest extends AbstractTestCase
                 'Asia/Tokyo',
                 'ja',
             ],
-            [
-                1227455558,
-                '月月',
-                '月月',
-                'Asia/Tokyo',
-                'ja',
-            ],
-            [
-                1227455558,
-                '%Y 年 2 月 %d 日 %H:%M',
-                '2008 年 2 月 24 日 00:52',
-                'Asia/Tokyo',
-                'ja',
-            ],
-            [
-                1227455558,
-                '%Y 年 2 � %d 日 %H:%M',
-                '2008 年 2 � 24 日 00:52',
-                'Asia/Tokyo',
-                'ja',
-            ],
+            [1227455558, '月月', '月月', 'Asia/Tokyo', 'ja'],
+            [1227455558, '%Y 年 2 月 %d 日 %H:%M', '2008 年 2 月 24 日 00:52', 'Asia/Tokyo', 'ja'],
+            [1227455558, '%Y 年 2 � %d 日 %H:%M', '2008 年 2 � 24 日 00:52', 'Asia/Tokyo', 'ja'],
             [
                 1617153941,
                 'H:i:s Y-d-m',
@@ -1494,14 +1034,8 @@ class UtilTest extends AbstractTestCase
     public static function providerTimespanFormat(): array
     {
         return [
-            [
-                1258,
-                '0 days, 0 hours, 20 minutes and 58 seconds',
-            ],
-            [
-                821958,
-                '9 days, 12 hours, 19 minutes and 18 seconds',
-            ],
+            [1258, '0 days, 0 hours, 20 minutes and 58 seconds'],
+            [821958, '9 days, 12 hours, 19 minutes and 18 seconds'],
         ];
     }
 
@@ -1530,16 +1064,8 @@ class UtilTest extends AbstractTestCase
     public static function providerPrintableBitValue(): array
     {
         return [
-            [
-                20131009,
-                64,
-                '0000000000000000000000000000000000000001001100110010110011000001',
-            ],
-            [
-                5,
-                32,
-                '00000000000000000000000000000101',
-            ],
+            [20131009, 64, '0000000000000000000000000000000000000001001100110010110011000001'],
+            [5, 32, '00000000000000000000000000000101'],
         ];
     }
 
@@ -1566,24 +1092,7 @@ class UtilTest extends AbstractTestCase
      */
     public static function providerUnQuote(): array
     {
-        return [
-            [
-                '"test\'"',
-                "test'",
-            ],
-            [
-                "'test''",
-                "test'",
-            ],
-            [
-                "`test'`",
-                "test'",
-            ],
-            [
-                "'test'test",
-                "'test'test",
-            ],
-        ];
+        return [['"test\'"', "test'"], ["'test''", "test'"], ["`test'`", "test'"], ["'test'test", "'test'test"]];
     }
 
     /**
@@ -1609,24 +1118,7 @@ class UtilTest extends AbstractTestCase
      */
     public static function providerUnQuoteSelectedChar(): array
     {
-        return [
-            [
-                '"test\'"',
-                "test'",
-            ],
-            [
-                "'test''",
-                "'test''",
-            ],
-            [
-                "`test'`",
-                "`test'`",
-            ],
-            [
-                "'test'test",
-                "'test'test",
-            ],
-        ];
+        return [['"test\'"', "test'"], ["'test''", "'test''"], ["`test'`", "`test'`"], ["'test'test", "'test'test"]];
     }
 
     /** @dataProvider providerForTestBackquote */
@@ -1643,41 +1135,13 @@ class UtilTest extends AbstractTestCase
     public static function providerForTestBackquote(): array
     {
         return [
-            [
-                '0',
-                '`0`',
-                '"0"',
-            ],
-            [
-                'test',
-                '`test`',
-                '"test"',
-            ],
-            [
-                'te`st',
-                '`te``st`',
-                '"te`st"',
-            ],
-            [
-                'te"st',
-                '`te"st`',
-                '"te\"st"',
-            ],
-            [
-                '',
-                '',
-                '',
-            ],
-            [
-                '*',
-                '*',
-                '*',
-            ],
-            [
-                null,
-                '',
-                '',
-            ],
+            ['0', '`0`', '"0"'],
+            ['test', '`test`', '"test"'],
+            ['te`st', '`te``st`', '"te`st"'],
+            ['te"st', '`te"st`', '"te\"st"'],
+            ['', '', ''],
+            ['*', '*', '*'],
+            [null, '', ''],
         ];
     }
 
@@ -1723,16 +1187,7 @@ class UtilTest extends AbstractTestCase
      */
     public static function providerUserDir(): array
     {
-        return [
-            [
-                '/var/pma_tmp/%u/',
-                '/var/pma_tmp/root/',
-            ],
-            [
-                '/home/%u/pma',
-                '/home/root/pma/',
-            ],
-        ];
+        return [['/var/pma_tmp/%u/', '/var/pma_tmp/root/'], ['/home/%u/pma', '/home/root/pma/']];
     }
 
     /**
@@ -1758,24 +1213,7 @@ class UtilTest extends AbstractTestCase
      */
     public static function providerDuplicateFirstNewline(): array
     {
-        return [
-            [
-                'test',
-                'test',
-            ],
-            [
-                "\r\ntest",
-                "\n\r\ntest",
-            ],
-            [
-                "\ntest",
-                "\ntest",
-            ],
-            [
-                "\n\r\ntest",
-                "\n\r\ntest",
-            ],
-        ];
+        return [['test', 'test'], ["\r\ntest", "\n\r\ntest"], ["\ntest", "\ntest"], ["\n\r\ntest", "\n\r\ntest"]];
     }
 
     public function testUnsupportedDatatypes(): void
@@ -1816,28 +1254,7 @@ class UtilTest extends AbstractTestCase
      */
     public static function providerIsInteger(): array
     {
-        return [
-            [
-                true,
-                1000,
-            ],
-            [
-                true,
-                '1000',
-            ],
-            [
-                false,
-                1000.1,
-            ],
-            [
-                false,
-                '1000.1',
-            ],
-            [
-                false,
-                'input',
-            ],
-        ];
+        return [[true, 1000], [true, '1000'], [false, 1000.1], [false, '1000.1'], [false, 'input']];
     }
 
     /**
@@ -1865,90 +1282,27 @@ class UtilTest extends AbstractTestCase
     public static function providerForwardedHeaders(): array
     {
         return [
-            [
-                '',
-                '',
-            ],
-            [
-                '=',
-                '',
-            ],
-            [
-                'https',
-                '',
-            ],
-            [
-                'https',
-                '',
-            ],
-            [
-                '=https',
-                '',
-            ],
-            [
-                '=http',
-                '',
-            ],
-            [
-                'For="[2001:db8:cafe::17]:4711"',
-                '',
-            ],
-            [
-                'for=192.0.2.60;proto=http;by=203.0.113.43',
-                'http',
-            ],
-            [
-                'for=192.0.2.43, for=198.51.100.17',
-                '',
-            ],
-            [
-                'for=123.34.567.89',
-                '',
-            ],
-            [
-                'for=192.0.2.43, for="[2001:db8:cafe::17]"',
-                '',
-            ],
-            [
-                'for=12.34.56.78;host=example.com;proto=https, for=23.45.67.89',
-                'https',
-            ],
-            [
-                'for=12.34.56.78, for=23.45.67.89;secret=egah2CGj55fSJFs, for=10.1.2.3',
-                '',
-            ],
-            [
-                'for=injected;by="',
-                '',
-            ],
-            [
-                'for=injected;by=", for=real',
-                '',
-            ],
-            [
-                'for=192.0.2.60;proto=http;by=203.0.113.43',
-                'http',
-            ],
-            [
-                'for=192.0.2.60;proto=htTp;by=203.0.113.43',
-                'http',
-            ],
-            [
-                'for=192.0.2.60;proto=HTTP;by=203.0.113.43',
-                'http',
-            ],
-            [
-                'for=192.0.2.60;proto= http;by=203.0.113.43',
-                'http',
-            ],
-            [
-                'for=12.34.45.67;secret="special;proto=abc;test=1";proto=http,for=23.45.67.89',
-                'http',
-            ],
-            [
-                'for=12.34.45.67;secret="special;proto=abc;test=1";proto=418,for=23.45.67.89',
-                '',
-            ],
+            ['', ''],
+            ['=', ''],
+            ['https', ''],
+            ['https', ''],
+            ['=https', ''],
+            ['=http', ''],
+            ['For="[2001:db8:cafe::17]:4711"', ''],
+            ['for=192.0.2.60;proto=http;by=203.0.113.43', 'http'],
+            ['for=192.0.2.43, for=198.51.100.17', ''],
+            ['for=123.34.567.89', ''],
+            ['for=192.0.2.43, for="[2001:db8:cafe::17]"', ''],
+            ['for=12.34.56.78;host=example.com;proto=https, for=23.45.67.89', 'https'],
+            ['for=12.34.56.78, for=23.45.67.89;secret=egah2CGj55fSJFs, for=10.1.2.3', ''],
+            ['for=injected;by="', ''],
+            ['for=injected;by=", for=real', ''],
+            ['for=192.0.2.60;proto=http;by=203.0.113.43', 'http'],
+            ['for=192.0.2.60;proto=htTp;by=203.0.113.43', 'http'],
+            ['for=192.0.2.60;proto=HTTP;by=203.0.113.43', 'http'],
+            ['for=192.0.2.60;proto= http;by=203.0.113.43', 'http'],
+            ['for=12.34.45.67;secret="special;proto=abc;test=1";proto=http,for=23.45.67.89', 'http'],
+            ['for=12.34.45.67;secret="special;proto=abc;test=1";proto=418,for=23.45.67.89', ''],
             /*[ // this test case is very special and would need a different implementation
                 'for=12.34.45.67;secret="special;proto=http;test=1";proto=https,for=23.45.67.89',
                 'https'
@@ -2108,141 +1462,85 @@ SQL;
                 'table',
                 'index.php?route=/table/structure&lang=en',
             ],
-            [
-                'structure',
-                'table',
-                'index.php?route=/table/structure&lang=en',
-            ],
+            ['structure', 'table', 'index.php?route=/table/structure&lang=en'],
             [
                 'tbl_sql.php', // Support the legacy value
                 'table',
                 'index.php?route=/table/sql&lang=en',
             ],
-            [
-                'sql',
-                'table',
-                'index.php?route=/table/sql&lang=en',
-            ],
+            ['sql', 'table', 'index.php?route=/table/sql&lang=en'],
             [
                 'tbl_select.php', // Support the legacy value
                 'table',
                 'index.php?route=/table/search&lang=en',
             ],
-            [
-                'search',
-                'table',
-                'index.php?route=/table/search&lang=en',
-            ],
+            ['search', 'table', 'index.php?route=/table/search&lang=en'],
             [
                 'tbl_change.php', // Support the legacy value
                 'table',
                 'index.php?route=/table/change&lang=en',
             ],
-            [
-                'insert',
-                'table',
-                'index.php?route=/table/change&lang=en',
-            ],
+            ['insert', 'table', 'index.php?route=/table/change&lang=en'],
             [
                 'sql.php', // Support the legacy value
                 'table',
                 'index.php?route=/sql&lang=en',
             ],
-            [
-                'browse',
-                'table',
-                'index.php?route=/sql&lang=en',
-            ],
+            ['browse', 'table', 'index.php?route=/sql&lang=en'],
             [
                 'db_structure.php', // Support the legacy value
                 'database',
                 'index.php?route=/database/structure&lang=en',
             ],
-            [
-                'structure',
-                'database',
-                'index.php?route=/database/structure&lang=en',
-            ],
+            ['structure', 'database', 'index.php?route=/database/structure&lang=en'],
             [
                 'db_sql.php', // Support the legacy value
                 'database',
                 'index.php?route=/database/sql&lang=en',
             ],
-            [
-                'sql',
-                'database',
-                'index.php?route=/database/sql&lang=en',
-            ],
+            ['sql', 'database', 'index.php?route=/database/sql&lang=en'],
             [
                 'db_search.php', // Support the legacy value
                 'database',
                 'index.php?route=/database/search&lang=en',
             ],
-            [
-                'search',
-                'database',
-                'index.php?route=/database/search&lang=en',
-            ],
+            ['search', 'database', 'index.php?route=/database/search&lang=en'],
             [
                 'db_operations.php', // Support the legacy value
                 'database',
                 'index.php?route=/database/operations&lang=en',
             ],
-            [
-                'operations',
-                'database',
-                'index.php?route=/database/operations&lang=en',
-            ],
+            ['operations', 'database', 'index.php?route=/database/operations&lang=en'],
             [
                 'index.php', // Support the legacy value
                 'server',
                 'index.php?route=/&lang=en',
             ],
-            [
-                'welcome',
-                'server',
-                'index.php?route=/&lang=en',
-            ],
+            ['welcome', 'server', 'index.php?route=/&lang=en'],
             [
                 'server_databases.php', // Support the legacy value
                 'server',
                 'index.php?route=/server/databases&lang=en',
             ],
-            [
-                'databases',
-                'server',
-                'index.php?route=/server/databases&lang=en',
-            ],
+            ['databases', 'server', 'index.php?route=/server/databases&lang=en'],
             [
                 'server_status.php', // Support the legacy value
                 'server',
                 'index.php?route=/server/status&lang=en',
             ],
-            [
-                'status',
-                'server',
-                'index.php?route=/server/status&lang=en',
-            ],
+            ['status', 'server', 'index.php?route=/server/status&lang=en'],
             [
                 'server_variables.php', // Support the legacy value
                 'server',
                 'index.php?route=/server/variables&lang=en',
             ],
-            [
-                'variables',
-                'server',
-                'index.php?route=/server/variables&lang=en',
-            ],
+            ['variables', 'server', 'index.php?route=/server/variables&lang=en'],
             [
                 'server_privileges.php', // Support the legacy value
                 'server',
                 'index.php?route=/server/privileges&lang=en',
             ],
-            [
-                'privileges',
-                'server',
-                'index.php?route=/server/privileges&lang=en',
-            ],
+            ['privileges', 'server', 'index.php?route=/server/privileges&lang=en'],
         ];
     }
 
@@ -2280,10 +1578,7 @@ SQL;
     public function testGetMySQLDocuURL(string $link, string $anchor, string $version, string $expected): void
     {
         $GLOBALS['dbi'] = $this->createDatabaseInterface();
-        $GLOBALS['dbi']->setVersion([
-            '@@version' => $version,
-            '@@version_comment' => 'MySQL Community Server (GPL)',
-        ]);
+        $GLOBALS['dbi']->setVersion(['@@version' => $version, '@@version_comment' => 'MySQL Community Server (GPL)']);
         $this->assertSame($expected, Util::getMySQLDocuURL($link, $anchor));
     }
 
@@ -2469,28 +1764,7 @@ SQL;
      */
     public static function provideForTestIsUUIDSupported(): array
     {
-        return [
-            [
-                false,
-                60100,
-                false,
-            ],
-            [
-                false,
-                100700,
-                false,
-            ],
-            [
-                true,
-                60100,
-                false,
-            ],
-            [
-                true,
-                100700,
-                true,
-            ],
-        ];
+        return [[false, 60100, false], [false, 100700, false], [true, 60100, false], [true, 100700, true]];
     }
 
     /** @dataProvider providerForTestGetLowerCaseNames */
diff --git a/test/classes/Utils/ForeignKeyTest.php b/test/classes/Utils/ForeignKeyTest.php
index 441181cf48..7c1473dd9e 100644
--- a/test/classes/Utils/ForeignKeyTest.php
+++ b/test/classes/Utils/ForeignKeyTest.php
@@ -43,12 +43,7 @@ class ForeignKeyTest extends AbstractTestCase
      */
     public static function providerIsSupported(): array
     {
-        return [
-            ['MyISAM', false],
-            ['innodb', true],
-            ['pBxT', true],
-            ['ndb', true],
-        ];
+        return [['MyISAM', false], ['innodb', true], ['pBxT', true], ['ndb', true]];
     }
 
     public function testIsCheckEnabled(): void
@@ -74,11 +69,7 @@ class ForeignKeyTest extends AbstractTestCase
     /** @return array[] */
     public static function providerCheckInit(): array
     {
-        return [
-            ['', 'OFF'],
-            ['0', 'OFF'],
-            ['1', 'ON'],
-        ];
+        return [['', 'OFF'], ['0', 'OFF'], ['1', 'ON']];
     }
 
     /** @dataProvider providerCheckInit */
@@ -128,10 +119,7 @@ class ForeignKeyTest extends AbstractTestCase
     /** @return array[] */
     public static function providerCheckCleanup(): array
     {
-        return [
-            [true, 'ON'],
-            [false, 'OFF'],
-        ];
+        return [[true, 'ON'], [false, 'OFF']];
     }
 
     /** @dataProvider providerCheckCleanup */
diff --git a/test/classes/Utils/FormatConverterTest.php b/test/classes/Utils/FormatConverterTest.php
index 7245c5a454..70faedcd15 100644
--- a/test/classes/Utils/FormatConverterTest.php
+++ b/test/classes/Utils/FormatConverterTest.php
@@ -38,46 +38,14 @@ class FormatConverterTest extends AbstractTestCase
         // input
         // isBinary
         return [
-            [
-                '10.11.12.13',
-                '0x0a0b0c0d',
-                false,
-            ],
-            [
-                'my ip',
-                'my ip',
-                false,
-            ],
-            [
-                '10.11.12.13',
-                '0x0a0b0c0d',
-                true,
-            ],
-            [
-                '6d79206970',
-                'my ip',
-                true,
-            ],
-            [
-                '10.11.12.13',
-                '0x0a0b0c0d',
-                true,
-            ],
-            [
-                '666566',
-                'fef',
-                true,
-            ],
-            [
-                '0ded',
-                hex2bin('0DED'),
-                true,
-            ],
-            [
-                '127.0.0.1',
-                hex2bin('30783766303030303031'),
-                true,
-            ],
+            ['10.11.12.13', '0x0a0b0c0d', false],
+            ['my ip', 'my ip', false],
+            ['10.11.12.13', '0x0a0b0c0d', true],
+            ['6d79206970', 'my ip', true],
+            ['10.11.12.13', '0x0a0b0c0d', true],
+            ['666566', 'fef', true],
+            ['0ded', hex2bin('0DED'), true],
+            ['127.0.0.1', hex2bin('30783766303030303031'), true],
         ];
     }
 
@@ -102,16 +70,7 @@ class FormatConverterTest extends AbstractTestCase
      */
     public static function providerIpToBinary(): array
     {
-        return [
-            [
-                '0x0a0b0c0d',
-                '10.11.12.13',
-            ],
-            [
-                'my ip',
-                'my ip',
-            ],
-        ];
+        return [['0x0a0b0c0d', '10.11.12.13'], ['my ip', 'my ip']];
     }
 
     /**
@@ -135,16 +94,7 @@ class FormatConverterTest extends AbstractTestCase
      */
     public static function providerIpToLong(): array
     {
-        return [
-            [
-                '168496141',
-                '10.11.12.13',
-            ],
-            [
-                'my ip',
-                'my ip',
-            ],
-        ];
+        return [['168496141', '10.11.12.13'], ['my ip', 'my ip']];
     }
 
     /**
@@ -168,15 +118,6 @@ class FormatConverterTest extends AbstractTestCase
      */
     public static function providerLongToIp(): array
     {
-        return [
-            [
-                '10.11.12.13',
-                '168496141',
-            ],
-            [
-                'my ip',
-                'my ip',
-            ],
-        ];
+        return [['10.11.12.13', '168496141'], ['my ip', 'my ip']];
     }
 }
diff --git a/test/classes/Utils/HttpRequestTest.php b/test/classes/Utils/HttpRequestTest.php
index 44a032bbd9..948ec4f88c 100644
--- a/test/classes/Utils/HttpRequestTest.php
+++ b/test/classes/Utils/HttpRequestTest.php
@@ -212,36 +212,11 @@ class HttpRequestTest extends AbstractTestCase
     public static function httpRequests(): array
     {
         return [
-            [
-                'https://www.phpmyadmin.net/test/data',
-                'GET',
-                true,
-                true,
-            ],
-            [
-                'https://www.phpmyadmin.net/test/data',
-                'POST',
-                true,
-                null,
-            ],
-            [
-                'https://nonexisting.phpmyadmin.net/test/data',
-                'GET',
-                true,
-                null,
-            ],
-            [
-                'https://www.phpmyadmin.net/test/data',
-                'GET',
-                false,
-                'TEST DATA',
-            ],
-            [
-                'https://www.phpmyadmin.net/test/nothing',
-                'GET',
-                true,
-                false,
-            ],
+            ['https://www.phpmyadmin.net/test/data', 'GET', true, true],
+            ['https://www.phpmyadmin.net/test/data', 'POST', true, null],
+            ['https://nonexisting.phpmyadmin.net/test/data', 'GET', true, null],
+            ['https://www.phpmyadmin.net/test/data', 'GET', false, 'TEST DATA'],
+            ['https://www.phpmyadmin.net/test/nothing', 'GET', true, false],
         ];
     }
 }
diff --git a/test/classes/VersionInformationTest.php b/test/classes/VersionInformationTest.php
index d896f6e9fb..78294d3a72 100644
--- a/test/classes/VersionInformationTest.php
+++ b/test/classes/VersionInformationTest.php
@@ -89,82 +89,25 @@ class VersionInformationTest extends AbstractTestCase
     public static function dataVersions(): array
     {
         return [
-            [
-                '1.0.0',
-                1000050,
-            ],
-            [
-                '2.0.0.2-dev',
-                2000002,
-            ],
-            [
-                '3.4.2.1',
-                3040251,
-            ],
-            [
-                '3.4.2-dev3',
-                3040203,
-            ],
-            [
-                '3.4.2-dev',
-                3040200,
-            ],
-            [
-                '3.4.2-pl',
-                3040260,
-            ],
-            [
-                '3.4.2-pl3',
-                3040263,
-            ],
-            [
-                '4.4.2-rc22',
-                4040252,
-            ],
-            [
-                '4.4.2-rc',
-                4040230,
-            ],
-            [
-                '4.4.22-beta22',
-                4042242,
-            ],
-            [
-                '4.4.22-beta',
-                4042220,
-            ],
-            [
-                '4.4.21-alpha22',
-                4042132,
-            ],
-            [
-                '4.4.20-alpha',
-                4042010,
-            ],
-            [
-                '4.40.20-alpha-dev',
-                4402010,
-            ],
-            [
-                '4.4a',
-                4000050,
-            ],
-            [
-                '4.4.4-test',
-                4040400,
-            ],
-            [
-                '4.1.0',
-                4010050,
-            ],
-            [
-                '4.0.1.3',
-                4000153,
-            ],
-            [
-                '4.1-dev',
-                4010000,
-            ],
+            ['1.0.0', 1000050],
+            ['2.0.0.2-dev', 2000002],
+            ['3.4.2.1', 3040251],
+            ['3.4.2-dev3', 3040203],
+            ['3.4.2-dev', 3040200],
+            ['3.4.2-pl', 3040260],
+            ['3.4.2-pl3', 3040263],
+            ['4.4.2-rc22', 4040252],
+            ['4.4.2-rc', 4040230],
+            ['4.4.22-beta22', 4042242],
+            ['4.4.22-beta', 4042220],
+            ['4.4.21-alpha22', 4042132],
+            ['4.4.20-alpha', 4042010],
+            ['4.40.20-alpha-dev', 4402010],
+            ['4.4a', 4000050],
+            ['4.4.4-test', 4040400],
+            ['4.1.0', 4010050],
+            ['4.0.1.3', 4000153],
+            ['4.1-dev', 4010000],
         ];
     }
 
diff --git a/test/classes/WebAuthn/CBORDecoderTest.php b/test/classes/WebAuthn/CBORDecoderTest.php
index ffe799b111..c941a2d974 100644
--- a/test/classes/WebAuthn/CBORDecoderTest.php
+++ b/test/classes/WebAuthn/CBORDecoderTest.php
@@ -127,10 +127,7 @@ class CBORDecoderTest extends TestCase
             ],
             [
                 '82a263616c672664747970656a7075626C69632D6B6579a263616c6739010064747970656a7075626C69632D6B6579',
-                [
-                    ['alg' => -7, 'type' => 'public-key'],
-                    ['alg' => -257, 'type' => 'public-key'],
-                ],
+                [['alg' => -7,'type' => 'public-key'], ['alg' => -257,'type' => 'public-key']],
             ],
             [
                 'A501020326200121582065eda5a12577c2bae829437fe338701a10aaa375e1bb5b5de108de439c08551d'
diff --git a/test/classes/ZipExtensionTest.php b/test/classes/ZipExtensionTest.php
index 6b4d00c99c..4564753ba3 100644
--- a/test/classes/ZipExtensionTest.php
+++ b/test/classes/ZipExtensionTest.php
@@ -54,26 +54,17 @@ class ZipExtensionTest extends AbstractTestCase
             'null as specific entry' => [
                 './test/test_data/test.zip',
                 null,
-                [
-                    'error' => '',
-                    'data' => 'TEST FILE' . "\n",
-                ],
+                ['error' => '', 'data' => 'TEST FILE' . "\n"],
             ],
             'an existent specific entry' => [
                 './test/test_data/test.zip',
                 '/test.file/',
-                [
-                    'error' => '',
-                    'data' => 'TEST FILE' . "\n",
-                ],
+                ['error' => '', 'data' => 'TEST FILE' . "\n"],
             ],
             'a nonexistent specific entry' => [
                 './test/test_data/test.zip',
                 '/foobar/',
-                [
-                    'error' => 'Error in ZIP archive: Could not find "/foobar/"',
-                    'data' => '',
-                ],
+                ['error' => 'Error in ZIP archive: Could not find "/foobar/"', 'data' => ''],
             ],
         ];
     }
@@ -105,16 +96,8 @@ class ZipExtensionTest extends AbstractTestCase
     public static function provideTestFindFile(): array
     {
         return [
-            [
-                './test/test_data/test.zip',
-                '/test/',
-                'test.file',
-            ],
-            [
-                './test/test_data/test.zip',
-                '/invalid/',
-                false,
-            ],
+            ['./test/test_data/test.zip', '/test/', 'test.file'],
+            ['./test/test_data/test.zip', '/invalid/', false],
         ];
     }
 
@@ -181,10 +164,7 @@ class ZipExtensionTest extends AbstractTestCase
         $this->assertFalse(
             $this->zipExtension->createFile(
                 'Content',
-                [
-                    'name1.txt',
-                    'name2.txt',
-                ],
+                ['name1.txt', 'name2.txt'],
             ),
         );
     }
@@ -195,14 +175,8 @@ class ZipExtensionTest extends AbstractTestCase
     public function testCreateMultiFile(): void
     {
         $file = $this->zipExtension->createFile(
-            [
-                'Content',
-                'Content2',
-            ],
-            [
-                'name1.txt',
-                'name2.txt',
-            ],
+            ['Content', 'Content2'],
+            ['name1.txt', 'name2.txt'],
         );
         $this->assertIsString($file);
         $this->assertNotEmpty($file);
diff --git a/test/selenium/ExportTest.php b/test/selenium/ExportTest.php
index 140b39468f..7a5d7de72b 100644
--- a/test/selenium/ExportTest.php
+++ b/test/selenium/ExportTest.php
@@ -96,22 +96,12 @@ class ExportTest extends TestBase
     public function exportDataProvider(): array
     {
         return [
-            [
-                'CSV',
-                ['"1","2"'],
-            ],
+            ['CSV', ['"1","2"']],
             [
                 'SQL',
-                [
-                    'CREATE TABLE IF NOT EXISTS `test_table`',
-                    'INSERT INTO `test_table` (`id`, `val`) VALUES',
-                    '(1, 2)',
-                ],
-            ],
-            [
-                'JSON',
-                ['{"id":"1","val":"2"}'],
+                ['CREATE TABLE IF NOT EXISTS `test_table`', 'INSERT INTO `test_table` (`id`, `val`) VALUES', '(1, 2)'],
             ],
+            ['JSON', ['{"id":"1","val":"2"}']],
         ];
     }
 
diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php
index d60be59a66..94d5e0bfb5 100644
--- a/test/selenium/TestBase.php
+++ b/test/selenium/TestBase.php
@@ -685,10 +685,7 @@ abstract class TestBase extends TestCase
         file_put_contents($htmlOutput, $this->webDriver->getPageSource());
         $testInfo = $screenshotDir . DIRECTORY_SEPARATOR . 'source_' . $key . '.json';
         file_put_contents($testInfo, json_encode(
-            [
-                'filesKey' => $key,
-                'testName' => $this->getTestName(),
-            ],
+            ['filesKey' => $key, 'testName' => $this->getTestName()],
             JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES,
         ));
     }
@@ -1122,10 +1119,7 @@ JS;
         }
 
         $payload = json_encode(
-            [
-                'status' => $status,
-                'reason' => $message,
-            ],
+            ['status' => $status, 'reason' => $message],
         );
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, self::SESSION_REST_URL . $this->sessionId . '.json');