Use short list syntax and single line arrays

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · May 26, 2020 · 3ae05c7 · 3ae05c7
1 parent 91bf091
commit 3ae05c7
Show file tree

Hide file tree

Showing 103 changed files with 318 additions and 661 deletions.
diff --git a/examples/openid.php b/examples/openid.php
@@ -145,7 +145,7 @@ function Die_error($e)
 } else {
     /* Grab query string */
     if (! count($_POST)) {
-        list(, $queryString) = explode('?', $_SERVER['REQUEST_URI']);
+        [, $queryString] = explode('?', $_SERVER['REQUEST_URI']);
     } else {
         // I hate php sometimes
         $queryString = file_get_contents('php://input');

diff --git a/libraries/classes/BrowseForeigners.php b/libraries/classes/BrowseForeigners.php
@@ -87,18 +87,18 @@ private function getHtmlForOneKey(
         // key names and descriptions for the left section,
         // sorted by key names
         $leftKeyname = $keys[$indexByKeyname];
-        list(
+        [
             $leftDescription,
-            $leftDescriptionTitle
-        ) = $this->getDescriptionAndTitle($descriptions[$indexByKeyname]);
+            $leftDescriptionTitle,
+        ] = $this->getDescriptionAndTitle($descriptions[$indexByKeyname]);
 
         // key names and descriptions for the right section,
         // sorted by descriptions
         $rightKeyname = $keys[$indexByDescription];
-        list(
+        [
             $rightDescription,
-            $rightDescriptionTitle
-        ) = $this->getDescriptionAndTitle($descriptions[$indexByDescription]);
+            $rightDescriptionTitle,
+        ] = $this->getDescriptionAndTitle($descriptions[$indexByDescription]);
 
         $indexByDescription++;
 
@@ -245,11 +245,11 @@ public function getHtmlForRelationalFieldSelection(
         $indexByDescription = 0;
 
         foreach ($keys as $indexByKeyname => $value) {
-            list(
+            [
                 $html,
                 $horizontal_count,
-                $indexByDescription
-            ) = $this->getHtmlForOneKey(
+                $indexByDescription,
+            ] = $this->getHtmlForOneKey(
                 $horizontal_count,
                 $header,
                 $keys,

diff --git a/libraries/classes/CentralColumns.php b/libraries/classes/CentralColumns.php
@@ -741,9 +741,7 @@ public function updateMultipleColumn(array $params)
      */
     private function getEditTableHeader(array $headers): string
     {
-        return $this->template->render('database/central_columns/edit_table_header', [
-            'headers' => $headers,
-        ]);
+        return $this->template->render('database/central_columns/edit_table_header', ['headers' => $headers]);
     }
 
     /**
@@ -768,9 +766,7 @@ private function getHtmlForEditTableRow(array $row, int $row_num): string
                 'column_meta' => [
                     'Field' => $row['col_name'],
                 ],
-                'cfg_relation' => [
-                    'centralcolumnswork' => false,
-                ],
+                'cfg_relation' => ['centralcolumnswork' => false],
                 'max_rows' => $this->maxRows,
             ])
             . '</td>';

diff --git a/libraries/classes/CheckUserPrivileges.php b/libraries/classes/CheckUserPrivileges.php
@@ -218,11 +218,11 @@ private function analyseShowGrant(): void
         $re1 = '(^|[^\\\\])(\\\)+'; // escaped wildcards
 
         while ($row = $this->dbi->fetchRow($rs_usr)) {
-            list(
+            [
                 $show_grants_str,
                 $show_grants_dbname,
-                $show_grants_tblname
-            ) = $this->getItemsFromShowGrantsRow($row[0]);
+                $show_grants_tblname,
+            ] = $this->getItemsFromShowGrantsRow($row[0]);
 
             if ($show_grants_dbname == '*') {
                 if ($show_grants_str != 'USAGE') {
@@ -339,7 +339,7 @@ public function getPrivileges(): void
 
         $current = $this->dbi->getCurrentUserAndHost();
         if (! empty($current)) {
-            list($username, ) = $current;
+            [$username] = $current;
         }
 
         // If MySQL is started with --skip-grant-tables

diff --git a/libraries/classes/Common.php b/libraries/classes/Common.php
@@ -129,7 +129,7 @@ public static function database(): void
             if (isset($_POST['change_all_tables_collations']) &&
                 $_POST['change_all_tables_collations'] === 'on'
             ) {
-                list($tables, , , , , , , ,) = Util::getDbInfo($db, null);
+                [$tables] = Util::getDbInfo($db, null);
                 foreach ($tables as $tableName => $data) {
                     if ($dbi->getTable($db, $tableName)->isView()) {
                         // Skip views, we can not change the collation of a view.

diff --git a/libraries/classes/Config/FormDisplayTemplate.php b/libraries/classes/Config/FormDisplayTemplate.php
@@ -486,9 +486,7 @@ public function displayJavascript(array $jsArray): string
             return '';
         }
 
-        return $this->template->render('javascript/display', [
-            'js_array' => $jsArray,
-        ]);
+        return $this->template->render('javascript/display', ['js_array' => $jsArray]);
     }
 
     /**

diff --git a/libraries/classes/Config/Forms/User/ExportForm.php b/libraries/classes/Config/Forms/User/ExportForm.php
@@ -75,9 +75,7 @@ public static function getForms()
                 'Export/sql_hex_for_binary',
                 'Export/sql_utc_time',
             ],
-            'CodeGen' => [
-                'Export/codegen_format',
-            ],
+            'CodeGen' => ['Export/codegen_format'],
             'Csv' => [
                 ':group:' . __('CSV'),
                 'Export/csv_separator',

diff --git a/libraries/classes/Config/Forms/User/FeaturesForm.php b/libraries/classes/Config/Forms/User/FeaturesForm.php
@@ -73,9 +73,7 @@ public static function getForms()
         ];
         // skip Developer form if no setting is available
         if ($GLOBALS['cfg']['UserprefsDeveloperTab']) {
-            $result['Developer'] = [
-                'DBG/sql',
-            ];
+            $result['Developer'] = ['DBG/sql'];
         }
 
         return $result;

diff --git a/libraries/classes/Config/Forms/User/MainForm.php b/libraries/classes/Config/Forms/User/MainForm.php
@@ -76,9 +76,7 @@ public static function getForms()
                 'DefaultTabDatabase',
                 'DefaultTabTable',
             ],
-            'DisplayRelationalSchema' => [
-                'PDFDefaultPageSize',
-            ],
+            'DisplayRelationalSchema' => ['PDFDefaultPageSize'],
         ];
     }
 

diff --git a/libraries/classes/Config/ServerConfigChecks.php b/libraries/classes/Config/ServerConfigChecks.php
@@ -51,7 +51,7 @@ public function performConfigChecks()
         $blowfishSecretSet = false;
         $cookieAuthUsed = false;
 
-        list($cookieAuthUsed, $blowfishSecret, $blowfishSecretSet)
+        [$cookieAuthUsed, $blowfishSecret, $blowfishSecretSet]
             = $this->performConfigChecksServers(
                 $cookieAuthUsed,
                 $blowfishSecret,
@@ -149,7 +149,7 @@ protected function performConfigChecksServers(
             );
             $serverName = htmlspecialchars($serverName);
 
-            list($blowfishSecret, $blowfishSecretSet)
+            [$blowfishSecret, $blowfishSecretSet]
                 = $this->performConfigChecksServersSetBlowfishSecret(
                     $blowfishSecret,
                     $cookieAuthServer,

diff --git a/libraries/classes/Controllers/Database/DataDictionaryController.php b/libraries/classes/Controllers/Database/DataDictionaryController.php
@@ -60,11 +60,11 @@ public function index(): void
                 $tableName
             )->getStatusInfo('TABLE_COMMENT');
 
-            list(, $primaryKeys, , ) = Util::processIndexData(
+            [, $primaryKeys] = Util::processIndexData(
                 $this->dbi->getTableIndexes($this->db, $tableName)
             );
 
-            list($foreigners, $hasRelation) = $this->relation->getRelationsAndStatus(
+            [$foreigners, $hasRelation] = $this->relation->getRelationsAndStatus(
                 ! empty($cfgRelation['relation']),
                 $this->db,
                 $tableName

diff --git a/libraries/classes/Controllers/Database/DesignerController.php b/libraries/classes/Controllers/Database/DesignerController.php
@@ -127,7 +127,7 @@ public function index(): void
                 $this->response->setRequestStatus($success);
                 $this->response->addJSON('message', $message);
             } elseif ($_POST['operation'] == 'addNewRelation') {
-                list($success, $message) = $this->designerCommon->addNewRelation(
+                [$success, $message] = $this->designerCommon->addNewRelation(
                     $_POST['db'],
                     $_POST['T1'],
                     $_POST['F1'],
@@ -141,7 +141,7 @@ public function index(): void
                 $this->response->setRequestStatus($success);
                 $this->response->addJSON('message', $message);
             } elseif ($_POST['operation'] == 'removeRelation') {
-                list($success, $message) = $this->designerCommon->removeRelation(
+                [$success, $message] = $this->designerCommon->removeRelation(
                     $_POST['T1'],
                     $_POST['F1'],
                     $_POST['T2'],
@@ -217,7 +217,7 @@ public function index(): void
         $scripts->addFile('designer/move.js');
         $scripts->addFile('designer/init.js');
 
-        list(
+        [
             $tables,
             $num_tables,
             $total_num_tables,
@@ -226,8 +226,8 @@ public function index(): void
             $db_is_system_schema,
             $tooltip_truename,
             $tooltip_aliasname,
-            $pos
-            ) = Util::getDbInfo($db, $sub_part ?? '');
+            $pos,
+        ] = Util::getDbInfo($db, $sub_part ?? '');
 
         // Embed some data into HTML, later it will be read
         // by designer/init.js and converted to JS variables.

diff --git a/libraries/classes/Controllers/Database/EventsController.php b/libraries/classes/Controllers/Database/EventsController.php
@@ -39,7 +39,7 @@ public function index(): void
         if (! $this->response->isAjax()) {
             Common::database();
 
-            list(
+            [
                 $tables,
                 $num_tables,
                 $total_num_tables,
@@ -48,8 +48,8 @@ public function index(): void
                 $db_is_system_schema,
                 $tooltip_truename,
                 $tooltip_aliasname,
-                $pos
-            ) = Util::getDbInfo($db, $sub_part ?? '');
+                $pos,
+            ] = Util::getDbInfo($db, $sub_part ?? '');
         } elseif (strlen($db) > 0) {
             $this->dbi->selectDb($db);
             $url_query = $url_query ?? Url::getCommon(['db' => $db]);

diff --git a/libraries/classes/Controllers/Database/ExportController.php b/libraries/classes/Controllers/Database/ExportController.php
@@ -57,7 +57,7 @@ public function index(): void
         $url_params['goto'] = Url::getFromRoute('/database/export');
         $url_query .= Url::getCommon($url_params, '&');
 
-        list(
+        [
             $tables,
             $num_tables,
             $total_num_tables,
@@ -66,8 +66,8 @@ public function index(): void
             $db_is_system_schema,
             $tooltip_truename,
             $tooltip_aliasname,
-            $pos
-        ) = Util::getDbInfo($db, $sub_part ?? '');
+            $pos,
+        ] = Util::getDbInfo($db, $sub_part ?? '');
 
         /**
          * Displays the form

diff --git a/libraries/classes/Controllers/Database/ImportController.php b/libraries/classes/Controllers/Database/ImportController.php
@@ -27,7 +27,7 @@ public function index(): void
          */
         Common::database();
 
-        list(
+        [
             $tables,
             $num_tables,
             $total_num_tables,
@@ -36,8 +36,8 @@ public function index(): void
             $db_is_system_schema,
             $tooltip_truename,
             $tooltip_aliasname,
-            $pos
-        ) = Util::getDbInfo($db, $sub_part ?? '');
+            $pos,
+        ] = Util::getDbInfo($db, $sub_part ?? '');
 
         $this->response->addHTML(
             Import::get(

diff --git a/libraries/classes/Controllers/Database/QueryByExampleController.php b/libraries/classes/Controllers/Database/QueryByExampleController.php
@@ -134,7 +134,7 @@ public function index(): void
         $url_params['goto'] = Url::getFromRoute('/database/qbe');
         $url_query .= Url::getCommon($url_params, '&');
 
-        list(
+        [
             $tables,
             $num_tables,
             $total_num_tables,
@@ -143,8 +143,8 @@ public function index(): void
             $db_is_system_schema,
             $tooltip_truename,
             $tooltip_aliasname,
-            $pos
-        ) = Util::getDbInfo($db, $sub_part ?? '');
+            $pos,
+        ] = Util::getDbInfo($db, $sub_part ?? '');
 
         $databaseQbe = new Qbe($this->relation, $this->template, $this->dbi, $db, $savedSearchList, $savedSearch);
 

diff --git a/libraries/classes/Controllers/Database/RoutinesController.php b/libraries/classes/Controllers/Database/RoutinesController.php
@@ -59,7 +59,7 @@ public function index(): void
                 $table = '';
                 Common::database();
 
-                list(
+                [
                     $tables,
                     $num_tables,
                     $total_num_tables,
@@ -68,8 +68,8 @@ public function index(): void
                     $db_is_system_schema,
                     $tooltip_truename,
                     $tooltip_aliasname,
-                    $pos
-                ) = Util::getDbInfo($db, $sub_part ?? '');
+                    $pos,
+                ] = Util::getDbInfo($db, $sub_part ?? '');
             }
         } else {
             /**

diff --git a/libraries/classes/Controllers/Database/StructureController.php b/libraries/classes/Controllers/Database/StructureController.php
@@ -503,7 +503,7 @@ public function multiSubmitAction(): void
             } elseif (strlen($db) > 0) {
                 Common::database();
 
-                list(
+                [
                     $tables,
                     $num_tables,
                     $total_num_tables,
@@ -512,8 +512,8 @@ public function multiSubmitAction(): void
                     $db_is_system_schema,
                     $tooltip_truename,
                     $tooltip_aliasname,
-                    $pos
-                ) = Util::getDbInfo($db, $sub_part ?? '');
+                    $pos,
+                ] = Util::getDbInfo($db, $sub_part ?? '');
             } else {
                 Common::server();
             }

diff --git a/libraries/classes/Controllers/Database/TriggersController.php b/libraries/classes/Controllers/Database/TriggersController.php
@@ -35,7 +35,7 @@ public function index(): void
                 $table = '';
                 Common::database();
 
-                list(
+                [
                     $tables,
                     $num_tables,
                     $total_num_tables,
@@ -44,8 +44,8 @@ public function index(): void
                     $db_is_system_schema,
                     $tooltip_truename,
                     $tooltip_aliasname,
-                    $pos
-                ) = Util::getDbInfo($db, $sub_part ?? '');
+                    $pos,
+                ] = Util::getDbInfo($db, $sub_part ?? '');
             }
         } else {
             /**

diff --git a/libraries/classes/Controllers/ExportController.php b/libraries/classes/Controllers/ExportController.php
@@ -336,9 +336,7 @@ public function index(): void
                 'table' => $table,
             ]);
         } elseif ($export_type === 'raw') {
-            $err_url = Url::getFromRoute('/server/export', [
-                'sql_query' => $sql_query,
-            ]);
+            $err_url = Url::getFromRoute('/server/export', ['sql_query' => $sql_query]);
         } else {
             Core::fatalError(__('Bad parameters!'));
         }
@@ -403,7 +401,7 @@ public function index(): void
             if (empty($remember_template)) {
                 $remember_template = '';
             }
-            list($filename, $mime_type) = $this->export->getFilenameAndMimetype(
+            [$filename, $mime_type] = $this->export->getFilenameAndMimetype(
                 $export_type,
                 $remember_template,
                 $export_plugin,
@@ -425,7 +423,7 @@ public function index(): void
 
         // Open file on server if needed
         if ($save_on_server) {
-            list($save_filename, $message, $file_handle) = $this->export->openFile(
+            [$save_filename, $message, $file_handle] = $this->export->openFile(
                 $filename,
                 $quick_export
             );
@@ -462,7 +460,7 @@ public function index(): void
                         exit;
                     }
                 }
-                list($html, $back_button, $refreshButton) = $this->export->getHtmlForDisplayedExportHeader(
+                [$html, $back_button, $refreshButton] = $this->export->getHtmlForDisplayedExportHeader(
                     $export_type,
                     $db,
                     $table