diff --git a/ajax.php b/ajax.php
index 1e098f4b0e..f0c8f74877 100644
--- a/ajax.php
+++ b/ajax.php
@@ -27,19 +27,19 @@ switch ($_POST['type']) {
         $response->addJSON('databases', $GLOBALS['dblist']->databases);
         break;
     case 'list-tables':
-        Util::checkParameters(array('db'), true);
+        Util::checkParameters(['db'], true);
         $response->addJSON('tables', $GLOBALS['dbi']->getTables($_REQUEST['db']));
         break;
     case 'list-columns':
-        Util::checkParameters(array('db', 'table'), true);
+        Util::checkParameters(['db', 'table'], true);
         $response->addJSON('columns', $GLOBALS['dbi']->getColumnNames($_REQUEST['db'], $_REQUEST['table']));
         break;
     case 'config-get':
-        Util::checkParameters(array('key'), true);
+        Util::checkParameters(['key'], true);
         $response->addJSON('value', $GLOBALS['PMA_Config']->get($_REQUEST['key']));
         break;
     case 'config-set':
-        Util::checkParameters(array('key', 'value'), true);
+        Util::checkParameters(['key', 'value'], true);
         $result = $GLOBALS['PMA_Config']->setUserValue(null, $_REQUEST['key'], json_decode($_REQUEST['value']));
         if ($result !== true) {
             $response = Response::getInstance();
diff --git a/browse_foreigners.php b/browse_foreigners.php
index ea585d4065..33b474cc8e 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -17,10 +17,10 @@ require_once 'libraries/common.inc.php';
 /**
  * Sets globals from $_REQUEST
  */
-$request_params = array(
+$request_params = [
     'data',
     'field'
-);
+];
 
 foreach ($request_params as $one_request_param) {
     if (isset($_REQUEST[$one_request_param])) {
@@ -28,7 +28,7 @@ foreach ($request_params as $one_request_param) {
     }
 }
 
-Util::checkParameters(array('db', 'table', 'field'));
+Util::checkParameters(['db', 'table', 'field']);
 
 $response = Response::getInstance();
 $response->getFooter()->setMinimal();
diff --git a/changelog.php b/changelog.php
index 502ce4f114..a76c4dc423 100644
--- a/changelog.php
+++ b/changelog.php
@@ -55,7 +55,7 @@ $changelog = htmlspecialchars($changelog);
 $github_url = 'https://github.com/phpmyadmin/phpmyadmin/';
 $faq_url = 'https://docs.phpmyadmin.net/en/latest/faq.html';
 
-$replaces = array(
+$replaces = [
     '@(https?://[./a-zA-Z0-9.-_-]*[/a-zA-Z0-9_])@'
     => '<a href="url.php?url=\\1">\\1</a>',
 
@@ -96,7 +96,7 @@ $replaces = array(
     // Links target and rel
     '/a href="/' => 'a target="_blank" rel="noopener noreferrer" href="'
 
-);
+];
 
 header('Content-type: text/html; charset=utf-8');
 ?>
diff --git a/db_central_columns.php b/db_central_columns.php
index 78c29c574e..ee3e06efb9 100644
--- a/db_central_columns.php
+++ b/db_central_columns.php
@@ -65,7 +65,7 @@ if (isset($_POST['getColumnList'])) {
     exit;
 }
 if (isset($_POST['add_column'])) {
-    $selected_col = array();
+    $selected_col = [];
     $selected_tbl = $_POST['table-select'];
     $selected_col[] = $_POST['column-select'];
     $tmp_msg = $centralColumns->syncUniqueColumns(
@@ -103,7 +103,7 @@ if (isset($_POST['multi_edit_central_column_save'])) {
     }
 }
 if (isset($_POST['delete_save'])) {
-    $col_name = array();
+    $col_name = [];
     parse_str($_POST['col_name'], $col_name);
     $tmp_msg = $centralColumns->deleteColumnsFromList(
         $col_name['selected_fld'],
diff --git a/db_datadict.php b/db_datadict.php
index 0edf628eeb..78df150404 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -47,12 +47,12 @@ $cfgRelation  = $relation->getRelationsParam();
 /**
  * Check parameters
  */
-PhpMyAdmin\Util::checkParameters(array('db'));
+PhpMyAdmin\Util::checkParameters(['db']);
 
 /**
  * Defines the url to return to in case of error in a sql statement
  */
-$err_url = 'db_sql.php' . Url::getCommon(array('db' => $db));
+$err_url = 'db_sql.php' . Url::getCommon(['db' => $db]);
 
 if ($cfgRelation['commwork']) {
     $comment = $relation->getDbComment($db);
diff --git a/db_designer.php b/db_designer.php
index c555dec1d1..1584a0cd35 100644
--- a/db_designer.php
+++ b/db_designer.php
@@ -39,15 +39,15 @@ if (isset($_REQUEST['dialog'])) {
 
         $req_key = array_search($required, $GLOBALS['designer']['TABLE_NAME']);
 
-        $GLOBALS['designer']['TABLE_NAME'] = array($GLOBALS['designer']['TABLE_NAME'][$req_key]);
-        $GLOBALS['designer_url']['TABLE_NAME_SMALL'] = array($GLOBALS['designer_url']['TABLE_NAME_SMALL'][$req_key]);
-        $GLOBALS['designer']['TABLE_NAME_SMALL'] = array($GLOBALS['designer']['TABLE_NAME_SMALL'][$req_key]);
-        $GLOBALS['designer_out']['TABLE_NAME_SMALL'] = array($GLOBALS['designer_out']['TABLE_NAME_SMALL'][$req_key]);
-        $GLOBALS['designer']['TABLE_TYPE'] = array($GLOBALS['designer_url']['TABLE_TYPE'][$req_key]);
-        $GLOBALS['designer_out']['OWNER'] = array($GLOBALS['designer_out']['OWNER'][$req_key]);
+        $GLOBALS['designer']['TABLE_NAME'] = [$GLOBALS['designer']['TABLE_NAME'][$req_key]];
+        $GLOBALS['designer_url']['TABLE_NAME_SMALL'] = [$GLOBALS['designer_url']['TABLE_NAME_SMALL'][$req_key]];
+        $GLOBALS['designer']['TABLE_NAME_SMALL'] = [$GLOBALS['designer']['TABLE_NAME_SMALL'][$req_key]];
+        $GLOBALS['designer_out']['TABLE_NAME_SMALL'] = [$GLOBALS['designer_out']['TABLE_NAME_SMALL'][$req_key]];
+        $GLOBALS['designer']['TABLE_TYPE'] = [$GLOBALS['designer_url']['TABLE_TYPE'][$req_key]];
+        $GLOBALS['designer_out']['OWNER'] = [$GLOBALS['designer_out']['OWNER'][$req_key]];
 
         $html = $databaseDesigner->getDatabaseTables(
-            array(), -1, $tab_column,
+            [], -1, $tab_column,
             $tables_all_keys, $tables_pk_or_unique_keys
         );
     }
@@ -135,7 +135,7 @@ if ($display_page != -1) {
 $tab_pos = $designerCommon->getTablePositions($display_page);
 $script_contr = $designerCommon->getScriptContr();
 
-$params = array('lang' => $GLOBALS['lang']);
+$params = ['lang' => $GLOBALS['lang']];
 if (isset($_GET['db'])) {
     $params['db'] = $_GET['db'];
 }
diff --git a/db_export.php b/db_export.php
index cfad2ce5d0..47f812744e 100644
--- a/db_export.php
+++ b/db_export.php
@@ -90,7 +90,7 @@ if (!empty($_POST['selected_tbl']) && empty($table_select)) {
 
 // Check if the selected tables are defined in $_GET
 // (from clicking Back button on export.php)
-foreach (array('table_select', 'table_structure', 'table_data') as $one_key) {
+foreach (['table_select', 'table_structure', 'table_data'] as $one_key) {
     if (isset($_GET[$one_key])) {
         $_GET[$one_key] = urldecode($_GET[$one_key]);
         $_GET[$one_key] = explode(",", $_GET[$one_key]);
diff --git a/db_operations.php b/db_operations.php
index 3ef7546a73..99a4942000 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -95,10 +95,10 @@ if (strlen($GLOBALS['db']) > 0
                 "export",
                 "sql",
                 'libraries/classes/Plugins/Export/',
-                array(
+                [
                     'single_table' => isset($single_table),
                     'export_type'  => 'database'
-                )
+                ]
             );
 
             // create stand-in tables for views
diff --git a/db_qbe.php b/db_qbe.php
index a3359065c9..f162b2de7b 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -27,7 +27,7 @@ $response = Response::getInstance();
 $relation = new Relation();
 $cfgRelation = $relation->getRelationsParam();
 
-$savedSearchList = array();
+$savedSearchList = [];
 $savedSearch = null;
 $currentSearchId = null;
 if ($cfgRelation['savedsearcheswork']) {
@@ -60,14 +60,14 @@ if ($cfgRelation['savedsearcheswork']) {
             $savedSearch = new SavedSearches($GLOBALS);
             $savedSearch->setUsername($GLOBALS['cfg']['Server']['user'])
                 ->setDbname($_REQUEST['db']);
-            $_REQUEST = array();
+            $_REQUEST = [];
         } elseif ('load' === $_REQUEST['action']) {
             if (empty($_REQUEST['searchId'])) {
                 //when not loading a search, reset the object.
                 $savedSearch = new SavedSearches($GLOBALS);
                 $savedSearch->setUsername($GLOBALS['cfg']['Server']['user'])
                     ->setDbname($_REQUEST['db']);
-                $_REQUEST = array();
+                $_REQUEST = [];
             } else {
                 $loadResult = $savedSearch->load();
             }
@@ -143,7 +143,7 @@ $db_qbe = new Qbe($GLOBALS['dbi'], $GLOBALS['db'], $savedSearchList, $savedSearc
 $url = 'db_designer.php' . Url::getCommon(
     array_merge(
         $url_params,
-        array('query' => 1)
+        ['query' => 1]
     )
 );
 $response->addHTML(
diff --git a/db_sql_autocomplete.php b/db_sql_autocomplete.php
index dae9fa3fa1..2d852c23ba 100644
--- a/db_sql_autocomplete.php
+++ b/db_sql_autocomplete.php
@@ -13,7 +13,7 @@ require_once 'libraries/common.inc.php';
 
 if ($GLOBALS['cfg']['EnableAutocompleteForTablesAndColumns']) {
     $db = isset($_POST['db']) ? $_POST['db'] : $GLOBALS['db'];
-    $sql_autocomplete = array();
+    $sql_autocomplete = [];
     if ($db) {
         $tableNames = $GLOBALS['dbi']->getTables($db);
         foreach ($tableNames as $tableName) {
diff --git a/db_structure.php b/db_structure.php
index 42413134cd..edb1229691 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -27,9 +27,9 @@ $container->set('PhpMyAdmin\Response', Response::getInstance());
 $container->alias('response', 'PhpMyAdmin\Response');
 
 /* Define dependencies for the concerned controller */
-$dependency_definitions = array(
+$dependency_definitions = [
     'db' => $db,
-);
+];
 
 /** @var DatabaseStructureController $controller */
 $controller = $container->get(
diff --git a/error_report.php b/error_report.php
index eca909e61a..61a641c78d 100644
--- a/error_report.php
+++ b/error_report.php
@@ -16,7 +16,7 @@ use PhpMyAdmin\Utils\HttpRequest;
 require_once 'libraries/common.inc.php';
 
 if (!isset($_REQUEST['exception_type'])
-    ||!in_array($_REQUEST['exception_type'], array('js', 'php'))
+    ||!in_array($_REQUEST['exception_type'], ['js', 'php'])
 ) {
     die('Oops, something went wrong!!');
 }
diff --git a/examples/config.manyhosts.inc.php b/examples/config.manyhosts.inc.php
index 49877db689..fac52633fd 100644
--- a/examples/config.manyhosts.inc.php
+++ b/examples/config.manyhosts.inc.php
@@ -11,12 +11,12 @@
 declare(strict_types=1);
 
 $i=0;
-$hosts = array (
+$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 3347c3d799..1c93c204b5 100644
--- a/examples/openid.php
+++ b/examples/openid.php
@@ -27,12 +27,12 @@ $secure_cookie = false;
 /**
  * Map of authenticated users to MySQL user/password pairs.
  */
-$AUTH_MAP = array(
-    'https://launchpad.net/~username' => array(
+$AUTH_MAP = [
+    'https://launchpad.net/~username' => [
         'user' => 'root',
         'password' => '',
-        ),
-    );
+        ],
+    ];
 
 /**
  * Simple function to show HTML page with given content.
diff --git a/examples/signon-script.php b/examples/signon-script.php
index 6eea629bee..fd0aadd459 100644
--- a/examples/signon-script.php
+++ b/examples/signon-script.php
@@ -25,11 +25,11 @@ function get_login_credentials($user)
 {
     /* Optionally we can use passed username */
     if (!empty($user)) {
-        return array($user, 'password');
+        return [$user, 'password'];
     }
 
     /* Here we would retrieve the credentials */
-    $credentials = array('root', '');
+    $credentials = ['root', ''];
 
     return $credentials;
 }
diff --git a/examples/signon.php b/examples/signon.php
index c925722352..b1e95207f9 100644
--- a/examples/signon.php
+++ b/examples/signon.php
@@ -33,7 +33,7 @@ if (isset($_POST['user'])) {
     $_SESSION['PMA_single_signon_host'] = $_POST['host'];
     $_SESSION['PMA_single_signon_port'] = $_POST['port'];
     /* Update another field of server configuration */
-    $_SESSION['PMA_single_signon_cfgupdate'] = array('verbose' => 'Signon test');
+    $_SESSION['PMA_single_signon_cfgupdate'] = ['verbose' => 'Signon test'];
     $id = session_id();
     /* Close that session */
     @session_write_close();
diff --git a/export.php b/export.php
index bcac58936f..3710a3d5a3 100644
--- a/export.php
+++ b/export.php
@@ -58,7 +58,7 @@ if (isset($_GET['check_time_out'])) {
  * TODO: this should be removed to avoid passing user input to GLOBALS
  * without checking
  */
-$post_params = array(
+$post_params = [
         'db',
         'table',
         'what',
@@ -174,7 +174,7 @@ $post_params = array(
         'latex_data_label',
         'latex_null',
         'aliases'
-);
+];
 
 foreach ($post_params as $one_post_param) {
     if (isset($_POST[$one_post_param])) {
@@ -184,7 +184,7 @@ foreach ($post_params as $one_post_param) {
 
 $table = $GLOBALS['table'];
 
-PhpMyAdmin\Util::checkParameters(array('what', 'export_type'));
+PhpMyAdmin\Util::checkParameters(['what', 'export_type']);
 
 // sanitize this parameter which will be used below in a file inclusion
 $what = Core::securePath($_POST['what']);
@@ -195,10 +195,10 @@ $export_plugin = Plugins::getPlugin(
     "export",
     $what,
     'libraries/classes/Plugins/Export/',
-    array(
+    [
         'export_type' => $export_type,
         'single_table' => isset($single_table)
-    )
+    ]
 );
 
 // Check export type
@@ -209,10 +209,10 @@ if (empty($export_plugin)) {
 /**
  * valid compression methods
  */
-$compression_methods = array(
+$compression_methods = [
     'zip',
     'gzip'
-);
+];
 
 /**
  * init and variable checking
@@ -273,18 +273,18 @@ if ($_REQUEST['output_format'] == 'astext') {
 if ($export_type == 'server') {
     $err_url = 'server_export.php' . Url::getCommon();
 } elseif ($export_type == 'database' && strlen($db) > 0) {
-    $err_url = 'db_export.php' . Url::getCommon(array('db' => $db));
+    $err_url = 'db_export.php' . Url::getCommon(['db' => $db]);
     // Check if we have something to export
     if (isset($table_select)) {
         $tables = $table_select;
     } else {
-        $tables = array();
+        $tables = [];
     }
 } elseif ($export_type == 'table' && strlen($db) > 0 && strlen($table) > 0) {
     $err_url = 'tbl_export.php' . Url::getCommon(
-        array(
+        [
             'db' => $db, 'table' => $table
-        )
+        ]
     );
 } else {
     Core::fatalError(__('Bad parameters!'));
@@ -294,7 +294,7 @@ if ($export_type == 'server') {
 // export page, Export page aliases are given more
 // preference over SQL Query aliases.
 $parser = new \PhpMyAdmin\SqlParser\Parser($sql_query);
-$aliases = array();
+$aliases = [];
 if ((!empty($parser->statements[0]))
     && ($parser->statements[0] instanceof \PhpMyAdmin\SqlParser\Statements\SelectStatement)
 ) {
@@ -318,7 +318,7 @@ $dump_buffer = '';
 $dump_buffer_len = 0;
 
 // Array of dump_buffers - used in separate file exports
-$dump_buffer_objects = array();
+$dump_buffer_objects = [];
 
 // We send fake headers to avoid browser timeout when buffering
 $time_start = time();
@@ -444,10 +444,10 @@ do {
         );
     } elseif ($export_type == 'database') {
         if (!isset($table_structure) || !is_array($table_structure)) {
-            $table_structure = array();
+            $table_structure = [];
         }
         if (!isset($table_data) || !is_array($table_data)) {
-            $table_data = array();
+            $table_data = [];
         }
         if (!empty($_REQUEST['structure_or_data_forced'])) {
             $table_structure = $tables;
@@ -486,7 +486,7 @@ do {
         }
         if (isset($lock_tables)) {
             try {
-                $export->lockTables($db, array($table), "READ");
+                $export->lockTables($db, [$table], "READ");
                 $export->exportTable(
                     $db, $table, $whatStrucOrData, $export_plugin, $crlf,
                     $err_url, $export_type, $do_relation, $do_comments,
diff --git a/gis_data_editor.php b/gis_data_editor.php
index 190a802c10..feff662da7 100644
--- a/gis_data_editor.php
+++ b/gis_data_editor.php
@@ -29,16 +29,16 @@ function escape($variable)
 require_once 'libraries/common.inc.php';
 
 if (! isset($_REQUEST['field'])) {
-    PhpMyAdmin\Util::checkParameters(array('field'));
+    PhpMyAdmin\Util::checkParameters(['field']);
 }
 
 // Get data if any posted
-$gis_data = array();
+$gis_data = [];
 if (Core::isValid($_REQUEST['gis_data'], 'array')) {
     $gis_data = $_REQUEST['gis_data'];
 }
 
-$gis_types = array(
+$gis_types = [
     'POINT',
     'MULTIPOINT',
     'LINESTRING',
@@ -46,7 +46,7 @@ $gis_types = array(
     'POLYGON',
     'MULTIPOLYGON',
     'GEOMETRYCOLLECTION'
-);
+];
 
 // Extract type from the initial call and make sure that it's a valid one.
 // Extract from field's values if available, if not use the column type passed.
@@ -86,12 +86,12 @@ $wkt_with_zero = $gis_obj->generateWkt($gis_data, 0, '0');
 $result = "'" . $wkt . "'," . $srid;
 
 // Generate SVG based visualization
-$visualizationSettings = array(
+$visualizationSettings = [
     'width' => 450,
     'height' => 300,
     'spatialColumn' => 'wkt'
-);
-$data = array(array('wkt' => $wkt_with_zero, 'srid' => $srid));
+];
+$data = [['wkt' => $wkt_with_zero, 'srid' => $srid]];
 $visualization = GisVisualization::getByData($data, $visualizationSettings)
     ->toImage('svg');
 
@@ -100,11 +100,11 @@ $open_layers = GisVisualization::getByData($data, $visualizationSettings)
 
 // If the call is to update the WKT and visualization make an AJAX response
 if (isset($_REQUEST['generate']) && $_REQUEST['generate'] == true) {
-    $extra_data = array(
+    $extra_data = [
         'result'        => $result,
         'visualization' => $visualization,
         'openLayers'    => $open_layers,
-    );
+    ];
     $response = Response::getInstance();
     $response->addJSON($extra_data);
     exit;
diff --git a/import.php b/import.php
index f5b963a558..2e65fad477 100644
--- a/import.php
+++ b/import.php
@@ -59,12 +59,12 @@ if (isset($_REQUEST['console_bookmark_add'])) {
         && isset($_REQUEST['bookmark_query']) && isset($_REQUEST['shared'])
     ) {
         $cfgBookmark = Bookmark::getParams($GLOBALS['cfg']['Server']['user']);
-        $bookmarkFields = array(
+        $bookmarkFields = [
             'bkm_database' => $_REQUEST['db'],
             'bkm_user'  => $cfgBookmark['user'],
             'bkm_sql_query' => $_REQUEST['bookmark_query'],
             'bkm_label' => $_REQUEST['label']
-        );
+        ];
         $isShared = ($_REQUEST['shared'] == 'true' ? true : false);
         $bookmark = Bookmark::createBookmark(
             $GLOBALS['dbi'],
@@ -91,7 +91,7 @@ $format = '';
 /**
  * Sets globals from $_POST
  */
-$post_params = array(
+$post_params = [
     'charset_of_file',
     'format',
     'import_type',
@@ -101,7 +101,7 @@ $post_params = array(
     'noplugin',
     'skip_queries',
     'local_import_file'
-);
+];
 
 foreach ($post_params as $one_post_param) {
     if (isset($_POST[$one_post_param])) {
@@ -121,7 +121,7 @@ if (!isset($_SESSION['is_multi_query'])) {
     $_SESSION['is_multi_query'] = false;
 }
 
-$ajax_reload = array();
+$ajax_reload = [];
 // Are we just executing plain query or sql file?
 // (eg. non import, but query box/window run)
 if (! empty($sql_query)) {
@@ -202,7 +202,7 @@ if (! empty($sql_query)) {
 
 // If we didn't get any parameters, either user called this directly, or
 // upload limit has been reached, let's assume the second possibility.
-if ($_POST == array() && $_GET == array()) {
+if ($_POST == [] && $_GET == []) {
     $message = PhpMyAdmin\Message::error(
         __(
             'You probably tried to upload a file that is too large. Please refer ' .
@@ -234,7 +234,7 @@ if (isset($_POST['console_message_id'])) {
 
 if (! in_array(
     $format,
-    array(
+    [
         'csv',
         'ldi',
         'mediawiki',
@@ -242,7 +242,7 @@ if (! in_array(
         'shp',
         'sql',
         'xml'
-    )
+    ]
 )
 ) {
     // this should not happen for a normal user
@@ -250,25 +250,25 @@ if (! in_array(
     Core::fatalError('Incorrect format parameter');
 }
 
-$post_patterns = array(
+$post_patterns = [
     '/^force_file_/',
     '/^' . $format . '_/'
-);
+];
 
 Core::setPostAsGlobal($post_patterns);
 
 // Check needed parameters
-PhpMyAdmin\Util::checkParameters(array('import_type', 'format'));
+PhpMyAdmin\Util::checkParameters(['import_type', 'format']);
 
 // We don't want anything special in format
 $format = Core::securePath($format);
 
 if (strlen($table) > 0 && strlen($db) > 0) {
-    $urlparams = array('db' => $db, 'table' => $table);
+    $urlparams = ['db' => $db, 'table' => $table];
 } elseif (strlen($db) > 0) {
-    $urlparams = array('db' => $db);
+    $urlparams = ['db' => $db];
 } else {
-    $urlparams = array();
+    $urlparams = [];
 }
 
 // Create error and goto url
@@ -535,7 +535,7 @@ if (! $error && isset($_POST['skip'])) {
 
 // This array contain the data like numberof valid sql queries in the statement
 // and complete valid sql statement (which affected for rows)
-$sql_data = array('valid_sql' => array(), 'valid_queries' => 0);
+$sql_data = ['valid_sql' => [], 'valid_queries' => 0];
 
 if (! $error) {
     /* @var $import_plugin ImportPlugin */
@@ -685,7 +685,7 @@ if ($go_sql) {
         $_SESSION['is_multi_query'] = true;
         $sql_queries = $sql_data['valid_sql'];
     } else {
-        $sql_queries = array($sql_query);
+        $sql_queries = [$sql_query];
     }
 
     $html_output = '';
diff --git a/index.php b/index.php
index 25e30cdd9f..f49a22c00d 100644
--- a/index.php
+++ b/index.php
@@ -30,13 +30,13 @@ require_once 'libraries/common.inc.php';
 /**
  * pass variables to child pages
  */
-$drops = array(
+$drops = [
     'lang',
     'server',
     'collation_connection',
     'db',
     'table'
-);
+];
 foreach ($drops as $each_drop) {
     if (array_key_exists($each_drop, $_GET)) {
         unset($_GET[$each_drop]);
@@ -49,9 +49,9 @@ unset($drops, $each_drop);
  * Such scripts must not be loaded on home page.
  *
  */
-$target_blacklist = array (
+$target_blacklist =  [
     'import.php', 'export.php'
-);
+];
 
 // If we have a valid target, let's load that script instead
 if (! empty($_REQUEST['target'])
diff --git a/js/messages.php b/js/messages.php
index bc7d17e4d2..380e56605c 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -789,7 +789,7 @@ Sanitize::printJsValue(
 Sanitize::printJsValue("$.datepicker.regional['']['currentText']", __('Today'));
 Sanitize::printJsValue(
     "$.datepicker.regional['']['monthNames']",
-    array(
+    [
         __('January'),
         __('February'),
         __('March'),
@@ -802,11 +802,11 @@ Sanitize::printJsValue(
         __('October'),
         __('November'),
         __('December')
-    )
+    ]
 );
 Sanitize::printJsValue(
     "$.datepicker.regional['']['monthNamesShort']",
-    array(
+    [
         /* l10n: Short month name */
         __('Jan'),
         /* l10n: Short month name */
@@ -831,11 +831,11 @@ Sanitize::printJsValue(
         __('Nov'),
         /* l10n: Short month name */
         __('Dec')
-    )
+    ]
 );
 Sanitize::printJsValue(
     "$.datepicker.regional['']['dayNames']",
-    array(
+    [
         __('Sunday'),
         __('Monday'),
         __('Tuesday'),
@@ -843,11 +843,11 @@ Sanitize::printJsValue(
         __('Thursday'),
         __('Friday'),
         __('Saturday')
-    )
+    ]
 );
 Sanitize::printJsValue(
     "$.datepicker.regional['']['dayNamesShort']",
-    array(
+    [
         /* l10n: Short week day name */
         __('Sun'),
         /* l10n: Short week day name */
@@ -862,11 +862,11 @@ Sanitize::printJsValue(
         __('Fri'),
         /* l10n: Short week day name */
         __('Sat')
-    )
+    ]
 );
 Sanitize::printJsValue(
     "$.datepicker.regional['']['dayNamesMin']",
-    array(
+    [
         /* l10n: Minimal week day name */
         __('Su'),
         /* l10n: Minimal week day name */
@@ -881,7 +881,7 @@ Sanitize::printJsValue(
         __('Fr'),
         /* l10n: Minimal week day name */
         __('Sa')
-    )
+    ]
 );
 /* l10n: Column header for week of the year in calendar */
 Sanitize::printJsValue("$.datepicker.regional['']['weekHeader']", __('Wk'));
diff --git a/libraries/check_user_privileges.inc.php b/libraries/check_user_privileges.inc.php
index 589c3863d6..4e913765ae 100644
--- a/libraries/check_user_privileges.inc.php
+++ b/libraries/check_user_privileges.inc.php
@@ -20,7 +20,7 @@ if ($username === '') { // MySQL is started with --skip-grant-tables
     $GLOBALS['is_create_db_priv'] = true;
     $GLOBALS['is_reload_priv'] = true;
     $GLOBALS['db_to_create'] = '';
-    $GLOBALS['dbs_where_create_table_allowed'] = array('*');
+    $GLOBALS['dbs_where_create_table_allowed'] = ['*'];
     $GLOBALS['dbs_to_test'] = false;
     $GLOBALS['db_priv'] = true;
     $GLOBALS['col_priv'] = true;
diff --git a/libraries/classes/Advisor.php b/libraries/classes/Advisor.php
index 0244830d46..336b778e09 100644
--- a/libraries/classes/Advisor.php
+++ b/libraries/classes/Advisor.php
@@ -107,9 +107,9 @@ class Advisor
             }
         );
         /* Some global variables for advisor */
-        $this->globals = array(
+        $this->globals = [
             'PMA_MYSQL_INT_VERSION' => $this->dbi->getVersion(),
-        );
+        ];
 
     }
 
@@ -229,10 +229,10 @@ class Advisor
         // $runResult
         $this->runRules();
 
-        return array(
-            'parse' => array('errors' => $this->parseResult['errors']),
+        return [
+            'parse' => ['errors' => $this->parseResult['errors']],
             'run'   => $this->runResult
-        );
+        ];
     }
 
     /**
@@ -261,12 +261,12 @@ class Advisor
     public function runRules(): bool
     {
         $this->setRunResult(
-            array(
-                'fired'     => array(),
-                'notfired'  => array(),
-                'unchecked' => array(),
-                'errors'    => array(),
-            )
+            [
+                'fired'     => [],
+                'notfired'  => [],
+                'unchecked' => [],
+                'errors'    => [],
+            ]
         );
 
         foreach ($this->parseResult['rules'] as $rule) {
@@ -353,7 +353,7 @@ class Advisor
         if (! is_null($param)) {
             $params = $this->ruleExprEvaluate('[' . $param . ']');
         } else {
-            $params = array();
+            $params = [];
         }
         return vsprintf($string, $params);
     }
@@ -369,9 +369,9 @@ class Advisor
     {
         $jst = preg_split('/\s*\|\s*/', $rule['justification'], 2);
         if (count($jst) > 1) {
-            return array($jst[0], $jst[1]);
+            return [$jst[0], $jst[1]];
         }
-        return array($rule['justification']);
+        return [$rule['justification']];
     }
 
     /**
@@ -415,14 +415,14 @@ class Advisor
             // linking to server_variables.php
             $rule['recommendation'] = preg_replace_callback(
                 '/\{([a-z_0-9]+)\}/Ui',
-                array($this, 'replaceVariable'),
+                [$this, 'replaceVariable'],
                 $this->translate($rule['recommendation'])
             );
 
             // Replaces external Links with Core::linkURL() generated links
             $rule['recommendation'] = preg_replace_callback(
                 '#href=("|\')(https?://[^\1]+)\1#i',
-                array($this, 'replaceLinkURL'),
+                [$this, 'replaceLinkURL'],
                 $rule['recommendation']
             );
             break;
@@ -452,7 +452,7 @@ class Advisor
      */
     private function replaceVariable(array $matches): string
     {
-        return '<a href="server_variables.php' . Url::getCommon(array('filter' => $matches[1]))
+        return '<a href="server_variables.php' . Url::getCommon(['filter' => $matches[1]])
                 . '">' . htmlspecialchars($matches[1]) . '</a>';
     }
 
@@ -489,21 +489,21 @@ class Advisor
         $filename = 'libraries/advisory_rules.txt';
         $file = file($filename, FILE_IGNORE_NEW_LINES);
 
-        $errors = array();
-        $rules = array();
-        $lines = array();
+        $errors = [];
+        $rules = [];
+        $lines = [];
 
         if ($file === false) {
             $errors[] = sprintf(
                 __('Error in reading file: The file \'%s\' does not exist or is not readable!'),
                 $filename
             );
-            return array('rules' => $rules, 'lines' => $lines, 'errors' => $errors);
+            return ['rules' => $rules, 'lines' => $lines, 'errors' => $errors];
         }
 
-        $ruleSyntax = array(
+        $ruleSyntax = [
             'name', 'formula', 'test', 'issue', 'recommendation', 'justification'
-        );
+        ];
         $numRules = count($ruleSyntax);
         $numLines = count($file);
         $ruleNo = -1;
@@ -531,8 +531,8 @@ class Advisor
                 if (preg_match("/rule\s'(.*)'( \[(.*)\])?$/", $line, $match)) {
                     $ruleLine = 1;
                     $ruleNo++;
-                    $rules[$ruleNo] = array('name' => $match[1]);
-                    $lines[$ruleNo] = array('name' => $i + 1);
+                    $rules[$ruleNo] = ['name' => $match[1]];
+                    $lines[$ruleNo] = ['name' => $i + 1];
                     if (isset($match[3])) {
                         $rules[$ruleNo]['precondition'] = $match[3];
                         $lines[$ruleNo]['precondition'] = $i + 1;
@@ -583,7 +583,7 @@ class Advisor
             }
         }
 
-        return array('rules' => $rules, 'lines' => $lines, 'errors' => $errors);
+        return ['rules' => $rules, 'lines' => $lines, 'errors' => $errors];
     }
 
     /**
diff --git a/libraries/classes/Bookmark.php b/libraries/classes/Bookmark.php
index 3886892fae..c9e0ef9494 100644
--- a/libraries/classes/Bookmark.php
+++ b/libraries/classes/Bookmark.php
@@ -176,7 +176,7 @@ class Bookmark
      */
     public function getVariableCount(): int
     {
-        $matches = array();
+        $matches = [];
         preg_match_all("/\[VARIABLE[0-9]*\]/", $this->_query, $matches, PREG_SET_ORDER);
         return count($matches);
     }
@@ -231,11 +231,11 @@ class Bookmark
         $relation = new Relation();
         $cfgRelation = $relation->getRelationsParam();
         if ($cfgRelation['bookmarkwork']) {
-            $cfgBookmark = array(
+            $cfgBookmark = [
                 'user'  => $user,
                 'db'    => $cfgRelation['db'],
                 'table' => $cfgRelation['bookmark'],
-            );
+            ];
         } else {
             $cfgBookmark = false;
         }
@@ -296,7 +296,7 @@ class Bookmark
     ): array {
         $cfgBookmark = self::getParams($user);
         if (empty($cfgBookmark)) {
-            return array();
+            return [];
         }
 
         $query = "SELECT * FROM " . Util::backquote($cfgBookmark['db'])
@@ -317,7 +317,7 @@ class Bookmark
         );
 
         if (! empty($result)) {
-            $bookmarks = array();
+            $bookmarks = [];
             foreach ($result as $row) {
                 $bookmark = new Bookmark($dbi, $user);
                 $bookmark->_id = $row['id'];
@@ -331,7 +331,7 @@ class Bookmark
             return $bookmarks;
         }
 
-        return array();
+        return [];
     }
 
     /**
diff --git a/libraries/classes/BrowseForeigners.php b/libraries/classes/BrowseForeigners.php
index 7fbec3b871..01542349a8 100644
--- a/libraries/classes/BrowseForeigners.php
+++ b/libraries/classes/BrowseForeigners.php
@@ -144,7 +144,7 @@ class BrowseForeigners
 
         $output .= '</tr>';
 
-        return array($output, $horizontal_count, $indexByDescription);
+        return [$output, $horizontal_count, $indexByDescription];
     }
 
     /**
@@ -226,8 +226,8 @@ class BrowseForeigners
             . '<tfoot>' . $header . '</tfoot>' . "\n"
             . '<tbody>' . "\n";
 
-        $descriptions = array();
-        $keys   = array();
+        $descriptions = [];
+        $keys   = [];
         foreach ($foreignData['disp_row'] as $relrow) {
             if ($foreignData['foreign_display'] != false) {
                 $descriptions[] = $relrow[$foreignData['foreign_display']];
@@ -291,7 +291,7 @@ class BrowseForeigners
                 . '...'
             );
         }
-        return array($description, $descriptionTitle);
+        return [$description, $descriptionTitle];
     }
 
     /**
diff --git a/libraries/classes/CentralColumns.php b/libraries/classes/CentralColumns.php
index 117042dd14..ef3c59ba28 100644
--- a/libraries/classes/CentralColumns.php
+++ b/libraries/classes/CentralColumns.php
@@ -98,11 +98,11 @@ class CentralColumns
         $cfgRelation = $this->relation->getRelationsParam();
 
         if ($cfgRelation['centralcolumnswork']) {
-            $cfgCentralColumns = array(
+            $cfgCentralColumns = [
                 'user'  => $this->user,
                 'db'    => $cfgRelation['db'],
                 'table' => $cfgRelation['central_columns'],
-            );
+            ];
         } else {
             $cfgCentralColumns = false;
         }
@@ -125,7 +125,7 @@ class CentralColumns
     {
         $cfgCentralColumns = $this->getParams();
         if (empty($cfgCentralColumns)) {
-            return array();
+            return [];
         }
         $pmadb = $cfgCentralColumns['db'];
         $this->dbi->selectDb($pmadb, DatabaseInterface::CONNECT_CONTROL);
@@ -192,7 +192,7 @@ class CentralColumns
     ): array {
         $cfgCentralColumns = $this->getParams();
         if (empty($cfgCentralColumns)) {
-            return array();
+            return [];
         }
         $pmadb = $cfgCentralColumns['db'];
         $this->dbi->selectDb($pmadb, DatabaseInterface::CONNECT_CONTROL);
@@ -274,7 +274,7 @@ class CentralColumns
             . '\'' . $this->dbi->escapeString((string) $length) . '\',\''
             . $this->dbi->escapeString($collation) . '\','
             . '\'' . $this->dbi->escapeString($isNull) . '\','
-            . '\'' . implode(',', array($extra, $attribute))
+            . '\'' . implode(',', [$extra, $attribute])
             . '\',\'' . $this->dbi->escapeString($default) . '\');';
         return $insQuery;
     }
@@ -305,10 +305,10 @@ class CentralColumns
         $pmadb = $cfgCentralColumns['db'];
         $central_list_table = $cfgCentralColumns['table'];
         $this->dbi->selectDb($db);
-        $existingCols = array();
+        $existingCols = [];
         $cols = "";
-        $insQuery = array();
-        $fields = array();
+        $insQuery = [];
+        $fields = [];
         $message = true;
         if ($isTable) {
             foreach ($field_select as $table) {
@@ -413,8 +413,8 @@ class CentralColumns
         $central_list_table = $cfgCentralColumns['table'];
         $this->dbi->selectDb($db);
         $message = true;
-        $colNotExist = array();
-        $fields = array();
+        $colNotExist = [];
+        $fields = [];
         if ($isTable) {
             $cols = '';
             foreach ($field_select as $table) {
@@ -565,7 +565,7 @@ class CentralColumns
     ): array {
         $cfgCentralColumns = $this->getParams();
         if (empty($cfgCentralColumns)) {
-            return array();
+            return [];
         }
         $this->dbi->selectDb($db);
         $fields = (array) $this->dbi->getColumnNames(
@@ -581,7 +581,7 @@ class CentralColumns
             return (array)$has_list;
         }
 
-        return array();
+        return [];
     }
 
     /**
@@ -619,7 +619,7 @@ class CentralColumns
         $centralTable = $cfgCentralColumns['table'];
         $this->dbi->selectDb($cfgCentralColumns['db'], DatabaseInterface::CONNECT_CONTROL);
         if ($orig_col_name == "") {
-            $def = array();
+            $def = [];
             $def['Type'] = $col_type;
             if ($col_length) {
                 $def['Type'] .= '(' . $col_length . ')';
@@ -638,7 +638,7 @@ class CentralColumns
                 . ', col_isNull = ' . $col_isNull
                 . ', col_collation = \'' . $this->dbi->escapeString($collation) . '\''
                 . ', col_extra = \''
-                . implode(',', array($col_extra, $col_attribute)) . '\''
+                . implode(',', [$col_extra, $col_attribute]) . '\''
                 . ', col_default = \'' . $this->dbi->escapeString($col_default) . '\''
                 . ' WHERE db_name = \'' . $this->dbi->escapeString($db) . '\' '
                 . 'AND col_name = \'' . $this->dbi->escapeString($orig_col_name)
@@ -667,8 +667,8 @@ class CentralColumns
         $col_attribute = $_POST['field_attribute'];
         $col_type = $_POST['field_type'];
         $collation = $_POST['field_collation'];
-        $col_isNull = array();
-        $col_extra = array();
+        $col_isNull = [];
+        $col_extra = [];
         $num_central_fields = count($orig_col_name);
         for ($i = 0; $i < $num_central_fields ; $i++) {
             $col_isNull[$i] = isset($_POST['field_null'][$i]) ? 1 : 0;
@@ -712,14 +712,14 @@ class CentralColumns
         $page_selector = ($nbTotalPage > 1)?(Util::pageselector(
             'pos', $this->maxRows, $pageNow, $nbTotalPage
         )):'';
-        return  Template::get('database/central_columns/table_navigation')->render(array(
+        return  Template::get('database/central_columns/table_navigation')->render([
             "pos" => $pos,
             "max_rows" => $this->maxRows,
             "db" => $db,
             "total_rows" => $total_rows,
             "nb_total_page" => $nbTotalPage,
             "page_selector" => $page_selector,
-        ));
+        ]);
     }
 
     /**
@@ -736,11 +736,11 @@ class CentralColumns
         string $title = '',
         int $actionCount = 0
     ): string {
-        return  Template::get('database/central_columns/table_header')->render(array(
+        return  Template::get('database/central_columns/table_header')->render([
             "class" => $class,
             "title" => $title,
             "actionCount" => $actionCount,
-        ));
+        ]);
     }
 
     /**
@@ -826,12 +826,12 @@ class CentralColumns
          string $db
      ): string {
          $table_drop_down = $this->getHtmlForTableDropdown($db);
-         return Template::get('database/central_columns/add_column')->render(array(
+         return Template::get('database/central_columns/add_column')->render([
              'pos' => $pos,
              'db' => $db,
              'total_rows' => $total_rows,
              'table_drop_down' => $table_drop_down,
-         ));
+         ]);
      }
 
     /**
@@ -845,7 +845,7 @@ class CentralColumns
      */
     public function getHtmlForTableRow(array $row, int $row_num, string $db): string
     {
-        $meta = array();
+        $meta = [];
         if (!isset($row['col_default']) || $row['col_default'] == '') {
             $meta['DefaultType'] = 'NONE';
         } else {
@@ -860,65 +860,65 @@ class CentralColumns
                 $meta['DefaultValue'] = $row['col_default'];
             }
         }
-        $column_name = Template::get('columns_definitions/column_name')->render(array(
+        $column_name = Template::get('columns_definitions/column_name')->render([
             'column_number' => $row_num,
             'ci' => 0,
             'ci_offset' => 0,
-            'column_meta' => array(
+            'column_meta' => [
                 'Field'=>$row['col_name']
-            ),
-            'cfg_relation' => array(
+            ],
+            'cfg_relation' => [
                 'centralcolumnswork' => false
-            ),
+            ],
             'max_rows' => $this->maxRows,
-        ));
-        $column_type = Template::get('columns_definitions/column_type')->render(array(
+        ]);
+        $column_type = Template::get('columns_definitions/column_type')->render([
             'column_number' => $row_num,
             'ci' => 1,
             'ci_offset' => 0,
             'type_upper' => mb_strtoupper($row['col_type']),
-            'column_meta' => array()
-        ));
-        $column_length = Template::get('columns_definitions/column_length')->render(array(
+            'column_meta' => []
+        ]);
+        $column_length = Template::get('columns_definitions/column_length')->render([
             'column_number' => $row_num,
             'ci' => 2,
             'ci_offset' => 0,
             'length_values_input_size' => 8,
             'length_to_display' => $row['col_length']
-        ));
-        $column_default = Template::get('columns_definitions/column_default')->render(array(
+        ]);
+        $column_default = Template::get('columns_definitions/column_default')->render([
             'column_number' => $row_num,
             'ci' => 3,
             'ci_offset' => 0,
             'type_upper' => mb_strtoupper($row['col_type']),
             'column_meta' => $meta,
             'char_editing' => $this->charEditing,
-        ));
-        $column_attribute = Template::get('columns_definitions/column_attribute')->render(array(
+        ]);
+        $column_attribute = Template::get('columns_definitions/column_attribute')->render([
             'column_number' => $row_num,
             'ci' => 5,
             'ci_offset' => 0,
-            'extracted_columnspec' => array(),
+            'extracted_columnspec' => [],
             'column_meta' => $row['col_attribute'],
             'submit_attribute' => false,
             'attribute_types' => $this->dbi->types->getAttributes(),
-        ));
-        $column_null = Template::get('columns_definitions/column_null')->render(array(
+        ]);
+        $column_null = Template::get('columns_definitions/column_null')->render([
             'column_number' => $row_num,
             'ci' => 6,
             'ci_offset' => 0,
-            'column_meta' => array(
+            'column_meta' => [
                 'Null' => $row['col_isNull']
-            )
-        ));
-        $column_extra = Template::get('columns_definitions/column_extra')->render(array(
+            ]
+        ]);
+        $column_extra = Template::get('columns_definitions/column_extra')->render([
             'column_number' => $row_num,
             'ci' => 7,
             'ci_offset' => 0,
-            'column_meta' => array('Extra'=>$row['col_extra'])
-        ));
+            'column_meta' => ['Extra'=>$row['col_extra']]
+        ]);
 
-        return Template::get('database/central_columns/table_row')->render(array(
+        return Template::get('database/central_columns/table_row')->render([
             'column_name' => $column_name,
             'column_type' => $column_type,
             'column_length' => $column_length,
@@ -931,7 +931,7 @@ class CentralColumns
             'db' => $db,
             'dbi' => $this->dbi,
             'disableIs' => $this->disableIs,
-        ));
+        ]);
     }
 
     /**
@@ -949,45 +949,45 @@ class CentralColumns
             . '<input name="orig_col_name[' . $row_num . ']" type="hidden" '
             . 'value="' . htmlspecialchars($row['col_name']) . '">'
             . '<td name="col_name" class="nowrap">'
-            . Template::get('columns_definitions/column_name')->render(array(
+            . Template::get('columns_definitions/column_name')->render([
                 'column_number' => $row_num,
                 'ci' => 0,
                 'ci_offset' => 0,
-                'column_meta' => array(
+                'column_meta' => [
                     'Field' => $row['col_name']
-                ),
-                'cfg_relation' => array(
+                ],
+                'cfg_relation' => [
                     'centralcolumnswork' => false
-                ),
+                ],
                 'max_rows' => $this->maxRows,
-            ))
+            ])
             . '</td>';
         $tableHtml .=
             '<td name = "col_type" class="nowrap">'
             . Template::get('columns_definitions/column_type')
                 ->render(
-                    array(
+                    [
                     'column_number' => $row_num,
                     'ci' => 1,
                     'ci_offset' => 0,
                     'type_upper' => mb_strtoupper($row['col_type']),
-                    'column_meta' => array()
-                    )
+                    'column_meta' => []
+                    ]
                 )
             . '</td>';
         $tableHtml .=
             '<td class="nowrap" name="col_length">'
             . Template::get('columns_definitions/column_length')->render(
-                array(
+                [
                     'column_number' => $row_num,
                     'ci' => 2,
                     'ci_offset' => 0,
                     'length_values_input_size' => 8,
                     'length_to_display' => $row['col_length']
-                )
+                ]
             )
             . '</td>';
-        $meta = array();
+        $meta = [];
         if (!isset($row['col_default']) || $row['col_default'] == '') {
             $meta['DefaultType'] = 'NONE';
         } else {
@@ -1006,14 +1006,14 @@ class CentralColumns
             '<td class="nowrap" name="col_default">'
             . Template::get('columns_definitions/column_default')
                 ->render(
-                    array(
+                    [
                     'column_number' => $row_num,
                     'ci' => 3,
                     'ci_offset' => 0,
                     'type_upper' => mb_strtoupper((string) $row['col_default']),
                     'column_meta' => $meta,
                     'char_editing' => $this->charEditing,
-                    )
+                    ]
                 )
             . '</td>';
         $tableHtml .=
@@ -1029,43 +1029,43 @@ class CentralColumns
             '<td class="nowrap" name="col_attribute">'
             . Template::get('columns_definitions/column_attribute')
                 ->render(
-                    array(
+                    [
                     'column_number' => $row_num,
                     'ci' => 5,
                     'ci_offset' => 0,
-                    'extracted_columnspec' => array(
+                    'extracted_columnspec' => [
                         'attribute' => $row['col_attribute']
-                    ),
-                    'column_meta' => array(),
+                    ],
+                    'column_meta' => [],
                     'submit_attribute' => false,
                     'attribute_types' => $this->dbi->types->getAttributes(),
-                    )
+                    ]
                 )
             . '</td>';
         $tableHtml .=
             '<td class="nowrap" name="col_isNull">'
             . Template::get('columns_definitions/column_null')
                 ->render(
-                    array(
+                    [
                     'column_number' => $row_num,
                     'ci' => 6,
                     'ci_offset' => 0,
-                    'column_meta' => array(
+                    'column_meta' => [
                         'Null' => $row['col_isNull']
-                    )
-                    )
+                    ]
+                    ]
                 )
             . '</td>';
 
         $tableHtml .=
             '<td class="nowrap" name="col_extra">'
             . Template::get('columns_definitions/column_extra')->render(
-                array(
+                [
                     'column_number' => $row_num,
                     'ci' => 7,
                     'ci_offset' => 0,
-                    'column_meta' => array('Extra' => $row['col_extra'])
-                )
+                    'column_meta' => ['Extra' => $row['col_extra']]
+                ]
             )
             . '</td>';
         $tableHtml .= '</tr>';
@@ -1086,7 +1086,7 @@ class CentralColumns
     {
         $cfgCentralColumns = $this->getParams();
         if (empty($cfgCentralColumns)) {
-            return json_encode(array());
+            return json_encode([]);
         }
         $centralTable = $cfgCentralColumns['table'];
         if (empty($table) || $table == '') {
@@ -1129,11 +1129,11 @@ class CentralColumns
     {
         $html_output = Template::get('select_all')
             ->render(
-                array(
+                [
                     'pma_theme_image' => $pmaThemeImage,
                     'text_dir'        => $text_dir,
                     'form_name'       => 'tableslistcontainer',
-                )
+                ]
             );
         $html_output .= Util::getButtonOrImage(
             'edit_central_columns', 'mult_submit change_central_columns',
@@ -1221,51 +1221,51 @@ class CentralColumns
         $addNewColumn .= '<tr>'
             . '<td></td>'
             . '<td name="col_name" class="nowrap">'
-            . Template::get('columns_definitions/column_name')->render(array(
+            . Template::get('columns_definitions/column_name')->render([
                 'column_number' => 0,
                 'ci' => 0,
                 'ci_offset' => 0,
-                'column_meta' => array(),
-                'cfg_relation' => array(
+                'column_meta' => [],
+                'cfg_relation' => [
                     'centralcolumnswork' => false
-                ),
+                ],
                 'max_rows' => $this->maxRows,
-            ))
+            ])
             . '</td>'
             . '<td name = "col_type" class="nowrap">'
             . Template::get('columns_definitions/column_type')
                 ->render(
-                    array(
+                    [
                     'column_number' => 0,
                     'ci' => 1,
                     'ci_offset' => 0,
                     'type_upper' => '',
-                    'column_meta' => array()
-                    )
+                    'column_meta' => []
+                    ]
                 )
             . '</td>'
             . '<td class="nowrap" name="col_length">'
             . Template::get('columns_definitions/column_length')->render(
-                array(
+                [
                     'column_number' => 0,
                     'ci' => 2,
                     'ci_offset' => 0,
                     'length_values_input_size' => 8,
                     'length_to_display' => ''
-                )
+                ]
             )
             . '</td>'
             . '<td class="nowrap" name="col_default">'
             . Template::get('columns_definitions/column_default')
                 ->render(
-                    array(
+                    [
                     'column_number' => 0,
                     'ci' => 3,
                     'ci_offset' => 0,
                     'type_upper' => '',
-                    'column_meta' => array(),
+                    'column_meta' => [],
                     'char_editing' => $this->charEditing,
-                    )
+                    ]
                 )
             . '</td>'
             . '<td name="collation" class="nowrap">'
@@ -1279,36 +1279,36 @@ class CentralColumns
             . '<td class="nowrap" name="col_attribute">'
             . Template::get('columns_definitions/column_attribute')
                 ->render(
-                    array(
+                    [
                     'column_number' => 0,
                     'ci' => 5,
                     'ci_offset' => 0,
-                    'extracted_columnspec' => array(),
-                    'column_meta' => array(),
+                    'extracted_columnspec' => [],
+                    'column_meta' => [],
                     'submit_attribute' => false,
                     'attribute_types' => $this->dbi->types->getAttributes(),
-                    )
+                    ]
                 )
             . '</td>'
             . '<td class="nowrap" name="col_isNull">'
             . Template::get('columns_definitions/column_null')
                 ->render(
-                    array(
+                    [
                     'column_number' => 0,
                     'ci' => 6,
                     'ci_offset' => 0,
-                    'column_meta' => array()
-                    )
+                    'column_meta' => []
+                    ]
                 )
             . '</td>'
             . '<td class="nowrap" name="col_extra">'
             . Template::get('columns_definitions/column_extra')->render(
-                array(
+                [
                     'column_number' => 0,
                     'ci' => 7,
                     'ci_offset' => 0,
-                    'column_meta' => array()
-                )
+                    'column_meta' => []
+                ]
             )
             . '</td>'
             . ' <td>'
@@ -1330,12 +1330,12 @@ class CentralColumns
     public function getHtmlForEditingPage(array $selected_fld, string $selected_db): string
     {
         $html = '<form id="multi_edit_central_columns">';
-        $header_cells = array(
+        $header_cells = [
             __('Name'), __('Type'), __('Length/Values'), __('Default'),
             __('Collation'), __('Attributes'), __('Null'), __('A_I')
-        );
+        ];
         $html .= $this->getEditTableHeader($header_cells);
-        $selected_fld_safe = array();
+        $selected_fld_safe = [];
         foreach ($selected_fld as $key) {
             $selected_fld_safe[] = $this->dbi->escapeString($key);
         }
diff --git a/libraries/classes/Charsets.php b/libraries/classes/Charsets.php
index 93cd33474b..b706143a9d 100644
--- a/libraries/classes/Charsets.php
+++ b/libraries/classes/Charsets.php
@@ -24,7 +24,7 @@ class Charsets
      *
      * @var array
      */
-    public static $mysql_charset_map = array(
+    public static $mysql_charset_map = [
         'big5'         => 'big5',
         'cp-866'       => 'cp866',
         'euc-jp'       => 'ujis',
@@ -48,12 +48,12 @@ class Charsets
         'windows-1252' => 'latin1',
         'windows-1256' => 'cp1256',
         'windows-1257' => 'cp1257',
-    );
+    ];
 
-    private static $_charsets = array();
-    private static $_charsets_descriptions = array();
-    private static $_collations = array();
-    private static $_default_collations = array();
+    private static $_charsets = [];
+    private static $_charsets_descriptions = [];
+    private static $_collations = [];
+    private static $_default_collations = [];
 
     /**
      * Loads charset data from the MySQL server.
@@ -79,7 +79,7 @@ class Charsets
         }
         $res = $dbi->query($sql);
 
-        self::$_charsets = array();
+        self::$_charsets = [];
         while ($row = $dbi->fetchAssoc($res)) {
             $name = $row['Charset'];
             self::$_charsets[] = $name;
@@ -311,7 +311,7 @@ class Charsets
 
         $name = __('Unknown');
         $variant = null;
-        $suffixes = array();
+        $suffixes = [];
         $unicode = false;
         $unknown = false;
 
diff --git a/libraries/classes/CheckUserPrivileges.php b/libraries/classes/CheckUserPrivileges.php
index fef595bbad..8f9a3505cf 100644
--- a/libraries/classes/CheckUserPrivileges.php
+++ b/libraries/classes/CheckUserPrivileges.php
@@ -67,11 +67,11 @@ class CheckUserPrivileges
         );
         $show_grants_tblname = Util::unQuote($show_grants_tblname, '`');
 
-        return array(
+        return [
             $show_grants_str,
             $show_grants_dbname,
             $show_grants_tblname
-        );
+        ];
     }
 
     /**
@@ -198,7 +198,7 @@ class CheckUserPrivileges
         $GLOBALS['is_create_db_priv']  = false;
         $GLOBALS['is_reload_priv'] = false;
         $GLOBALS['db_to_create'] = '';
-        $GLOBALS['dbs_where_create_table_allowed'] = array();
+        $GLOBALS['dbs_where_create_table_allowed'] = [];
         $GLOBALS['dbs_to_test'] = $this->dbi->getSystemSchemas();
         $GLOBALS['proc_priv'] = false;
         $GLOBALS['db_priv'] = false;
diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php
index 40a1b16a34..579ddb8ed2 100644
--- a/libraries/classes/Config.php
+++ b/libraries/classes/Config.php
@@ -39,17 +39,17 @@ class Config
     /**
      * @var array   default configuration settings
      */
-    public $default = array();
+    public $default = [];
 
     /**
      * @var array   configuration settings, without user preferences applied
      */
-    public $base_settings = array();
+    public $base_settings = [];
 
     /**
      * @var array   configuration settings
      */
-    public $settings = array();
+    public $settings = [];
 
     /**
      * @var string  config source
@@ -76,7 +76,7 @@ class Config
     /**
      * @var array
      */
-    public $default_server = array();
+    public $default_server = [];
 
     /**
      * @var boolean whether init is done or not
@@ -97,7 +97,7 @@ class Config
      */
     public function __construct(?string $source = null)
     {
-        $this->settings = array('is_setup' => false);
+        $this->settings = ['is_setup' => false];
 
         // functions need to refresh in case of config file changed goes in
         // PhpMyAdmin\Config::load()
@@ -389,7 +389,7 @@ class Config
             }
         } elseif (is_file($git)) {
             $contents = file_get_contents($git);
-            $gitmatch = array();
+            $gitmatch = [];
             // Matches expected format
             if (! preg_match('/^gitdir: (.*)$/',
                 $contents, $gitmatch)) {
@@ -498,7 +498,7 @@ class Config
                 $commit = explode("\n", $commit[1]);
                 $_SESSION['PMA_VERSION_COMMITDATA_' . $hash] = $commit;
             } else {
-                $pack_names = array();
+                $pack_names = [];
                 // work with packed data
                 $packs_file = $git_folder . '/objects/info/packs';
                 if (@file_exists($packs_file)
@@ -693,20 +693,20 @@ class Config
         }
 
         if ($commit !== false) {
-            $author = array('name' => '', 'email' => '', 'date' => '');
-            $committer = array('name' => '', 'email' => '', 'date' => '');
+            $author = ['name' => '', 'email' => '', 'date' => ''];
+            $committer = ['name' => '', 'email' => '', 'date' => ''];
 
             do {
                 $dataline = array_shift($commit);
                 $datalinearr = explode(' ', $dataline, 2);
                 $linetype = $datalinearr[0];
-                if (in_array($linetype, array('author', 'committer'))) {
+                if (in_array($linetype, ['author', 'committer'])) {
                     $user = $datalinearr[1];
                     preg_match('/([^<]+)<([^>]+)> ([0-9]+)( [^ ]+)?/', $user, $user);
-                    $user2 = array(
+                    $user2 = [
                         'name' => trim($user[1]),
                         'email' => trim($user[2]),
-                        'date' => date('Y-m-d H:i:s', (int) $user[3]));
+                        'date' => date('Y-m-d H:i:s', (int) $user[3])];
                     if (isset($user[4])) {
                         $user2['date'] .= $user[4];
                     }
@@ -716,14 +716,14 @@ class Config
             $message = trim(implode(' ', $commit));
 
         } elseif (isset($commit_json) && isset($commit_json->author) && isset($commit_json->committer)) {
-            $author = array(
+            $author = [
                 'name' => $commit_json->author->name,
                 'email' => $commit_json->author->email,
-                'date' => $commit_json->author->date);
-            $committer = array(
+                'date' => $commit_json->author->date];
+            $committer = [
                 'name' => $commit_json->committer->name,
                 'email' => $commit_json->committer->email,
-                'date' => $commit_json->committer->date);
+                'date' => $commit_json->committer->date];
             $message = trim($commit_json->message);
         } else {
             return;
@@ -746,7 +746,7 @@ class Config
      */
     public function loadDefaults(): bool
     {
-        $cfg = array();
+        $cfg = [];
         if (! @file_exists($this->default_source)) {
             $this->error_config_default_file = true;
             return false;
@@ -797,7 +797,7 @@ class Config
             return false;
         }
 
-        $cfg = array();
+        $cfg = [];
 
         /**
          * Parses the configuration file, we throw away any errors or
@@ -1380,7 +1380,7 @@ class Config
         $GLOBALS['max_upload_size'] = $this->get('max_upload_size');
         $GLOBALS['is_https']        = $this->get('is_https');
 
-        $defines = array(
+        $defines = [
             'PMA_VERSION',
             'PMA_MAJOR_VERSION',
             'PMA_THEME_VERSION',
@@ -1390,7 +1390,7 @@ class Config
             'PMA_USR_OS',
             'PMA_USR_BROWSER_VER',
             'PMA_USR_BROWSER_AGENT'
-            );
+            ];
 
         foreach ($defines as $define) {
             if (! defined($define)) {
@@ -1570,7 +1570,7 @@ class Config
      */
     public function getTempDir(string $name): ?string
     {
-        static $temp_dir = array();
+        static $temp_dir = [];
 
         if (isset($temp_dir[$name]) && !defined('TESTSUITE')) {
             return $temp_dir[$name];
@@ -1602,11 +1602,11 @@ class Config
     {
         // First try configured temp dir
         // Fallback to PHP upload_tmp_dir
-        $dirs = array(
+        $dirs = [
             $this->getTempDir('upload'),
             ini_get('upload_tmp_dir'),
             sys_get_temp_dir(),
-        );
+        ];
 
         foreach ($dirs as $dir) {
             if (! empty($dir) && @is_writable($dir)) {
@@ -1666,7 +1666,7 @@ class Config
                 $this->settings['Server'] = $this->settings['Servers'][$server];
             } else {
                 $server = 0;
-                $this->settings['Server'] = array();
+                $this->settings['Server'] = [];
             }
         }
 
@@ -1683,10 +1683,10 @@ class Config
         // Do we have some server?
         if (! isset($this->settings['Servers']) || count($this->settings['Servers']) == 0) {
             // No server => create one with defaults
-            $this->settings['Servers'] = array(1 => $this->default_server);
+            $this->settings['Servers'] = [1 => $this->default_server];
         } else {
             // We have server(s) => apply default configuration
-            $new_servers = array();
+            $new_servers = [];
 
             foreach ($this->settings['Servers'] as $server_index => $each_server) {
 
@@ -1717,5 +1717,5 @@ class Config
 }
 
 if (!defined('TESTSUITE')) {
-    register_shutdown_function(array('PhpMyAdmin\Config', 'fatalErrorHandler'));
+    register_shutdown_function(['PhpMyAdmin\Config', 'fatalErrorHandler']);
 }
diff --git a/libraries/classes/Config/ConfigFile.php b/libraries/classes/Config/ConfigFile.php
index 918bbc4450..ec5863f877 100644
--- a/libraries/classes/Config/ConfigFile.php
+++ b/libraries/classes/Config/ConfigFile.php
@@ -48,14 +48,14 @@ class ConfigFile
      * Keys which will be always written to config file
      * @var array
      */
-    private $_persistKeys = array();
+    private $_persistKeys = [];
 
     /**
      * Changes keys while updating config in {@link updateWithGlobalConfig()}
      * or reading by {@link getConfig()} or {@link getConfigArray()}
      * @var array
      */
-    private $_cfgUpdateReadMapping = array();
+    private $_cfgUpdateReadMapping = [];
 
     /**
      * Key filter for {@link set()}
@@ -104,7 +104,7 @@ class ConfigFile
         $this->_isInSetup = is_null($base_config);
         $this->_id = 'ConfigFile' . $GLOBALS['server'];
         if (!isset($_SESSION[$this->_id])) {
-            $_SESSION[$this->_id] = array();
+            $_SESSION[$this->_id] = [];
         }
     }
 
@@ -174,7 +174,7 @@ class ConfigFile
      */
     public function resetConfigData()
     {
-        $_SESSION[$this->_id] = array();
+        $_SESSION[$this->_id] = [];
     }
 
     /**
@@ -258,7 +258,7 @@ class ConfigFile
         // no recursion for numeric arrays
         if (is_array($value) && !isset($value[0])) {
             $prefix .= $key . '/';
-            array_walk($value, array($this, '_flattenArray'), $prefix);
+            array_walk($value, [$this, '_flattenArray'], $prefix);
         } else {
             $this->_flattenArrayResult[$prefix . $key] = $value;
         }
@@ -271,8 +271,8 @@ class ConfigFile
      */
     public function getFlatDefaultConfig()
     {
-        $this->_flattenArrayResult = array();
-        array_walk($this->_defaultCfg, array($this, '_flattenArray'), '');
+        $this->_flattenArrayResult = [];
+        array_walk($this->_defaultCfg, [$this, '_flattenArray'], '');
         $flat_cfg = $this->_flattenArrayResult;
         $this->_flattenArrayResult = null;
         return $flat_cfg;
@@ -289,8 +289,8 @@ class ConfigFile
     public function updateWithGlobalConfig(array $cfg)
     {
         // load config array and flatten it
-        $this->_flattenArrayResult = array();
-        array_walk($cfg, array($this, '_flattenArray'), '');
+        $this->_flattenArrayResult = [];
+        array_walk($cfg, [$this, '_flattenArray'], '');
         $flat_cfg = $this->_flattenArrayResult;
         $this->_flattenArrayResult = null;
 
@@ -507,8 +507,8 @@ class ConfigFile
      */
     public function getConfigArray()
     {
-        $this->_flattenArrayResult = array();
-        array_walk($_SESSION[$this->_id], array($this, '_flattenArray'), '');
+        $this->_flattenArrayResult = [];
+        array_walk($_SESSION[$this->_id], [$this, '_flattenArray'], '');
         $c = $this->_flattenArrayResult;
         $this->_flattenArrayResult = null;
 
diff --git a/libraries/classes/Config/Descriptions.php b/libraries/classes/Config/Descriptions.php
index 58c9f4f2c6..d5cb446f03 100644
--- a/libraries/classes/Config/Descriptions.php
+++ b/libraries/classes/Config/Descriptions.php
@@ -31,8 +31,8 @@ class Descriptions
     public static function get($path, $type = 'name')
     {
         $key = str_replace(
-            array('Servers/1/', '/'),
-            array('Servers/', '_'),
+            ['Servers/1/', '/'],
+            ['Servers/', '_'],
             $path
         );
         $value = self::getString($key, $type);
diff --git a/libraries/classes/Config/Form.php b/libraries/classes/Config/Form.php
index a9b724294d..c1f9bfc151 100644
--- a/libraries/classes/Config/Form.php
+++ b/libraries/classes/Config/Form.php
@@ -104,11 +104,11 @@ class Form
         $value = $this->_configFile->getDbEntry($option_path);
         if ($value === null) {
             trigger_error("$option_path - select options not defined", E_USER_ERROR);
-            return array();
+            return [];
         }
         if (!is_array($value)) {
             trigger_error("$option_path - not a static value list", E_USER_ERROR);
-            return array();
+            return [];
         }
         // convert array('#', 'a', 'b') to array('a', 'b')
         if (isset($value[0]) && $value[0] === '#') {
@@ -120,7 +120,7 @@ class Form
 
         // convert value list array('a', 'b') to array('a' => 'a', 'b' => 'b')
         $has_string_keys = false;
-        $keys = array();
+        $keys = [];
         for ($i = 0, $nb = count($value); $i < $nb; $i++) {
             if (!isset($value[$i])) {
                 $has_string_keys = true;
@@ -152,7 +152,7 @@ class Form
 
         if (is_array($value)) {
             $prefix .= $key . '/';
-            array_walk($value, array($this, '_readFormPathsCallback'), $prefix);
+            array_walk($value, [$this, '_readFormPathsCallback'], $prefix);
             return;
         }
 
@@ -177,13 +177,13 @@ class Form
     protected function readFormPaths(array $form)
     {
         // flatten form fields' paths and save them to $fields
-        $this->fields = array();
-        array_walk($form, array($this, '_readFormPathsCallback'), '');
+        $this->fields = [];
+        array_walk($form, [$this, '_readFormPathsCallback'], '');
 
         // $this->fields is an array of the form: [0..n] => 'field path'
         // change numeric indexes to contain field names (last part of the path)
         $paths = $this->fields;
-        $this->fields = array();
+        $this->fields = [];
         foreach ($paths as $path) {
             $key = ltrim(
                 mb_substr($path, (int) mb_strrpos($path, '/')),
diff --git a/libraries/classes/Config/FormDisplay.php b/libraries/classes/Config/FormDisplay.php
index 981f771f86..24e68eb271 100644
--- a/libraries/classes/Config/FormDisplay.php
+++ b/libraries/classes/Config/FormDisplay.php
@@ -42,7 +42,7 @@ class FormDisplay
      * Form list
      * @var Form[]
      */
-    private $_forms = array();
+    private $_forms = [];
 
     /**
      * Stores validation errors, indexed by paths
@@ -50,27 +50,27 @@ class FormDisplay
      * [path] is a string storing error associated with single field
      * @var array
      */
-    private $_errors = array();
+    private $_errors = [];
 
     /**
      * Paths changed so that they can be used as HTML ids, indexed by paths
      * @var array
      */
-    private $_translatedPaths = array();
+    private $_translatedPaths = [];
 
     /**
      * Server paths change indexes so we define maps from current server
      * path to the first one, indexed by work path
      * @var array
      */
-    private $_systemPaths = array();
+    private $_systemPaths = [];
 
     /**
      * Language strings which will be sent to PMA_messages JS variable
      * Will be looked up in $GLOBALS: str{value} or strSetup{value}
      * @var array
      */
-    private $_jsLangStrings = array();
+    private $_jsLangStrings = [];
 
     /**
      * Tells whether forms have been validated
@@ -97,12 +97,12 @@ class FormDisplay
      */
     public function __construct(ConfigFile $cf)
     {
-        $this->_jsLangStrings = array(
+        $this->_jsLangStrings = [
             'error_nan_p' => __('Not a positive number!'),
             'error_nan_nneg' => __('Not a non-negative number!'),
             'error_incorrect_port' => __('Not a valid port number!'),
             'error_invalid_value' => __('Incorrect value!'),
-            'error_value_lte' => __('Value must be equal or lower than %s!'));
+            'error_value_lte' => __('Value must be equal or lower than %s!')];
         $this->_configFile = $cf;
         // initialize validators
         Validator::getValidators($this->_configFile);
@@ -175,8 +175,8 @@ class FormDisplay
             return;
         }
 
-        $paths = array();
-        $values = array();
+        $paths = [];
+        $values = [];
         foreach ($this->_forms as $form) {
             /* @var $form Form */
             $paths[] = $form->name;
@@ -195,7 +195,7 @@ class FormDisplay
 
         // change error keys from canonical paths to work paths
         if (is_array($errors) && count($errors) > 0) {
-            $this->_errors = array();
+            $this->_errors = [];
             foreach ($errors as $path => $error_list) {
                 $work_path = array_search($path, $this->_systemPaths);
                 // field error
@@ -235,7 +235,7 @@ class FormDisplay
                 Descriptions::get("Form_{$form->name}"),
                 Descriptions::get("Form_{$form->name}", 'desc'),
                 $form_errors,
-                array('id' => $form->name)
+                ['id' => $form->name]
             );
 
             foreach ($form->fields as $field => $path) {
@@ -291,13 +291,13 @@ class FormDisplay
 
         $htmlOutput = '';
 
-        $js = array();
-        $js_default = array();
+        $js = [];
+        $js_default = [];
 
         $htmlOutput .= FormDisplayTemplate::displayFormTop($form_action, 'post', $hidden_fields);
 
         if ($tabbed_form) {
-            $tabs = array();
+            $tabs = [];
             foreach ($this->_forms as $form) {
                 $tabs[$form->name] = Descriptions::get("Form_$form->name");
             }
@@ -333,7 +333,7 @@ class FormDisplay
         // if not already done, send strings used for validation to JavaScript
         if (! $js_lang_sent) {
             $js_lang_sent = true;
-            $js_lang = array();
+            $js_lang = [];
             foreach ($this->_jsLangStrings as $strName => $strValue) {
                 $js_lang[] = "'$strName': '" . Sanitize::jsFormat($strValue, false) . '\'';
             }
@@ -382,12 +382,12 @@ class FormDisplay
             $value_is_default = true;
         }
 
-        $opts = array(
+        $opts = [
             'doc' => $this->getDocLink($system_path),
             'show_restore_default' => $show_restore_default,
             'userprefs_allow' => $userprefs_allow,
             'userprefs_comment' => Descriptions::get($system_path, 'cmt')
-        );
+        ];
         if (isset($form->default[$system_path])) {
             $opts['setvalue'] = $form->default[$system_path];
         }
@@ -578,14 +578,14 @@ class FormDisplay
         $result = true;
         $forms = (array) $forms;
 
-        $values = array();
-        $to_save = array();
+        $values = [];
+        $to_save = [];
         $is_setup_script = $GLOBALS['PMA_Config']->get('is_setup');
         if ($is_setup_script) {
             $this->_loadUserprefsInfo();
         }
 
-        $this->_errors = array();
+        $this->_errors = [];
         foreach ($forms as $form_name) {
             /* @var $form Form */
             if (isset($this->_forms[$form_name])) {
@@ -669,7 +669,7 @@ class FormDisplay
                     $post_values = is_array($_POST[$key])
                         ? $_POST[$key]
                         : explode("\n", $_POST[$key]);
-                    $_POST[$key] = array();
+                    $_POST[$key] = [];
                     $this->_fillPostArrayParameters($post_values, $key);
                     break;
                 }
@@ -696,10 +696,10 @@ class FormDisplay
         foreach ($to_save as $work_path => $path) {
             // TrustedProxies requires changes before saving
             if ($path == 'TrustedProxies') {
-                $proxies = array();
+                $proxies = [];
                 $i = 0;
                 foreach ($values[$path] as $value) {
-                    $matches = array();
+                    $matches = [];
                     $match = preg_match(
                         "/^(.+):(?:[ ]?)(\\w+)$/", $value, $matches
                     );
@@ -769,7 +769,7 @@ class FormDisplay
      */
     private function _getOptName($path)
     {
-        return str_replace(array('Servers/1/', '/'), array('Servers/', '_'), $path);
+        return str_replace(['Servers/1/', '/'], ['Servers/', '_'], $path);
     }
 
     /**
@@ -786,7 +786,7 @@ class FormDisplay
         $this->_userprefsKeys = array_flip(UserFormList::getFields());
         // read real config for user preferences display
         $userprefs_disallow = $GLOBALS['PMA_Config']->get('is_setup')
-            ? $this->_configFile->get('UserprefsDisallow', array())
+            ? $this->_configFile->get('UserprefsDisallow', [])
             : $GLOBALS['cfg']['UserprefsDisallow'];
         $this->_userprefsDisallow = array_flip($userprefs_disallow);
     }
@@ -827,10 +827,10 @@ class FormDisplay
             || $system_path == 'BZipDump'
         ) {
             $comment = '';
-            $funcs = array(
-                'ZipDump'  => array('zip_open', 'gzcompress'),
-                'GZipDump' => array('gzopen', 'gzencode'),
-                'BZipDump' => array('bzopen', 'bzcompress'));
+            $funcs = [
+                'ZipDump'  => ['zip_open', 'gzcompress'],
+                'GZipDump' => ['gzopen', 'gzencode'],
+                'BZipDump' => ['bzopen', 'bzcompress']];
             if (!function_exists($funcs[$system_path][0])) {
                 $comment = sprintf(
                     __(
diff --git a/libraries/classes/Config/FormDisplayTemplate.php b/libraries/classes/Config/FormDisplayTemplate.php
index 20068ff2fe..7a648782b7 100644
--- a/libraries/classes/Config/FormDisplayTemplate.php
+++ b/libraries/classes/Config/FormDisplayTemplate.php
@@ -65,21 +65,21 @@ class FormDisplayTemplate
      */
     public static function displayTabsTop(array $tabs)
     {
-        $items = array();
+        $items = [];
         foreach ($tabs as $tab_id => $tab_name) {
-            $items[] = array(
+            $items[] = [
                 'content' => htmlspecialchars($tab_name),
-                'url' => array(
+                'url' => [
                     'href' => '#' . $tab_id,
-                ),
-            );
+                ],
+            ];
         }
 
         $htmlOutput = Template::get('list/unordered')->render(
-            array(
+            [
                 'class' => 'tabs responsivetable',
                 'items' => $items,
-            )
+            ]
         );
         $htmlOutput .= '<br />';
         $htmlOutput .= '<div class="tabs_contents">';
@@ -100,13 +100,13 @@ class FormDisplayTemplate
         $title = '',
         $description = '',
         $errors = null,
-        array $attributes = array()
+        array $attributes = []
     ) {
         global $_FormDisplayGroup;
 
         $_FormDisplayGroup = 0;
 
-        $attributes = array_merge(array('class' => 'optbox'), $attributes);
+        $attributes = array_merge(['class' => 'optbox'], $attributes);
 
         return Template::get('config/form_display/fieldset_top')->render([
             'attributes' => $attributes,
@@ -156,17 +156,17 @@ class FormDisplayTemplate
 
         $is_setup_script = $GLOBALS['PMA_Config']->get('is_setup');
         if ($icons === null) { // if the static variables have not been initialised
-            $icons = array();
+            $icons = [];
             // Icon definitions:
             // The same indexes will be used in the $icons array.
             // The first element contains the filename and the second
             // element is used for the "alt" and "title" attributes.
-            $icon_init = array(
-                'edit'   => array('b_edit', ''),
-                'help'   => array('b_help', __('Documentation')),
-                'reload' => array('s_reload', ''),
-                'tblops' => array('b_tblops', '')
-            );
+            $icon_init = [
+                'edit'   => ['b_edit', ''],
+                'help'   => ['b_help', __('Documentation')],
+                'reload' => ['s_reload', ''],
+                'tblops' => ['b_tblops', '']
+            ];
             if ($is_setup_script) {
                 // When called from the setup script, we don't have access to the
                 // sprite-aware getImage() function because the PMA_theme class
@@ -275,7 +275,7 @@ class FormDisplayTemplate
             $htmlOutput .= '<select class="all85" ' . $name_id . $field_class . '>';
             $escape = !(isset($opts['values_escaped']) && $opts['values_escaped']);
             $values_disabled = isset($opts['values_disabled'])
-                ? array_flip($opts['values_disabled']) : array();
+                ? array_flip($opts['values_disabled']) : [];
             foreach ($opts['values'] as $opt_value_key => $opt_value) {
                 // set names for boolean values
                 if (is_bool($opt_value)) {
@@ -450,7 +450,7 @@ class FormDisplayTemplate
             $validator = (array)$validator;
             $v_name = array_shift($validator);
             $v_name = "PMA_" . $v_name;
-            $v_args = array();
+            $v_args = [];
             foreach ($validator as $arg) {
                 $v_args[] = Sanitize::escapeJsString($arg);
             }
@@ -473,7 +473,7 @@ class FormDisplayTemplate
         }
 
         return Template::get('javascript/display')->render(
-            array('js_array' => $js_array,)
+            ['js_array' => $js_array,]
         );
     }
 
diff --git a/libraries/classes/Config/Forms/BaseForm.php b/libraries/classes/Config/Forms/BaseForm.php
index 4f0e7328af..fdd54c6fcc 100644
--- a/libraries/classes/Config/Forms/BaseForm.php
+++ b/libraries/classes/Config/Forms/BaseForm.php
@@ -56,7 +56,7 @@ abstract class BaseForm extends FormDisplay
      */
     public static function getForms()
     {
-        return array();
+        return [];
     }
 
     /**
diff --git a/libraries/classes/Config/Forms/BaseFormList.php b/libraries/classes/Config/Forms/BaseFormList.php
index 3bf6c0c6eb..e8244f452e 100644
--- a/libraries/classes/Config/Forms/BaseFormList.php
+++ b/libraries/classes/Config/Forms/BaseFormList.php
@@ -20,7 +20,7 @@ class BaseFormList
     /**
      * List of all forms
      */
-    protected static $all = array();
+    protected static $all = [];
 
     /**
      * @var string
@@ -68,7 +68,7 @@ class BaseFormList
      */
     public function __construct(ConfigFile $cf)
     {
-        $this->_forms = array();
+        $this->_forms = [];
         foreach (static::$all as $form) {
             $class = static::get($form);
             $this->_forms[] = new $class($cf);
diff --git a/libraries/classes/Config/Forms/Page/PageFormList.php b/libraries/classes/Config/Forms/Page/PageFormList.php
index d27da7832a..f4cae3dcae 100644
--- a/libraries/classes/Config/Forms/Page/PageFormList.php
+++ b/libraries/classes/Config/Forms/Page/PageFormList.php
@@ -20,7 +20,7 @@ class PageFormList extends BaseFormList
     /**
      * @var array
      */
-    protected static $all = array(
+    protected static $all = [
         'Browse',
         'DbStructure',
         'Edit',
@@ -29,7 +29,7 @@ class PageFormList extends BaseFormList
         'Navi',
         'Sql',
         'TableStructure',
-    );
+    ];
     /**
      * @var string
      */
diff --git a/libraries/classes/Config/Forms/Setup/ConfigForm.php b/libraries/classes/Config/Forms/Setup/ConfigForm.php
index 9cd4ab82ef..f5c14647d3 100644
--- a/libraries/classes/Config/Forms/Setup/ConfigForm.php
+++ b/libraries/classes/Config/Forms/Setup/ConfigForm.php
@@ -22,11 +22,11 @@ class ConfigForm extends BaseForm
      */
     public static function getForms()
     {
-        return array(
-            'Config' => array(
+        return [
+            'Config' => [
                 'DefaultLang',
                 'ServerDefault'
-            ),
-        );
+            ],
+        ];
     }
 }
diff --git a/libraries/classes/Config/Forms/Setup/FeaturesForm.php b/libraries/classes/Config/Forms/Setup/FeaturesForm.php
index 840273c0f0..b44422c189 100644
--- a/libraries/classes/Config/Forms/Setup/FeaturesForm.php
+++ b/libraries/classes/Config/Forms/Setup/FeaturesForm.php
@@ -27,7 +27,7 @@ class FeaturesForm extends \PhpMyAdmin\Config\Forms\User\FeaturesForm
             ['Servers/1/only_db', 'Servers/1/hide_db']
         );
         /* Following are not available to user */
-        $result['Import_export'] = array(
+        $result['Import_export'] = [
             'UploadDir',
             'SaveDir',
             'RecodingEngine' => ':group',
@@ -37,8 +37,8 @@ class FeaturesForm extends \PhpMyAdmin\Config\Forms\User\FeaturesForm
             'GZipDump',
             'BZipDump',
             'CompressOnFly'
-        );
-        $result['Security'] = array(
+        ];
+        $result['Security'] = [
             'blowfish_secret',
             'CheckConfigurationPermissions',
             'TrustedProxies',
@@ -50,12 +50,12 @@ class FeaturesForm extends \PhpMyAdmin\Config\Forms\User\FeaturesForm
             'LoginCookieDeleteAll',
             'CaptchaLoginPublicKey',
             'CaptchaLoginPrivateKey'
-        );
-        $result['Developer'] = array(
+        ];
+        $result['Developer'] = [
             'UserprefsDeveloperTab',
             'DBG/sql',
-        );
-        $result['Other_core_settings'] = array(
+        ];
+        $result['Other_core_settings'] = [
             'OBGzip',
             'PersistentConnections',
             'ExecTimeLimit',
@@ -66,7 +66,7 @@ class FeaturesForm extends \PhpMyAdmin\Config\Forms\User\FeaturesForm
             'ProxyPass',
             'AllowThirdPartyFraming',
             'ZeroConf',
-        );
+        ];
         return $result;
     }
 }
diff --git a/libraries/classes/Config/Forms/Setup/ServersForm.php b/libraries/classes/Config/Forms/Setup/ServersForm.php
index 53d1bce5d0..5c3d8edb20 100644
--- a/libraries/classes/Config/Forms/Setup/ServersForm.php
+++ b/libraries/classes/Config/Forms/Setup/ServersForm.php
@@ -22,15 +22,15 @@ class ServersForm extends BaseForm
      */
     public static function getForms()
     {
-        return array(
-            'Server' => array('Servers' => array(1 => array(
+        return [
+            'Server' => ['Servers' => [1 => [
                 'verbose',
                 'host',
                 'port',
                 'socket',
                 'ssl',
-                'compress'))),
-            'Server_auth' => array('Servers' => array(1 => array(
+                'compress']]],
+            'Server_auth' => ['Servers' => [1 => [
                 'auth_type',
                 ':group:' . __('Config authentication'),
                     'user',
@@ -42,8 +42,8 @@ class ServersForm extends BaseForm
                 ':group:' . __('Signon authentication'),
                     'SignonSession',
                     'SignonURL',
-                    'LogoutURL'))),
-            'Server_config' => array('Servers' => array(1 => array(
+                    'LogoutURL']]],
+            'Server_config' => ['Servers' => [1 => [
                 'only_db',
                 'hide_db',
                 'AllowRoot',
@@ -51,8 +51,8 @@ class ServersForm extends BaseForm
                 'DisableIS',
                 'AllowDeny/order',
                 'AllowDeny/rules',
-                'SessionTimeZone'))),
-            'Server_pmadb' => array('Servers' => array(1 => array(
+                'SessionTimeZone']]],
+            'Server_pmadb' => ['Servers' => [1 => [
                 'pmadb' => 'phpmyadmin',
                 'controlhost',
                 'controlport',
@@ -77,14 +77,14 @@ class ServersForm extends BaseForm
                 'central_columns' => 'pma__central_columns',
                 'designer_settings' => 'pma__designer_settings',
                 'export_templates' => 'pma__export_templates',
-                'MaxTableUiprefs' => 100))),
-            'Server_tracking' => array('Servers' => array(1 => array(
+                'MaxTableUiprefs' => 100]]],
+            'Server_tracking' => ['Servers' => [1 => [
                 'tracking_version_auto_create',
                 'tracking_default_statements',
                 'tracking_add_drop_view',
                 'tracking_add_drop_table',
                 'tracking_add_drop_database',
-            ))),
-        );
+            ]]],
+        ];
     }
 }
diff --git a/libraries/classes/Config/Forms/Setup/SetupFormList.php b/libraries/classes/Config/Forms/Setup/SetupFormList.php
index 54f246dd91..91edb27973 100644
--- a/libraries/classes/Config/Forms/Setup/SetupFormList.php
+++ b/libraries/classes/Config/Forms/Setup/SetupFormList.php
@@ -20,7 +20,7 @@ class SetupFormList extends BaseFormList
     /**
      * @var array
      */
-    protected static $all = array(
+    protected static $all = [
         'Config',
         'Export',
         'Features',
@@ -29,7 +29,7 @@ class SetupFormList extends BaseFormList
         'Navi',
         'Servers',
         'Sql',
-    );
+    ];
     /**
      * @var string
      */
diff --git a/libraries/classes/Config/Forms/User/ExportForm.php b/libraries/classes/Config/Forms/User/ExportForm.php
index 275d3c95d9..a9948a2812 100644
--- a/libraries/classes/Config/Forms/User/ExportForm.php
+++ b/libraries/classes/Config/Forms/User/ExportForm.php
@@ -22,8 +22,8 @@ class ExportForm extends BaseForm
      */
     public static function getForms()
     {
-        return array(
-            'Export_defaults' => array(
+        return [
+            'Export_defaults' => [
                 'Export/method',
                 ':group:' . __('Quick'),
                     'Export/quick_export_onserver',
@@ -42,8 +42,8 @@ class ExportForm extends BaseForm
                     'Export/file_template_table',
                     'Export/file_template_database',
                     'Export/file_template_server'
-            ),
-            'Sql' => array(
+            ],
+            'Sql' => [
                 'Export/sql_include_comments' => ':group',
                     'Export/sql_dates',
                     'Export/sql_relation',
@@ -76,11 +76,11 @@ class ExportForm extends BaseForm
                     'Export/sql_max_query_size',
                     'Export/sql_hex_for_binary',
                     'Export/sql_utc_time'
-            ),
-            'CodeGen' => array(
+            ],
+            'CodeGen' => [
                 'Export/codegen_format'
-            ),
-            'Csv' => array(
+            ],
+            'Csv' => [
                 ':group:' . __('CSV'),
                     'Export/csv_separator',
                     'Export/csv_enclosed',
@@ -95,8 +95,8 @@ class ExportForm extends BaseForm
                     'Export/excel_removeCRLF',
                     'Export/excel_columns',
                     'Export/excel_edition'
-                ),
-            'Latex' => array(
+                ],
+            'Latex' => [
                 'Export/latex_caption',
                 'Export/latex_structure_or_data',
                 ':group:' . __('Structure'),
@@ -113,13 +113,13 @@ class ExportForm extends BaseForm
                     'Export/latex_data_continued_caption',
                     'Export/latex_data_label',
                     'Export/latex_null'
-            ),
-            'Microsoft_Office' => array(
+            ],
+            'Microsoft_Office' => [
                 ':group:' . __('Microsoft Word 2000'),
                     'Export/htmlword_structure_or_data',
                     'Export/htmlword_null',
-                    'Export/htmlword_columns'),
-            'Open_Document' => array(
+                    'Export/htmlword_columns'],
+            'Open_Document' => [
                 ':group:' . __('OpenDocument Spreadsheet'),
                     'Export/ods_columns',
                     'Export/ods_null',
@@ -134,14 +134,14 @@ class ExportForm extends BaseForm
                     ':group:' . __('Data'),
                         'Export/odt_columns',
                         'Export/odt_null'
-            ),
-            'Texy' => array(
+            ],
+            'Texy' => [
                 'Export/texytext_structure_or_data',
                 ':group:' . __('Data'),
                     'Export/texytext_null',
                     'Export/texytext_columns'
-            ),
-        );
+            ],
+        ];
     }
 
     /**
diff --git a/libraries/classes/Config/Forms/User/FeaturesForm.php b/libraries/classes/Config/Forms/User/FeaturesForm.php
index f3d252a50d..a7a671aad6 100644
--- a/libraries/classes/Config/Forms/User/FeaturesForm.php
+++ b/libraries/classes/Config/Forms/User/FeaturesForm.php
@@ -22,8 +22,8 @@ class FeaturesForm extends BaseForm
      */
     public static function getForms()
     {
-        $result = array(
-            'General' => array(
+        $result = [
+            'General' => [
                 'VersionCheck',
                 'NaturalOrder',
                 'InitialSlidersState',
@@ -33,15 +33,15 @@ class FeaturesForm extends BaseForm
                 'SendErrorReports',
                 'ConsoleEnterExecutes',
                 'DisableShortcutKeys',
-            ),
-            'Databases' => array(
+            ],
+            'Databases' => [
                 'Servers/1/only_db', // saves to Server/only_db
                 'Servers/1/hide_db', // saves to Server/hide_db
                 'MaxDbList',
                 'MaxTableList',
                 'DefaultConnectionCollation',
-            ),
-            'Text_fields' => array(
+            ],
+            'Text_fields' => [
                 'CharEditing',
                 'MinSizeForInputField',
                 'MaxSizeForInputField',
@@ -50,20 +50,20 @@ class FeaturesForm extends BaseForm
                 'TextareaCols',
                 'TextareaRows',
                 'LongtextDoubleTextarea'
-            ),
-            'Page_titles' => array(
+            ],
+            'Page_titles' => [
                 'TitleDefault',
                 'TitleTable',
                 'TitleDatabase',
                 'TitleServer'
-            ),
-            'Warnings' => array(
+            ],
+            'Warnings' => [
                 'PmaNoRelation_DisableWarning',
                 'SuhosinDisableWarning',
                 'LoginCookieValidityDisableWarning',
                 'ReservedWordDisableWarning'
-            ),
-            'Console' => array(
+            ],
+            'Console' => [
                 'Console/Mode',
                 'Console/StartHistory',
                 'Console/AlwaysExpand',
@@ -74,13 +74,13 @@ class FeaturesForm extends BaseForm
                 'Console/GroupQueries',
                 'Console/OrderBy',
                 'Console/Order',
-            ),
-        );
+            ],
+        ];
         // skip Developer form if no setting is available
         if ($GLOBALS['cfg']['UserprefsDeveloperTab']) {
-            $result['Developer'] = array(
+            $result['Developer'] = [
                 'DBG/sql'
-            );
+            ];
         }
         return $result;
     }
diff --git a/libraries/classes/Config/Forms/User/ImportForm.php b/libraries/classes/Config/Forms/User/ImportForm.php
index 489e0f5ce3..065889604e 100644
--- a/libraries/classes/Config/Forms/User/ImportForm.php
+++ b/libraries/classes/Config/Forms/User/ImportForm.php
@@ -22,19 +22,19 @@ class ImportForm extends BaseForm
      */
     public static function getForms()
     {
-        return array(
-            'Import_defaults' => array(
+        return [
+            'Import_defaults' => [
                 'Import/format',
                 'Import/charset',
                 'Import/allow_interrupt',
                 'Import/skip_queries'
-            ),
-            'Sql' => array(
+            ],
+            'Sql' => [
                 'Import/sql_compatibility',
                 'Import/sql_no_auto_value_on_zero',
                 'Import/sql_read_as_multibytes'
-            ),
-            'Csv' => array(
+            ],
+            'Csv' => [
                 ':group:' . __('CSV'),
                     'Import/csv_replace',
                     'Import/csv_ignore',
@@ -50,16 +50,16 @@ class ImportForm extends BaseForm
                     'Import/ldi_enclosed',
                     'Import/ldi_escaped',
                     'Import/ldi_local_option'
-            ),
-            'Open_Document' => array(
+            ],
+            'Open_Document' => [
                 ':group:' . __('OpenDocument Spreadsheet'),
                     'Import/ods_col_names',
                     'Import/ods_empty_rows',
                     'Import/ods_recognize_percentages',
                     'Import/ods_recognize_currency'
-            ),
+            ],
 
-        );
+        ];
     }
 
     /**
diff --git a/libraries/classes/Config/Forms/User/MainForm.php b/libraries/classes/Config/Forms/User/MainForm.php
index 3ea8c090f7..de6f3949d3 100644
--- a/libraries/classes/Config/Forms/User/MainForm.php
+++ b/libraries/classes/Config/Forms/User/MainForm.php
@@ -22,20 +22,20 @@ class MainForm extends BaseForm
      */
     public static function getForms()
     {
-        return array(
-            'Startup' => array(
+        return [
+            'Startup' => [
                 'ShowCreateDb',
                 'ShowStats',
                 'ShowServerInfo'
-            ),
-            'DbStructure' => array(
+            ],
+            'DbStructure' => [
                 'ShowDbStructureCharset',
                 'ShowDbStructureComment',
                 'ShowDbStructureCreation',
                 'ShowDbStructureLastUpdate',
                 'ShowDbStructureLastCheck'
-            ),
-            'TableStructure' => array(
+            ],
+            'TableStructure' => [
                 'HideStructureActions',
                 'ShowColumnComments',
                 ':group:' . __('Default transformations'),
@@ -49,8 +49,8 @@ class MainForm extends BaseForm
                 'DefaultTransformations/TextImageLink',
                 'DefaultTransformations/TextLink',
                 ':group:end'
-            ),
-            'Browse' => array(
+            ],
+            'Browse' => [
                 'TableNavigationLinksMode',
                 'ActionLinksMode',
                 'ShowAll',
@@ -67,25 +67,25 @@ class MainForm extends BaseForm
                 'TablePrimaryKeyOrder',
                 'RememberSorting',
                 'RelationalDisplay'
-            ),
-            'Edit' => array(
+            ],
+            'Edit' => [
                 'ProtectBinary',
                 'ShowFunctionFields',
                 'ShowFieldTypesInDataEditView',
                 'InsertRows',
                 'ForeignKeyDropdownOrder',
                 'ForeignKeyMaxLimit'
-            ),
-            'Tabs' => array(
+            ],
+            'Tabs' => [
                 'TabsMode',
                 'DefaultTabServer',
                 'DefaultTabDatabase',
                 'DefaultTabTable'
-            ),
-            'DisplayRelationalSchema' => array(
+            ],
+            'DisplayRelationalSchema' => [
                 'PDFDefaultPageSize'
-            ),
-        );
+            ],
+        ];
     }
 
     /**
diff --git a/libraries/classes/Config/Forms/User/NaviForm.php b/libraries/classes/Config/Forms/User/NaviForm.php
index 602f9fd452..b282272331 100644
--- a/libraries/classes/Config/Forms/User/NaviForm.php
+++ b/libraries/classes/Config/Forms/User/NaviForm.php
@@ -22,8 +22,8 @@ class NaviForm extends BaseForm
      */
     public static function getForms()
     {
-        return array(
-            'Navi_panel' => array(
+        return [
+            'Navi_panel' => [
                 'ShowDatabasesNavigationAsTree',
                 'NavigationLinkWithMainPanel',
                 'NavigationDisplayLogo',
@@ -35,8 +35,8 @@ class NaviForm extends BaseForm
                 'NumRecentTables',
                 'NumFavoriteTables',
                 'NavigationWidth',
-            ),
-            'Navi_tree' => array(
+            ],
+            'Navi_tree' => [
                 'MaxNavigationItems',
                 'NavigationTreeEnableGrouping',
                 'NavigationTreeEnableExpansion',
@@ -45,22 +45,22 @@ class NaviForm extends BaseForm
                 'NavigationTreeShowFunctions',
                 'NavigationTreeShowProcedures',
                 'NavigationTreeShowEvents'
-            ),
-            'Navi_servers' => array(
+            ],
+            'Navi_servers' => [
                 'NavigationDisplayServers',
                 'DisplayServersList',
-            ),
-            'Navi_databases' => array(
+            ],
+            'Navi_databases' => [
                 'NavigationTreeDisplayDbFilterMinimum',
                 'NavigationTreeDbSeparator'
-            ),
-            'Navi_tables' => array(
+            ],
+            'Navi_tables' => [
                 'NavigationTreeDefaultTabTable',
                 'NavigationTreeDefaultTabTable2',
                 'NavigationTreeTableSeparator',
                 'NavigationTreeTableLevel',
-            ),
-        );
+            ],
+        ];
     }
 
     /**
diff --git a/libraries/classes/Config/Forms/User/SqlForm.php b/libraries/classes/Config/Forms/User/SqlForm.php
index 072c15212a..3d8ac7a930 100644
--- a/libraries/classes/Config/Forms/User/SqlForm.php
+++ b/libraries/classes/Config/Forms/User/SqlForm.php
@@ -22,8 +22,8 @@ class SqlForm extends BaseForm
      */
     public static function getForms()
     {
-        return array(
-            'Sql_queries' => array(
+        return [
+            'Sql_queries' => [
                 'ShowSQL',
                 'Confirm',
                 'QueryHistoryMax',
@@ -34,14 +34,14 @@ class SqlForm extends BaseForm
                 'LintEnable',
                 'EnableAutocompleteForTablesAndColumns',
                 'DefaultForeignKeyChecks',
-            ),
-            'Sql_box' => array(
+            ],
+            'Sql_box' => [
                 'SQLQuery/Edit',
                 'SQLQuery/Explain',
                 'SQLQuery/ShowAsPHP',
                 'SQLQuery/Refresh',
-            ),
-        );
+            ],
+        ];
     }
 
     /**
diff --git a/libraries/classes/Config/Forms/User/UserFormList.php b/libraries/classes/Config/Forms/User/UserFormList.php
index 8ed14f4c3d..c054d3e103 100644
--- a/libraries/classes/Config/Forms/User/UserFormList.php
+++ b/libraries/classes/Config/Forms/User/UserFormList.php
@@ -20,14 +20,14 @@ class UserFormList extends BaseFormList
     /**
      * @var array
      */
-    protected static $all = array(
+    protected static $all = [
         'Features',
         'Sql',
         'Navi',
         'Main',
         'Import',
         'Export',
-    );
+    ];
     /**
      * @var string
      */
diff --git a/libraries/classes/Config/PageSettings.php b/libraries/classes/Config/PageSettings.php
index d6afe690d4..820c0a35b2 100644
--- a/libraries/classes/Config/PageSettings.php
+++ b/libraries/classes/Config/PageSettings.php
@@ -172,9 +172,9 @@ class PageSettings
             true,
             false,
             $response->getFooter()->getSelfUrl(),
-            array(
+            [
                 'submit_save' => $this->_groupName
-            )
+            ]
         );
         $retval .= '</div>';
         $retval .= '</div>';
diff --git a/libraries/classes/Config/ServerConfigChecks.php b/libraries/classes/Config/ServerConfigChecks.php
index 159ba87441..b20bc3c038 100644
--- a/libraries/classes/Config/ServerConfigChecks.php
+++ b/libraries/classes/Config/ServerConfigChecks.php
@@ -77,11 +77,11 @@ class ServerConfigChecks
                     . 'reliable if your IP belongs to an ISP where thousands of users, '
                     . 'including you, are connected to.'
                 ),
-                '[a@' . Url::getCommon(array('page' => 'form', 'formset' => 'Features')) . '#tab_Security]',
+                '[a@' . Url::getCommon(['page' => 'form', 'formset' => 'Features']) . '#tab_Security]',
                 '[/a]',
-                '[a@' . Url::getCommon(array('page' => 'form', 'formset' => 'Features')) . '#tab_Security]',
+                '[a@' . Url::getCommon(['page' => 'form', 'formset' => 'Features']) . '#tab_Security]',
                 '[/a]',
-                '[a@' . Url::getCommon(array('page' => 'form', 'formset' => 'Features')) . '#tab_Security]',
+                '[a@' . Url::getCommon(['page' => 'form', 'formset' => 'Features']) . '#tab_Security]',
                 '[/a]'
             );
             SetupIndex::messagesSet(
@@ -180,9 +180,9 @@ class ServerConfigChecks
                     . 'However, IP-based protection may not be reliable if your IP belongs '
                     . 'to an ISP where thousands of users, including you, are connected to.'
                 ),
-                '[a@' . Url::getCommon(array('page' => 'servers', 'mode' => 'edit', 'id' => $i)) . '#tab_Server_config]',
+                '[a@' . Url::getCommon(['page' => 'servers', 'mode' => 'edit', 'id' => $i]) . '#tab_Server_config]',
                 '[/a]',
-                '[a@' . Url::getCommon(array('page' => 'form', 'formset' => 'Features')) . '#tab_Security]',
+                '[a@' . Url::getCommon(['page' => 'form', 'formset' => 'Features']) . '#tab_Security]',
                 '[/a]'
             ));
 
@@ -208,7 +208,7 @@ class ServerConfigChecks
                             . 'URL can directly access your phpMyAdmin panel. Set %1$sauthentication '
                             . 'type%2$s to [kbd]cookie[/kbd] or [kbd]http[/kbd].'
                         ),
-                        '[a@' . Url::getCommon(array('page' => 'servers', 'mode' => 'edit', 'id' => $i)) . '#tab_Server]',
+                        '[a@' . Url::getCommon(['page' => 'servers', 'mode' => 'edit', 'id' => $i]) . '#tab_Server]',
                         '[/a]'
                     ))
                     . ' ' . $sSecurityInfoMsg
@@ -234,7 +234,7 @@ class ServerConfigChecks
                 );
             }
         }
-        return array($cookieAuthUsed, $blowfishSecret, $blowfishSecretSet);
+        return [$cookieAuthUsed, $blowfishSecret, $blowfishSecretSet];
     }
 
     /**
@@ -253,7 +253,7 @@ class ServerConfigChecks
             $blowfishSecretSet = true;
             $this->cfg->set('blowfish_secret', Util::generateRandom(32));
         }
-        return array($blowfishSecret, $blowfishSecretSet);
+        return [$blowfishSecret, $blowfishSecretSet];
     }
 
     /**
@@ -305,7 +305,7 @@ class ServerConfigChecks
                         '%sZip decompression%s requires functions (%s) which are unavailable '
                         . 'on this system.'
                     ),
-                    '[a@' . Url::getCommon(array('page' => 'form', 'formset' => 'Features')) . '#tab_Import_export]',
+                    '[a@' . Url::getCommon(['page' => 'form', 'formset' => 'Features']) . '#tab_Import_export]',
                     '[/a]',
                     'zip_open'
                 ))
@@ -326,7 +326,7 @@ class ServerConfigChecks
                         '%sZip compression%s requires functions (%s) which are unavailable on '
                         . 'this system.'
                     ),
-                    '[a@' . Url::getCommon(array('page' => 'form', 'formset' => 'Features')) . '#tab_Import_export]',
+                    '[a@' . Url::getCommon(['page' => 'form', 'formset' => 'Features']) . '#tab_Import_export]',
                     '[/a]',
                     'gzcompress'
                 ))
@@ -366,7 +366,7 @@ class ServerConfigChecks
                     ))
                 );
             } else {
-                $blowfishWarnings = array();
+                $blowfishWarnings = [];
                 // check length
                 if (strlen($blowfishSecret) < 32) {
                     // too short key
@@ -421,7 +421,7 @@ class ServerConfigChecks
                         . 'cause random session invalidation (currently session.gc_maxlifetime '
                         . 'is %5$d).'
                     ),
-                    '[a@' . Url::getCommon(array('page' => 'form', 'formset' => 'Features')) . '#tab_Security]',
+                    '[a@' . Url::getCommon(['page' => 'form', 'formset' => 'Features']) . '#tab_Security]',
                     '[/a]',
                     '[a@' . Core::getPHPDocLink('session.configuration.php#ini.session.gc-maxlifetime') . ']',
                     '[/a]',
@@ -445,7 +445,7 @@ class ServerConfigChecks
                         . 'at most. Values larger than 1800 may pose a security risk such as '
                         . 'impersonation.'
                     ),
-                    '[a@' . Url::getCommon(array('page' => 'form', 'formset' => 'Features')) . '#tab_Security]',
+                    '[a@' . Url::getCommon(['page' => 'form', 'formset' => 'Features']) . '#tab_Security]',
                     '[/a]'
                 ))
             );
@@ -469,9 +469,9 @@ class ServerConfigChecks
                         . 'is not 0, %sLogin cookie validity%s must be set to a value less or '
                         . 'equal to it.'
                     ),
-                    '[a@' . Url::getCommon(array('page' => 'form', 'formset' => 'Features')) . '#tab_Security]',
+                    '[a@' . Url::getCommon(['page' => 'form', 'formset' => 'Features']) . '#tab_Security]',
                     '[/a]',
-                    '[a@' . Url::getCommon(array('page' => 'form', 'formset' => 'Features')) . '#tab_Security]',
+                    '[a@' . Url::getCommon(['page' => 'form', 'formset' => 'Features']) . '#tab_Security]',
                     '[/a]'
                 ))
             );
@@ -508,7 +508,7 @@ class ServerConfigChecks
                             '%1$sBzip2 compression and decompression%2$s requires functions (%3$s) which '
                             . 'are unavailable on this system.'
                         ),
-                        '[a@' . Url::getCommon(array('page' => 'form', 'formset' => 'Features')) . '#tab_Import_export]',
+                        '[a@' . Url::getCommon(['page' => 'form', 'formset' => 'Features']) . '#tab_Import_export]',
                         '[/a]',
                         $functions
                     )
@@ -540,7 +540,7 @@ class ServerConfigChecks
                         '%1$sGZip compression and decompression%2$s requires functions (%3$s) which '
                         . 'are unavailable on this system.'
                     ),
-                    '[a@' . Url::getCommon(array('page' => 'form', 'formset' => 'Features')) . '#tab_Import_export]',
+                    '[a@' . Url::getCommon(['page' => 'form', 'formset' => 'Features']) . '#tab_Import_export]',
                     '[/a]',
                     'gzencode'
                 ))
diff --git a/libraries/classes/Config/Validator.php b/libraries/classes/Config/Validator.php
index 450d12ac2b..9fc696df7a 100644
--- a/libraries/classes/Config/Validator.php
+++ b/libraries/classes/Config/Validator.php
@@ -45,7 +45,7 @@ class Validator
             return $validators;
         }
 
-        $validators = $cf->getDbEntry('_validators', array());
+        $validators = $cf->getDbEntry('_validators', []);
         if ($GLOBALS['PMA_Config']->get('is_setup')) {
             return $validators;
         }
@@ -54,7 +54,7 @@ class Validator
         // preferences we need original config values not overwritten
         // by user preferences, creating a new PhpMyAdmin\Config instance is a
         // better idea than hacking into its code
-        $uvs = $cf->getDbEntry('_userValidators', array());
+        $uvs = $cf->getDbEntry('_userValidators', []);
         foreach ($uvs as $field => $uv_list) {
             $uv_list = (array)$uv_list;
             foreach ($uv_list as &$uv) {
@@ -100,7 +100,7 @@ class Validator
         // find validators
         $validator_id = (array) $validator_id;
         $validators = static::getValidators($cf);
-        $vids = array();
+        $vids = [];
         foreach ($validator_id as &$vid) {
             $vid = $cf->getCanonicalPath($vid);
             if (isset($validators[$vid])) {
@@ -112,8 +112,8 @@ class Validator
         }
 
         // create argument list with canonical paths and remember path mapping
-        $arguments = array();
-        $key_map = array();
+        $arguments = [];
+        $key_map = [];
         foreach ($values as $k => $v) {
             $k2 = $isPostSource ? str_replace('-', '/', $k) : $k;
             $k2 = mb_strpos($k2, '/')
@@ -124,14 +124,14 @@ class Validator
         }
 
         // validate
-        $result = array();
+        $result = [];
         foreach ($vids as $vid) {
             // call appropriate validation functions
             foreach ((array)$validators[$vid] as $validator) {
                 $vdef = (array) $validator;
                 $vname = array_shift($vdef);
                 $vname = 'PhpMyAdmin\Config\Validator::' . $vname;
-                $args = array_merge(array($vid, &$arguments), $vdef);
+                $args = array_merge([$vid, &$arguments], $vdef);
                 $r = call_user_func_array($vname, $args);
 
                 // merge results
@@ -145,7 +145,7 @@ class Validator
                         continue;
                     }
                     if (! isset($result[$key])) {
-                        $result[$key] = array();
+                        $result[$key] = [];
                     }
                     $result[$key] = array_merge(
                         $result[$key], (array)$error_list
@@ -155,7 +155,7 @@ class Validator
         }
 
         // restore original paths
-        $new_result = array();
+        $new_result = [];
         foreach ($result as $k => $v) {
             $k2 = isset($key_map[$k]) ? $key_map[$k] : $k;
             $new_result[$k2] = $v;
@@ -224,7 +224,7 @@ class Validator
         if (! is_null($error)) {
             $error .= ' - ' . error_get_last();
         }
-        return is_null($error) ? true : array($error_key => $error);
+        return is_null($error) ? true : [$error_key => $error];
     }
 
     /**
@@ -239,12 +239,12 @@ class Validator
      */
     public static function validateServer($path, array $values)
     {
-        $result = array(
+        $result = [
             'Server' => '',
             'Servers/1/user' => '',
             'Servers/1/SignonSession' => '',
             'Servers/1/SignonURL' => ''
-        );
+        ];
         $error = false;
         if (empty($values['Servers/1/auth_type'])) {
             $values['Servers/1/auth_type'] = '';
@@ -311,18 +311,18 @@ class Validator
      */
     public static function validatePMAStorage($path, array $values)
     {
-        $result = array(
+        $result = [
             'Server_pmadb' => '',
             'Servers/1/controluser' => '',
             'Servers/1/controlpass' => ''
-        );
+        ];
         $error = false;
 
         if (empty($values['Servers/1/pmadb'])) {
             return $result;
         }
 
-        $result = array();
+        $result = [];
         if (empty($values['Servers/1/controluser'])) {
             $result['Servers/1/controluser'] = __(
                 'Empty phpMyAdmin control user while using phpMyAdmin configuration '
@@ -364,7 +364,7 @@ class Validator
      */
     public static function validateRegex($path, array $values)
     {
-        $result = array($path => '');
+        $result = [$path => ''];
 
         if (empty($values[$path])) {
             return $result;
@@ -381,7 +381,7 @@ class Validator
             $last_error = error_get_last();
         }
 
-        $matches = array();
+        $matches = [];
         // in libraries/ListDatabase.php _checkHideDatabase(),
         // a '/' is used as the delimiter for hide_db
         @preg_match('/' . Util::requestString($values[$path]) . '/', '', $matches);
@@ -390,7 +390,7 @@ class Validator
 
         if ($current_error !== $last_error) {
             $error = preg_replace('/^preg_match\(\): /', '', $current_error['message']);
-            return array($path => $error);
+            return [$path => $error];
         }
 
         return $result;
@@ -406,7 +406,7 @@ class Validator
      */
     public static function validateTrustedProxies($path, array $values)
     {
-        $result = array($path => array());
+        $result = [$path => []];
 
         if (empty($values[$path])) {
             return $result;
@@ -414,7 +414,7 @@ class Validator
 
         if (is_array($values[$path]) || is_object($values[$path])) {
             // value already processed by FormDisplay::save
-            $lines = array();
+            $lines = [];
             foreach ($values[$path] as $ip => $v) {
                 $v = Util::requestString($v);
                 $lines[] = preg_match('/^-\d+$/', $ip)
@@ -427,7 +427,7 @@ class Validator
         }
         foreach ($lines as $line) {
             $line = trim($line);
-            $matches = array();
+            $matches = [];
             // we catch anything that may (or may not) be an IP
             if (!preg_match("/^(.+):(?:[ ]?)\\w+$/", $line, $matches)) {
                 $result[$path][] = __('Incorrect value:') . ' '
@@ -494,7 +494,7 @@ class Validator
      */
     public static function validatePortNumber($path, array $values)
     {
-        return array(
+        return [
             $path => static::validateNumber(
                 $path,
                 $values,
@@ -503,7 +503,7 @@ class Validator
                 65535,
                 __('Not a valid port number!')
             )
-        );
+        ];
     }
 
     /**
@@ -516,7 +516,7 @@ class Validator
      */
     public static function validatePositiveNumber($path, array $values)
     {
-        return array(
+        return [
             $path => static::validateNumber(
                 $path,
                 $values,
@@ -525,7 +525,7 @@ class Validator
                 PHP_INT_MAX,
                 __('Not a positive number!')
             )
-        );
+        ];
     }
 
     /**
@@ -538,7 +538,7 @@ class Validator
      */
     public static function validateNonNegativeNumber($path, array $values)
     {
-        return array(
+        return [
             $path => static::validateNumber(
                 $path,
                 $values,
@@ -547,7 +547,7 @@ class Validator
                 PHP_INT_MAX,
                 __('Not a non-negative number!')
             )
-        );
+        ];
     }
 
     /**
@@ -566,7 +566,7 @@ class Validator
             return '';
         }
         $result = preg_match($regex, Util::requestString($values[$path]));
-        return array($path => ($result ? '' : __('Incorrect value!')));
+        return [$path => ($result ? '' : __('Incorrect value!'))];
     }
 
     /**
@@ -581,7 +581,7 @@ class Validator
     public static function validateUpperBound($path, array $values, $max_value)
     {
         $result = $values[$path] <= $max_value;
-        return array($path => ($result ? ''
-            : sprintf(__('Value must be equal or lower than %s!'), $max_value)));
+        return [$path => ($result ? ''
+            : sprintf(__('Value must be equal or lower than %s!'), $max_value))];
     }
 }
diff --git a/libraries/classes/Console.php b/libraries/classes/Console.php
index 40756b7ffd..5c93bd99ab 100644
--- a/libraries/classes/Console.php
+++ b/libraries/classes/Console.php
@@ -104,10 +104,10 @@ class Console
             unset($count_bookmarks, $private_message, $shared_message);
             return Template::get('console/bookmark_content')
                 ->render(
-                    array(
+                    [
                         'welcome_message'    => $welcomeMessage,
                         'bookmarks'         => $bookmarks,
-                    )
+                    ]
                 );
         }
         return '';
@@ -120,7 +120,7 @@ class Console
      */
     public function getScripts(): array
     {
-        return array('console.js');
+        return ['console.js'];
     }
 
     /**
diff --git a/libraries/classes/Controllers/Database/DatabaseStructureController.php b/libraries/classes/Controllers/Database/DatabaseStructureController.php
index 6a96fe8b61..b80e166976 100644
--- a/libraries/classes/Controllers/Database/DatabaseStructureController.php
+++ b/libraries/classes/Controllers/Database/DatabaseStructureController.php
@@ -143,10 +143,10 @@ class DatabaseStructureController extends DatabaseController
         }
 
         $this->response->getHeader()->getScripts()->addFiles(
-            array(
+            [
                 'db_structure.js',
                 'tbl_change.js',
-            )
+            ]
         );
 
         // Gets the database structure
@@ -156,11 +156,11 @@ class DatabaseStructureController extends DatabaseController
         // If there are no tables, the user is redirected to the last page
         // having any.
         if ($this->_total_num_tables > 0 && $this->_pos > $this->_total_num_tables) {
-            $uri = './db_structure.php' . Url::getCommonRaw(array(
+            $uri = './db_structure.php' . Url::getCommonRaw([
                 'db' => $this->db,
                 'pos' => max(0, $this->_total_num_tables - $GLOBALS['cfg']['MaxTableList']),
                 'reload' => 1
-            ));
+            ]);
             Core::sendHeaderLocation($uri);
         }
 
@@ -185,9 +185,9 @@ class DatabaseStructureController extends DatabaseController
          * Displays the tables list
          */
         $this->response->addHTML('<div id="tableslistcontainer">');
-        $_url_params = array(
+        $_url_params = [
             'pos' => $this->_pos,
-            'db'  => $this->db);
+            'db'  => $this->db];
 
         // Add the sort options if they exists
         if (isset($_REQUEST['sort'])) {
@@ -225,12 +225,12 @@ class DatabaseStructureController extends DatabaseController
         /* Printable view of a table */
         $this->response->addHTML(
             Template::get('database/structure/print_view_data_dictionary_link')
-                ->render(array('url_query' => Url::getCommon(
-                    array(
+                ->render(['url_query' => Url::getCommon(
+                    [
                         'db' => $this->db,
                         'goto' => 'db_structure.php',
-                    )
-                )))
+                    ]
+                )])
         );
 
         if (empty($this->_db_is_system_schema)) {
@@ -249,7 +249,7 @@ class DatabaseStructureController extends DatabaseController
         if (isset($_REQUEST['favorite_tables'])) {
             $favorite_tables = json_decode($_REQUEST['favorite_tables'], true);
         } else {
-            $favorite_tables = array();
+            $favorite_tables = [];
         }
         // Required to keep each user's preferences separate.
         $user = sha1($GLOBALS['cfg']['Server']['user']);
@@ -293,35 +293,35 @@ class DatabaseStructureController extends DatabaseController
                 'message',
                 Template::get('components/error_message')
                     ->render(
-                        array(
+                        [
                             'msg' => __("Favorite List is full!")
-                        )
+                        ]
                     )
             );
             return;
         }
         // Check if current table is already in favorite list.
-        $favParams = array('db' => $this->db,
+        $favParams = ['db' => $this->db,
             'ajax_request' => true,
             'favorite_table' => $favorite_table,
             (($already_favorite ? 'remove' : 'add') . '_favorite') => true
-        );
+        ];
         $this->response->addJSON(
-            array(
+            [
                 'user' => $user,
                 'favorite_tables' => json_encode($favorite_tables),
                 'list' => $fav_instance->getHtmlList(),
                 'anchor' => Template::get('database/structure/favorite_anchor')
                     ->render(
-                        array(
+                        [
                             'table_name_hash' => md5($favorite_table),
                             'db_table_name_hash' => md5($this->db . "." . $favorite_table),
                             'fav_params' => $favParams,
                             'already_favorite' => $already_favorite,
                             'titles' => $titles,
-                        )
+                        ]
                     )
-            )
+            ]
         );
     }
 
@@ -346,16 +346,16 @@ class DatabaseStructureController extends DatabaseController
         }
 
         // Array to store the results.
-        $real_row_count_all = array();
+        $real_row_count_all = [];
         // Iterate over each table and fetch real row count.
         foreach ($this->_tables as $table) {
             $row_count = $this->dbi
                 ->getTable($this->db, $table['TABLE_NAME'])
                 ->getRealRowCountTable();
-            $real_row_count_all[] = array(
+            $real_row_count_all[] = [
                 'table' => $table['TABLE_NAME'],
                 'row_count' => $row_count
-            );
+            ];
         }
 
         $ajax_response->addJSON(
@@ -373,7 +373,7 @@ class DatabaseStructureController extends DatabaseController
     {
         $action = 'db_structure.php';
         $err_url = 'db_structure.php' . Url::getCommon(
-            array('db' => $this->db)
+            ['db' => $this->db]
         );
 
         // see bug #2794840; in this case, code path is:
@@ -397,7 +397,7 @@ class DatabaseStructureController extends DatabaseController
     {
         // filtering
         $this->response->addHTML(
-            Template::get('filter')->render(array('filter_value' => ''))
+            Template::get('filter')->render(['filter_value' => ''])
         );
         // table form
         $this->response->addHTML(
@@ -428,7 +428,7 @@ class DatabaseStructureController extends DatabaseController
         $sum_size       = 0;
         $overhead_size  = 0;
 
-        $hidden_fields = array();
+        $hidden_fields = [];
         $overall_approx_rows = false;
         foreach ($this->_tables as $keyname => $current_table) {
             // Get valid statistics whatever is the table type
@@ -441,7 +441,7 @@ class DatabaseStructureController extends DatabaseController
             $table_is_view = false;
             // Sets parameters for links
             $tbl_url_query = Url::getCommon(
-                array('db' => $this->db, 'table' => $current_table['TABLE_NAME'])
+                ['db' => $this->db, 'table' => $current_table['TABLE_NAME']]
             );
             // do not list the previous table's size info for a view
 
@@ -548,33 +548,33 @@ class DatabaseStructureController extends DatabaseController
 
             $browse_table = Template::get('database/structure/browse_table')
                 ->render(
-                    array(
+                    [
                         'tbl_url_query' => $tbl_url_query,
                         'title'         => $may_have_rows ? $titles['Browse']
                             : $titles['NoBrowse'],
-                    )
+                    ]
                 );
 
             $search_table = Template::get('database/structure/search_table')
                 ->render(
-                    array(
+                    [
                         'tbl_url_query' => $tbl_url_query,
                         'title'         => $may_have_rows ? $titles['Search']
                             : $titles['NoSearch'],
-                    )
+                    ]
                 );
 
             $browse_table_label = Template::get(
                 'database/structure/browse_table_label'
             )
                 ->render(
-                    array(
+                    [
                         'tbl_url_query' => $tbl_url_query,
                         'title'         => htmlspecialchars(
                             $current_table['TABLE_COMMENT']
                         ),
                         'truename'      => $truename,
-                    )
+                    ]
                 );
 
             $empty_table = '';
@@ -583,7 +583,7 @@ class DatabaseStructureController extends DatabaseController
                 if (!$table_is_view) {
                     $empty_table = Template::get('database/structure/empty_table')
                         ->render(
-                            array(
+                            [
                                 'tbl_url_query' => $tbl_url_query,
                                 'sql_query' => urlencode(
                                     'TRUNCATE ' . Util::backquote(
@@ -600,7 +600,7 @@ class DatabaseStructureController extends DatabaseController
                                 ),
                                 'title' => $may_have_rows ? $titles['Empty']
                                     : $titles['NoEmpty'],
-                            )
+                            ]
                         );
                 }
                 $drop_query = sprintf(
@@ -658,7 +658,7 @@ class DatabaseStructureController extends DatabaseController
             $this->response->addHTML(
                 Template::get('database/structure/structure_table_row')
                     ->render(
-                        array(
+                        [
                             'table_name_hash'       => md5($current_table['TABLE_NAME']),
                             'db_table_name_hash'    => md5($this->db . '.' . $current_table['TABLE_NAME']),
                             'db'                    => $this->db,
@@ -705,7 +705,7 @@ class DatabaseStructureController extends DatabaseController
                             'show_creation'          => $GLOBALS['cfg']['ShowDbStructureCreation'],
                             'show_last_update'       => $GLOBALS['cfg']['ShowDbStructureLastUpdate'],
                             'show_last_check'        => $GLOBALS['cfg']['ShowDbStructureLastCheck'],
-                        )
+                        ]
                     )
             );
 
@@ -720,7 +720,7 @@ class DatabaseStructureController extends DatabaseController
         // Show Summary
         $this->response->addHTML(
             Template::get('database/structure/body_for_table_summary')->render(
-                array(
+                [
                     'num_tables' => $this->_num_tables,
                     'server_slave_status' => $GLOBALS['replication_info']['slave']['status'],
                     'db_is_system_schema' => $this->_db_is_system_schema,
@@ -743,7 +743,7 @@ class DatabaseStructureController extends DatabaseController
                     'show_creation' => $GLOBALS['cfg']['ShowDbStructureCreation'],
                     'show_last_update' => $GLOBALS['cfg']['ShowDbStructureLastUpdate'],
                     'show_last_check' => $GLOBALS['cfg']['ShowDbStructureLastCheck'],
-                )
+                ]
             )
         );
         $this->response->addHTML('</table>');
@@ -782,11 +782,11 @@ class DatabaseStructureController extends DatabaseController
                     'database/structure/tracking_icon'
                 )
                 ->render(
-                    array(
+                    [
                         'db' => $this->db,
                         'table' => $table,
                         'is_tracked' => $is_tracked,
-                    )
+                    ]
                 );
             }
         }
@@ -816,7 +816,7 @@ class DatabaseStructureController extends DatabaseController
         ) {
             // InnoDB/TokuDB table: we did not get an accurate row count
             $approx_rows = !$table_is_view
-                && in_array($current_table['ENGINE'], array('InnoDB', 'TokuDB'))
+                && in_array($current_table['ENGINE'], ['InnoDB', 'TokuDB'])
                 && !$current_table['COUNTED'];
 
             if ($table_is_view
@@ -837,7 +837,7 @@ class DatabaseStructureController extends DatabaseController
             }
         }
 
-        return array($approx_rows, $show_superscript);
+        return [$approx_rows, $show_superscript];
     }
 
     /**
@@ -889,7 +889,7 @@ class DatabaseStructureController extends DatabaseController
                 );
         }
 
-        return array($do, $ignored);
+        return [$do, $ignored];
     }
 
     /**
@@ -919,10 +919,10 @@ class DatabaseStructureController extends DatabaseController
         $favorite_tables[$user] = $fav_instance->getTables();
 
         $this->response->addJSON(
-            array(
+            [
                 'favorite_tables' => json_encode($favorite_tables),
                 'list' => $fav_instance->getHtmlList()
-            )
+            ]
         );
         $server_id = $GLOBALS['server'];
         // Set flag when localStorage and pmadb(if present) are in sync.
@@ -1058,9 +1058,9 @@ class DatabaseStructureController extends DatabaseController
             $table_is_view = true;
         }
 
-        return array($current_table, $formatted_size, $unit, $formatted_overhead,
+        return [$current_table, $formatted_size, $unit, $formatted_overhead,
             $overhead_unit, $overhead_size, $table_is_view, $sum_size
-        );
+        ];
     }
 
     /**
@@ -1104,9 +1104,9 @@ class DatabaseStructureController extends DatabaseController
                 $overhead_size += $current_table['Data_free'];
             }
         }
-        return array($current_table, $formatted_size, $unit, $formatted_overhead,
+        return [$current_table, $formatted_size, $unit, $formatted_overhead,
             $overhead_unit, $overhead_size, $sum_size
-        );
+        ];
     }
 
     /**
@@ -1122,7 +1122,7 @@ class DatabaseStructureController extends DatabaseController
     ) {
         $formatted_size = $unit = '';
 
-        if ((in_array($current_table['ENGINE'], array('InnoDB', 'TokuDB'))
+        if ((in_array($current_table['ENGINE'], ['InnoDB', 'TokuDB'])
             && $current_table['TABLE_ROWS'] < $GLOBALS['cfg']['MaxExactCount'])
             || !isset($current_table['TABLE_ROWS'])
         ) {
@@ -1143,6 +1143,6 @@ class DatabaseStructureController extends DatabaseController
             );
         }
 
-        return array($current_table, $formatted_size, $unit, $sum_size);
+        return [$current_table, $formatted_size, $unit, $sum_size];
     }
 }
diff --git a/libraries/classes/Controllers/Server/ServerBinlogController.php b/libraries/classes/Controllers/Server/ServerBinlogController.php
index 6ee128f612..4275dc52c1 100644
--- a/libraries/classes/Controllers/Server/ServerBinlogController.php
+++ b/libraries/classes/Controllers/Server/ServerBinlogController.php
@@ -59,7 +59,7 @@ class ServerBinlogController extends Controller
          */
         include_once 'libraries/server_common.inc.php';
 
-        $url_params = array();
+        $url_params = [];
         if (! isset($_REQUEST['log'])
             || ! array_key_exists($_REQUEST['log'], $this->binary_logs)
         ) {
@@ -91,11 +91,11 @@ class ServerBinlogController extends Controller
     private function _getLogSelector(array $url_params)
     {
         return Template::get('server/binlog/log_selector')->render(
-            array(
+            [
                 'url_params' => $url_params,
                 'binary_logs' => $this->binary_logs,
                 'log' => $_REQUEST['log'],
-            )
+            ]
         );
     }
 
@@ -257,10 +257,10 @@ class ServerBinlogController extends Controller
         $html = "";
         while ($value = $this->dbi->fetchAssoc($result)) {
             $html .= Template::get('server/binlog/log_row')->render(
-                array(
+                [
                     'value' => $value,
                     'dontlimitchars' => $dontlimitchars,
-                )
+                ]
             );
         }
         return $html;
diff --git a/libraries/classes/Controllers/Server/ServerCollationsController.php b/libraries/classes/Controllers/Server/ServerCollationsController.php
index b4a9ee3797..f7fdd0dbcc 100644
--- a/libraries/classes/Controllers/Server/ServerCollationsController.php
+++ b/libraries/classes/Controllers/Server/ServerCollationsController.php
@@ -68,12 +68,12 @@ class ServerCollationsController extends Controller
         array $mysqlDftCollations
     ): string {
         return Template::get('server/collations/charsets')->render(
-            array(
+            [
                 'mysql_charsets' => $mysqlCharsets,
                 'mysql_collations' => $mysqlCollations,
                 'mysql_charsets_desc' => $mysqlCharsetsDesc,
                 'mysql_dft_collations' => $mysqlDftCollations,
-            )
+            ]
         );
     }
 }
diff --git a/libraries/classes/Controllers/Server/ServerDatabasesController.php b/libraries/classes/Controllers/Server/ServerDatabasesController.php
index 94bef486cf..4a8557d73b 100644
--- a/libraries/classes/Controllers/Server/ServerDatabasesController.php
+++ b/libraries/classes/Controllers/Server/ServerDatabasesController.php
@@ -173,7 +173,7 @@ class ServerDatabasesController extends Controller
                 Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
                 )
-                . Url::getCommon(array('db' => $_POST['new_db']))
+                . Url::getCommon(['db' => $_POST['new_db']])
             );
         }
     }
@@ -225,7 +225,7 @@ class ServerDatabasesController extends Controller
         if (empty($_REQUEST['sort_by'])) {
             $this->_sort_by = 'SCHEMA_NAME';
         } else {
-            $sort_by_whitelist = array(
+            $sort_by_whitelist = [
                 'SCHEMA_NAME',
                 'DEFAULT_COLLATION_NAME',
                 'SCHEMA_TABLES',
@@ -234,7 +234,7 @@ class ServerDatabasesController extends Controller
                 'SCHEMA_INDEX_LENGTH',
                 'SCHEMA_LENGTH',
                 'SCHEMA_DATA_FREE'
-            );
+            ];
             if (in_array($_REQUEST['sort_by'], $sort_by_whitelist)) {
                 $this->_sort_by = $_REQUEST['sort_by'];
             } else {
@@ -275,8 +275,8 @@ class ServerDatabasesController extends Controller
             }
         }
 
-        $values = array();
-        $units = array();
+        $values = [];
+        $units = [];
         foreach ($column_order as $stat_name => $stat) {
             if (array_key_exists($stat_name,$first_database)) {
                 if ($stat['format'] == 'byte') {
@@ -291,12 +291,12 @@ class ServerDatabasesController extends Controller
             }
         }
 
-        $_url_params = array(
+        $_url_params = [
             'pos' => $this->_pos,
             'dbstats' => $this->_dbstats,
             'sort_by' => $this->_sort_by,
             'sort_order' => $this->_sort_order,
-        );
+        ];
 
         $html = Template::get('server/databases/databases_header')->render([
             'database_count' => $this->_database_count,
@@ -340,43 +340,43 @@ class ServerDatabasesController extends Controller
      */
     private function _getColumnOrder()
     {
-        $column_order = array();
-        $column_order['DEFAULT_COLLATION_NAME'] = array(
+        $column_order = [];
+        $column_order['DEFAULT_COLLATION_NAME'] = [
             'disp_name' => __('Collation'),
-            'description_function' => array(Charsets::class, 'getCollationDescr'),
+            'description_function' => [Charsets::class, 'getCollationDescr'],
             'format'    => 'string',
             'footer'    => $this->dbi->getServerCollation(),
-        );
-        $column_order['SCHEMA_TABLES'] = array(
+        ];
+        $column_order['SCHEMA_TABLES'] = [
             'disp_name' => __('Tables'),
             'format'    => 'number',
             'footer'    => 0,
-        );
-        $column_order['SCHEMA_TABLE_ROWS'] = array(
+        ];
+        $column_order['SCHEMA_TABLE_ROWS'] = [
             'disp_name' => __('Rows'),
             'format'    => 'number',
             'footer'    => 0,
-        );
-        $column_order['SCHEMA_DATA_LENGTH'] = array(
+        ];
+        $column_order['SCHEMA_DATA_LENGTH'] = [
             'disp_name' => __('Data'),
             'format'    => 'byte',
             'footer'    => 0,
-        );
-        $column_order['SCHEMA_INDEX_LENGTH'] = array(
+        ];
+        $column_order['SCHEMA_INDEX_LENGTH'] = [
             'disp_name' => __('Indexes'),
             'format'    => 'byte',
             'footer'    => 0,
-        );
-        $column_order['SCHEMA_LENGTH'] = array(
+        ];
+        $column_order['SCHEMA_LENGTH'] = [
             'disp_name' => __('Total'),
             'format'    => 'byte',
             'footer'    => 0,
-        );
-        $column_order['SCHEMA_DATA_FREE'] = array(
+        ];
+        $column_order['SCHEMA_DATA_FREE'] = [
             'disp_name' => __('Overhead'),
             'format'    => 'byte',
             'footer'    => 0,
-        );
+        ];
 
         return $column_order;
     }
@@ -466,8 +466,8 @@ class ServerDatabasesController extends Controller
             }
         }
 
-        $values = array();
-        $units = array();
+        $values = [];
+        $units = [];
         foreach ($column_order as $stat_name => $stat) {
             if (array_key_exists($stat_name,$current)) {
                 if ($stat['format'] == 'byte') {
diff --git a/libraries/classes/Controllers/Server/ServerEnginesController.php b/libraries/classes/Controllers/Server/ServerEnginesController.php
index 1f4ffcafec..88ba3cf725 100644
--- a/libraries/classes/Controllers/Server/ServerEnginesController.php
+++ b/libraries/classes/Controllers/Server/ServerEnginesController.php
@@ -65,7 +65,7 @@ class ServerEnginesController extends Controller
     private function _getHtmlForAllServerEngines()
     {
         return Template::get('server/engines/engines')->render(
-            array('engines' => StorageEngine::getStorageEngines())
+            ['engines' => StorageEngine::getStorageEngines()]
         );
     }
 
@@ -85,7 +85,7 @@ class ServerEnginesController extends Controller
          * Displays details about a given Storage Engine
          */
         return Template::get('server/engines/engine')->render(
-            array(
+            [
                 'title' => $engine->getTitle(),
                 'help_page' => $engine->getMysqlHelpPage(),
                 'comment' => $engine->getComment(),
@@ -95,7 +95,7 @@ class ServerEnginesController extends Controller
                 'page_output' => $pageOutput,
                 'page' => $page,
                 'engine' => $_REQUEST['engine'],
-            )
+            ]
         );
     }
 }
diff --git a/libraries/classes/Controllers/Server/ServerPluginsController.php b/libraries/classes/Controllers/Server/ServerPluginsController.php
index b465a1990c..c7223693d9 100644
--- a/libraries/classes/Controllers/Server/ServerPluginsController.php
+++ b/libraries/classes/Controllers/Server/ServerPluginsController.php
@@ -81,7 +81,7 @@ class ServerPluginsController extends Controller
                 ORDER BY plugin_type, plugin_name";
 
         $res = $this->dbi->query($sql);
-        $this->plugins = array();
+        $this->plugins = [];
         while ($row = $this->dbi->fetchAssoc($res)) {
             $this->plugins[$row['plugin_type']][] = $row;
         }
@@ -96,7 +96,7 @@ class ServerPluginsController extends Controller
      */
     private function _getPluginsHtml()
     {
-        $plugins_type_clean = array();
+        $plugins_type_clean = [];
         $keys = array_keys($this->plugins);
         foreach ($keys as $plugin_type) {
             $plugins_type_clean[$plugin_type] = preg_replace(
@@ -105,19 +105,19 @@ class ServerPluginsController extends Controller
         }
         $html  = '<div id="plugins_plugins">';
         $html .= Template::get('server/plugins/section_links')
-            ->render(array(
+            ->render([
                 'plugins' => $this->plugins,
                 'plugins_type_clean' => $plugins_type_clean,
-            ));
+            ]);
 
         foreach ($this->plugins as $plugin_type => $plugin_list) {
             $html .= Template::get('server/plugins/section')
                 ->render(
-                    array(
+                    [
                         'plugin_type' => $plugin_type,
                         'plugin_type_clean' => $plugins_type_clean[$plugin_type],
                         'plugin_list' => $plugin_list,
-                    )
+                    ]
                 );
         }
         $html .= '</div>';
diff --git a/libraries/classes/Controllers/Server/ServerVariablesController.php b/libraries/classes/Controllers/Server/ServerVariablesController.php
index e7b4fec1bf..0d1c96160c 100644
--- a/libraries/classes/Controllers/Server/ServerVariablesController.php
+++ b/libraries/classes/Controllers/Server/ServerVariablesController.php
@@ -90,7 +90,7 @@ class ServerVariablesController extends Controller
 
         if ($serverVarsResult !== false) {
 
-            $serverVarsSession = array();
+            $serverVarsSession = [];
             while ($arr = $this->dbi->fetchRow($serverVarsResult)) {
                 $serverVarsSession[$arr[0]] = $arr[1];
             }
@@ -173,7 +173,7 @@ class ServerVariablesController extends Controller
     public function setValueAction()
     {
         $value = $_REQUEST['varValue'];
-        $matches = array();
+        $matches = [];
 
         if (isset($this->variable_doc_links[$_REQUEST['varName']][3])
             && $this->variable_doc_links[$_REQUEST['varName']][3] == 'byte'
@@ -183,14 +183,14 @@ class ServerVariablesController extends Controller
                 $matches
             )
         ) {
-            $exp = array(
+            $exp = [
                 'kb' => 1,
                 'kib' => 1,
                 'mb' => 2,
                 'mib' => 2,
                 'gb' => 3,
                 'gib' => 3
-            );
+            ];
             $value = floatval($matches[1]) * pow(
                 1024,
                 $exp[mb_strtolower($matches[3])]
@@ -269,10 +269,10 @@ class ServerVariablesController extends Controller
             }
         }
 
-        return array(
+        return [
             $formattedValue,
             $isHtmlFormatted
-        );
+        ];
     }
 
     /**
@@ -284,7 +284,7 @@ class ServerVariablesController extends Controller
     {
         $url = 'server_variables.php' . Url::getCommon();
         return Template::get('server/variables/link_template')
-            ->render(array('url' => $url));
+            ->render(['url' => $url]);
     }
 
     /**
@@ -300,7 +300,7 @@ class ServerVariablesController extends Controller
         // filter
         $filterValue = ! empty($_REQUEST['filter']) ? $_REQUEST['filter'] : '';
         $output = Template::get('filter')
-            ->render(array('filter_value' => $filterValue));
+            ->render(['filter_value' => $filterValue]);
 
         $output .= '<div class="responsivetable">';
         $output .= '<table id="serverVariables" class="width100 data filteredData noclick">';
@@ -343,7 +343,7 @@ class ServerVariablesController extends Controller
 
             list($formattedValue, $isHtmlFormatted) = $this->_formatVariable($name, $value);
 
-            $output .= Template::get('server/variables/variable_row')->render(array(
+            $output .= Template::get('server/variables/variable_row')->render([
                 'row_class' => $row_class,
                 'editable' => ! in_array(
                     strtolower($name),
@@ -354,7 +354,7 @@ class ServerVariablesController extends Controller
                 'value' => $formattedValue,
                 'is_superuser' => $this->dbi->isSuperuser(),
                 'is_html_formatted' => $isHtmlFormatted,
-            ));
+            ]);
 
             if ($has_session_value) {
                 list($formattedValue, $isHtmlFormatted)= $this->_formatVariable(
@@ -362,11 +362,11 @@ class ServerVariablesController extends Controller
                 );
                 $output .= Template::get('server/variables/session_variable_row')
                     ->render(
-                        array(
+                        [
                             'row_class'         => $row_class,
                             'value'             => $formattedValue,
                             'is_html_formatted' => $isHtmlFormatted,
-                        )
+                        ]
                     );
             }
 
@@ -395,2198 +395,2198 @@ class ServerVariablesController extends Controller
      */
     private function _getDocumentLinks()
     {
-        $variable_doc_links = array();
-        $variable_doc_links['auto_increment_increment'] = array(
+        $variable_doc_links = [];
+        $variable_doc_links['auto_increment_increment'] = [
             'auto_increment_increment',
             'replication-options-master',
-            'sysvar');
-        $variable_doc_links['auto_increment_offset'] = array(
+            'sysvar'];
+        $variable_doc_links['auto_increment_offset'] = [
             'auto_increment_offset',
             'replication-options-master',
-            'sysvar');
-        $variable_doc_links['autocommit'] = array(
+            'sysvar'];
+        $variable_doc_links['autocommit'] = [
             'autocommit',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['automatic_sp_privileges'] = array(
+            'sysvar'];
+        $variable_doc_links['automatic_sp_privileges'] = [
             'automatic_sp_privileges',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['avoid_temporal_upgrade'] = array(
+            'sysvar'];
+        $variable_doc_links['avoid_temporal_upgrade'] = [
             'avoid_temporal_upgrade',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['back_log'] = array(
+            'sysvar'];
+        $variable_doc_links['back_log'] = [
             'back_log',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['basedir'] = array(
+            'sysvar'];
+        $variable_doc_links['basedir'] = [
             'basedir',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['big_tables'] = array(
+            'option_mysqld'];
+        $variable_doc_links['big_tables'] = [
             'big-tables',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['bind_address'] = array(
+            'option_mysqld'];
+        $variable_doc_links['bind_address'] = [
             'bind-address',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['binlog_cache_size'] = array(
+            'option_mysqld'];
+        $variable_doc_links['binlog_cache_size'] = [
             'binlog_cache_size',
             'replication-options-binary-log',
             'sysvar',
-            'byte');
-        $variable_doc_links['binlog_checksum'] = array(
+            'byte'];
+        $variable_doc_links['binlog_checksum'] = [
             'binlog_checksum',
             'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['binlog_direct_non_transactional_updates'] = array(
+            'sysvar'];
+        $variable_doc_links['binlog_direct_non_transactional_updates'] = [
             'binlog_direct_non_transactional_updates',
             'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['binlog_error_action'] = array(
+            'sysvar'];
+        $variable_doc_links['binlog_error_action'] = [
             'binlog_error_action',
             'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['binlog_format'] = array(
+            'sysvar'];
+        $variable_doc_links['binlog_format'] = [
             'binlog-format',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['binlog_group_commit_sync_delay'] = array(
+            'option_mysqld'];
+        $variable_doc_links['binlog_group_commit_sync_delay'] = [
             'binlog_group_commit_sync_delay',
             'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['binlog_group_commit_sync_no_delay_count'] = array(
+            'sysvar'];
+        $variable_doc_links['binlog_group_commit_sync_no_delay_count'] = [
             'binlog_group_commit_sync_no_delay_count',
             'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['binlog_gtid_simple_recovery'] = array(
+            'sysvar'];
+        $variable_doc_links['binlog_gtid_simple_recovery'] = [
             'binlog_gtid_simple_recovery',
             'replication-options-gtids',
-            'sysvar');
-        $variable_doc_links['binlog_max_flush_queue_time'] = array(
+            'sysvar'];
+        $variable_doc_links['binlog_max_flush_queue_time'] = [
             'binlog_max_flush_queue_time',
             'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['binlog_order_commits'] = array(
+            'sysvar'];
+        $variable_doc_links['binlog_order_commits'] = [
             'binlog_order_commits',
             'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['binlog_row_image'] = array(
+            'sysvar'];
+        $variable_doc_links['binlog_row_image'] = [
             'binlog_row_image',
             'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['binlog_rows_query_log_events'] = array(
+            'sysvar'];
+        $variable_doc_links['binlog_rows_query_log_events'] = [
             'binlog_rows_query_log_events',
             'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['binlog_stmt_cache_size'] = array(
+            'sysvar'];
+        $variable_doc_links['binlog_stmt_cache_size'] = [
             'binlog_stmt_cache_size',
             'replication-options-binary-log',
             'sysvar',
-            'byte');
-        $variable_doc_links['block_encryption_mode'] = array(
+            'byte'];
+        $variable_doc_links['block_encryption_mode'] = [
             'block_encryption_mode',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['bulk_insert_buffer_size'] = array(
+            'sysvar'];
+        $variable_doc_links['bulk_insert_buffer_size'] = [
             'bulk_insert_buffer_size',
             'server-system-variables',
             'sysvar',
-            'byte');
-        $variable_doc_links['character_set_client'] = array(
+            'byte'];
+        $variable_doc_links['character_set_client'] = [
             'character_set_client',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['character_set_connection'] = array(
+            'sysvar'];
+        $variable_doc_links['character_set_connection'] = [
             'character_set_connection',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['character_set_database'] = array(
+            'sysvar'];
+        $variable_doc_links['character_set_database'] = [
             'character_set_database',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['character_set_filesystem'] = array(
+            'sysvar'];
+        $variable_doc_links['character_set_filesystem'] = [
             'character-set-filesystem',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['character_set_results'] = array(
+            'option_mysqld'];
+        $variable_doc_links['character_set_results'] = [
             'character_set_results',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['character_set_server'] = array(
+            'sysvar'];
+        $variable_doc_links['character_set_server'] = [
             'character-set-server',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['character_set_system'] = array(
+            'option_mysqld'];
+        $variable_doc_links['character_set_system'] = [
             'character_set_system',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['character_sets_dir'] = array(
+            'sysvar'];
+        $variable_doc_links['character_sets_dir'] = [
             'character-sets-dir',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['check_proxy_users'] = array(
+            'option_mysqld'];
+        $variable_doc_links['check_proxy_users'] = [
             'check_proxy_users',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['collation_connection'] = array(
+            'sysvar'];
+        $variable_doc_links['collation_connection'] = [
             'collation_connection',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['collation_database'] = array(
+            'sysvar'];
+        $variable_doc_links['collation_database'] = [
             'collation_database',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['collation_server'] = array(
+            'sysvar'];
+        $variable_doc_links['collation_server'] = [
             'collation-server',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['completion_type'] = array(
+            'option_mysqld'];
+        $variable_doc_links['completion_type'] = [
             'completion_type',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['concurrent_insert'] = array(
+            'sysvar'];
+        $variable_doc_links['concurrent_insert'] = [
             'concurrent_insert',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['connect_timeout'] = array(
+            'sysvar'];
+        $variable_doc_links['connect_timeout'] = [
             'connect_timeout',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['core_file'] = array(
+            'sysvar'];
+        $variable_doc_links['core_file'] = [
             'core_file',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['datadir'] = array(
+            'sysvar'];
+        $variable_doc_links['datadir'] = [
             'datadir',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['date_format'] = array(
+            'option_mysqld'];
+        $variable_doc_links['date_format'] = [
             'date_format',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['datetime_format'] = array(
+            'sysvar'];
+        $variable_doc_links['datetime_format'] = [
             'datetime_format',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['debug'] = array(
+            'sysvar'];
+        $variable_doc_links['debug'] = [
             'debug',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['debug_sync'] = array(
+            'option_mysqld'];
+        $variable_doc_links['debug_sync'] = [
             'debug_sync',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['default_authentication_plugin'] = array(
+            'sysvar'];
+        $variable_doc_links['default_authentication_plugin'] = [
             'default_authentication_plugin',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['default_password_lifetime'] = array(
+            'sysvar'];
+        $variable_doc_links['default_password_lifetime'] = [
             'default_password_lifetime',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['default_storage_engine'] = array(
+            'sysvar'];
+        $variable_doc_links['default_storage_engine'] = [
             'default-storage-engine',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['default_tmp_storage_engine'] = array(
+            'option_mysqld'];
+        $variable_doc_links['default_tmp_storage_engine'] = [
             'default_tmp_storage_engine',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['default_week_format'] = array(
+            'sysvar'];
+        $variable_doc_links['default_week_format'] = [
             'default_week_format',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['delay_key_write'] = array(
+            'sysvar'];
+        $variable_doc_links['delay_key_write'] = [
             'delay-key-write',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['delayed_insert_limit'] = array(
+            'option_mysqld'];
+        $variable_doc_links['delayed_insert_limit'] = [
             'delayed_insert_limit',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['delayed_insert_timeout'] = array(
+            'sysvar'];
+        $variable_doc_links['delayed_insert_timeout'] = [
             'delayed_insert_timeout',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['delayed_queue_size'] = array(
+            'sysvar'];
+        $variable_doc_links['delayed_queue_size'] = [
             'delayed_queue_size',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['disabled_storage_engines'] = array(
+            'sysvar'];
+        $variable_doc_links['disabled_storage_engines'] = [
             'disabled_storage_engines',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['disconnect_on_expired_password'] = array(
+            'sysvar'];
+        $variable_doc_links['disconnect_on_expired_password'] = [
             'disconnect_on_expired_password',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['div_precision_increment'] = array(
+            'sysvar'];
+        $variable_doc_links['div_precision_increment'] = [
             'div_precision_increment',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['end_markers_in_json'] = array(
+            'sysvar'];
+        $variable_doc_links['end_markers_in_json'] = [
             'end_markers_in_json',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['enforce_gtid_consistency'] = array(
+            'sysvar'];
+        $variable_doc_links['enforce_gtid_consistency'] = [
             'enforce_gtid_consistency',
             'replication-options-gtids',
-            'sysvar');
-        $variable_doc_links['eq_range_index_dive_limit'] = array(
+            'sysvar'];
+        $variable_doc_links['eq_range_index_dive_limit'] = [
             'eq_range_index_dive_limit',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['engine_condition_pushdown'] = array(
+            'sysvar'];
+        $variable_doc_links['engine_condition_pushdown'] = [
             'engine-condition-pushdown',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['error_count'] = array(
+            'option_mysqld'];
+        $variable_doc_links['error_count'] = [
             'error_count',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['event_scheduler'] = array(
+            'sysvar'];
+        $variable_doc_links['event_scheduler'] = [
             'event-scheduler',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['expire_logs_days'] = array(
+            'option_mysqld'];
+        $variable_doc_links['expire_logs_days'] = [
             'expire_logs_days',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['explicit_defaults_for_timestamp'] = array(
+            'sysvar'];
+        $variable_doc_links['explicit_defaults_for_timestamp'] = [
             'explicit_defaults_for_timestamp',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['external_user'] = array(
+            'sysvar'];
+        $variable_doc_links['external_user'] = [
             'external_user',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['flush'] = array(
+            'sysvar'];
+        $variable_doc_links['flush'] = [
             'flush',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['flush_time'] = array(
+            'sysvar'];
+        $variable_doc_links['flush_time'] = [
             'flush_time',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['foreign_key_checks'] = array(
+            'sysvar'];
+        $variable_doc_links['foreign_key_checks'] = [
             'foreign_key_checks',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['ft_boolean_syntax'] = array(
+            'sysvar'];
+        $variable_doc_links['ft_boolean_syntax'] = [
             'ft_boolean_syntax',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['ft_max_word_len'] = array(
+            'sysvar'];
+        $variable_doc_links['ft_max_word_len'] = [
             'ft_max_word_len',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['ft_min_word_len'] = array(
+            'sysvar'];
+        $variable_doc_links['ft_min_word_len'] = [
             'ft_min_word_len',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['ft_query_expansion_limit'] = array(
+            'sysvar'];
+        $variable_doc_links['ft_query_expansion_limit'] = [
             'ft_query_expansion_limit',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['ft_stopword_file'] = array(
+            'sysvar'];
+        $variable_doc_links['ft_stopword_file'] = [
             'ft_stopword_file',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['general_log'] = array(
+            'sysvar'];
+        $variable_doc_links['general_log'] = [
             'general-log',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['general_log_file'] = array(
+            'option_mysqld'];
+        $variable_doc_links['general_log_file'] = [
             'general_log_file',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['group_concat_max_len'] = array(
+            'sysvar'];
+        $variable_doc_links['group_concat_max_len'] = [
             'group_concat_max_len',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['gtid_executed'] = array(
+            'sysvar'];
+        $variable_doc_links['gtid_executed'] = [
             'gtid_executed',
             'replication-options-gtids',
-            'sysvar');
-        $variable_doc_links['gtid_executed_compression_period'] = array(
+            'sysvar'];
+        $variable_doc_links['gtid_executed_compression_period'] = [
             'gtid_executed_compression_period',
             'replication-options-gtids',
-            'sysvar');
-        $variable_doc_links['gtid_mode'] = array(
+            'sysvar'];
+        $variable_doc_links['gtid_mode'] = [
             'gtid_mode',
             'replication-options-gtids',
-            'sysvar');
-        $variable_doc_links['gtid_owned'] = array(
+            'sysvar'];
+        $variable_doc_links['gtid_owned'] = [
             'gtid_owned',
             'replication-options-gtids',
-            'sysvar');
-        $variable_doc_links['gtid_purged'] = array(
+            'sysvar'];
+        $variable_doc_links['gtid_purged'] = [
             'gtid_purged',
             'replication-options-gtids',
-            'sysvar');
-        $variable_doc_links['have_compress'] = array(
+            'sysvar'];
+        $variable_doc_links['have_compress'] = [
             'have_compress',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_crypt'] = array(
+            'sysvar'];
+        $variable_doc_links['have_crypt'] = [
             'have_crypt',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_csv'] = array(
+            'sysvar'];
+        $variable_doc_links['have_csv'] = [
             'have_csv',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_dynamic_loading'] = array(
+            'sysvar'];
+        $variable_doc_links['have_dynamic_loading'] = [
             'have_dynamic_loading',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_geometry'] = array(
+            'sysvar'];
+        $variable_doc_links['have_geometry'] = [
             'have_geometry',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_innodb'] = array(
+            'sysvar'];
+        $variable_doc_links['have_innodb'] = [
             'have_innodb',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_ndbcluster'] = array(
+            'sysvar'];
+        $variable_doc_links['have_ndbcluster'] = [
             'have_ndbcluster',
             'mysql-cluster-system-variables',
-            'sysvar');
-        $variable_doc_links['have_openssl'] = array(
+            'sysvar'];
+        $variable_doc_links['have_openssl'] = [
             'have_openssl',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_partitioning'] = array(
+            'sysvar'];
+        $variable_doc_links['have_partitioning'] = [
             'have_partitioning',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_profiling'] = array(
+            'sysvar'];
+        $variable_doc_links['have_profiling'] = [
             'have_profiling',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_query_cache'] = array(
+            'sysvar'];
+        $variable_doc_links['have_query_cache'] = [
             'have_query_cache',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_rtree_keys'] = array(
+            'sysvar'];
+        $variable_doc_links['have_rtree_keys'] = [
             'have_rtree_keys',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_ssl'] = array(
+            'sysvar'];
+        $variable_doc_links['have_ssl'] = [
             'have_ssl',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_statement_timeout'] = array(
+            'sysvar'];
+        $variable_doc_links['have_statement_timeout'] = [
             'have_statement_timeout',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['have_symlink'] = array(
+            'sysvar'];
+        $variable_doc_links['have_symlink'] = [
             'have_symlink',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['host_cache_size'] = array(
+            'sysvar'];
+        $variable_doc_links['host_cache_size'] = [
             'host_cache_size',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['hostname'] = array(
+            'sysvar'];
+        $variable_doc_links['hostname'] = [
             'hostname',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['identity'] = array(
+            'sysvar'];
+        $variable_doc_links['identity'] = [
             'identity',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['ignore_builtin_innodb'] = array(
+            'sysvar'];
+        $variable_doc_links['ignore_builtin_innodb'] = [
             'ignore-builtin-innodb',
             'innodb-parameters',
-            'option_mysqld');
-        $variable_doc_links['ignore_db_dirs'] = array(
+            'option_mysqld'];
+        $variable_doc_links['ignore_db_dirs'] = [
             'ignore_db_dirs',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['init_connect'] = array(
+            'sysvar'];
+        $variable_doc_links['init_connect'] = [
             'init_connect',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['init_file'] = array(
+            'sysvar'];
+        $variable_doc_links['init_file'] = [
             'init-file',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['init_slave'] = array(
+            'option_mysqld'];
+        $variable_doc_links['init_slave'] = [
             'init_slave',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['innodb_adaptive_flushing'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_adaptive_flushing'] = [
             'innodb_adaptive_flushing',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_adaptive_flushing_lwm'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_adaptive_flushing_lwm'] = [
             'innodb_adaptive_flushing_lwm',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_adaptive_hash_index'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_adaptive_hash_index'] = [
             'innodb_adaptive_hash_index',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_adaptive_hash_index_parts'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_adaptive_hash_index_parts'] = [
             'innodb_adaptive_hash_index_parts',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_adaptive_max_sleep_delay'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_adaptive_max_sleep_delay'] = [
             'innodb_adaptive_max_sleep_delay',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_additional_mem_pool_size'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_additional_mem_pool_size'] = [
             'innodb_additional_mem_pool_size',
             'innodb-parameters',
             'sysvar',
-            'byte');
-        $variable_doc_links['innodb_api_bk_commit_interval'] = array(
+            'byte'];
+        $variable_doc_links['innodb_api_bk_commit_interval'] = [
             'innodb_api_bk_commit_interval',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_api_disable_rowlock'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_api_disable_rowlock'] = [
             'innodb_api_disable_rowlock',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_api_enable_binlog'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_api_enable_binlog'] = [
             'innodb_api_enable_binlog',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_api_enable_mdl'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_api_enable_mdl'] = [
             'innodb_api_enable_mdl',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_api_trx_level'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_api_trx_level'] = [
             'innodb_api_trx_level',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_autoextend_increment'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_autoextend_increment'] = [
             'innodb_autoextend_increment',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_autoinc_lock_mode'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_autoinc_lock_mode'] = [
             'innodb_autoinc_lock_mode',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_buffer_pool_chunk_size'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_buffer_pool_chunk_size'] = [
             'innodb_buffer_pool_chunk_size',
             'innodb-parameters',
             'sysvar',
-            'byte');
-        $variable_doc_links['innodb_buffer_pool_dump_at_shutdown'] = array(
+            'byte'];
+        $variable_doc_links['innodb_buffer_pool_dump_at_shutdown'] = [
             'innodb_buffer_pool_dump_at_shutdown',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_buffer_pool_dump_now'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_buffer_pool_dump_now'] = [
             'innodb_buffer_pool_dump_now',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_buffer_pool_dump_pct'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_buffer_pool_dump_pct'] = [
             'innodb_buffer_pool_dump_pct',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_buffer_pool_filename'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_buffer_pool_filename'] = [
             'innodb_buffer_pool_filename',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_buffer_pool_instances'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_buffer_pool_instances'] = [
             'innodb_buffer_pool_instances',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_buffer_pool_load_abort'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_buffer_pool_load_abort'] = [
             'innodb_buffer_pool_load_abort',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_buffer_pool_load_at_startup'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_buffer_pool_load_at_startup'] = [
             'innodb_buffer_pool_load_at_startup',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_buffer_pool_load_now'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_buffer_pool_load_now'] = [
             'innodb_buffer_pool_load_now',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_buffer_pool_size'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_buffer_pool_size'] = [
             'innodb_buffer_pool_size',
             'innodb-parameters',
             'sysvar',
-            'byte');
-        $variable_doc_links['innodb_change_buffer_max_size'] = array(
+            'byte'];
+        $variable_doc_links['innodb_change_buffer_max_size'] = [
             'innodb_change_buffer_max_size',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_change_buffering'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_change_buffering'] = [
             'innodb_change_buffering',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_checksum_algorithm'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_checksum_algorithm'] = [
             'innodb_checksum_algorithm',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_checksums'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_checksums'] = [
             'innodb_checksums',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_cmp_per_index_enabled'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_cmp_per_index_enabled'] = [
             'innodb_cmp_per_index_enabled',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_commit_concurrency'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_commit_concurrency'] = [
             'innodb_commit_concurrency',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_compression_failure_threshold_pct'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_compression_failure_threshold_pct'] = [
             'innodb_compression_failure_threshold_pct',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_compression_level'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_compression_level'] = [
             'innodb_compression_level',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_compression_pad_pct_max'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_compression_pad_pct_max'] = [
             'innodb_compression_pad_pct_max',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_concurrency_tickets'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_concurrency_tickets'] = [
             'innodb_concurrency_tickets',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_data_file_path'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_data_file_path'] = [
             'innodb_data_file_path',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_data_home_dir'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_data_home_dir'] = [
             'innodb_data_home_dir',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_disable_sort_file_cache'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_disable_sort_file_cache'] = [
             'innodb_disable_sort_file_cache',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_doublewrite'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_doublewrite'] = [
             'innodb_doublewrite',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_fast_shutdown'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_fast_shutdown'] = [
             'innodb_fast_shutdown',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_file_format'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_file_format'] = [
             'innodb_file_format',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_file_format_check'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_file_format_check'] = [
             'innodb_file_format_check',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_file_format_max'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_file_format_max'] = [
             'innodb_file_format_max',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_file_per_table'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_file_per_table'] = [
             'innodb_file_per_table',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_fill_factor'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_fill_factor'] = [
             'innodb_fill_factor',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_flush_log_at_timeout'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_flush_log_at_timeout'] = [
             'innodb_flush_log_at_timeout',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_flush_log_at_trx_commit'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_flush_log_at_trx_commit'] = [
             'innodb_flush_log_at_trx_commit',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_flush_method'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_flush_method'] = [
             'innodb_flush_method',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_flush_neighbors'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_flush_neighbors'] = [
             'innodb_flush_neighbors',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_flush_sync'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_flush_sync'] = [
             'innodb_flush_sync',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_flushing_avg_loops'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_flushing_avg_loops'] = [
             'innodb_flushing_avg_loops',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_force_load_corrupted'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_force_load_corrupted'] = [
             'innodb_force_load_corrupted',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_force_recovery'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_force_recovery'] = [
             'innodb_force_recovery',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_aux_table'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_ft_aux_table'] = [
             'innodb_ft_aux_table',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_cache_size'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_ft_cache_size'] = [
             'innodb_ft_cache_size',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_enable_diag_print'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_ft_enable_diag_print'] = [
             'innodb_ft_enable_diag_print',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_enable_stopword'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_ft_enable_stopword'] = [
             'innodb_ft_enable_stopword',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_max_token_size'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_ft_max_token_size'] = [
             'innodb_ft_max_token_size',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_min_token_size'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_ft_min_token_size'] = [
             'innodb_ft_min_token_size',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_num_word_optimize'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_ft_num_word_optimize'] = [
             'innodb_ft_num_word_optimize',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_result_cache_limit'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_ft_result_cache_limit'] = [
             'innodb_ft_result_cache_limit',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_server_stopword_table'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_ft_server_stopword_table'] = [
             'innodb_ft_server_stopword_table',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_sort_pll_degree'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_ft_sort_pll_degree'] = [
             'innodb_ft_sort_pll_degree',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_total_cache_size'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_ft_total_cache_size'] = [
             'innodb_ft_total_cache_size',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_ft_user_stopword_table'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_ft_user_stopword_table'] = [
             'innodb_ft_user_stopword_table',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_io_capacity'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_io_capacity'] = [
             'innodb_io_capacity',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_io_capacity_max'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_io_capacity_max'] = [
             'innodb_io_capacity_max',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_large_prefix'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_large_prefix'] = [
             'innodb_large_prefix',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_lock_wait_timeout'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_lock_wait_timeout'] = [
             'innodb_lock_wait_timeout',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_locks_unsafe_for_binlog'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_locks_unsafe_for_binlog'] = [
             'innodb_locks_unsafe_for_binlog',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_log_buffer_size'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_log_buffer_size'] = [
             'innodb_log_buffer_size',
             'innodb-parameters',
             'sysvar',
-            'byte');
-        $variable_doc_links['innodb_log_checksum_algorithm'] = array(
+            'byte'];
+        $variable_doc_links['innodb_log_checksum_algorithm'] = [
             'innodb_log_checksum_algorithm',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_log_compressed_pages'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_log_compressed_pages'] = [
             'innodb_log_compressed_pages',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_log_file_size'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_log_file_size'] = [
             'innodb_log_file_size',
             'innodb-parameters',
             'sysvar',
-            'byte');
-        $variable_doc_links['innodb_log_files_in_group'] = array(
+            'byte'];
+        $variable_doc_links['innodb_log_files_in_group'] = [
             'innodb_log_files_in_group',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_log_group_home_dir'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_log_group_home_dir'] = [
             'innodb_log_group_home_dir',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_log_write_ahead_size'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_log_write_ahead_size'] = [
             'innodb_log_write_ahead_size',
             'innodb-parameters',
             'sysvar',
-            'byte');
-        $variable_doc_links['innodb_lru_scan_depth'] = array(
+            'byte'];
+        $variable_doc_links['innodb_lru_scan_depth'] = [
             'innodb_lru_scan_depth',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_max_dirty_pages_pct'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_max_dirty_pages_pct'] = [
             'innodb_max_dirty_pages_pct',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_max_dirty_pages_pct_lwm'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_max_dirty_pages_pct_lwm'] = [
             'innodb_max_dirty_pages_pct_lwm',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_max_purge_lag'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_max_purge_lag'] = [
             'innodb_max_purge_lag',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_max_purge_lag_delay'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_max_purge_lag_delay'] = [
             'innodb_max_purge_lag_delay',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_max_undo_log_size'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_max_undo_log_size'] = [
             'innodb_max_undo_log_size',
             'innodb-parameters',
             'sysvar',
-            'byte');
-        $variable_doc_links['innodb_mirrored_log_groups'] = array(
+            'byte'];
+        $variable_doc_links['innodb_mirrored_log_groups'] = [
             'innodb_mirrored_log_groups',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_monitor_disable'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_monitor_disable'] = [
             'innodb_monitor_disable',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_monitor_enable'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_monitor_enable'] = [
             'innodb_monitor_enable',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_monitor_reset'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_monitor_reset'] = [
             'innodb_monitor_reset',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_monitor_reset_all'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_monitor_reset_all'] = [
             'innodb_monitor_reset_all',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_old_blocks_pct'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_old_blocks_pct'] = [
             'innodb_old_blocks_pct',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_old_blocks_time'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_old_blocks_time'] = [
             'innodb_old_blocks_time',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_online_alter_log_max_size'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_online_alter_log_max_size'] = [
             'innodb_online_alter_log_max_size',
             'innodb-parameters',
             'sysvar',
-            'byte');
-        $variable_doc_links['innodb_open_files'] = array(
+            'byte'];
+        $variable_doc_links['innodb_open_files'] = [
             'innodb_open_files',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_optimize_fulltext_only'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_optimize_fulltext_only'] = [
             'innodb_optimize_fulltext_only',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_page_cleaners'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_page_cleaners'] = [
             'innodb_page_cleaners',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_page_size'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_page_size'] = [
             'innodb_page_size',
             'innodb-parameters',
             'sysvar',
-            'byte');
-        $variable_doc_links['innodb_print_all_deadlocks'] = array(
+            'byte'];
+        $variable_doc_links['innodb_print_all_deadlocks'] = [
             'innodb_print_all_deadlocks',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_purge_batch_size'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_purge_batch_size'] = [
             'innodb_purge_batch_size',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_purge_rseg_truncate_frequency'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_purge_rseg_truncate_frequency'] = [
             'innodb_purge_rseg_truncate_frequency',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_purge_threads'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_purge_threads'] = [
             'innodb_purge_threads',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_random_read_ahead'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_random_read_ahead'] = [
             'innodb_random_read_ahead',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_read_ahead_threshold'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_read_ahead_threshold'] = [
             'innodb_read_ahead_threshold',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_read_io_threads'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_read_io_threads'] = [
             'innodb_read_io_threads',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_read_only'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_read_only'] = [
             'innodb_read_only',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_replication_delay'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_replication_delay'] = [
             'innodb_replication_delay',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_rollback_on_timeout'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_rollback_on_timeout'] = [
             'innodb_rollback_on_timeout',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_rollback_segments'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_rollback_segments'] = [
             'innodb_rollback_segments',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_sort_buffer_size'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_sort_buffer_size'] = [
             'innodb_sort_buffer_size',
             'innodb-parameters',
             'sysvar',
-            'byte');
-        $variable_doc_links['innodb_spin_wait_delay'] = array(
+            'byte'];
+        $variable_doc_links['innodb_spin_wait_delay'] = [
             'innodb_spin_wait_delay',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_stats_auto_recalc'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_stats_auto_recalc'] = [
             'innodb_stats_auto_recalc',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_stats_method'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_stats_method'] = [
             'innodb_stats_method',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_stats_on_metadata'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_stats_on_metadata'] = [
             'innodb_stats_on_metadata',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_stats_persistent'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_stats_persistent'] = [
             'innodb_stats_persistent',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_stats_persistent_sample_pages'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_stats_persistent_sample_pages'] = [
             'innodb_stats_persistent_sample_pages',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_stats_sample_pages'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_stats_sample_pages'] = [
             'innodb_stats_sample_pages',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_stats_transient_sample_pages'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_stats_transient_sample_pages'] = [
             'innodb_stats_transient_sample_pages',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_status_output'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_status_output'] = [
             'innodb_status_output',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_status_output_locks'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_status_output_locks'] = [
             'innodb_status_output_locks',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_strict_mode'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_strict_mode'] = [
             'innodb_strict_mode',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_support_xa'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_support_xa'] = [
             'innodb_support_xa',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_sync_array_size'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_sync_array_size'] = [
             'innodb_sync_array_size',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_sync_spin_loops'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_sync_spin_loops'] = [
             'innodb_sync_spin_loops',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_table_locks'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_table_locks'] = [
             'innodb_table_locks',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_temp_data_file_path'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_temp_data_file_path'] = [
             'innodb_temp_data_file_path',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_thread_concurrency'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_thread_concurrency'] = [
             'innodb_thread_concurrency',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_thread_sleep_delay'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_thread_sleep_delay'] = [
             'innodb_thread_sleep_delay',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_undo_directory'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_undo_directory'] = [
             'innodb_undo_directory',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_undo_log_truncate'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_undo_log_truncate'] = [
             'innodb_undo_log_truncate',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_undo_logs'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_undo_logs'] = [
             'innodb_undo_logs',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_undo_tablespaces'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_undo_tablespaces'] = [
             'innodb_undo_tablespaces',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_use_native_aio'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_use_native_aio'] = [
             'innodb_use_native_aio',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_use_sys_malloc'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_use_sys_malloc'] = [
             'innodb_use_sys_malloc',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_version'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_version'] = [
             'innodb_version',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['innodb_write_io_threads'] = array(
+            'sysvar'];
+        $variable_doc_links['innodb_write_io_threads'] = [
             'innodb_write_io_threads',
             'innodb-parameters',
-            'sysvar');
-        $variable_doc_links['insert_id'] = array(
+            'sysvar'];
+        $variable_doc_links['insert_id'] = [
             'insert_id',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['interactive_timeout'] = array(
+            'sysvar'];
+        $variable_doc_links['interactive_timeout'] = [
             'interactive_timeout',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['internal_tmp_disk_storage_engine'] = array(
+            'sysvar'];
+        $variable_doc_links['internal_tmp_disk_storage_engine'] = [
             'internal_tmp_disk_storage_engine',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['join_buffer_size'] = array(
+            'sysvar'];
+        $variable_doc_links['join_buffer_size'] = [
             'join_buffer_size',
             'server-system-variables',
             'sysvar',
-            'byte');
-        $variable_doc_links['keep_files_on_create'] = array(
+            'byte'];
+        $variable_doc_links['keep_files_on_create'] = [
             'keep_files_on_create',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['key_buffer_size'] = array(
+            'sysvar'];
+        $variable_doc_links['key_buffer_size'] = [
             'key_buffer_size',
             'server-system-variables',
             'sysvar',
-            'byte');
-        $variable_doc_links['key_cache_age_threshold'] = array(
+            'byte'];
+        $variable_doc_links['key_cache_age_threshold'] = [
             'key_cache_age_threshold',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['key_cache_block_size'] = array(
+            'sysvar'];
+        $variable_doc_links['key_cache_block_size'] = [
             'key_cache_block_size',
             'server-system-variables',
             'sysvar',
-            'byte');
-        $variable_doc_links['key_cache_division_limit'] = array(
+            'byte'];
+        $variable_doc_links['key_cache_division_limit'] = [
             'key_cache_division_limit',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['language'] = array(
+            'sysvar'];
+        $variable_doc_links['language'] = [
             'language',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['large_files_support'] = array(
+            'option_mysqld'];
+        $variable_doc_links['large_files_support'] = [
             'large_files_support',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['large_page_size'] = array(
+            'sysvar'];
+        $variable_doc_links['large_page_size'] = [
             'large_page_size',
             'server-system-variables',
             'sysvar',
-            'byte');
-        $variable_doc_links['large_pages'] = array(
+            'byte'];
+        $variable_doc_links['large_pages'] = [
             'large-pages',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['last_insert_id'] = array(
+            'option_mysqld'];
+        $variable_doc_links['last_insert_id'] = [
             'last_insert_id',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['lc_messages'] = array(
+            'sysvar'];
+        $variable_doc_links['lc_messages'] = [
             'lc-messages',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['lc_messages_dir'] = array(
+            'option_mysqld'];
+        $variable_doc_links['lc_messages_dir'] = [
             'lc-messages-dir',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['lc_time_names'] = array(
+            'option_mysqld'];
+        $variable_doc_links['lc_time_names'] = [
             'lc_time_names',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['license'] = array(
+            'sysvar'];
+        $variable_doc_links['license'] = [
             'license',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['local_infile'] = array(
+            'sysvar'];
+        $variable_doc_links['local_infile'] = [
             'local_infile',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['lock_wait_timeout'] = array(
+            'sysvar'];
+        $variable_doc_links['lock_wait_timeout'] = [
             'lock_wait_timeout',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['locked_in_memory'] = array(
+            'sysvar'];
+        $variable_doc_links['locked_in_memory'] = [
             'locked_in_memory',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['log_backward_compatible_user_definitions'] = array(
+            'sysvar'];
+        $variable_doc_links['log_backward_compatible_user_definitions'] = [
             'log_backward_compatible_user_definitions',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['log'] = array(
+            'sysvar'];
+        $variable_doc_links['log'] = [
             'log',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['log_bin'] = array(
+            'option_mysqld'];
+        $variable_doc_links['log_bin'] = [
             'log_bin',
             'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['log-bin'] = array(
+            'sysvar'];
+        $variable_doc_links['log-bin'] = [
             'log-bin',
             'replication-options-binary-log',
-            'option_mysqld');
-        $variable_doc_links['log_bin_basename'] = array(
+            'option_mysqld'];
+        $variable_doc_links['log_bin_basename'] = [
             'log_bin_basename',
             'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['log_bin_index'] = array(
+            'sysvar'];
+        $variable_doc_links['log_bin_index'] = [
             'log_bin_index',
             'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['log_bin_trust_function_creators'] = array(
+            'sysvar'];
+        $variable_doc_links['log_bin_trust_function_creators'] = [
             'log-bin-trust-function-creators',
             'replication-options-binary-log',
-            'option_mysqld');
-        $variable_doc_links['log_bin_use_v1_row_events'] = array(
+            'option_mysqld'];
+        $variable_doc_links['log_bin_use_v1_row_events'] = [
             'log_bin_use_v1_row_events',
             'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['log_error'] = array(
+            'sysvar'];
+        $variable_doc_links['log_error'] = [
             'log-error',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['log_error_verbosity'] = array(
+            'option_mysqld'];
+        $variable_doc_links['log_error_verbosity'] = [
             'log_error_verbosity',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['log_output'] = array(
+            'sysvar'];
+        $variable_doc_links['log_output'] = [
             'log-output',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['log_queries_not_using_indexes'] = array(
+            'option_mysqld'];
+        $variable_doc_links['log_queries_not_using_indexes'] = [
             'log-queries-not-using-indexes',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['log_slave_updates'] = array(
+            'option_mysqld'];
+        $variable_doc_links['log_slave_updates'] = [
             'log-slave-updates',
             'replication-options-slave',
-            'option_mysqld');
-        $variable_doc_links['log_slow_admin_statements'] = array(
+            'option_mysqld'];
+        $variable_doc_links['log_slow_admin_statements'] = [
             'log_slow_admin_statements',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['log_slow_slave_statements'] = array(
+            'sysvar'];
+        $variable_doc_links['log_slow_slave_statements'] = [
             'log_slow_slave_statements',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['log_syslog'] = array(
+            'sysvar'];
+        $variable_doc_links['log_syslog'] = [
             'log_syslog',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['log_syslog_facility'] = array(
+            'sysvar'];
+        $variable_doc_links['log_syslog_facility'] = [
             'log_syslog_facility',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['log_syslog_include_pid'] = array(
+            'sysvar'];
+        $variable_doc_links['log_syslog_include_pid'] = [
             'log_syslog_include_pid',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['log_syslog_tag'] = array(
+            'sysvar'];
+        $variable_doc_links['log_syslog_tag'] = [
             'log_syslog_tag',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['log_throttle_queries_not_using_indexes'] = array(
+            'sysvar'];
+        $variable_doc_links['log_throttle_queries_not_using_indexes'] = [
             'log_throttle_queries_not_using_indexes',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['log_timestamps'] = array(
+            'sysvar'];
+        $variable_doc_links['log_timestamps'] = [
             'log_timestamps',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['log_slow_queries'] = array(
+            'sysvar'];
+        $variable_doc_links['log_slow_queries'] = [
             'log-slow-queries',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['log_warnings'] = array(
+            'option_mysqld'];
+        $variable_doc_links['log_warnings'] = [
             'log-warnings',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['long_query_time'] = array(
+            'option_mysqld'];
+        $variable_doc_links['long_query_time'] = [
             'long_query_time',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['low_priority_updates'] = array(
+            'sysvar'];
+        $variable_doc_links['low_priority_updates'] = [
             'low-priority-updates',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['lower_case_file_system'] = array(
+            'option_mysqld'];
+        $variable_doc_links['lower_case_file_system'] = [
             'lower_case_file_system',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['lower_case_table_names'] = array(
+            'sysvar'];
+        $variable_doc_links['lower_case_table_names'] = [
             'lower_case_table_names',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['master_info_repository'] = array(
+            'sysvar'];
+        $variable_doc_links['master_info_repository'] = [
             'master_info_repository',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['master_verify_checksum'] = array(
+            'sysvar'];
+        $variable_doc_links['master_verify_checksum'] = [
             'master_verify_checksum',
             'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['master-bind'] = array(
+            'sysvar'];
+        $variable_doc_links['master-bind'] = [
             '',
             'replication-options',
-            0);
-        $variable_doc_links['max_allowed_packet'] = array(
+            0];
+        $variable_doc_links['max_allowed_packet'] = [
             'max_allowed_packet',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_binlog_cache_size'] = array(
+            'sysvar'];
+        $variable_doc_links['max_binlog_cache_size'] = [
             'max_binlog_cache_size',
             'replication-options-binary-log',
             'sysvar',
-            'byte');
-        $variable_doc_links['max_binlog_size'] = array(
+            'byte'];
+        $variable_doc_links['max_binlog_size'] = [
             'max_binlog_size',
             'replication-options-binary-log',
             'sysvar',
-            'byte');
-        $variable_doc_links['max_binlog_stmt_cache_size'] = array(
+            'byte'];
+        $variable_doc_links['max_binlog_stmt_cache_size'] = [
             'max_binlog_stmt_cache_size',
             'replication-options-binary-log',
             'sysvar',
-            'byte');
-        $variable_doc_links['max_connect_errors'] = array(
+            'byte'];
+        $variable_doc_links['max_connect_errors'] = [
             'max_connect_errors',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_connections'] = array(
+            'sysvar'];
+        $variable_doc_links['max_connections'] = [
             'max_connections',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_delayed_threads'] = array(
+            'sysvar'];
+        $variable_doc_links['max_delayed_threads'] = [
             'max_delayed_threads',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_digest_length'] = array(
+            'sysvar'];
+        $variable_doc_links['max_digest_length'] = [
             'max_digest_length',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_error_count'] = array(
+            'sysvar'];
+        $variable_doc_links['max_error_count'] = [
             'max_error_count',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_execution_time'] = array(
+            'sysvar'];
+        $variable_doc_links['max_execution_time'] = [
             'max_execution_time',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_heap_table_size'] = array(
+            'sysvar'];
+        $variable_doc_links['max_heap_table_size'] = [
             'max_heap_table_size',
             'server-system-variables',
             'sysvar',
-            'byte');
-        $variable_doc_links['max_insert_delayed_threads'] = array(
+            'byte'];
+        $variable_doc_links['max_insert_delayed_threads'] = [
             'max_insert_delayed_threads',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_join_size'] = array(
+            'sysvar'];
+        $variable_doc_links['max_join_size'] = [
             'max_join_size',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_length_for_sort_data'] = array(
+            'sysvar'];
+        $variable_doc_links['max_length_for_sort_data'] = [
             'max_length_for_sort_data',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_points_in_geometry'] = array(
+            'sysvar'];
+        $variable_doc_links['max_points_in_geometry'] = [
             'max_points_in_geometry',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_long_data_size'] = array(
+            'sysvar'];
+        $variable_doc_links['max_long_data_size'] = [
             'max_long_data_size',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_prepared_stmt_count'] = array(
+            'sysvar'];
+        $variable_doc_links['max_prepared_stmt_count'] = [
             'max_prepared_stmt_count',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_relay_log_size'] = array(
+            'sysvar'];
+        $variable_doc_links['max_relay_log_size'] = [
             'max_relay_log_size',
             'server-system-variables',
             'sysvar',
-            'byte');
-        $variable_doc_links['max_seeks_for_key'] = array(
+            'byte'];
+        $variable_doc_links['max_seeks_for_key'] = [
             'max_seeks_for_key',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_sort_length'] = array(
+            'sysvar'];
+        $variable_doc_links['max_sort_length'] = [
             'max_sort_length',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_sp_recursion_depth'] = array(
+            'sysvar'];
+        $variable_doc_links['max_sp_recursion_depth'] = [
             'max_sp_recursion_depth',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_tmp_tables'] = array(
+            'sysvar'];
+        $variable_doc_links['max_tmp_tables'] = [
             'max_tmp_tables',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_user_connections'] = array(
+            'sysvar'];
+        $variable_doc_links['max_user_connections'] = [
             'max_user_connections',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['max_write_lock_count'] = array(
+            'sysvar'];
+        $variable_doc_links['max_write_lock_count'] = [
             'max_write_lock_count',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['metadata_locks_cache_size'] = array(
+            'sysvar'];
+        $variable_doc_links['metadata_locks_cache_size'] = [
             'metadata_locks_cache_size',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['metadata_locks_hash_instances'] = array(
+            'sysvar'];
+        $variable_doc_links['metadata_locks_hash_instances'] = [
             'metadata_locks_hash_instances',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['memlock'] = array(
+            'sysvar'];
+        $variable_doc_links['memlock'] = [
             'memlock',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['min_examined_row_limit'] = array(
+            'option_mysqld'];
+        $variable_doc_links['min_examined_row_limit'] = [
             'min-examined-row-limit',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['multi_range_count'] = array(
+            'option_mysqld'];
+        $variable_doc_links['multi_range_count'] = [
             'multi_range_count',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['myisam_data_pointer_size'] = array(
+            'sysvar'];
+        $variable_doc_links['myisam_data_pointer_size'] = [
             'myisam_data_pointer_size',
             'server-system-variables',
             'sysvar',
-            'byte');
-        $variable_doc_links['myisam_max_sort_file_size'] = array(
+            'byte'];
+        $variable_doc_links['myisam_max_sort_file_size'] = [
             'myisam_max_sort_file_size',
             'server-system-variables',
             'sysvar',
-            'byte');
-        $variable_doc_links['myisam_mmap_size'] = array(
+            'byte'];
+        $variable_doc_links['myisam_mmap_size'] = [
             'myisam_mmap_size',
             'server-system-variables',
             'sysvar',
-            'byte');
-        $variable_doc_links['myisam_recover_options'] = array(
+            'byte'];
+        $variable_doc_links['myisam_recover_options'] = [
             'myisam_recover_options',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['myisam_repair_threads'] = array(
+            'sysvar'];
+        $variable_doc_links['myisam_repair_threads'] = [
             'myisam_repair_threads',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['myisam_sort_buffer_size'] = array(
+            'sysvar'];
+        $variable_doc_links['myisam_sort_buffer_size'] = [
             'myisam_sort_buffer_size',
             'server-system-variables',
             'sysvar',
-            'byte');
-        $variable_doc_links['myisam_stats_method'] = array(
+            'byte'];
+        $variable_doc_links['myisam_stats_method'] = [
             'myisam_stats_method',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['myisam_use_mmap'] = array(
+            'sysvar'];
+        $variable_doc_links['myisam_use_mmap'] = [
             'myisam_use_mmap',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['mysql_native_password_proxy_users'] = array(
+            'sysvar'];
+        $variable_doc_links['mysql_native_password_proxy_users'] = [
             'mysql_native_password_proxy_users',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['named_pipe'] = array(
+            'sysvar'];
+        $variable_doc_links['named_pipe'] = [
             'named_pipe',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['net_buffer_length'] = array(
+            'sysvar'];
+        $variable_doc_links['net_buffer_length'] = [
             'net_buffer_length',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['net_read_timeout'] = array(
+            'sysvar'];
+        $variable_doc_links['net_read_timeout'] = [
             'net_read_timeout',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['net_retry_count'] = array(
+            'sysvar'];
+        $variable_doc_links['net_retry_count'] = [
             'net_retry_count',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['net_write_timeout'] = array(
+            'sysvar'];
+        $variable_doc_links['net_write_timeout'] = [
             'net_write_timeout',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['new'] = array(
+            'sysvar'];
+        $variable_doc_links['new'] = [
             'new',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['ngram_token_size'] = array(
+            'sysvar'];
+        $variable_doc_links['ngram_token_size'] = [
             'ngram_token_size',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['offline_mode'] = array(
+            'sysvar'];
+        $variable_doc_links['offline_mode'] = [
             'offline_mode',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['old'] = array(
+            'sysvar'];
+        $variable_doc_links['old'] = [
             'old',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['old_alter_table'] = array(
+            'sysvar'];
+        $variable_doc_links['old_alter_table'] = [
             'old-alter-table',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['old_passwords'] = array(
+            'option_mysqld'];
+        $variable_doc_links['old_passwords'] = [
             'old-passwords',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['open_files_limit'] = array(
+            'option_mysqld'];
+        $variable_doc_links['open_files_limit'] = [
             'open-files-limit',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['optimizer_prune_level'] = array(
+            'option_mysqld'];
+        $variable_doc_links['optimizer_prune_level'] = [
             'optimizer_prune_level',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['optimizer_search_depth'] = array(
+            'sysvar'];
+        $variable_doc_links['optimizer_search_depth'] = [
             'optimizer_search_depth',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['optimizer_switch'] = array(
+            'sysvar'];
+        $variable_doc_links['optimizer_switch'] = [
             'optimizer_switch',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['optimizer_trace'] = array(
+            'sysvar'];
+        $variable_doc_links['optimizer_trace'] = [
             'optimizer_trace',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['optimizer_trace_features'] = array(
+            'sysvar'];
+        $variable_doc_links['optimizer_trace_features'] = [
             'optimizer_trace_features',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['optimizer_trace_limit'] = array(
+            'sysvar'];
+        $variable_doc_links['optimizer_trace_limit'] = [
             'optimizer_trace_limit',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['optimizer_trace_max_mem_size'] = array(
+            'sysvar'];
+        $variable_doc_links['optimizer_trace_max_mem_size'] = [
             'optimizer_trace_max_mem_size',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['optimizer_trace_offset'] = array(
+            'sysvar'];
+        $variable_doc_links['optimizer_trace_offset'] = [
             'optimizer_trace_offset',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['partition'] = array(
+            'sysvar'];
+        $variable_doc_links['partition'] = [
             'partition',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['performance_schema'] = array(
+            'option_mysqld'];
+        $variable_doc_links['performance_schema'] = [
             'performance_schema',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_accounts_size'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_accounts_size'] = [
             'performance_schema_accounts_size',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_digests_size'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_digests_size'] = [
             'performance_schema_digests_size',
             'performance-schema-system-variables',
-            'sysvar');
+            'sysvar'];
         $variable_doc_links['performance_schema_events_stages_history_long_size']
-            = array(
+            = [
                 'performance_schema_events_stages_history_long_size',
                 'performance-schema-system-variables',
                 'sysvar',
-            );
-        $variable_doc_links['performance_schema_events_stages_history_size'] = array(
+            ];
+        $variable_doc_links['performance_schema_events_stages_history_size'] = [
             'performance_schema_events_stages_history_size',
             'performance-schema-system-variables',
-            'sysvar');
+            'sysvar'];
         $variable_doc_links['performance_schema_events_statements_history_long_size']
-            = array(
+            = [
                 'performance_schema_events_statements_history_long_size',
                 'performance-schema-system-variables',
                 'sysvar',
-            );
+            ];
         $variable_doc_links['performance_schema_events_statements_history_size']
-            = array(
+            = [
                 'performance_schema_events_statements_history_size',
                 'performance-schema-system-variables',
                 'sysvar',
-            );
+            ];
         $variable_doc_links['performance_schema_events_transactions_history_long_size']
-            = array(
+            = [
                 'performance_schema_events_transactions_history_long_size',
                 'performance-schema-system-variables',
                 'sysvar',
-            );
+            ];
         $variable_doc_links['performance_schema_events_transactions_history_size']
-            = array(
+            = [
                 'performance_schema_events_transactions_history_size',
                 'performance-schema-system-variables',
                 'sysvar',
-            );
+            ];
         $variable_doc_links['performance_schema_events_waits_history_long_size']
-            = array(
+            = [
                 'performance_schema_events_waits_history_long_size',
                 'performance-schema-system-variables',
                 'sysvar',
-            );
-        $variable_doc_links['performance_schema_events_waits_history_size'] = array(
+            ];
+        $variable_doc_links['performance_schema_events_waits_history_size'] = [
             'performance_schema_events_waits_history_size',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_hosts_size'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_hosts_size'] = [
             'performance_schema_hosts_size',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_cond_classes'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_cond_classes'] = [
             'performance_schema_max_cond_classes',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_cond_instances'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_cond_instances'] = [
             'performance_schema_max_cond_instances',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_digest_length'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_digest_length'] = [
             'performance_schema_max_digest_length',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_file_classes'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_file_classes'] = [
             'performance_schema_max_file_classes',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_file_handles'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_file_handles'] = [
             'performance_schema_max_file_handles',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_file_instances'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_file_instances'] = [
             'performance_schema_max_file_instances',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_index_stat'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_index_stat'] = [
             'performance_schema_max_index_stat',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_memory_classes'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_memory_classes'] = [
             'performance_schema_max_memory_classes',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_metadata_locks'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_metadata_locks'] = [
             'performance_schema_max_metadata_locks',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_mutex_classes'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_mutex_classes'] = [
             'performance_schema_max_mutex_classes',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_mutex_instances'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_mutex_instances'] = [
             'performance_schema_max_mutex_instances',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_prepared_statements_instances'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_prepared_statements_instances'] = [
             'performance_schema_max_prepared_statements_instances',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_program_instances'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_program_instances'] = [
             'performance_schema_max_program_instances',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_rwlock_classes'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_rwlock_classes'] = [
             'performance_schema_max_rwlock_classes',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_rwlock_instances'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_rwlock_instances'] = [
             'performance_schema_max_rwlock_instances',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_socket_classes'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_socket_classes'] = [
             'performance_schema_max_socket_classes',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_socket_instances'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_socket_instances'] = [
             'performance_schema_max_socket_instances',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_sql_text_length'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_sql_text_length'] = [
             'performance_schema_max_sql_text_length',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_stage_classes'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_stage_classes'] = [
             'performance_schema_max_stage_classes',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_statement_classes'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_statement_classes'] = [
             'performance_schema_max_statement_classes',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_statement_stack'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_statement_stack'] = [
             'performance_schema_max_statement_stack',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_table_handles'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_table_handles'] = [
             'performance_schema_max_table_handles',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_table_instances'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_table_instances'] = [
             'performance_schema_max_table_instances',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_table_lock_stat'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_table_lock_stat'] = [
             'performance_schema_max_table_lock_stat',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_thread_classes'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_thread_classes'] = [
             'performance_schema_max_thread_classes',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_max_thread_instances'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_max_thread_instances'] = [
             'performance_schema_max_thread_instances',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_session_connect_attrs_size'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_session_connect_attrs_size'] = [
             'performance_schema_session_connect_attrs_size',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_setup_actors_size'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_setup_actors_size'] = [
             'performance_schema_setup_actors_size',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_setup_objects_size'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_setup_objects_size'] = [
             'performance_schema_setup_objects_size',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['performance_schema_users_size'] = array(
+            'sysvar'];
+        $variable_doc_links['performance_schema_users_size'] = [
             'performance_schema_users_size',
             'performance-schema-system-variables',
-            'sysvar');
-        $variable_doc_links['pid_file'] = array(
+            'sysvar'];
+        $variable_doc_links['pid_file'] = [
             'pid-file',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['plugin_dir'] = array(
+            'option_mysqld'];
+        $variable_doc_links['plugin_dir'] = [
             'plugin_dir',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['port'] = array(
+            'sysvar'];
+        $variable_doc_links['port'] = [
             'port',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['preload_buffer_size'] = array(
+            'option_mysqld'];
+        $variable_doc_links['preload_buffer_size'] = [
             'preload_buffer_size',
             'server-system-variables',
             'sysvar',
-            'byte');
-        $variable_doc_links['profiling'] = array(
+            'byte'];
+        $variable_doc_links['profiling'] = [
             'profiling',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['profiling_history_size'] = array(
+            'sysvar'];
+        $variable_doc_links['profiling_history_size'] = [
             'profiling_history_size',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['protocol_version'] = array(
+            'sysvar'];
+        $variable_doc_links['protocol_version'] = [
             'protocol_version',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['proxy_user'] = array(
+            'sysvar'];
+        $variable_doc_links['proxy_user'] = [
             'proxy_user',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['pseudo_thread_id'] = array(
+            'sysvar'];
+        $variable_doc_links['pseudo_thread_id'] = [
             'pseudo_thread_id',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['query_alloc_block_size'] = array(
+            'sysvar'];
+        $variable_doc_links['query_alloc_block_size'] = [
             'query_alloc_block_size',
             'server-system-variables',
             'sysvar',
-            'byte');
-        $variable_doc_links['query_cache_limit'] = array(
+            'byte'];
+        $variable_doc_links['query_cache_limit'] = [
             'query_cache_limit',
             'server-system-variables',
             'sysvar',
-            'byte');
-        $variable_doc_links['query_cache_min_res_unit'] = array(
+            'byte'];
+        $variable_doc_links['query_cache_min_res_unit'] = [
             'query_cache_min_res_unit',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['query_cache_size'] = array(
+            'sysvar'];
+        $variable_doc_links['query_cache_size'] = [
             'query_cache_size',
             'server-system-variables',
             'sysvar',
-            'byte');
-        $variable_doc_links['query_cache_type'] = array(
+            'byte'];
+        $variable_doc_links['query_cache_type'] = [
             'query_cache_type',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['query_cache_wlock_invalidate'] = array(
+            'sysvar'];
+        $variable_doc_links['query_cache_wlock_invalidate'] = [
             'query_cache_wlock_invalidate',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['query_prealloc_size'] = array(
+            'sysvar'];
+        $variable_doc_links['query_prealloc_size'] = [
             'query_prealloc_size',
             'server-system-variables',
             'sysvar',
-            'byte');
-        $variable_doc_links['rand_seed1'] = array(
+            'byte'];
+        $variable_doc_links['rand_seed1'] = [
             'rand_seed1',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['rand_seed2'] = array(
+            'sysvar'];
+        $variable_doc_links['rand_seed2'] = [
             'rand_seed2',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['range_alloc_block_size'] = array(
+            'sysvar'];
+        $variable_doc_links['range_alloc_block_size'] = [
             'range_alloc_block_size',
             'server-system-variables',
             'sysvar',
-            'byte');
-        $variable_doc_links['rbr_exec_mode'] = array(
+            'byte'];
+        $variable_doc_links['rbr_exec_mode'] = [
             'rbr_exec_mode',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['read_buffer_size'] = array(
+            'sysvar'];
+        $variable_doc_links['read_buffer_size'] = [
             'read_buffer_size',
             'server-system-variables',
             'sysvar',
-            'byte');
-        $variable_doc_links['read_only'] = array(
+            'byte'];
+        $variable_doc_links['read_only'] = [
             'read_only',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['read_rnd_buffer_size'] = array(
+            'sysvar'];
+        $variable_doc_links['read_rnd_buffer_size'] = [
             'read_rnd_buffer_size',
             'server-system-variables',
             'sysvar',
-            'byte');
-        $variable_doc_links['relay_log'] = array(
+            'byte'];
+        $variable_doc_links['relay_log'] = [
             'relay_log',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['relay_log_basename'] = array(
+            'sysvar'];
+        $variable_doc_links['relay_log_basename'] = [
             'relay_log_basename',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['relay-log-index'] = array(
+            'sysvar'];
+        $variable_doc_links['relay-log-index'] = [
             'relay-log-index',
             'replication-options-slave',
-            'option_mysqld');
-        $variable_doc_links['relay_log_index'] = array(
+            'option_mysqld'];
+        $variable_doc_links['relay_log_index'] = [
             'relay_log_index',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['relay_log_info_file'] = array(
+            'sysvar'];
+        $variable_doc_links['relay_log_info_file'] = [
             'relay_log_info_file',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['relay_log_info_repository'] = array(
+            'sysvar'];
+        $variable_doc_links['relay_log_info_repository'] = [
             'relay_log_info_repository',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['relay_log_purge'] = array(
+            'sysvar'];
+        $variable_doc_links['relay_log_purge'] = [
             'relay_log_purge',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['relay_log_recovery'] = array(
+            'sysvar'];
+        $variable_doc_links['relay_log_recovery'] = [
             'relay_log_recovery',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['relay_log_space_limit'] = array(
+            'sysvar'];
+        $variable_doc_links['relay_log_space_limit'] = [
             'relay_log_space_limit',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['report_host'] = array(
+            'sysvar'];
+        $variable_doc_links['report_host'] = [
             'report-host',
             'replication-options-slave',
-            'option_mysqld');
-        $variable_doc_links['report_password'] = array(
+            'option_mysqld'];
+        $variable_doc_links['report_password'] = [
             'report-password',
             'replication-options-slave',
-            'option_mysqld');
-        $variable_doc_links['report_port'] = array(
+            'option_mysqld'];
+        $variable_doc_links['report_port'] = [
             'report-port',
             'replication-options-slave',
-            'option_mysqld');
-        $variable_doc_links['report_user'] = array(
+            'option_mysqld'];
+        $variable_doc_links['report_user'] = [
             'report-user',
             'replication-options-slave',
-            'option_mysqld');
-        $variable_doc_links['require_secure_transport'] = array(
+            'option_mysqld'];
+        $variable_doc_links['require_secure_transport'] = [
             'require_secure_transport',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['rpl_stop_slave_timeout'] = array(
+            'sysvar'];
+        $variable_doc_links['rpl_stop_slave_timeout'] = [
             'rpl_stop_slave_timeout',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['rpl_recovery_rank'] = array(
+            'sysvar'];
+        $variable_doc_links['rpl_recovery_rank'] = [
             'rpl_recovery_rank',
             'replication-options-slave',
-            'option_mysqld');
-        $variable_doc_links['rpl_semi_sync_master_enabled'] = array(
+            'option_mysqld'];
+        $variable_doc_links['rpl_semi_sync_master_enabled'] = [
             'rpl_semi_sync_master_enabled',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['rpl_semi_sync_master_timeout'] = array(
+            'sysvar'];
+        $variable_doc_links['rpl_semi_sync_master_timeout'] = [
             'rpl_semi_sync_master_timeout',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['rpl_semi_sync_master_trace_level'] = array(
+            'sysvar'];
+        $variable_doc_links['rpl_semi_sync_master_trace_level'] = [
             'rpl_semi_sync_master_trace_level',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['rpl_semi_sync_master_wait_no_slave'] = array(
+            'sysvar'];
+        $variable_doc_links['rpl_semi_sync_master_wait_no_slave'] = [
             'rpl_semi_sync_master_wait_no_slave',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['rpl_semi_sync_slave_enabled'] = array(
+            'sysvar'];
+        $variable_doc_links['rpl_semi_sync_slave_enabled'] = [
             'rpl_semi_sync_slave_enabled',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['rpl_semi_sync_slave_trace_level'] = array(
+            'sysvar'];
+        $variable_doc_links['rpl_semi_sync_slave_trace_level'] = [
             'rpl_semi_sync_slave_trace_level',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['safe_show_database'] = array(
+            'sysvar'];
+        $variable_doc_links['safe_show_database'] = [
             'safe-show-database',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['secure_auth'] = array(
+            'option_mysqld'];
+        $variable_doc_links['secure_auth'] = [
             'secure-auth',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['secure_file_priv'] = array(
+            'option_mysqld'];
+        $variable_doc_links['secure_file_priv'] = [
             'secure-file-priv',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['server_id'] = array(
+            'option_mysqld'];
+        $variable_doc_links['server_id'] = [
             'server-id',
             'replication-options',
-            'option_mysqld');
-        $variable_doc_links['server_id_bits'] = array(
+            'option_mysqld'];
+        $variable_doc_links['server_id_bits'] = [
             'server_id_bits',
             'mysql-cluster-system-variables',
-            'sysvar');
-        $variable_doc_links['server_uuid'] = array(
+            'sysvar'];
+        $variable_doc_links['server_uuid'] = [
             'server_uuid',
             'replication-options',
-            'sysvar');
-        $variable_doc_links['session_track_gtids'] = array(
+            'sysvar'];
+        $variable_doc_links['session_track_gtids'] = [
             'session_track_gtids',
             'server_system_variables',
-            'sysvar');
-        $variable_doc_links['session_track_schema'] = array(
+            'sysvar'];
+        $variable_doc_links['session_track_schema'] = [
             'session_track_schema',
             'server_system_variables',
-            'sysvar');
-        $variable_doc_links['session_track_state_change'] = array(
+            'sysvar'];
+        $variable_doc_links['session_track_state_change'] = [
             'session_track_state_change',
             'server_system_variables',
-            'sysvar');
-        $variable_doc_links['session_track_system_variables'] = array(
+            'sysvar'];
+        $variable_doc_links['session_track_system_variables'] = [
             'session_track_system_variables',
             'session_system_variables',
-            'sysvar');
-        $variable_doc_links['session_track_transaction_info'] = array(
+            'sysvar'];
+        $variable_doc_links['session_track_transaction_info'] = [
             'session_track_transaction_info',
             'session_system_variables',
-            'sysvar');
-        $variable_doc_links['sha256_password_proxy_users'] = array(
+            'sysvar'];
+        $variable_doc_links['sha256_password_proxy_users'] = [
             'sha256_password_proxy_users',
             'session_system_variables',
-            'sysvar');
-        $variable_doc_links['show_compatibility_56'] = array(
+            'sysvar'];
+        $variable_doc_links['show_compatibility_56'] = [
             'show_compatibility_56',
             'session_system_variables',
-            'sysvar');
-        $variable_doc_links['show_old_temporals'] = array(
+            'sysvar'];
+        $variable_doc_links['show_old_temporals'] = [
             'show_old_temporals',
             'session_system_variables',
-            'sysvar');
-        $variable_doc_links['shared_memory'] = array(
+            'sysvar'];
+        $variable_doc_links['shared_memory'] = [
             'shared_memory',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['shared_memory_base_name'] = array(
+            'sysvar'];
+        $variable_doc_links['shared_memory_base_name'] = [
             'shared_memory_base_name',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['skip_external_locking'] = array(
+            'sysvar'];
+        $variable_doc_links['skip_external_locking'] = [
             'skip-external-locking',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['skip_name_resolve'] = array(
+            'option_mysqld'];
+        $variable_doc_links['skip_name_resolve'] = [
             'skip-name-resolve',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['skip_networking'] = array(
+            'option_mysqld'];
+        $variable_doc_links['skip_networking'] = [
             'skip-networking',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['skip_show_database'] = array(
+            'option_mysqld'];
+        $variable_doc_links['skip_show_database'] = [
             'skip-show-database',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['slave_allow_batching'] = array(
+            'option_mysqld'];
+        $variable_doc_links['slave_allow_batching'] = [
             'slave_allow_batching',
             'mysql-cluster-system-variables',
-            'sysvar');
-        $variable_doc_links['slave_checkpoint_group'] = array(
+            'sysvar'];
+        $variable_doc_links['slave_checkpoint_group'] = [
             'slave_checkpoint_group',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['slave_checkpoint_period'] = array(
+            'sysvar'];
+        $variable_doc_links['slave_checkpoint_period'] = [
             'slave_checkpoint_period',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['slave_compressed_protocol'] = array(
+            'sysvar'];
+        $variable_doc_links['slave_compressed_protocol'] = [
             'slave_compressed_protocol',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['slave_exec_mode'] = array(
+            'sysvar'];
+        $variable_doc_links['slave_exec_mode'] = [
             'slave_exec_mode',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['slave_load_tmpdir'] = array(
+            'sysvar'];
+        $variable_doc_links['slave_load_tmpdir'] = [
             'slave-load-tmpdir',
             'replication-options-slave',
-            'option_mysqld');
-        $variable_doc_links['slave_max_allowed_packet'] = array(
+            'option_mysqld'];
+        $variable_doc_links['slave_max_allowed_packet'] = [
             'slave_max_allowed_packet',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['slave_net_timeout'] = array(
+            'sysvar'];
+        $variable_doc_links['slave_net_timeout'] = [
             'slave-net-timeout',
             'replication-options-slave',
-            'option_mysqld');
-        $variable_doc_links['slave_parallel_type'] = array(
+            'option_mysqld'];
+        $variable_doc_links['slave_parallel_type'] = [
             'slave_parallel_type',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['slave_parallel_workers'] = array(
+            'sysvar'];
+        $variable_doc_links['slave_parallel_workers'] = [
             'slave_parallel_workers',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['slave_pending_jobs_size_max'] = array(
+            'sysvar'];
+        $variable_doc_links['slave_pending_jobs_size_max'] = [
             'slave_pending_jobs_size_max',
             'replication-options-slave',
             'sysvar',
-            'byte');
-        $variable_doc_links['slave_preserve_commit_order'] = array(
+            'byte'];
+        $variable_doc_links['slave_preserve_commit_order'] = [
             'slave_preserve_commit_order',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['slave_rows_search_algorithms'] = array(
+            'sysvar'];
+        $variable_doc_links['slave_rows_search_algorithms'] = [
             'slave_rows_search_algorithms',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['slave_skip_errors'] = array(
+            'sysvar'];
+        $variable_doc_links['slave_skip_errors'] = [
             'slave-skip-errors',
             'replication-options-slave',
-            'option_mysqld');
-        $variable_doc_links['slave_sql_verify_checksum'] = array(
+            'option_mysqld'];
+        $variable_doc_links['slave_sql_verify_checksum'] = [
             'slave_sql_verify_checksum',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['slave_transaction_retries'] = array(
+            'sysvar'];
+        $variable_doc_links['slave_transaction_retries'] = [
             'slave_transaction_retries',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['slave_type_conversions'] = array(
+            'sysvar'];
+        $variable_doc_links['slave_type_conversions'] = [
             'slave_type_conversions',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['slow_launch_time'] = array(
+            'sysvar'];
+        $variable_doc_links['slow_launch_time'] = [
             'slow_launch_time',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['slow_query_log'] = array(
+            'sysvar'];
+        $variable_doc_links['slow_query_log'] = [
             'slow-query-log',
             'server-options',
-            'server-system-variables');
-        $variable_doc_links['slow_query_log_file'] = array(
+            'server-system-variables'];
+        $variable_doc_links['slow_query_log_file'] = [
             'slow_query_log_file',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['socket'] = array(
+            'sysvar'];
+        $variable_doc_links['socket'] = [
             'socket',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['sort_buffer_size'] = array(
+            'option_mysqld'];
+        $variable_doc_links['sort_buffer_size'] = [
             'sort_buffer_size',
             'server-system-variables',
             'sysvar',
-            'byte');
-        $variable_doc_links['sql_auto_is_null'] = array(
+            'byte'];
+        $variable_doc_links['sql_auto_is_null'] = [
             'sql_auto_is_null',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_big_selects'] = array(
+            'sysvar'];
+        $variable_doc_links['sql_big_selects'] = [
             'sql_big_selects',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_big_tables'] = array(
+            'sysvar'];
+        $variable_doc_links['sql_big_tables'] = [
             'big-tables',
             'server-options',
-            'server-system-variables');
-        $variable_doc_links['sql_buffer_result'] = array(
+            'server-system-variables'];
+        $variable_doc_links['sql_buffer_result'] = [
             'sql_buffer_result',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_log_bin'] = array(
+            'sysvar'];
+        $variable_doc_links['sql_log_bin'] = [
             'sql_log_bin',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_log_off'] = array(
+            'sysvar'];
+        $variable_doc_links['sql_log_off'] = [
             'sql_log_off',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_log_update'] = array(
+            'sysvar'];
+        $variable_doc_links['sql_log_update'] = [
             'sql_log_update',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_low_priority_updates'] = array(
+            'sysvar'];
+        $variable_doc_links['sql_low_priority_updates'] = [
             'sql_low_priority_updates',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_max_join_size'] = array(
+            'sysvar'];
+        $variable_doc_links['sql_max_join_size'] = [
             'sql_max_join_size',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_mode'] = array(
+            'sysvar'];
+        $variable_doc_links['sql_mode'] = [
             'sql-mode',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['sql_notes'] = array(
+            'option_mysqld'];
+        $variable_doc_links['sql_notes'] = [
             'sql_notes',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_quote_show_create'] = array(
+            'sysvar'];
+        $variable_doc_links['sql_quote_show_create'] = [
             'sql_quote_show_create',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_safe_updates'] = array(
+            'sysvar'];
+        $variable_doc_links['sql_safe_updates'] = [
             'sql_safe_updates',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_select_limit'] = array(
+            'sysvar'];
+        $variable_doc_links['sql_select_limit'] = [
             'sql_select_limit',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sql_slave_skip_counter'] = array(
+            'sysvar'];
+        $variable_doc_links['sql_slave_skip_counter'] = [
             'sql_slave_skip_counter',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['sql_warnings'] = array(
+            'sysvar'];
+        $variable_doc_links['sql_warnings'] = [
             'sql_warnings',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['ssl_ca'] = array(
+            'sysvar'];
+        $variable_doc_links['ssl_ca'] = [
             'ssl-ca',
             'ssl-options',
-            'option_general');
-        $variable_doc_links['ssl_capath'] = array(
+            'option_general'];
+        $variable_doc_links['ssl_capath'] = [
             'ssl-capath',
             'ssl-options',
-            'option_general');
-        $variable_doc_links['ssl_cert'] = array(
+            'option_general'];
+        $variable_doc_links['ssl_cert'] = [
             'ssl-cert',
             'ssl-options',
-            'option_general');
-        $variable_doc_links['ssl_cipher'] = array(
+            'option_general'];
+        $variable_doc_links['ssl_cipher'] = [
             'ssl-cipher',
             'ssl-options',
-            'option_general');
-        $variable_doc_links['ssl_crl'] = array(
+            'option_general'];
+        $variable_doc_links['ssl_crl'] = [
             'ssl_crl',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['ssl_crlpath'] = array(
+            'sysvar'];
+        $variable_doc_links['ssl_crlpath'] = [
             'ssl_crlpath',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['ssl_key'] = array(
+            'sysvar'];
+        $variable_doc_links['ssl_key'] = [
             'ssl-key',
             'ssl-options',
-            'option_general');
-        $variable_doc_links['storage_engine'] = array(
+            'option_general'];
+        $variable_doc_links['storage_engine'] = [
             'storage_engine',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['stored_program_cache'] = array(
+            'sysvar'];
+        $variable_doc_links['stored_program_cache'] = [
             'stored_program_cache',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['super_read_only'] = array(
+            'sysvar'];
+        $variable_doc_links['super_read_only'] = [
             'super_read_only',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sync_binlog'] = array(
+            'sysvar'];
+        $variable_doc_links['sync_binlog'] = [
             'sync_binlog',
             'replication-options-binary-log',
-            'sysvar');
-        $variable_doc_links['sync_frm'] = array(
+            'sysvar'];
+        $variable_doc_links['sync_frm'] = [
             'sync_frm',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['sync_master_info'] = array(
+            'sysvar'];
+        $variable_doc_links['sync_master_info'] = [
             'sync_master_info',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['sync_relay_log'] = array(
+            'sysvar'];
+        $variable_doc_links['sync_relay_log'] = [
             'sync_relay_log',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['sync_relay_log_info'] = array(
+            'sysvar'];
+        $variable_doc_links['sync_relay_log_info'] = [
             'sync_relay_log_info',
             'replication-options-slave',
-            'sysvar');
-        $variable_doc_links['system_time_zone'] = array(
+            'sysvar'];
+        $variable_doc_links['system_time_zone'] = [
             'system_time_zone',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['table_definition_cache'] = array(
+            'sysvar'];
+        $variable_doc_links['table_definition_cache'] = [
             'table_definition_cache',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['table_lock_wait_timeout'] = array(
+            'sysvar'];
+        $variable_doc_links['table_lock_wait_timeout'] = [
             'table_lock_wait_timeout',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['table_open_cache'] = array(
+            'sysvar'];
+        $variable_doc_links['table_open_cache'] = [
             'table_open_cache',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['table_open_cache_instances'] = array(
+            'sysvar'];
+        $variable_doc_links['table_open_cache_instances'] = [
             'table_open_cache_instances',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['table_type'] = array(
+            'sysvar'];
+        $variable_doc_links['table_type'] = [
             'table_type',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['thread_cache_size'] = array(
+            'sysvar'];
+        $variable_doc_links['thread_cache_size'] = [
             'thread_cache_size',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['thread_concurrency'] = array(
+            'sysvar'];
+        $variable_doc_links['thread_concurrency'] = [
             'thread_concurrency',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['thread_handling'] = array(
+            'sysvar'];
+        $variable_doc_links['thread_handling'] = [
             'thread_handling',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['thread_stack'] = array(
+            'sysvar'];
+        $variable_doc_links['thread_stack'] = [
             'thread_stack',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['time_format'] = array(
+            'sysvar'];
+        $variable_doc_links['time_format'] = [
             'time_format',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['time_zone'] = array(
+            'sysvar'];
+        $variable_doc_links['time_zone'] = [
             'time_zone',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['timed_mutexes'] = array(
+            'sysvar'];
+        $variable_doc_links['timed_mutexes'] = [
             'timed_mutexes',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['timestamp'] = array(
+            'sysvar'];
+        $variable_doc_links['timestamp'] = [
             'timestamp',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['tmp_table_size'] = array(
+            'sysvar'];
+        $variable_doc_links['tmp_table_size'] = [
             'tmp_table_size',
             'server-system-variables',
             'sysvar',
-            'byte');
-        $variable_doc_links['tmpdir'] = array(
+            'byte'];
+        $variable_doc_links['tmpdir'] = [
             'tmpdir',
             'server-options',
-            'option_mysqld');
-        $variable_doc_links['transaction_alloc_block_size'] = array(
+            'option_mysqld'];
+        $variable_doc_links['transaction_alloc_block_size'] = [
             'transaction_alloc_block_size',
             'server-system-variables',
             'sysvar',
-            'byte');
-        $variable_doc_links['transaction_prealloc_size'] = array(
+            'byte'];
+        $variable_doc_links['transaction_prealloc_size'] = [
             'transaction_prealloc_size',
             'server-system-variables',
             'sysvar',
-            'byte');
-        $variable_doc_links['transaction_write_set_extraction'] = array(
+            'byte'];
+        $variable_doc_links['transaction_write_set_extraction'] = [
             'transaction_write_set_extraction',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['tx_isolation'] = array(
+            'sysvar'];
+        $variable_doc_links['tx_isolation'] = [
             'tx_isolation',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['tx_read_only'] = array(
+            'sysvar'];
+        $variable_doc_links['tx_read_only'] = [
             'tx_read_only',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['unique_checks'] = array(
+            'sysvar'];
+        $variable_doc_links['unique_checks'] = [
             'unique_checks',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['updatable_views_with_limit'] = array(
+            'sysvar'];
+        $variable_doc_links['updatable_views_with_limit'] = [
             'updatable_views_with_limit',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['version'] = array(
+            'sysvar'];
+        $variable_doc_links['version'] = [
             'version',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['version_comment'] = array(
+            'sysvar'];
+        $variable_doc_links['version_comment'] = [
             'version_comment',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['version_compile_machine'] = array(
+            'sysvar'];
+        $variable_doc_links['version_compile_machine'] = [
             'version_compile_machine',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['version_compile_os'] = array(
+            'sysvar'];
+        $variable_doc_links['version_compile_os'] = [
             'version_compile_os',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['wait_timeout'] = array(
+            'sysvar'];
+        $variable_doc_links['wait_timeout'] = [
             'wait_timeout',
             'server-system-variables',
-            'sysvar');
-        $variable_doc_links['warning_count'] = array(
+            'sysvar'];
+        $variable_doc_links['warning_count'] = [
             'warning_count',
             'server-system-variables',
-            'sysvar');
+            'sysvar'];
         return $variable_doc_links;
     }
 
@@ -2599,7 +2599,7 @@ class ServerVariablesController extends Controller
      */
     private function _getStaticSystemVariables()
     {
-        $static_variables = array(
+        $static_variables = [
             'audit_log_buffer_size',
             'audit_log_current_session',
             'audit_log_file',
@@ -2833,7 +2833,7 @@ class ServerVariablesController extends Controller
             'version_compile_machine',
             'version_compile_os',
             'version_tokens_session_number'
-        );
+        ];
 
         return $static_variables;
     }
diff --git a/libraries/classes/Controllers/Table/TableChartController.php b/libraries/classes/Controllers/Table/TableChartController.php
index fba2f40b24..07e485957a 100644
--- a/libraries/classes/Controllers/Table/TableChartController.php
+++ b/libraries/classes/Controllers/Table/TableChartController.php
@@ -93,7 +93,7 @@ class TableChartController extends TableController
         }
 
         $this->response->getHeader()->getScripts()->addFiles(
-            array(
+            [
                 'chart.js',
                 'tbl_chart.js',
                 'vendor/jqplot/jquery.jqplot.js',
@@ -106,7 +106,7 @@ class TableChartController extends TableController
                 'vendor/jqplot/plugins/jqplot.pieRenderer.js',
                 'vendor/jqplot/plugins/jqplot.enhancedPieLegendRenderer.js',
                 'vendor/jqplot/plugins/jqplot.highlighter.js'
-            )
+            ]
         );
 
         /**
@@ -115,7 +115,7 @@ class TableChartController extends TableController
          */
         $db = &$this->db;
         $table = &$this->table;
-        $url_params = array();
+        $url_params = [];
 
         /**
          * Runs common work
@@ -141,7 +141,7 @@ class TableChartController extends TableController
             include 'libraries/server_common.inc.php';
         }
 
-        $data = array();
+        $data = [];
 
         $result = $this->dbi->tryQuery($this->sql_query);
         $fields_meta = $this->dbi->getFieldsMeta($result);
@@ -151,7 +151,7 @@ class TableChartController extends TableController
 
         $keys = array_keys($data[0]);
 
-        $numeric_types = array('int', 'real');
+        $numeric_types = ['int', 'real'];
         $numeric_column_count = 0;
         foreach ($keys as $idx => $key) {
             if (in_array($fields_meta[$idx]->type, $numeric_types)) {
@@ -176,7 +176,7 @@ class TableChartController extends TableController
          */
         $this->response->addHTML(
             Template::get('table/chart/tbl_chart')->render(
-                array(
+                [
                     'url_query' => $this->url_query,
                     'url_params' => $url_params,
                     'keys' => $keys,
@@ -184,7 +184,7 @@ class TableChartController extends TableController
                     'numeric_types' => $numeric_types,
                     'numeric_column_count' => $numeric_column_count,
                     'sql_query' => $this->sql_query
-                )
+                ]
             )
         );
     }
@@ -223,7 +223,7 @@ class TableChartController extends TableController
         }
         $sql_with_limit = $statement->build();
 
-        $data = array();
+        $data = [];
         $result = $this->dbi->tryQuery($sql_with_limit);
         while ($row = $this->dbi->fetchAssoc($result)) {
             $data[] = $row;
@@ -234,10 +234,10 @@ class TableChartController extends TableController
             $this->response->addJSON('message', __('No data to display'));
             return;
         }
-        $sanitized_data = array();
+        $sanitized_data = [];
 
         foreach ($data as $data_row_number => $data_row) {
-            $tmp_row = array();
+            $tmp_row = [];
             foreach ($data_row as $data_column => $data_value) {
                 $tmp_row[htmlspecialchars($data_column)] = htmlspecialchars(
                     $data_value
diff --git a/libraries/classes/Controllers/Table/TableGisVisualizationController.php b/libraries/classes/Controllers/Table/TableGisVisualizationController.php
index 802b639a0f..4865751563 100644
--- a/libraries/classes/Controllers/Table/TableGisVisualizationController.php
+++ b/libraries/classes/Controllers/Table/TableGisVisualizationController.php
@@ -114,8 +114,8 @@ class TableGisVisualizationController extends TableController
         $meta = $this->dbi->getFieldsMeta($result);
 
         // Find the candidate fields for label column and spatial column
-        $labelCandidates = array();
-        $spatialCandidates = array();
+        $labelCandidates = [];
+        $spatialCandidates = [];
         foreach ($meta as $column_meta) {
             if ($column_meta->type == 'geometry') {
                 $spatialCandidates[] = $column_meta->name;
@@ -165,11 +165,11 @@ class TableGisVisualizationController extends TableController
         }
 
         $this->response->getHeader()->getScripts()->addFiles(
-            array(
+            [
                 'vendor/openlayers/OpenLayers.js',
                 'vendor/jquery/jquery.svg.js',
                 'tbl_gis_visualization.js',
-            )
+            ]
         );
 
         // If all the rows contain SRID, use OpenStreetMaps on the initial loading.
@@ -197,15 +197,15 @@ class TableGisVisualizationController extends TableController
         $downloadUrl = 'tbl_gis_visualization.php' . Url::getCommon(
             array_merge(
                 $this->url_params,
-                array(
+                [
                     'saveToFile' => true,
                     'session_max_rows' => $rows,
                     'pos' => $pos
-                )
+                ]
             )
         );
         $html = Template::get('table/gis_visualization/gis_visualization')->render(
-            array(
+            [
                 'url_params' => $this->url_params,
                 'download_url' => $downloadUrl,
                 'label_candidates' => $labelCandidates,
@@ -215,7 +215,7 @@ class TableGisVisualizationController extends TableController
                 'visualization' => $this->visualization->toImage('svg'),
                 'draw_ol' => $this->visualization->asOl(),
                 'pma_theme_image' => $GLOBALS['pmaThemeImage']
-            )
+            ]
         );
 
         $this->response->addHTML($html);
diff --git a/libraries/classes/Controllers/Table/TableIndexesController.php b/libraries/classes/Controllers/Table/TableIndexesController.php
index a968622739..eaf5bf2de4 100644
--- a/libraries/classes/Controllers/Table/TableIndexesController.php
+++ b/libraries/classes/Controllers/Table/TableIndexesController.php
@@ -89,10 +89,10 @@ class TableIndexesController extends TableController
         // Get fields and stores their name/type
         if (isset($_REQUEST['create_edit_table'])) {
             $fields = json_decode($_REQUEST['columns'], true);
-            $index_params = array(
+            $index_params = [
                 'Non_unique' => ($_REQUEST['index']['Index_choice'] == 'UNIQUE')
                     ? '0' : '1',
-            );
+            ];
             $this->index->set($index_params);
             $add_fields = count($fields);
         } else {
@@ -100,10 +100,10 @@ class TableIndexesController extends TableController
                 ->getNameAndTypeOfTheColumns();
         }
 
-        $form_params = array(
+        $form_params = [
             'db' => $this->db,
             'table' => $this->table,
-        );
+        ];
 
         if (isset($_REQUEST['create_index'])) {
             $form_params['create_index'] = 1;
@@ -117,13 +117,13 @@ class TableIndexesController extends TableController
 
         $this->response->addHTML(
             Template::get('table/index_form')->render(
-                array(
+                [
                     'fields' => $fields,
                     'index' => $this->index,
                     'form_params' => $form_params,
                     'add_fields' => $add_fields,
                     'create_edit_table' => isset($_REQUEST['create_edit_table'])
-                )
+                ]
             )
         );
     }
@@ -149,9 +149,9 @@ class TableIndexesController extends TableController
                 'sql_data',
                 Template::get('preview_sql')
                     ->render(
-                        array(
+                        [
                             'query_data' => $sql_query
-                        )
+                        ]
                     )
             );
         } elseif (!$error) {
diff --git a/libraries/classes/Controllers/Table/TableRelationController.php b/libraries/classes/Controllers/Table/TableRelationController.php
index 4669558f21..523f771df6 100644
--- a/libraries/classes/Controllers/Table/TableRelationController.php
+++ b/libraries/classes/Controllers/Table/TableRelationController.php
@@ -119,10 +119,10 @@ class TableRelationController extends TableController
         }
 
         $this->response->getHeader()->getScripts()->addFiles(
-            array(
+            [
                 'tbl_relation.js',
                 'indexes.js'
-            )
+            ]
         );
 
         // Set the database
@@ -162,14 +162,14 @@ class TableRelationController extends TableController
 
         $this->response->addHTML(
             Template::get('table/secondary_tabs')->render(
-                array(
-                    'url_params' => array(
+                [
+                    'url_params' => [
                         'db' => $GLOBALS['db'],
                         'table' => $GLOBALS['table']
-                    ),
+                    ],
                     'is_foreign_key_supported' => Util::isForeignKeySupported($engine),
                     'cfg_relation' => $this->relation->getRelationsParam(),
-                )
+                ]
             )
         );
         $this->response->addHTML('<div id="structure_content">');
@@ -182,8 +182,8 @@ class TableRelationController extends TableController
         // in mysqli
         $columns = $this->dbi->getColumns($this->db, $this->table);
 
-        $column_array = array();
-        $column_hash_array = array();
+        $column_array = [];
+        $column_hash_array = [];
         $column_array[''] = '';
         foreach ($columns as $column) {
             if (strtoupper($this->tbl_storage_engine) == 'INNODB'
@@ -204,9 +204,9 @@ class TableRelationController extends TableController
                 'table' => $this->table,
                 'cfg_relation' => $this->cfgRelation,
                 'tbl_storage_engine' => $this->tbl_storage_engine,
-                'existrel' => isset($this->existrel) ? $this->existrel : array(),
+                'existrel' => isset($this->existrel) ? $this->existrel : [],
                 'existrel_foreign' => isset($this->existrel_foreign)
-                    ? $this->existrel_foreign['foreign_keys_data'] : array(),
+                    ? $this->existrel_foreign['foreign_keys_data'] : [],
                 'options_array' => $this->options_array,
                 'column_array' => $column_array,
                 'column_hash_array' => $column_hash_array,
@@ -330,7 +330,7 @@ class TableRelationController extends TableController
         } else {
             $columnList = $table_obj->getIndexedColumns(false, false);
         }
-        $columns = array();
+        $columns = [];
         foreach ($columnList as $column) {
             $columns[] = htmlspecialchars($column);
         }
@@ -356,7 +356,7 @@ class TableRelationController extends TableController
      */
     public function getDropdownValueForDbAction()
     {
-        $tables = array();
+        $tables = [];
         $foreign = isset($_REQUEST['foreign']) && $_REQUEST['foreign'] === 'true';
 
         if ($foreign) {
diff --git a/libraries/classes/Controllers/Table/TableSearchController.php b/libraries/classes/Controllers/Table/TableSearchController.php
index 3f94874c27..e6111e3558 100644
--- a/libraries/classes/Controllers/Table/TableSearchController.php
+++ b/libraries/classes/Controllers/Table/TableSearchController.php
@@ -109,12 +109,12 @@ class TableSearchController extends TableController
 
         $this->url_query = $url_query;
         $this->_searchType = $searchType;
-        $this->_columnNames = array();
-        $this->_columnNullFlags = array();
-        $this->_columnTypes = array();
-        $this->_columnCollations = array();
+        $this->_columnNames = [];
+        $this->_columnNullFlags = [];
+        $this->_columnTypes = [];
+        $this->_columnCollations = [];
         $this->_geomColumnFlag = false;
-        $this->_foreigners = array();
+        $this->_foreigners = [];
         $this->relation = new Relation();
         // Loads table's information
         $this->_loadTableInfo();
@@ -208,14 +208,14 @@ class TableSearchController extends TableController
             $this->response->getHeader()
                 ->getScripts()
                 ->addFiles(
-                    array(
+                    [
                         'makegrid.js',
                         'sql.js',
                         'tbl_select.js',
                         'tbl_change.js',
                         'vendor/jquery/jquery.uitablefilter.js',
                         'gis_data_editor.js',
-                    )
+                    ]
                 );
 
             if (isset($_REQUEST['range_search'])) {
@@ -240,7 +240,7 @@ class TableSearchController extends TableController
             $this->response->getHeader()
                 ->getScripts()
                 ->addFiles(
-                    array(
+                    [
                         'makegrid.js',
                         'sql.js',
                         'vendor/jqplot/jquery.jqplot.js',
@@ -251,7 +251,7 @@ class TableSearchController extends TableController
                         'vendor/jqplot/plugins/jqplot.cursor.js',
                         'tbl_zoom_plot_jqplot.js',
                         'tbl_change.js',
-                    )
+                    ]
                 );
 
             /**
@@ -331,11 +331,11 @@ class TableSearchController extends TableController
             DatabaseInterface::QUERY_STORE
         );
         $fields_meta = $this->dbi->getFieldsMeta($result);
-        $data = array();
+        $data = [];
         while ($row = $this->dbi->fetchAssoc($result)) {
             //Need a row with indexes as 0,1,2 for the getUniqueCondition
             // hence using a temporary array
-            $tmpRow = array();
+            $tmpRow = [];
             foreach ($row as $val) {
                 $tmpRow[] = $val;
             }
@@ -352,25 +352,25 @@ class TableSearchController extends TableController
             //Append it to row array as where_clause
             $row['where_clause'] = $uniqueCondition[0];
 
-            $tmpData = array(
+            $tmpData = [
                 $_POST['criteriaColumnNames'][0] =>
                     $row[$_POST['criteriaColumnNames'][0]],
                 $_POST['criteriaColumnNames'][1] =>
                     $row[$_POST['criteriaColumnNames'][1]],
                 'where_clause' => $uniqueCondition[0]
-            );
+            ];
             $tmpData[$dataLabel] = ($dataLabel) ? $row[$dataLabel] : '';
             $data[] = $tmpData;
         }
         unset($tmpData);
 
         //Displays form for point data and scatter plot
-        $titles = array(
+        $titles = [
             'Browse' => Util::getIcon(
                 'b_browse',
                 __('Browse foreign values')
             )
-        );
+        ];
         $column_names_hashes = [];
 
         foreach ($this->_columnNames as $columnName) {
@@ -432,7 +432,7 @@ class TableSearchController extends TableController
      */
     public function getDataRowAction()
     {
-        $extra_data = array();
+        $extra_data = [];
         $row_info_query = 'SELECT * FROM `' . $_REQUEST['db'] . '`.`'
             . $_REQUEST['table'] . '` WHERE ' .  $_REQUEST['where_clause'];
         $result = $this->dbi->query(
@@ -516,19 +516,19 @@ class TableSearchController extends TableController
         $this->response->addHTML(
             Template::get('secondary_tabs')
                 ->render(
-                    array(
-                        'url_params' => array(
+                    [
+                        'url_params' => [
                             'db'    => $this->db,
                             'table' => $this->table,
-                        ),
+                        ],
                         'sub_tabs'   => $this->_getSubTabs(),
-                    )
+                    ]
                 )
         );
 
         $column_names = $this->_columnNames;
         $column_types = $this->_columnTypes;
-        $types = array();
+        $types = [];
         if ($this->_searchType == 'replace') {
             $num_cols = count($column_names);
             for ($i= 0; $i < $num_cols; $i++) {
@@ -537,7 +537,7 @@ class TableSearchController extends TableController
         }
 
         $criteria_column_names = isset($_POST['criteriaColumnNames']) ? $_POST['criteriaColumnNames'] : null;
-        $keys = array();
+        $keys = [];
         for ($i= 0; $i < 4; $i++) {
             if (isset($criteria_column_names[$i])) {
                 if ($criteria_column_names[$i] != 'pma_null') {
@@ -547,7 +547,7 @@ class TableSearchController extends TableController
         }
 
         $this->response->addHTML(
-            Template::get('table/search/selection_form')->render(array(
+            Template::get('table/search/selection_form')->render([
                 'search_type' => $this->_searchType,
                 'db' => $this->db,
                 'table' => $this->table,
@@ -567,7 +567,7 @@ class TableSearchController extends TableController
                 'max_plot_limit' => ((! empty($_POST['maxPlotLimit']))
                     ? intval($_POST['maxPlotLimit'])
                     : intval($GLOBALS['cfg']['maxRowPlotLimit'])),
-            ))
+            ])
         );
     }
 
@@ -665,7 +665,7 @@ class TableSearchController extends TableController
         }
 
         return Template::get('table/search/replace_preview')->render(
-            array(
+            [
                 'db' => $this->db,
                 'table' => $this->table,
                 'column_index' => $columnIndex,
@@ -673,7 +673,7 @@ class TableSearchController extends TableController
                 'replace_with' => $replaceWith,
                 'use_regex' => $useRegex,
                 'result' => $result
-            )
+            ]
         );
     }
 
@@ -709,7 +709,7 @@ class TableSearchController extends TableController
 
         if (is_array($result)) {
             /* Iterate over possible delimiters to get one */
-            $delimiters = array('/', '@', '#', '~', '!', '$', '%', '^', '&', '_');
+            $delimiters = ['/', '@', '#', '~', '!', '$', '%', '^', '&', '_'];
             $found = false;
             for ($i = 0, $l = count($delimiters); $i < $l; $i++) {
                 if (strpos($find, $delimiters[$i]) === false) {
@@ -816,7 +816,7 @@ class TableSearchController extends TableController
      */
     private function _getSubTabs()
     {
-        $subtabs = array();
+        $subtabs = [];
         $subtabs['search']['icon'] = 'b_search';
         $subtabs['search']['text'] = __('Table search');
         $subtabs['search']['link'] = 'tbl_select.php';
@@ -892,11 +892,11 @@ class TableSearchController extends TableController
             ? $_POST['criteriaColumnOperators'][$search_index] : '');
         $entered_value = (isset($_POST['criteriaValues'])
             ? $_POST['criteriaValues'] : '');
-        $titles = array(
+        $titles = [
             'Browse' => Util::getIcon(
                 'b_browse', __('Browse foreign values')
             )
-        );
+        ];
         //Gets column's type and collation
         $type = $this->_columnTypes[$column_index];
         $collation = $this->_columnCollations[$column_index];
@@ -906,17 +906,17 @@ class TableSearchController extends TableController
             $this->_columnNullFlags[$column_index], $selected_operator
         );
         $func = Template::get('table/search/column_comparison_operators')->render(
-            array(
+            [
                 'search_index' => $search_index,
                 'type_operators' => $typeOperators
-            )
+            ]
         );
         //Gets link to browse foreign data(if any) and criteria inputbox
         $foreignData = $this->relation->getForeignData(
             $this->_foreigners, $this->_columnNames[$column_index], false, '', ''
         );
         $value = Template::get('table/search/input_box')->render(
-            array(
+            [
                 'str' => '',
                 'column_type' => (string) $type,
                 'column_id' => 'fieldID_',
@@ -932,14 +932,14 @@ class TableSearchController extends TableController
                 'db' => $this->db,
                 'titles' => $titles,
                 'in_fbs' => true
-            )
+            ]
         );
-        return array(
+        return [
             'type' => $type,
             'collation' => $collation,
             'func' => $func,
             'value' => $value
-        );
+        ];
     }
 
     /**
@@ -965,7 +965,7 @@ class TableSearchController extends TableController
         }
 
         // else continue to form the where clause from column criteria values
-        $fullWhereClause = array();
+        $fullWhereClause = [];
         foreach ($_POST['criteriaColumnOperators'] as $column_index => $operator) {
             $unaryFlag =  $this->dbi->types->isUnaryOperator($operator);
             $tmp_geom_func = isset($_POST['geom_func'][$column_index])
@@ -1044,12 +1044,12 @@ class TableSearchController extends TableController
     private function _getGeomWhereClause($criteriaValues, $names,
         $func_type, $types, $geom_func = null
     ) {
-        $geom_unary_functions = array(
+        $geom_unary_functions = [
             'IsEmpty' => 1,
             'IsSimple' => 1,
             'IsRing' => 1,
             'IsClosed' => 1,
-        );
+        ];
         $where = '';
 
         // Get details about the geometry functions
@@ -1183,7 +1183,7 @@ class TableSearchController extends TableController
                 if (false !== $emptyKey) {
                     unset($values[$emptyKey]);
                 }
-                $wheres = array();
+                $wheres = [];
                 if (!empty($values)) {
                     $wheres[] = $backquoted_name . ' ' . $func_type
                         . ' (' . implode(',', $values) . ')';
diff --git a/libraries/classes/Controllers/Table/TableStructureController.php b/libraries/classes/Controllers/Table/TableStructureController.php
index da541875f3..6d588c31e7 100644
--- a/libraries/classes/Controllers/Table/TableStructureController.php
+++ b/libraries/classes/Controllers/Table/TableStructureController.php
@@ -126,7 +126,7 @@ class TableStructureController extends TableController
         parent::__construct($response, $dbi, $db, $table);
 
         $this->_db_is_system_schema = $db_is_system_schema;
-        $this->_url_query = Url::getCommonRaw(array('db' => $db, 'table' => $table));
+        $this->_url_query = Url::getCommonRaw(['db' => $db, 'table' => $table]);
         $this->_tbl_is_view = $tbl_is_view;
         $this->_tbl_storage_engine = $tbl_storage_engine;
         $this->_table_info_num_rows = $table_info_num_rows;
@@ -154,10 +154,10 @@ class TableStructureController extends TableController
         include_once 'libraries/check_user_privileges.inc.php';
 
         $this->response->getHeader()->getScripts()->addFiles(
-            array(
+            [
                 'tbl_structure.js',
                 'indexes.js'
-            )
+            ]
         );
 
         /**
@@ -177,7 +177,7 @@ class TableStructureController extends TableController
         if (isset($_REQUEST['reserved_word_check'])) {
             if ($GLOBALS['cfg']['ReservedWordDisableWarning'] === false) {
                 $columns_names = $_REQUEST['field_name'];
-                $reserved_keywords_names = array();
+                $reserved_keywords_names = [];
                 foreach ($columns_names as $column) {
                     if (Context::isKeyword(trim($column), true)) {
                         $reserved_keywords_names[] = trim($column);
@@ -288,14 +288,14 @@ class TableStructureController extends TableController
         $engine = $this->table_obj->getStorageEngine();
         $this->response->addHTML(
             Template::get('table/secondary_tabs')->render(
-                array(
-                    'url_params' => array(
+                [
+                    'url_params' => [
                         'db' => $this->db,
                         'table' => $this->table
-                    ),
+                    ],
                     'is_foreign_key_supported' => Util::isForeignKeySupported($engine),
                     'cfg_relation' => $this->relation->getRelationsParam(),
-                )
+                ]
             )
         );
         $this->response->addHTML('<div id="structure_content">');
@@ -350,15 +350,15 @@ class TableStructureController extends TableController
         // got to be eliminated in long run
         $db = &$this->db;
         $table = &$this->table;
-        $url_params = array();
+        $url_params = [];
         include_once 'libraries/tbl_common.inc.php';
         $this->_db_is_system_schema = $db_is_system_schema;
-        $this->_url_query = Url::getCommonRaw(array(
+        $this->_url_query = Url::getCommonRaw([
             'db' => $db,
             'table' => $table,
             'goto' => 'tbl_structure.php',
             'back' => 'tbl_structure.php',
-        ));
+        ]);
         /* The url_params array is initialized in above include */
         $url_params['goto'] = 'tbl_structure.php';
         $url_params['back'] = 'tbl_structure.php';
@@ -406,7 +406,7 @@ class TableStructureController extends TableController
          */
         $columns = $this->dbi->getColumnsFull($this->db, $this->table);
         $column_names = array_keys($columns);
-        $changes = array();
+        $changes = [];
 
         // move columns from first to last
         for ($i = 0, $l = count($_REQUEST['move_columns']); $i < $l; $i++) {
@@ -440,9 +440,9 @@ class TableStructureController extends TableController
                 $default_type = 'USER_DEFINED';
             }
 
-            $virtual = array(
+            $virtual = [
                 'VIRTUAL', 'PERSISTENT', 'VIRTUAL GENERATED', 'STORED GENERATED'
-            );
+            ];
             $data['Virtuality'] = '';
             $data['Expression'] = '';
             if (isset($data['Extra']) && in_array($data['Extra'], $virtual)) {
@@ -494,9 +494,9 @@ class TableStructureController extends TableController
                 'sql_data',
                 Template::get('preview_sql')
                     ->render(
-                        array(
+                        [
                             'query_data' => $sql_query
-                        )
+                        ]
                     )
             );
         } else { // move column
@@ -537,7 +537,7 @@ class TableStructureController extends TableController
         /**
          * @todo optimize in case of multiple fields to modify
          */
-        $fields_meta = array();
+        $fields_meta = [];
         for ($i = 0; $i < $selected_cnt; $i++) {
             $value = $this->dbi->getColumns(
                 $this->db, $this->table, $selected[$i], true
@@ -584,11 +584,11 @@ class TableStructureController extends TableController
         $this->response->addHTML(
             Template::get('table/structure/partition_definition_form')
                 ->render(
-                    array(
+                    [
                         'db' => $this->db,
                         'table' => $this->table,
                         'partition_details' => $partitionDetails,
-                    )
+                    ]
                 )
         );
     }
@@ -611,7 +611,7 @@ class TableStructureController extends TableController
          */
         $stmt = $parser->statements[0];
 
-        $partitionDetails = array();
+        $partitionDetails = [];
 
         $partitionDetails['partition_by'] = '';
         $partitionDetails['partition_expr'] = '';
@@ -668,12 +668,12 @@ class TableStructureController extends TableController
             || $partitionDetails['partition_by'] == 'LIST'
             || $partitionDetails['partition_by'] == 'LIST COLUMNS');
 
-        $partitionDetails['partitions'] = array();
+        $partitionDetails['partitions'] = [];
 
         for ($i = 0; $i < intval($partitionDetails['partition_count']); $i++) {
 
             if (! isset($stmt->partitions[$i])) {
-                $partitionDetails['partitions'][$i] = array(
+                $partitionDetails['partitions'][$i] = [
                     'name' => 'p' . $i,
                     'value_type' => '',
                     'value' => '',
@@ -685,7 +685,7 @@ class TableStructureController extends TableController
                     'min_rows' => '',
                     'tablespace' => '',
                     'node_group' => '',
-                );
+                ];
             } else {
                 $p = $stmt->partitions[$i];
                 $type = $p->type;
@@ -694,7 +694,7 @@ class TableStructureController extends TableController
                     $type .= ' MAXVALUE';
                     $expr = '';
                 }
-                $partitionDetails['partitions'][$i] = array(
+                $partitionDetails['partitions'][$i] = [
                     'name' => $p->name,
                     'value_type' => $type,
                     'value' => $expr,
@@ -706,7 +706,7 @@ class TableStructureController extends TableController
                     'min_rows' => $p->options->has('MIN_ROWS', true),
                     'tablespace' => $p->options->has('TABLESPACE', true),
                     'node_group' => $p->options->has('NODEGROUP', true),
-                );
+                ];
             }
 
             $partition =& $partitionDetails['partitions'][$i];
@@ -714,11 +714,11 @@ class TableStructureController extends TableController
 
             if ($partitionDetails['subpartition_count'] > 1) {
                 $partition['subpartition_count'] = $partitionDetails['subpartition_count'];
-                $partition['subpartitions'] = array();
+                $partition['subpartitions'] = [];
 
                 for ($j = 0; $j < intval($partitionDetails['subpartition_count']); $j++) {
                     if (! isset($stmt->partitions[$i]->subpartitions[$j])) {
-                        $partition['subpartitions'][$j] = array(
+                        $partition['subpartitions'][$j] = [
                             'name' => $partition['name'] . '_s' . $j,
                             'engine' => '',
                             'comment' => '',
@@ -728,10 +728,10 @@ class TableStructureController extends TableController
                             'min_rows' => '',
                             'tablespace' => '',
                             'node_group' => '',
-                        );
+                        ];
                     } else {
                         $sp = $stmt->partitions[$i]->subpartitions[$j];
-                        $partition['subpartitions'][$j] = array(
+                        $partition['subpartitions'][$j] = [
                             'name' => $sp->name,
                             'engine' => $sp->options->has('ENGINE', true),
                             'comment' => trim($sp->options->has('COMMENT', true), "'"),
@@ -741,7 +741,7 @@ class TableStructureController extends TableController
                             'min_rows' => $sp->options->has('MIN_ROWS', true),
                             'tablespace' => $sp->options->has('TABLESPACE', true),
                             'node_group' => $sp->options->has('NODEGROUP', true),
-                        );
+                        ];
                     }
 
                     $subpartition =& $partition['subpartitions'][$j];
@@ -793,11 +793,11 @@ class TableStructureController extends TableController
      */
     protected function getMultipleFieldCommandType()
     {
-        $types = array(
+        $types = [
             'change', 'drop', 'primary',
             'index', 'unique', 'spatial',
             'fulltext', 'browse'
-        );
+        ];
 
         foreach ($types as $type) {
             if (isset($_REQUEST['submit_mult_' . $type . '_x'])) {
@@ -830,7 +830,7 @@ class TableStructureController extends TableController
     protected function displayTableBrowseForSelectedColumns($goto, $pmaThemeImage)
     {
         $GLOBALS['active_page'] = 'sql.php';
-        $fields = array();
+        $fields = [];
         foreach ($_REQUEST['selected_fld'] as $sval) {
             $fields[] = Util::backquote($sval);
         }
@@ -884,14 +884,14 @@ class TableStructureController extends TableController
     protected function updateColumns()
     {
         $err_url = 'tbl_structure.php' . Url::getCommon(
-            array(
+            [
                 'db' => $this->db, 'table' => $this->table
-            )
+            ]
         );
         $regenerate = false;
         $field_cnt = count($_REQUEST['field_name']);
-        $changes = array();
-        $adjust_privileges = array();
+        $changes = [];
+        $adjust_privileges = [];
 
         for ($i = 0; $i < $field_cnt; $i++) {
             if (!$this->columnNeedsAlterTable($i)) {
@@ -975,7 +975,7 @@ class TableStructureController extends TableController
                     | Index::SPATIAL | Index::FULLTEXT
                 );
 
-            $changedToBlob = array();
+            $changedToBlob = [];
             // While changing the Column Collation
             // First change to BLOB
             for ($i = 0; $i < $field_cnt; $i++ ) {
@@ -1029,7 +1029,7 @@ class TableStructureController extends TableController
 
                 // Save the Original Error
                 $orig_error = $this->dbi->getError();
-                $changes_revert = array();
+                $changes_revert = [];
 
                 // Change back to Original Collation and data type
                 for ($i = 0; $i < $field_cnt; $i++) {
@@ -1177,11 +1177,11 @@ class TableStructureController extends TableController
             return true;
         }
 
-        $fields = array(
+        $fields = [
             'field_attribute', 'field_collation', 'field_comments',
             'field_default_value', 'field_default_type', 'field_extra',
             'field_length', 'field_null', 'field_type'
-        );
+        ];
         foreach ($fields as $field) {
             if ($_REQUEST[$field][$i] != $_REQUEST[$field . '_orig'][$i]) {
                 return true;
@@ -1209,8 +1209,8 @@ class TableStructureController extends TableController
         $primary_index, array $fields, array $columns_with_index
     ) {
         // prepare comments
-        $comments_map = array();
-        $mime_map = array();
+        $comments_map = [];
+        $mime_map = [];
 
         if ($GLOBALS['cfg']['ShowPropertyComments']) {
             $comments_map = $this->relation->getComments($this->db, $this->table);
@@ -1223,9 +1223,9 @@ class TableStructureController extends TableController
             $this->db,
             $this->table
         );
-        $columns_list = array();
+        $columns_list = [];
 
-        $titles = array(
+        $titles = [
             'Change' => Util::getIcon('b_edit', __('Change')),
             'Drop' => Util::getIcon('b_drop', __('Drop')),
             'NoDrop' => Util::getIcon('b_drop', __('Drop')),
@@ -1240,7 +1240,7 @@ class TableStructureController extends TableController
             'NoSpatial' => Util::getIcon('bd_spatial', __('Spatial')),
             'NoIdxFulltext' => Util::getIcon('bd_ftext', __('Fulltext')),
             'DistinctValues' => Util::getIcon('b_browse', __('Distinct values')),
-        );
+        ];
 
         /**
          * Work on the table
@@ -1265,7 +1265,7 @@ class TableStructureController extends TableController
             $parts = explode(" ", substr($createView, 17));
             $item['ALGORITHM'] = $parts[0];
 
-            $view = array(
+            $view = [
                 'operation' => 'alter',
                 'definer' => $item['DEFINER'],
                 'sql_security' => $item['SECURITY_TYPE'],
@@ -1273,7 +1273,7 @@ class TableStructureController extends TableController
                 'as' => $item['VIEW_DEFINITION'],
                 'with' => $item['CHECK_OPTION'],
                 'algorithm' => $item['ALGORITHM'],
-            );
+            ];
 
             $edit_view_url = 'view_create.php'
                 . Url::getCommon($url_params) . '&amp;'
@@ -1310,12 +1310,12 @@ class TableStructureController extends TableController
 
         // logic removed from Template
         $rownum = 0;
-        $columns_list = array();
-        $attributes = array();
-        $displayed_field_names = array();
-        $displayed_field_names_replaced = array();
-        $row_comments = array();
-        $extracted_columnspecs = array();
+        $columns_list = [];
+        $attributes = [];
+        $displayed_field_names = [];
+        $displayed_field_names_replaced = [];
+        $row_comments = [];
+        $extracted_columnspecs = [];
         foreach ($fields as $field) {
             $rownum += 1;
             $columns_list[] = $field['Field'];
@@ -1328,10 +1328,10 @@ class TableStructureController extends TableController
 
             if (isset($field['Default'])) {
                 if ($field['Null'] == 'Yes') {
-                    $field = array_merge($field, array('Default' => '<em>NULL</em>'));
+                    $field = array_merge($field, ['Default' => '<em>NULL</em>']);
                 }
             } else {
-                $field = array_merge($field, array('Default' => $field['Default']));
+                $field = array_merge($field, ['Default' => $field['Default']]);
             }
 
             $displayed_field_names[$rownum] = $field['Field'];
@@ -1361,7 +1361,7 @@ class TableStructureController extends TableController
         }
 
         return Template::get('table/structure/display_structure')->render(
-            array(
+            [
                 'hide_structure_actions' => $hideStructureActions,
                 'db' => $this->db,
                 'table' => $this->table,
@@ -1398,7 +1398,7 @@ class TableStructureController extends TableController
                 'displayed_field_names' => $displayed_field_names,
                 'displayed_field_names_replaced' => $displayed_field_names_replaced,
                 'row_comments' => $row_comments,
-            )
+            ]
         );
     }
 
@@ -1475,7 +1475,7 @@ class TableStructureController extends TableController
         }
 
         return Template::get('table/structure/display_table_stats')->render(
-            array(
+            [
                 'showtable' => $this->_showtable,
                 'table_info_num_rows' => $this->_table_info_num_rows,
                 'tbl_is_view' => $this->_tbl_is_view,
@@ -1498,7 +1498,7 @@ class TableStructureController extends TableController
                 'tot_size' => $tot_size,
                 'tot_unit' => $tot_unit,
                 'table' => $GLOBALS['table']
-            )
+            ]
         );
     }
 
@@ -1600,9 +1600,9 @@ class TableStructureController extends TableController
             // this should already be handled by tbl_structure.php
         }
 
-        return array(
+        return [
             $what, $query_type, $is_unset_submit_mult, $mult_btn,
             $centralColsError
-        );
+        ];
     }
 }
diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php
index b7a251fdf3..f48af39b3f 100644
--- a/libraries/classes/Core.php
+++ b/libraries/classes/Core.php
@@ -30,7 +30,7 @@ class Core
      * the whitelist for goto parameter
      * @static array $goto_whitelist
      */
-    public static $goto_whitelist = array(
+    public static $goto_whitelist = [
         'db_datadict.php',
         'db_sql.php',
         'db_events.php',
@@ -79,7 +79,7 @@ class Core
         'transformation_overview.php',
         'transformation_wrapper.php',
         'user_password.php',
-    );
+    ];
 
     /**
      * checks given $var and returns it if valid, or $default of not valid
@@ -291,13 +291,13 @@ class Core
             // Generate JSON manually
             self::headerJSON();
             echo json_encode(
-                array(
+                [
                     'success' => false,
                     'message' => Message::error($error_message)->getDisplay(),
-                )
+                ]
             );
         } else {
-            $error_message = strtr($error_message, array('<br />' => '[br]'));
+            $error_message = strtr($error_message, ['<br />' => '[br]']);
             $error_header = __('Error');
             $lang = isset($GLOBALS['lang']) ? $GLOBALS['lang'] : 'en';
             $dir = isset($GLOBALS['text_dir']) ? $GLOBALS['text_dir'] : 'ltr';
@@ -322,9 +322,9 @@ class Core
     public static function getPHPDocLink(string $target): string
     {
         /* List of PHP documentation translations */
-        $php_doc_languages = array(
+        $php_doc_languages = [
             'pt_BR', 'zh', 'fr', 'de', 'it', 'ja', 'pl', 'ro', 'ru', 'fa', 'es', 'tr'
-        );
+        ];
 
         $lang = 'en';
         if (in_array($GLOBALS['lang'], $php_doc_languages)) {
@@ -419,7 +419,7 @@ class Core
             return 0;
         }
 
-        $binaryprefixes = array(
+        $binaryprefixes = [
             'T' => 1099511627776,
             't' => 1099511627776,
             'G' =>    1073741824,
@@ -428,7 +428,7 @@ class Core
             'm' =>       1048576,
             'K' =>          1024,
             'k' =>          1024,
-        );
+        ];
 
         if (preg_match('/^([0-9]+)([KMGT])/i', $size, $matches)) {
             return $matches[1] * $binaryprefixes[$matches[2]];
@@ -528,7 +528,7 @@ class Core
             Response::getInstance()->disable();
 
             echo Template::get('header_location')
-                ->render(array('uri' => $uri));
+                ->render(['uri' => $uri]);
 
             return;
         }
@@ -686,7 +686,7 @@ class Core
         $a =& $array;
         foreach ($keys as $key) {
             if (! isset($a[$key])) {
-                $a[$key] = array();
+                $a[$key] = [];
             }
             $a =& $a[$key];
         }
@@ -705,7 +705,7 @@ class Core
     {
         $keys = explode('/', $path);
         $keys_last = array_pop($keys);
-        $path = array();
+        $path = [];
         $depth = 0;
 
         $path[0] =& $array;
@@ -748,14 +748,14 @@ class Core
             return $url;
         }
 
-        $params = array();
+        $params = [];
         $params['url'] = $url;
 
         $url = Url::getCommon($params);
         //strip off token and such sensitive information. Just keep url.
         $arr = parse_url($url);
         parse_str($arr["query"], $vars);
-        $query = http_build_query(array("url" => $vars["url"]));
+        $query = http_build_query(["url" => $vars["url"]]);
 
         if (!is_null($GLOBALS['PMA_Config']) && $GLOBALS['PMA_Config']->get('is_setup')) {
             $url = '../url.php?' . $query;
@@ -783,14 +783,14 @@ class Core
             return false;
         }
         // We do not want these to be present
-        $blocked = array('user', 'pass', 'port');
+        $blocked = ['user', 'pass', 'port'];
         foreach ($blocked as $part) {
             if (isset($arr[$part]) && strlen((string) $arr[$part]) != 0) {
                 return false;
             }
         }
         $domain = $arr["host"];
-        $domainWhiteList = array(
+        $domainWhiteList = [
             /* Include current domain */
             $_SERVER['SERVER_NAME'],
             /* phpMyAdmin domains */
@@ -812,7 +812,7 @@ class Core
             'www.percona.com',
             /* Following are doubtful ones. */
             'mysqldatabaseadministration.blogspot.com',
-        );
+        ];
 
         return in_array($domain, $domainWhiteList);
     }
@@ -1267,18 +1267,18 @@ class Core
     ): void {
         echo Template::get('list/item')
             ->render(
-                array(
+                [
                     'content' => $name,
                     'id' => $listId,
                     'class' => $class,
-                    'url' => array(
+                    'url' => [
                         'href' => $url,
                         'target' => $target,
                         'id' => $a_id,
                         'class' => $a_class,
-                    ),
+                    ],
                     'mysql_help_page' => $mysql_help_page,
-                )
+                ]
             );
     }
 
diff --git a/libraries/classes/Database/Designer.php b/libraries/classes/Database/Designer.php
index 18d2ac4cdb..0cbfc8c800 100644
--- a/libraries/classes/Database/Designer.php
+++ b/libraries/classes/Database/Designer.php
@@ -329,7 +329,7 @@ class Designer
         array $tables_pk_or_unique_keys
     ) {
         $table_names = $GLOBALS['designer']['TABLE_NAME'];
-        $columns_type = array();
+        $columns_type = [];
         foreach ($table_names as $table_name) {
             $limit = count($tab_column[$table_name]['COLUMN_ID']);
             for ($j = 0; $j < $limit; $j++) {
diff --git a/libraries/classes/Database/Designer/Common.php b/libraries/classes/Database/Designer/Common.php
index 12a3a3bf9b..6c9fc7676b 100644
--- a/libraries/classes/Database/Designer/Common.php
+++ b/libraries/classes/Database/Designer/Common.php
@@ -50,11 +50,11 @@ class Common
      */
     public function getTablesInfo()
     {
-        $retval = array();
+        $retval = [];
 
-        $GLOBALS['designer']['TABLE_NAME'] = array();// that foreach no error
-        $GLOBALS['designer']['OWNER'] = array();
-        $GLOBALS['designer']['TABLE_NAME_SMALL'] = array();
+        $GLOBALS['designer']['TABLE_NAME'] = [];// that foreach no error
+        $GLOBALS['designer']['OWNER'] = [];
+        $GLOBALS['designer']['TABLE_NAME_SMALL'] = [];
 
         $tables = $this->dbi->getTablesFull($GLOBALS['db']);
         // seems to be needed later
@@ -107,7 +107,7 @@ class Common
     public function getColumnsInfo()
     {
         $this->dbi->selectDb($GLOBALS['db']);
-        $tab_column = array();
+        $tab_column = [];
         for ($i = 0, $cnt = count($GLOBALS['designer']["TABLE_NAME"]); $i < $cnt; $i++) {
             $fields_rs = $this->dbi->query(
                 $this->dbi->getColumnsSql(
@@ -140,8 +140,8 @@ class Common
     public function getScriptContr()
     {
         $this->dbi->selectDb($GLOBALS['db']);
-        $con = array();
-        $con["C_NAME"] = array();
+        $con = [];
+        $con["C_NAME"] = [];
         $i = 0;
         $alltab_rs = $this->dbi->query(
             'SHOW TABLES FROM ' . Util::backquote($GLOBALS['db']),
@@ -184,20 +184,20 @@ class Common
         }
 
         $ti = 0;
-        $retval = array();
+        $retval = [];
         for ($i = 0, $cnt = count($con["C_NAME"]); $i < $cnt; $i++) {
             $c_name_i = $con['C_NAME'][$i];
             $dtn_i = $con['DTN'][$i];
-            $retval[$ti] = array();
-            $retval[$ti][$c_name_i] = array();
+            $retval[$ti] = [];
+            $retval[$ti][$c_name_i] = [];
             if (in_array($dtn_i, $GLOBALS['designer_url']["TABLE_NAME"])
                 && in_array($con['STN'][$i], $GLOBALS['designer_url']["TABLE_NAME"])
             ) {
-                $retval[$ti][$c_name_i][$dtn_i] = array();
-                $retval[$ti][$c_name_i][$dtn_i][$con['DCN'][$i]] = array(
+                $retval[$ti][$c_name_i][$dtn_i] = [];
+                $retval[$ti][$c_name_i][$dtn_i][$con['DCN'][$i]] = [
                     0 => $con['STN'][$i],
                     1 => $con['SCN'][$i]
-                );
+                ];
             }
             $ti++;
         }
@@ -223,7 +223,7 @@ class Common
      */
     public function getAllKeys($unique_only = false)
     {
-        $keys = array();
+        $keys = [];
 
         foreach ($GLOBALS['designer']['TABLE_NAME_SMALL'] as $I => $table) {
             $schema = $GLOBALS['designer']['OWNER'][$I];
@@ -248,10 +248,10 @@ class Common
      */
     public function getScriptTabs()
     {
-        $retval = array(
-            'j_tabs' => array(),
-            'h_tabs' => array()
-        );
+        $retval = [
+            'j_tabs' => [],
+            'h_tabs' => []
+        ];
 
         for ($i = 0, $cnt = count($GLOBALS['designer']['TABLE_NAME']); $i < $cnt; $i++) {
             $j = 0;
@@ -570,7 +570,7 @@ class Common
             if ($foreigner
                 && isset($foreigner['constraint'])
             ) {
-                return array(false, __('Error: relationship already exists.'));
+                return [false, __('Error: relationship already exists.')];
             }
             // note: in InnoDB, the index does not requires to be on a PRIMARY
             // or UNIQUE key
@@ -581,7 +581,7 @@ class Common
             );
 
             // will be use to emphasis prim. keys in the table view
-            $index_array1 = array();
+            $index_array1 = [];
             while ($row = $this->dbi->fetchAssoc($result)) {
                 $index_array1[$row['Column_name']] = 1;
             }
@@ -592,7 +592,7 @@ class Common
                 . '.' . Util::backquote($T2) . ';'
             );
             // will be used to emphasis prim. keys in the table view
-            $index_array2 = array();
+            $index_array2 = [];
             while ($row = $this->dbi->fetchAssoc($result)) {
                 $index_array2[$row['Column_name']] = 1;
             }
@@ -616,23 +616,23 @@ class Common
                 }
                 $upd_query .= ';';
                 if ($this->dbi->tryQuery($upd_query)) {
-                    return array(true, __('FOREIGN KEY relationship has been added.'));
+                    return [true, __('FOREIGN KEY relationship has been added.')];
                 }
 
                 $error = $this->dbi->getError();
-                return array(
+                return [
                     false,
                     __('Error: FOREIGN KEY relationship could not be added!')
                     . "<br/>" . $error
-                );
+                ];
             }
 
-            return array(false, __('Error: Missing index on column(s).'));
+            return [false, __('Error: Missing index on column(s).')];
         }
 
         // internal (pmadb) relation
         if ($GLOBALS['cfgRelation']['relwork'] == false) {
-            return array(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,
@@ -654,15 +654,15 @@ class Common
 
         if ($this->relation->queryAsControlUser($q, false, DatabaseInterface::QUERY_STORE)
         ) {
-            return array(true, __('Internal relationship has been added.'));
+            return [true, __('Internal relationship has been added.')];
         }
 
         $error = $this->dbi->getError(DatabaseInterface::CONNECT_CONTROL);
-        return array(
+        return [
             false,
             __('Error: Internal relationship could not be added!')
             . "<br/>" . $error
-        );
+        ];
     }
 
     /**
@@ -698,15 +698,15 @@ class Common
                     . '.' . Util::backquote($T2) . ' DROP FOREIGN KEY '
                     . Util::backquote($foreigner['constraint']) . ';';
                 if ($this->dbi->query($upd_query)) {
-                    return array(true, __('FOREIGN KEY relationship has been removed.'));
+                    return [true, __('FOREIGN KEY relationship has been removed.')];
                 }
 
                 $error = $this->dbi->getError();
-                return array(
+                return [
                     false,
                     __('Error: FOREIGN KEY relationship could not be removed!')
                     . "<br/>" . $error
-                );
+                ];
             }
         }
 
@@ -729,13 +729,13 @@ class Common
 
         if (!$result) {
             $error = $this->dbi->getError(DatabaseInterface::CONNECT_CONTROL);
-            return array(
+            return [
                 false,
                 __('Error: Internal relationship could not be removed!') . "<br/>" . $error
-            );
+            ];
         }
 
-        return array(true, __('Internal relationship has been removed.'));
+        return [true, __('Internal relationship has been removed.')];
     }
 
     /**
@@ -749,11 +749,11 @@ class Common
     public function saveSetting($index, $value)
     {
         $cfgRelation = $this->relation->getRelationsParam();
-        $cfgDesigner = array(
+        $cfgDesigner = [
             'user'  => $GLOBALS['cfg']['Server']['user'],
             'db'    => $cfgRelation['db'],
             'table' => $cfgRelation['designer_settings']
-        );
+        ];
 
         $success = true;
         if ($GLOBALS['cfgRelation']['designersettingswork']) {
@@ -782,7 +782,7 @@ class Common
 
                 $success = $this->relation->queryAsControlUser($save_query);
             } else {
-                $save_data = array($index => $value);
+                $save_data = [$index => $value];
 
                 $query = "INSERT INTO "
                     . Util::backquote($cfgDesigner['db'])
diff --git a/libraries/classes/Database/Qbe.php b/libraries/classes/Database/Qbe.php
index 07fd9d0e87..4249f9c9c7 100644
--- a/libraries/classes/Database/Qbe.php
+++ b/libraries/classes/Database/Qbe.php
@@ -236,7 +236,7 @@ class Qbe
     public function __construct(
         $dbi,
         $dbname,
-        array $savedSearchList = array(),
+        array $savedSearchList = [],
         $currentSearch = null
     ) {
         $this->_db = $dbname;
@@ -302,7 +302,7 @@ class Qbe
 
         $this->_prev_criteria = isset($_REQUEST['prev_criteria'])
             ? $_REQUEST['prev_criteria']
-            : array();
+            : [];
         $this->_criteria = isset($_REQUEST['criteria'])
             ? $_REQUEST['criteria']
             : array_fill(0, $criteriaColumnCount, '');
@@ -321,12 +321,12 @@ class Qbe
             : array_fill(0, $criteriaColumnCount, '');
         // sets minimum width
         $this->_form_column_width = 12;
-        $this->_formColumns = array();
-        $this->_formSorts = array();
-        $this->_formShows = array();
-        $this->_formCriterions = array();
-        $this->_formAndOrRows = array();
-        $this->_formAndOrCols = array();
+        $this->_formColumns = [];
+        $this->_formSorts = [];
+        $this->_formShows = [];
+        $this->_formCriterions = [];
+        $this->_formAndOrRows = [];
+        $this->_formAndOrCols = [];
     }
 
     /**
@@ -912,7 +912,7 @@ class Qbe
                 $this->_formAndOrCols[$new_column_count]
                     = $this->_criteriaAndOrColumn[$column_index];
             }
-            $checked_options = array();
+            $checked_options = [];
             if (isset($this->_criteriaAndOrColumn[$column_index])
                 && $this->_criteriaAndOrColumn[$column_index] == 'or'
             ) {
@@ -1048,7 +1048,7 @@ class Qbe
     {
         $html_output = '';
         $new_row_count = 0;
-        $checked_options = array();
+        $checked_options = [];
         for (
         $row_index = 0;
         $row_index <= $this->_criteria_row_count;
@@ -1109,7 +1109,7 @@ class Qbe
     private function _getSelectClause()
     {
         $select_clause = '';
-        $select_clauses = array();
+        $select_clauses = [];
         for (
             $column_index = 0;
             $column_index < $this->_criteria_column_count;
@@ -1172,7 +1172,7 @@ class Qbe
         }
         // OR rows ${'cur' . $or}[$column_index]
         if (! isset($this->_formAndOrRows)) {
-            $this->_formAndOrRows = array();
+            $this->_formAndOrRows = [];
         }
         for (
         $row_index = 0;
@@ -1236,7 +1236,7 @@ class Qbe
     private function _getOrderByClause()
     {
         $orderby_clause = '';
-        $orderby_clauses = array();
+        $orderby_clauses = [];
 
         // Create copy of instance variables
         $columns = $this->_formColumns;
@@ -1292,8 +1292,8 @@ class Qbe
     private function _getIndexes(array $search_tables, array $search_columns,
         array $where_clause_columns
     ) {
-        $unique_columns = array();
-        $index_columns = array();
+        $unique_columns = [];
+        $index_columns = [];
 
         foreach ($search_tables as $table) {
             $indexes = $this->dbi->getTableIndexes($this->_db, $table);
@@ -1317,10 +1317,10 @@ class Qbe
             } // end while (each index of a table)
         } // end while (each table)
 
-        return array(
+        return [
             'unique' => $unique_columns,
             'index' => $index_columns
-        );
+        ];
     }
 
     /**
@@ -1360,8 +1360,8 @@ class Qbe
             return $candidate_columns;
         }
 
-        $very_good = array();
-        $still_good = array();
+        $very_good = [];
+        $still_good = [];
         foreach ($candidate_columns as $column => $is_where) {
             $table = explode('.', $column);
             $table = $table[0];
@@ -1413,7 +1413,7 @@ class Qbe
         // Generally, we need to display all the rows of foreign (referenced)
         // table, whether they have any matching row in child table or not.
         // So we select candidate tables which are foreign tables.
-        $foreign_tables = array();
+        $foreign_tables = [];
         foreach ($candidate_columns as $one_table) {
             $foreigners = $this->relation->getForeigners($this->_db, $one_table);
             foreach ($foreigners as $key => $foreigner) {
@@ -1448,7 +1448,7 @@ class Qbe
 
         // Of course we only want to check each table once
         $checked_tables = $candidate_columns;
-        $tsize = array();
+        $tsize = [];
         $maxsize = -1;
         $result = '';
         foreach ($candidate_columns as $table) {
@@ -1473,8 +1473,8 @@ class Qbe
      */
     private function _getWhereClauseTablesAndColumns()
     {
-        $where_clause_columns = array();
-        $where_clause_tables = array();
+        $where_clause_columns = [];
+        $where_clause_tables = [];
 
         // Now we need all tables that we have in the where clause
         for (
@@ -1500,10 +1500,10 @@ class Qbe
                 }
             } // end if
         } // end for
-        return array(
+        return [
             'where_clause_tables' => $where_clause_tables,
             'where_clause_columns' => $where_clause_columns
-        );
+        ];
     }
 
     /**
@@ -1521,7 +1521,7 @@ class Qbe
         }
 
         // Initialize some variables
-        $search_tables = $search_columns = array();
+        $search_tables = $search_columns = [];
 
         // We only start this if we have fields, otherwise it would be dumb
         foreach ($formColumns as $value) {
@@ -1545,7 +1545,7 @@ class Qbe
         if (empty($from_clause)) {
             // Create cartesian product
             $from_clause = implode(
-                ", ", array_map(array('PhpMyAdmin\Util', 'backquote'), $search_tables)
+                ", ", array_map(['PhpMyAdmin\Util', 'backquote'], $search_tables)
             );
         }
 
@@ -1563,7 +1563,7 @@ class Qbe
     private function _getJoinForFromClause(array $searchTables, array $searchColumns)
     {
         // $relations[master_table][foreign_table] => clause
-        $relations = array();
+        $relations = [];
 
         // Fill $relations with inter table relationship data
         foreach ($searchTables as $oneTable) {
@@ -1583,7 +1583,7 @@ class Qbe
 
         // Will include master tables and all tables that can be combined into
         // a cluster by their relation
-        $finalized = array();
+        $finalized = [];
         if (strlen($master) > 0) {
             // Add master tables
             $finalized[$master] = '';
@@ -1651,7 +1651,7 @@ class Qbe
             if (count($unfinalized) > 0) {
                 // Add these tables as cartesian product before joined tables
                 $join .= implode(
-                    ', ', array_map(array('PhpMyAdmin\Util', 'backquote'), $unfinalized)
+                    ', ', array_map(['PhpMyAdmin\Util', 'backquote'], $unfinalized)
                 );
             }
         }
@@ -1685,14 +1685,14 @@ class Qbe
      */
     private function _loadRelationsForTable(array &$relations, $oneTable)
     {
-        $relations[$oneTable] = array();
+        $relations[$oneTable] = [];
 
         $foreigners = $this->relation->getForeigners($GLOBALS['db'], $oneTable);
         foreach ($foreigners as $field => $foreigner) {
             // Foreign keys data
             if ($field == 'foreign_keys_data') {
                 foreach ($foreigner as $oneKey) {
-                    $clauses = array();
+                    $clauses = [];
                     // There may be multiple column relations
                     foreach ($oneKey['index_list'] as $index => $oneField) {
                         $clauses[]
@@ -1811,7 +1811,7 @@ class Qbe
         $html_output .= $this->_getModifyColumnsRow();
         $html_output .= '</table>';
         $this->_new_row_count--;
-        $url_params = array();
+        $url_params = [];
         $url_params['db'] = $this->_db;
         $url_params['criteriaColumnCount'] = $this->_new_column_count;
         $url_params['rows'] = $this->_new_row_count;
@@ -1825,7 +1825,7 @@ class Qbe
         $html_output .= $this->_getTablesList();
         $html_output .= '</form>';
         $html_output .= '<form action="db_qbe.php" method="post" class="lock-page">';
-        $html_output .= Url::getHiddenInputs(array('db' => $this->_db));
+        $html_output .= Url::getHiddenInputs(['db' => $this->_db]);
         // get SQL query
         $html_output .= '<div class="floatleft desktop50">';
         $html_output .= '<fieldset>';
@@ -1841,7 +1841,7 @@ class Qbe
             . ' dir="' . $text_dir . '">';
 
         if (empty($this->_formColumns)) {
-            $this->_formColumns = array();
+            $this->_formColumns = [];
         }
         $html_output .= $this->_getSQLQuery($this->_formColumns);
 
@@ -1954,19 +1954,19 @@ class Qbe
         if (isset($unique_columns) && count($unique_columns) > 0) {
             $candidate_columns = $unique_columns;
             $needsort = 1;
-            return array($candidate_columns, $needsort);
+            return [$candidate_columns, $needsort];
         } elseif (isset($index_columns) && count($index_columns) > 0) {
             $candidate_columns = $index_columns;
             $needsort = 1;
-            return array($candidate_columns, $needsort);
+            return [$candidate_columns, $needsort];
         } elseif (isset($where_clause_columns) && count($where_clause_columns) > 0) {
             $candidate_columns = $where_clause_columns;
             $needsort = 0;
-            return array($candidate_columns, $needsort);
+            return [$candidate_columns, $needsort];
         }
 
         $candidate_columns = $search_tables;
         $needsort = 0;
-        return array($candidate_columns, $needsort);
+        return [$candidate_columns, $needsort];
     }
 }
diff --git a/libraries/classes/Database/Search.php b/libraries/classes/Database/Search.php
index fa2f17fe78..98758d87c2 100644
--- a/libraries/classes/Database/Search.php
+++ b/libraries/classes/Database/Search.php
@@ -99,13 +99,13 @@ class Search
     {
         $this->db = $db;
         $this->dbi = $dbi;
-        $this->searchTypes = array(
+        $this->searchTypes = [
             '1' => __('at least one of the words'),
             '2' => __('all of the words'),
             '3' => __('the exact phrase as substring'),
             '4' => __('the exact phrase as whole field'),
             '5' => __('as regular expression'),
-        );
+        ];
         // Sets criteria parameters
         $this->setSearchParams();
     }
@@ -143,7 +143,7 @@ class Search
             $this->criteriaSearchString = $_REQUEST['criteriaSearchString'];
         }
 
-        $this->criteriaTables = array();
+        $this->criteriaTables = [];
         if (empty($_REQUEST['criteriaTables'])
             || ! is_array($_REQUEST['criteriaTables'])
         ) {
@@ -193,7 +193,7 @@ class Search
         // Gets where clause for the query
         $where_clause = $this->getWhereClause($table);
         // Builds complete queries
-        $sql = array();
+        $sql = [];
         $sql['select_columns'] = $sqlstr_select . ' * ' . $sqlstr_from
             . $where_clause;
         // here, I think we need to still use the COUNT clause, even for
@@ -216,7 +216,7 @@ class Search
     {
         // Columns to select
         $allColumns = $this->dbi->getColumns($GLOBALS['db'], $table);
-        $likeClauses = array();
+        $likeClauses = [];
         // Based on search type, decide like/regex & '%'/''
         $like_or_regex   = (($this->criteriaSearchType == 5) ? 'REGEXP' : 'LIKE');
         $automatic_wildcard   = (($this->criteriaSearchType < 4) ? '%' : '');
@@ -228,7 +228,7 @@ class Search
         );
         // Extract search words or pattern
         $search_words = (($this->criteriaSearchType > 2)
-            ? array($criteriaSearchStringEscaped)
+            ? [$criteriaSearchStringEscaped]
             : explode(' ', $criteriaSearchStringEscaped));
 
         foreach ($search_words as $search_word) {
@@ -236,7 +236,7 @@ class Search
             if (strlen($search_word) === 0) {
                 continue;
             }
-            $likeClausesPerColumn = array();
+            $likeClausesPerColumn = [];
             // for each column in the table
             foreach ($allColumns as $column) {
                 if (! isset($this->criteriaColumnName)
@@ -312,7 +312,7 @@ class Search
      */
     public function getSelectionForm()
     {
-        $choices = array(
+        $choices = [
             '1' => $this->searchTypes[1] . ' '
                 . Util::showHint(
                     __('Words are separated by a space character (" ").')
@@ -324,7 +324,7 @@ class Search
             '3' => $this->searchTypes[3],
             '4' => $this->searchTypes[4],
             '5' => $this->searchTypes[5] . ' ' . Util::showMySQLDocu('Regexp')
-        );
+        ];
         return Template::get('database/search/selection_form')->render([
             'db' => $this->db,
             'choices' => $choices,
diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php
index 0a25d45998..ef68adbd7d 100644
--- a/libraries/classes/DatabaseInterface.php
+++ b/libraries/classes/DatabaseInterface.php
@@ -131,13 +131,13 @@ class DatabaseInterface
     public function __construct(DbiExtension $ext)
     {
         $this->_extension = $ext;
-        $this->_links = array();
+        $this->_links = [];
         if (defined('TESTSUITE')) {
             $this->_links[DatabaseInterface::CONNECT_USER] = 1;
             $this->_links[DatabaseInterface::CONNECT_CONTROL] = 2;
         }
-        $this->_table_cache = array();
-        $this->_current_user = array();
+        $this->_table_cache = [];
+        $this->_current_user = [];
         $this->types = new Types($this);
         $this->relation = new Relation();
     }
@@ -213,7 +213,7 @@ class DatabaseInterface
             // final values at the correct depth. Then we'll keep digging into the
             // array.
             if (!isset($loc[$key]) || !is_array($loc[$key])) {
-                $loc[$key] = array();
+                $loc[$key] = [];
             }
             $loc = &$loc[$key];
         }
@@ -228,7 +228,7 @@ class DatabaseInterface
      */
     public function clearTableCache(): void
     {
-        $this->_table_cache = array();
+        $this->_table_cache = [];
     }
 
     /**
@@ -278,7 +278,7 @@ class DatabaseInterface
      */
     private function _dbgQuery(string $query, $link, $result, $time): void
     {
-        $dbgInfo = array();
+        $dbgInfo = [];
         $error_message = $this->getError($link);
         if ($result == false && is_string($error_message)) {
             $dbgInfo['error']
@@ -423,7 +423,7 @@ class DatabaseInterface
                     . implode(
                         '\', \'',
                         array_map(
-                            array($this, 'escapeString'),
+                            [$this, 'escapeString'],
                             $table
                         )
                     )
@@ -538,12 +538,12 @@ class DatabaseInterface
         }
         // prepare and check parameters
         if (! is_array($database)) {
-            $databases = array($database);
+            $databases = [$database];
         } else {
             $databases = $database;
         }
 
-        $tables = array();
+        $tables = [];
 
         if (! $GLOBALS['cfg']['Server']['DisableIS']) {
             $sql_where_table = $this->_getTableCondition(
@@ -558,7 +558,7 @@ class DatabaseInterface
             // comparison (if we are looking for the db Aa we don't want
             // to find the db aa)
             $this_databases = array_map(
-                array($this, 'escapeString'),
+                [$this, 'escapeString'],
                 $databases
             );
 
@@ -572,7 +572,7 @@ class DatabaseInterface
             }
 
             $tables = $this->fetchResult(
-                $sql, array('TABLE_SCHEMA', 'TABLE_NAME'), null, $link
+                $sql, ['TABLE_SCHEMA', 'TABLE_NAME'], null, $link
             );
 
             if ($sort_by == 'Name' && $GLOBALS['cfg']['NaturalOrder']) {
@@ -623,7 +623,7 @@ class DatabaseInterface
                                 . implode(
                                     '\', \'',
                                     array_map(
-                                        array($this, 'escapeString'),
+                                        [$this, 'escapeString'],
                                         $table,
                                         $link
                                     )
@@ -807,7 +807,7 @@ class DatabaseInterface
     public function getVirtualTables(string $db): array
     {
         $tables_full = $this->getTablesFull($db);
-        $views = array();
+        $views = [];
 
         foreach ($tables_full as $table=>$tmp) {
 
@@ -932,7 +932,7 @@ class DatabaseInterface
                 unset($databases[$drop]);
             }
         } else {
-            $databases = array();
+            $databases = [];
             foreach ($GLOBALS['dblist']->databases as $database_name) {
                 // Compatibility with INFORMATION_SCHEMA output
                 $databases[$database_name]['SCHEMA_NAME']      = $database_name;
@@ -997,7 +997,7 @@ class DatabaseInterface
             $GLOBALS['callback_sort_by'] = $sort_by;
             usort(
                 $databases,
-                array(self::class, '_usortComparisonCallback')
+                [self::class, '_usortComparisonCallback']
             );
             unset($GLOBALS['callback_sort_order'], $GLOBALS['callback_sort_by']);
 
@@ -1051,12 +1051,12 @@ class DatabaseInterface
      *
      * @return array
      */
-    public function getColumnMapFromSql(string $sql_query, array $view_columns = array()): array
+    public function getColumnMapFromSql(string $sql_query, array $view_columns = []): array
     {
         $result = $this->tryQuery($sql_query);
 
         if ($result === false) {
-            return array();
+            return [];
         }
 
         $meta = $this->getFieldsMeta(
@@ -1065,15 +1065,15 @@ class DatabaseInterface
 
         $nbFields = count($meta);
         if ($nbFields <= 0) {
-            return array();
+            return [];
         }
 
-        $column_map = array();
+        $column_map = [];
         $nbColumns = count($view_columns);
 
         for ($i=0; $i < $nbFields; $i++) {
 
-            $map = array();
+            $map = [];
             $map['table_name'] = $meta[$i]->table;
             $map['refering_column'] = $meta[$i]->name;
 
@@ -1105,8 +1105,8 @@ class DatabaseInterface
         $link = DatabaseInterface::CONNECT_USER
     ): array {
         if (! $GLOBALS['cfg']['Server']['DisableIS']) {
-            $sql_wheres = array();
-            $array_keys = array();
+            $sql_wheres = [];
+            $array_keys = [];
 
             // get columns information from information_schema
             if (null !== $database) {
@@ -1149,7 +1149,7 @@ class DatabaseInterface
             return $this->fetchResult($sql, $array_keys, null, $link);
         }
 
-        $columns = array();
+        $columns = [];
         if (null === $database) {
             foreach ($GLOBALS['dblist']->databases as $database) {
                 $columns[$database] = $this->getColumnsFull(
@@ -1284,7 +1284,7 @@ class DatabaseInterface
         $sql = $this->getColumnsSql($database, $table, $column, $full);
         $fields = $this->fetchResult($sql, 'Field', null, $link);
         if (! is_array($fields) || count($fields) == 0) {
-            return array();
+            return [];
         }
         // Check if column is a part of multiple-column index and set its 'Key'.
         $indexes = Index::getFromTable($table, $database);
@@ -1377,7 +1377,7 @@ class DatabaseInterface
         $indexes = $this->fetchResult($sql, null, null, $link);
 
         if (! is_array($indexes) || count($indexes) < 1) {
-            return array();
+            return [];
         }
         return $indexes;
     }
@@ -1799,7 +1799,7 @@ class DatabaseInterface
         $link = DatabaseInterface::CONNECT_USER,
         int $options = 0
     ) {
-        $resultrows = array();
+        $resultrows = [];
 
         $result = $this->tryQuery($query, $link, $options, false);
 
@@ -1836,7 +1836,7 @@ class DatabaseInterface
                         }
 
                         if (! isset($result_target[$row[$key_index]])) {
-                            $result_target[$row[$key_index]] = array();
+                            $result_target[$row[$key_index]] = [];
                         }
                         $result_target =& $result_target[$row[$key_index]];
                     }
@@ -1860,7 +1860,7 @@ class DatabaseInterface
      */
     public function getCompatibilities(): array
     {
-        $compats = array('NONE');
+        $compats = ['NONE'];
         $compats[] = 'ANSI';
         $compats[] = 'DB2';
         $compats[] = 'MAXDB';
@@ -1905,7 +1905,7 @@ class DatabaseInterface
         $shows = $this->fetchResult(
             'SHOW ' . $which . ' STATUS;', null, null, $link
         );
-        $result = array();
+        $result = [];
         foreach ($shows as $one_show) {
             if ($one_show['Db'] == $db && $one_show['Type'] == $which) {
                 $result[] = $one_show['Name'];
@@ -1930,12 +1930,12 @@ class DatabaseInterface
         string $name,
         $link = DatabaseInterface::CONNECT_USER
     ): string {
-        $returned_field = array(
+        $returned_field = [
             'PROCEDURE' => 'Create Procedure',
             'FUNCTION'  => 'Create Function',
             'EVENT'     => 'Create Event',
             'VIEW'      => 'Create View'
-        );
+        ];
         $query = 'SHOW CREATE ' . $which . ' '
             . Util::backquote($db) . '.'
             . Util::backquote($name);
@@ -1957,7 +1957,7 @@ class DatabaseInterface
         ?string $which = null,
         string $name = ''
     ): array {
-        $routines = array();
+        $routines = [];
         if (! $GLOBALS['cfg']['Server']['DisableIS']) {
             $query = "SELECT"
                 . " `ROUTINE_SCHEMA` AS `Db`,"
@@ -1975,7 +1975,7 @@ class DatabaseInterface
                 . " FROM `information_schema`.`ROUTINES`"
                 . " WHERE `ROUTINE_SCHEMA` " . Util::getCollateForIS()
                 . " = '" . $GLOBALS['dbi']->escapeString($db) . "'";
-            if (Core::isValid($which, array('FUNCTION','PROCEDURE'))) {
+            if (Core::isValid($which, ['FUNCTION','PROCEDURE'])) {
                 $query .= " AND `ROUTINE_TYPE` = '" . $which . "'";
             }
             if (! empty($name)) {
@@ -2013,9 +2013,9 @@ class DatabaseInterface
             }
         }
 
-        $ret = array();
+        $ret = [];
         foreach ($routines as $routine) {
-            $one_result = array();
+            $one_result = [];
             $one_result['db'] = $routine['Db'];
             $one_result['name'] = $routine['Name'];
             $one_result['type'] = $routine['Type'];
@@ -2026,7 +2026,7 @@ class DatabaseInterface
         }
 
         // Sort results by name
-        $name = array();
+        $name = [];
         foreach ($ret as $value) {
             $name[] = $value['name'];
         }
@@ -2077,10 +2077,10 @@ class DatabaseInterface
             }
         }
 
-        $result = array();
+        $result = [];
         if ($events = $this->fetchResult($query)) {
             foreach ($events as $event) {
-                $one_result = array();
+                $one_result = [];
                 $one_result['name'] = $event['Name'];
                 $one_result['type'] = $event['Type'];
                 $one_result['status'] = $event['Status'];
@@ -2089,7 +2089,7 @@ class DatabaseInterface
         }
 
         // Sort results by name
-        $name = array();
+        $name = [];
         foreach ($result as $value) {
             $name[] = $value['name'];
         }
@@ -2109,7 +2109,7 @@ class DatabaseInterface
      */
     public function getTriggers(string $db, string $table = '', $delimiter = '//')
     {
-        $result = array();
+        $result = [];
         if (! $GLOBALS['cfg']['Server']['DisableIS']) {
             $query = 'SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION'
                 . ', EVENT_OBJECT_TABLE, ACTION_TIMING, ACTION_STATEMENT'
@@ -2139,7 +2139,7 @@ class DatabaseInterface
                     $trigger['ACTION_STATEMENT'] = $trigger['Statement'];
                     $trigger['DEFINER'] = $trigger['Definer'];
                 }
-                $one_result = array();
+                $one_result = [];
                 $one_result['name'] = $trigger['TRIGGER_NAME'];
                 $one_result['table'] = $trigger['EVENT_OBJECT_TABLE'];
                 $one_result['action_timing'] = $trigger['ACTION_TIMING'];
@@ -2167,7 +2167,7 @@ class DatabaseInterface
         }
 
         // Sort results by name
-        $name = array();
+        $name = [];
         foreach ($result as $value) {
             $name[] = $value['name'];
         }
@@ -2222,7 +2222,7 @@ class DatabaseInterface
                 $error .= ' - ' . $error_message .
                     ' (<a href="server_engines.php' .
                     Url::getCommon(
-                        array('engine' => 'InnoDB', 'page' => 'Status')
+                        ['engine' => 'InnoDB', 'page' => 'Status']
                     ) . '">' . __('Details…') . '</a>)';
             }
         } else {
@@ -2389,10 +2389,10 @@ class DatabaseInterface
      */
     public function getSystemSchemas(): array
     {
-        $schemas = array(
+        $schemas = [
             'information_schema', 'performance_schema', 'mysql', 'sys'
-        );
-        $systemSchemas = array();
+        ];
+        $systemSchemas = [];
         foreach ($schemas as $schema) {
             if ($this->isSystemSchema($schema, true)) {
                 $systemSchemas[] = $schema;
@@ -2445,7 +2445,7 @@ class DatabaseInterface
             $user = $cfg['Server']['controluser'];
             $password = $cfg['Server']['controlpass'];
 
-            $server = array();
+            $server = [];
 
             if (! empty($cfg['Server']['controlhost'])) {
                 $server['host'] = $cfg['Server']['controlhost'];
@@ -2454,11 +2454,11 @@ class DatabaseInterface
             }
             // Share the settings if the host is same
             if ($server['host'] == $cfg['Server']['host']) {
-                $shared = array(
+                $shared = [
                     'port', 'socket', 'compress',
                     'ssl', 'ssl_key', 'ssl_cert', 'ssl_ca',
                     'ssl_ca_path',  'ssl_ciphers', 'ssl_verify',
-                );
+                ];
                 foreach ($shared as $item) {
                     if (isset($cfg['Server'][$item])) {
                         $server[$item] = $cfg['Server'][$item];
@@ -2477,7 +2477,7 @@ class DatabaseInterface
             }
         } else {
             if (is_null($server)) {
-                return array(null, null, null);
+                return [null, null, null];
             }
             if (isset($server['user'])) {
                 $user = $server['user'];
@@ -2506,7 +2506,7 @@ class DatabaseInterface
             $server['compress'] = false;
         }
 
-        return array($user, $password, $server);
+        return [$user, $password, $server];
     }
 
     /**
diff --git a/libraries/classes/Dbi/DbiDummy.php b/libraries/classes/Dbi/DbiDummy.php
index 2910f2e533..33621bf8e5 100644
--- a/libraries/classes/Dbi/DbiDummy.php
+++ b/libraries/classes/Dbi/DbiDummy.php
@@ -29,7 +29,7 @@ class DbiDummy implements DbiExtension
     /**
      * @var array
      */
-    private $_queries = array();
+    private $_queries = [];
 
     /**
      * @var int
@@ -188,7 +188,7 @@ class DbiDummy implements DbiExtension
             return $data;
         }
 
-        $ret = array();
+        $ret = [];
         foreach ($data as $key => $val) {
             $ret[$query_data['columns'][$key]] = $val;
         }
@@ -363,7 +363,7 @@ class DbiDummy implements DbiExtension
      */
     public function getFieldsMeta($result)
     {
-        return array();
+        return [];
     }
 
     /**
@@ -445,10 +445,10 @@ class DbiDummy implements DbiExtension
      */
     public function setResult($query, $result)
     {
-        $this->_queries[] = array(
+        $this->_queries[] = [
             'query' => $query,
             'result' => $result,
-        );
+        ];
     }
 
     /**
@@ -475,27 +475,27 @@ class DbiDummy implements DbiExtension
         /**
          * Array of queries this "driver" supports
          */
-        $GLOBALS['dummy_queries'] = array(
-            array('query' => 'SELECT 1', 'result' => array(array('1'))),
-            array(
+        $GLOBALS['dummy_queries'] = [
+            ['query' => 'SELECT 1', 'result' => [['1']]],
+            [
                 'query'  => 'SELECT CURRENT_USER();',
-                'result' => array(array('pma_test@localhost')),
-            ),
-            array(
+                'result' => [['pma_test@localhost']],
+            ],
+            [
                 'query'  => "SHOW VARIABLES LIKE 'lower_case_table_names'",
-                'result' => array(array('lower_case_table_names', '1')),
-            ),
-            array(
+                'result' => [['lower_case_table_names', '1']],
+            ],
+            [
                 'query'  => 'SELECT 1 FROM mysql.user LIMIT 1',
-                'result' => array(array('1')),
-            ),
-            array(
+                'result' => [['1']],
+            ],
+            [
                 'query'  => "SELECT 1 FROM `INFORMATION_SCHEMA`.`USER_PRIVILEGES`"
                     . " WHERE `PRIVILEGE_TYPE` = 'CREATE USER'"
                     . " AND '''pma_test''@''localhost''' LIKE `GRANTEE` LIMIT 1",
-                'result' => array(array('1')),
-            ),
-            array(
+                'result' => [['1']],
+            ],
+            [
                 'query'  => "SELECT 1 FROM (SELECT `GRANTEE`, `IS_GRANTABLE`"
                     . " FROM `INFORMATION_SCHEMA`.`COLUMN_PRIVILEGES`"
                     . " UNION SELECT `GRANTEE`, `IS_GRANTABLE`"
@@ -506,155 +506,155 @@ class DbiDummy implements DbiExtension
                     . " FROM `INFORMATION_SCHEMA`.`USER_PRIVILEGES`) t"
                     . " WHERE `IS_GRANTABLE` = 'YES'"
                     . " AND '''pma_test''@''localhost''' LIKE `GRANTEE` LIMIT 1",
-                'result' => array(array('1')),
-            ),
-            array(
+                'result' => [['1']],
+            ],
+            [
                 'query'  => 'SHOW MASTER LOGS',
                 'result' => false,
-            ),
-            array(
+            ],
+            [
                 'query'  => 'SHOW STORAGE ENGINES',
-                'result' => array(
-                    array(
+                'result' => [
+                    [
                         'Engine'  => 'dummy',
                         'Support' => 'YES',
                         'Comment' => 'dummy comment',
-                    ),
-                    array(
+                    ],
+                    [
                         'Engine'  => 'dummy2',
                         'Support' => 'NO',
                         'Comment' => 'dummy2 comment',
-                    ),
-                    array(
+                    ],
+                    [
                         'Engine'  => 'FEDERATED',
                         'Support' => 'NO',
                         'Comment' => 'Federated MySQL storage engine',
-                    ),
-                ),
-            ),
-            array(
+                    ],
+                ],
+            ],
+            [
                 'query'  => 'SHOW STATUS WHERE Variable_name'
                     . ' LIKE \'Innodb\\_buffer\\_pool\\_%\''
                     . ' OR Variable_name = \'Innodb_page_size\';',
-                'result' => array(
-                    array('Innodb_buffer_pool_pages_data', 0),
-                    array('Innodb_buffer_pool_pages_dirty', 0),
-                    array('Innodb_buffer_pool_pages_flushed', 0),
-                    array('Innodb_buffer_pool_pages_free', 0),
-                    array('Innodb_buffer_pool_pages_misc', 0),
-                    array('Innodb_buffer_pool_pages_total', 4096),
-                    array('Innodb_buffer_pool_read_ahead_rnd', 0),
-                    array('Innodb_buffer_pool_read_ahead', 0),
-                    array('Innodb_buffer_pool_read_ahead_evicted', 0),
-                    array('Innodb_buffer_pool_read_requests', 64),
-                    array('Innodb_buffer_pool_reads', 32),
-                    array('Innodb_buffer_pool_wait_free', 0),
-                    array('Innodb_buffer_pool_write_requests', 64),
-                    array('Innodb_page_size', 16384),
-                ),
-            ),
-            array(
+                '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],
+                ],
+            ],
+            [
                 'query'  => 'SHOW ENGINE INNODB STATUS;',
                 'result' => false,
-            ),
-            array(
+            ],
+            [
                 'query'  => 'SELECT @@innodb_version;',
-                'result' => array(
-                    array('1.1.8'),
-                ),
-            ),
-            array(
+                'result' => [
+                    ['1.1.8'],
+                ],
+            ],
+            [
                 'query'  => 'SELECT @@disabled_storage_engines',
-                'result' => array(
-                    array(''),
-                ),
-            ),
-            array(
+                'result' => [
+                    [''],
+                ],
+            ],
+            [
                 'query'  => 'SHOW GLOBAL VARIABLES LIKE \'innodb_file_per_table\';',
-                'result' => array(
-                    array('innodb_file_per_table', 'OFF'),
-                ),
-            ),
-            array(
+                'result' => [
+                    ['innodb_file_per_table', 'OFF'],
+                ],
+            ],
+            [
                 'query'  => 'SHOW GLOBAL VARIABLES LIKE \'innodb_file_format\';',
-                'result' => array(
-                    array('innodb_file_format', 'Antelope'),
-                ),
-            ),
-            array(
+                'result' => [
+                    ['innodb_file_format', 'Antelope'],
+                ],
+            ],
+            [
                 'query'  => 'SELECT @@collation_server',
-                'result' => array(
-                    array('utf8_general_ci'),
-                ),
-            ),
-            array(
+                'result' => [
+                    ['utf8_general_ci'],
+                ],
+            ],
+            [
                 'query'  => 'SELECT @@lc_messages;',
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => 'SHOW SESSION VARIABLES LIKE \'FOREIGN_KEY_CHECKS\';',
-                'result' => array(
-                    array('foreign_key_checks', 'ON'),
-                ),
-            ),
-            array(
+                'result' => [
+                    ['foreign_key_checks', 'ON'],
+                ],
+            ],
+            [
                 'query'  => 'SHOW TABLES FROM `pma_test`;',
-                'result' => array(
-                    array('table1'),
-                    array('table2'),
-                ),
-            ),
-            array(
+                'result' => [
+                    ['table1'],
+                    ['table2'],
+                ],
+            ],
+            [
                 'query'  => 'SHOW TABLES FROM `pmadb`',
-                'result' => array(
-                    array('column_info'),
-                ),
-            ),
-            array(
+                'result' => [
+                    ['column_info'],
+                ],
+            ],
+            [
                 'query'   => 'SHOW COLUMNS FROM `pma_test`.`table1`',
-                'columns' => array(
+                'columns' => [
                     'Field',
                     'Type',
                     'Null',
                     'Key',
                     'Default',
                     'Extra',
-                ),
-                'result'  => array(
-                    array('i', 'int(11)', 'NO', 'PRI', 'NULL', 'auto_increment'),
-                    array('o', 'int(11)', 'NO', 'MUL', 'NULL', ''),
-                ),
-            ),
-            array(
+                ],
+                'result'  => [
+                    ['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' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'   => 'SHOW COLUMNS FROM `pma_test`.`table2`',
-                'columns' => array(
+                'columns' => [
                     'Field',
                     'Type',
                     'Null',
                     'Key',
                     'Default',
                     'Extra',
-                ),
-                'result'  => array(
-                    array('i', 'int(11)', 'NO', 'PRI', 'NULL', 'auto_increment'),
-                    array('o', 'int(11)', 'NO', 'MUL', 'NULL', ''),
-                ),
-            ),
-            array(
+                ],
+                'result'  => [
+                    ['i', 'int(11)', 'NO', 'PRI', 'NULL', 'auto_increment'],
+                    ['o', 'int(11)', 'NO', 'MUL', 'NULL', ''],
+                ],
+            ],
+            [
                 'query'  => 'SHOW INDEXES FROM `pma_test`.`table1`',
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => 'SHOW INDEXES FROM `pma_test`.`table2`',
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'   => 'SHOW COLUMNS FROM `pma`.`table1`',
-                'columns' => array(
+                'columns' => [
                     'Field',
                     'Type',
                     'Null',
@@ -663,9 +663,9 @@ class DbiDummy implements DbiExtension
                     'Extra',
                     'Privileges',
                     'Comment',
-                ),
-                'result'  => array(
-                    array(
+                ],
+                'result'  => [
+                    [
                         'i',
                         'int(11)',
                         'NO',
@@ -674,8 +674,8 @@ class DbiDummy implements DbiExtension
                         'auto_increment',
                         'select,insert,update,references',
                         '',
-                    ),
-                    array(
+                    ],
+                    [
                         'o',
                         'varchar(100)',
                         'NO',
@@ -684,43 +684,43 @@ class DbiDummy implements DbiExtension
                         '',
                         'select,insert,update,references',
                         '',
-                    ),
-                ),
-            ),
-            array(
+                    ],
+                ],
+            ],
+            [
                 'query'   => 'SELECT `CHARACTER_SET_NAME` AS `Charset`,'
                     . ' `DESCRIPTION` AS `Description`'
                     . ' FROM `information_schema`.`CHARACTER_SETS`',
-                'columns' => array(
+                'columns' => [
                     'Charset',
                     'Description',
-                ),
-                'result'  => array(
-                    array('utf8', 'UTF-8 Unicode'),
-                    array('latin1', 'cp1252 West European'),
-                ),
-            ),
-            array(
+                ],
+                'result'  => [
+                    ['utf8', 'UTF-8 Unicode'],
+                    ['latin1', 'cp1252 West European'],
+                ],
+            ],
+            [
                 'query'   => 'SELECT `CHARACTER_SET_NAME` AS `Charset`,'
                     . ' `COLLATION_NAME` AS `Collation`, `IS_DEFAULT` AS `Default`'
                     . ' FROM `information_schema`.`COLLATIONS`',
-                'columns' => array(
+                'columns' => [
                     'Charset',
                     'Collation',
                     'Default',
-                ),
-                'result'  => array(
-                    array('utf8', 'utf8_general_ci','Yes'),
-                    array('utf8', 'utf8_bin', ''),
-                    array('latin1', 'latin1_swedish_ci', 'Yes'),
-                ),
-            ),
-            array(
+                ],
+                'result'  => [
+                    ['utf8', 'utf8_general_ci','Yes'],
+                    ['utf8', 'utf8_bin', ''],
+                    ['latin1', 'latin1_swedish_ci', 'Yes'],
+                ],
+            ],
+            [
                 'query'  => 'SELECT `TABLE_NAME` FROM `INFORMATION_SCHEMA`.`TABLES`'
                     . ' WHERE `TABLE_SCHEMA`=\'pma_test\' AND `TABLE_TYPE`=\'BASE TABLE\'',
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'   => 'SELECT `column_name`, `mimetype`, `transformation`,'
                     . ' `transformation_options`, `input_transformation`,'
                     . ' `input_transformation_options`'
@@ -730,25 +730,25 @@ class DbiDummy implements DbiExtension
                     . ' OR `transformation_options` != \'\''
                     . ' OR `input_transformation` != \'\''
                     . ' OR `input_transformation_options` != \'\')',
-                'columns' => array(
+                'columns' => [
                     'column_name',
                     'mimetype',
                     'transformation',
                     'transformation_options',
                     'input_transformation',
                     'input_transformation_options',
-                ),
-                'result'  => array(
-                    array('o', 'text/plain', 'sql', '', 'regex', '/pma/i'),
-                    array('col', 't', 'o/p', '', 'i/p', ''),
-                ),
-            ),
-            array(
+                ],
+                'result'  => [
+                    ['o', 'text/plain', 'sql', '', 'regex', '/pma/i'],
+                    ['col', 't', 'o/p', '', 'i/p', ''],
+                ],
+            ],
+            [
                 'query'  => 'SELECT TABLE_NAME FROM information_schema.VIEWS'
                     . ' WHERE TABLE_SCHEMA = \'pma_test\' AND TABLE_NAME = \'table1\'',
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'   => 'SELECT *, `TABLE_SCHEMA` AS `Db`, `TABLE_NAME` AS `Name`,'
                     . ' `TABLE_TYPE` AS `TABLE_TYPE`, `ENGINE` AS `Engine`,'
                     . ' `ENGINE` AS `Type`, `VERSION` AS `Version`,'
@@ -765,7 +765,7 @@ class DbiDummy implements DbiExtension
                     . ' FROM `information_schema`.`TABLES` t'
                     . ' WHERE `TABLE_SCHEMA` IN (\'pma_test\')'
                     . ' AND t.`TABLE_NAME` = \'table1\' ORDER BY Name ASC',
-                'columns' => array(
+                'columns' => [
                     'TABLE_CATALOG',
                     'TABLE_SCHEMA',
                     'TABLE_NAME',
@@ -808,9 +808,9 @@ class DbiDummy implements DbiExtension
                     'Checksum',
                     'Create_options',
                     'Comment',
-                ),
-                'result'  => array(
-                    array(
+                ],
+                'result'  => [
+                    [
                         'def',
                         'smash',
                         'issues_issue',
@@ -851,10 +851,10 @@ class DbiDummy implements DbiExtension
                         'NULL',
                         'utf8_general_ci',
                         'NULL',
-                    ),
-                ),
-            ),
-            array(
+                    ],
+                ],
+            ],
+            [
                 'query'   => 'SELECT *, `TABLE_SCHEMA` AS `Db`, `TABLE_NAME` AS `Name`,'
                     . ' `TABLE_TYPE` AS `TABLE_TYPE`, `ENGINE` AS `Engine`,'
                     . ' `ENGINE` AS `Type`, `VERSION` AS `Version`,'
@@ -871,7 +871,7 @@ class DbiDummy implements DbiExtension
                     . ' FROM `information_schema`.`TABLES` t'
                     . ' WHERE `TABLE_SCHEMA` IN (\'pma_test\')'
                     . ' AND t.`TABLE_NAME` = \'table1\' ORDER BY Name ASC',
-                'columns' => array(
+                'columns' => [
                     'TABLE_CATALOG',
                     'TABLE_SCHEMA',
                     'TABLE_NAME',
@@ -914,9 +914,9 @@ class DbiDummy implements DbiExtension
                     'Checksum',
                     'Create_options',
                     'Comment',
-                ),
-                'result'  => array(
-                    array(
+                ],
+                'result'  => [
+                    [
                         'def',
                         'smash',
                         'issues_issue',
@@ -957,128 +957,128 @@ class DbiDummy implements DbiExtension
                         'NULL',
                         'utf8_general_ci',
                         'NULL',
-                    ),
-                ),
-            ),
-            array(
+                    ],
+                ],
+            ],
+            [
                 'query'  => 'SELECT COUNT(*) FROM `pma_test`.`table1`',
-                'result' => array(array(0)),
-            ),
-            array(
+                'result' => [[0]],
+            ],
+            [
                 'query'  => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
                     . '`USER_PRIVILEGES`'
                     . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\''
                     . ' AND PRIVILEGE_TYPE=\'TRIGGER\'',
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
                     . '`SCHEMA_PRIVILEGES`'
                     . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\''
                     . ' AND PRIVILEGE_TYPE=\'TRIGGER\' AND \'pma_test\''
                     . ' LIKE `TABLE_SCHEMA`',
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
                     . '`TABLE_PRIVILEGES`'
                     . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\''
                     . ' AND PRIVILEGE_TYPE=\'TRIGGER\' AND \'pma_test\''
                     . ' LIKE `TABLE_SCHEMA` AND TABLE_NAME=\'table1\'',
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
                     . '`USER_PRIVILEGES`'
                     . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\''
                     . ' AND PRIVILEGE_TYPE=\'EVENT\'',
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
                     . '`SCHEMA_PRIVILEGES`'
                     . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\''
                     . ' AND PRIVILEGE_TYPE=\'EVENT\' AND \'pma_test\''
                     . ' LIKE `TABLE_SCHEMA`',
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'
                     . '`TABLE_PRIVILEGES`'
                     . ' WHERE GRANTEE=\'\'\'pma_test\'\'@\'\'localhost\'\'\''
                     . ' AND PRIVILEGE_TYPE=\'EVENT\''
                     . ' AND TABLE_SCHEMA=\'pma\\\\_test\' AND TABLE_NAME=\'table1\'',
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => 'RENAME TABLE `pma_test`.`table1` TO `pma_test`.`table3`;',
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => 'SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION,'
                     . ' EVENT_OBJECT_TABLE, ACTION_TIMING, ACTION_STATEMENT, '
                     . 'EVENT_OBJECT_SCHEMA, EVENT_OBJECT_TABLE, DEFINER'
                     . ' FROM information_schema.TRIGGERS'
                     . ' WHERE EVENT_OBJECT_SCHEMA= \'pma_test\''
                     . ' AND EVENT_OBJECT_TABLE = \'table1\';',
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => 'SHOW TABLES FROM `pma`;',
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => "SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`."
                     . "`SCHEMA_PRIVILEGES` WHERE GRANTEE='''pma_test''@''localhost'''"
                     . " AND PRIVILEGE_TYPE='EVENT' AND TABLE_SCHEMA='pma'",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => "SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`."
                     . "`SCHEMA_PRIVILEGES` WHERE GRANTEE='''pma_test''@''localhost'''"
                     . " AND PRIVILEGE_TYPE='TRIGGER' AND TABLE_SCHEMA='pma'",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'   => 'SELECT DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA'
                     . ' WHERE SCHEMA_NAME = \'pma_test\' LIMIT 1',
-                'columns' => array('DEFAULT_COLLATION_NAME'),
-                'result'  => array(
-                    array('utf8_general_ci'),
-                ),
-            ),
-            array(
+                'columns' => ['DEFAULT_COLLATION_NAME'],
+                'result'  => [
+                    ['utf8_general_ci'],
+                ],
+            ],
+            [
                 'query'   => 'SELECT @@collation_database',
-                'columns' => array('@@collation_database'),
-                'result'  => array(
-                    array('bar'),
-                ),
-            ),
-            array(
+                'columns' => ['@@collation_database'],
+                'result'  => [
+                    ['bar'],
+                ],
+            ],
+            [
                 'query'  => "SHOW TABLES FROM `phpmyadmin`",
-                'result' => array(),
-            ),
-            array(
+                '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' => array('tracking_active'),
-                'result'  => array(
-                    array(1),
-                ),
-            ),
-            array(
+                'columns' => ['tracking_active'],
+                'result'  => [
+                    [1],
+                ],
+            ],
+            [
                 'query'  => "SELECT tracking_active FROM `pmadb`.`tracking`" .
                     " WHERE db_name = 'pma_test_db'" .
                     " AND table_name = 'pma_test_table2'" .
                     " ORDER BY version DESC LIMIT 1",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => "SHOW SLAVE STATUS",
-                'result' => array(
-                    array(
+                'result' => [
+                    [
                         'Slave_IO_State'              => 'running',
                         'Master_Host'                 => 'locahost',
                         'Master_User'                 => 'Master_User',
@@ -1112,25 +1112,25 @@ class DbiDummy implements DbiExtension
                         'Master_SSL_Cipher'           => 'Master_SSL_Cipher',
                         'Master_SSL_Key'              => 'Master_SSL_Key',
                         'Seconds_Behind_Master'       => 'Seconds_Behind_Master',
-                    ),
-                ),
-            ),
-            array(
+                    ],
+                ],
+            ],
+            [
                 'query'  => "SHOW MASTER STATUS",
-                'result' => array(
-                    array(
+                'result' => [
+                    [
                         "File"             => "master-bin.000030",
                         "Position"         => "107",
                         "Binlog_Do_DB"     => "Binlog_Do_DB",
                         "Binlog_Ignore_DB" => "Binlog_Ignore_DB",
-                    ),
-                ),
-            ),
-            array(
+                    ],
+                ],
+            ],
+            [
                 'query'  => "SHOW GRANTS",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => "SELECT `SCHEMA_NAME` FROM `INFORMATION_SCHEMA`.`SCHEMATA`, "
                     . "(SELECT DB_first_level FROM ( SELECT DISTINCT "
                     . "SUBSTRING_INDEX(SCHEMA_NAME, '_', 1) DB_first_level "
@@ -1138,112 +1138,112 @@ class DbiDummy implements DbiExtension
                     . "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",
-                'result' => array(
+                'result' => [
                     "test",
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 'query'  => "SELECT COUNT(*) FROM ( SELECT DISTINCT SUBSTRING_INDEX("
                     . "SCHEMA_NAME, '_', 1) DB_first_level "
                     . "FROM INFORMATION_SCHEMA.SCHEMATA WHERE TRUE ) t",
-                'result' => array(
-                    array(1),
-                ),
-            ),
-            array(
+                'result' => [
+                    [1],
+                ],
+            ],
+            [
                 'query'  => "SELECT `PARTITION_METHOD` "
                     . "FROM `information_schema`.`PARTITIONS` "
                     . "WHERE `TABLE_SCHEMA` = 'db' AND `TABLE_NAME` = 'table' LIMIT 1",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => "SHOW PLUGINS",
-                'result' => array(
-                    array('Name' => 'partition'),
-                ),
-            ),
-            array(
+                'result' => [
+                    ['Name' => 'partition'],
+                ],
+            ],
+            [
                 'query'  => "SHOW FULL TABLES FROM `default` WHERE `Table_type`='BASE TABLE'",
-                'result' => array(
-                    array("test1", "BASE TABLE"),
-                    array("test2", "BASE TABLE"),
-                ),
-            ),
-            array(
+                'result' => [
+                    ["test1", "BASE TABLE"],
+                    ["test2", "BASE TABLE"],
+                ],
+            ],
+            [
                 'query'  => "SHOW FULL TABLES FROM `default` "
                     . "WHERE `Table_type`!='BASE TABLE'",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => "SHOW FUNCTION STATUS WHERE `Db`='default'",
-                'result' => array(array("Name" => "testFunction")),
-            ),
-            array(
+                'result' => [["Name" => "testFunction"]],
+            ],
+            [
                 'query'  => "SHOW PROCEDURE STATUS WHERE `Db`='default'",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => "SHOW EVENTS FROM `default`",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => "FLUSH PRIVILEGES",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => "SELECT * FROM `mysql`.`db` LIMIT 1",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => "SELECT * FROM `mysql`.`columns_priv` LIMIT 1",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => "SELECT * FROM `mysql`.`tables_priv` LIMIT 1",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => "SELECT * FROM `mysql`.`procs_priv` LIMIT 1",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query' => 'DELETE FROM `mysql`.`db` WHERE `host` = "" '
                     . 'AND `Db` = "" AND `User` = ""',
                 'result' => true
-            ),
-            array(
+            ],
+            [
                 'query' => 'DELETE FROM `mysql`.`columns_priv` WHERE '
                     . '`host` = "" AND `Db` = "" AND `User` = ""',
                 'result' => true
-            ),
-            array(
+            ],
+            [
                 'query' => 'DELETE FROM `mysql`.`tables_priv` WHERE '
                     . '`host` = "" AND `Db` = "" AND `User` = "" AND Table_name = ""',
                 'result' => true
-            ),
-            array(
+            ],
+            [
                 'query'  => 'DELETE FROM `mysql`.`procs_priv` WHERE '
                     . '`host` = "" AND `Db` = "" AND `User` = "" AND `Routine_name` = "" '
                     . 'AND `Routine_type` = ""',
                 'result' => true
-            ),
-            array(
+            ],
+            [
                 'query' => 'SELECT `plugin` FROM `mysql`.`user` WHERE '
                     . '`User` = "pma_username" AND `Host` = "pma_hostname" LIMIT 1',
-                'result' => array()
-            ),
-            array(
+                'result' => []
+            ],
+            [
                 'query'  => 'SELECT @@default_authentication_plugin',
-                'result' => array(
-                    array('@@default_authentication_plugin' => 'mysql_native_password'),
-                ),
-            ),
-            array(
+                'result' => [
+                    ['@@default_authentication_plugin' => 'mysql_native_password'],
+                ],
+            ],
+            [
                 'query'  => "SELECT TABLE_NAME FROM information_schema.VIEWS WHERE "
                     . "TABLE_SCHEMA = 'db' AND TABLE_NAME = 'table'",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => "SELECT *, `TABLE_SCHEMA` AS `Db`, "
                     . "`TABLE_NAME` AS `Name`, `TABLE_TYPE` AS `TABLE_TYPE`, "
                     . "`ENGINE` AS `Engine`, `ENGINE` AS `Type`, "
@@ -1261,52 +1261,52 @@ class DbiDummy implements DbiExtension
                     . "FROM `information_schema`.`TABLES` t "
                     . "WHERE `TABLE_SCHEMA` IN ('db') "
                     . "AND t.`TABLE_NAME` = 'table' ORDER BY Name ASC",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => "SHOW TABLE STATUS FROM `db` WHERE `Name` LIKE 'table%'",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => "SELECT @@have_partitioning;",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => "SELECT @@lower_case_table_names",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => "SELECT `PLUGIN_NAME`, `PLUGIN_DESCRIPTION` "
                     . "FROM `information_schema`.`PLUGINS` "
                     . "WHERE `PLUGIN_TYPE` = 'AUTHENTICATION';",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => "SHOW TABLES FROM `db`;",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => "SELECT `PRIVILEGE_TYPE` FROM "
                     . "`INFORMATION_SCHEMA`.`SCHEMA_PRIVILEGES` "
                     . "WHERE GRANTEE='''pma_test''@''localhost''' "
                     . "AND PRIVILEGE_TYPE='EVENT' AND 'db' LIKE `TABLE_SCHEMA`",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => "SELECT `PRIVILEGE_TYPE` FROM "
                     . "`INFORMATION_SCHEMA`.`SCHEMA_PRIVILEGES` "
                     . "WHERE GRANTEE='''pma_test''@''localhost''' "
                     . "AND PRIVILEGE_TYPE='TRIGGER' AND 'db' LIKE `TABLE_SCHEMA`",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => "SELECT (COUNT(DB_first_level) DIV 100) * 100 from "
                     . "( SELECT distinct SUBSTRING_INDEX(SCHEMA_NAME, '_', 1) "
                     . "DB_first_level FROM INFORMATION_SCHEMA.SCHEMATA "
                     . "WHERE `SCHEMA_NAME` < 'db' ) t",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query'  => "SELECT `SCHEMA_NAME` FROM "
                     . "`INFORMATION_SCHEMA`.`SCHEMATA`, "
                     . "(SELECT DB_first_level FROM ( SELECT DISTINCT "
@@ -1315,17 +1315,17 @@ class DbiDummy implements DbiExtension
                     . "ORDER BY DB_first_level ASC LIMIT , 100) t2 WHERE TRUE AND "
                     . "1 = LOCATE(CONCAT(DB_first_level, '_'), "
                     . "CONCAT(SCHEMA_NAME, '_')) ORDER BY SCHEMA_NAME ASC",
-                'result' => array(),
-            ),
-            array(
+                'result' => [],
+            ],
+            [
                 'query' => 'SELECT @@ndb_version_string',
-                'result' => array(array('ndb-7.4.10')),
-            ),
-            array(
+                'result' => [['ndb-7.4.10']],
+            ],
+            [
                 'query' => "SELECT *, `COLUMN_NAME` AS `Field`, `COLUMN_TYPE` AS `Type`, `COLLATION_NAME` AS `Collation`, `IS_NULLABLE` AS `Null`, `COLUMN_KEY` AS `Key`, `COLUMN_DEFAULT` AS `Default`, `EXTRA` AS `Extra`, `PRIVILEGES` AS `Privileges`, `COLUMN_COMMENT` AS `Comment` FROM `information_schema`.`COLUMNS` WHERE `TABLE_SCHEMA` = 'information_schema' AND `TABLE_NAME` = 'PMA'",
-                'result' => array(),
-            ),
-        );
+                'result' => [],
+            ],
+        ];
         /**
          * Current database.
          */
diff --git a/libraries/classes/Dbi/DbiMysqli.php b/libraries/classes/Dbi/DbiMysqli.php
index 616e5e3378..913843b80b 100644
--- a/libraries/classes/Dbi/DbiMysqli.php
+++ b/libraries/classes/Dbi/DbiMysqli.php
@@ -23,7 +23,7 @@ class DbiMysqli implements DbiExtension
     /**
      * @var array
      */
-    private static $pma_mysqli_flag_names = array(
+    private static $pma_mysqli_flag_names = [
         MYSQLI_NUM_FLAG => 'num',
         MYSQLI_PART_KEY_FLAG => 'part_key',
         MYSQLI_SET_FLAG => 'set',
@@ -37,7 +37,7 @@ class DbiMysqli implements DbiExtension
         MYSQLI_UNIQUE_KEY_FLAG => 'unique_key',
         MYSQLI_PRI_KEY_FLAG => 'primary_key',
         MYSQLI_NOT_NULL_FLAG => 'not_null',
-    );
+    ];
 
     /**
      * connects to the database server
@@ -394,7 +394,7 @@ class DbiMysqli implements DbiExtension
     public function getFieldsMeta($result)
     {
         // Build an associative array for a type look up
-        $typeAr = array();
+        $typeAr = [];
         $typeAr[MYSQLI_TYPE_DECIMAL]     = 'real';
         $typeAr[MYSQLI_TYPE_NEWDECIMAL]  = 'real';
         $typeAr[MYSQLI_TYPE_BIT]         = 'int';
@@ -524,7 +524,7 @@ class DbiMysqli implements DbiExtension
         $type = $fieldDefinition->type;
         $charsetNumber = $fieldDefinition->charsetnr;
         $fieldDefinitionFlags = $fieldDefinition->flags;
-        $flags = array();
+        $flags = [];
         foreach (self::$pma_mysqli_flag_names as $flag => $name) {
             if ($fieldDefinitionFlags & $flag) {
                 $flags[] = $name;
diff --git a/libraries/classes/Di/AliasItem.php b/libraries/classes/Di/AliasItem.php
index 6d98929bec..a6c57baece 100644
--- a/libraries/classes/Di/AliasItem.php
+++ b/libraries/classes/Di/AliasItem.php
@@ -41,7 +41,7 @@ class AliasItem implements Item
      * @param array $params Parameters
      * @return mixed
      */
-    public function get(array $params = array())
+    public function get(array $params = [])
     {
         return $this->container->get($this->target, $params);
     }
diff --git a/libraries/classes/Di/Container.php b/libraries/classes/Di/Container.php
index 1a7435b158..20cfd60186 100644
--- a/libraries/classes/Di/Container.php
+++ b/libraries/classes/Di/Container.php
@@ -21,7 +21,7 @@ class Container implements ContainerInterface
     /**
      * @var Item[] $content
      */
-    protected $content = array();
+    protected $content = [];
 
     /**
      * @var Container
@@ -54,7 +54,7 @@ class Container implements ContainerInterface
      *
      * @return mixed
      */
-    public function get($name, array $params = array())
+    public function get($name, array $params = [])
     {
         if (!$this->has($name)) {
             throw new NotFoundException("No entry was found for $name identifier.");
diff --git a/libraries/classes/Di/FactoryItem.php b/libraries/classes/Di/FactoryItem.php
index cdced6aa50..927805b48b 100644
--- a/libraries/classes/Di/FactoryItem.php
+++ b/libraries/classes/Di/FactoryItem.php
@@ -24,7 +24,7 @@ class FactoryItem extends ReflectorItem
      *
      * @return mixed
      */
-    public function get(array $params = array())
+    public function get(array $params = [])
     {
         return $this->invoke($params);
     }
diff --git a/libraries/classes/Di/Item.php b/libraries/classes/Di/Item.php
index 2632a3f56e..1da8614d62 100644
--- a/libraries/classes/Di/Item.php
+++ b/libraries/classes/Di/Item.php
@@ -23,5 +23,5 @@ interface Item
      * @param array $params Parameters
      * @return mixed
      */
-    public function get(array $params = array());
+    public function get(array $params = []);
 }
diff --git a/libraries/classes/Di/ReflectorItem.php b/libraries/classes/Di/ReflectorItem.php
index 0ddb09a204..8277543076 100644
--- a/libraries/classes/Di/ReflectorItem.php
+++ b/libraries/classes/Di/ReflectorItem.php
@@ -41,9 +41,9 @@ abstract class ReflectorItem implements Item
      * @param array $params Parameters
      * @return mixed
      */
-    protected function invoke(array $params = array())
+    protected function invoke(array $params = [])
     {
-        $args = array();
+        $args = [];
         $reflector = $this->_reflector;
         if ($reflector instanceof \ReflectionClass) {
             $constructor = $reflector->getConstructor();
@@ -76,9 +76,9 @@ abstract class ReflectorItem implements Item
      *
 *@return array
      */
-    private function _resolveArgs($required, array $params = array())
+    private function _resolveArgs($required, array $params = [])
     {
-        $args = array();
+        $args = [];
         foreach ($required as $param) {
             $name = $param->getName();
             $type = $param->getClass();
diff --git a/libraries/classes/Di/ServiceItem.php b/libraries/classes/Di/ServiceItem.php
index 908c64906a..223efd849a 100644
--- a/libraries/classes/Di/ServiceItem.php
+++ b/libraries/classes/Di/ServiceItem.php
@@ -26,7 +26,7 @@ class ServiceItem extends ReflectorItem
      * @param array $params Parameters
      * @return mixed
      */
-    public function get(array $params = array())
+    public function get(array $params = [])
     {
         if (!isset($this->instance)) {
             $this->instance = $this->invoke();
diff --git a/libraries/classes/Di/ValueItem.php b/libraries/classes/Di/ValueItem.php
index 419b9468d0..7a40cb3d10 100644
--- a/libraries/classes/Di/ValueItem.php
+++ b/libraries/classes/Di/ValueItem.php
@@ -36,7 +36,7 @@ class ValueItem implements Item
      * @param array $params Parameters
      * @return mixed
      */
-    public function get(array $params = array())
+    public function get(array $params = [])
     {
         return $this->value;
     }
diff --git a/libraries/classes/Display/CreateTable.php b/libraries/classes/Display/CreateTable.php
index 73db9239bb..ba123fab2e 100644
--- a/libraries/classes/Display/CreateTable.php
+++ b/libraries/classes/Display/CreateTable.php
@@ -49,7 +49,7 @@ class CreateTable
     public static function getHtml($db)
     {
         return Template::get('database/create_table')->render(
-            array('db' => $db)
+            ['db' => $db]
         );
     }
 }
diff --git a/libraries/classes/Display/Export.php b/libraries/classes/Display/Export.php
index cfc58cbe36..05eaa7b9c3 100644
--- a/libraries/classes/Display/Export.php
+++ b/libraries/classes/Display/Export.php
@@ -577,44 +577,44 @@ class Export
         if (isset($_SESSION['tmpval']['aliases'])) {
             foreach ($_SESSION['tmpval']['aliases'] as $db => $dbData) {
                 if (isset($dbData['alias'])) {
-                    $result .= $template->render(array(
+                    $result .= $template->render([
                         'type' => _pgettext('Alias', 'Database'),
                         'name' => $db,
                         'field' => 'aliases[' . $db . '][alias]',
                         'value' => $dbData['alias'],
-                    ));
+                    ]);
                 }
                 if (! isset($dbData['tables'])) {
                     continue;
                 }
                 foreach ($dbData['tables'] as $table => $tableData) {
                     if (isset($tableData['alias'])) {
-                        $result .= $template->render(array(
+                        $result .= $template->render([
                             'type' => _pgettext('Alias', 'Table'),
                             'name' => $db . '.' . $table,
                             'field' => 'aliases[' . $db . '][tables][' . $table . '][alias]',
                             'value' => $tableData['alias'],
-                        ));
+                        ]);
                     }
                     if (! isset($tableData['columns'])) {
                         continue;
                     }
                     foreach ($tableData['columns'] as $column => $columnName) {
-                        $result .= $template->render(array(
+                        $result .= $template->render([
                             'type' => _pgettext('Alias', 'Column'),
                             'name' => $db . '.' . $table . '.'. $column,
                             'field' => 'aliases[' . $db . '][tables][' . $table . '][colums][' . $column . ']',
                             'value' => $columnName,
-                        ));
+                        ]);
                     }
                 }
             }
         }
 
         // Empty row for javascript manipulations
-        $result .= '</tbody><tfoot class="hide">' . $template->render(array(
+        $result .= '</tbody><tfoot class="hide">' . $template->render([
             'type' => '', 'name' => '', 'field' => 'aliases_new', 'value' => ''
-        )) . '</tfoot>';
+        ]) . '</tfoot>';
 
         return $result . '</table>';
     }
@@ -669,10 +669,10 @@ class Export
         $exportList = Plugins::getPlugins(
             "export",
             'libraries/classes/Plugins/Export/',
-            array(
+            [
                 'export_type' => $exportType,
                 'single_table' => isset($GLOBALS['single_table'])
-            )
+            ]
         );
 
         /* Fail if we didn't find any plugin */
diff --git a/libraries/classes/Display/Import.php b/libraries/classes/Display/Import.php
index c1040b1539..627f084d06 100644
--- a/libraries/classes/Display/Import.php
+++ b/libraries/classes/Display/Import.php
@@ -74,7 +74,7 @@ class Import
         }
 
         // zip, gzip and bzip2 encode features
-        $compressions = array();
+        $compressions = [];
         if ($cfg['GZipDump'] && function_exists('gzopen')) {
             $compressions[] = 'gzip';
         }
diff --git a/libraries/classes/Display/ImportAjax.php b/libraries/classes/Display/ImportAjax.php
index b6f209410e..afaee5aea2 100644
--- a/libraries/classes/Display/ImportAjax.php
+++ b/libraries/classes/Display/ImportAjax.php
@@ -43,13 +43,13 @@ class ImportAjax
         /**
          * list of available plugins
          */
-        $plugins = array(
+        $plugins = [
             // PHP 5.4 session-based upload progress is problematic, see bug 3964
             //"session",
             "progress",
             "apc",
             "noplugin"
-        );
+        ];
 
         // select available plugin
         foreach ($plugins as $plugin) {
@@ -63,7 +63,7 @@ class ImportAjax
                 break;
             }
         }
-        return array($SESSION_KEY, $upload_id, $plugins);
+        return [$SESSION_KEY, $upload_id, $plugins];
     }
 
     /**
diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php
index bea4942d36..8ab6623925 100644
--- a/libraries/classes/Display/Results.php
+++ b/libraries/classes/Display/Results.php
@@ -89,7 +89,7 @@ class Results
     // Declare global fields
 
     /** array with properties of the class */
-    private $_property_array = array(
+    private $_property_array = [
 
         /** string Database name */
         'db' => null,
@@ -176,8 +176,8 @@ class Results
         'unique_id' => null,
 
         /** where clauses for each row, each table in the row */
-        'whereClauseMap' => array(),
-    );
+        'whereClauseMap' => [],
+    ];
 
     /**
      * This variable contains the column transformation information
@@ -257,125 +257,125 @@ class Results
      */
     private function _setDefaultTransformations()
     {
-        $json_highlighting_data = array(
+        $json_highlighting_data = [
             'libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php',
             'PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Json',
             'Text_Plain'
-        );
-        $sql_highlighting_data = array(
+        ];
+        $sql_highlighting_data = [
             'libraries/classes/Plugins/Transformations/Output/Text_Plain_Sql.php',
             'PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Sql',
             'Text_Plain'
-        );
-        $blob_sql_highlighting_data = array(
+        ];
+        $blob_sql_highlighting_data = [
             'libraries/classes/Plugins/Transformations/Output/Text_Octetstream_Sql.php',
             'PhpMyAdmin\Plugins\Transformations\Output\Text_Octetstream_Sql',
             'Text_Octetstream'
-        );
-        $link_data = array(
+        ];
+        $link_data = [
             'libraries/classes/Plugins/Transformations/Text_Plain_Link.php',
             'PhpMyAdmin\Plugins\Transformations\Text_Plain_Link',
             'Text_Plain'
-        );
-        $this->transformation_info = array(
-            'information_schema' => array(
-                'events' => array(
+        ];
+        $this->transformation_info = [
+            'information_schema' => [
+                'events' => [
                     'event_definition' => $sql_highlighting_data
-                ),
-                'processlist' => array(
+                ],
+                'processlist' => [
                     'info' => $sql_highlighting_data
-                ),
-                'routines' => array(
+                ],
+                'routines' => [
                     'routine_definition' => $sql_highlighting_data
-                ),
-                'triggers' => array(
+                ],
+                'triggers' => [
                     'action_statement' => $sql_highlighting_data
-                ),
-                'views' => array(
+                ],
+                'views' => [
                     'view_definition' => $sql_highlighting_data
-                )
-            ),
-            'mysql' => array(
-                'event' => array(
+                ]
+            ],
+            'mysql' => [
+                'event' => [
                     'body' => $blob_sql_highlighting_data,
                     'body_utf8' => $blob_sql_highlighting_data
-                ),
-                'general_log' => array(
+                ],
+                'general_log' => [
                     'argument' => $sql_highlighting_data
-                ),
-                'help_category' => array(
+                ],
+                'help_category' => [
                     'url' => $link_data
-                ),
-                'help_topic' => array(
+                ],
+                'help_topic' => [
                     'example' => $sql_highlighting_data,
                     'url' => $link_data
-                ),
-                'proc' => array(
+                ],
+                'proc' => [
                     'param_list' => $blob_sql_highlighting_data,
                     'returns' => $blob_sql_highlighting_data,
                     'body' => $blob_sql_highlighting_data,
                     'body_utf8' => $blob_sql_highlighting_data
-                ),
-                'slow_log' => array(
+                ],
+                'slow_log' => [
                     'sql_text' => $sql_highlighting_data
-                )
-            )
-        );
+                ]
+            ]
+        ];
 
         $cfgRelation = $this->relation->getRelationsParam();
         if ($cfgRelation['db']) {
-            $this->transformation_info[$cfgRelation['db']] = array();
+            $this->transformation_info[$cfgRelation['db']] = [];
             $relDb = &$this->transformation_info[$cfgRelation['db']];
             if (! empty($cfgRelation['history'])) {
-                $relDb[$cfgRelation['history']] = array(
+                $relDb[$cfgRelation['history']] = [
                     'sqlquery' => $sql_highlighting_data
-                );
+                ];
             }
             if (! empty($cfgRelation['bookmark'])) {
-                $relDb[$cfgRelation['bookmark']] = array(
+                $relDb[$cfgRelation['bookmark']] = [
                     'query' => $sql_highlighting_data
-                );
+                ];
             }
             if (! empty($cfgRelation['tracking'])) {
-                $relDb[$cfgRelation['tracking']] = array(
+                $relDb[$cfgRelation['tracking']] = [
                     'schema_sql' => $sql_highlighting_data,
                     'data_sql' => $sql_highlighting_data
-                );
+                ];
             }
             if (! empty($cfgRelation['favorite'])) {
-                $relDb[$cfgRelation['favorite']] = array(
+                $relDb[$cfgRelation['favorite']] = [
                     'tables' => $json_highlighting_data
-                );
+                ];
             }
             if (! empty($cfgRelation['recent'])) {
-                $relDb[$cfgRelation['recent']] = array(
+                $relDb[$cfgRelation['recent']] = [
                     'tables' => $json_highlighting_data
-                );
+                ];
             }
             if (! empty($cfgRelation['savedsearches'])) {
-                $relDb[$cfgRelation['savedsearches']] = array(
+                $relDb[$cfgRelation['savedsearches']] = [
                     'search_data' => $json_highlighting_data
-                );
+                ];
             }
             if (! empty($cfgRelation['designer_settings'])) {
-                $relDb[$cfgRelation['designer_settings']] = array(
+                $relDb[$cfgRelation['designer_settings']] = [
                     'settings_data' => $json_highlighting_data
-                );
+                ];
             }
             if (! empty($cfgRelation['table_uiprefs'])) {
-                $relDb[$cfgRelation['table_uiprefs']] = array(
+                $relDb[$cfgRelation['table_uiprefs']] = [
                     'prefs' => $json_highlighting_data
-                );
+                ];
             }
             if (! empty($cfgRelation['userconfig'])) {
-                $relDb[$cfgRelation['userconfig']] = array(
+                $relDb[$cfgRelation['userconfig']] = [
                     'config_data' => $json_highlighting_data
-                );
+                ];
             }
             if (! empty($cfgRelation['export_templates'])) {
-                $relDb[$cfgRelation['export_templates']] = array(
+                $relDb[$cfgRelation['export_templates']] = [
                     'template_data' => $json_highlighting_data
-                );
+                ];
             }
         }
     }
@@ -685,7 +685,7 @@ class Results
             }
         } // end if (3)
 
-        return array($displayParts, $the_total);
+        return [$displayParts, $the_total];
 
     } // end of the 'setDisplayPartsAndTotal()' function
 
@@ -800,13 +800,13 @@ class Results
 
         if ($nbTotalPage > 1) {
             $table_navigation_html .= '<td>';
-            $_url_params = array(
+            $_url_params = [
                 'db'                 => $this->__get('db'),
                 'table'              => $this->__get('table'),
                 'sql_query'          => $this->__get('sql_query'),
                 'goto'               => $this->__get('goto'),
                 'is_browse_distinct' => $this->__get('is_browse_distinct'),
-            );
+            ];
 
             //<form> to keep the form alignment of button < and <<
             // and also to know what to execute when the selector changes
@@ -822,7 +822,7 @@ class Results
             $table_navigation_html .= '</form>'
                 . '</td>';
         }
-        return array($table_navigation_html, $nbTotalPage);
+        return [$table_navigation_html, $nbTotalPage];
     }
 
     /**
@@ -1122,13 +1122,13 @@ class Results
             $numberOfRowsPlaceholder = __('All');
         }
 
-        $numberOfRowsChoices = array(
+        $numberOfRowsChoices = [
             '25'  => 25,
             '50'  => 50,
             '100' => 100,
             '250' => 250,
             '500' => 500
-        );
+        ];
 
         return Template::get('display/results/additional_fields')->render([
             'goto' => $this->__get('goto'),
@@ -1269,8 +1269,8 @@ class Results
      */
     private function _getTableHeaders(
         array &$displayParts, array $analyzed_sql_results, $unsorted_sql_query,
-        array $sort_expression = array(), $sort_expression_nodirection = '',
-        array $sort_direction = array(), $is_limited_display = false
+        array $sort_expression = [], $sort_expression_nodirection = '',
+        array $sort_direction = [], $is_limited_display = false
     ) {
 
         $table_headers_html = '';
@@ -1390,7 +1390,7 @@ class Results
             }
         }
 
-        return array($unsorted_sql_query, $drop_down_html);
+        return [$unsorted_sql_query, $drop_down_html];
 
     } // end of the '_getUnsortedSqlAndSortByKeyDropDown()' function
 
@@ -1418,7 +1418,7 @@ class Results
             . Url::getHiddenInputs(
                 $this->__get('db'), $this->__get('table')
             )
-            . Url::getHiddenFields(array('sort_by_key' => '1'), '', true)
+            . Url::getHiddenFields(['sort_by_key' => '1'], '', true)
             . __('Sort by key')
             . ': <select name="sql_query" class="autosubmit">' . "\n";
 
@@ -1558,7 +1558,7 @@ class Results
 
         $this->__set('display_params', $display_params);
 
-        return array($colspan, $button_html);
+        return [$colspan, $button_html];
 
     } // end of the '_getFieldVisibilityParams()' function
 
@@ -1579,10 +1579,10 @@ class Results
         if ((!$GLOBALS['cfg']['ShowBrowseComments'])
             || (empty($analyzed_sql_results['statement']->from))
         ) {
-            return array();
+            return [];
         }
 
-        $ret = array();
+        $ret = [];
         foreach ($analyzed_sql_results['statement']->from as $field) {
             if (empty($field->table)) {
                 continue;
@@ -1611,7 +1611,7 @@ class Results
      */
     private function _setHighlightedColumnGlobalField(array $analyzed_sql_results)
     {
-        $highlight_columns = array();
+        $highlight_columns = [];
 
         if (!empty($analyzed_sql_results['statement']->where)) {
             foreach ($analyzed_sql_results['statement']->where as $expr) {
@@ -1721,13 +1721,13 @@ class Results
     private function _getFullOrPartialTextButtonOrLink()
     {
 
-        $url_params_full_text = array(
+        $url_params_full_text = [
             'db' => $this->__get('db'),
             'table' => $this->__get('table'),
             'sql_query' => $this->__get('sql_query'),
             'goto' => $this->__get('goto'),
             'full_text_button' => 1
-        );
+        ];
 
         if ($_SESSION['tmpval']['pftext'] == self::DISPLAY_FULL_TEXT) {
             // currently in fulltext mode so show the opposite link
@@ -1858,21 +1858,21 @@ class Results
             $multi_sorted_sql_query = $unsorted_sql_query . $multi_sort_order;
         }
 
-        $_single_url_params = array(
+        $_single_url_params = [
             'db'                 => $this->__get('db'),
             'table'              => $this->__get('table'),
             'sql_query'          => $single_sorted_sql_query,
             'session_max_rows'   => $session_max_rows,
             'is_browse_distinct' => $this->__get('is_browse_distinct'),
-        );
+        ];
 
-        $_multi_url_params = array(
+        $_multi_url_params = [
             'db'                 => $this->__get('db'),
             'table'              => $this->__get('table'),
             'sql_query'          => $multi_sorted_sql_query,
             'session_max_rows'   => $session_max_rows,
             'is_browse_distinct' => $this->__get('is_browse_distinct'),
-        );
+        ];
         $single_order_url  = 'sql.php' . Url::getCommon($_single_url_params);
         $multi_order_url = 'sql.php' . Url::getCommon($_multi_url_params);
 
@@ -1887,7 +1887,7 @@ class Results
             $fields_meta, $order_link, $comments
         );
 
-        return array($order_link, $sorted_header_html);
+        return [$order_link, $sorted_header_html];
 
     } // end of the '_getOrderLinkAndSortedHeaderHtml()' function
 
@@ -2023,7 +2023,7 @@ class Results
         if (empty($order_img)) {
             $order_img = '';
         }
-        return array($single_sort_order, $sort_order, $order_img);
+        return [$single_sort_order, $sort_order, $order_img];
     }
 
     /**
@@ -2123,24 +2123,24 @@ class Results
             $sort_order .= ' ASC';
             $order_img   = ' ' . Util::getImage(
                 's_desc', __('Descending'),
-                array('class' => "soimg", 'title' => '')
+                ['class' => "soimg", 'title' => '']
             );
             $order_img  .= ' ' . Util::getImage(
                 's_asc', __('Ascending'),
-                array('class' => "soimg hide", 'title' => '')
+                ['class' => "soimg hide", 'title' => '']
             );
         } else {
             $sort_order .= ' DESC';
             $order_img   = ' ' . Util::getImage(
                 's_asc', __('Ascending'),
-                array('class' => "soimg", 'title' => '')
+                ['class' => "soimg", 'title' => '']
             );
             $order_img  .=  ' ' . Util::getImage(
                 's_desc', __('Descending'),
-                array('class' => "soimg hide", 'title' => '')
+                ['class' => "soimg hide", 'title' => '']
             );
         }
-        return array($sort_order, $order_img);
+        return [$sort_order, $order_img];
     } // end of the '_getSortingUrlParams()' function
 
 
@@ -2161,9 +2161,9 @@ class Results
     private function _getSortOrderLink(
         $order_img, $fields_meta, $order_url, $multi_order_url
     ) {
-        $order_link_params = array(
+        $order_link_params = [
             'class' => 'sortlink'
-        );
+        ];
 
         $order_link_content = htmlspecialchars($fields_meta->name);
         $inner_link_content = $order_link_content . $order_img
@@ -2218,7 +2218,7 @@ class Results
     ) {
 
         $draggable_html = '<th';
-        $th_class = array();
+        $th_class = [];
         $th_class[] = 'draggable';
         $this->_getClassForNumericColumnType($fields_meta, $th_class);
         if ($col_visib && !$col_visib_j) {
@@ -2266,7 +2266,7 @@ class Results
     ) {
 
         $draggable_html = '<th';
-        $th_class = array();
+        $th_class = [];
         $th_class[] = 'draggable';
         $this->_getClassForNumericColumnType($fields_meta, $th_class);
         if ($col_visib && !$col_visib_j) {
@@ -2454,10 +2454,10 @@ class Results
         $class, $condition_field, $meta, $nowrap, $is_field_truncated = false,
         $transformation_plugin = '', $default_function = ''
     ) {
-        $classes = array(
+        $classes = [
             $class,
             $nowrap,
-        );
+        ];
 
         if (isset($meta->mimetype)) {
             $classes[] = preg_replace('/\//', '_', $meta->mimetype);
@@ -2481,11 +2481,11 @@ class Results
         }
 
         // Define classes to be added to this data field based on the type of data
-        $matches = array(
+        $matches = [
             'enum' => 'enum',
             'set' => 'set',
             'binary' => 'hex',
-        );
+        ];
 
         foreach ($matches as $key => $value) {
             if (mb_strpos($meta->flags, $key) !== false) {
@@ -2536,15 +2536,15 @@ class Results
         $display_params = $this->__get('display_params');
 
         if (! is_array($map)) {
-            $map = array();
+            $map = [];
         }
 
         $row_no                       = 0;
-        $display_params['edit']       = array();
-        $display_params['copy']       = array();
-        $display_params['delete']     = array();
-        $display_params['data']       = array();
-        $display_params['row_delete'] = array();
+        $display_params['edit']       = [];
+        $display_params['copy']       = [];
+        $display_params['delete']     = [];
+        $display_params['data']       = [];
+        $display_params['row_delete'] = [];
         $this->__set('display_params', $display_params);
 
         // name of the class added to all grid editable elements;
@@ -2597,7 +2597,7 @@ class Results
                 );
             }
 
-            $tr_class = array();
+            $tr_class = [];
             if ($GLOBALS['cfg']['BrowsePointerEnable'] != true) {
                 $tr_class[] = 'nopointer';
             }
@@ -2739,8 +2739,8 @@ class Results
     private function _setMimeMap()
     {
         $fields_meta = $this->__get('fields_meta');
-        $mimeMap = array();
-        $added = array();
+        $mimeMap = [];
+        $added = [];
 
         for ($currentColumn = 0;
                 $currentColumn < $this->__get('fields_cnt');
@@ -2778,20 +2778,20 @@ class Results
                 $str = ' ' . strtoupper($which[1]);
                 $isShowProcessList = strpos($str, 'PROCESSLIST') > 0;
                 if ($isShowProcessList) {
-                    $mimeMap['..Info'] = array(
+                    $mimeMap['..Info'] = [
                         'mimetype' => 'Text_Plain',
                         'transformation' => 'output/Text_Plain_Sql.php',
-                    );
+                    ];
                 }
 
                 $isShowCreateTable = preg_match(
                     '@CREATE[[:space:]]+TABLE@i', $this->__get('sql_query')
                 );
                 if ($isShowCreateTable) {
-                    $mimeMap['..Create Table'] = array(
+                    $mimeMap['..Create Table'] = [
                         'mimetype' => 'Text_Plain',
                         'transformation' => 'output/Text_Plain_Sql.php',
-                    );
+                    ];
                 }
             }
         }
@@ -2886,7 +2886,7 @@ class Results
             // Wrap MIME-transformations. [MIME]
             $default_function = [Core::class, 'mimeDefaultFunction']; // default_function
             $transformation_plugin = $default_function;
-            $transform_options = array();
+            $transform_options = [];
 
             if ($GLOBALS['cfgRelation']['mimework']
                 && $GLOBALS['cfg']['BrowseMIME']
@@ -2969,10 +2969,10 @@ class Results
                 );
                 $transformation_plugin = new Text_Plain_Link();
 
-                $transform_options  = array(
+                $transform_options  = [
                     0 => $linking_url,
                     2 => true
-                );
+                ];
 
                 $meta->mimetype = str_replace(
                     '_', '/',
@@ -3001,12 +3001,12 @@ class Results
                 $whereClauseMap[$row_no][$meta->orgtable] = $unique_conditions[0];
             }
 
-            $_url_params = array(
+            $_url_params = [
                 'db'            => $this->__get('db'),
                 'table'         => $meta->orgtable,
                 'where_clause'  => $whereClauseMap[$row_no][$meta->orgtable],
                 'transform_key' => $meta->orgname
-            );
+            ];
 
             if (! empty($sql_query)) {
                 $_url_params['sql_query'] = $url_sql_query;
@@ -3111,7 +3111,7 @@ class Results
     private function _getSpecialLinkUrl($column_value, array $row_info, $field_name)
     {
 
-        $linking_url_params = array();
+        $linking_url_params = [];
         $link_relations = $GLOBALS['special_schema_links']
             [mb_strtolower($this->__get('db'))]
             [mb_strtolower($this->__get('table'))]
@@ -3170,7 +3170,7 @@ class Results
     private function _getRowInfoForSpecialLinks(array $row, $col_order)
     {
 
-        $row_info = array();
+        $row_info = [];
         $fields_meta = $this->__get('fields_meta');
 
         for ($n = 0; $n < $this->__get('fields_cnt'); ++$n) {
@@ -3255,7 +3255,7 @@ class Results
             $col_visib = false;
         }
 
-        return array($col_order, $col_visib);
+        return [$col_order, $col_visib];
     } // end of the '_getColumnParams()' function
 
 
@@ -3320,23 +3320,23 @@ class Results
         $where_clause, $clause_is_unique, $url_sql_query
     ) {
 
-        $_url_params = array(
+        $_url_params = [
                 'db'               => $this->__get('db'),
                 'table'            => $this->__get('table'),
                 'where_clause'     => $where_clause,
                 'clause_is_unique' => $clause_is_unique,
                 'sql_query'        => $url_sql_query,
                 'goto'             => 'sql.php',
-            );
+            ];
 
         $edit_url = 'tbl_change.php'
             . Url::getCommon(
-                $_url_params + array('default_action' => 'update')
+                $_url_params + ['default_action' => 'update']
             );
 
         $copy_url = 'tbl_change.php'
             . Url::getCommon(
-                $_url_params + array('default_action' => 'insert')
+                $_url_params + ['default_action' => 'insert']
             );
 
         $edit_str = $this->_getActionLinkContent(
@@ -3352,7 +3352,7 @@ class Results
             $edit_anchor_class .= ' nonunique';
         }
 
-        return array($edit_url, $copy_url, $edit_str, $copy_str, $edit_anchor_class);
+        return [$edit_url, $copy_url, $edit_str, $copy_str, $edit_anchor_class];
 
     } // end of the '_getModifiedLinks()' function
 
@@ -3381,13 +3381,13 @@ class Results
 
         if ($del_lnk == self::DELETE_ROW) { // delete row case
 
-            $_url_params = array(
+            $_url_params = [
                 'db'        => $this->__get('db'),
                 'table'     => $this->__get('table'),
                 'sql_query' => $url_sql_query,
                 'message_to_show' => __('The row has been deleted.'),
                 'goto'      => (empty($goto) ? 'tbl_sql.php' : $goto),
-            );
+            ];
 
             $lnk_goto = 'sql.php' . Url::getCommonRaw($_url_params);
 
@@ -3396,13 +3396,13 @@ class Results
                 . ' WHERE ' . $where_clause .
                 ($clause_is_unique ? '' : ' LIMIT 1');
 
-            $_url_params = array(
+            $_url_params = [
                     'db'        => $this->__get('db'),
                     'table'     => $this->__get('table'),
                     'sql_query' => $del_query,
                     'message_to_show' => __('The row has been deleted.'),
                     'goto'      => $lnk_goto,
-                );
+                ];
             $del_url  = 'sql.php' . Url::getCommon($_url_params);
 
             $js_conf  = 'DELETE FROM ' . Sanitize::jsFormat($this->__get('table'))
@@ -3413,22 +3413,22 @@ class Results
 
         } elseif ($del_lnk == self::KILL_PROCESS) { // kill process case
 
-            $_url_params = array(
+            $_url_params = [
                     'db'        => $this->__get('db'),
                     'table'     => $this->__get('table'),
                     'sql_query' => $url_sql_query,
                     'goto'      => 'index.php',
-                );
+                ];
 
             $lnk_goto = 'sql.php' . Url::getCommonRaw($_url_params);
 
             $kill = $GLOBALS['dbi']->getKillQuery($row[0]);
 
-            $_url_params = array(
+            $_url_params = [
                     'db'        => 'mysql',
                     'sql_query' => $kill,
                     'goto'      => $lnk_goto,
-                );
+                ];
 
             $del_url  = 'sql.php' . Url::getCommon($_url_params);
             $js_conf  = $kill;
@@ -3439,7 +3439,7 @@ class Results
             $del_url = $del_str = $js_conf = null;
         }
 
-        return array($del_url, $del_str, $js_conf);
+        return [$del_url, $del_str, $js_conf];
 
     } // end of the '_getDeleteAndKillLinks()' function
 
@@ -3935,7 +3935,7 @@ class Results
     {
 
         $sql_md5 = md5($this->__get('sql_query'));
-        $query = array();
+        $query = [];
         if (isset($_SESSION['tmpval']['query'][$sql_md5])) {
             $query = $_SESSION['tmpval']['query'][$sql_md5];
         }
@@ -3967,9 +3967,9 @@ class Results
 
         if (Core::isValid(
             $_REQUEST['pftext'],
-            array(
+            [
                 self::DISPLAY_PARTIAL_TEXT, self::DISPLAY_FULL_TEXT
-            )
+            ]
         )
         ) {
             $query['pftext'] = $_REQUEST['pftext'];
@@ -3980,9 +3980,9 @@ class Results
 
         if (Core::isValid(
             $_REQUEST['relational_display'],
-            array(
+            [
                 self::RELATIONAL_KEY, self::RELATIONAL_DISPLAY_COLUMN
-            )
+            ]
         )
         ) {
             $query['relational_display'] = $_REQUEST['relational_display'];
@@ -3996,10 +3996,10 @@ class Results
 
         if (Core::isValid(
             $_REQUEST['geoOption'],
-            array(
+            [
                 self::GEOMETRY_DISP_WKT, self::GEOMETRY_DISP_WKB,
                 self::GEOMETRY_DISP_GEOM
-            )
+            ]
         )
         ) {
             $query['geoOption'] = $_REQUEST['geoOption'];
@@ -4151,9 +4151,9 @@ class Results
         // 1.3 Extract sorting expressions.
         //     we need $sort_expression and $sort_expression_nodirection
         //     even if there are many table references
-        $sort_expression = array();
-        $sort_expression_nodirection = array();
-        $sort_direction = array();
+        $sort_expression = [];
+        $sort_expression_nodirection = [];
+        $sort_direction = [];
 
         if (!is_null($statement) && !empty($statement->order)) {
             foreach ($statement->order as $o) {
@@ -4244,9 +4244,9 @@ class Results
         // (see the 'relation' configuration variable)
 
         // initialize map
-        $map = array();
+        $map = [];
 
-        $target = array();
+        $target = [];
         if (!is_null($statement) && !empty($statement->from)) {
             foreach ($statement->from as $field) {
                 if (!empty($field->table)) {
@@ -4262,12 +4262,12 @@ class Results
             // Coming from 'Distinct values' action of structure page
             // We manipulate relations mechanism to show a link to related rows.
             if ($this->__get('is_browse_distinct')) {
-                $map[$fields_meta[1]->name] = array(
+                $map[$fields_meta[1]->name] = [
                     $this->__get('table'),
                     $fields_meta[1]->name,
                     '',
                     $this->__get('db')
-                );
+                ];
             }
         } // end if
         // end 2b
@@ -4365,7 +4365,7 @@ class Results
             }
         }
 
-        return array($pos_next, $pos_prev);
+        return [$pos_next, $pos_prev];
 
     } // end of the '_getOffsets()' function
 
@@ -4427,7 +4427,7 @@ class Results
         // initializing default arguments
         $default_function = [Core::class, 'mimeDefaultFunction'];
         $transformation_plugin = $default_function;
-        $transform_options = array();
+        $transform_options = [];
 
         // check for non printable sorted row data
         $meta = $fields_meta[$sorted_column_index];
@@ -4631,12 +4631,12 @@ class Results
                     $display_field = $this->relation->getDisplayField(
                         $rel['foreign_db'], $rel['foreign_table']
                     );
-                    $map[$master_field] = array(
+                    $map[$master_field] = [
                         $rel['foreign_table'],
                         $rel['foreign_field'],
                         $display_field,
                         $rel['foreign_db']
-                    );
+                    ];
                 } else {
                     foreach ($rel as $key => $one_key) {
                         foreach ($one_key['index_list'] as $index => $one_field) {
@@ -4647,14 +4647,14 @@ class Results
                                 $one_key['ref_table_name']
                             );
 
-                            $map[$one_field] = array(
+                            $map[$one_field] = [
                                 $one_key['ref_table_name'],
                                 $one_key['ref_index_list'][$index],
                                 $display_field,
                                 isset($one_key['ref_db_name'])
                                 ? $one_key['ref_db_name']
                                 : $GLOBALS['db']
-                            );
+                            ];
                         }
                     }
                 }
@@ -4822,7 +4822,7 @@ class Results
                     Util::getIcon(
                         'b_view_add', __('Create view'), true
                     ),
-                    array('class' => 'create_view ajax')
+                    ['class' => 'create_view ajax']
                 )
                 . '</span>' . "\n";
         }
@@ -4847,7 +4847,7 @@ class Results
         //calling to _getResultOperations with a fake $displayParts
         //and setting only_view parameter to be true to generate just view
         $results_operations_html .= $this->_getResultsOperations(
-            array(),
+            [],
             $analyzed_sql_results,
             true
         );
@@ -4868,7 +4868,7 @@ class Results
             Util::getIcon(
                 'b_insrow', __('Copy to clipboard'), true
             ),
-            array('id' => 'copyToClipBoard')
+            ['id' => 'copyToClipBoard']
         );
 
         return $html;
@@ -4888,7 +4888,7 @@ class Results
             Util::getIcon(
                 'b_print', __('Print'), true
             ),
-            array('id' => 'printView'),
+            ['id' => 'printView'],
             'print_view'
         );
 
@@ -4919,12 +4919,12 @@ class Results
         $header = '<fieldset class="print_ignore" ><legend>'
             . __('Query results operations') . '</legend>';
 
-        $_url_params = array(
+        $_url_params = [
                     'db'        => $this->__get('db'),
                     'table'     => $this->__get('table'),
                     'printview' => '1',
                     'sql_query' => $this->__get('sql_query'),
-                );
+                ];
         $url_query = Url::getCommon($_url_params);
 
         if (!$header_shown) {
@@ -5081,7 +5081,7 @@ class Results
      */
     private function _handleNonPrintableContents(
         $category, $content, $transformation_plugin, $transform_options,
-        $default_function, $meta, array $url_params = array(), &$is_truncated = null
+        $default_function, $meta, array $url_params = [], &$is_truncated = null
     ) {
 
         $is_truncated = false;
@@ -5131,7 +5131,7 @@ class Results
             return($result);
         }
 
-        $result = $default_function($result, array(), $meta);
+        $result = $default_function($result, [], $meta);
         if (($_SESSION['tmpval']['display_binary']
             && $meta->type === self::STRING_FIELD)
             || ($_SESSION['tmpval']['display_blob']
@@ -5316,7 +5316,7 @@ class Results
                     $title = htmlspecialchars($data);
                 }
 
-                $_url_params = array(
+                $_url_params = [
                     'db'    => $map[$meta->name][3],
                     'table' => $map[$meta->name][0],
                     'pos'   => '0',
@@ -5326,7 +5326,7 @@ class Results
                         . ' WHERE '
                         . Util::backquote($map[$meta->name][1])
                         . $where_comparison,
-                );
+                ];
 
                 if ($transformation_plugin != $default_function) {
                     // always apply a transformation on the real data,
@@ -5351,7 +5351,7 @@ class Results
 
                 }
 
-                $tag_params = array('title' => $title);
+                $tag_params = ['title' => $title];
                 if (strpos($class, 'grid_edit') !== false) {
                     $tag_params['class'] = 'ajax';
                 }
@@ -5546,7 +5546,7 @@ class Results
             . Util::linkOrButton(
                 $del_url,
                 $del_str,
-                array('class' => 'delete_row requireConfirm' . $ajax)
+                ['class' => 'delete_row requireConfirm' . $ajax]
             )
             . '<div class="hide">' . $js_conf . '</div>'
             . '</td>';
@@ -5664,6 +5664,6 @@ class Results
             $truncated = false;
         }
 
-        return array($truncated, $str, $original_length);
+        return [$truncated, $str, $original_length];
     }
 }
diff --git a/libraries/classes/Encoding.php b/libraries/classes/Encoding.php
index 27e8f68c2d..fcac4c29e7 100644
--- a/libraries/classes/Encoding.php
+++ b/libraries/classes/Encoding.php
@@ -66,21 +66,21 @@ class Encoding
      *
      * @var array
      */
-    private static $_enginemap = array(
-        'iconv' => array('iconv', self::ENGINE_ICONV, 'iconv'),
-        'recode' => array('recode_string', self::ENGINE_RECODE, 'recode'),
-        'mb' => array('mb_convert_encoding', self::ENGINE_MB, 'mbstring'),
-        'none' => array('isset', self::ENGINE_NONE, ''),
-    );
+    private static $_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, ''],
+    ];
 
     /**
      * Order of automatic detection of engines
      *
      * @var array
      */
-    private static $_engineorder = array(
+    private static $_engineorder = [
         'iconv', 'mb', 'recode',
-    );
+    ];
 
     /**
      * Kanji encodings list
diff --git a/libraries/classes/Engines/Bdb.php b/libraries/classes/Engines/Bdb.php
index 2bbf2914d5..7d19a3355f 100644
--- a/libraries/classes/Engines/Bdb.php
+++ b/libraries/classes/Engines/Bdb.php
@@ -25,31 +25,31 @@ class Bdb extends StorageEngine
      */
     public function getVariables()
     {
-        return array(
-            'version_bdb'         => array(
+        return [
+            'version_bdb'         => [
                 'title' => __('Version information'),
-            ),
-            'bdb_cache_size'      => array(
+            ],
+            'bdb_cache_size'      => [
                 'type' => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'bdb_home'            => array(),
-            'bdb_log_buffer_size' => array(
+            ],
+            'bdb_home'            => [],
+            'bdb_log_buffer_size' => [
                 'type' => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'bdb_logdir'          => array(),
-            'bdb_max_lock'        => array(
+            ],
+            'bdb_logdir'          => [],
+            'bdb_max_lock'        => [
                 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'bdb_shared_data'     => array(),
-            'bdb_tmpdir'          => array(),
-            'bdb_data_direct'     => array(),
-            'bdb_lock_detect'     => array(),
-            'bdb_log_direct'      => array(),
-            'bdb_no_recover'      => array(),
-            'bdb_no_sync'         => array(),
-            'skip_sync_bdb_logs'  => array(),
-            'sync_bdb_logs'       => array(),
-        );
+            ],
+            'bdb_shared_data'     => [],
+            'bdb_tmpdir'          => [],
+            'bdb_data_direct'     => [],
+            'bdb_lock_detect'     => [],
+            'bdb_log_direct'      => [],
+            'bdb_no_recover'      => [],
+            'bdb_no_sync'         => [],
+            'skip_sync_bdb_logs'  => [],
+            'sync_bdb_logs'       => [],
+        ];
     }
 
     /**
diff --git a/libraries/classes/Engines/Innodb.php b/libraries/classes/Engines/Innodb.php
index e9b3c1a4b7..fad418822e 100644
--- a/libraries/classes/Engines/Innodb.php
+++ b/libraries/classes/Engines/Innodb.php
@@ -26,94 +26,94 @@ class Innodb extends StorageEngine
      */
     public function getVariables()
     {
-        return array(
-            'innodb_data_home_dir'            => array(
+        return [
+            'innodb_data_home_dir'            => [
                 'title' => __('Data home directory'),
                 'desc'  => __(
                     'The common part of the directory path for all InnoDB data '
                     . 'files.'
                 ),
-            ),
-            'innodb_data_file_path'           => array(
+            ],
+            'innodb_data_file_path'           => [
                 'title' => __('Data files'),
-            ),
-            'innodb_autoextend_increment'     => array(
+            ],
+            'innodb_autoextend_increment'     => [
                 'title' => __('Autoextend increment'),
                 'desc'  => __(
                     'The increment size for extending the size of an autoextending '
                     . 'tablespace when it becomes full.'
                 ),
                 'type'  => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'innodb_buffer_pool_size'         => array(
+            ],
+            'innodb_buffer_pool_size'         => [
                 'title' => __('Buffer pool size'),
                 'desc'  => __(
                     'The size of the memory buffer InnoDB uses to cache data and '
                     . 'indexes of its tables.'
                 ),
                 'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'innodb_additional_mem_pool_size' => array(
+            ],
+            'innodb_additional_mem_pool_size' => [
                 'title' => 'innodb_additional_mem_pool_size',
                 'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'innodb_buffer_pool_awe_mem_mb'   => array(
+            ],
+            'innodb_buffer_pool_awe_mem_mb'   => [
                 'type' => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'innodb_checksums'                => array(),
-            'innodb_commit_concurrency'       => array(),
-            'innodb_concurrency_tickets'      => array(
+            ],
+            'innodb_checksums'                => [],
+            'innodb_commit_concurrency'       => [],
+            'innodb_concurrency_tickets'      => [
                 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'innodb_doublewrite'              => array(),
-            'innodb_fast_shutdown'            => array(),
-            'innodb_file_io_threads'          => array(
+            ],
+            'innodb_doublewrite'              => [],
+            'innodb_fast_shutdown'            => [],
+            'innodb_file_io_threads'          => [
                 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'innodb_file_per_table'           => array(),
-            'innodb_flush_log_at_trx_commit'  => array(),
-            'innodb_flush_method'             => array(),
-            'innodb_force_recovery'           => array(),
-            'innodb_lock_wait_timeout'        => array(
+            ],
+            'innodb_file_per_table'           => [],
+            'innodb_flush_log_at_trx_commit'  => [],
+            'innodb_flush_method'             => [],
+            'innodb_force_recovery'           => [],
+            'innodb_lock_wait_timeout'        => [
                 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'innodb_locks_unsafe_for_binlog'  => array(),
-            'innodb_log_arch_dir'             => array(),
-            'innodb_log_archive'              => array(),
-            'innodb_log_buffer_size'          => array(
+            ],
+            'innodb_locks_unsafe_for_binlog'  => [],
+            'innodb_log_arch_dir'             => [],
+            'innodb_log_archive'              => [],
+            'innodb_log_buffer_size'          => [
                 'type' => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'innodb_log_file_size'            => array(
+            ],
+            'innodb_log_file_size'            => [
                 'type' => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'innodb_log_files_in_group'       => array(
+            ],
+            'innodb_log_files_in_group'       => [
                 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'innodb_log_group_home_dir'       => array(),
-            'innodb_max_dirty_pages_pct'      => array(
+            ],
+            'innodb_log_group_home_dir'       => [],
+            'innodb_max_dirty_pages_pct'      => [
                 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'innodb_max_purge_lag'            => array(),
-            'innodb_mirrored_log_groups'      => array(
+            ],
+            'innodb_max_purge_lag'            => [],
+            'innodb_mirrored_log_groups'      => [
                 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'innodb_open_files'               => array(
+            ],
+            'innodb_open_files'               => [
                 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'innodb_support_xa'               => array(),
-            'innodb_sync_spin_loops'          => array(
+            ],
+            'innodb_support_xa'               => [],
+            'innodb_sync_spin_loops'          => [
                 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'innodb_table_locks'              => array(
+            ],
+            'innodb_table_locks'              => [
                 'type' => PMA_ENGINE_DETAILS_TYPE_BOOLEAN,
-            ),
-            'innodb_thread_concurrency'       => array(
+            ],
+            'innodb_thread_concurrency'       => [
                 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'innodb_thread_sleep_delay'       => array(
+            ],
+            'innodb_thread_sleep_delay'       => [
                 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -135,9 +135,9 @@ class Innodb extends StorageEngine
     public function getInfoPages()
     {
         if ($this->support < PMA_ENGINE_SUPPORT_YES) {
-            return array();
+            return [];
         }
-        $pages = array();
+        $pages = [];
         $pages['Bufferpool'] = __('Buffer Pool');
         $pages['Status'] = __('InnoDB Status');
 
diff --git a/libraries/classes/Engines/Memory.php b/libraries/classes/Engines/Memory.php
index 55b7b2f4dc..b3aa9647b7 100644
--- a/libraries/classes/Engines/Memory.php
+++ b/libraries/classes/Engines/Memory.php
@@ -25,11 +25,11 @@ class Memory extends StorageEngine
      */
     public function getVariables()
     {
-        return array(
-            'max_heap_table_size' => array(
+        return [
+            'max_heap_table_size' => [
                 'type' => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-        );
+            ],
+        ];
     }
 }
 
diff --git a/libraries/classes/Engines/Myisam.php b/libraries/classes/Engines/Myisam.php
index 06a5384f40..3a40fb4258 100644
--- a/libraries/classes/Engines/Myisam.php
+++ b/libraries/classes/Engines/Myisam.php
@@ -25,23 +25,23 @@ class Myisam extends StorageEngine
      */
     public function getVariables()
     {
-        return array(
-            'myisam_data_pointer_size'        => array(
+        return [
+            'myisam_data_pointer_size'        => [
                 'title' => __('Data pointer size'),
                 'desc'  => __(
                     'The default pointer size in bytes, to be used by CREATE TABLE '
                     . 'for MyISAM tables when no MAX_ROWS option is specified.'
                 ),
                 'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'myisam_recover_options'          => array(
+            ],
+            'myisam_recover_options'          => [
                 'title' => __('Automatic recovery mode'),
                 'desc'  => __(
                     'The mode for automatic recovery of crashed MyISAM tables, as '
                     . 'set via the --myisam-recover server startup option.'
                 ),
-            ),
-            'myisam_max_sort_file_size'       => array(
+            ],
+            'myisam_max_sort_file_size'       => [
                 'title' => __('Maximum size for temporary sort files'),
                 'desc'  => __(
                     'The maximum size of the temporary file MySQL is allowed to use '
@@ -49,8 +49,8 @@ class Myisam extends StorageEngine
                     . 'TABLE, or LOAD DATA INFILE).'
                 ),
                 'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'myisam_max_extra_sort_file_size' => array(
+            ],
+            'myisam_max_extra_sort_file_size' => [
                 'title' => __('Maximum size for temporary files on index creation'),
                 'desc'  => __(
                     'If the temporary file used for fast MyISAM index creation '
@@ -58,8 +58,8 @@ class Myisam extends StorageEngine
                     . 'specified here, prefer the key cache method.'
                 ),
                 'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'myisam_repair_threads'           => array(
+            ],
+            'myisam_repair_threads'           => [
                 'title' => __('Repair threads'),
                 'desc'  => __(
                     'If this value is greater than 1, MyISAM table indexes are '
@@ -67,8 +67,8 @@ class Myisam extends StorageEngine
                     . 'the repair by sorting process.'
                 ),
                 'type'  => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'myisam_sort_buffer_size'         => array(
+            ],
+            'myisam_sort_buffer_size'         => [
                 'title' => __('Sort buffer size'),
                 'desc'  => __(
                     'The buffer that is allocated when sorting MyISAM indexes '
@@ -76,14 +76,14 @@ class Myisam extends StorageEngine
                     . 'INDEX or ALTER TABLE.'
                 ),
                 'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'myisam_stats_method'             => array(),
-            'delay_key_write'                 => array(),
-            'bulk_insert_buffer_size'         => array(
+            ],
+            'myisam_stats_method'             => [],
+            'delay_key_write'                 => [],
+            'bulk_insert_buffer_size'         => [
                 'type' => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'skip_external_locking'           => array(),
-        );
+            ],
+            'skip_external_locking'           => [],
+        ];
     }
 }
 
diff --git a/libraries/classes/Engines/Ndbcluster.php b/libraries/classes/Engines/Ndbcluster.php
index 812832c23c..c7b0f0a42c 100644
--- a/libraries/classes/Engines/Ndbcluster.php
+++ b/libraries/classes/Engines/Ndbcluster.php
@@ -25,9 +25,9 @@ class Ndbcluster extends StorageEngine
      */
     public function getVariables()
     {
-        return array(
-            'ndb_connectstring' => array(),
-        );
+        return [
+            'ndb_connectstring' => [],
+        ];
     }
 
     /**
diff --git a/libraries/classes/Engines/Pbxt.php b/libraries/classes/Engines/Pbxt.php
index d7eddbac42..ba91430795 100644
--- a/libraries/classes/Engines/Pbxt.php
+++ b/libraries/classes/Engines/Pbxt.php
@@ -27,8 +27,8 @@ class Pbxt extends StorageEngine
      */
     public function getVariables()
     {
-        return array(
-            'pbxt_index_cache_size'        => array(
+        return [
+            'pbxt_index_cache_size'        => [
                 'title' => __('Index cache size'),
                 'desc'  => __(
                     'This is the amount of memory allocated to the'
@@ -36,8 +36,8 @@ class Pbxt extends StorageEngine
                     . ' allocated here is used only for caching index pages.'
                 ),
                 'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'pbxt_record_cache_size'       => array(
+            ],
+            'pbxt_record_cache_size'       => [
                 'title' => __('Record cache size'),
                 'desc'  => __(
                     'This is the amount of memory allocated to the'
@@ -46,8 +46,8 @@ class Pbxt extends StorageEngine
                     . ' the handle data (.xtd) and row pointer (.xtr) files.'
                 ),
                 'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'pbxt_log_cache_size'          => array(
+            ],
+            'pbxt_log_cache_size'          => [
                 'title' => __('Log cache size'),
                 'desc'  => __(
                     'The amount of memory allocated to the'
@@ -55,16 +55,16 @@ class Pbxt extends StorageEngine
                     . ' data. The default is 16MB.'
                 ),
                 'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'pbxt_log_file_threshold'      => array(
+            ],
+            'pbxt_log_file_threshold'      => [
                 'title' => __('Log file threshold'),
                 'desc'  => __(
                     'The size of a transaction log before rollover,'
                     . ' and a new log is created. The default value is 16MB.'
                 ),
                 'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'pbxt_transaction_buffer_size' => array(
+            ],
+            'pbxt_transaction_buffer_size' => [
                 'title' => __('Transaction buffer size'),
                 'desc'  => __(
                     'The size of the global transaction log buffer'
@@ -72,8 +72,8 @@ class Pbxt extends StorageEngine
                     . ' The default is 1MB.'
                 ),
                 'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'pbxt_checkpoint_frequency'    => array(
+            ],
+            'pbxt_checkpoint_frequency'    => [
                 'title' => __('Checkpoint frequency'),
                 'desc'  => __(
                     'The amount of data written to the transaction'
@@ -81,8 +81,8 @@ class Pbxt extends StorageEngine
                     . ' The default value is 24MB.'
                 ),
                 'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'pbxt_data_log_threshold'      => array(
+            ],
+            'pbxt_data_log_threshold'      => [
                 'title' => __('Data log threshold'),
                 'desc'  => __(
                     'The maximum size of a data log file. The default'
@@ -92,8 +92,8 @@ class Pbxt extends StorageEngine
                     . ' amount of data that can be stored in the database.'
                 ),
                 'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'pbxt_garbage_threshold'       => array(
+            ],
+            'pbxt_garbage_threshold'       => [
                 'title' => __('Garbage threshold'),
                 'desc'  => __(
                     'The percentage of garbage in a data log file'
@@ -101,8 +101,8 @@ class Pbxt extends StorageEngine
                     . ' 99. The default is 50.'
                 ),
                 'type'  => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-            'pbxt_log_buffer_size'         => array(
+            ],
+            'pbxt_log_buffer_size'         => [
                 'title' => __('Log buffer size'),
                 'desc'  => __(
                     'The size of the buffer used when writing a data'
@@ -111,18 +111,18 @@ class Pbxt extends StorageEngine
                     . ' to write a data log.'
                 ),
                 'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'pbxt_data_file_grow_size'     => array(
+            ],
+            'pbxt_data_file_grow_size'     => [
                 'title' => __('Data file grow size'),
                 'desc'  => __('The grow size of the handle data (.xtd) files.'),
                 'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'pbxt_row_file_grow_size'      => array(
+            ],
+            'pbxt_row_file_grow_size'      => [
                 'title' => __('Row file grow size'),
                 'desc'  => __('The grow size of the row pointer (.xtr) files.'),
                 'type'  => PMA_ENGINE_DETAILS_TYPE_SIZE,
-            ),
-            'pbxt_log_file_count'          => array(
+            ],
+            'pbxt_log_file_count'          => [
                 'title' => __('Log file count'),
                 'desc'  => __(
                     'This is the number of transaction log files'
@@ -132,8 +132,8 @@ class Pbxt extends StorageEngine
                     . ' highest number.'
                 ),
                 'type'  => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -165,7 +165,7 @@ class Pbxt extends StorageEngine
      */
     public function getInfoPages()
     {
-        $pages = array();
+        $pages = [];
         $pages['Documentation'] = __('Documentation');
 
         return $pages;
diff --git a/libraries/classes/Error.php b/libraries/classes/Error.php
index d15a0ef069..f3e7535bc2 100644
--- a/libraries/classes/Error.php
+++ b/libraries/classes/Error.php
@@ -24,7 +24,7 @@ class Error extends Message
      *
      * @var array
      */
-    public static $errortype = array (
+    public static $errortype =  [
         0                    => 'Internal error',
         E_ERROR              => 'Error',
         E_WARNING            => 'Warning',
@@ -40,14 +40,14 @@ class Error extends Message
         E_STRICT             => 'Runtime Notice',
         E_DEPRECATED         => 'Deprecation Notice',
         E_RECOVERABLE_ERROR  => 'Catchable Fatal Error',
-    );
+    ];
 
     /**
      * Error levels
      *
      * @var array
      */
-    public static $errorlevel = array (
+    public static $errorlevel =  [
         0                    => 'error',
         E_ERROR              => 'error',
         E_WARNING            => 'error',
@@ -63,7 +63,7 @@ class Error extends Message
         E_STRICT             => 'notice',
         E_DEPRECATED         => 'notice',
         E_RECOVERABLE_ERROR  => 'error',
-    );
+    ];
 
     /**
      * The file in which the error occurred
@@ -84,7 +84,7 @@ class Error extends Message
      *
      * @var array
      */
-    protected $backtrace = array();
+    protected $backtrace = [];
 
     /**
      * Hide location of errors
@@ -113,7 +113,7 @@ class Error extends Message
             // debug_backtrace(), handleError() and addError()
             $backtrace = array_slice($backtrace, 3);
         } else {
-            $backtrace = array();
+            $backtrace = [];
         }
 
         $this->setBacktrace($backtrace);
@@ -128,13 +128,13 @@ class Error extends Message
      */
     public static function processBacktrace(array $backtrace): array
     {
-        $result = array();
+        $result = [];
 
-        $members = array('line', 'function', 'class', 'type');
+        $members = ['line', 'function', 'class', 'type'];
 
         foreach ($backtrace as $idx => $step) {
             /* Create new backtrace entry */
-            $result[$idx] = array();
+            $result[$idx] = [];
 
             /* Make path relative */
             if (isset($step['file'])) {
@@ -402,20 +402,20 @@ class Error extends Message
     public static function getArg($arg, string $function): string
     {
         $retval = '';
-        $include_functions = array(
+        $include_functions = [
             'include',
             'include_once',
             'require',
             'require_once',
-        );
-        $connect_functions = array(
+        ];
+        $connect_functions = [
             'mysql_connect',
             'mysql_pconnect',
             'mysqli_connect',
             'mysqli_real_connect',
             'connect',
             '_realConnect'
-        );
+        ];
 
         if (in_array($function, $include_functions)) {
             $retval .= self::relPath($arg);
diff --git a/libraries/classes/ErrorHandler.php b/libraries/classes/ErrorHandler.php
index cc6d3ae059..cdeddcf135 100644
--- a/libraries/classes/ErrorHandler.php
+++ b/libraries/classes/ErrorHandler.php
@@ -25,7 +25,7 @@ class ErrorHandler
      *
      * @var Error[]
      */
-    protected $errors = array();
+    protected $errors = [];
 
     /**
      * Hide location of errors
@@ -50,7 +50,7 @@ class ErrorHandler
          * rely on PHPUnit doing it's own error handling which we break here.
          */
         if (!defined('TESTSUITE')) {
-            set_error_handler(array($this, 'handleError'));
+            set_error_handler([$this, 'handleError']);
         }
         $this->error_reporting = error_reporting();
     }
@@ -65,7 +65,7 @@ class ErrorHandler
     {
         if (isset($_SESSION)) {
             if (! isset($_SESSION['errors'])) {
-                $_SESSION['errors'] = array();
+                $_SESSION['errors'] = [];
             }
 
             // remember only not displayed errors
@@ -363,10 +363,10 @@ class ErrorHandler
                 $retval .= ' class="hide"';
             }
             $retval .=  '>';
-            $retval .= Url::getHiddenFields(array(
+            $retval .= Url::getHiddenFields([
                 'exception_type' => 'php',
                 'send_error_report' => '1',
-            ));
+            ]);
             $retval .= '<input type="submit" value="'
                     . __('Report')
                     . '" id="pma_report_errors" class="floatright">'
@@ -417,7 +417,7 @@ class ErrorHandler
             }
 
             // delete stored errors
-            $_SESSION['errors'] = array();
+            $_SESSION['errors'] = [];
             unset($_SESSION['errors']);
         }
     }
diff --git a/libraries/classes/Export.php b/libraries/classes/Export.php
index 71859651b1..ebcc7c30ea 100644
--- a/libraries/classes/Export.php
+++ b/libraries/classes/Export.php
@@ -332,7 +332,7 @@ class Export
             $filename  .= '.zip';
             $mime_type = 'application/zip';
         }
-        return array($filename, $mime_type);
+        return [$filename, $mime_type];
     }
 
     /**
@@ -380,7 +380,7 @@ class Export
             );
             $message->addParam($save_filename);
         }
-        return array($save_filename, $message, $file_handle);
+        return [$save_filename, $message, $file_handle];
     }
 
     /**
@@ -407,13 +407,13 @@ class Export
             $message = new Message(
                 __('Insufficient space to save the file %s.'),
                 Message::ERROR,
-                array($save_filename)
+                [$save_filename]
             );
         } else {
             $message = new Message(
                 __('Dump has been saved to file %s.'),
                 Message::SUCCESS,
-                array($save_filename)
+                [$save_filename]
             );
         }
         return $message;
@@ -491,12 +491,12 @@ class Export
         if ($export_type == 'server') {
             $back_button .= 'server_export.php' . Url::getCommon();
         } elseif ($export_type == 'database') {
-            $back_button .= 'db_export.php' . Url::getCommon(array('db' => $db));
+            $back_button .= 'db_export.php' . Url::getCommon(['db' => $db]);
         } else {
             $back_button .= 'tbl_export.php' . Url::getCommon(
-                array(
+                [
                     'db' => $db, 'table' => $table
-                )
+                ]
             );
         }
 
@@ -549,7 +549,7 @@ class Export
             . '<textarea name="sqldump" cols="50" rows="30" '
             . 'id="textSQLDUMP" wrap="OFF">';
 
-        return array($html, $back_button, $refreshButton);
+        return [$html, $back_button, $refreshButton];
     }
 
     /**
@@ -669,7 +669,7 @@ class Export
             }
         }
 
-        $views = array();
+        $views = [];
 
         foreach ($tables as $table) {
             $_table = new Table($table, $db);
@@ -1059,7 +1059,7 @@ class Export
      */
     public function lockTables(string $db, array $tables, string $lockType = "WRITE")
     {
-        $locks = array();
+        $locks = [];
         foreach ($tables as $table) {
             $locks[] = Util::backquote($db) . "."
                 . Util::backquote($table) . " " . $lockType;
@@ -1086,7 +1086,7 @@ class Export
      */
     public function getMetadataTypes(): array
     {
-        return array(
+        return [
             'column_info',
             'table_uiprefs',
             'tracking',
@@ -1097,7 +1097,7 @@ class Export
             'savedsearches',
             'central_columns',
             'export_templates',
-        );
+        ];
     }
 
     /**
diff --git a/libraries/classes/File.php b/libraries/classes/File.php
index 86c53983f2..e285da32a2 100644
--- a/libraries/classes/File.php
+++ b/libraries/classes/File.php
@@ -360,13 +360,13 @@ class File
         string $rownumber,
         string $key
     ): array {
-        $new_file = array(
+        $new_file = [
             'name' => $file['name']['multi_edit'][$rownumber][$key],
             'type' => $file['type']['multi_edit'][$rownumber][$key],
             'size' => $file['size']['multi_edit'][$rownumber][$key],
             'tmp_name' => $file['tmp_name']['multi_edit'][$rownumber][$key],
             'error' => $file['error']['multi_edit'][$rownumber][$key],
-        );
+        ];
 
         return $new_file;
     }
diff --git a/libraries/classes/FileListing.php b/libraries/classes/FileListing.php
index 090fc9e421..a5c57a47a1 100644
--- a/libraries/classes/FileListing.php
+++ b/libraries/classes/FileListing.php
@@ -30,7 +30,7 @@ class FileListing
             return false;
         }
 
-        $result = array();
+        $result = [];
         if (substr($dir, -1) != '/') {
             $dir .= '/';
         }
diff --git a/libraries/classes/Font.php b/libraries/classes/Font.php
index c435fdaf71..1bc009c31b 100644
--- a/libraries/classes/Font.php
+++ b/libraries/classes/Font.php
@@ -25,51 +25,51 @@ class Font
     public function getCharLists(): array
     {
         // list of characters and their width modifiers
-        $charLists = array();
+        $charLists = [];
 
         //ijl
-        $charLists[] = array("chars" => array("i", "j", "l"), "modifier" => 0.23);
+        $charLists[] = ["chars" => ["i", "j", "l"], "modifier" => 0.23];
         //f
-        $charLists[] = array("chars" => array("f"), "modifier" => 0.27);
+        $charLists[] = ["chars" => ["f"], "modifier" => 0.27];
         //tI
-        $charLists[] = array("chars" => array("t", "I"), "modifier" => 0.28);
+        $charLists[] = ["chars" => ["t", "I"], "modifier" => 0.28];
         //r
-        $charLists[] = array("chars" => array("r"), "modifier" => 0.34);
+        $charLists[] = ["chars" => ["r"], "modifier" => 0.34];
         //1
-        $charLists[] = array("chars" => array("1"), "modifier" => 0.49);
+        $charLists[] = ["chars" => ["1"], "modifier" => 0.49];
         //cksvxyzJ
-        $charLists[] = array(
-            "chars" => array("c", "k", "s", "v", "x", "y", "z", "J"),
+        $charLists[] = [
+            "chars" => ["c", "k", "s", "v", "x", "y", "z", "J"],
             "modifier" => 0.5
-        );
+        ];
         //abdeghnopquL023456789
-        $charLists[] = array(
-            "chars" => array(
+        $charLists[] = [
+            "chars" => [
                 "a", "b", "d", "e", "g", "h", "n", "o", "p", "q", "u", "L",
                 "0", "2", "3", "4", "5", "6", "7", "8", "9"
-            ),
+            ],
             "modifier" => 0.56
-        );
+        ];
         //FTZ
-        $charLists[] = array("chars" => array("F", "T", "Z"), "modifier" => 0.61);
+        $charLists[] = ["chars" => ["F", "T", "Z"], "modifier" => 0.61];
         //ABEKPSVXY
-        $charLists[] = array(
-            "chars" => array("A", "B", "E", "K", "P", "S", "V", "X", "Y"),
+        $charLists[] = [
+            "chars" => ["A", "B", "E", "K", "P", "S", "V", "X", "Y"],
             "modifier" => 0.67
-        );
+        ];
         //wCDHNRU
-        $charLists[] = array(
-            "chars" => array("w", "C", "D", "H", "N", "R", "U"),
+        $charLists[] = [
+            "chars" => ["w", "C", "D", "H", "N", "R", "U"],
             "modifier" => 0.73
-        );
+        ];
         //GOQ
-        $charLists[] = array("chars" => array("G", "O", "Q"), "modifier" => 0.78);
+        $charLists[] = ["chars" => ["G", "O", "Q"], "modifier" => 0.78];
         //mM
-        $charLists[] = array("chars" => array("m", "M"), "modifier" => 0.84);
+        $charLists[] = ["chars" => ["m", "M"], "modifier" => 0.84];
         //W
-        $charLists[] = array("chars" => array("W"), "modifier" => 0.95);
+        $charLists[] = ["chars" => ["W"], "modifier" => 0.95];
         //" "
-        $charLists[] = array("chars" => array(" "), "modifier" => 0.28);
+        $charLists[] = ["chars" => [" "], "modifier" => 0.28];
 
         return $charLists;
     }
diff --git a/libraries/classes/Footer.php b/libraries/classes/Footer.php
index cbfc1dfac2..671256c5f0 100644
--- a/libraries/classes/Footer.php
+++ b/libraries/classes/Footer.php
@@ -106,7 +106,7 @@ class Footer
      *
      * @return object Reference passed object
      */
-    private static function _removeRecursion(&$object, array $stack = array())
+    private static function _removeRecursion(&$object, array $stack = [])
     {
         if ((is_object($object) || is_array($object)) && $object) {
             if ($object instanceof Traversable) {
@@ -139,10 +139,10 @@ class Footer
             self::_removeRecursion($_SESSION['debug']);
 
             $retval = JSON_encode($_SESSION['debug']);
-            $_SESSION['debug'] = array();
+            $_SESSION['debug'] = [];
             return json_last_error() ? '\'false\'' : $retval;
         }
-        $_SESSION['debug'] = array();
+        $_SESSION['debug'] = [];
         return $retval;
     }
 
@@ -156,15 +156,15 @@ class Footer
         $db = isset($GLOBALS['db']) && strlen($GLOBALS['db']) ? $GLOBALS['db'] : '';
         $table = isset($GLOBALS['table']) && strlen($GLOBALS['table']) ? $GLOBALS['table'] : '';
         $target = isset($_REQUEST['target']) && strlen($_REQUEST['target']) ? $_REQUEST['target'] : '';
-        $params = array(
+        $params = [
             'db' => $db,
             'table' => $table,
             'server' => $GLOBALS['server'],
             'target' => $target
-        );
+        ];
         // needed for server privileges tabs
         if (isset($_REQUEST['viewing_mode'])
-            && in_array($_REQUEST['viewing_mode'], array('server', 'db', 'table'))
+            && in_array($_REQUEST['viewing_mode'], ['server', 'db', 'table'])
         ) {
             $params['viewing_mode'] = $_REQUEST['viewing_mode'];
         }
@@ -187,7 +187,7 @@ class Footer
             $params['checkprivstable'] = $_REQUEST['checkprivstable'];
         }
         if (isset($_REQUEST['single_table'])
-            && in_array($_REQUEST['single_table'], array(true, false))
+            && in_array($_REQUEST['single_table'], [true, false])
         ) {
             $params['single_table'] = $_REQUEST['single_table'];
         }
diff --git a/libraries/classes/Gis/GisGeometry.php b/libraries/classes/Gis/GisGeometry.php
index cb521ba42d..c97d93f37c 100644
--- a/libraries/classes/Gis/GisGeometry.php
+++ b/libraries/classes/Gis/GisGeometry.php
@@ -199,7 +199,7 @@ abstract class GisGeometry
             $wkt = $value;
         }
 
-        return array('srid' => $srid, 'wkt' => $wkt);
+        return ['srid' => $srid, 'wkt' => $wkt];
     }
 
     /**
@@ -214,7 +214,7 @@ abstract class GisGeometry
      */
     protected function extractPoints($point_set, $scale_data, $linear = false)
     {
-        $points_arr = array();
+        $points_arr = [];
 
         // Separate each point
         $points = explode(",", $point_set);
@@ -241,7 +241,7 @@ abstract class GisGeometry
             }
 
             if (!$linear) {
-                $points_arr[] = array($x, $y);
+                $points_arr[] = [$x, $y];
             } else {
                 $points_arr[] = $x;
                 $points_arr[] = $y;
diff --git a/libraries/classes/Gis/GisGeometryCollection.php b/libraries/classes/Gis/GisGeometryCollection.php
index 54ef8769d6..df9dc59365 100644
--- a/libraries/classes/Gis/GisGeometryCollection.php
+++ b/libraries/classes/Gis/GisGeometryCollection.php
@@ -56,7 +56,7 @@ class GisGeometryCollection extends GisGeometry
      */
     public function scaleRow($spatial)
     {
-        $min_max = array();
+        $min_max = [];
 
         // Trim to remove leading 'GEOMETRYCOLLECTION(' and trailing ')'
         $goem_col
@@ -308,7 +308,7 @@ class GisGeometryCollection extends GisGeometry
      */
     private function _explodeGeomCol($geom_col)
     {
-        $sub_parts = array();
+        $sub_parts = [];
         $br_count = 0;
         $start = 0;
         $count = 0;
@@ -381,7 +381,7 @@ class GisGeometryCollection extends GisGeometry
      */
     public function generateParams($value)
     {
-        $params = array();
+        $params = [];
         $data = GisGeometry::generateParams($value);
         $params['srid'] = $data['srid'];
         $wkt = $data['wkt'];
diff --git a/libraries/classes/Gis/GisLineString.php b/libraries/classes/Gis/GisLineString.php
index 3086a48452..0649fa3a54 100644
--- a/libraries/classes/Gis/GisLineString.php
+++ b/libraries/classes/Gis/GisLineString.php
@@ -64,7 +64,7 @@ class GisLineString extends GisGeometry
                 mb_strlen($spatial) - 12
             );
 
-        return $this->setMinMax($linestring, array());
+        return $this->setMinMax($linestring, []);
     }
 
     /**
@@ -151,7 +151,7 @@ class GisLineString extends GisGeometry
         $red = hexdec(mb_substr($line_color, 1, 2));
         $green = hexdec(mb_substr($line_color, 3, 2));
         $blue = hexdec(mb_substr($line_color, 4, 2));
-        $line = array('width' => 1.5, 'color' => array($red, $green, $blue));
+        $line = ['width' => 1.5, 'color' => [$red, $green, $blue]];
 
         // Trim to remove leading 'LINESTRING(' and trailing ')'
         $linesrting
@@ -200,14 +200,14 @@ class GisLineString extends GisGeometry
      */
     public function prepareRowAsSvg($spatial, $label, $line_color, array $scale_data)
     {
-        $line_options = array(
+        $line_options = [
             'name'         => $label,
             'id'           => $label . rand(),
             'class'        => 'linestring vector',
             'fill'         => 'none',
             'stroke'       => $line_color,
             'stroke-width' => 2,
-        );
+        ];
 
         // Trim to remove leading 'LINESTRING(' and trailing ')'
         $linesrting
@@ -246,12 +246,12 @@ class GisLineString extends GisGeometry
      */
     public function prepareRowAsOl($spatial, $srid, $label, $line_color, array $scale_data)
     {
-        $style_options = array(
+        $style_options = [
             'strokeColor' => $line_color,
             'strokeWidth' => 2,
             'label'       => $label,
             'fontSize'    => 10,
-        );
+        ];
         if ($srid == 0) {
             $srid = 4326;
         }
@@ -322,7 +322,7 @@ class GisLineString extends GisGeometry
      */
     public function generateParams($value, $index = -1)
     {
-        $params = array();
+        $params = [];
         if ($index == -1) {
             $index = 0;
             $data = GisGeometry::generateParams($value);
diff --git a/libraries/classes/Gis/GisMultiLineString.php b/libraries/classes/Gis/GisMultiLineString.php
index 1e08194abc..eb61317f17 100644
--- a/libraries/classes/Gis/GisMultiLineString.php
+++ b/libraries/classes/Gis/GisMultiLineString.php
@@ -56,7 +56,7 @@ class GisMultiLineString extends GisGeometry
      */
     public function scaleRow($spatial)
     {
-        $min_max = array();
+        $min_max = [];
 
         // Trim to remove leading 'MULTILINESTRING((' and trailing '))'
         $multilinestirng
@@ -166,7 +166,7 @@ class GisMultiLineString extends GisGeometry
         $red = hexdec(mb_substr($line_color, 1, 2));
         $green = hexdec(mb_substr($line_color, 3, 2));
         $blue = hexdec(mb_substr($line_color, 4, 2));
-        $line = array('width' => 1.5, 'color' => array($red, $green, $blue));
+        $line = ['width' => 1.5, 'color' => [$red, $green, $blue]];
 
         // Trim to remove leading 'MULTILINESTRING((' and trailing '))'
         $multilinestirng
@@ -222,13 +222,13 @@ class GisMultiLineString extends GisGeometry
      */
     public function prepareRowAsSvg($spatial, $label, $line_color, array $scale_data)
     {
-        $line_options = array(
+        $line_options = [
             'name'         => $label,
             'class'        => 'linestring vector',
             'fill'         => 'none',
             'stroke'       => $line_color,
             'stroke-width' => 2,
-        );
+        ];
 
         // Trim to remove leading 'MULTILINESTRING((' and trailing '))'
         $multilinestirng
@@ -274,12 +274,12 @@ class GisMultiLineString extends GisGeometry
      */
     public function prepareRowAsOl($spatial, $srid, $label, $line_color, array $scale_data)
     {
-        $style_options = array(
+        $style_options = [
             'strokeColor' => $line_color,
             'strokeWidth' => 2,
             'label'       => $label,
             'fontSize'    => 10,
-        );
+        ];
         if ($srid == 0) {
             $srid = 4326;
         }
@@ -403,7 +403,7 @@ class GisMultiLineString extends GisGeometry
      */
     public function generateParams($value, $index = -1)
     {
-        $params = array();
+        $params = [];
         if ($index == -1) {
             $index = 0;
             $data = GisGeometry::generateParams($value);
diff --git a/libraries/classes/Gis/GisMultiPoint.php b/libraries/classes/Gis/GisMultiPoint.php
index 96126bdc2d..3202a40a0d 100644
--- a/libraries/classes/Gis/GisMultiPoint.php
+++ b/libraries/classes/Gis/GisMultiPoint.php
@@ -64,7 +64,7 @@ class GisMultiPoint extends GisGeometry
                 mb_strlen($spatial) - 12
             );
 
-        return $this->setMinMax($multipoint, array());
+        return $this->setMinMax($multipoint, []);
     }
 
     /**
@@ -148,7 +148,7 @@ class GisMultiPoint extends GisGeometry
         $red = hexdec(mb_substr($point_color, 1, 2));
         $green = hexdec(mb_substr($point_color, 3, 2));
         $blue = hexdec(mb_substr($point_color, 4, 2));
-        $line = array('width' => 1.25, 'color' => array($red, $green, $blue));
+        $line = ['width' => 1.25, 'color' => [$red, $green, $blue]];
 
         // Trim to remove leading 'MULTIPOINT(' and trailing ')'
         $multipoint
@@ -190,13 +190,13 @@ class GisMultiPoint extends GisGeometry
      */
     public function prepareRowAsSvg($spatial, $label, $point_color, array $scale_data)
     {
-        $point_options = array(
+        $point_options = [
             'name'         => $label,
             'class'        => 'multipoint vector',
             'fill'         => 'white',
             'stroke'       => $point_color,
             'stroke-width' => 2,
-        );
+        ];
 
         // Trim to remove leading 'MULTIPOINT(' and trailing ')'
         $multipoint
@@ -243,7 +243,7 @@ class GisMultiPoint extends GisGeometry
         $point_color,
         array $scale_data
     ) {
-        $style_options = array(
+        $style_options = [
             'pointRadius'  => 3,
             'fillColor'    => '#ffffff',
             'strokeColor'  => $point_color,
@@ -251,7 +251,7 @@ class GisMultiPoint extends GisGeometry
             'label'        => $label,
             'labelYOffset' => -8,
             'fontSize'     => 10,
-        );
+        ];
         if ($srid == 0) {
             $srid = 4326;
         }
@@ -350,7 +350,7 @@ class GisMultiPoint extends GisGeometry
      */
     public function generateParams($value, $index = -1)
     {
-        $params = array();
+        $params = [];
         if ($index == -1) {
             $index = 0;
             $data = GisGeometry::generateParams($value);
diff --git a/libraries/classes/Gis/GisMultiPolygon.php b/libraries/classes/Gis/GisMultiPolygon.php
index 193a4756ce..16ebf6e823 100644
--- a/libraries/classes/Gis/GisMultiPolygon.php
+++ b/libraries/classes/Gis/GisMultiPolygon.php
@@ -56,7 +56,7 @@ class GisMultiPolygon extends GisGeometry
      */
     public function scaleRow($spatial)
     {
-        $min_max = array();
+        $min_max = [];
 
         // Trim to remove leading 'MULTIPOLYGON(((' and trailing ')))'
         $multipolygon
@@ -143,7 +143,7 @@ class GisMultiPolygon extends GisGeometry
             imagefilledpolygon($image, $points_arr, sizeof($points_arr) / 2, $color);
             // mark label point if applicable
             if (isset($label) && trim($label) != '' && $first_poly) {
-                $label_point = array($points_arr[2], $points_arr[3]);
+                $label_point = [$points_arr[2], $points_arr[3]];
             }
             $first_poly = false;
         }
@@ -180,7 +180,7 @@ class GisMultiPolygon extends GisGeometry
         $red = hexdec(mb_substr($fill_color, 1, 2));
         $green = hexdec(mb_substr($fill_color, 3, 2));
         $blue = hexdec(mb_substr($fill_color, 4, 2));
-        $color = array($red, $green, $blue);
+        $color = [$red, $green, $blue];
 
         // Trim to remove leading 'MULTIPOLYGON(((' and trailing ')))'
         $multipolygon
@@ -213,10 +213,10 @@ class GisMultiPolygon extends GisGeometry
                 }
             }
             // draw polygon
-            $pdf->Polygon($points_arr, 'F*', array(), $color, true);
+            $pdf->Polygon($points_arr, 'F*', [], $color, true);
             // mark label point if applicable
             if (isset($label) && trim($label) != '' && $first_poly) {
-                $label_point = array($points_arr[2], $points_arr[3]);
+                $label_point = [$points_arr[2], $points_arr[3]];
             }
             $first_poly = false;
         }
@@ -244,7 +244,7 @@ class GisMultiPolygon extends GisGeometry
      */
     public function prepareRowAsSvg($spatial, $label, $fill_color, array $scale_data)
     {
-        $polygon_options = array(
+        $polygon_options = [
             'name'         => $label,
             'class'        => 'multipolygon vector',
             'stroke'       => 'black',
@@ -252,7 +252,7 @@ class GisMultiPolygon extends GisGeometry
             'fill'         => $fill_color,
             'fill-rule'    => 'evenodd',
             'fill-opacity' => 0.8,
-        );
+        ];
 
         $row = '';
 
@@ -310,14 +310,14 @@ class GisMultiPolygon extends GisGeometry
      */
     public function prepareRowAsOl($spatial, $srid, $label, $fill_color, array $scale_data)
     {
-        $style_options = array(
+        $style_options = [
             'strokeColor' => '#000000',
             'strokeWidth' => 0.5,
             'fillColor'   => $fill_color,
             'fillOpacity' => 0.8,
             'label'       => $label,
             'fontSize'    => 10,
-        );
+        ];
         if ($srid == 0) {
             $srid = 4326;
         }
@@ -478,7 +478,7 @@ class GisMultiPolygon extends GisGeometry
                 )
                 ) {
                     if (!isset($ring2['inner'])) {
-                        $row_data['parts'][$k]['inner'] = array();
+                        $row_data['parts'][$k]['inner'] = [];
                     }
                     $row_data['parts'][$k]['inner'][] = $j;
                 }
@@ -547,7 +547,7 @@ class GisMultiPolygon extends GisGeometry
      */
     public function generateParams($value, $index = -1)
     {
-        $params = array();
+        $params = [];
         if ($index == -1) {
             $index = 0;
             $data = GisGeometry::generateParams($value);
diff --git a/libraries/classes/Gis/GisPoint.php b/libraries/classes/Gis/GisPoint.php
index 55461e0fea..15ecb2ae0d 100644
--- a/libraries/classes/Gis/GisPoint.php
+++ b/libraries/classes/Gis/GisPoint.php
@@ -64,7 +64,7 @@ class GisPoint extends GisGeometry
                 mb_strlen($spatial) - 7
             );
 
-        return $this->setMinMax($point, array());
+        return $this->setMinMax($point, []);
     }
 
     /**
@@ -153,7 +153,7 @@ class GisPoint extends GisGeometry
         $red = hexdec(mb_substr($point_color, 1, 2));
         $green = hexdec(mb_substr($point_color, 3, 2));
         $blue = hexdec(mb_substr($point_color, 4, 2));
-        $line = array('width' => 1.25, 'color' => array($red, $green, $blue));
+        $line = ['width' => 1.25, 'color' => [$red, $green, $blue]];
 
         // Trim to remove leading 'POINT(' and trailing ')'
         $point
@@ -199,14 +199,14 @@ class GisPoint extends GisGeometry
      */
     public function prepareRowAsSvg($spatial, $label, $point_color, array $scale_data)
     {
-        $point_options = array(
+        $point_options = [
             'name'         => $label,
             'id'           => $label . rand(),
             'class'        => 'point vector',
             'fill'         => 'white',
             'stroke'       => $point_color,
             'stroke-width' => 2,
-        );
+        ];
 
         // Trim to remove leading 'POINT(' and trailing ')'
         $point
@@ -250,7 +250,7 @@ class GisPoint extends GisGeometry
         $point_color,
         array $scale_data
     ) {
-        $style_options = array(
+        $style_options = [
             'pointRadius'  => 3,
             'fillColor'    => '#ffffff',
             'strokeColor'  => $point_color,
@@ -258,7 +258,7 @@ class GisPoint extends GisGeometry
             'label'        => $label,
             'labelYOffset' => -8,
             'fontSize'     => 10,
-        );
+        ];
         if ($srid == 0) {
             $srid = 4326;
         }
@@ -329,7 +329,7 @@ class GisPoint extends GisGeometry
      */
     public function generateParams($value, $index = -1)
     {
-        $params = array();
+        $params = [];
         if ($index == -1) {
             $index = 0;
             $data = GisGeometry::generateParams($value);
diff --git a/libraries/classes/Gis/GisPolygon.php b/libraries/classes/Gis/GisPolygon.php
index 8cafe70167..367806760f 100644
--- a/libraries/classes/Gis/GisPolygon.php
+++ b/libraries/classes/Gis/GisPolygon.php
@@ -72,7 +72,7 @@ class GisPolygon extends GisGeometry
             $ring = $parts[0];
         }
 
-        return $this->setMinMax($ring, array());
+        return $this->setMinMax($ring, []);
     }
 
     /**
@@ -163,7 +163,7 @@ class GisPolygon extends GisGeometry
         $red = hexdec(mb_substr($fill_color, 1, 2));
         $green = hexdec(mb_substr($fill_color, 3, 2));
         $blue = hexdec(mb_substr($fill_color, 4, 2));
-        $color = array($red, $green, $blue);
+        $color = [$red, $green, $blue];
 
         // Trim to remove leading 'POLYGON((' and trailing '))'
         $polygon = mb_substr(
@@ -192,7 +192,7 @@ class GisPolygon extends GisGeometry
         }
 
         // draw polygon
-        $pdf->Polygon($points_arr, 'F*', array(), $color, true);
+        $pdf->Polygon($points_arr, 'F*', [], $color, true);
         // print label if applicable
         if (isset($label) && trim($label) != '') {
             $pdf->SetXY($points_arr[2], $points_arr[3]);
@@ -216,7 +216,7 @@ class GisPolygon extends GisGeometry
      */
     public function prepareRowAsSvg($spatial, $label, $fill_color, array $scale_data)
     {
-        $polygon_options = array(
+        $polygon_options = [
             'name'         => $label,
             'id'           => $label . rand(),
             'class'        => 'polygon vector',
@@ -225,7 +225,7 @@ class GisPolygon extends GisGeometry
             'fill'         => $fill_color,
             'fill-rule'    => 'evenodd',
             'fill-opacity' => 0.8,
-        );
+        ];
 
         // Trim to remove leading 'POLYGON((' and trailing '))'
         $polygon
@@ -277,14 +277,14 @@ class GisPolygon extends GisGeometry
      */
     public function prepareRowAsOl($spatial, $srid, $label, $fill_color, array $scale_data)
     {
-        $style_options = array(
+        $style_options = [
             'strokeColor' => '#000000',
             'strokeWidth' => 0.5,
             'fillColor'   => $fill_color,
             'fillOpacity' => 0.8,
             'label'       => $label,
             'fontSize'    => 10,
-        );
+        ];
         if ($srid == 0) {
             $srid = 4326;
         }
@@ -468,17 +468,17 @@ class GisPolygon extends GisGeometry
         $p1 = $polygon[0];
         for ($i = 1; $i <= $no_of_points; $i++) {
             $p2 = $polygon[$i % $no_of_points];
-            if ($point['y'] <= min(array($p1['y'], $p2['y']))) {
+            if ($point['y'] <= min([$p1['y'], $p2['y']])) {
                 $p1 = $p2;
                 continue;
             }
 
-            if ($point['y'] > max(array($p1['y'], $p2['y']))) {
+            if ($point['y'] > max([$p1['y'], $p2['y']])) {
                 $p1 = $p2;
                 continue;
             }
 
-            if ($point['x'] > max(array($p1['x'], $p2['x']))) {
+            if ($point['x'] > max([$p1['x'], $p2['x']])) {
                 $p1 = $p2;
                 continue;
             }
@@ -532,8 +532,8 @@ class GisPolygon extends GisGeometry
         // Always keep $epsilon < 1 to go with the reduction logic down here
         $epsilon = 0.1;
         $denominator = sqrt(pow(($y1 - $y0), 2) + pow(($x0 - $x1), 2));
-        $pointA = array();
-        $pointB = array();
+        $pointA = [];
+        $pointB = [];
 
         while (true) {
             // Get the points on either sides of the line
@@ -573,7 +573,7 @@ class GisPolygon extends GisGeometry
      */
     public function generateParams($value, $index = -1)
     {
-        $params = array();
+        $params = [];
         if ($index == -1) {
             $index = 0;
             $data = GisGeometry::generateParams($value);
diff --git a/libraries/classes/Gis/GisVisualization.php b/libraries/classes/Gis/GisVisualization.php
index c11b55573b..86ea1de0b0 100644
--- a/libraries/classes/Gis/GisVisualization.php
+++ b/libraries/classes/Gis/GisVisualization.php
@@ -29,9 +29,9 @@ class GisVisualization
     /**
      * @var array   Set of default settings values are here.
      */
-    private $_settings = array(
+    private $_settings = [
         // Array of colors to be used for GIS visualizations.
-        'colors' => array(
+        'colors' => [
             '#B02EE0',
             '#E0642E',
             '#E0D62E',
@@ -49,12 +49,12 @@ class GisVisualization
             '#238C74',
             '#4C489B',
             '#87C9BF',
-        ),
+        ],
         // The width of the GIS visualization.
         'width'  => 600,
         // The height of the GIS visualization.
         'height' => 450,
-    );
+    ];
     /**
      * @var array   Options that the user has specified.
      */
@@ -211,10 +211,10 @@ class GisVisualization
         $modified_result = $GLOBALS['dbi']->tryQuery($this->_modified_sql);
 
         if ($modified_result === false) {
-            return array();
+            return [];
         }
 
-        $data = array();
+        $data = [];
         while ($row = $GLOBALS['dbi']->fetchAssoc($modified_result)) {
             $data[] = $row;
         }
@@ -543,7 +543,7 @@ class GisVisualization
      */
     private function _scaleDataSet(array $data)
     {
-        $min_max = array();
+        $min_max = [];
         $border = 15;
         // effective width and height of the plot
         $plot_width = $this->_settings['width'] - 2 * $border;
@@ -608,7 +608,7 @@ class GisVisualization
             $y = ($min_max['maxY'] + $min_max['minY'] - $plot_height / $scale) / 2;
         }
 
-        return array(
+        return [
             'scale'  => $scale,
             'x'      => $x,
             'y'      => $y,
@@ -617,7 +617,7 @@ class GisVisualization
             'minY'   => $min_max['minY'],
             'maxY'   => $min_max['maxY'],
             'height' => $this->_settings['height'],
-        );
+        ];
     }
 
     /**
diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php
index 5173e857de..97e346652c 100644
--- a/libraries/classes/Header.php
+++ b/libraries/classes/Header.php
@@ -194,7 +194,7 @@ class Header
         // Here would not be a good place to add CodeMirror because
         // the user preferences have not been merged at this point
 
-        $this->_scripts->addFile('messages.php', array('l' => $GLOBALS['lang']));
+        $this->_scripts->addFile('messages.php', ['l' => $GLOBALS['lang']]);
         // Append the theme id to this url to invalidate
         // the cache on a theme change. Though this might be
         // unavailable for fatal errors.
@@ -229,7 +229,7 @@ class Header
         $pftext = isset($_SESSION['tmpval']['pftext'])
             ? $_SESSION['tmpval']['pftext'] : '';
 
-        $params = array(
+        $params = [
             'common_query' => Url::getCommonRaw(),
             'opendb_url' => Util::getScriptNameForOption(
                 $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
@@ -260,7 +260,7 @@ class Header
             'rootPath' => $GLOBALS['PMA_Config']->getRootPath(),
             'arg_separator' => URL::getArgSeparator(),
             'PMA_VERSION' => PMA_VERSION
-        );
+        ];
         if (isset($GLOBALS['cfg']['Server'])
             && isset($GLOBALS['cfg']['Server']['auth_type'])
         ) {
diff --git a/libraries/classes/Import.php b/libraries/classes/Import.php
index f94738e846..88af48828d 100644
--- a/libraries/classes/Import.php
+++ b/libraries/classes/Import.php
@@ -107,12 +107,12 @@ class Import
         $msg = '# ';
         if ($result === false) { // execution failed
             if (! isset($my_die)) {
-                $my_die = array();
+                $my_die = [];
             }
-            $my_die[] = array(
+            $my_die[] = [
                 'sql' => $full,
                 'error' => $GLOBALS['dbi']->getError()
-            );
+            ];
 
             $msg .= __('Error');
 
@@ -182,7 +182,7 @@ class Import
     public function runQuery(
         string $sql = '',
         string $full = '',
-        array &$sql_data = array()
+        array &$sql_data = []
     ): void {
         global $import_run_buffer, $go_sql, $complete_query, $display_query,
             $sql_query, $error, $reload, $result, $msg,
@@ -246,7 +246,7 @@ class Import
                     $count = $sql_data['valid_queries'];
                     $go_sql = false;
 
-                    $sql_data['valid_sql'] = array();
+                    $sql_data['valid_sql'] = [];
                     $sql_data['valid_queries'] = 0;
                     unset($sql_data['valid_full']);
                     for ($i = 0; $i < $count; $i++) {
@@ -314,7 +314,7 @@ class Import
         string $full
     ): array {
         if (!empty($sql) || !empty($full)) {
-            $import_run_buffer = array('sql' => $sql, 'full' => $full);
+            $import_run_buffer = ['sql' => $sql, 'full' => $full];
             return $import_run_buffer;
         }
 
@@ -345,7 +345,7 @@ class Import
 
             $reload = true;
         }
-        return array($db, $reload);
+        return [$db, $reload];
     }
 
 
@@ -578,7 +578,7 @@ class Import
         $m = $curr_size - 1;
         $d = $decPrecision;
 
-        return array($m, $d, ($m . "," . $d));
+        return [$m, $d, ($m . "," . $d)];
     }
 
     /**
@@ -850,8 +850,8 @@ class Import
         /* Get number of columns */
         $numCols = count($table[self::COL_NAMES]);
         /* Current type for each column */
-        $types = array();
-        $sizes = array();
+        $types = [];
+        $sizes = [];
 
         /* Initialize $sizes to all 0's */
         for ($i = 0; $i < $numCols; ++$i) {
@@ -926,7 +926,7 @@ class Import
             }
         }
 
-        return array($types, $sizes);
+        return [$types, $sizes];
     }
 
     /**
@@ -976,7 +976,7 @@ class Import
         }
 
         /* Create SQL code to handle the database */
-        $sql = array();
+        $sql = [];
 
         if ($create_db) {
             $sql[] = "CREATE DATABASE IF NOT EXISTS " . Util::backquote($db_name)
@@ -1034,14 +1034,14 @@ class Import
         }
 
         if ($analyses != null) {
-            $type_array = array(
+            $type_array = [
                 self::NONE => "NULL",
                 self::VARCHAR => "varchar",
                 self::INT => "int",
                 self::DECIMAL => "decimal",
                 self::BIGINT => "bigint",
                 self::GEOMETRY => 'geometry'
-            );
+            ];
 
             /* TODO: Do more checking here to make sure they really are matched */
             if (count($tables) != count($analyses)) {
@@ -1189,7 +1189,7 @@ class Import
         $table_pattern = '@CREATE TABLE IF NOT EXISTS `([^`]+)`@';
         /* Check a third pattern to make sure its not a "USE `db_name`;" statement */
 
-        $regs = array();
+        $regs = [];
 
         $inTables = false;
 
@@ -1210,16 +1210,16 @@ class Import
                 }
 
                 if (! $inTables) {
-                    $tables[] = array(self::TBL_NAME => $regs[1]);
+                    $tables[] = [self::TBL_NAME => $regs[1]];
                 }
             }
 
             /* Reset the array */
-            $regs = array();
+            $regs = [];
             $inTables = false;
         }
 
-        $params = array('db' => (string)$db_name);
+        $params = ['db' => (string)$db_name];
         $db_url = 'db_structure.php' . Url::getCommon($params);
         $db_ops_url = 'db_operations.php' . Url::getCommon($params);
 
@@ -1257,10 +1257,10 @@ class Import
 
         $num_tables = count($tables);
         for ($i = 0; $i < $num_tables; ++$i) {
-            $params = array(
+            $params = [
                  'db' => (string) $db_name,
                  'table' => (string) $tables[$i][self::TBL_NAME]
-            );
+            ];
             $tbl_url = 'sql.php' . Url::getCommon($params);
             $tbl_struct_url = 'tbl_structure.php' . Url::getCommon($params);
             $tbl_ops_url = 'tbl_operations.php' . Url::getCommon($params);
@@ -1363,7 +1363,7 @@ class Import
         $error = false;
         $error_msg = __('Only single-table UPDATE and DELETE queries can be simulated.');
         $sql_delimiter = $_REQUEST['sql_delimiter'];
-        $sql_data = array();
+        $sql_data = [];
         $queries = explode($sql_delimiter, $GLOBALS['sql_query']);
         foreach ($queries as $sql_query) {
             if (empty($sql_query)) {
@@ -1379,11 +1379,11 @@ class Import
 
             $statement = $parser->statements[0];
 
-            $analyzed_sql_results = array(
+            $analyzed_sql_results = [
                 'query' => $sql_query,
                 'parser' => $parser,
                 'statement' => $statement,
-            );
+            ];
 
             if ((!(($statement instanceof UpdateStatement)
                 || ($statement instanceof DeleteStatement)))
@@ -1424,7 +1424,7 @@ class Import
      *
      * @return array
      */
-    public function getMatchedRows(array $analyzed_sql_results = array()): array
+    public function getMatchedRows(array $analyzed_sql_results = []): array
     {
         $statement = $analyzed_sql_results['statement'];
 
@@ -1439,17 +1439,17 @@ class Import
         $matched_rows = $this->executeMatchedRowQuery($matched_row_query);
 
         // URL to matched rows.
-        $_url_params = array(
+        $_url_params = [
             'db'        => $GLOBALS['db'],
             'sql_query' => $matched_row_query
-        );
+        ];
         $matched_rows_url  = 'sql.php' . Url::getCommon($_url_params);
 
-        return array(
+        return [
             'sql_query' => Util::formatSql($analyzed_sql_results['query']),
             'matched_rows' => $matched_rows,
             'matched_rows_url' => $matched_rows_url
-        );
+        ];
     }
 
     /**
@@ -1475,8 +1475,8 @@ class Import
             $where = '1';
         }
 
-        $columns = array();
-        $diff = array();
+        $columns = [];
+        $diff = [];
         foreach ($analyzed_sql_results['statement']->set as $set) {
             $columns[] = $set->column;
             $not_equal_operator = ' <> ';
@@ -1689,7 +1689,7 @@ class Import
         }
 
         // List of Transactional Engines.
-        $transactional_engines = array(
+        $transactional_engines = [
             'INNODB',
             'FALCON',
             'NDB',
@@ -1698,7 +1698,7 @@ class Import
             'XTRADB',
             'SEQUENCE',
             'BDB'
-        );
+        ];
 
         // Query to check if table is 'Transactional'.
         $check_query = 'SELECT `ENGINE` FROM `information_schema`.`tables` '
diff --git a/libraries/classes/Index.php b/libraries/classes/Index.php
index b31bf1eb5c..69aba8c9a8 100644
--- a/libraries/classes/Index.php
+++ b/libraries/classes/Index.php
@@ -34,7 +34,7 @@ class Index
      *
      * @var array
      */
-    private static $_registry = array();
+    private static $_registry = [];
 
     /**
      * @var string The name of the schema
@@ -56,7 +56,7 @@ class Index
      *
      * @var array
      */
-    private $_columns = array();
+    private $_columns = [];
 
     /**
      * The index method used (BTREE, HASH, RTREE).
@@ -118,7 +118,7 @@ class Index
      *
      * @param array $params parameters
      */
-    public function __construct(array $params = array())
+    public function __construct(array $params = [])
     {
         $this->set($params);
     }
@@ -163,7 +163,7 @@ class Index
             return Index::$_registry[$schema][$table];
         }
 
-        return array();
+        return [];
     }
 
     /**
@@ -177,7 +177,7 @@ class Index
      */
     static public function getFromTableByChoice($table, $schema, $choices = 31)
     {
-        $indexes = array();
+        $indexes = [];
         foreach (self::getFromTable($table, $schema) as $index) {
             if (($choices & Index::PRIMARY)
                 && $index->getChoice() == 'PRIMARY'
@@ -283,7 +283,7 @@ class Index
      */
     public function addColumns(array $columns)
     {
-        $_columns = array();
+        $_columns = [];
 
         if (isset($columns['names'])) {
             // coming from form
@@ -292,10 +292,10 @@ class Index
             foreach ($columns['names'] as $key => $name) {
                 $sub_part = isset($columns['sub_parts'][$key])
                     ? $columns['sub_parts'][$key] : '';
-                $_columns[] = array(
+                $_columns[] = [
                     'Column_name'   => $name,
                     'Sub_part'      => $sub_part,
-                );
+                ];
             }
         } else {
             // coming from SHOW INDEXES
@@ -476,13 +476,13 @@ class Index
      */
     static public function getIndexChoices()
     {
-        return array(
+        return [
             'PRIMARY',
             'INDEX',
             'UNIQUE',
             'SPATIAL',
             'FULLTEXT',
-        );
+        ];
     }
 
     /**
@@ -492,10 +492,10 @@ class Index
      */
     static public function getIndexTypes()
     {
-        return array(
+        return [
             'BTREE',
             'HASH'
-        );
+        ];
     }
 
     /**
@@ -537,7 +537,7 @@ class Index
      */
     public function generateIndexTypeSelector()
     {
-        $types = array("" => "--");
+        $types = ["" => "--"];
         foreach (Index::getIndexTypes() as $type) {
             $types[$type] = $type;
         }
@@ -593,15 +593,15 @@ class Index
     public function isUnique($as_text = false)
     {
         if ($as_text) {
-            $r = array(
+            $r = [
                 '0' => __('Yes'),
                 '1' => __('No'),
-            );
+            ];
         } else {
-            $r = array(
+            $r = [
                 '0' => true,
                 '1' => false,
-            );
+            ];
         }
 
         return $r[$this->_non_unique];
@@ -770,7 +770,7 @@ class Index
                 $r .= Util::linkOrButton(
                     'sql.php' . Url::getCommon($this_params),
                     Util::getIcon('b_drop', __('Drop')),
-                    array('class' => 'drop_primary_key_index_anchor ajax')
+                    ['class' => 'drop_primary_key_index_anchor ajax']
                 );
                 $r .= '</td>' . "\n";
             }
@@ -841,11 +841,11 @@ class Index
      */
     public function getCompareData()
     {
-        $data = array(
+        $data = [
             // 'Non_unique'    => $this->_non_unique,
             'Packed'        => $this->_packed,
             'Index_choice'    => $this->_choice,
-        );
+        ];
 
         foreach ($this->_columns as $column) {
             $data['columns'][] = $column->getCompareData();
diff --git a/libraries/classes/IndexColumn.php b/libraries/classes/IndexColumn.php
index 2e0dc2d4c1..002ade4755 100644
--- a/libraries/classes/IndexColumn.php
+++ b/libraries/classes/IndexColumn.php
@@ -64,7 +64,7 @@ class IndexColumn
      *
      * @param array $params an array containing the parameters of the index column
      */
-    public function __construct(array $params = array())
+    public function __construct(array $params = [])
     {
         $this->set($params);
     }
@@ -177,12 +177,12 @@ class IndexColumn
      */
     public function getCompareData()
     {
-        return array(
+        return [
             'Column_name'   => $this->_name,
             'Seq_in_index'  => $this->_seq_in_index,
             'Collation'     => $this->_collation,
             'Sub_part'      => $this->_sub_part,
             'Null'          => $this->_null,
-        );
+        ];
     }
 }
diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php
index 1080335bd8..6dd631f3a7 100644
--- a/libraries/classes/InsertEdit.php
+++ b/libraries/classes/InsertEdit.php
@@ -81,13 +81,13 @@ class InsertEdit
         array $where_clause_array,
         $err_url
     ) {
-        $_form_params = array(
+        $_form_params = [
             'db'        => $db,
             'table'     => $table,
             'goto'      => $GLOBALS['goto'],
             'err_url'   => $err_url,
             'sql_query' => $_POST['sql_query'],
-        );
+        ];
         if (isset($where_clauses)) {
             foreach ($where_clause_array as $key_id => $where_clause) {
                 $_form_params['where_clause[' . $key_id . ']'] = trim($where_clause);
@@ -109,14 +109,14 @@ class InsertEdit
     private function getWhereClauseArray($where_clause)
     {
         if (!isset($where_clause)) {
-            return array();
+            return [];
         }
 
         if (is_array($where_clause)) {
             return $where_clause;
         }
 
-        return array(0 => $where_clause);
+        return [0 => $where_clause];
     }
 
     /**
@@ -133,9 +133,9 @@ class InsertEdit
         $table,
         $db
     ) {
-        $rows               = array();
-        $result             = array();
-        $where_clauses      = array();
+        $rows               = [];
+        $result             = [];
+        $where_clauses      = [];
         $found_unique_key   = false;
         foreach ($where_clause_array as $key_id => $where_clause) {
             $local_query     = 'SELECT * FROM '
@@ -161,7 +161,7 @@ class InsertEdit
                 $found_unique_key = true;
             }
         }
-        return array($where_clauses, $result, $rows, $found_unique_key);
+        return [$where_clauses, $result, $rows, $found_unique_key];
     }
 
     /**
@@ -236,7 +236,7 @@ class InsertEdit
             DatabaseInterface::QUERY_STORE
         );
         $rows = array_fill(0, $GLOBALS['cfg']['InsertRows'], false);
-        return array($result, $rows);
+        return [$result, $rows];
     }
 
     /**
@@ -275,7 +275,7 @@ class InsertEdit
      */
     public function showTypeOrFunction($which, array $url_params, $is_show)
     {
-        $params = array();
+        $params = [];
 
         switch ($which) {
             case 'function':
@@ -347,15 +347,15 @@ class InsertEdit
         $column['Field_title']   = $this->getColumnTitle($column, $comments_map);
         $column['is_binary']     = $this->isColumn(
             $column,
-            array('binary', 'varbinary')
+            ['binary', 'varbinary']
         );
         $column['is_blob']       = $this->isColumn(
             $column,
-            array('blob', 'tinyblob', 'mediumblob', 'longblob')
+            ['blob', 'tinyblob', 'mediumblob', 'longblob']
         );
         $column['is_char']       = $this->isColumn(
             $column,
-            array('char', 'varchar')
+            ['char', 'varchar']
         );
 
         list($column['pma_type'], $column['wrap'], $column['first_timestamp'])
@@ -436,7 +436,7 @@ class InsertEdit
                 $column['wrap']  = ' nowrap';
                 break;
         }
-        return array($column['pma_type'], $column['wrap'], $column['first_timestamp']);
+        return [$column['pma_type'], $column['wrap'], $column['first_timestamp']];
     }
 
     /**
@@ -866,13 +866,13 @@ class InsertEdit
 
         $html_output .= '<a class="ajax browse_foreign" href="browse_foreigners.php'
             . Url::getCommon(
-                array(
+                [
                     'db' => $db,
                     'table' => $table,
                     'field' => $column['Field'],
                     'rownumber' => $rownumber,
                     'data'      => $data
-                )
+                ]
             ) . '">'
             . str_replace("'", "\'", $titles['Browse']) . '</a>';
         return $html_output;
@@ -1092,12 +1092,12 @@ class InsertEdit
      */
     private function getColumnEnumValues(array $column, array $extracted_columnspec)
     {
-        $column['values'] = array();
+        $column['values'] = [];
         foreach ($extracted_columnspec['enum_set_values'] as $val) {
-            $column['values'][] = array(
+            $column['values'][] = [
                 'plain' => $val,
                 'html'  => htmlspecialchars($val),
-            );
+            ];
         }
         return $column['values'];
     }
@@ -1294,16 +1294,16 @@ class InsertEdit
         array $extracted_columnspec
     ) {
         if (! isset($column['values'])) {
-            $column['values'] = array();
+            $column['values'] = [];
             foreach ($extracted_columnspec['enum_set_values'] as $val) {
-                $column['values'][] = array(
+                $column['values'][] = [
                     'plain' => $val,
                     'html'  => htmlspecialchars($val),
-                );
+                ];
             }
             $column['select_size'] = min(4, count($column['values']));
         }
-        return array($column['values'], $column['select_size']);
+        return [$column['values'], $column['select_size']];
     }
 
     /**
@@ -1546,12 +1546,12 @@ class InsertEdit
          * process any data with function like MD5
          */
         global $max_upload_size;
-        $max_field_sizes = array(
+        $max_field_sizes = [
             'tinyblob'   =>        '256',
             'blob'       =>      '65536',
             'mediumblob' =>   '16777216',
             'longblob'   => '4294967296' // yeah, really
-        );
+        ];
 
         $this_field_max_size = $max_upload_size; // from PHP max
         if ($this_field_max_size > $max_field_sizes[$column['pma_type']]) {
@@ -1566,7 +1566,7 @@ class InsertEdit
         if ($this_field_max_size > $biggest_max_file_size) {
             $biggest_max_file_size = $this_field_max_size;
         }
-        return array($html_output, $biggest_max_file_size);
+        return [$html_output, $biggest_max_file_size];
     }
 
     /**
@@ -1647,9 +1647,9 @@ class InsertEdit
                 $readOnly
             );
 
-            $virtual = array(
+            $virtual = [
                 'VIRTUAL', 'PERSISTENT', 'VIRTUAL GENERATED', 'STORED GENERATED'
-            );
+            ];
             if (in_array($column['Extra'], $virtual)) {
                 $html_output .= '<input type="hidden" name="virtual'
                     . $column_name_appendix . '" value="1" />';
@@ -1729,7 +1729,7 @@ class InsertEdit
             . Util::linkOrButton(
                 '#',
                 $edit_str,
-                array(),
+                [],
                 '_blank'
             )
             . '</span>';
@@ -1871,7 +1871,7 @@ class InsertEdit
             // in 2.9.0, we are looking for `table_name`.`field_name` = numeric_value
             $is_numeric = false;
             if (! is_array($where_clause)) {
-                $where_clause = array($where_clause);
+                $where_clause = [$where_clause];
             }
             for ($i = 0, $nb = count($where_clause); $i < $nb; $i++) {
                 // preg_match() returns 1 if there is a match
@@ -2057,13 +2057,13 @@ class InsertEdit
             . $column_name_appendix . '" value="'
             . htmlspecialchars($current_row[$column['Field']]) . '" />';
 
-        return array(
+        return [
             $real_null_value,
             $special_chars_encoded,
             $special_chars,
             $data,
             $backup_field
-        );
+        ];
     }
 
     /**
@@ -2107,10 +2107,10 @@ class InsertEdit
         $special_chars_encoded = Util::duplicateFirstNewline(
             $special_chars
         );
-        return array(
+        return [
             $real_null_value, $data, $special_chars,
             $backup_field, $special_chars_encoded
-        );
+        ];
     }
 
     /**
@@ -2124,7 +2124,7 @@ class InsertEdit
             // we were editing something => use the WHERE clause
             $loop_array = is_array($_REQUEST['where_clause'])
                 ? $_REQUEST['where_clause']
-                : array($_REQUEST['where_clause']);
+                : [$_REQUEST['where_clause']];
             $using_key  = true;
             $is_insert  = isset($_REQUEST['submit_type'])
                           && ($_REQUEST['submit_type'] == 'insert'
@@ -2132,7 +2132,7 @@ class InsertEdit
                           || $_REQUEST['submit_type'] == 'insertignore');
         } else {
             // new row => use indexes
-            $loop_array = array();
+            $loop_array = [];
             if (! empty($_REQUEST['fields'])) {
                 foreach ($_REQUEST['fields']['multi_edit'] as $key => $dummy) {
                     $loop_array[] = $key;
@@ -2143,7 +2143,7 @@ class InsertEdit
         }
         $is_insertignore  = isset($_REQUEST['submit_type'])
             && $_REQUEST['submit_type'] == 'insertignore';
-        return array($loop_array, $using_key, $is_insert, $is_insertignore);
+        return [$loop_array, $using_key, $is_insert, $is_insertignore];
     }
 
     /**
@@ -2217,7 +2217,7 @@ class InsertEdit
      */
     public function getGotoInclude($goto_include)
     {
-        $valid_options = array('new_insert', 'same_insert', 'edit_next');
+        $valid_options = ['new_insert', 'same_insert', 'edit_next'];
         if (isset($_REQUEST['after_insert'])
             && in_array($_REQUEST['after_insert'], $valid_options)
         ) {
@@ -2276,12 +2276,12 @@ class InsertEdit
         } else {
             $insert_command = 'INSERT ';
         }
-        $query = array(
+        $query = [
             $insert_command . 'INTO '
             . Util::backquote($GLOBALS['table'])
             . ' (' . implode(', ', $query_fields) . ') VALUES ('
             . implode('), (', $value_sets) . ')'
-        );
+        ];
         unset($insert_command, $query_fields);
         return $query;
     }
@@ -2308,9 +2308,9 @@ class InsertEdit
         $GLOBALS['display_query'] = $GLOBALS['sql_query'];
 
         $total_affected_rows = 0;
-        $last_messages = array();
-        $warning_messages = array();
-        $error_messages = array();
+        $last_messages = [];
+        $warning_messages = [];
+        $error_messages = [];
 
         foreach ($query as $single_query) {
             if ($_REQUEST['submit_type'] == 'showinsert') {
@@ -2347,14 +2347,14 @@ class InsertEdit
             }
             $warning_messages = $this->getWarningMessages();
         }
-        return array(
+        return [
             $url_params,
             $total_affected_rows,
             $last_messages,
             $warning_messages,
             $error_messages,
             $return_to_sql_query
-        );
+        ];
     }
 
     /**
@@ -2364,7 +2364,7 @@ class InsertEdit
      */
     private function getWarningMessages()
     {
-        $warning_essages = array();
+        $warning_essages = [];
         foreach ($this->dbi->getWarnings() as $warning) {
             $warning_essages[] = Message::sanitize(
                 $warning['Level'] . ': #' . $warning['Code'] . ' ' . $warning['Message']
@@ -2447,7 +2447,7 @@ class InsertEdit
         } else {
             $title = ' title="' . htmlspecialchars($relation_field_value) . '"';
         }
-        $_url_params = array(
+        $_url_params = [
             'db'    => $foreigner['foreign_db'],
             'table' => $foreigner['foreign_table'],
             'pos'   => '0',
@@ -2456,7 +2456,7 @@ class InsertEdit
                 . '.' . Util::backquote($foreigner['foreign_table'])
                 . ' WHERE ' . Util::backquote($foreigner['foreign_field'])
                 . $where_comparison
-        );
+        ];
         $output = '<a href="sql.php'
             . Url::getCommon($_url_params) . '"' . $title . '>';
 
@@ -2500,12 +2500,12 @@ class InsertEdit
         $include_file = 'libraries/classes/Plugins/Transformations/' . $file;
         if (is_file($include_file)) {
             include_once $include_file;
-            $_url_params = array(
+            $_url_params = [
                 'db'            => $db,
                 'table'         => $table,
                 'where_clause'  => $_REQUEST['where_clause'],
                 'transform_key' => $column_name
-            );
+            ];
             $transform_options = $this->transformations->getOptions(
                 isset($transformation[$type . '_options'])
                 ? $transformation[$type . '_options']
@@ -2666,7 +2666,7 @@ class InsertEdit
                     . ' = ' . $current_value_as_an_array;
             }
         }
-        return array($query_values, $query_fields);
+        return [$query_values, $query_fields];
     }
 
     /**
@@ -2905,7 +2905,7 @@ class InsertEdit
             $where_clause = null;
             list($result, $rows) = $this->loadFirstRow($table, $db);
             $where_clauses = null;
-            $where_clause_array = array();
+            $where_clause_array = [];
             $found_unique_key = false;
         }
 
@@ -2917,11 +2917,11 @@ class InsertEdit
             $where_clause = $where_clauses = null;
         }
 
-        return array(
+        return [
             $insert_mode, $where_clause, $where_clause_array, $where_clauses,
             $result, $rows, $found_unique_key,
             isset($after_insert) ? $after_insert : null
-        );
+        ];
     }
 
     /**
@@ -2934,7 +2934,7 @@ class InsertEdit
      */
     public function getCommentsMap($db, $table)
     {
-        $comments_map = array();
+        $comments_map = [];
 
         if ($GLOBALS['cfg']['ShowPropertyComments']) {
             $comments_map = $this->relation->getComments($db, $table);
@@ -2956,10 +2956,10 @@ class InsertEdit
         /**
          * @todo check if we could replace by "db_|tbl_" - please clarify!?
          */
-        $url_params = array(
+        $url_params = [
             'db' => $db,
             'sql_query' => $_POST['sql_query']
-        );
+        ];
 
         if (preg_match('@^tbl_@', $GLOBALS['goto'])) {
             $url_params['table'] = $table;
@@ -3295,12 +3295,12 @@ class InsertEdit
                 $transformation_options = $this->transformations->getOptions(
                     $column_mime['input_transformation_options']
                 );
-                $_url_params = array(
+                $_url_params = [
                     'db'            => $db,
                     'table'         => $table,
                     'transform_key' => $column['Field'],
                     'where_clause'  => $where_clause
-                );
+                ];
                 $transformation_options['wrapper_link']
                     = Url::getCommon($_url_params);
                 $current_value = '';
@@ -3342,7 +3342,7 @@ class InsertEdit
                 $data,
                 $special_chars,
                 $foreignData,
-                array($table, $db),
+                [$table, $db],
                 $row_id,
                 $titles,
                 $text_dir,
@@ -3432,7 +3432,7 @@ class InsertEdit
         }
         for ($column_number = 0; $column_number < $columns_cnt; $column_number++) {
             $table_column = $table_columns[$column_number];
-            $column_mime = array();
+            $column_mime = [];
             if (isset($mime_map[$table_column['Field']])) {
                 $column_mime = $mime_map[$table_column['Field']];
             }
diff --git a/libraries/classes/IpAllowDeny.php b/libraries/classes/IpAllowDeny.php
index 423a85fdb0..35af52396e 100644
--- a/libraries/classes/IpAllowDeny.php
+++ b/libraries/classes/IpAllowDeny.php
@@ -156,7 +156,7 @@ class IpAllowDeny
 
         if ($is_range) {
             // what range do we operate on?
-            $range_match = array();
+            $range_match = [];
             $match = preg_match(
                 '/\[([0-9a-f]+)\-([0-9a-f]+)\]/', $test_range, $range_match
             );
@@ -274,17 +274,17 @@ class IpAllowDeny
         if (isset($cfg['Server']['AllowDeny']['rules'])) {
             $rules     = $cfg['Server']['AllowDeny']['rules'];
             if (! is_array($rules)) {
-                $rules = array();
+                $rules = [];
             }
         } else {
-            $rules = array();
+            $rules = [];
         }
 
         // lookup table for some name shortcuts
-        $shortcuts = array(
+        $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/Language.php b/libraries/classes/Language.php
index 119a66bba3..dc659cd279 100644
--- a/libraries/classes/Language.php
+++ b/libraries/classes/Language.php
@@ -159,7 +159,7 @@ class Language
      */
     public function isRTL()
     {
-        return in_array($this->code, array('ar', 'fa', 'he', 'ur'));
+        return in_array($this->code, ['ar', 'fa', 'he', 'ur']);
     }
 
     /**
@@ -188,7 +188,7 @@ class Language
         }
 
         /* TCPDF */
-        $GLOBALS['l'] = array();
+        $GLOBALS['l'] = [];
 
         /* TCPDF settings */
         $GLOBALS['l']['a_meta_charset'] = 'UTF-8';
diff --git a/libraries/classes/LanguageManager.php b/libraries/classes/LanguageManager.php
index 7afca15591..4627809060 100644
--- a/libraries/classes/LanguageManager.php
+++ b/libraries/classes/LanguageManager.php
@@ -32,619 +32,619 @@ class LanguageManager
      * - Match regular expression
      * - MySQL locale
      */
-    private static $_language_data = array(
-        'af' => array(
+    private static $_language_data = [
+        'af' => [
             'af',
             'Afrikaans',
             '',
             'af|afrikaans',
             '',
-        ),
-        'ar' => array(
+        ],
+        'ar' => [
             'ar',
             'Arabic',
             '&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;',
             'ar|arabic',
             'ar_AE',
-        ),
-        'az' => array(
+        ],
+        'az' => [
             'az',
             'Azerbaijani',
             'Az&#601;rbaycanca',
             'az|azerbaijani',
             '',
-        ),
-        'bn' => array(
+        ],
+        'bn' => [
             'bn',
             'Bangla',
             'বাংলা',
             'bn|bangla',
             '',
-        ),
-        'be' => array(
+        ],
+        'be' => [
             'be',
             'Belarusian',
             '&#1041;&#1077;&#1083;&#1072;&#1088;&#1091;&#1089;&#1082;&#1072;&#1103;',
             'be|belarusian',
             'be_BY',
-        ),
-        'be@latin' => array(
+        ],
+        'be@latin' => [
             'be@latin',
             'Belarusian (latin)',
             'Bie&#0322;aruskaja',
             'be[-_]lat|be@latin|belarusian latin',
             '',
-        ),
-        'bg' => array(
+        ],
+        'bg' => [
             'bg',
             'Bulgarian',
             '&#1041;&#1098;&#1083;&#1075;&#1072;&#1088;&#1089;&#1082;&#1080;',
             'bg|bulgarian',
             'bg_BG',
-        ),
-        'bs' => array(
+        ],
+        'bs' => [
             'bs',
             'Bosnian',
             'Bosanski',
             'bs|bosnian',
             '',
-        ),
-        'br' => array(
+        ],
+        'br' => [
             'br',
             'Breton',
             'Brezhoneg',
             'br|breton',
             '',
-        ),
-        'brx' => array(
+        ],
+        'brx' => [
             'brx',
             'Bodo',
             'बड़ो',
             'brx|bodo',
             '',
-        ),
-        'ca' => array(
+        ],
+        'ca' => [
             'ca',
             'Catalan',
             'Catal&agrave;',
             'ca|catalan',
             'ca_ES',
-        ),
-        'ckb' => array(
+        ],
+        'ckb' => [
             'ckb',
             'Sorani',
             'سۆرانی',
             'ckb|sorani',
             '',
-        ),
-        'cs' => array(
+        ],
+        'cs' => [
             'cs',
             'Czech',
             'Čeština',
             'cs|czech',
             'cs_CZ',
-        ),
-        'cy' => array(
+        ],
+        'cy' => [
             'cy',
             'Welsh',
             'Cymraeg',
             'cy|welsh',
             '',
-        ),
-        'da' => array(
+        ],
+        'da' => [
             'da',
             'Danish',
             'Dansk',
             'da|danish',
             'da_DK',
-        ),
-        'de' => array(
+        ],
+        'de' => [
             'de',
             'German',
             'Deutsch',
             'de|german',
             'de_DE',
-        ),
-        'el' => array(
+        ],
+        'el' => [
             'el',
             'Greek',
             '&Epsilon;&lambda;&lambda;&eta;&nu;&iota;&kappa;&#940;',
             'el|greek',
             '',
-        ),
-        'en' => array(
+        ],
+        'en' => [
             'en',
             'English',
             '',
             'en|english',
             'en_US',
-        ),
-        'en_gb' => array(
+        ],
+        'en_gb' => [
             'en_GB',
             'English (United Kingdom)',
             '',
             'en[_-]gb|english (United Kingdom)',
             'en_GB',
-        ),
-        'eo' => array(
+        ],
+        'eo' => [
             'eo',
             'Esperanto',
             'Esperanto',
             'eo|esperanto',
             '',
-        ),
-        'es' => array(
+        ],
+        'es' => [
             'es',
             'Spanish',
             'Espa&ntilde;ol',
             'es|spanish',
             'es_ES',
-        ),
-        'et' => array(
+        ],
+        'et' => [
             'et',
             'Estonian',
             'Eesti',
             'et|estonian',
             'et_EE',
-        ),
-        'eu' => array(
+        ],
+        'eu' => [
             'eu',
             'Basque',
             'Euskara',
             'eu|basque',
             'eu_ES',
-        ),
-        'fa' => array(
+        ],
+        'fa' => [
             'fa',
             'Persian',
             '&#1601;&#1575;&#1585;&#1587;&#1740;',
             'fa|persian',
             '',
-        ),
-        'fi' => array(
+        ],
+        'fi' => [
             'fi',
             'Finnish',
             'Suomi',
             'fi|finnish',
             'fi_FI',
-        ),
-        'fil' => array(
+        ],
+        'fil' => [
             'fil',
             'Filipino',
             'Pilipino',
             'fil|filipino',
             '',
-        ),
-        'fr' => array(
+        ],
+        'fr' => [
             'fr',
             'French',
             'Fran&ccedil;ais',
             'fr|french',
             'fr_FR',
-        ),
-        'fy' => array(
+        ],
+        'fy' => [
             'fy',
             'Frisian',
             'Frysk',
             'fy|frisian',
             '',
-        ),
-        'gl' => array(
+        ],
+        'gl' => [
             'gl',
             'Galician',
             'Galego',
             'gl|galician',
             'gl_ES',
-        ),
-        'gu' => array(
+        ],
+        'gu' => [
             'gu',
             'Gujarati',
             'ગુજરાતી',
             'gu|gujarati',
             'gu_IN',
-        ),
-        'he' => array(
+        ],
+        'he' => [
             'he',
             'Hebrew',
             '&#1506;&#1489;&#1512;&#1497;&#1514;',
             'he|hebrew',
             'he_IL',
-        ),
-        'hi' => array(
+        ],
+        'hi' => [
             'hi',
             'Hindi',
             '&#2361;&#2367;&#2344;&#2381;&#2342;&#2368;',
             'hi|hindi',
             'hi_IN',
-        ),
-        'hr' => array(
+        ],
+        'hr' => [
             'hr',
             'Croatian',
             'Hrvatski',
             'hr|croatian',
             'hr_HR',
-        ),
-        'hu' => array(
+        ],
+        'hu' => [
             'hu',
             'Hungarian',
             'Magyar',
             'hu|hungarian',
             'hu_HU',
-        ),
-        'hy' => array(
+        ],
+        'hy' => [
             'hy',
             'Armenian',
             'Հայերէն',
             'hy|armenian',
             '',
-        ),
-        'ia' => array(
+        ],
+        'ia' => [
             'ia',
             'Interlingua',
             '',
             'ia|interlingua',
             '',
-        ),
-        'id' => array(
+        ],
+        'id' => [
             'id',
             'Indonesian',
             'Bahasa Indonesia',
             'id|indonesian',
             'id_ID',
-        ),
-        'ig' => array(
+        ],
+        'ig' => [
             'ig',
             'Igbo',
             'Asụsụ Igbo',
             'ig|igbo',
             '',
-        ),
-        'it' => array(
+        ],
+        'it' => [
             'it',
             'Italian',
             'Italiano',
             'it|italian',
             'it_IT',
-        ),
-        'ja' => array(
+        ],
+        'ja' => [
             'ja',
             'Japanese',
             '&#26085;&#26412;&#35486;',
             'ja|japanese',
             'ja_JP',
-        ),
-        'ko' => array(
+        ],
+        'ko' => [
             'ko',
             'Korean',
             '&#54620;&#44397;&#50612;',
             'ko|korean',
             'ko_KR',
-        ),
-        'ka' => array(
+        ],
+        'ka' => [
             'ka',
             'Georgian',
             '&#4325;&#4304;&#4320;&#4311;&#4323;&#4314;&#4312;',
             'ka|georgian',
             '',
-        ),
-        'kab' => array(
+        ],
+        'kab' => [
             'kab',
             'Kabylian',
             'Taqbaylit',
             'kab|kabylian',
             '',
-        ),
-        'kk' => array(
+        ],
+        'kk' => [
             'kk',
             'Kazakh',
             'Қазақ',
             'kk|kazakh',
             '',
-        ),
-        'km' => array(
+        ],
+        'km' => [
             'km',
             'Khmer',
             'ខ្មែរ',
             'km|khmer',
             '',
-        ),
-        'kn' => array(
+        ],
+        'kn' => [
             'kn',
             'Kannada',
             'ಕನ್ನಡ',
             'kn|kannada',
             '',
-        ),
-        'ksh' => array(
+        ],
+        'ksh' => [
             'ksh',
             'Colognian',
             'Kölsch',
             'ksh|colognian',
             '',
-        ),
-        'ku' => array(
+        ],
+        'ku' => [
             'ku',
             'Kurdish',
             'کوردی',
             'ku|kurdish',
             '',
-        ),
-        'ky' => array(
+        ],
+        'ky' => [
             'ky',
             'Kyrgyz',
             'Кыргызча',
             'ky|kyrgyz',
             '',
-        ),
-        'li' => array(
+        ],
+        'li' => [
             'li',
             'Limburgish',
             'Lèmbörgs',
             'li|limburgish',
             '',
-        ),
-        'lt' => array(
+        ],
+        'lt' => [
             'lt',
             'Lithuanian',
             'Lietuvi&#371;',
             'lt|lithuanian',
             'lt_LT',
-        ),
-        'lv' => array(
+        ],
+        'lv' => [
             'lv',
             'Latvian',
             'Latvie&scaron;u',
             'lv|latvian',
             'lv_LV',
-        ),
-        'mk' => array(
+        ],
+        'mk' => [
             'mk',
             'Macedonian',
             'Macedonian',
             'mk|macedonian',
             'mk_MK',
-        ),
-        'ml' => array(
+        ],
+        'ml' => [
             'ml',
             'Malayalam',
             'Malayalam',
             'ml|malayalam',
             '',
-        ),
-        'mn' => array(
+        ],
+        'mn' => [
             'mn',
             'Mongolian',
             '&#1052;&#1086;&#1085;&#1075;&#1086;&#1083;',
             'mn|mongolian',
             'mn_MN',
-        ),
-        'ms' => array(
+        ],
+        'ms' => [
             'ms',
             'Malay',
             'Bahasa Melayu',
             'ms|malay',
             'ms_MY',
-        ),
-        'ne' => array(
+        ],
+        'ne' => [
             'ne',
             'Nepali',
             'नेपाली',
             'ne|nepali',
             '',
-        ),
-        'nb' => array(
+        ],
+        'nb' => [
             'nb',
             'Norwegian',
             'Norsk',
             'nb|norwegian',
             'nb_NO',
-        ),
-        'nl' => array(
+        ],
+        'nl' => [
             'nl',
             'Dutch',
             'Nederlands',
             'nl|dutch',
             'nl_NL',
-        ),
-        'pa' => array(
+        ],
+        'pa' => [
             'pa',
             'Punjabi',
             'ਪੰਜਾਬੀ',
             'pa|punjabi',
             '',
-        ),
-        'pl' => array(
+        ],
+        'pl' => [
             'pl',
             'Polish',
             'Polski',
             'pl|polish',
             'pl_PL',
-        ),
-        'pt' => array(
+        ],
+        'pt' => [
             'pt',
             'Portuguese',
             'Portugu&ecirc;s',
             'pt|portuguese',
             'pt_PT',
-        ),
-        'pt_br' => array(
+        ],
+        'pt_br' => [
             'pt_BR',
             'Portuguese (Brazil)',
             'Portugu&ecirc;s (Brasil)',
             'pt[-_]br|portuguese (brazil)',
             'pt_BR',
-        ),
-        'ro' => array(
+        ],
+        'ro' => [
             'ro',
             'Romanian',
             'Rom&acirc;n&#259;',
             'ro|romanian',
             'ro_RO',
-        ),
-        'ru' => array(
+        ],
+        'ru' => [
             'ru',
             'Russian',
             '&#1056;&#1091;&#1089;&#1089;&#1082;&#1080;&#1081;',
             'ru|russian',
             'ru_RU',
-        ),
-        'si' => array(
+        ],
+        'si' => [
             'si',
             'Sinhala',
             '&#3523;&#3538;&#3458;&#3524;&#3517;',
             'si|sinhala',
             '',
-        ),
-        'sk' => array(
+        ],
+        'sk' => [
             'sk',
             'Slovak',
             'Sloven&#269;ina',
             'sk|slovak',
             'sk_SK',
-        ),
-        'sl' => array(
+        ],
+        'sl' => [
             'sl',
             'Slovenian',
             'Sloven&scaron;&#269;ina',
             'sl|slovenian',
             'sl_SI',
-        ),
-        'sq' => array(
+        ],
+        'sq' => [
             'sq',
             'Slbanian',
             'Shqip',
             'sq|albanian',
             'sq_AL',
-        ),
-        'sr@latin' => array(
+        ],
+        'sr@latin' => [
             'sr@latin',
             'Serbian (latin)',
             'Srpski',
             'sr[-_]lat|sr@latin|serbian latin',
             'sr_YU',
-        ),
-        'sr' => array(
+        ],
+        'sr' => [
             'sr',
             'Serbian',
             '&#1057;&#1088;&#1087;&#1089;&#1082;&#1080;',
             'sr|serbian',
             'sr_YU',
-        ),
-        'sv' => array(
+        ],
+        'sv' => [
             'sv',
             'Swedish',
             'Svenska',
             'sv|swedish',
             'sv_SE',
-        ),
-        'ta' => array(
+        ],
+        'ta' => [
             'ta',
             'Tamil',
             'தமிழ்',
             'ta|tamil',
             'ta_IN',
-        ),
-        'te' => array(
+        ],
+        'te' => [
             'te',
             'Telugu',
             'తెలుగు',
             'te|telugu',
             'te_IN',
-        ),
-        'th' => array(
+        ],
+        'th' => [
             'th',
             'Thai',
             '&#3616;&#3634;&#3625;&#3634;&#3652;&#3607;&#3618;',
             'th|thai',
             'th_TH',
-        ),
-        'tk' => array(
+        ],
+        'tk' => [
             'tk',
             'Turkmen',
             'Türkmençe',
             'tk|turkmen',
             '',
-        ),
-        'tr' => array(
+        ],
+        'tr' => [
             'tr',
             'Turkish',
             'T&uuml;rk&ccedil;e',
             'tr|turkish',
             'tr_TR',
-        ),
-        'tt' => array(
+        ],
+        'tt' => [
             'tt',
             'Tatarish',
             'Tatar&ccedil;a',
             'tt|tatarish',
             '',
-        ),
-        'ug' => array(
+        ],
+        'ug' => [
             'ug',
             'Uyghur',
             'ئۇيغۇرچە',
             'ug|uyghur',
             '',
-        ),
-        'uk' => array(
+        ],
+        'uk' => [
             'uk',
             'Ukrainian',
             '&#1059;&#1082;&#1088;&#1072;&#1111;&#1085;&#1089;&#1100;&#1082;&#1072;',
             'uk|ukrainian',
             'uk_UA',
-        ),
-        'ur' => array(
+        ],
+        'ur' => [
             'ur',
             'Urdu',
             'اُردوُ',
             'ur|urdu',
             'ur_PK',
-        ),
-        'uz@latin' => array(
+        ],
+        'uz@latin' => [
             'uz@latin',
             'Uzbek (latin)',
             'O&lsquo;zbekcha',
             'uz[-_]lat|uz@latin|uzbek-latin',
             '',
-        ),
-        'uz' => array(
+        ],
+        'uz' => [
             'uz',
             'Uzbek (cyrillic)',
             '&#1038;&#1079;&#1073;&#1077;&#1082;&#1095;&#1072;',
             'uz[-_]cyr|uz@cyrillic|uzbek-cyrillic',
             '',
-        ),
-        'vi' => array(
+        ],
+        'vi' => [
             'vi',
             'Vietnamese',
             'Tiếng Việt',
             'vi|vietnamese',
             'vi_VN',
-        ),
-        'vls' => array(
+        ],
+        'vls' => [
             'vls',
             'Flemish',
             'West-Vlams',
             'vls|flemish',
             '',
-        ),
-        'zh_tw' => array(
+        ],
+        'zh_tw' => [
             'zh_TW',
             'Chinese traditional',
             '&#20013;&#25991;',
             'zh[-_](tw|hk)|chinese traditional',
             'zh_TW',
-        ),
+        ],
         // only TW and HK use traditional Chinese while others (CN, SG, MY)
         // use simplified Chinese
-        'zh_cn' => array(
+        'zh_cn' => [
             'zh_CN',
             'Chinese simplified',
             '&#20013;&#25991;',
             'zh(?![-_](tw|hk))([-_][[:alpha:]]{2,3})?|chinese simplified',
             'zh_CN',
-        ),
-    );
+        ],
+    ];
 
     private $_available_locales;
     private $_available_languages;
@@ -673,7 +673,7 @@ class LanguageManager
      */
     public function listLocaleDir()
     {
-        $result = array('en');
+        $result = ['en'];
 
         /* Check for existing directory */
         if (!is_dir(LOCALE_PATH)) {
@@ -744,7 +744,7 @@ class LanguageManager
     public function availableLanguages()
     {
         if (! $this->_available_languages) {
-            $this->_available_languages = array();
+            $this->_available_languages = [];
 
             foreach($this->availableLocales() as $lang) {
                 $lang = strtolower($lang);
@@ -926,10 +926,10 @@ class LanguageManager
      */
     public function getSelectorDisplay($use_fieldset = false, $show_doc = true)
     {
-        $_form_params = array(
+        $_form_params = [
             'db' => $GLOBALS['db'],
             'table' => $GLOBALS['table'],
-        );
+        ];
 
         // For non-English, display "Language" with emphasis because it's
         // not a proper word in the current language; we show it to help
@@ -943,12 +943,12 @@ class LanguageManager
         $available_languages = $this->sortedLanguages();
 
         return Template::get('select_lang')->render(
-            array(
+            [
                 'language_title' => $language_title,
                 'use_fieldset' => $use_fieldset,
                 'available_languages' => $available_languages,
                 '_form_params' => $_form_params,
-            )
+            ]
         );
     }
 }
diff --git a/libraries/classes/Linter.php b/libraries/classes/Linter.php
index ca819a76df..41b2d2635f 100644
--- a/libraries/classes/Linter.php
+++ b/libraries/classes/Linter.php
@@ -54,7 +54,7 @@ class Linter
         $len = ($str instanceof UtfString) ?
             $str->length() : strlen($str);
 
-        $lines = array(0);
+        $lines = [0];
         for ($i = 0; $i < $len; ++$i) {
             if ($str[$i] === "\n") {
                 $lines[] = $i + 1;
@@ -80,7 +80,7 @@ class Linter
             }
             $line = $lineNo;
         }
-        return array($line, $pos - $lines[$line]);
+        return [$line, $pos - $lines[$line]];
     }
 
     /**
@@ -94,8 +94,8 @@ class Linter
     {
         // Disabling lint for huge queries to save some resources.
         if (mb_strlen($query) > 10000) {
-            return array(
-                array(
+            return [
+                [
                     'message' => __(
                         'Linting is disabled for this query because it exceeds the '
                         . 'maximum length.'
@@ -105,8 +105,8 @@ class Linter
                     'toLine' => 0,
                     'toColumn' => 0,
                     'severity' => 'warning',
-                )
-            );
+                ]
+            ];
         }
 
         /**
@@ -128,14 +128,14 @@ class Linter
          *
          * @var array
          */
-        $errors = ParserError::get(array($lexer, $parser));
+        $errors = ParserError::get([$lexer, $parser]);
 
         /**
          * The response containing of all errors.
          *
          * @var array
          */
-        $response = array();
+        $response = [];
 
         /**
          * The starting position for each line.
@@ -161,7 +161,7 @@ class Linter
             );
 
             // Building the response.
-            $response[] = array(
+            $response[] = [
                 'message' => sprintf(
                     __('%1$s (near <code>%2$s</code>)'),
                     htmlspecialchars($error[0]), htmlspecialchars($error[2])
@@ -171,7 +171,7 @@ class Linter
                 'toLine' => $toLine,
                 'toColumn' => $toColumn,
                 'severity' => 'error',
-            );
+            ];
         }
 
         // Sending back the answer.
diff --git a/libraries/classes/ListAbstract.php b/libraries/classes/ListAbstract.php
index bd2b76cb92..47e6d04a73 100644
--- a/libraries/classes/ListAbstract.php
+++ b/libraries/classes/ListAbstract.php
@@ -38,7 +38,7 @@ abstract class ListAbstract extends ArrayObject
      *                               ArrayIterator is the default class used.
      */
     public function __construct(
-        array $array = array(), $flags = 0, $iterator_class = "ArrayIterator"
+        array $array = [], $flags = 0, $iterator_class = "ArrayIterator"
     ) {
         parent::__construct($array, $flags, $iterator_class);
     }
diff --git a/libraries/classes/ListDatabase.php b/libraries/classes/ListDatabase.php
index abdc8a4b21..c7438689b2 100644
--- a/libraries/classes/ListDatabase.php
+++ b/libraries/classes/ListDatabase.php
@@ -64,7 +64,7 @@ class ListDatabase extends ListAbstract
      */
     protected function retrieve($like_db_name = null)
     {
-        $database_list = array();
+        $database_list = [];
         $command = "";
         if (! $GLOBALS['cfg']['Server']['DisableIS']) {
             $command .= "SELECT `SCHEMA_NAME` FROM `INFORMATION_SCHEMA`.`SCHEMATA`";
@@ -128,16 +128,16 @@ class ListDatabase extends ListAbstract
         if (is_string($GLOBALS['cfg']['Server']['only_db'])
             && strlen($GLOBALS['cfg']['Server']['only_db']) > 0
         ) {
-            $GLOBALS['cfg']['Server']['only_db'] = array(
+            $GLOBALS['cfg']['Server']['only_db'] = [
                 $GLOBALS['cfg']['Server']['only_db']
-            );
+            ];
         }
 
         if (! is_array($GLOBALS['cfg']['Server']['only_db'])) {
             return false;
         }
 
-        $items = array();
+        $items = [];
 
         foreach ($GLOBALS['cfg']['Server']['only_db'] as $each_only_db) {
 
diff --git a/libraries/classes/Menu.php b/libraries/classes/Menu.php
index e68649aead..6d6871345b 100644
--- a/libraries/classes/Menu.php
+++ b/libraries/classes/Menu.php
@@ -107,7 +107,7 @@ class Menu
      */
     private function _getMenu()
     {
-        $url_params = array();
+        $url_params = [];
 
         if (strlen($this->_table) > 0) {
             $tabs = $this->_getTableTabs();
@@ -209,7 +209,7 @@ class Menu
             $retval .= Util::getImage(
                 's_host',
                 '',
-                array('class' => 'item')
+                ['class' => 'item']
             );
         }
         $retval .= sprintf(
@@ -228,7 +228,7 @@ class Menu
                 $retval .= Util::getImage(
                     's_db',
                     '',
-                    array('class' => 'item')
+                    ['class' => 'item']
                 );
             }
             $retval .= sprintf(
@@ -236,7 +236,7 @@ class Menu
                 Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
                 ),
-                Url::getCommon(array('db' => $this->_db)),
+                Url::getCommon(['db' => $this->_db]),
                 htmlspecialchars($this->_db),
                 __('Database')
             );
@@ -262,7 +262,7 @@ class Menu
                     $retval .= Util::getImage(
                         $icon,
                         '',
-                        array('class' => 'item')
+                        ['class' => 'item']
                     );
                 }
                 $retval .= sprintf(
@@ -271,9 +271,9 @@ class Menu
                         $GLOBALS['cfg']['DefaultTabTable'], 'table'
                     ),
                     Url::getCommon(
-                        array(
+                        [
                             'db' => $this->_db, 'table' => $this->_table
-                        )
+                        ]
                     ),
                     str_replace(' ', '&nbsp;', htmlspecialchars($this->_table)),
                     $tbl_is_view ? __('View') : __('Table')
@@ -346,7 +346,7 @@ class Menu
         $isCreateOrGrantUser = $GLOBALS['dbi']->isUserType('grant')
             || $GLOBALS['dbi']->isUserType('create');
 
-        $tabs = array();
+        $tabs = [];
 
         $tabs['browse']['icon'] = 'b_browse';
         $tabs['browse']['text'] = __('Browse');
@@ -358,7 +358,7 @@ class Menu
         $tabs['structure']['text'] = __('Structure');
         $tabs['structure']['active'] = in_array(
             basename($GLOBALS['PMA_PHP_SELF']),
-            array('tbl_structure.php', 'tbl_relation.php')
+            ['tbl_structure.php', 'tbl_relation.php']
         );
 
         $tabs['sql']['icon'] = 'b_sql';
@@ -370,7 +370,7 @@ class Menu
         $tabs['search']['link'] = 'tbl_select.php';
         $tabs['search']['active'] = in_array(
             basename($GLOBALS['PMA_PHP_SELF']),
-            array('tbl_select.php', 'tbl_zoom_select.php', 'tbl_find_replace.php')
+            ['tbl_select.php', 'tbl_zoom_select.php', 'tbl_find_replace.php']
         );
 
         if (! $db_is_system_schema && (! $tbl_is_view || $updatable_view)) {
@@ -459,7 +459,7 @@ class Menu
          */
         $cfgRelation = $this->relation->getRelationsParam();
 
-        $tabs = array();
+        $tabs = [];
 
         $tabs['structure']['link'] = 'db_structure.php';
         $tabs['structure']['text'] = __('Structure');
@@ -571,7 +571,7 @@ class Menu
             Util::cacheSet('binary_logs', $binary_logs);
         }
 
-        $tabs = array();
+        $tabs = [];
 
         $tabs['databases']['icon'] = 's_db';
         $tabs['databases']['link'] = 'server_databases.php';
@@ -586,14 +586,14 @@ class Menu
         $tabs['status']['text'] = __('Status');
         $tabs['status']['active'] = in_array(
             basename($GLOBALS['PMA_PHP_SELF']),
-            array(
+            [
                 'server_status.php',
                 'server_status_advisor.php',
                 'server_status_monitor.php',
                 'server_status_queries.php',
                 'server_status_variables.php',
                 'server_status_processes.php'
-            )
+            ]
         );
 
         if ($is_superuser || $isCreateOrGrantUser) {
@@ -602,7 +602,7 @@ class Menu
             $tabs['rights']['text'] = __('User accounts');
             $tabs['rights']['active'] = in_array(
                 basename($GLOBALS['PMA_PHP_SELF']),
-                array('server_privileges.php', 'server_user_groups.php')
+                ['server_privileges.php', 'server_user_groups.php']
             );
             $tabs['rights']['args']['viewing_mode'] = 'server';
         }
@@ -620,7 +620,7 @@ class Menu
         $tabs['settings']['text']   = __('Settings');
         $tabs['settings']['active'] = in_array(
             basename($GLOBALS['PMA_PHP_SELF']),
-            array('prefs_forms.php', 'prefs_manage.php')
+            ['prefs_forms.php', 'prefs_manage.php']
         );
 
         if (! empty($binary_logs)) {
diff --git a/libraries/classes/Message.php b/libraries/classes/Message.php
index 3f9012ead6..df89d7fafe 100644
--- a/libraries/classes/Message.php
+++ b/libraries/classes/Message.php
@@ -59,11 +59,11 @@ class Message
      *
      * @var array
      */
-    public static $level = array (
+    public static $level =  [
         Message::SUCCESS => 'success',
         Message::NOTICE  => 'notice',
         Message::ERROR   => 'error',
-    );
+    ];
 
     /**
      * The message number
@@ -119,7 +119,7 @@ class Message
      * @access  protected
      * @var     array
      */
-    protected $params = array();
+    protected $params = [];
 
     /**
      * holds additional messages
@@ -127,7 +127,7 @@ class Message
      * @access  protected
      * @var     array
      */
-    protected $addedMessages = array();
+    protected $addedMessages = [];
 
     /**
      * Constructor
@@ -141,7 +141,7 @@ class Message
     public function __construct(
         string $string = '',
         int $number = Message::NOTICE,
-        array $params = array(),
+        array $params = [],
         int $sanitize = Message::SANITIZE_NONE
     ) {
         $this->setString($string, $sanitize & Message::SANITIZE_STRING);
diff --git a/libraries/classes/Navigation/Navigation.php b/libraries/classes/Navigation/Navigation.php
index 2e1fa416e4..f23e28fc5d 100644
--- a/libraries/classes/Navigation/Navigation.php
+++ b/libraries/classes/Navigation/Navigation.php
@@ -193,26 +193,26 @@ class Navigation
             . (! empty($tableName) ? $GLOBALS['dbi']->escapeString($tableName) : '') . "'";
         $result = $this->relation->queryAsControlUser($sqlQuery, false);
 
-        $hidden = array();
+        $hidden = [];
         if ($result) {
             while ($row = $GLOBALS['dbi']->fetchArray($result)) {
                 $type = $row['item_type'];
                 if (! isset($hidden[$type])) {
-                    $hidden[$type] = array();
+                    $hidden[$type] = [];
                 }
                 $hidden[$type][] = $row['item_name'];
             }
         }
         $GLOBALS['dbi']->freeResult($result);
 
-        $typeMap = array(
+        $typeMap = [
             'group' => __('Groups:'),
             'event' => __('Events:'),
             'function' => __('Functions:'),
             'procedure' => __('Procedures:'),
             'table' => __('Tables:'),
             'view' => __('Views:'),
-        );
+        ];
         if (empty($tableName)) {
             $first = true;
             foreach ($typeMap as $t => $lable) {
@@ -223,12 +223,12 @@ class Navigation
                         . '<strong>' . $lable . '</strong>';
                     $html .= '<table width="100%"><tbody>';
                     foreach ($hidden[$t] as $hiddenItem) {
-                        $params = array(
+                        $params = [
                             'unhideNavItem' => true,
                             'itemType' => $t,
                             'itemName' => $hiddenItem,
                             'dbName' => $dbName
-                        );
+                        ];
 
                         $html .= '<tr>';
                         $html .= '<td>' . htmlspecialchars($hiddenItem) . '</td>';
diff --git a/libraries/classes/Navigation/NavigationHeader.php b/libraries/classes/Navigation/NavigationHeader.php
index 8774e0c374..8d0fce331e 100644
--- a/libraries/classes/Navigation/NavigationHeader.php
+++ b/libraries/classes/Navigation/NavigationHeader.php
@@ -34,9 +34,9 @@ class NavigationHeader
             $GLOBALS['url_query'] = Url::getCommon();
         }
         $link_url = Url::getCommon(
-            array(
+            [
                 'ajax_request' => true,
-            )
+            ]
         );
         $class = ' class="list_container';
         if ($GLOBALS['cfg']['NavigationLinkWithMainPanel']) {
@@ -61,10 +61,10 @@ class NavigationHeader
         $buffer .= Util::getImage(
             'ajax_clock_small',
             __('Loading…'),
-            array(
+            [
                 'style' => 'visibility: hidden; display:none',
                 'class' => 'throbber',
-            )
+            ]
         );
         $buffer .= '</div>'; // pma_navigation_header
         $buffer .= '<div id="pma_navigation_tree"' . $class . '>';
@@ -186,7 +186,7 @@ class NavigationHeader
                 '',
                 true,
                 '',
-                array('logout')
+                ['logout']
             );
         }
         $retval .= Util::getNavigationLink(
@@ -218,7 +218,7 @@ class NavigationHeader
             'pma_navigation_settings_icon',
             false,
             '',
-            defined('PMA_DISABLE_NAVI_SETTINGS') ? array('hide') : array()
+            defined('PMA_DISABLE_NAVI_SETTINGS') ? ['hide'] : []
         );
         $retval .= Util::getNavigationLink(
             '#',
diff --git a/libraries/classes/Navigation/NavigationTree.php b/libraries/classes/Navigation/NavigationTree.php
index 6cf4391245..55747736a5 100644
--- a/libraries/classes/Navigation/NavigationTree.php
+++ b/libraries/classes/Navigation/NavigationTree.php
@@ -37,13 +37,13 @@ class NavigationTree
      *            This does not include nodes created after the grouping
      *            of nodes has been performed
      */
-    private $_aPath = array();
+    private $_aPath = [];
     /**
      * @var array The virtual paths to all expanded nodes in the tree
      *            This includes nodes created after the grouping of
      *            nodes has been performed
      */
-    private $_vPath = array();
+    private $_vPath = [];
     /**
      * @var int Position in the list of databases,
      *          used for pagination
@@ -54,23 +54,23 @@ class NavigationTree
      *            the second level of the navigation tree. These may be
      *            tables, views, functions, procedures or events.
      */
-    private $_pos2_name = array();
+    private $_pos2_name = [];
     /**
      * @var array The positions of nodes in the lists of tables, views,
      *            routines or events used for pagination
      */
-    private $_pos2_value = array();
+    private $_pos2_value = [];
     /**
      * @var array The names of the type of items that are being paginated
      *            on the second level of the navigation tree.
      *            These may be columns or indexes
      */
-    private $_pos3_name = array();
+    private $_pos3_name = [];
     /**
      * @var array The positions of nodes in the lists of columns or indexes
      *            used for pagination
      */
-    private $_pos3_value = array();
+    private $_pos3_value = [];
     /**
      * @var string The search clause to use in SQL queries for
      *             fetching databases
@@ -201,7 +201,7 @@ class NavigationTree
             return $retval;
         }
 
-        $prefixMap = array();
+        $prefixMap = [];
         if ($GLOBALS['dbs_to_test'] === false) {
             $handle = $GLOBALS['dbi']->tryQuery("SHOW DATABASES");
             if ($handle !== false) {
@@ -222,7 +222,7 @@ class NavigationTree
                 }
             }
         } else {
-            $databases = array();
+            $databases = [];
             foreach ($GLOBALS['dbs_to_test'] as $db) {
                 $query = "SHOW DATABASES LIKE '" . $db . "'";
                 $handle = $GLOBALS['dbi']->tryQuery($query);
@@ -523,7 +523,7 @@ class NavigationTree
      */
     private function _addTableContainers($table, $pos2, $type3, $pos3)
     {
-        $retval = array();
+        $retval = [];
         if ($table->hasChildren(true) == 0) {
             if ($table->getPresence('columns')) {
                 $retval['columns'] = NodeFactory::getInstance(
@@ -605,7 +605,7 @@ class NavigationTree
             $hidden[] = 'events';
         }
 
-        $retval = array();
+        $retval = [];
         if ($db->hasChildren(true) == 0) {
             if (!in_array('tables', $hidden) && $db->getPresence('tables')) {
                 $retval['tables'] = NodeFactory::getInstance(
@@ -687,7 +687,7 @@ class NavigationTree
             return;
         }
 
-        $separators = array();
+        $separators = [];
         if (is_array($node->separator)) {
             $separators = $node->separator;
         } else {
@@ -695,7 +695,7 @@ class NavigationTree
                 $separators[] = $node->separator;
             }
         }
-        $prefixes = array();
+        $prefixes = [];
         if ($node->separator_depth > 0) {
             foreach ($node->children as $child) {
                 $prefix_pos = false;
@@ -747,7 +747,7 @@ class NavigationTree
         }
         if (count($prefixes)) {
             /** @var Node[] $groups */
-            $groups = array();
+            $groups = [];
             foreach ($prefixes as $key => $value) {
 
                 // warn about large groups
@@ -779,10 +779,10 @@ class NavigationTree
                     || $node instanceof NodeViewContainer
                 ) {
                     $tblGroup = '&amp;tbl_group=' . urlencode($key);
-                    $groups[$key]->links = array(
+                    $groups[$key]->links = [
                         'text' => $node->links['text'] . $tblGroup,
                         'icon' => $node->links['icon'] . $tblGroup,
-                    );
+                    ];
                 }
                 $node->addChild($groups[$key]);
                 foreach ($separators as $separator) {
@@ -862,7 +862,7 @@ class NavigationTree
         $children = $this->_tree->children;
         usort(
             $children,
-            array('PhpMyAdmin\\Navigation\\NavigationTree', 'sortNode')
+            ['PhpMyAdmin\\Navigation\\NavigationTree', 'sortNode']
         );
         $this->_setVisibility();
         for ($i = 0, $nbChildren = count($children); $i < $nbChildren; $i++) {
@@ -905,7 +905,7 @@ class NavigationTree
             $children = $node->children;
             usort(
                 $children,
-                array('PhpMyAdmin\\Navigation\\NavigationTree', 'sortNode')
+                ['PhpMyAdmin\\Navigation\\NavigationTree', 'sortNode']
             );
             for ($i = 0, $nbChildren = count($children); $i < $nbChildren; $i++) {
                 if ($i + 1 != $nbChildren) {
@@ -1047,7 +1047,7 @@ class NavigationTree
                 return '';
             }
             $retval .= '<li class="' . trim($class . ' ' . $node->classes) . '">';
-            $sterile = array(
+            $sterile = [
                 'events',
                 'triggers',
                 'functions',
@@ -1055,7 +1055,7 @@ class NavigationTree
                 'views',
                 'columns',
                 'indexes',
-            );
+            ];
             $parentName = '';
             $parents = $node->parents(false, true);
             if (count($parents)) {
@@ -1113,13 +1113,13 @@ class NavigationTree
             }
 
             $linkClass = '';
-            $haveAjax = array(
+            $haveAjax = [
                 'functions',
                 'procedures',
                 'events',
                 'triggers',
                 'indexes',
-            );
+            ];
             $parent = $node->parents(false, true);
             $isNewView = $parent[0]->real_name == 'views' && $node->isNew === true;
             if ($parent[0]->type == Node::CONTAINER
@@ -1138,8 +1138,8 @@ class NavigationTree
                 $iconLinks = $node->links['icon'];
                 $icons = $node->icon;
                 if (!is_array($iconLinks)) {
-                    $iconLinks = array($iconLinks);
-                    $icons = array($icons);
+                    $iconLinks = [$iconLinks];
+                    $icons = [$icons];
                 }
 
                 if (count($icons) > 1) {
@@ -1150,7 +1150,7 @@ class NavigationTree
             $retval .= "<div class='block " . $divClass . "'>";
 
             if (isset($node->links['icon']) && !empty($node->links['icon'])) {
-                $args = array();
+                $args = [];
                 foreach ($node->parents(true) as $parent) {
                     $args[] = urlencode($parent->real_name);
                 }
@@ -1170,7 +1170,7 @@ class NavigationTree
             $retval .= "</div>";
 
             if (isset($node->links['text'])) {
-                $args = array();
+                $args = [];
                 foreach ($node->parents(true) as $parent) {;
                     $args[] = urlencode($parent->real_name);
                 }
@@ -1209,7 +1209,7 @@ class NavigationTree
             $children = $node->children;
             usort(
                 $children,
-                array('PhpMyAdmin\\Navigation\\NavigationTree', 'sortNode')
+                ['PhpMyAdmin\\Navigation\\NavigationTree', 'sortNode']
             );
             $buffer = '';
             $extra_class = '';
@@ -1257,17 +1257,17 @@ class NavigationTree
         $retval .= Util::getListNavigator(
             $this->_tree->getPresence('databases', ''),
             $this->_pos,
-            array('server' => $GLOBALS['server']),
+            ['server' => $GLOBALS['server']],
             'navigation.php',
             'frame_navigation',
             $GLOBALS['cfg']['FirstLevelNavigationItems'],
             'pos',
-            array('dbselector')
+            ['dbselector']
         );
         $children = $this->_tree->children;
-        $url_params = array(
+        $url_params = [
             'server' => $GLOBALS['server'],
-        );
+        ];
         $retval .= '<div id="pma_navigation_db_select">';
         $retval .= '<form action="index.php">';
         $retval .= Url::getHiddenFields($url_params);
@@ -1301,7 +1301,7 @@ class NavigationTree
         $children = $this->_tree->children;
         usort(
             $children,
-            array('PhpMyAdmin\\Navigation\\NavigationTree', 'sortNode')
+            ['PhpMyAdmin\\Navigation\\NavigationTree', 'sortNode']
         );
         $this->_setVisibility();
         for ($i = 0, $nbChildren = count($children); $i < $nbChildren; $i++) {
@@ -1356,9 +1356,9 @@ class NavigationTree
         if ($node === $this->_tree
             && $this->_tree->getPresence() >= $filter_db_min
         ) {
-            $url_params = array(
+            $url_params = [
                 'pos' => 0,
-            );
+            ];
             $retval .= '<li class="fast_filter db_fast_filter">';
             $retval .= '<form class="ajax fast_filter">';
             $retval .= Url::getHiddenInputs($url_params);
@@ -1384,13 +1384,13 @@ class NavigationTree
             && $node->realParent()->getPresence($node->real_name) >= $filter_item_min
         ) {
             $paths = $node->getPaths();
-            $url_params = array(
+            $url_params = [
                 'pos'        => $this->_pos,
                 'aPath'      => $paths['aPath'],
                 'vPath'      => $paths['vPath'],
                 'pos2_name'  => $node->real_name,
                 'pos2_value' => 0,
-            );
+            ];
             $retval .= "<li class='fast_filter'>";
             $retval .= "<form class='ajax fast_filter'>";
             $retval .= Url::getHiddenFields($url_params);
@@ -1465,25 +1465,25 @@ class NavigationTree
             $retval .= Util::getListNavigator(
                 $this->_tree->getPresence('databases', $this->_searchClause),
                 $this->_pos,
-                array('server' => $GLOBALS['server']),
+                ['server' => $GLOBALS['server']],
                 'navigation.php',
                 'frame_navigation',
                 $GLOBALS['cfg']['FirstLevelNavigationItems'],
                 'pos',
-                array('dbselector')
+                ['dbselector']
             );
         } else {
             if ($node->type == Node::CONTAINER && !$node->is_group) {
                 $paths = $node->getPaths();
 
                 $level = isset($paths['aPath_clean'][4]) ? 3 : 2;
-                $_url_params = array(
+                $_url_params = [
                     'aPath'     => $paths['aPath'],
                     'vPath'     => $paths['vPath'],
                     'pos'       => $this->_pos,
                     'server'    => $GLOBALS['server'],
                     'pos2_name' => $paths['aPath_clean'][2],
-                );
+                ];
                 if ($level == 3) {
                     $pos = $node->pos3;
                     $_url_params['pos2_value'] = $node->pos2;
diff --git a/libraries/classes/Navigation/Nodes/Node.php b/libraries/classes/Navigation/Nodes/Node.php
index 3af31ae884..b3e651261b 100644
--- a/libraries/classes/Navigation/Nodes/Node.php
+++ b/libraries/classes/Navigation/Nodes/Node.php
@@ -61,7 +61,7 @@ class Node
      * @var Node[] An array of Node objects that are
      *             direct children of this node
      */
-    public $children = array();
+    public $children = [];
     /**
      * @var Mixed A string used to group nodes, or an array of strings
      *            Only relevant if the node is of type CONTAINER
@@ -200,7 +200,7 @@ class Node
      */
     public function parents($self = false, $containers = false, $groups = false)
     {
-        $parents = array();
+        $parents = [];
         if ($self
             && ($this->type != Node::CONTAINER || $containers)
             && (!$this->is_group || $groups)
@@ -323,8 +323,8 @@ class Node
      */
     public function getPaths()
     {
-        $aPath = array();
-        $aPath_clean = array();
+        $aPath = [];
+        $aPath_clean = [];
         foreach ($this->parents(true, true, false) as $parent) {
             $aPath[] = base64_encode($parent->real_name);
             $aPath_clean[] = $parent->real_name;
@@ -332,8 +332,8 @@ class Node
         $aPath = implode('.', array_reverse($aPath));
         $aPath_clean = array_reverse($aPath_clean);
 
-        $vPath = array();
-        $vPath_clean = array();
+        $vPath = [];
+        $vPath_clean = [];
         foreach ($this->parents(true, true, true) as $parent) {
             $vPath[] = base64_encode($parent->name);
             $vPath_clean[] = $parent->name;
@@ -341,12 +341,12 @@ class Node
         $vPath = implode('.', array_reverse($vPath));
         $vPath_clean = array_reverse($vPath_clean);
 
-        return array(
+        return [
             'aPath'       => $aPath,
             'aPath_clean' => $aPath_clean,
             'vPath'       => $vPath,
             'vPath_clean' => $vPath_clean,
-        );
+        ];
     }
 
     /**
@@ -380,7 +380,7 @@ class Node
             }
 
             if ($GLOBALS['dbs_to_test'] === false) {
-                $retval = array();
+                $retval = [];
                 $query = "SHOW DATABASES ";
                 $query .= $this->_getWhereClause('Database', $searchClause);
                 $handle = $GLOBALS['dbi']->tryQuery($query);
@@ -405,7 +405,7 @@ class Node
                 return $retval;
             }
 
-            $retval = array();
+            $retval = [];
             $count = 0;
             foreach ($this->_getDatabasesToSearch($searchClause) as $db) {
                 $query = "SHOW DATABASES LIKE '" . $db . "'";
@@ -467,9 +467,9 @@ class Node
             $query = "SHOW DATABASES ";
             $query .= $this->_getWhereClause('Database', $searchClause);
             $handle = $GLOBALS['dbi']->tryQuery($query);
-            $prefixes = array();
+            $prefixes = [];
             if ($handle !== false) {
-                $prefixMap = array();
+                $prefixMap = [];
                 $total = $pos + $maxItems;
                 while ($arr = $GLOBALS['dbi']->fetchArray($handle)) {
                     $prefix = strstr($arr[0], $dbSeparator, true);
@@ -487,7 +487,7 @@ class Node
             $query = "SHOW DATABASES ";
             $query .= $this->_getWhereClause('Database', $searchClause);
             $query .= "AND (";
-            $subClauses = array();
+            $subClauses = [];
             foreach ($prefixes as $prefix) {
                 $subClauses[] = " LOCATE('"
                     . $GLOBALS['dbi']->escapeString($prefix) . $dbSeparator
@@ -500,8 +500,8 @@ class Node
             return $retval;
         }
 
-        $retval = array();
-        $prefixMap = array();
+        $retval = [];
+        $prefixMap = [];
         $total = $pos + $maxItems;
         foreach ($this->_getDatabasesToSearch($searchClause) as $db) {
             $query = "SHOW DATABASES LIKE '" . $db . "'";
@@ -621,7 +621,7 @@ class Node
         }
 
         if ($GLOBALS['dbs_to_test'] !== false) {
-            $prefixMap = array();
+            $prefixMap = [];
             foreach ($this->_getDatabasesToSearch($searchClause) as $db) {
                 $query = "SHOW DATABASES LIKE '" . $db . "'";
                 $handle = $GLOBALS['dbi']->tryQuery($query);
@@ -645,7 +645,7 @@ class Node
             return $retval;
         }
 
-        $prefixMap = array();
+        $prefixMap = [];
         $query = "SHOW DATABASES ";
         $query .= $this->_getWhereClause('Database', $searchClause);
         $handle = $GLOBALS['dbi']->tryQuery($query);
@@ -689,9 +689,9 @@ class Node
     private function _getDatabasesToSearch($searchClause)
     {
         if (!empty($searchClause)) {
-            $databases = array(
+            $databases = [
                 "%" . $GLOBALS['dbi']->escapeString($searchClause) . "%",
-            );
+            ];
         } elseif (!empty($GLOBALS['cfg']['Server']['only_db'])) {
             $databases = $GLOBALS['cfg']['Server']['only_db'];
         } elseif (!empty($GLOBALS['dbs_to_test'])) {
@@ -730,12 +730,12 @@ class Node
 
         if (!empty($GLOBALS['cfg']['Server']['only_db'])) {
             if (is_string($GLOBALS['cfg']['Server']['only_db'])) {
-                $GLOBALS['cfg']['Server']['only_db'] = array(
+                $GLOBALS['cfg']['Server']['only_db'] = [
                     $GLOBALS['cfg']['Server']['only_db'],
-                );
+                ];
             }
             $whereClause .= "AND (";
-            $subClauses = array();
+            $subClauses = [];
             foreach ($GLOBALS['cfg']['Server']['only_db'] as $each_only_db) {
                 $subClauses[] = " " . Util::backquote($columnName)
                     . " LIKE '"
@@ -771,7 +771,7 @@ class Node
             return '';
         }
 
-        $result = array('expander');
+        $result = ['expander'];
 
         if ($this->is_group || $match) {
             $result[] = 'loaded';
diff --git a/libraries/classes/Navigation/Nodes/NodeColumn.php b/libraries/classes/Navigation/Nodes/NodeColumn.php
index 50f041cce0..de43962626 100644
--- a/libraries/classes/Navigation/Nodes/NodeColumn.php
+++ b/libraries/classes/Navigation/Nodes/NodeColumn.php
@@ -30,7 +30,7 @@ class NodeColumn extends Node
     {
         parent::__construct($name, $type, $is_group);
         $this->icon = Util::getImage('pause', __('Column'));
-        $this->links = array(
+        $this->links = [
             'text'  => 'tbl_structure.php?server=' . $GLOBALS['server']
                 . '&amp;db=%3$s&amp;table=%2$s&amp;field=%1$s'
                 . '&amp;change_column=1',
@@ -38,6 +38,6 @@ class NodeColumn extends Node
                 . '&amp;db=%3$s&amp;table=%2$s&amp;field=%1$s'
                 . '&amp;change_column=1',
             'title' => __('Structure'),
-        );
+        ];
     }
 }
diff --git a/libraries/classes/Navigation/Nodes/NodeColumnContainer.php b/libraries/classes/Navigation/Nodes/NodeColumnContainer.php
index 009f33fc67..d4308bb9d5 100644
--- a/libraries/classes/Navigation/Nodes/NodeColumnContainer.php
+++ b/libraries/classes/Navigation/Nodes/NodeColumnContainer.php
@@ -26,12 +26,12 @@ class NodeColumnContainer extends Node
     {
         parent::__construct(__('Columns'), Node::CONTAINER);
         $this->icon = Util::getImage('pause', __('Columns'));
-        $this->links = array(
+        $this->links = [
             'text' => 'tbl_structure.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&amp;table=%1$s',
             'icon' => 'tbl_structure.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&amp;table=%1$s',
-        );
+        ];
         $this->real_name = 'columns';
 
         $new_label = _pgettext('Create new column', 'New');
@@ -41,14 +41,14 @@ class NodeColumnContainer extends Node
         );
         $new->isNew = true;
         $new->icon = Util::getImage('b_column_add', $new_label);
-        $new->links = array(
+        $new->links = [
             'text' => 'tbl_addfield.php?server=' . $GLOBALS['server']
                 . '&amp;db=%3$s&amp;table=%2$s'
                 . '&amp;field_where=last&after_field=',
             'icon' => 'tbl_addfield.php?server=' . $GLOBALS['server']
                 . '&amp;db=%3$s&amp;table=%2$s'
                 . '&amp;field_where=last&after_field=',
-        );
+        ];
         $new->classes = 'new_column italics';
         $this->addChild($new);
     }
diff --git a/libraries/classes/Navigation/Nodes/NodeDatabase.php b/libraries/classes/Navigation/Nodes/NodeDatabase.php
index ae97ba308e..9e70004682 100644
--- a/libraries/classes/Navigation/Nodes/NodeDatabase.php
+++ b/libraries/classes/Navigation/Nodes/NodeDatabase.php
@@ -47,14 +47,14 @@ class NodeDatabase extends Node
             $GLOBALS['cfg']['DefaultTabDatabase'],
             'database'
         );
-        $this->links = array(
+        $this->links = [
             'text'  => $script_name
                 . '?server=' . $GLOBALS['server']
                 . '&amp;db=%1$s',
             'icon'  => 'db_operations.php?server=' . $GLOBALS['server']
                 . '&amp;db=%1$s&amp;',
             'title' => __('Structure'),
-        );
+        ];
         $this->classes = 'database';
     }
 
@@ -367,7 +367,7 @@ class NodeDatabase extends Node
      */
     public function getData($type, $pos, $searchClause = '')
     {
-        $retval = array();
+        $retval = [];
         switch ($type) {
         case 'tables':
             $retval = $this->_getTables($pos, $searchClause);
@@ -415,7 +415,7 @@ class NodeDatabase extends Node
         $db = $this->real_name;
         $cfgRelation = $this->relation->getRelationsParam();
         if (empty($cfgRelation['navigationhiding'])) {
-            return array();
+            return [];
         }
         $navTable = Util::backquote($cfgRelation['db'])
             . "." . Util::backquote($cfgRelation['navigationhiding']);
@@ -425,7 +425,7 @@ class NodeDatabase extends Node
             . "'" . " AND `db_name`='" . $GLOBALS['dbi']->escapeString($db)
             . "'";
         $result = $this->relation->queryAsControlUser($sqlQuery, false);
-        $hiddenItems = array();
+        $hiddenItems = [];
         if ($result) {
             while ($row = $GLOBALS['dbi']->fetchArray($result)) {
                 $hiddenItems[] = $row[0];
@@ -453,7 +453,7 @@ class NodeDatabase extends Node
             $condition = '!=';
         }
         $maxItems = $GLOBALS['cfg']['MaxNavigationItems'];
-        $retval   = array();
+        $retval   = [];
         $db       = $this->real_name;
         if (! $GLOBALS['cfg']['Server']['DisableIS']) {
             $escdDb = $GLOBALS['dbi']->escapeString($db);
@@ -539,7 +539,7 @@ class NodeDatabase extends Node
     private function _getRoutines($routineType, $pos, $searchClause)
     {
         $maxItems = $GLOBALS['cfg']['MaxNavigationItems'];
-        $retval = array();
+        $retval = [];
         $db = $this->real_name;
         if (!$GLOBALS['cfg']['Server']['DisableIS']) {
             $escdDb = $GLOBALS['dbi']->escapeString($db);
@@ -620,7 +620,7 @@ class NodeDatabase extends Node
     private function _getEvents($pos, $searchClause)
     {
         $maxItems = $GLOBALS['cfg']['MaxNavigationItems'];
-        $retval = array();
+        $retval = [];
         $db = $this->real_name;
         if (!$GLOBALS['cfg']['Server']['DisableIS']) {
             $escdDb = $GLOBALS['dbi']->escapeString($db);
@@ -674,10 +674,10 @@ class NodeDatabase extends Node
         $cfgRelation = $this->relation->getRelationsParam();
         if ($cfgRelation['navwork']) {
             if ($this->hiddenCount > 0) {
-                $params = array(
+                $params = [
                     'showUnhideDialog' => true,
                     'dbName' => $this->real_name,
-                );
+                ];
                 $ret = '<span class="dbItemControls">'
                     . '<a href="navigation.php'
                     . Url::getCommon($params) . '"'
diff --git a/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php b/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php
index 3ce3851347..f74ac3b09c 100644
--- a/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php
+++ b/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php
@@ -42,12 +42,12 @@ abstract class NodeDatabaseChild extends Node
             $db = $this->realParent()->real_name;
             $item = $this->real_name;
 
-            $params = array(
+            $params = [
                 'hideNavItem' => true,
                 'itemType' => $this->getItemType(),
                 'itemName' => $item,
                 'dbName' => $db
-            );
+            ];
 
             $ret = '<span class="navItemControls">'
                 . '<a href="navigation.php'
diff --git a/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php b/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php
index ec7996127f..ffca035a77 100644
--- a/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php
+++ b/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php
@@ -39,10 +39,10 @@ class NodeDatabaseContainer extends Node
             );
             $new->isNew = true;
             $new->icon = Util::getImage('b_newdb', '');
-            $new->links = array(
+            $new->links = [
                 'text' => 'server_databases.php?server=' . $GLOBALS['server'],
                 'icon' => 'server_databases.php?server=' . $GLOBALS['server'],
-            );
+            ];
             $new->classes = 'new_database italics';
             $this->addChild($new);
         }
diff --git a/libraries/classes/Navigation/Nodes/NodeEvent.php b/libraries/classes/Navigation/Nodes/NodeEvent.php
index 936018b783..12cf3f799d 100644
--- a/libraries/classes/Navigation/Nodes/NodeEvent.php
+++ b/libraries/classes/Navigation/Nodes/NodeEvent.php
@@ -30,12 +30,12 @@ class NodeEvent extends NodeDatabaseChild
     {
         parent::__construct($name, $type, $is_group);
         $this->icon = Util::getImage('b_events');
-        $this->links = array(
+        $this->links = [
             'text' => 'db_events.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&amp;item_name=%1$s&amp;edit_item=1',
             'icon' => 'db_events.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&amp;item_name=%1$s&amp;export_item=1',
-        );
+        ];
         $this->classes = 'event';
     }
 
diff --git a/libraries/classes/Navigation/Nodes/NodeEventContainer.php b/libraries/classes/Navigation/Nodes/NodeEventContainer.php
index 6b33c8eb40..c6996cdb0d 100644
--- a/libraries/classes/Navigation/Nodes/NodeEventContainer.php
+++ b/libraries/classes/Navigation/Nodes/NodeEventContainer.php
@@ -26,12 +26,12 @@ class NodeEventContainer extends NodeDatabaseChildContainer
     {
         parent::__construct(__('Events'), Node::CONTAINER);
         $this->icon = Util::getImage('b_events', '');
-        $this->links = array(
+        $this->links = [
             'text' => 'db_events.php?server=' . $GLOBALS['server']
                 . '&amp;db=%1$s',
             'icon' => 'db_events.php?server=' . $GLOBALS['server']
                 . '&amp;db=%1$s',
-        );
+        ];
         $this->real_name = 'events';
 
         $new = NodeFactory::getInstance(
@@ -40,12 +40,12 @@ class NodeEventContainer extends NodeDatabaseChildContainer
         );
         $new->isNew = true;
         $new->icon = Util::getImage('b_event_add', '');
-        $new->links = array(
+        $new->links = [
             'text' => 'db_events.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&add_item=1',
             'icon' => 'db_events.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&add_item=1',
-        );
+        ];
         $new->classes = 'new_event italics';
         $this->addChild($new);
     }
diff --git a/libraries/classes/Navigation/Nodes/NodeFunction.php b/libraries/classes/Navigation/Nodes/NodeFunction.php
index c685d11cce..364a5ea1e9 100644
--- a/libraries/classes/Navigation/Nodes/NodeFunction.php
+++ b/libraries/classes/Navigation/Nodes/NodeFunction.php
@@ -30,14 +30,14 @@ class NodeFunction extends NodeDatabaseChild
     {
         parent::__construct($name, $type, $is_group);
         $this->icon = Util::getImage('b_routines', __('Function'));
-        $this->links = array(
+        $this->links = [
             'text' => 'db_routines.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&amp;item_name=%1$s&amp;item_type=FUNCTION'
                 . '&amp;edit_item=1',
             'icon' => 'db_routines.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&amp;item_name=%1$s&amp;item_type=FUNCTION'
                 . '&amp;execute_dialog=1',
-        );
+        ];
         $this->classes = 'function';
     }
 
diff --git a/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php b/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php
index 27de00003f..fa252e4d3f 100644
--- a/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php
+++ b/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php
@@ -26,12 +26,12 @@ class NodeFunctionContainer extends NodeDatabaseChildContainer
     {
         parent::__construct(__('Functions'), Node::CONTAINER);
         $this->icon = Util::getImage('b_routines', __('Functions'));
-        $this->links = array(
+        $this->links = [
             'text' => 'db_routines.php?server=' . $GLOBALS['server']
                 . '&amp;db=%1$s&amp;type=FUNCTION',
             'icon' => 'db_routines.php?server=' . $GLOBALS['server']
                 . '&amp;db=%1$s&amp;type=FUNCTION',
-        );
+        ];
         $this->real_name = 'functions';
 
         $new_label = _pgettext('Create new function', 'New');
@@ -41,12 +41,12 @@ class NodeFunctionContainer extends NodeDatabaseChildContainer
         );
         $new->isNew = true;
         $new->icon = Util::getImage('b_routine_add', $new_label);
-        $new->links = array(
+        $new->links = [
             'text' => 'db_routines.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&add_item=1&amp;item_type=FUNCTION',
             'icon' => 'db_routines.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&add_item=1&amp;item_type=FUNCTION',
-        );
+        ];
         $new->classes = 'new_function italics';
         $this->addChild($new);
     }
diff --git a/libraries/classes/Navigation/Nodes/NodeIndex.php b/libraries/classes/Navigation/Nodes/NodeIndex.php
index e50100b6a9..efd3246e1b 100644
--- a/libraries/classes/Navigation/Nodes/NodeIndex.php
+++ b/libraries/classes/Navigation/Nodes/NodeIndex.php
@@ -30,12 +30,12 @@ class NodeIndex extends Node
     {
         parent::__construct($name, $type, $is_group);
         $this->icon = Util::getImage('b_index', __('Index'));
-        $this->links = array(
+        $this->links = [
             'text' => 'tbl_indexes.php?server=' . $GLOBALS['server']
                 . '&amp;db=%3$s&amp;table=%2$s&amp;index=%1$s',
             'icon' => 'tbl_indexes.php?server=' . $GLOBALS['server']
                 . '&amp;db=%3$s&amp;table=%2$s&amp;index=%1$s',
-        );
+        ];
         $this->classes = 'index';
     }
 }
diff --git a/libraries/classes/Navigation/Nodes/NodeIndexContainer.php b/libraries/classes/Navigation/Nodes/NodeIndexContainer.php
index acd825f5fe..8e3b203ca1 100644
--- a/libraries/classes/Navigation/Nodes/NodeIndexContainer.php
+++ b/libraries/classes/Navigation/Nodes/NodeIndexContainer.php
@@ -26,12 +26,12 @@ class NodeIndexContainer extends Node
     {
         parent::__construct(__('Indexes'), Node::CONTAINER);
         $this->icon = Util::getImage('b_index', __('Indexes'));
-        $this->links = array(
+        $this->links = [
             'text' => 'tbl_structure.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&amp;table=%1$s',
             'icon' => 'tbl_structure.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&amp;table=%1$s',
-        );
+        ];
         $this->real_name = 'indexes';
 
         $new_label = _pgettext('Create new index', 'New');
@@ -41,14 +41,14 @@ class NodeIndexContainer extends Node
         );
         $new->isNew = true;
         $new->icon = Util::getImage('b_index_add', $new_label);
-        $new->links = array(
+        $new->links = [
             'text' => 'tbl_indexes.php?server=' . $GLOBALS['server']
                 . '&amp;create_index=1&amp;added_fields=2'
                 . '&amp;db=%3$s&amp;table=%2$s',
             'icon' => 'tbl_indexes.php?server=' . $GLOBALS['server']
                 . '&amp;create_index=1&amp;added_fields=2'
                 . '&amp;db=%3$s&amp;table=%2$s',
-        );
+        ];
         $new->classes = 'new_index italics';
         $this->addChild($new);
     }
diff --git a/libraries/classes/Navigation/Nodes/NodeProcedure.php b/libraries/classes/Navigation/Nodes/NodeProcedure.php
index 5b2d0abfa8..dd2463e13c 100644
--- a/libraries/classes/Navigation/Nodes/NodeProcedure.php
+++ b/libraries/classes/Navigation/Nodes/NodeProcedure.php
@@ -30,14 +30,14 @@ class NodeProcedure extends NodeDatabaseChild
     {
         parent::__construct($name, $type, $is_group);
         $this->icon = Util::getImage('b_routines', __('Procedure'));
-        $this->links = array(
+        $this->links = [
             'text' => 'db_routines.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&amp;item_name=%1$s&amp;item_type=PROCEDURE'
                 . '&amp;edit_item=1',
             'icon' => 'db_routines.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&amp;item_name=%1$s&amp;item_type=PROCEDURE'
                 . '&amp;execute_dialog=1',
-        );
+        ];
         $this->classes = 'procedure';
     }
 
diff --git a/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php b/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php
index 22ed502f48..82df38da98 100644
--- a/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php
+++ b/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php
@@ -26,12 +26,12 @@ class NodeProcedureContainer extends NodeDatabaseChildContainer
     {
         parent::__construct(__('Procedures'), Node::CONTAINER);
         $this->icon = Util::getImage('b_routines', __('Procedures'));
-        $this->links = array(
+        $this->links = [
             'text' => 'db_routines.php?server=' . $GLOBALS['server']
                 . '&amp;db=%1$s&amp;type=PROCEDURE',
             'icon' => 'db_routines.php?server=' . $GLOBALS['server']
                 . '&amp;db=%1$s&amp;type=PROCEDURE',
-        );
+        ];
         $this->real_name = 'procedures';
 
         $new_label = _pgettext('Create new procedure', 'New');
@@ -41,12 +41,12 @@ class NodeProcedureContainer extends NodeDatabaseChildContainer
         );
         $new->isNew = true;
         $new->icon = Util::getImage('b_routine_add', $new_label);
-        $new->links = array(
+        $new->links = [
             'text' => 'db_routines.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&add_item=1',
             'icon' => 'db_routines.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&add_item=1',
-        );
+        ];
         $new->classes = 'new_procedure italics';
         $this->addChild($new);
     }
diff --git a/libraries/classes/Navigation/Nodes/NodeTable.php b/libraries/classes/Navigation/Nodes/NodeTable.php
index 69bdddfa1f..99f8efcaac 100644
--- a/libraries/classes/Navigation/Nodes/NodeTable.php
+++ b/libraries/classes/Navigation/Nodes/NodeTable.php
@@ -29,7 +29,7 @@ class NodeTable extends NodeDatabaseChild
     public function __construct($name, $type = Node::OBJECT, $is_group = false)
     {
         parent::__construct($name, $type, $is_group);
-        $this->icon = array();
+        $this->icon = [];
         $this->_addIcon(
             Util::getScriptNameForOption(
                 $GLOBALS['cfg']['NavigationTreeDefaultTabTable'],
@@ -51,12 +51,12 @@ class NodeTable extends NodeDatabaseChild
             $GLOBALS['cfg']['DefaultTabTable'],
             'table'
         );
-        $this->links = array(
+        $this->links = [
             'text'  => $script_name
                 . '?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&amp;table=%1$s'
                 . '&amp;pos=0',
-            'icon'  => array(
+            'icon'  => [
                 Util::getScriptNameForOption(
                     $GLOBALS['cfg']['NavigationTreeDefaultTabTable'],
                     'table'
@@ -69,9 +69,9 @@ class NodeTable extends NodeDatabaseChild
                 )
                 . '?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&amp;table=%1$s',
-            ),
+            ],
             'title' => $this->title,
-        );
+        ];
         $this->classes = 'table';
     }
 
@@ -160,7 +160,7 @@ class NodeTable extends NodeDatabaseChild
     public function getData($type, $pos, $searchClause = '')
     {
         $maxItems = $GLOBALS['cfg']['MaxNavigationItems'];
-        $retval = array();
+        $retval = [];
         $db = $this->realParent()->real_name;
         $table = $this->real_name;
         switch ($type) {
diff --git a/libraries/classes/Navigation/Nodes/NodeTableContainer.php b/libraries/classes/Navigation/Nodes/NodeTableContainer.php
index 7e23ebc95b..5aedd77f80 100644
--- a/libraries/classes/Navigation/Nodes/NodeTableContainer.php
+++ b/libraries/classes/Navigation/Nodes/NodeTableContainer.php
@@ -26,12 +26,12 @@ class NodeTableContainer extends NodeDatabaseChildContainer
     {
         parent::__construct(__('Tables'), Node::CONTAINER);
         $this->icon = Util::getImage('b_browse', __('Tables'));
-        $this->links = array(
+        $this->links = [
             'text' => 'db_structure.php?server=' . $GLOBALS['server']
                 . '&amp;db=%1$s&amp;tbl_type=table',
             'icon' => 'db_structure.php?server=' . $GLOBALS['server']
                 . '&amp;db=%1$s&amp;tbl_type=table',
-        );
+        ];
         $this->real_name = 'tables';
         $this->classes = 'tableContainer subContainer';
 
@@ -42,12 +42,12 @@ class NodeTableContainer extends NodeDatabaseChildContainer
         );
         $new->isNew = true;
         $new->icon = Util::getImage('b_table_add', $new_label);
-        $new->links = array(
+        $new->links = [
             'text' => 'tbl_create.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s',
             'icon' => 'tbl_create.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s',
-        );
+        ];
         $new->classes = 'new_table italics';
         $this->addChild($new);
     }
diff --git a/libraries/classes/Navigation/Nodes/NodeTrigger.php b/libraries/classes/Navigation/Nodes/NodeTrigger.php
index 8ac1610c42..d442c3f61f 100644
--- a/libraries/classes/Navigation/Nodes/NodeTrigger.php
+++ b/libraries/classes/Navigation/Nodes/NodeTrigger.php
@@ -30,12 +30,12 @@ class NodeTrigger extends Node
     {
         parent::__construct($name, $type, $is_group);
         $this->icon = Util::getImage('b_triggers');
-        $this->links = array(
+        $this->links = [
             'text' => 'db_triggers.php?server=' . $GLOBALS['server']
                 . '&amp;db=%3$s&amp;item_name=%1$s&amp;edit_item=1',
             'icon' => 'db_triggers.php?server=' . $GLOBALS['server']
                 . '&amp;db=%3$s&amp;item_name=%1$s&amp;export_item=1',
-        );
+        ];
         $this->classes = 'trigger';
     }
 }
diff --git a/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php b/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php
index e92fb4799b..fb5f9cc700 100644
--- a/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php
+++ b/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php
@@ -26,12 +26,12 @@ class NodeTriggerContainer extends Node
     {
         parent::__construct(__('Triggers'), Node::CONTAINER);
         $this->icon = Util::getImage('b_triggers');
-        $this->links = array(
+        $this->links = [
             'text' => 'db_triggers.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&amp;table=%1$s',
             'icon' => 'db_triggers.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&amp;table=%1$s',
-        );
+        ];
         $this->real_name = 'triggers';
 
         $new = NodeFactory::getInstance(
@@ -40,12 +40,12 @@ class NodeTriggerContainer extends Node
         );
         $new->isNew = true;
         $new->icon = Util::getImage('b_trigger_add', '');
-        $new->links = array(
+        $new->links = [
             'text' => 'db_triggers.php?server=' . $GLOBALS['server']
                 . '&amp;db=%3$s&amp;add_item=1',
             'icon' => 'db_triggers.php?server=' . $GLOBALS['server']
                 . '&amp;db=%3$s&amp;add_item=1',
-        );
+        ];
         $new->classes = 'new_trigger italics';
         $this->addChild($new);
     }
diff --git a/libraries/classes/Navigation/Nodes/NodeView.php b/libraries/classes/Navigation/Nodes/NodeView.php
index 94c70da7dd..2189792fae 100644
--- a/libraries/classes/Navigation/Nodes/NodeView.php
+++ b/libraries/classes/Navigation/Nodes/NodeView.php
@@ -30,12 +30,12 @@ class NodeView extends NodeDatabaseChild
     {
         parent::__construct($name, $type, $is_group);
         $this->icon = Util::getImage('b_props', __('View'));
-        $this->links = array(
+        $this->links = [
             'text' => 'sql.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&amp;table=%1$s&amp;pos=0',
             'icon' => 'tbl_structure.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s&amp;table=%1$s',
-        );
+        ];
         $this->classes = 'view';
     }
 
diff --git a/libraries/classes/Navigation/Nodes/NodeViewContainer.php b/libraries/classes/Navigation/Nodes/NodeViewContainer.php
index 4047ddfa20..85dca45b14 100644
--- a/libraries/classes/Navigation/Nodes/NodeViewContainer.php
+++ b/libraries/classes/Navigation/Nodes/NodeViewContainer.php
@@ -26,12 +26,12 @@ class NodeViewContainer extends NodeDatabaseChildContainer
     {
         parent::__construct(__('Views'), Node::CONTAINER);
         $this->icon = Util::getImage('b_views', __('Views'));
-        $this->links = array(
+        $this->links = [
             'text' => 'db_structure.php?server=' . $GLOBALS['server']
                 . '&amp;db=%1$s&amp;tbl_type=view',
             'icon' => 'db_structure.php?server=' . $GLOBALS['server']
                 . '&amp;db=%1$s&amp;tbl_type=view',
-        );
+        ];
         $this->classes = 'viewContainer subContainer';
         $this->real_name = 'views';
 
@@ -42,12 +42,12 @@ class NodeViewContainer extends NodeDatabaseChildContainer
         );
         $new->isNew = true;
         $new->icon = Util::getImage('b_view_add', $new_label);
-        $new->links = array(
+        $new->links = [
             'text' => 'view_create.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s',
             'icon' => 'view_create.php?server=' . $GLOBALS['server']
                 . '&amp;db=%2$s',
-        );
+        ];
         $new->classes = 'new_view italics';
         $this->addChild($new);
     }
diff --git a/libraries/classes/OpenDocument.php b/libraries/classes/OpenDocument.php
index ca867beee7..c021a0b618 100644
--- a/libraries/classes/OpenDocument.php
+++ b/libraries/classes/OpenDocument.php
@@ -40,7 +40,7 @@ EOT;
      */
     public static function create($mime, $data)
     {
-        $data = array(
+        $data = [
             $mime,
             $data,
             '<?xml version="1.0" encoding="UTF-8"?' . '>'
@@ -163,15 +163,15 @@ EOT;
             . '<manifest:file-entry manifest:media-type="text/xml"'
             . ' manifest:full-path="styles.xml"/>'
             . '</manifest:manifest>'
-        );
+        ];
 
-        $name = array(
+        $name = [
             'mimetype',
             'content.xml',
             'meta.xml',
             'styles.xml',
             'META-INF/manifest.xml'
-        );
+        ];
 
         $zipExtension = new ZipExtension();
         return $zipExtension->createFile($data, $name);
diff --git a/libraries/classes/Operations.php b/libraries/classes/Operations.php
index 20e705908c..c4914c5488 100644
--- a/libraries/classes/Operations.php
+++ b/libraries/classes/Operations.php
@@ -149,7 +149,7 @@ class Operations
     public function getHtmlForDropDatabaseLink($db)
     {
         $this_sql_query = 'DROP DATABASE ' . Util::backquote($db);
-        $this_url_params = array(
+        $this_url_params = [
             'sql_query' => $this_sql_query,
             'back' => 'db_operations.php',
             'goto' => 'index.php',
@@ -160,7 +160,7 @@ class Operations
                 htmlspecialchars(Util::backquote($db))
             ),
             'db' => null,
-        );
+        ];
 
         $html_output = '<div>'
             . '<fieldset class="caution">';
@@ -193,11 +193,11 @@ class Operations
     public function getHtmlForCopyDatabase($db)
     {
         $drop_clause = 'DROP TABLE / DROP VIEW';
-        $choices = array(
+        $choices = [
             'structure' => __('Structure only'),
             'data'      => __('Structure and data'),
             'dataonly'  => __('Data only')
-        );
+        ];
 
         $pma_switch_to_new = isset($_SESSION['pma_switch_to_new']) && $_SESSION['pma_switch_to_new'];
 
@@ -422,7 +422,7 @@ class Operations
     public function getViewsAndCreateSqlViewStandIn(
         array $tables_full, $export_sql_plugin, $db
     ) {
-        $views = array();
+        $views = [];
         foreach ($tables_full as $each_table => $tmp) {
             // to be able to rename a db containing views,
             // first all the views are collected and a stand-in is created
@@ -466,7 +466,7 @@ class Operations
      */
     public function copyTables(array $tables_full, $move, $db)
     {
-        $sqlContraints = array();
+        $sqlContraints = [];
         foreach ($tables_full as $each_table => $tmp) {
             // skip the views; we have created stand-in definitions
             if ($GLOBALS['dbi']->getTable($db, $each_table)->isView()) {
@@ -770,9 +770,9 @@ class Operations
     public function duplicateBookmarks($_error, $db)
     {
         if (! $_error && $db != $_REQUEST['newname']) {
-            $get_fields = array('user', 'label', 'query');
-            $where_fields = array('dbase' => $db);
-            $new_fields = array('dbase' => $_REQUEST['newname']);
+            $get_fields = ['user', 'label', 'query'];
+            $where_fields = ['dbase' => $db];
+            $new_fields = ['dbase' => $_REQUEST['newname']];
             Table::duplicateInfo(
                 'bookmarkwork', 'bookmark', $get_fields,
                 $where_fields, $new_fields
@@ -1094,11 +1094,11 @@ class Operations
             . '</label>'
             . '</td></tr>';
 
-        if ($pma_table->isEngine(array('MYISAM', 'ARIA', 'ISAM'))) {
+        if ($pma_table->isEngine(['MYISAM', 'ARIA', 'ISAM'])) {
             $html_output .= $this->getHtmlForPackKeys($pack_keys);
         } // end if (MYISAM|ISAM)
 
-        if ($pma_table->isEngine(array('MYISAM', 'ARIA'))) {
+        if ($pma_table->isEngine(['MYISAM', 'ARIA'])) {
             $html_output .= $this->getHtmlForTableRow(
                 'new_checksum',
                 'CHECKSUM',
@@ -1127,7 +1127,7 @@ class Operations
         } // end if (ARIA)
 
         if (strlen($auto_increment) > 0
-            && $pma_table->isEngine(array('MYISAM', 'ARIA', 'INNODB', 'PBXT'))
+            && $pma_table->isEngine(['MYISAM', 'ARIA', 'INNODB', 'PBXT'])
         ) {
             $html_output .= '<tr><td class="vmiddle">'
                 . '<label for="auto_increment_opt">AUTO_INCREMENT</label></td>'
@@ -1197,33 +1197,33 @@ class Operations
         // the outer array is for engines, the inner array contains the dropdown
         // option values as keys then the dropdown option labels
 
-        $possible_row_formats = array(
-            'ARCHIVE' => array(
+        $possible_row_formats = [
+            'ARCHIVE' => [
                 'COMPRESSED' => 'COMPRESSED',
-            ),
-            'ARIA'  => array(
+            ],
+            'ARIA'  => [
                 'FIXED'     => 'FIXED',
                 'DYNAMIC'   => 'DYNAMIC',
                 'PAGE'      => 'PAGE'
-            ),
-            'MARIA'  => array(
+            ],
+            'MARIA'  => [
                 'FIXED'     => 'FIXED',
                 'DYNAMIC'   => 'DYNAMIC',
                 'PAGE'      => 'PAGE'
-            ),
-            'MYISAM' => array(
+            ],
+            'MYISAM' => [
                  'FIXED'    => 'FIXED',
                  'DYNAMIC'  => 'DYNAMIC'
-            ),
-            'PBXT'   => array(
+            ],
+            'PBXT'   => [
                  'FIXED'    => 'FIXED',
                  'DYNAMIC'  => 'DYNAMIC'
-            ),
-            'INNODB' => array(
+            ],
+            'INNODB' => [
                  'COMPACT'  => 'COMPACT',
                  'REDUNDANT' => 'REDUNDANT'
-            )
-        );
+            ]
+        ];
 
         /** @var Innodb $innodbEnginePlugin */
         $innodbEnginePlugin = StorageEngine::getEngine('Innodb');
@@ -1277,11 +1277,11 @@ class Operations
             . 'name="new_name" maxlength="64" '
             . 'value="' . htmlspecialchars($GLOBALS['table']) . '"/><br />';
 
-        $choices = array(
+        $choices = [
             'structure' => __('Structure only'),
             'data'      => __('Structure and data'),
             'dataonly'  => __('Data only')
-        );
+        ];
 
         $html_output .= Util::getRadioFields(
             'what', $choices, 'data', true
@@ -1381,12 +1381,12 @@ class Operations
         $html_output = '';
 
         // analyze table
-        if ($pma_table->isEngine(array('MYISAM', 'ARIA', 'INNODB', 'BERKELEYDB', 'TOKUDB'))) {
-            $params = array(
+        if ($pma_table->isEngine(['MYISAM', 'ARIA', 'INNODB', 'BERKELEYDB', 'TOKUDB'])) {
+            $params = [
                 'sql_query' => 'ANALYZE TABLE '
                     . Util::backquote($GLOBALS['table']),
                 'table_maintenance' => 'Go',
-            );
+            ];
             $html_output .= $this->getMaintainActionlink(
                 __('Analyze table'),
                 $params,
@@ -1396,12 +1396,12 @@ class Operations
         }
 
         // check table
-        if ($pma_table->isEngine(array('MYISAM', 'ARIA', 'INNODB', 'TOKUDB'))) {
-            $params = array(
+        if ($pma_table->isEngine(['MYISAM', 'ARIA', 'INNODB', 'TOKUDB'])) {
+            $params = [
                 'sql_query' => 'CHECK TABLE '
                     . Util::backquote($GLOBALS['table']),
                 'table_maintenance' => 'Go',
-            );
+            ];
             $html_output .= $this->getMaintainActionlink(
                 __('Check table'),
                 $params,
@@ -1411,11 +1411,11 @@ class Operations
         }
 
         // checksum table
-        $params = array(
+        $params = [
             'sql_query' => 'CHECKSUM TABLE '
                 . Util::backquote($GLOBALS['table']),
             'table_maintenance' => 'Go',
-        );
+        ];
         $html_output .= $this->getMaintainActionlink(
             __('Checksum table'),
             $params,
@@ -1424,12 +1424,12 @@ class Operations
         );
 
         // defragment table
-        if ($pma_table->isEngine(array('INNODB'))) {
-            $params = array(
+        if ($pma_table->isEngine(['INNODB'])) {
+            $params = [
                 'sql_query' => 'ALTER TABLE '
                 . Util::backquote($GLOBALS['table'])
                 . ' ENGINE = InnoDB;'
-            );
+            ];
             $html_output .= $this->getMaintainActionlink(
                 __('Defragment table'),
                 $params,
@@ -1439,7 +1439,7 @@ class Operations
         }
 
         // flush table
-        $params = array(
+        $params = [
             'sql_query' => 'FLUSH TABLE '
                 . Util::backquote($GLOBALS['table']),
             'message_to_show' => sprintf(
@@ -1447,7 +1447,7 @@ class Operations
                 htmlspecialchars($GLOBALS['table'])
             ),
             'reload' => 1,
-        );
+        ];
         $html_output .= $this->getMaintainActionlink(
             __('Flush the table (FLUSH)'),
             $params,
@@ -1456,12 +1456,12 @@ class Operations
         );
 
         // optimize table
-        if ($pma_table->isEngine(array('MYISAM', 'ARIA', 'INNODB', 'BERKELEYDB', 'TOKUDB'))) {
-            $params = array(
+        if ($pma_table->isEngine(['MYISAM', 'ARIA', 'INNODB', 'BERKELEYDB', 'TOKUDB'])) {
+            $params = [
                 'sql_query' => 'OPTIMIZE TABLE '
                     . Util::backquote($GLOBALS['table']),
                 'table_maintenance' => 'Go',
-            );
+            ];
             $html_output .= $this->getMaintainActionlink(
                 __('Optimize table'),
                 $params,
@@ -1471,12 +1471,12 @@ class Operations
         }
 
         // repair table
-        if ($pma_table->isEngine(array('MYISAM', 'ARIA'))) {
-            $params = array(
+        if ($pma_table->isEngine(['MYISAM', 'ARIA'])) {
+            $params = [
                 'sql_query' => 'REPAIR TABLE '
                     . Util::backquote($GLOBALS['table']),
                 'table_maintenance' => 'Go',
-            );
+            ];
             $html_output .= $this->getMaintainActionlink(
                 __('Repair table'),
                 $params,
@@ -1564,7 +1564,7 @@ class Operations
         return '<li>' . Util::linkOrButton(
                 'sql.php' . Url::getCommon($url_params),
                 $link,
-                array('id' => $htmlId, 'class' => 'ajax')
+                ['id' => $htmlId, 'class' => 'ajax']
             )
             . Util::showMySQLDocu($syntax)
             . '</li>';
@@ -1580,14 +1580,14 @@ class Operations
      */
     public function getHtmlForPartitionMaintenance(array $partition_names, array $url_params)
     {
-        $choices = array(
+        $choices = [
             'ANALYZE' => __('Analyze'),
             'CHECK' => __('Check'),
             'OPTIMIZE' => __('Optimize'),
             'REBUILD' => __('Rebuild'),
             'REPAIR' => __('Repair'),
             'TRUNCATE' => __('Truncate')
-        );
+        ];
 
         $partition_method = Partition::getPartitionMethod(
             $GLOBALS['db'], $GLOBALS['table']
@@ -1634,11 +1634,11 @@ class Operations
         );
         $this_url_params = array_merge(
             $url_params,
-            array(
+            [
                 'sql_query' => 'ALTER TABLE '
                 . Util::backquote($GLOBALS['table'])
                 . ' REMOVE PARTITIONING;'
-            )
+            ]
         );
         $html_output .= '<div class="clearfloat" /><br />';
 
@@ -1707,7 +1707,7 @@ class Operations
                 . ' IS NOT NULL';
             $this_url_params = array_merge(
                 $url_params,
-                array('sql_query' => $join_query)
+                ['sql_query' => $join_query]
             );
 
             $html_output .= '<li>'
@@ -1744,7 +1744,7 @@ class Operations
         $sql_query .= ';';
         $result = $GLOBALS['dbi']->query($sql_query);
 
-        return array($sql_query, $result);
+        return [$sql_query, $result];
     }
 
     /**
@@ -1768,7 +1768,7 @@ class Operations
     ) {
         global $auto_increment;
 
-        $table_alters = array();
+        $table_alters = [];
 
         if (isset($_REQUEST['comment'])
             && urldecode($_REQUEST['prev_comment']) !== $_REQUEST['comment']
@@ -1789,7 +1789,7 @@ class Operations
                 . Util::getCharsetQueryPart($_REQUEST['tbl_collation']);
         }
 
-        if ($pma_table->isEngine(array('MYISAM', 'ARIA', 'ISAM'))
+        if ($pma_table->isEngine(['MYISAM', 'ARIA', 'ISAM'])
             && isset($_REQUEST['new_pack_keys'])
             && $_REQUEST['new_pack_keys'] != (string)$pack_keys
         ) {
@@ -1797,7 +1797,7 @@ class Operations
         }
 
         $_REQUEST['new_checksum'] = empty($_REQUEST['new_checksum']) ? '0' : '1';
-        if ($pma_table->isEngine(array('MYISAM', 'ARIA'))
+        if ($pma_table->isEngine(['MYISAM', 'ARIA'])
             && $_REQUEST['new_checksum'] !== $checksum
         ) {
             $table_alters[] = 'checksum = ' . $_REQUEST['new_checksum'];
@@ -1821,13 +1821,13 @@ class Operations
 
         $_REQUEST['new_delay_key_write']
             = empty($_REQUEST['new_delay_key_write']) ? '0' : '1';
-        if ($pma_table->isEngine(array('MYISAM', 'ARIA'))
+        if ($pma_table->isEngine(['MYISAM', 'ARIA'])
             && $_REQUEST['new_delay_key_write'] !== $delay_key_write
         ) {
             $table_alters[] = 'delay_key_write = ' . $_REQUEST['new_delay_key_write'];
         }
 
-        if ($pma_table->isEngine(array('MYISAM', 'ARIA', 'INNODB', 'PBXT'))
+        if ($pma_table->isEngine(['MYISAM', 'ARIA', 'INNODB', 'PBXT'])
             && ! empty($_REQUEST['new_auto_increment'])
             && (! isset($auto_increment)
             || $_REQUEST['new_auto_increment'] !== $auto_increment)
@@ -1839,7 +1839,7 @@ class Operations
         if (! empty($_REQUEST['new_row_format'])) {
             $newRowFormat = $_REQUEST['new_row_format'];
             $newRowFormatLower = mb_strtolower($newRowFormat);
-            if ($pma_table->isEngine(array('MYISAM', 'ARIA', 'INNODB', 'PBXT'))
+            if ($pma_table->isEngine(['MYISAM', 'ARIA', 'INNODB', 'PBXT'])
                 && (strlen($row_format) === 0
                 || $newRowFormatLower !== mb_strtolower($row_format))
             ) {
@@ -1858,7 +1858,7 @@ class Operations
      */
     public function getWarningMessagesArray()
     {
-        $warning_messages = array();
+        $warning_messages = [];
         foreach ($GLOBALS['dbi']->getWarnings() as $warning) {
             // In MariaDB 5.1.44, when altering a table from Maria to MyISAM
             // and if TRANSACTIONAL was set, the system reports an error;
@@ -1899,7 +1899,7 @@ class Operations
 
         $result = $GLOBALS['dbi']->query($sql_query);
 
-        return array($sql_query, $result);
+        return [$sql_query, $result];
     }
 
     /**
diff --git a/libraries/classes/OutputBuffering.php b/libraries/classes/OutputBuffering.php
index fa6c6b4b82..712e7e6208 100644
--- a/libraries/classes/OutputBuffering.php
+++ b/libraries/classes/OutputBuffering.php
@@ -90,7 +90,7 @@ class OutputBuffering
                 header('X-ob_mode: ' . $this->_mode);
             }
             register_shutdown_function(
-                array(OutputBuffering::class, 'stop')
+                [OutputBuffering::class, 'stop']
             );
             $this->_on = true;
         }
diff --git a/libraries/classes/ParseAnalyze.php b/libraries/classes/ParseAnalyze.php
index f8fa3d831b..1c202be292 100644
--- a/libraries/classes/ParseAnalyze.php
+++ b/libraries/classes/ParseAnalyze.php
@@ -75,6 +75,6 @@ class ParseAnalyze
             $analyzed_sql_results['reload'] = $reload;
         }
 
-        return array($analyzed_sql_results, $db, $table);
+        return [$analyzed_sql_results, $db, $table];
     }
 }
diff --git a/libraries/classes/Partition.php b/libraries/classes/Partition.php
index d270935cbe..b159e95283 100644
--- a/libraries/classes/Partition.php
+++ b/libraries/classes/Partition.php
@@ -25,7 +25,7 @@ class Partition extends SubPartition
     /**
      * @var SubPartition[] sub partitions
      */
-    protected $subPartitions = array();
+    protected $subPartitions = [];
 
     /**
      * Loads data from the fetched row from information_schema.PARTITIONS
@@ -161,7 +161,7 @@ class Partition extends SubPartition
                 . "' AND `TABLE_NAME` = '" . $GLOBALS['dbi']->escapeString($table) . "'"
             );
             if ($result) {
-                $partitionMap = array();
+                $partitionMap = [];
                 foreach ($result as $row) {
                     if (isset($partitionMap[$row['PARTITION_NAME']])) {
                         $partition = $partitionMap[$row['PARTITION_NAME']];
@@ -178,10 +178,10 @@ class Partition extends SubPartition
                 }
                 return array_values($partitionMap);
             }
-            return array();
+            return [];
         }
 
-        return array();
+        return [];
     }
 
     /**
@@ -203,7 +203,7 @@ class Partition extends SubPartition
             );
         }
 
-        return array();
+        return [];
     }
 
     /**
diff --git a/libraries/classes/Pdf.php b/libraries/classes/Pdf.php
index edc402830e..725ceffe0b 100644
--- a/libraries/classes/Pdf.php
+++ b/libraries/classes/Pdf.php
@@ -24,7 +24,7 @@ use TCPDF_FONTS;
 class Pdf extends TCPDF
 {
     var $footerset;
-    var $Alias = array();
+    var $Alias = [];
 
     /**
      * PDF font to use.
@@ -56,7 +56,7 @@ class Pdf extends TCPDF
         $this->AddFont('DejaVuSans', '', 'dejavusans.php');
         $this->AddFont('DejaVuSans', 'B', 'dejavusansb.php');
         $this->SetFont(Pdf::PMA_PDF_FONT, '', 14);
-        $this->setFooterFont(array(Pdf::PMA_PDF_FONT, '', 14));
+        $this->setFooterFont([Pdf::PMA_PDF_FONT, '', 14]);
     }
 
     /**
diff --git a/libraries/classes/Plugins.php b/libraries/classes/Plugins.php
index 87e2b79b95..362c279299 100644
--- a/libraries/classes/Plugins.php
+++ b/libraries/classes/Plugins.php
@@ -71,7 +71,7 @@ class Plugins
     {
         $GLOBALS['plugin_param'] = $plugin_param;
         /* Scan for plugins */
-        $plugin_list = array();
+        $plugin_list = [];
         if (!($handle = @opendir($plugins_dir))) {
             return $plugin_list;
         }
@@ -177,7 +177,7 @@ class Plugins
             return '';
         }
 
-        $matches = array();
+        $matches = [];
         /* Possibly replace localised texts */
         if (!preg_match_all(
             '/(str[A-Z][A-Za-z0-9]*)/',
@@ -286,7 +286,7 @@ class Plugins
         if (! $is_subgroup) {
             // for subgroup headers
             if (mb_strpos(get_class($propertyGroup), "PropertyItem")) {
-                $properties = array($propertyGroup);
+                $properties = [$propertyGroup];
             } else {
                 // for main groups
                 $ret .= '<div class="export_sub_options" id="' . $plugin_name . '_'
diff --git a/libraries/classes/Plugins/Auth/AuthenticationCookie.php b/libraries/classes/Plugins/Auth/AuthenticationCookie.php
index 43a5459c54..b40e750e87 100644
--- a/libraries/classes/Plugins/Auth/AuthenticationCookie.php
+++ b/libraries/classes/Plugins/Auth/AuthenticationCookie.php
@@ -216,7 +216,7 @@ class AuthenticationCookie extends AuthenticationPlugin
             , htmlspecialchars($GLOBALS['cfg']['CaptchaLoginPublicKey']),'"'
                 .' data-callback="recaptchaCallback" value="' , __('Go') , '" type="submit" id="input_go" />';
         }
-        $_form_params = array();
+        $_form_params = [];
         if (! empty($GLOBALS['target'])) {
             $_form_params['target'] = $GLOBALS['target'];
         }
@@ -489,7 +489,7 @@ class AuthenticationCookie extends AuthenticationPlugin
             $redirect_url = './index.php';
 
             // any parameters to pass?
-            $url_params = array();
+            $url_params = [];
             if (strlen($GLOBALS['db']) > 0) {
                 $url_params['db'] = $GLOBALS['db'];
             }
@@ -554,7 +554,7 @@ class AuthenticationCookie extends AuthenticationPlugin
      */
     public function storePasswordCookie($password)
     {
-        $payload = array('password' => $password);
+        $payload = ['password' => $password];
         if ($GLOBALS['cfg']['AllowArbitraryServer'] && ! empty($GLOBALS['pma_auth_server'])) {
             $payload['server'] = $GLOBALS['pma_auth_server'];
         }
@@ -744,11 +744,11 @@ class AuthenticationCookie extends AuthenticationPlugin
         $this->cleanSSLErrors();
         $iv = base64_encode($iv);
         return json_encode(
-            array(
+            [
                 'iv' => $iv,
                 'mac' => hash_hmac('sha1', $iv . $result, $mac_secret),
                 'payload' => $result,
-            )
+            ]
         );
     }
 
diff --git a/libraries/classes/Plugins/Auth/AuthenticationSignon.php b/libraries/classes/Plugins/Auth/AuthenticationSignon.php
index f94c6f42c2..5450ee98f9 100644
--- a/libraries/classes/Plugins/Auth/AuthenticationSignon.php
+++ b/libraries/classes/Plugins/Auth/AuthenticationSignon.php
@@ -84,7 +84,7 @@ class AuthenticationSignon extends AuthenticationPlugin
         $single_signon_port = $GLOBALS['cfg']['Server']['port'];
 
         /* No configuration updates */
-        $single_signon_cfgupdate = array();
+        $single_signon_cfgupdate = [];
 
         /* Handle script based auth */
         if (!empty($script_name)) {
@@ -118,7 +118,7 @@ class AuthenticationSignon extends AuthenticationPlugin
                 }
                 return null;
             };
-            foreach (array('lifetime', 'path', 'domain', 'secure', 'httponly') as $key) {
+            foreach (['lifetime', 'path', 'domain', 'secure', 'httponly'] as $key) {
                 if (!isset($session_cookie_params[$key]))
                     $session_cookie_params[$key] = $defaultCookieParams($key);
             }
diff --git a/libraries/classes/Plugins/AuthenticationPlugin.php b/libraries/classes/Plugins/AuthenticationPlugin.php
index 49847e3464..7f0f02c225 100644
--- a/libraries/classes/Plugins/AuthenticationPlugin.php
+++ b/libraries/classes/Plugins/AuthenticationPlugin.php
@@ -153,7 +153,7 @@ abstract class AuthenticationPlugin
             /* Redirect to other autenticated server */
             $_SESSION['partial_logout'] = true;
             Core::sendHeaderLocation(
-                './index.php' . Url::getCommonRaw(array('server' => $server))
+                './index.php' . Url::getCommonRaw(['server' => $server])
             );
         }
     }
diff --git a/libraries/classes/Plugins/Export/ExportCodegen.php b/libraries/classes/Plugins/Export/ExportCodegen.php
index b8f0ec8b1a..45eee1b56f 100644
--- a/libraries/classes/Plugins/Export/ExportCodegen.php
+++ b/libraries/classes/Plugins/Export/ExportCodegen.php
@@ -60,17 +60,17 @@ class ExportCodegen extends ExportPlugin
     protected function initSpecificVariables()
     {
         $this->_setCgFormats(
-            array(
+            [
                 "NHibernate C# DO",
                 "NHibernate XML",
-            )
+            ]
         );
 
         $this->_setCgHandlers(
-            array(
+            [
                 "_handleNHibernateCSBody",
                 "_handleNHibernateXMLBody",
-            )
+            ]
         );
     }
 
@@ -190,7 +190,7 @@ class ExportCodegen extends ExportPlugin
         $crlf,
         $error_url,
         $sql_query,
-        array $aliases = array()
+        array $aliases = []
     ) {
         $CG_FORMATS = $this->_getCgFormats();
         $CG_HANDLERS = $this->_getCgHandlers();
@@ -240,12 +240,12 @@ class ExportCodegen extends ExportPlugin
      *
      * @return string containing C# code lines, separated by "\n"
      */
-    private function _handleNHibernateCSBody($db, $table, $crlf, array $aliases = array())
+    private function _handleNHibernateCSBody($db, $table, $crlf, array $aliases = [])
     {
         $db_alias = $db;
         $table_alias = $table;
         $this->initAlias($aliases, $db_alias, $table_alias);
-        $lines = array();
+        $lines = [];
 
         $result = $GLOBALS['dbi']->query(
             sprintf(
@@ -256,7 +256,7 @@ class ExportCodegen extends ExportPlugin
         );
         if ($result) {
             /** @var TableProperty[] $tableProperties */
-            $tableProperties = array();
+            $tableProperties = [];
             while ($row = $GLOBALS['dbi']->fetchRow($result)) {
                 $col_as = $this->getAlias($aliases, $row[0], 'col', $db, $table);
                 if (!empty($col_as)) {
@@ -286,7 +286,7 @@ class ExportCodegen extends ExportPlugin
             $lines[] = '        #region Constructors';
             $lines[] = '        public '
                 . ExportCodegen::cgMakeIdentifier($table_alias) . '() { }';
-            $temp = array();
+            $temp = [];
             foreach ($tableProperties as $tableProperty) {
                 if (!$tableProperty->isPK()) {
                     $temp[] = $tableProperty->formatCs(
@@ -343,12 +343,12 @@ class ExportCodegen extends ExportPlugin
         $db,
         $table,
         $crlf,
-        array $aliases = array()
+        array $aliases = []
     ) {
         $db_alias = $db;
         $table_alias = $table;
         $this->initAlias($aliases, $db_alias, $table_alias);
-        $lines = array();
+        $lines = [];
         $lines[] = '<?xml version="1.0" encoding="utf-8" ?' . '>';
         $lines[] = '<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" '
             . 'namespace="' . ExportCodegen::cgMakeIdentifier($db_alias) . '" '
diff --git a/libraries/classes/Plugins/Export/ExportCsv.php b/libraries/classes/Plugins/Export/ExportCsv.php
index c05b181ed3..492cee8960 100644
--- a/libraries/classes/Plugins/Export/ExportCsv.php
+++ b/libraries/classes/Plugins/Export/ExportCsv.php
@@ -223,7 +223,7 @@ class ExportCsv extends ExportPlugin
         $crlf,
         $error_url,
         $sql_query,
-        array $aliases = array()
+        array $aliases = []
     ) {
         global $what, $csv_terminated, $csv_separator, $csv_enclosed, $csv_escaped;
 
diff --git a/libraries/classes/Plugins/Export/ExportExcel.php b/libraries/classes/Plugins/Export/ExportExcel.php
index 3cb39e81f2..2a489db860 100644
--- a/libraries/classes/Plugins/Export/ExportExcel.php
+++ b/libraries/classes/Plugins/Export/ExportExcel.php
@@ -69,11 +69,11 @@ class ExportExcel extends ExportCsv
             __('Excel edition:')
         );
         $leaf->setValues(
-            array(
+            [
                 'win'           => 'Windows',
                 'mac_excel2003' => 'Excel 2003 / Macintosh',
                 'mac_excel2008' => 'Excel 2008 / Macintosh',
-            )
+            ]
         );
         $generalOptions->addProperty($leaf);
         $leaf = new HiddenPropertyItem(
diff --git a/libraries/classes/Plugins/Export/ExportHtmlword.php b/libraries/classes/Plugins/Export/ExportHtmlword.php
index a42999a256..b745f7fa27 100644
--- a/libraries/classes/Plugins/Export/ExportHtmlword.php
+++ b/libraries/classes/Plugins/Export/ExportHtmlword.php
@@ -68,11 +68,11 @@ class ExportHtmlword extends ExportPlugin
         // create primary items and add them to the group
         $leaf = new RadioPropertyItem("structure_or_data");
         $leaf->setValues(
-            array(
+            [
                 'structure'          => __('structure'),
                 'data'               => __('data'),
                 'structure_and_data' => __('structure and data'),
-            )
+            ]
         );
         $dumpWhat->addProperty($leaf);
         // add the main group to the root group
@@ -200,7 +200,7 @@ class ExportHtmlword extends ExportPlugin
         $crlf,
         $error_url,
         $sql_query,
-        array $aliases = array()
+        array $aliases = []
     ) {
         global $what;
 
@@ -285,7 +285,7 @@ class ExportHtmlword extends ExportPlugin
      *
      * @return string resulting definition
      */
-    public function getTableDefStandIn($db, $view, $crlf, $aliases = array())
+    public function getTableDefStandIn($db, $view, $crlf, $aliases = [])
     {
         $schema_insert = '<table class="width100" cellspacing="1">'
             . '<tr class="print-category">'
@@ -306,7 +306,7 @@ class ExportHtmlword extends ExportPlugin
         /**
          * Get the unique keys in the view
          */
-        $unique_keys = array();
+        $unique_keys = [];
         $keys = $GLOBALS['dbi']->getTableIndexes($db, $view);
         foreach ($keys as $key) {
             if ($key['Non_unique'] == 0) {
@@ -359,7 +359,7 @@ class ExportHtmlword extends ExportPlugin
         $do_comments,
         $do_mime,
         $view = false,
-        array $aliases = array()
+        array $aliases = []
     ) {
         // set $cfgRelation here, because there is a chance that it's modified
         // since the class initialization
@@ -420,7 +420,7 @@ class ExportHtmlword extends ExportPlugin
         /**
          * Get the unique keys in the table
          */
-        $unique_keys = array();
+        $unique_keys = [];
         $keys = $GLOBALS['dbi']->getTableIndexes($db, $table);
         foreach ($keys as $key) {
             if ($key['Non_unique'] == 0) {
@@ -549,7 +549,7 @@ class ExportHtmlword extends ExportPlugin
         $do_comments = false,
         $do_mime = false,
         $dates = false,
-        array $aliases = array()
+        array $aliases = []
     ) {
         $db_alias = $db;
         $table_alias = $table;
diff --git a/libraries/classes/Plugins/Export/ExportJson.php b/libraries/classes/Plugins/Export/ExportJson.php
index 5096691a19..f505e84d87 100644
--- a/libraries/classes/Plugins/Export/ExportJson.php
+++ b/libraries/classes/Plugins/Export/ExportJson.php
@@ -116,11 +116,11 @@ class ExportJson extends ExportPlugin
     {
         global $crlf;
 
-        $meta = array(
+        $meta = [
             'type' => 'header',
             'version' => PMA_VERSION,
             'comment' => 'Export to JSON plugin for PHPMyAdmin',
-        );
+        ];
 
         return $this->export->outputHandler(
             '[' . $crlf . $this->encode($meta) . ',' . $crlf
@@ -155,10 +155,10 @@ class ExportJson extends ExportPlugin
             $db_alias = $db;
         }
 
-        $meta = array(
+        $meta = [
             'type' => 'database',
             'name' => $db_alias
-        );
+        ];
 
         return $this->export->outputHandler(
             $this->encode($meta) . ',' . $crlf
@@ -209,7 +209,7 @@ class ExportJson extends ExportPlugin
         $crlf,
         $error_url,
         $sql_query,
-        array $aliases = array()
+        array $aliases = []
     ) {
         $db_alias = $db;
         $table_alias = $table;
@@ -224,12 +224,12 @@ class ExportJson extends ExportPlugin
         }
 
         $buffer = $this->encode(
-            array(
+            [
                 'type' => 'table',
                 'name' => $table_alias,
                 'database' => $db_alias,
                 'data' => "@@DATA@@"
-            )
+            ]
         );
         list($header, $footer) = explode('"@@DATA@@"', $buffer);
 
@@ -244,7 +244,7 @@ class ExportJson extends ExportPlugin
         );
         $columns_cnt = $GLOBALS['dbi']->numFields($result);
 
-        $columns = array();
+        $columns = [];
         for ($i = 0; $i < $columns_cnt; $i++) {
             $col_as = $GLOBALS['dbi']->fieldName($result, $i);
             if (!empty($aliases[$db]['tables'][$table]['columns'][$col_as])) {
@@ -265,7 +265,7 @@ class ExportJson extends ExportPlugin
                 }
             }
 
-            $data = array();
+            $data = [];
 
             for ($i = 0; $i < $columns_cnt; $i++) {
                 $data[$columns[$i]] = $record[$i];
diff --git a/libraries/classes/Plugins/Export/ExportLatex.php b/libraries/classes/Plugins/Export/ExportLatex.php
index 77cde09b5f..f16bb0062e 100644
--- a/libraries/classes/Plugins/Export/ExportLatex.php
+++ b/libraries/classes/Plugins/Export/ExportLatex.php
@@ -101,11 +101,11 @@ class ExportLatex extends ExportPlugin
         // create primary items and add them to the group
         $leaf = new RadioPropertyItem("structure_or_data");
         $leaf->setValues(
-            array(
+            [
                 'structure'          => __('structure'),
                 'data'               => __('data'),
                 'structure_and_data' => __('structure and data'),
-            )
+            ]
         );
         $dumpWhat->addProperty($leaf);
         // add the main group to the root group
@@ -303,7 +303,7 @@ class ExportLatex extends ExportPlugin
         $crlf,
         $error_url,
         $sql_query,
-        array $aliases = array()
+        array $aliases = []
     ) {
         $db_alias = $db;
         $table_alias = $table;
@@ -316,8 +316,8 @@ class ExportLatex extends ExportPlugin
         );
 
         $columns_cnt = $GLOBALS['dbi']->numFields($result);
-        $columns = array();
-        $columns_alias = array();
+        $columns = [];
+        $columns_alias = [];
         for ($i = 0; $i < $columns_cnt; $i++) {
             $columns[$i] = $col_as = $GLOBALS['dbi']->fieldName($result, $i);
             if (!empty($aliases[$db]['tables'][$table]['columns'][$col_as])) {
@@ -339,17 +339,17 @@ class ExportLatex extends ExportPlugin
             $buffer .= ' \\caption{'
                 . Util::expandUserString(
                     $GLOBALS['latex_data_caption'],
-                    array(
+                    [
                         'texEscape',
                         get_class($this),
-                    ),
-                    array('table' => $table_alias, 'database' => $db_alias)
+                    ],
+                    ['table' => $table_alias, 'database' => $db_alias]
                 )
                 . '} \\label{'
                 . Util::expandUserString(
                     $GLOBALS['latex_data_label'],
                     null,
-                    array('table' => $table_alias, 'database' => $db_alias)
+                    ['table' => $table_alias, 'database' => $db_alias]
                 )
                 . '} \\\\';
         }
@@ -374,11 +374,11 @@ class ExportLatex extends ExportPlugin
                     '\\caption{'
                     . Util::expandUserString(
                         $GLOBALS['latex_data_continued_caption'],
-                        array(
+                        [
                             'texEscape',
                             get_class($this),
-                        ),
-                        array('table' => $table_alias, 'database' => $db_alias)
+                        ],
+                        ['table' => $table_alias, 'database' => $db_alias]
                     )
                     . '} \\\\ '
                 )
@@ -468,7 +468,7 @@ class ExportLatex extends ExportPlugin
         $do_comments = false,
         $do_mime = false,
         $dates = false,
-        array $aliases = array()
+        array $aliases = []
     ) {
         $db_alias = $db;
         $table_alias = $table;
@@ -484,7 +484,7 @@ class ExportLatex extends ExportPlugin
         /**
          * Get the unique keys in the table
          */
-        $unique_keys = array();
+        $unique_keys = [];
         $keys = $GLOBALS['dbi']->getTableIndexes($db, $table);
         foreach ($keys as $key) {
             if ($key['Non_unique'] == 0) {
@@ -546,17 +546,17 @@ class ExportLatex extends ExportPlugin
             $buffer .= ' \\caption{'
                 . Util::expandUserString(
                     $GLOBALS['latex_structure_caption'],
-                    array(
+                    [
                         'texEscape',
                         get_class($this),
-                    ),
-                    array('table' => $table_alias, 'database' => $db_alias)
+                    ],
+                    ['table' => $table_alias, 'database' => $db_alias]
                 )
                 . '} \\label{'
                 . Util::expandUserString(
                     $GLOBALS['latex_structure_label'],
                     null,
-                    array('table' => $table_alias, 'database' => $db_alias)
+                    ['table' => $table_alias, 'database' => $db_alias]
                 )
                 . '} \\\\' . $crlf;
         }
@@ -567,11 +567,11 @@ class ExportLatex extends ExportPlugin
             $buffer .= ' \\caption{'
                 . Util::expandUserString(
                     $GLOBALS['latex_structure_continued_caption'],
-                    array(
+                    [
                         'texEscape',
                         get_class($this),
-                    ),
-                    array('table' => $table_alias, 'database' => $db_alias)
+                    ],
+                    ['table' => $table_alias, 'database' => $db_alias]
                 )
                 . '} \\\\ ' . $crlf;
         }
@@ -669,7 +669,7 @@ class ExportLatex extends ExportPlugin
      */
     public static function texEscape($string)
     {
-        $escape = array('$', '%', '{', '}', '&', '#', '_', '^');
+        $escape = ['$', '%', '{', '}', '&', '#', '_', '^'];
         $cnt_escape = count($escape);
         for ($k = 0; $k < $cnt_escape; $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 974b62b891..db30b95839 100644
--- a/libraries/classes/Plugins/Export/ExportMediawiki.php
+++ b/libraries/classes/Plugins/Export/ExportMediawiki.php
@@ -69,11 +69,11 @@ class ExportMediawiki extends ExportPlugin
         );
         $leaf = new RadioPropertyItem('structure_or_data');
         $leaf->setValues(
-            array(
+            [
                 'structure'          => __('structure'),
                 'data'               => __('data'),
                 'structure_and_data' => __('structure and data'),
-            )
+            ]
         );
         $subgroup->setSubgroupHeader($leaf);
         $generalOptions->addProperty($subgroup);
@@ -192,7 +192,7 @@ class ExportMediawiki extends ExportPlugin
         $do_comments = false,
         $do_mime = false,
         $dates = false,
-        array $aliases = array()
+        array $aliases = []
     ) {
         $db_alias = $db;
         $table_alias = $table;
@@ -286,7 +286,7 @@ class ExportMediawiki extends ExportPlugin
         $crlf,
         $error_url,
         $sql_query,
-        array $aliases = array()
+        array $aliases = []
     ) {
         $db_alias = $db;
         $table_alias = $table;
diff --git a/libraries/classes/Plugins/Export/ExportOds.php b/libraries/classes/Plugins/Export/ExportOds.php
index 57577bdbe0..d0fd612b55 100644
--- a/libraries/classes/Plugins/Export/ExportOds.php
+++ b/libraries/classes/Plugins/Export/ExportOds.php
@@ -217,7 +217,7 @@ class ExportOds extends ExportPlugin
         $crlf,
         $error_url,
         $sql_query,
-        array $aliases = array()
+        array $aliases = []
     ) {
         global $what;
 
@@ -232,7 +232,7 @@ class ExportOds extends ExportPlugin
         );
         $fields_cnt = $GLOBALS['dbi']->numFields($result);
         $fields_meta = $GLOBALS['dbi']->getFieldsMeta($result);
-        $field_flags = array();
+        $field_flags = [];
         for ($j = 0; $j < $fields_cnt; $j++) {
             $field_flags[$j] = $GLOBALS['dbi']->fieldFlags($result, $j);
         }
diff --git a/libraries/classes/Plugins/Export/ExportOdt.php b/libraries/classes/Plugins/Export/ExportOdt.php
index 103f139bf6..f72eee044b 100644
--- a/libraries/classes/Plugins/Export/ExportOdt.php
+++ b/libraries/classes/Plugins/Export/ExportOdt.php
@@ -79,11 +79,11 @@ class ExportOdt extends ExportPlugin
         // create primary items and add them to the group
         $leaf = new RadioPropertyItem("structure_or_data");
         $leaf->setValues(
-            array(
+            [
                 'structure'          => __('structure'),
                 'data'               => __('data'),
                 'structure_and_data' => __('structure and data'),
-            )
+            ]
         );
         $dumpWhat->addProperty($leaf);
         // add the main group to the root group
@@ -248,7 +248,7 @@ class ExportOdt extends ExportPlugin
         $crlf,
         $error_url,
         $sql_query,
-        array $aliases = array()
+        array $aliases = []
     ) {
         global $what;
 
@@ -263,7 +263,7 @@ class ExportOdt extends ExportPlugin
         );
         $fields_cnt = $GLOBALS['dbi']->numFields($result);
         $fields_meta = $GLOBALS['dbi']->getFieldsMeta($result);
-        $field_flags = array();
+        $field_flags = [];
         for ($j = 0; $j < $fields_cnt; $j++) {
             $field_flags[$j] = $GLOBALS['dbi']->fieldFlags($result, $j);
         }
@@ -356,7 +356,7 @@ class ExportOdt extends ExportPlugin
      *
      * @return string resulting definition
      */
-    public function getTableDefStandIn($db, $view, $crlf, $aliases = array())
+    public function getTableDefStandIn($db, $view, $crlf, $aliases = [])
     {
         $db_alias = $db;
         $view_alias = $view;
@@ -443,7 +443,7 @@ class ExportOdt extends ExportPlugin
         $show_dates = false,
         $add_semicolon = true,
         $view = false,
-        array $aliases = array()
+        array $aliases = []
     ) {
         global $cfgRelation;
 
@@ -592,7 +592,7 @@ class ExportOdt extends ExportPlugin
      *
      * @return bool true
      */
-    protected function getTriggers($db, $table, array $aliases = array())
+    protected function getTriggers($db, $table, array $aliases = [])
     {
         $db_alias = $db;
         $table_alias = $table;
@@ -681,7 +681,7 @@ class ExportOdt extends ExportPlugin
         $do_comments = false,
         $do_mime = false,
         $dates = false,
-        array $aliases = array()
+        array $aliases = []
     ) {
         $db_alias = $db;
         $table_alias = $table;
diff --git a/libraries/classes/Plugins/Export/ExportPdf.php b/libraries/classes/Plugins/Export/ExportPdf.php
index f5ba93e230..8f71273360 100644
--- a/libraries/classes/Plugins/Export/ExportPdf.php
+++ b/libraries/classes/Plugins/Export/ExportPdf.php
@@ -113,11 +113,11 @@ class ExportPdf extends ExportPlugin
         );
         $leaf = new RadioPropertyItem("structure_or_data");
         $leaf->setValues(
-            array(
+            [
                 'structure'          => __('structure'),
                 'data'               => __('data'),
                 'structure_and_data' => __('structure and data'),
-            )
+            ]
         );
         $dumpWhat->addProperty($leaf);
         // add the group to the root group
@@ -139,7 +139,7 @@ class ExportPdf extends ExportPlugin
         $pdf = $this->_getPdf();
         $pdf->Open();
 
-        $attr = array('titleFontSize' => 18, 'titleText' => $pdf_report_title);
+        $attr = ['titleFontSize' => 18, 'titleText' => $pdf_report_title];
         $pdf->setAttributes($attr);
         $pdf->setTopMargin(30);
 
@@ -216,19 +216,19 @@ class ExportPdf extends ExportPlugin
         $crlf,
         $error_url,
         $sql_query,
-        array $aliases = array()
+        array $aliases = []
     ) {
         $db_alias = $db;
         $table_alias = $table;
         $this->initAlias($aliases, $db_alias, $table_alias);
         $pdf = $this->_getPdf();
-        $attr = array(
+        $attr = [
             'currentDb'    => $db,
             'currentTable' => $table,
             'dbAlias'      => $db_alias,
             'tableAlias'   => $table_alias,
             'aliases'      => $aliases,
-        );
+        ];
         $pdf->setAttributes($attr);
         $pdf->purpose = __('Dumping data');
         $pdf->mysqlReport($sql_query);
@@ -270,7 +270,7 @@ class ExportPdf extends ExportPlugin
         $do_comments = false,
         $do_mime = false,
         $dates = false,
-        array $aliases = array()
+        array $aliases = []
     ) {
         $db_alias = $db;
         $table_alias = $table;
@@ -291,14 +291,14 @@ class ExportPdf extends ExportPlugin
             $purpose = __('Stand in');
         } // end switch
 
-        $attr = array(
+        $attr = [
             'currentDb'    => $db,
             'currentTable' => $table,
             'dbAlias'      => $db_alias,
             'tableAlias'   => $table_alias,
             'aliases'      => $aliases,
             'purpose'      => $purpose,
-        );
+        ];
         $pdf->setAttributes($attr);
         /**
          * comment display set true as presently in pdf
diff --git a/libraries/classes/Plugins/Export/ExportPhparray.php b/libraries/classes/Plugins/Export/ExportPhparray.php
index 2836f60460..dce9d0ed15 100644
--- a/libraries/classes/Plugins/Export/ExportPhparray.php
+++ b/libraries/classes/Plugins/Export/ExportPhparray.php
@@ -176,7 +176,7 @@ class ExportPhparray extends ExportPlugin
         $crlf,
         $error_url,
         $sql_query,
-        array $aliases = array()
+        array $aliases = []
     ) {
         $db_alias = $db;
         $table_alias = $table;
@@ -189,7 +189,7 @@ class ExportPhparray extends ExportPlugin
         );
 
         $columns_cnt = $GLOBALS['dbi']->numFields($result);
-        $columns = array();
+        $columns = [];
         for ($i = 0; $i < $columns_cnt; $i++) {
             $col_as = $GLOBALS['dbi']->fieldName($result, $i);
             if (!empty($aliases[$db]['tables'][$table]['columns'][$col_as])) {
diff --git a/libraries/classes/Plugins/Export/ExportSql.php b/libraries/classes/Plugins/Export/ExportSql.php
index 7b97e96cab..4cc4e72191 100644
--- a/libraries/classes/Plugins/Export/ExportSql.php
+++ b/libraries/classes/Plugins/Export/ExportSql.php
@@ -142,11 +142,11 @@ class ExportSql extends ExportPlugin
                 __('Enclose export in a transaction')
             );
             $leaf->setDoc(
-                array(
+                [
                     'programs',
                     'mysqldump',
                     'option_mysqldump_single-transaction',
-                )
+                ]
             );
             $generalOptions->addProperty($leaf);
 
@@ -156,11 +156,11 @@ class ExportSql extends ExportPlugin
                 __('Disable foreign key checks')
             );
             $leaf->setDoc(
-                array(
+                [
                     'manual_MySQL_Database_Administration',
                     'server-system-variables',
                     'sysvar_foreign_key_checks',
-                )
+                ]
             );
             $generalOptions->addProperty($leaf);
 
@@ -181,7 +181,7 @@ class ExportSql extends ExportPlugin
             // compatibility maximization
             $compats = $GLOBALS['dbi']->getCompatibilities();
             if (count($compats) > 0) {
-                $values = array();
+                $values = [];
                 foreach ($compats as $val) {
                     $values[$val] = $val;
                 }
@@ -195,10 +195,10 @@ class ExportSql extends ExportPlugin
                 );
                 $leaf->setValues($values);
                 $leaf->setDoc(
-                    array(
+                    [
                         'manual_MySQL_Database_Administration',
                         'Server_SQL_mode',
-                    )
+                    ]
                 );
                 $generalOptions->addProperty($leaf);
 
@@ -211,11 +211,11 @@ class ExportSql extends ExportPlugin
             );
             $leaf = new RadioPropertyItem('structure_or_data');
             $leaf->setValues(
-                array(
+                [
                     'structure'          => __('structure'),
                     'data'               => __('data'),
                     'structure_and_data' => __('structure and data'),
-                )
+                ]
             );
             $subgroup->setSubgroupHeader($leaf);
             $generalOptions->addProperty($subgroup);
@@ -365,10 +365,10 @@ class ExportSql extends ExportPlugin
                 __('<code>INSERT DELAYED</code> statements')
             );
             $leaf->setDoc(
-                array(
+                [
                     'manual_MySQL_Database_Administration',
                     'insert_delayed'
-                )
+                ]
             );
             $subgroup->addProperty($leaf);
 
@@ -377,10 +377,10 @@ class ExportSql extends ExportPlugin
                 __('<code>INSERT IGNORE</code> statements')
             );
             $leaf->setDoc(
-                array(
+                [
                     'manual_MySQL_Database_Administration',
                     'insert',
-                )
+                ]
             );
             $subgroup->addProperty($leaf);
             $dataOptions->addProperty($subgroup);
@@ -391,11 +391,11 @@ class ExportSql extends ExportPlugin
                 __('Function to use when dumping data:')
             );
             $leaf->setValues(
-                array(
+                [
                     'INSERT'  => 'INSERT',
                     'UPDATE'  => 'UPDATE',
                     'REPLACE' => 'REPLACE',
-                )
+                ]
             );
             $dataOptions->addProperty($leaf);
 
@@ -411,7 +411,7 @@ class ExportSql extends ExportPlugin
                 __('<code>INSERT IGNORE</code> statements')
             );
             $leaf->setValues(
-                array(
+                [
                     'complete' => __(
                         'include column names in every <code>INSERT</code> statement'
                         . ' <br /> &nbsp; &nbsp; &nbsp; Example: <code>INSERT INTO'
@@ -431,7 +431,7 @@ class ExportSql extends ExportPlugin
                         'neither of the above<br /> &nbsp; &nbsp; &nbsp; Example:'
                         . ' <code>INSERT INTO tbl_name VALUES (1,2,3)</code>'
                     ),
-                )
+                ]
             );
             $subgroup->addProperty($leaf);
             $dataOptions->addProperty($subgroup);
@@ -538,7 +538,7 @@ class ExportSql extends ExportPlugin
      *
      * @return bool Whether it succeeded
      */
-    public function exportRoutines($db, array $aliases = array())
+    public function exportRoutines($db, array $aliases = [])
     {
         global $crlf;
 
@@ -606,7 +606,7 @@ class ExportSql extends ExportPlugin
             }
 
             $lines = preg_split("/\\r\\n|\\r|\\n/", $text);
-            $result = array();
+            $result = [];
             foreach ($lines as $line) {
                 $result[] = '-- ' . $line . $GLOBALS['crlf'];
             }
@@ -1055,22 +1055,22 @@ class ExportSql extends ExportPlugin
         $cfgRelation = $this->relation->getRelationsParam();
 
         if (isset($table)) {
-            $types = array(
+            $types = [
                 'column_info'   => 'db_name',
                 'table_uiprefs' => 'db_name',
                 'tracking'      => 'db_name',
-            );
+            ];
         } else {
-            $types = array(
+            $types = [
                 'bookmark'        => 'dbase',
                 'relation'        => 'master_db',
                 'pdf_pages'       => 'db_name',
                 'savedsearches'   => 'db_name',
                 'central_columns' => 'db_name',
-            );
+            ];
         }
 
-        $aliases = array();
+        $aliases = [];
 
         $comment = $this->_possibleCRLF()
             . $this->_exportComment();
@@ -1224,7 +1224,7 @@ class ExportSql extends ExportPlugin
      *
      * @return string resulting definition
      */
-    public function getTableDefStandIn($db, $view, $crlf, $aliases = array())
+    public function getTableDefStandIn($db, $view, $crlf, $aliases = [])
     {
         $db_alias = $db;
         $view_alias = $view;
@@ -1244,7 +1244,7 @@ class ExportSql extends ExportPlugin
             $create_query .= 'IF NOT EXISTS ';
         }
         $create_query .= Util::backquote($view_alias) . ' (' . $crlf;
-        $tmp = array();
+        $tmp = [];
         $columns = $GLOBALS['dbi']->getColumnsFull($db, $view);
         foreach ($columns as $column_name => $definition) {
             $col_alias = $column_name;
@@ -1276,7 +1276,7 @@ class ExportSql extends ExportPlugin
         $view,
         $crlf,
         $add_semicolon = true,
-        array $aliases = array()
+        array $aliases = []
     ) {
         $db_alias = $db;
         $view_alias = $view;
@@ -1370,7 +1370,7 @@ class ExportSql extends ExportPlugin
         $add_semicolon = true,
         $view = false,
         $update_indexes_increments = true,
-        array $aliases = array()
+        array $aliases = []
     ) {
         global $sql_drop_table, $sql_backquotes, $sql_constraints,
                $sql_constraints_query, $sql_indexes, $sql_indexes_query,
@@ -1612,21 +1612,21 @@ class ExportSql extends ExportPlugin
                  *
                  * @var array
                  */
-                $constraints = array();
+                $constraints = [];
 
                 /**
                  * Fragments containining definition of each index.
                  *
                  * @var array
                  */
-                $indexes = array();
+                $indexes = [];
 
                 /**
                  * Fragments containining definition of each FULLTEXT index.
                  *
                  * @var array
                  */
-                $indexes_fulltext = array();
+                $indexes_fulltext = [];
 
                 /**
                  * Fragments containining definition of each foreign key that will
@@ -1634,14 +1634,14 @@ class ExportSql extends ExportPlugin
                  *
                  * @var array
                  */
-                $dropped = array();
+                $dropped = [];
 
                 /**
                  * Fragment containining definition of the `AUTO_INCREMENT`.
                  *
                  * @var array
                  */
-                $auto_increment = array();
+                $auto_increment = [];
 
                 // Scanning each field of the `CREATE` statement to fill the arrays
                 // above.
@@ -1835,7 +1835,7 @@ class ExportSql extends ExportPlugin
         $crlf,
         $do_relation = false,
         $do_mime = false,
-        array $aliases = array()
+        array $aliases = []
     ) {
         global $cfgRelation, $sql_backquotes;
 
@@ -1985,7 +1985,7 @@ class ExportSql extends ExportPlugin
         $comments = false,
         $mime = false,
         $dates = false,
-        array $aliases = array()
+        array $aliases = []
     ) {
         $db_alias = $db;
         $table_alias = $table;
@@ -2159,7 +2159,7 @@ class ExportSql extends ExportPlugin
         $crlf,
         $error_url,
         $sql_query,
-        array $aliases = array()
+        array $aliases = []
     ) {
         global $current_row, $sql_backquotes;
 
@@ -2227,12 +2227,12 @@ class ExportSql extends ExportPlugin
 
         // Get field information
         $fields_meta = $GLOBALS['dbi']->getFieldsMeta($result);
-        $field_flags = array();
+        $field_flags = [];
         for ($j = 0; $j < $fields_cnt; $j++) {
             $field_flags[$j] = $GLOBALS['dbi']->fieldFlags($result, $j);
         }
 
-        $field_set = array();
+        $field_set = [];
         for ($j = 0; $j < $fields_cnt; $j++) {
             $col_as = $fields_meta[$j]->name;
             if (!empty($aliases[$db]['tables'][$table]['columns'][$col_as])) {
@@ -2377,7 +2377,7 @@ class ExportSql extends ExportPlugin
                 }
             }
             $current_row++;
-            $values = array();
+            $values = [];
             for ($j = 0; $j < $fields_cnt; $j++) {
                 // NULL
                 if (!isset($row[$j]) || is_null($row[$j])) {
diff --git a/libraries/classes/Plugins/Export/ExportTexytext.php b/libraries/classes/Plugins/Export/ExportTexytext.php
index c58e9156e5..f85172eb52 100644
--- a/libraries/classes/Plugins/Export/ExportTexytext.php
+++ b/libraries/classes/Plugins/Export/ExportTexytext.php
@@ -67,11 +67,11 @@ class ExportTexytext extends ExportPlugin
         // create primary items and add them to the group
         $leaf = new RadioPropertyItem("structure_or_data");
         $leaf->setValues(
-            array(
+            [
                 'structure'          => __('structure'),
                 'data'               => __('data'),
                 'structure_and_data' => __('structure and data'),
-            )
+            ]
         );
         $dumpWhat->addProperty($leaf);
         // add the main group to the root group
@@ -184,7 +184,7 @@ class ExportTexytext extends ExportPlugin
         $crlf,
         $error_url,
         $sql_query,
-        array $aliases = array()
+        array $aliases = []
     ) {
         global $what;
 
@@ -262,14 +262,14 @@ class ExportTexytext extends ExportPlugin
      *
      * @return string resulting definition
      */
-    public function getTableDefStandIn($db, $view, $crlf, $aliases = array())
+    public function getTableDefStandIn($db, $view, $crlf, $aliases = [])
     {
         $text_output = '';
 
         /**
          * Get the unique keys in the table
          */
-        $unique_keys = array();
+        $unique_keys = [];
         $keys = $GLOBALS['dbi']->getTableIndexes($db, $view);
         foreach ($keys as $key) {
             if ($key['Non_unique'] == 0) {
@@ -344,7 +344,7 @@ class ExportTexytext extends ExportPlugin
         $show_dates = false,
         $add_semicolon = true,
         $view = false,
-        array $aliases = array()
+        array $aliases = []
     ) {
         global $cfgRelation;
 
@@ -353,7 +353,7 @@ class ExportTexytext extends ExportPlugin
         /**
          * Get the unique keys in the table
          */
-        $unique_keys = array();
+        $unique_keys = [];
         $keys = $GLOBALS['dbi']->getTableIndexes($db, $table);
         foreach ($keys as $key) {
             if ($key['Non_unique'] == 0) {
@@ -507,7 +507,7 @@ class ExportTexytext extends ExportPlugin
         $do_comments = false,
         $do_mime = false,
         $dates = false,
-        array $aliases = array()
+        array $aliases = []
     ) {
         $db_alias = $db;
         $table_alias = $table;
diff --git a/libraries/classes/Plugins/Export/ExportXml.php b/libraries/classes/Plugins/Export/ExportXml.php
index b8c7d4d990..1d3663a561 100644
--- a/libraries/classes/Plugins/Export/ExportXml.php
+++ b/libraries/classes/Plugins/Export/ExportXml.php
@@ -471,7 +471,7 @@ class ExportXml extends ExportPlugin
         $crlf,
         $error_url,
         $sql_query,
-        array $aliases = array()
+        array $aliases = []
     ) {
         // Do not export data for merge tables
         if ($GLOBALS['dbi']->getTable($db, $table)->isMerge()) {
@@ -491,7 +491,7 @@ class ExportXml extends ExportPlugin
             );
 
             $columns_cnt = $GLOBALS['dbi']->numFields($result);
-            $columns = array();
+            $columns = [];
             for ($i = 0; $i < $columns_cnt; $i++) {
                 $columns[$i] = stripslashes($GLOBALS['dbi']->fieldName($result, $i));
             }
diff --git a/libraries/classes/Plugins/Export/ExportYaml.php b/libraries/classes/Plugins/Export/ExportYaml.php
index 19b17832eb..33bf378a14 100644
--- a/libraries/classes/Plugins/Export/ExportYaml.php
+++ b/libraries/classes/Plugins/Export/ExportYaml.php
@@ -152,7 +152,7 @@ class ExportYaml extends ExportPlugin
         $crlf,
         $error_url,
         $sql_query,
-        array $aliases = array()
+        array $aliases = []
     ) {
         $db_alias = $db;
         $table_alias = $table;
@@ -164,7 +164,7 @@ class ExportYaml extends ExportPlugin
         );
 
         $columns_cnt = $GLOBALS['dbi']->numFields($result);
-        $columns = array();
+        $columns = [];
         for ($i = 0; $i < $columns_cnt; $i++) {
             $col_as = $GLOBALS['dbi']->fieldName($result, $i);
             if (!empty($aliases[$db]['tables'][$table]['columns'][$col_as])) {
@@ -202,8 +202,8 @@ class ExportYaml extends ExportPlugin
                 }
 
                 $record[$i] = str_replace(
-                    array('\\', '"', "\n", "\r"),
-                    array('\\\\', '\"', '\n', '\r'),
+                    ['\\', '"', "\n", "\r"],
+                    ['\\\\', '\"', '\n', '\r'],
                     $record[$i]
                 );
                 $buffer .= '  ' . $columns[$i] . ': "' . $record[$i] . '"' . $crlf;
diff --git a/libraries/classes/Plugins/Export/Helpers/Pdf.php b/libraries/classes/Plugins/Export/Helpers/Pdf.php
index 673a852a0d..00b6c629e1 100644
--- a/libraries/classes/Plugins/Export/Helpers/Pdf.php
+++ b/libraries/classes/Plugins/Export/Helpers/Pdf.php
@@ -236,7 +236,7 @@ class Pdf extends PdfLib
 
         // Now let's start to write the table
         $row = 0;
-        $tmpheight = array();
+        $tmpheight = [];
         $maxpage = $this->page;
 
         while ($data = $GLOBALS['dbi']->fetchRow($this->results)) {
@@ -306,7 +306,7 @@ class Pdf extends PdfLib
      *
      * @return void
      */
-    public function setAttributes(array $attr = array())
+    public function setAttributes(array $attr = [])
     {
         foreach ($attr as $key => $val) {
             $this->$key = $val;
@@ -388,9 +388,9 @@ class Pdf extends PdfLib
         }
 
         $row = 0;
-        $tmpheight = array();
+        $tmpheight = [];
         $maxpage = $this->page;
-        $data = array();
+        $data = [];
 
         $triggers = $GLOBALS['dbi']->getTriggers($db, $table);
 
@@ -481,7 +481,7 @@ class Pdf extends PdfLib
         $do_comments,
         $do_mime,
         $view = false,
-        array $aliases = array()
+        array $aliases = []
     ) {
         // set $cfgRelation here, because there is a chance that it's modified
         // since the class initialization
@@ -574,7 +574,7 @@ class Pdf extends PdfLib
          * Presently, this information is not used. We will have to find out
          * way of displaying it.
          */
-        $unique_keys = array();
+        $unique_keys = [];
         $keys = $GLOBALS['dbi']->getTableIndexes($db, $table);
         foreach ($keys as $key) {
             if ($key['Non_unique'] == 0) {
@@ -593,9 +593,9 @@ class Pdf extends PdfLib
         }
 
         $row = 0;
-        $tmpheight = array();
+        $tmpheight = [];
         $maxpage = $this->page;
-        $data = array();
+        $data = [];
 
         // fun begin
         foreach ($columns as $column) {
@@ -733,8 +733,8 @@ class Pdf extends PdfLib
         // col widths/ titles/ alignment
         // if a col title is less than the starting col width,
         // reduce that column size
-        $colFits = array();
-        $titleWidth = array();
+        $colFits = [];
+        $titleWidth = [];
         for ($i = 0; $i < $this->numFields; $i++) {
             $col_as = $this->fields[$i]->name;
             $db = $this->currentDb;
diff --git a/libraries/classes/Plugins/ExportPlugin.php b/libraries/classes/Plugins/ExportPlugin.php
index 719109305b..f356410df3 100644
--- a/libraries/classes/Plugins/ExportPlugin.php
+++ b/libraries/classes/Plugins/ExportPlugin.php
@@ -119,7 +119,7 @@ abstract class ExportPlugin
         $crlf,
         $error_url,
         $sql_query,
-        array $aliases = array()
+        array $aliases = []
     );
 
     /**
@@ -135,7 +135,7 @@ abstract class ExportPlugin
      *
      * @return bool Whether it succeeded
      */
-    public function exportRoutines($db, array $aliases = array())
+    public function exportRoutines($db, array $aliases = [])
     {
         ;
     }
@@ -185,7 +185,7 @@ abstract class ExportPlugin
         $comments = false,
         $mime = false,
         $dates = false,
-        array $aliases = array()
+        array $aliases = []
     ) {
         ;
     }
@@ -217,7 +217,7 @@ abstract class ExportPlugin
      *
      * @return string resulting definition
      */
-    public function getTableDefStandIn($db, $view, $crlf, $aliases = array())
+    public function getTableDefStandIn($db, $view, $crlf, $aliases = [])
     {
         ;
     }
@@ -306,9 +306,9 @@ abstract class ExportPlugin
     public function getAlias(array $aliases, $id, $type = 'dbtblcol', $db = '', $tbl = '')
     {
         if (!empty($db) && isset($aliases[$db])) {
-            $aliases = array(
+            $aliases = [
                 $db => $aliases[$db],
-            );
+            ];
         }
         // search each database
         foreach ($aliases as $db_key => $db) {
@@ -323,9 +323,9 @@ abstract class ExportPlugin
                 continue;
             }
             if (!empty($tbl) && isset($db['tables'][$tbl])) {
-                $db['tables'] = array(
+                $db['tables'] = [
                     $tbl => $db['tables'][$tbl],
-                );
+                ];
             }
             // search each of its tables
             foreach ($db['tables'] as $table_key => $table) {
@@ -372,7 +372,7 @@ abstract class ExportPlugin
         array $res_rel,
         $field_name,
         $db,
-        array $aliases = array()
+        array $aliases = []
     ) {
         $relation = '';
         $foreigner = $this->relation->searchColumnInForeigners($res_rel, $field_name);
diff --git a/libraries/classes/Plugins/IOTransformationsPlugin.php b/libraries/classes/Plugins/IOTransformationsPlugin.php
index 32a2d7b99d..3652eba673 100644
--- a/libraries/classes/Plugins/IOTransformationsPlugin.php
+++ b/libraries/classes/Plugins/IOTransformationsPlugin.php
@@ -62,7 +62,7 @@ abstract class IOTransformationsPlugin extends TransformationsPlugin
      */
     public function getScripts()
     {
-        return array();
+        return [];
     }
 
     /**
diff --git a/libraries/classes/Plugins/Import/ImportCsv.php b/libraries/classes/Plugins/Import/ImportCsv.php
index 58383e9a01..62d49fb9f8 100644
--- a/libraries/classes/Plugins/Import/ImportCsv.php
+++ b/libraries/classes/Plugins/Import/ImportCsv.php
@@ -99,7 +99,7 @@ class ImportCsv extends AbstractImportCsv
      *
      * @return void
      */
-    public function doImport(array &$sql_data = array())
+    public function doImport(array &$sql_data = [])
     {
         global $db, $table, $csv_terminated, $csv_enclosed, $csv_escaped,
                $csv_new_line, $csv_columns, $err_url;
@@ -107,11 +107,11 @@ class ImportCsv extends AbstractImportCsv
         // but we use directly from $_POST
         global $error, $timeout_passed, $finished, $message;
 
-        $replacements = array(
+        $replacements = [
             '\\n' => "\n",
             '\\t' => "\t",
             '\\r' => "\r",
-        );
+        ];
         $csv_terminated = strtr($csv_terminated, $replacements);
         $csv_enclosed = strtr($csv_enclosed, $replacements);
         $csv_escaped = strtr($csv_escaped, $replacements);
@@ -189,7 +189,7 @@ class ImportCsv extends AbstractImportCsv
                 $fields = $tmp_fields;
             } else {
                 $sql_template .= ' (';
-                $fields = array();
+                $fields = [];
                 $tmp = preg_split('/,( ?)/', $csv_columns);
                 foreach ($tmp as $key => $val) {
                     if (count($fields) > 0) {
@@ -233,13 +233,13 @@ class ImportCsv extends AbstractImportCsv
         $lastlen = null;
         $line = 1;
         $lasti = -1;
-        $values = array();
+        $values = [];
         $csv_finish = false;
 
-        $tempRow = array();
-        $rows = array();
-        $col_names = array();
-        $tables = array();
+        $tempRow = [];
+        $rows = [];
+        $col_names = [];
+        $tables = [];
 
         $col_count = 0;
         $max_cols = 0;
@@ -522,7 +522,7 @@ class ImportCsv extends AbstractImportCsv
                         $col_count = 0;
 
                         $rows[] = $tempRow;
-                        $tempRow = array();
+                        $tempRow = [];
                     } else {
                         // Do we have correct count of values?
                         if (count($values) != $required_fields) {
@@ -581,7 +581,7 @@ class ImportCsv extends AbstractImportCsv
 
                     $line++;
                     $csv_finish = false;
-                    $values = array();
+                    $values = [];
                     $buffer = mb_substr($buffer, $i + 1);
                     $len = mb_strlen($buffer);
                     $i = 0;
@@ -625,10 +625,10 @@ class ImportCsv extends AbstractImportCsv
                 $tbl_name = 'TBL_NAME';
             }
 
-            $tables[] = array($tbl_name, $col_names, $rows);
+            $tables[] = [$tbl_name, $col_names, $rows];
 
             /* Obtain the best-fit MySQL types for each column */
-            $analyses = array();
+            $analyses = [];
             $analyses[] = $this->import->analyzeTable($tables[0]);
 
             /**
diff --git a/libraries/classes/Plugins/Import/ImportLdi.php b/libraries/classes/Plugins/Import/ImportLdi.php
index 8f75593037..34f45b70cb 100644
--- a/libraries/classes/Plugins/Import/ImportLdi.php
+++ b/libraries/classes/Plugins/Import/ImportLdi.php
@@ -95,7 +95,7 @@ class ImportLdi extends AbstractImportCsv
      *
      * @return void
      */
-    public function doImport(array &$sql_data = array())
+    public function doImport(array &$sql_data = [])
     {
         global $finished, $import_file, $charset_conversion, $table;
         global $ldi_local_option, $ldi_replace, $ldi_ignore, $ldi_terminated,
diff --git a/libraries/classes/Plugins/Import/ImportMediawiki.php b/libraries/classes/Plugins/Import/ImportMediawiki.php
index 165f31438f..90b15d09e7 100644
--- a/libraries/classes/Plugins/Import/ImportMediawiki.php
+++ b/libraries/classes/Plugins/Import/ImportMediawiki.php
@@ -56,7 +56,7 @@ class ImportMediawiki extends ImportPlugin
         $importPluginProperties->setText(__('MediaWiki Table'));
         $importPluginProperties->setExtension('txt');
         $importPluginProperties->setMimeType('text/plain');
-        $importPluginProperties->setOptions(array());
+        $importPluginProperties->setOptions([]);
         $importPluginProperties->setOptionsText(__('Options'));
 
         $this->properties = $importPluginProperties;
@@ -69,7 +69,7 @@ class ImportMediawiki extends ImportPlugin
      *
      * @return void
      */
-    public function doImport(array &$sql_data = array())
+    public function doImport(array &$sql_data = [])
     {
         global $error, $timeout_passed, $finished;
 
@@ -140,7 +140,7 @@ class ImportMediawiki extends ImportPlugin
                 }
 
                 $first_character = $cur_buffer_line[0];
-                $matches = array();
+                $matches = [];
 
                 // Check beginning of comment
                 if (!strcmp(mb_substr($cur_buffer_line, 0, 4), "<!--")) {
@@ -163,7 +163,7 @@ class ImportMediawiki extends ImportPlugin
                         }
                     } else {
                         // Check table name
-                        $match_table_name = array();
+                        $match_table_name = [];
                         if (preg_match(
                             "/^Table data for `(.*)`$/",
                             $cur_buffer_line,
@@ -193,12 +193,12 @@ class ImportMediawiki extends ImportPlugin
 
                     // This will store all the column info on all rows from
                     // the current table read from the buffer
-                    $cur_temp_table = array();
+                    $cur_temp_table = [];
 
                     // Will be used as storage for the current row in the buffer
                     // Once all its columns are read, it will be added to
                     // $cur_temp_table and then it will be emptied
-                    $cur_temp_line = array();
+                    $cur_temp_line = [];
 
                     // Helps us differentiate the header columns
                     // from the normal columns
@@ -226,15 +226,15 @@ class ImportMediawiki extends ImportPlugin
                     }
 
                     // Empty the temporary buffer
-                    $cur_temp_line = array();
+                    $cur_temp_line = [];
 
                     // No more processing required at the end of the table
                     if (mb_substr($cur_buffer_line, 0, 2) === '|}') {
-                        $current_table = array(
+                        $current_table = [
                             $cur_table_name,
                             $cur_temp_table_headers,
                             $cur_temp_table,
-                        );
+                        ];
 
                         // Import the current table data into the database
                         $this->_importDataOneTable($current_table, $sql_data);
@@ -264,7 +264,7 @@ class ImportMediawiki extends ImportPlugin
 
                         // Delete the beginning of the column, if there is one
                         $cell = trim($cell);
-                        $col_start_chars = array("|", "!");
+                        $col_start_chars = ["|", "!"];
                         foreach ($col_start_chars as $col_start_char) {
                             $cell = $this->_getCellContent($cell, $col_start_char);
                         }
@@ -312,11 +312,11 @@ class ImportMediawiki extends ImportPlugin
             $this->_setTableHeaders($table[1], $table[2][0]);
 
             // Create the tables array to be used in Import::buildSql()
-            $tables = array();
-            $tables [] = array($table[0], $table[1], $table[2]);
+            $tables = [];
+            $tables [] = [$table[0], $table[1], $table[2]];
 
             // Obtain the best-fit MySQL types for each column
-            $analyses = array();
+            $analyses = [];
             $analyses [] = $this->import->analyzeTable($tables[0]);
 
             $this->_executeImportTables($tables, $analyses, $sql_data);
diff --git a/libraries/classes/Plugins/Import/ImportOds.php b/libraries/classes/Plugins/Import/ImportOds.php
index 42c156302e..57e1389000 100644
--- a/libraries/classes/Plugins/Import/ImportOds.php
+++ b/libraries/classes/Plugins/Import/ImportOds.php
@@ -103,7 +103,7 @@ class ImportOds extends ImportPlugin
      *
      * @return void
      */
-    public function doImport(array &$sql_data = array())
+    public function doImport(array &$sql_data = [])
     {
         global $db, $error, $timeout_passed, $finished;
 
@@ -149,7 +149,7 @@ class ImportOds extends ImportPlugin
         unset($buffer);
 
         if ($xml === false) {
-            $sheets = array();
+            $sheets = [];
             $GLOBALS['message'] = Message::error(
                 __(
                     'The XML file specified was either malformed or incomplete.'
@@ -161,7 +161,7 @@ class ImportOds extends ImportPlugin
             /** @var SimpleXMLElement $root */
             $root = $xml->children('office', true)->{'body'}->{'spreadsheet'};
             if (empty($root)) {
-                $sheets = array();
+                $sheets = [];
                 $GLOBALS['message'] = Message::error(
                     __('Could not parse OpenDocument Spreadsheet!')
                 );
@@ -171,16 +171,16 @@ class ImportOds extends ImportPlugin
             }
         }
 
-        $tables = array();
+        $tables = [];
 
         $max_cols = 0;
 
         $col_count = 0;
-        $col_names = array();
+        $col_names = [];
 
-        $tempRow = array();
-        $tempRows = array();
-        $rows = array();
+        $tempRow = [];
+        $tempRows = [];
+        $rows = [];
 
         /* Iterate over tables */
         /** @var SimpleXMLElement $sheet */
@@ -279,14 +279,14 @@ class ImportOds extends ImportPlugin
 
                 $col_count = 0;
                 $col_names_in_first_row = false;
-                $tempRow = array();
+                $tempRow = [];
             }
 
             /* Skip over empty sheets */
             if (count($tempRows) == 0 || count($tempRows[0]) == 0) {
-                $col_names = array();
-                $tempRow = array();
-                $tempRows = array();
+                $col_names = [];
+                $tempRow = [];
+                $tempRows = [];
                 continue;
             }
 
@@ -311,12 +311,12 @@ class ImportOds extends ImportPlugin
 
             /* Store the table name so we know where to place the row set */
             $tbl_attr = $sheet->attributes('table', true);
-            $tables[] = array((string)$tbl_attr['name']);
+            $tables[] = [(string)$tbl_attr['name']];
 
             /* Store the current sheet in the accumulator */
-            $rows[] = array((string)$tbl_attr['name'], $col_names, $tempRows);
-            $tempRows = array();
-            $col_names = array();
+            $rows[] = [(string)$tbl_attr['name'], $col_names, $tempRows];
+            $tempRows = [];
+            $col_names = [];
             $max_cols = 0;
         }
 
@@ -349,7 +349,7 @@ class ImportOds extends ImportPlugin
         unset($rows);
 
         /* Obtain the best-fit MySQL types for each column */
-        $analyses = array();
+        $analyses = [];
 
         $len = count($tables);
         for ($i = 0; $i < $len; ++$i) {
@@ -414,7 +414,7 @@ class ImportOds extends ImportPlugin
         }
 
         /* We need to concatenate all paragraphs */
-        $values = array();
+        $values = [];
         foreach ($text as $paragraph) {
             $values[] = (string) $paragraph;
         }
diff --git a/libraries/classes/Plugins/Import/ImportShp.php b/libraries/classes/Plugins/Import/ImportShp.php
index e6155f9e81..f1a9316408 100644
--- a/libraries/classes/Plugins/Import/ImportShp.php
+++ b/libraries/classes/Plugins/Import/ImportShp.php
@@ -58,7 +58,7 @@ class ImportShp extends ImportPlugin
         $importPluginProperties = new ImportPluginProperties();
         $importPluginProperties->setText(__('ESRI Shape File'));
         $importPluginProperties->setExtension('shp');
-        $importPluginProperties->setOptions(array());
+        $importPluginProperties->setOptions([]);
         $importPluginProperties->setOptionsText(__('Options'));
 
         $this->properties = $importPluginProperties;
@@ -71,7 +71,7 @@ class ImportShp extends ImportPlugin
      *
      * @return void
      */
-    public function doImport(array &$sql_data = array())
+    public function doImport(array &$sql_data = [])
     {
         global $db, $error, $finished,
                $import_file, $local_import_file, $message;
@@ -208,11 +208,11 @@ class ImportShp extends ImportPlugin
         // If .dbf file is loaded, the number of extra data columns
         $num_data_cols = isset($shp->DBFHeader) ? count($shp->DBFHeader) : 0;
 
-        $rows = array();
-        $col_names = array();
+        $rows = [];
+        $col_names = [];
         if ($num_rows != 0) {
             foreach ($shp->records as $record) {
-                $tempRow = array();
+                $tempRow = [];
                 if ($gis_obj == null) {
                     $tempRow[] = null;
                 } else {
@@ -258,10 +258,10 @@ class ImportShp extends ImportPlugin
         } else {
             $table_name = 'TBL_NAME';
         }
-        $tables = array(array($table_name, $col_names, $rows));
+        $tables = [[$table_name, $col_names, $rows]];
 
         // Use data from shape file to chose best-fit MySQL types for each column
-        $analyses = array();
+        $analyses = [];
         $analyses[] = $this->import->analyzeTable($tables[0]);
 
         $table_no = 0;
@@ -272,7 +272,7 @@ class ImportShp extends ImportPlugin
         // Set database name to the currently selected one, if applicable
         if (strlen((string) $db) > 0) {
             $db_name = $db;
-            $options = array('create_db' => false);
+            $options = ['create_db' => false];
         } else {
             $db_name = 'SHP_DB';
             $options = null;
diff --git a/libraries/classes/Plugins/Import/ImportSql.php b/libraries/classes/Plugins/Import/ImportSql.php
index 32b8dc499f..31f36b5a4a 100644
--- a/libraries/classes/Plugins/Import/ImportSql.php
+++ b/libraries/classes/Plugins/Import/ImportSql.php
@@ -51,7 +51,7 @@ class ImportSql extends ImportPlugin
 
         $compats = $GLOBALS['dbi']->getCompatibilities();
         if (count($compats) > 0) {
-            $values = array();
+            $values = [];
             foreach ($compats as $val) {
                 $values[$val] = $val;
             }
@@ -72,10 +72,10 @@ class ImportSql extends ImportPlugin
             );
             $leaf->setValues($values);
             $leaf->setDoc(
-                array(
+                [
                     'manual_MySQL_Database_Administration',
                     'Server_SQL_mode',
-                )
+                ]
             );
             $generalOptions->addProperty($leaf);
             $leaf = new BoolPropertyItem(
@@ -83,11 +83,11 @@ class ImportSql extends ImportPlugin
                 __('Do not use <code>AUTO_INCREMENT</code> for zero values')
             );
             $leaf->setDoc(
-                array(
+                [
                     'manual_MySQL_Database_Administration',
                     'Server_SQL_mode',
                     'sqlmode_no_auto_value_on_zero',
-                )
+                ]
             );
             $generalOptions->addProperty($leaf);
 
@@ -107,7 +107,7 @@ class ImportSql extends ImportPlugin
      *
      * @return void
      */
-    public function doImport(array &$sql_data = array())
+    public function doImport(array &$sql_data = [])
     {
         global $error, $timeout_passed;
 
@@ -183,7 +183,7 @@ class ImportSql extends ImportPlugin
      */
     private function _setSQLMode($dbi, array $request)
     {
-        $sql_modes = array();
+        $sql_modes = [];
         if (isset($request['sql_compatibility'])
             && 'NONE' != $request['sql_compatibility']
         ) {
diff --git a/libraries/classes/Plugins/Import/ImportXml.php b/libraries/classes/Plugins/Import/ImportXml.php
index 0be85fc0e3..24213d3be4 100644
--- a/libraries/classes/Plugins/Import/ImportXml.php
+++ b/libraries/classes/Plugins/Import/ImportXml.php
@@ -47,7 +47,7 @@ class ImportXml extends ImportPlugin
         $importPluginProperties->setText(__('XML'));
         $importPluginProperties->setExtension('xml');
         $importPluginProperties->setMimeType('text/xml');
-        $importPluginProperties->setOptions(array());
+        $importPluginProperties->setOptions([]);
         $importPluginProperties->setOptionsText(__('Options'));
 
         $this->properties = $importPluginProperties;
@@ -60,7 +60,7 @@ class ImportXml extends ImportPlugin
      *
      * @return void
      */
-    public function doImport(array &$sql_data = array())
+    public function doImport(array &$sql_data = [])
     {
         global $error, $timeout_passed, $finished, $db;
 
@@ -125,17 +125,17 @@ class ImportXml extends ImportPlugin
         /**
          * Table accumulator
          */
-        $tables = array();
+        $tables = [];
         /**
          * Row accumulator
          */
-        $rows = array();
+        $rows = [];
 
         /**
          * Temp arrays
          */
-        $tempRow = array();
-        $tempCells = array();
+        $tempRow = [];
+        $tempCells = [];
 
         /**
          * CREATE code included (by default: no)
@@ -198,7 +198,7 @@ class ImportXml extends ImportPlugin
              */
             $struct = $xml->children($namespaces['pma']);
 
-            $create = array();
+            $create = [];
 
             /** @var SimpleXMLElement $val1 */
             foreach ($struct as $val1) {
@@ -259,7 +259,7 @@ class ImportXml extends ImportPlugin
                 }
 
                 if (!$isInTables) {
-                    $tables[] = array((string)$tbl_attr['name']);
+                    $tables[] = [(string)$tbl_attr['name']];
                 }
 
                 foreach ($v1 as $v2) {
@@ -270,10 +270,10 @@ class ImportXml extends ImportPlugin
                     $tempCells[] = (string)$v2;
                 }
 
-                $rows[] = array((string)$tbl_attr['name'], $tempRow, $tempCells);
+                $rows[] = [(string)$tbl_attr['name'], $tempRow, $tempCells];
 
-                $tempRow = array();
-                $tempCells = array();
+                $tempRow = [];
+                $tempCells = [];
             }
 
             unset($tempRow);
@@ -300,7 +300,7 @@ class ImportXml extends ImportPlugin
             unset($rows);
 
             if (!$struct_present) {
-                $analyses = array();
+                $analyses = [];
 
                 $len = count($tables);
                 for ($i = 0; $i < $len; ++$i) {
@@ -347,17 +347,17 @@ class ImportXml extends ImportPlugin
         if (strlen((string) $db)) {
             /* Override the database name in the XML file, if one is selected */
             $db_name = $db;
-            $options = array('create_db' => false);
+            $options = ['create_db' => false];
         } else {
             if ($db_name === null) {
                 $db_name = 'XML_DB';
             }
 
             /* Set database collation/charset */
-            $options = array(
+            $options = [
                 'db_collation' => $collation,
                 'db_charset'   => $charset,
-            );
+            ];
         }
 
         /* Created and execute necessary SQL statements from data */
diff --git a/libraries/classes/Plugins/Import/Upload/UploadApc.php b/libraries/classes/Plugins/Import/Upload/UploadApc.php
index 13e23d3021..35e49dd66d 100644
--- a/libraries/classes/Plugins/Import/Upload/UploadApc.php
+++ b/libraries/classes/Plugins/Import/Upload/UploadApc.php
@@ -46,14 +46,14 @@ class UploadApc implements UploadInterface
             return null;
         }
         if (!array_key_exists($id, $_SESSION[$SESSION_KEY])) {
-            $_SESSION[$SESSION_KEY][$id] = array(
+            $_SESSION[$SESSION_KEY][$id] = [
                 'id'       => $id,
                 'finished' => false,
                 'percent'  => 0,
                 'total'    => 0,
                 'complete' => 0,
                 'plugin'   => UploadApc::getIdKey(),
-            );
+            ];
         }
         $ret = $_SESSION[$SESSION_KEY][$id];
 
diff --git a/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php b/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php
index d947b2acc4..8784cfa2db 100644
--- a/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php
+++ b/libraries/classes/Plugins/Import/Upload/UploadNoplugin.php
@@ -46,14 +46,14 @@ class UploadNoplugin implements UploadInterface
             return null;
         }
         if (!array_key_exists($id, $_SESSION[$SESSION_KEY])) {
-            $_SESSION[$SESSION_KEY][$id] = array(
+            $_SESSION[$SESSION_KEY][$id] = [
                 'id'       => $id,
                 'finished' => false,
                 'percent'  => 0,
                 'total'    => 0,
                 'complete' => 0,
                 'plugin'   => UploadNoplugin::getIdKey(),
-            );
+            ];
         }
         $ret = $_SESSION[$SESSION_KEY][$id];
 
diff --git a/libraries/classes/Plugins/Import/Upload/UploadProgress.php b/libraries/classes/Plugins/Import/Upload/UploadProgress.php
index aef07da273..fbfa96046e 100644
--- a/libraries/classes/Plugins/Import/Upload/UploadProgress.php
+++ b/libraries/classes/Plugins/Import/Upload/UploadProgress.php
@@ -47,14 +47,14 @@ class UploadProgress implements UploadInterface
         }
 
         if (!array_key_exists($id, $_SESSION[$SESSION_KEY])) {
-            $_SESSION[$SESSION_KEY][$id] = array(
+            $_SESSION[$SESSION_KEY][$id] = [
                 'id'       => $id,
                 'finished' => false,
                 'percent'  => 0,
                 'total'    => 0,
                 'complete' => 0,
                 'plugin'   => UploadProgress::getIdKey(),
-            );
+            ];
         }
         $ret = $_SESSION[$SESSION_KEY][$id];
 
@@ -77,14 +77,14 @@ class UploadProgress implements UploadInterface
                 $ret['percent'] = $ret['complete'] / $ret['total'] * 100;
             }
         } else {
-            $ret = array(
+            $ret = [
                 'id'       => $id,
                 'finished' => true,
                 'percent'  => 100,
                 'total'    => $ret['total'],
                 'complete' => $ret['total'],
                 'plugin'   => UploadProgress::getIdKey(),
-            );
+            ];
         }
 
         $_SESSION[$SESSION_KEY][$id] = $ret;
diff --git a/libraries/classes/Plugins/Import/Upload/UploadSession.php b/libraries/classes/Plugins/Import/Upload/UploadSession.php
index 315788f80f..9562c15bfe 100644
--- a/libraries/classes/Plugins/Import/Upload/UploadSession.php
+++ b/libraries/classes/Plugins/Import/Upload/UploadSession.php
@@ -47,14 +47,14 @@ class UploadSession implements UploadInterface
         }
 
         if (!array_key_exists($id, $_SESSION[$SESSION_KEY])) {
-            $_SESSION[$SESSION_KEY][$id] = array(
+            $_SESSION[$SESSION_KEY][$id] = [
                 'id'       => $id,
                 'finished' => false,
                 'percent'  => 0,
                 'total'    => 0,
                 'complete' => 0,
                 'plugin'   => UploadSession::getIdKey(),
-            );
+            ];
         }
         $ret = $_SESSION[$SESSION_KEY][$id];
 
@@ -78,14 +78,14 @@ class UploadSession implements UploadInterface
                 $ret['percent'] = $ret['complete'] / $ret['total'] * 100;
             }
         } else {
-            $ret = array(
+            $ret = [
                 'id'       => $id,
                 'finished' => true,
                 'percent'  => 100,
                 'total'    => $ret['total'],
                 'complete' => $ret['total'],
                 'plugin'   => UploadSession::getIdKey(),
-            );
+            ];
         }
 
         $_SESSION[$SESSION_KEY][$id] = $ret;
diff --git a/libraries/classes/Plugins/ImportPlugin.php b/libraries/classes/Plugins/ImportPlugin.php
index 93d18130c7..7fd015816f 100644
--- a/libraries/classes/Plugins/ImportPlugin.php
+++ b/libraries/classes/Plugins/ImportPlugin.php
@@ -80,12 +80,12 @@ abstract class ImportPlugin
     {
         if (strlen((string) $currentDb) > 0) {
             $db_name = $currentDb;
-            $options = array('create_db' => false);
+            $options = ['create_db' => false];
         } else {
             $db_name = $defaultDb;
             $options = null;
         }
 
-        return array($db_name, $options);
+        return [$db_name, $options];
     }
 }
diff --git a/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php b/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php
index 696c56a61c..6c4c3a7ba0 100644
--- a/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php
+++ b/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php
@@ -36,9 +36,9 @@ class DiaRelationSchema extends ExportRelationSchema
     /**
      * @var TableStatsDia[]|TableStatsEps[]|TableStatsPdf[]|TableStatsSvg[]
      */
-    private $_tables = array();
+    private $_tables = [];
     /** @var RelationStatsDia[] Relations */
-    private $_relations = array();
+    private $_relations = [];
     private $_topMargin = 2.8222000598907471;
     private $_bottomMargin = 2.8222000598907471;
     private $_leftMargin = 2.8222000598907471;
diff --git a/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php b/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php
index 666084c624..fe7e474db3 100644
--- a/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php
+++ b/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php
@@ -84,9 +84,9 @@ class RelationStatsDia
         // left, right, position
         $value = 12;
         if ($pos != 0) {
-            return array($pos + $value + $pos, $pos + $value + $pos + 1, $pos);
+            return [$pos + $value + $pos, $pos + $value + $pos + 1, $pos];
         }
-        return array($pos + $value , $pos + $value + 1, $pos);
+        return [$pos + $value , $pos + $value + 1, $pos];
     }
 
     /**
@@ -124,11 +124,11 @@ class RelationStatsDia
         }
 
         if ($showColor) {
-            $listOfColors = array(
+            $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 293fdaadb5..1682f5e065 100644
--- a/libraries/classes/Plugins/Schema/Dia/TableStatsDia.php
+++ b/libraries/classes/Plugins/Schema/Dia/TableStatsDia.php
@@ -99,11 +99,11 @@ class TableStatsDia extends TableStats
     public function tableDraw($showColor)
     {
         if ($showColor) {
-            $listOfColors = array(
+            $listOfColors = [
                 'FF0000',
                 '000099',
                 '00FF00'
-            );
+            ];
             shuffle($listOfColors);
             $this->tableColor =  '#' . $listOfColors[0] . '';
         } else {
diff --git a/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php b/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php
index 01ad51f5f6..9f4dd0891e 100644
--- a/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php
+++ b/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php
@@ -35,10 +35,10 @@ class EpsRelationSchema extends ExportRelationSchema
     /**
      * @var TableStatsDia[]|TableStatsEps[]|TableStatsPdf[]|TableStatsSvg[]
      */
-    private $_tables = array();
+    private $_tables = [];
 
     /** @var RelationStatsDia[] Relations */
-    private $_relations = array();
+    private $_relations = [];
 
     private $_tablewidth;
 
diff --git a/libraries/classes/Plugins/Schema/ExportRelationSchema.php b/libraries/classes/Plugins/Schema/ExportRelationSchema.php
index d0f1ee2b99..4b11ba3cb3 100644
--- a/libraries/classes/Plugins/Schema/ExportRelationSchema.php
+++ b/libraries/classes/Plugins/Schema/ExportRelationSchema.php
@@ -247,7 +247,7 @@ class ExportRelationSchema
      */
     protected function getTablesFromRequest()
     {
-        $tables = array();
+        $tables = [];
         $dbLength = mb_strlen($this->db);
         foreach ($_REQUEST['t_h'] as $key => $value) {
             if ($value) {
@@ -303,7 +303,7 @@ class ExportRelationSchema
         echo '    ' , $error_message , "\n";
         echo '</p>' , "\n";
         echo '<a href="db_designer.php'
-            , Url::getCommon(array('db' => $GLOBALS['db']))
+            , Url::getCommon(['db' => $GLOBALS['db']])
             , '&page=' . htmlspecialchars($pageNumber) , '">' , __('Back') , '</a>';
         echo "\n";
         exit;
diff --git a/libraries/classes/Plugins/Schema/Pdf/Pdf.php b/libraries/classes/Plugins/Schema/Pdf/Pdf.php
index da7edce30d..c75ac9dd99 100644
--- a/libraries/classes/Plugins/Schema/Pdf/Pdf.php
+++ b/libraries/classes/Plugins/Schema/Pdf/Pdf.php
@@ -47,7 +47,7 @@ class Pdf extends PdfLib
     var $topMargin = 10;
     var $scale;
     var $PMA_links;
-    var $Outlines = array();
+    var $Outlines = [];
     var $def_outlines;
     var $widths;
     private $_ff = PdfLib::PMA_PDF_FONT;
diff --git a/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php
index b21e1a5de3..1e50d77d14 100644
--- a/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php
+++ b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php
@@ -54,7 +54,7 @@ class PdfRelationSchema extends ExportRelationSchema
     /**
      * @var TableStatsPdf[]
      */
-    private $_tables = array();
+    private $_tables = [];
     private $_ff = PdfLib::PMA_PDF_FONT;
     private $_xMax = 0;
     private $_yMax = 0;
@@ -70,7 +70,7 @@ class PdfRelationSchema extends ExportRelationSchema
     /**
      * @var RelationStatsPdf[]
      */
-    protected $relations = array();
+    protected $relations = [];
 
     /**
      * @var Transformations
@@ -655,7 +655,7 @@ class PdfRelationSchema extends ExportRelationSchema
                 $this->diagram->Cell($comments_width, 8, __('Comments'), 1, 0, 'C');
                 $this->diagram->Cell(45, 8, 'MIME', 1, 1, 'C');
                 $this->diagram->setWidths(
-                    array(25, 20, 20, 10, 20, 25, 45, $comments_width, 45)
+                    [25, 20, 20, 10, 20, 25, 45, $comments_width, 45]
                 );
             } else {
                 $this->diagram->Cell(20, 8, __('Column'), 1, 0, 'C');
@@ -667,7 +667,7 @@ class PdfRelationSchema extends ExportRelationSchema
                 $this->diagram->Cell(30, 8, __('Links to'), 1, 0, 'C');
                 $this->diagram->Cell(30, 8, __('Comments'), 1, 0, 'C');
                 $this->diagram->Cell(30, 8, 'MIME', 1, 1, 'C');
-                $this->diagram->setWidths(array(20, 20, 20, 10, 15, 15, 30, 30, 30));
+                $this->diagram->setWidths([20, 20, 20, 10, 15, 15, 30, 30, 30]);
             }
             $this->diagram->SetFont($this->_ff, '');
 
@@ -706,7 +706,7 @@ class PdfRelationSchema extends ExportRelationSchema
                     }
                 }
 
-                $this->diagram_row = array(
+                $this->diagram_row = [
                     $field_name,
                     $type,
                     $attribute,
@@ -722,8 +722,8 @@ class PdfRelationSchema extends ExportRelationSchema
                     (isset($mime_map) && isset($mime_map[$field_name])
                         ? str_replace('_', '/', $mime_map[$field_name]['mimetype'])
                         : '')
-                );
-                $links = array();
+                ];
+                $links = [];
                 $links[0] = $this->diagram->PMA_links['RT'][$table][$field_name];
                 if ($foreigner
                     && isset($this->diagram->PMA_links['doc'][$foreigner['foreign_table']][$foreigner['foreign_field']])
diff --git a/libraries/classes/Plugins/Schema/Pdf/RelationStatsPdf.php b/libraries/classes/Plugins/Schema/Pdf/RelationStatsPdf.php
index a8eb2bbf18..24b2327f50 100644
--- a/libraries/classes/Plugins/Schema/Pdf/RelationStatsPdf.php
+++ b/libraries/classes/Plugins/Schema/Pdf/RelationStatsPdf.php
@@ -64,14 +64,14 @@ class RelationStatsPdf extends RelationStats
             $j = ($i - $d) / 6;
             $j = $j % 4;
             $j++;
-            $case = array(
-                array(1, 0, 0),
-                array(0, 1, 0),
-                array(0, 0, 1),
-                array(1, 1, 0),
-                array(1, 0, 1),
-                array(0, 1, 1)
-            );
+            $case = [
+                [1, 0, 0],
+                [0, 1, 0],
+                [0, 0, 1],
+                [1, 1, 0],
+                [1, 0, 1],
+                [0, 1, 1]
+            ];
             list ($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 84bffe7dbf..2c11a9a389 100644
--- a/libraries/classes/Plugins/Schema/RelationStats.php
+++ b/libraries/classes/Plugins/Schema/RelationStats.php
@@ -107,10 +107,10 @@ abstract class RelationStats
         $pos = array_search($column, $table->fields);
 
         // x_left, x_right, y
-        return array(
+        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 d98817846e..10a7f46a8a 100644
--- a/libraries/classes/Plugins/Schema/SchemaDia.php
+++ b/libraries/classes/Plugins/Schema/SchemaDia.php
@@ -62,10 +62,10 @@ class SchemaDia extends SchemaPlugin
             __('Orientation')
         );
         $leaf->setValues(
-            array(
+            [
                 'L' => __('Landscape'),
                 'P' => __('Portrait'),
-            )
+            ]
         );
         $specificOptions->addProperty($leaf);
 
diff --git a/libraries/classes/Plugins/Schema/SchemaEps.php b/libraries/classes/Plugins/Schema/SchemaEps.php
index b12f3c9da3..19e56b94a2 100644
--- a/libraries/classes/Plugins/Schema/SchemaEps.php
+++ b/libraries/classes/Plugins/Schema/SchemaEps.php
@@ -70,10 +70,10 @@ class SchemaEps extends SchemaPlugin
             __('Orientation')
         );
         $leaf->setValues(
-            array(
+            [
                 'L' => __('Landscape'),
                 'P' => __('Portrait'),
-            )
+            ]
         );
         $specificOptions->addProperty($leaf);
 
diff --git a/libraries/classes/Plugins/Schema/SchemaPdf.php b/libraries/classes/Plugins/Schema/SchemaPdf.php
index e0ec627ef8..e2a27ca198 100644
--- a/libraries/classes/Plugins/Schema/SchemaPdf.php
+++ b/libraries/classes/Plugins/Schema/SchemaPdf.php
@@ -70,10 +70,10 @@ class SchemaPdf extends SchemaPlugin
             __('Orientation')
         );
         $leaf->setValues(
-            array(
+            [
                 'L' => __('Landscape'),
                 'P' => __('Portrait'),
-            )
+            ]
         );
         $specificOptions->addProperty($leaf);
 
@@ -101,11 +101,11 @@ class SchemaPdf extends SchemaPlugin
             __('Order of the tables')
         );
         $leaf->setValues(
-            array(
+            [
                 ''          => __('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 865d0994fa..b68f0cd082 100644
--- a/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php
+++ b/libraries/classes/Plugins/Schema/Svg/RelationStatsSvg.php
@@ -64,7 +64,7 @@ class RelationStatsSvg extends RelationStats
     public function relationDraw($showColor)
     {
         if ($showColor) {
-            $listOfColors = array(
+            $listOfColors = [
                 '#c00',
                 '#bbb',
                 '#333',
@@ -72,7 +72,7 @@ class RelationStatsSvg extends RelationStats
                 '#0b0',
                 '#0bf',
                 '#b0b',
-            );
+            ];
             shuffle($listOfColors);
             $color = $listOfColors[0];
         } else {
diff --git a/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php b/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php
index 3f8c1edb4e..6646241551 100644
--- a/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php
+++ b/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php
@@ -38,9 +38,9 @@ class SvgRelationSchema extends ExportRelationSchema
     /**
      * @var PhpMyAdmin\Plugins\Schema\Dia\TableStatsDia[]|TableStatsEps[]|TableStatsPdf[]|TableStatsSvg[]
      */
-    private $_tables = array();
+    private $_tables = [];
     /** @var RelationStatsDia[] Relations */
-    private $_relations = array();
+    private $_relations = [];
     private $_xMax = 0;
     private $_yMax = 0;
     private $_xMin = 100000;
diff --git a/libraries/classes/Plugins/Schema/TableStats.php b/libraries/classes/Plugins/Schema/TableStats.php
index d3110b8cc7..c790f3cbfb 100644
--- a/libraries/classes/Plugins/Schema/TableStats.php
+++ b/libraries/classes/Plugins/Schema/TableStats.php
@@ -33,8 +33,8 @@ abstract class TableStats
     protected $showKeys;
     protected $tableDimension;
     public $displayfield;
-    public $fields = array();
-    public $primary = array();
+    public $fields = [];
+    public $primary = [];
     public $x, $y;
     public $width = 0;
     public $heightCell = 0;
@@ -109,7 +109,7 @@ abstract class TableStats
 
         if ($this->showKeys) {
             $indexes = Index::getFromTable($this->tableName, $this->db);
-            $all_columns = array();
+            $all_columns = [];
             foreach ($indexes as $index) {
                 $all_columns = array_merge(
                     $all_columns,
diff --git a/libraries/classes/Plugins/SchemaPlugin.php b/libraries/classes/Plugins/SchemaPlugin.php
index 2660efe480..2b62d8ce79 100644
--- a/libraries/classes/Plugins/SchemaPlugin.php
+++ b/libraries/classes/Plugins/SchemaPlugin.php
@@ -80,7 +80,7 @@ abstract class SchemaPlugin
      */
     protected function getPaperSizeArray()
     {
-        $ret = array();
+        $ret = [];
         foreach ($GLOBALS['cfg']['PDFPageSizes'] as $val) {
             $ret[$val] = $val;
         }
diff --git a/libraries/classes/Plugins/Transformations/Abs/Bool2TextTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/Bool2TextTransformationsPlugin.php
index 7df770fb04..4cb02dbc0f 100644
--- a/libraries/classes/Plugins/Transformations/Abs/Bool2TextTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/Bool2TextTransformationsPlugin.php
@@ -42,7 +42,7 @@ abstract class Bool2TextTransformationsPlugin extends TransformationsPlugin
      *
      * @return string
      */
-    public function applyTransformation($buffer, array $options = array(), $meta = '')
+    public function applyTransformation($buffer, array $options = [], $meta = '')
     {
         $cfg = $GLOBALS['cfg'];
         $options = $this->getOptions($options, $cfg['DefaultTransformations']['Bool2Text']);
diff --git a/libraries/classes/Plugins/Transformations/Abs/CodeMirrorEditorTransformationPlugin.php b/libraries/classes/Plugins/Transformations/Abs/CodeMirrorEditorTransformationPlugin.php
index e32d2662f7..1784f8975a 100644
--- a/libraries/classes/Plugins/Transformations/Abs/CodeMirrorEditorTransformationPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/CodeMirrorEditorTransformationPlugin.php
@@ -27,7 +27,7 @@ abstract class CodeMirrorEditorTransformationPlugin extends IOTransformationsPlu
      *
      * @return string
      */
-    public function applyTransformation($buffer, array $options = array(), $meta = '')
+    public function applyTransformation($buffer, array $options = [], $meta = '')
     {
         return $buffer;
     }
diff --git a/libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php
index f21e654754..eec812c752 100644
--- a/libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php
@@ -50,7 +50,7 @@ abstract class DateFormatTransformationsPlugin extends TransformationsPlugin
      *
      * @return string
      */
-    public function applyTransformation($buffer, array $options = array(), $meta = '')
+    public function applyTransformation($buffer, array $options = [], $meta = '')
     {
         $buffer = (string) $buffer;
         // possibly use a global transform and feed it with special options
@@ -89,7 +89,7 @@ abstract class DateFormatTransformationsPlugin extends TransformationsPlugin
                     $offset = 2;
                 }
 
-                $aDate = array();
+                $aDate = [];
                 $aDate['year'] = (int)
                 mb_substr($buffer, 0, $offset);
                 $aDate['month'] = (int)
diff --git a/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php
index 8c708489f6..8952393b3a 100644
--- a/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/DownloadTransformationsPlugin.php
@@ -44,7 +44,7 @@ abstract class DownloadTransformationsPlugin extends TransformationsPlugin
      *
      * @return string
      */
-    public function applyTransformation($buffer, array $options = array(), $meta = '')
+    public function applyTransformation($buffer, array $options = [], $meta = '')
     {
         global $row, $fields_meta;
 
diff --git a/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php
index 9924b8a5d8..9259dad59b 100644
--- a/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php
@@ -49,7 +49,7 @@ abstract class ExternalTransformationsPlugin extends TransformationsPlugin
      *
      * @return bool
      */
-    public function applyTransformationNoWrap(array $options = array())
+    public function applyTransformationNoWrap(array $options = [])
     {
         if (!isset($options[3]) || $options[3] == '') {
             $nowrap = true;
@@ -71,13 +71,13 @@ abstract class ExternalTransformationsPlugin extends TransformationsPlugin
      *
      * @return string
      */
-    public function applyTransformation($buffer, array $options = array(), $meta = '')
+    public function applyTransformation($buffer, array $options = [], $meta = '')
     {
         // possibly use a global transform and feed it with special options
 
         // further operations on $buffer using the $options[] array.
 
-        $allowed_programs = array();
+        $allowed_programs = [];
 
         //
         // WARNING:
@@ -112,10 +112,10 @@ abstract class ExternalTransformationsPlugin extends TransformationsPlugin
 
         // needs PHP >= 4.3.0
         $newstring = '';
-        $descriptorspec = array(
-            0 => array("pipe", "r"),
-            1 => array("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/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php
index 22fe9e9a93..2eb8a62936 100644
--- a/libraries/classes/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php
@@ -42,7 +42,7 @@ abstract class FormattedTransformationsPlugin extends TransformationsPlugin
      *
      * @return string
      */
-    public function applyTransformation($buffer, array $options = array(), $meta = '')
+    public function applyTransformation($buffer, array $options = [], $meta = '')
     {
         return '<iframe srcdoc="'
             . strtr($buffer, '"', '\'')
diff --git a/libraries/classes/Plugins/Transformations/Abs/HexTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/HexTransformationsPlugin.php
index 64f9ab0208..29b9ab894c 100644
--- a/libraries/classes/Plugins/Transformations/Abs/HexTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/HexTransformationsPlugin.php
@@ -42,7 +42,7 @@ abstract class HexTransformationsPlugin extends TransformationsPlugin
      *
      * @return string
      */
-    public function applyTransformation($buffer, array $options = array(), $meta = '')
+    public function applyTransformation($buffer, array $options = [], $meta = '')
     {
         // possibly use a global transform and feed it with special options
         $cfg = $GLOBALS['cfg'];
diff --git a/libraries/classes/Plugins/Transformations/Abs/ImageLinkTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/ImageLinkTransformationsPlugin.php
index 2615a42c08..3a754847de 100644
--- a/libraries/classes/Plugins/Transformations/Abs/ImageLinkTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/ImageLinkTransformationsPlugin.php
@@ -40,7 +40,7 @@ abstract class ImageLinkTransformationsPlugin extends TransformationsPlugin
      *
      * @return string
      */
-    public function applyTransformation($buffer, array $options = array(), $meta = '')
+    public function applyTransformation($buffer, array $options = [], $meta = '')
     {
         // must disable the page loader, see
         // https://wiki.phpmyadmin.net/pma/Page_loader#Bypassing_the_page_loader
diff --git a/libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php
index 5cf51dceb8..152f614873 100644
--- a/libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/ImageUploadTransformationsPlugin.php
@@ -42,7 +42,7 @@ abstract class ImageUploadTransformationsPlugin extends IOTransformationsPlugin
      *
      * @return string
      */
-    public function applyTransformation($buffer, array $options = array(), $meta = '')
+    public function applyTransformation($buffer, array $options = [], $meta = '')
     {
         return $buffer;
     }
@@ -101,9 +101,9 @@ abstract class ImageUploadTransformationsPlugin extends IOTransformationsPlugin
      */
     public function getScripts()
     {
-        return array(
+        return [
             'transformations/image_upload.js',
-        );
+        ];
     }
 
     /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
diff --git a/libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php
index 9c0fb5ce62..fd403cbd78 100644
--- a/libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/InlineTransformationsPlugin.php
@@ -41,7 +41,7 @@ abstract class InlineTransformationsPlugin extends TransformationsPlugin
      *
      * @return string
      */
-    public function applyTransformation($buffer, array $options = array(), $meta = '')
+    public function applyTransformation($buffer, array $options = [], $meta = '')
     {
         $cfg = $GLOBALS['cfg'];
         $options = $this->getOptions($options, $cfg['DefaultTransformations']['Inline']);
diff --git a/libraries/classes/Plugins/Transformations/Abs/LongToIPv4TransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/LongToIPv4TransformationsPlugin.php
index 9b7f618741..29433b324a 100644
--- a/libraries/classes/Plugins/Transformations/Abs/LongToIPv4TransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/LongToIPv4TransformationsPlugin.php
@@ -41,7 +41,7 @@ abstract class LongToIPv4TransformationsPlugin extends TransformationsPlugin
      *
      * @return string
      */
-    public function applyTransformation($buffer, array $options = array(), $meta = '')
+    public function applyTransformation($buffer, array $options = [], $meta = '')
     {
         if ($buffer < 0 || $buffer > 4294967295) {
             return htmlspecialchars($buffer);
diff --git a/libraries/classes/Plugins/Transformations/Abs/PreApPendTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/PreApPendTransformationsPlugin.php
index 0a1f9665ec..4034e978f0 100644
--- a/libraries/classes/Plugins/Transformations/Abs/PreApPendTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/PreApPendTransformationsPlugin.php
@@ -43,7 +43,7 @@ abstract class PreApPendTransformationsPlugin extends TransformationsPlugin
      *
      * @return string
      */
-    public function applyTransformation($buffer, array $options = array(), $meta = '')
+    public function applyTransformation($buffer, array $options = [], $meta = '')
     {
         $cfg = $GLOBALS['cfg'];
         $options = $this->getOptions($options, $cfg['DefaultTransformations']['PreApPend']);
diff --git a/libraries/classes/Plugins/Transformations/Abs/RegexValidationTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/RegexValidationTransformationsPlugin.php
index 8cb44269df..4307e8b1cf 100644
--- a/libraries/classes/Plugins/Transformations/Abs/RegexValidationTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/RegexValidationTransformationsPlugin.php
@@ -44,7 +44,7 @@ abstract class RegexValidationTransformationsPlugin extends IOTransformationsPlu
      *
      * @return string
      */
-    public function applyTransformation($buffer, array $options = array(), $meta = '')
+    public function applyTransformation($buffer, array $options = [], $meta = '')
     {
         // reset properties of object
         $this->reset();
diff --git a/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php
index e16c182e19..586678d73c 100644
--- a/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/SQLTransformationsPlugin.php
@@ -41,7 +41,7 @@ abstract class SQLTransformationsPlugin extends TransformationsPlugin
      *
      * @return string
      */
-    public function applyTransformation($buffer, array $options = array(), $meta = '')
+    public function applyTransformation($buffer, array $options = [], $meta = '')
     {
         // see PMA_highlightSQL()
         $result = Util::formatSql($buffer);
diff --git a/libraries/classes/Plugins/Transformations/Abs/SubstringTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/SubstringTransformationsPlugin.php
index 1770f203c3..2cce2f2539 100644
--- a/libraries/classes/Plugins/Transformations/Abs/SubstringTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/SubstringTransformationsPlugin.php
@@ -44,7 +44,7 @@ abstract class SubstringTransformationsPlugin extends TransformationsPlugin
      *
      * @return string
      */
-    public function applyTransformation($buffer, array $options = array(), $meta = '')
+    public function applyTransformation($buffer, array $options = [], $meta = '')
     {
         // possibly use a global transform and feed it with special options
 
diff --git a/libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php
index e435020e13..0d6e9bd40e 100644
--- a/libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php
@@ -43,7 +43,7 @@ abstract class TextFileUploadTransformationsPlugin extends IOTransformationsPlug
      *
      * @return string
      */
-    public function applyTransformation($buffer, array $options = array(), $meta = '')
+    public function applyTransformation($buffer, array $options = [], $meta = '')
     {
         return $buffer;
     }
diff --git a/libraries/classes/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php
index bb45af288f..504d58668b 100644
--- a/libraries/classes/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/TextImageLinkTransformationsPlugin.php
@@ -43,7 +43,7 @@ abstract class TextImageLinkTransformationsPlugin extends TransformationsPlugin
      *
      * @return string
      */
-    public function applyTransformation($buffer, array $options = array(), $meta = '')
+    public function applyTransformation($buffer, array $options = [], $meta = '')
     {
         $cfg = $GLOBALS['cfg'];
         $options = $this->getOptions($options, $cfg['DefaultTransformations']['TextImageLink']);
diff --git a/libraries/classes/Plugins/Transformations/Abs/TextLinkTransformationsPlugin.php b/libraries/classes/Plugins/Transformations/Abs/TextLinkTransformationsPlugin.php
index 5be2e769d0..a0a2070f95 100644
--- a/libraries/classes/Plugins/Transformations/Abs/TextLinkTransformationsPlugin.php
+++ b/libraries/classes/Plugins/Transformations/Abs/TextLinkTransformationsPlugin.php
@@ -43,7 +43,7 @@ abstract class TextLinkTransformationsPlugin extends TransformationsPlugin
      *
      * @return string
      */
-    public function applyTransformation($buffer, array $options = array(), $meta = '')
+    public function applyTransformation($buffer, array $options = [], $meta = '')
     {
         $cfg = $GLOBALS['cfg'];
         $options = $this->getOptions($options, $cfg['DefaultTransformations']['TextLink']);
diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php
index bbf3e0ecc1..f8a5a4938c 100644
--- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php
+++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptobinary.php
@@ -44,7 +44,7 @@ class Text_Plain_Iptobinary extends IOTransformationsPlugin
      *
      * @return string IP address
      */
-    public function applyTransformation($buffer, array $options = array(), $meta = '')
+    public function applyTransformation($buffer, array $options = [], $meta = '')
     {
         $val = @inet_pton($buffer);
         if ($val !== false) {
diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php
index 50ff400bf4..17d8cf69b3 100644
--- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php
+++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php
@@ -41,7 +41,7 @@ class Text_Plain_JsonEditor extends CodeMirrorEditorTransformationPlugin
      */
     public function getScripts()
     {
-        $scripts = array();
+        $scripts = [];
         if ($GLOBALS['cfg']['CodemirrorEnable']) {
             $scripts[] = 'vendor/codemirror/lib/codemirror.js';
             $scripts[] = 'vendor/codemirror/mode/javascript/javascript.js';
diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php
index f8617774e7..478b21c7a2 100644
--- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php
+++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_SqlEditor.php
@@ -41,7 +41,7 @@ class Text_Plain_SqlEditor extends CodeMirrorEditorTransformationPlugin
      */
     public function getScripts()
     {
-        $scripts = array();
+        $scripts = [];
         if ($GLOBALS['cfg']['CodemirrorEnable']) {
             $scripts[] = 'vendor/codemirror/lib/codemirror.js';
             $scripts[] = 'vendor/codemirror/mode/sql/sql.js';
diff --git a/libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php b/libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php
index a2e4e5e712..0c4e49255a 100644
--- a/libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php
+++ b/libraries/classes/Plugins/Transformations/Input/Text_Plain_XmlEditor.php
@@ -41,7 +41,7 @@ class Text_Plain_XmlEditor extends CodeMirrorEditorTransformationPlugin
      */
     public function getScripts()
     {
-        $scripts = array();
+        $scripts = [];
         if ($GLOBALS['cfg']['CodemirrorEnable']) {
             $scripts[] = 'vendor/codemirror/lib/codemirror.js';
             $scripts[] = 'vendor/codemirror/mode/xml/xml.js';
diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php
index 097c5b0889..e5729fa2ba 100644
--- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php
+++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Binarytoip.php
@@ -45,7 +45,7 @@ class Text_Plain_Binarytoip extends TransformationsPlugin
      *
      * @return string IP address
      */
-    public function applyTransformation($buffer, array $options = array(), $meta = '')
+    public function applyTransformation($buffer, array $options = [], $meta = '')
     {
         $length = strlen($buffer);
         if ($length == 4 || $length == 16) {
diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php
index fe854010d5..7ba16f5b50 100644
--- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php
+++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Json.php
@@ -59,7 +59,7 @@ class Text_Plain_Json extends TransformationsPlugin
      *
      * @return string
      */
-    public function applyTransformation($buffer, array $options = array(), $meta = '')
+    public function applyTransformation($buffer, array $options = [], $meta = '')
     {
         return '<code class="json"><pre>' . "\n"
         . htmlspecialchars($buffer) . "\n"
diff --git a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php
index 5c87b06a05..c387856011 100644
--- a/libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php
+++ b/libraries/classes/Plugins/Transformations/Output/Text_Plain_Xml.php
@@ -59,7 +59,7 @@ class Text_Plain_Xml extends TransformationsPlugin
      *
      * @return string
      */
-    public function applyTransformation($buffer, array $options = array(), $meta = '')
+    public function applyTransformation($buffer, array $options = [], $meta = '')
     {
         return '<code class="xml"><pre>' . "\n"
         . htmlspecialchars($buffer) . "\n"
diff --git a/libraries/classes/Plugins/TransformationsPlugin.php b/libraries/classes/Plugins/TransformationsPlugin.php
index f7e9696a80..9f9bdab8b6 100644
--- a/libraries/classes/Plugins/TransformationsPlugin.php
+++ b/libraries/classes/Plugins/TransformationsPlugin.php
@@ -24,7 +24,7 @@ abstract class TransformationsPlugin implements TransformationsInterface
      *
      * @return void
      */
-    public function applyTransformationNoWrap(array $options = array())
+    public function applyTransformationNoWrap(array $options = [])
     {
         ;
     }
@@ -40,7 +40,7 @@ abstract class TransformationsPlugin implements TransformationsInterface
      */
     abstract public function applyTransformation(
         $buffer,
-        array $options = array(),
+        array $options = [],
         $meta = ''
     );
 
@@ -54,7 +54,7 @@ abstract class TransformationsPlugin implements TransformationsInterface
      */
     public function getOptions(array $options, array $defaults)
     {
-        $result = array();
+        $result = [];
         foreach ($defaults as $key => $value) {
             if (isset($options[$key]) && $options[$key] !== '') {
                 $result[$key] = $options[$key];
diff --git a/libraries/classes/Properties/Options/OptionsPropertyGroup.php b/libraries/classes/Properties/Options/OptionsPropertyGroup.php
index 5ad22d9470..6d8da88e32 100644
--- a/libraries/classes/Properties/Options/OptionsPropertyGroup.php
+++ b/libraries/classes/Properties/Options/OptionsPropertyGroup.php
@@ -55,7 +55,7 @@ abstract class OptionsPropertyGroup extends OptionsPropertyItem implements \Coun
     {
         $this->_properties = array_diff(
             $this->getProperties(),
-            array($property)
+            [$property]
         );
     }
 
diff --git a/libraries/classes/RecentFavoriteTable.php b/libraries/classes/RecentFavoriteTable.php
index ccc12a9ab0..46af8b6495 100644
--- a/libraries/classes/RecentFavoriteTable.php
+++ b/libraries/classes/RecentFavoriteTable.php
@@ -47,7 +47,7 @@ class RecentFavoriteTable
      * @access private
      * @var array
      */
-    private static $_instances = array();
+    private static $_instances = [];
 
     /**
      * @var Relation $relation
@@ -69,7 +69,7 @@ class RecentFavoriteTable
         if (! isset($_SESSION['tmpval'][$this->_tableType . '_tables'][$server_id])
         ) {
             $_SESSION['tmpval'][$this->_tableType . '_tables'][$server_id]
-                = $this->_getPmaTable() ? $this->getFromDb() : array();
+                = $this->_getPmaTable() ? $this->getFromDb() : [];
         }
         $this->_tables
             =& $_SESSION['tmpval'][$this->_tableType . '_tables'][$server_id];
@@ -112,7 +112,7 @@ class RecentFavoriteTable
             = " SELECT `tables` FROM " . $this->_getPmaTable() .
             " WHERE `username` = '" . $GLOBALS['dbi']->escapeString($GLOBALS['cfg']['Server']['user']) . "'";
 
-        $return = array();
+        $return = [];
         $result = $this->relation->queryAsControlUser($sql_query, false);
         if ($result) {
             $row = $GLOBALS['dbi']->fetchArray($result);
@@ -193,10 +193,10 @@ class RecentFavoriteTable
             if ($this->_tableType == 'recent') {
                 foreach ($this->_tables as $table) {
                     $html .= '<li class="warp_link">';
-                    $recent_params = array(
+                    $recent_params = [
                         'db'    => $table['db'],
                         'table' => $table['table']
-                    );
+                    ];
                     $recent_url = 'tbl_recent_favorite.php'
                         . Url::getCommon($recent_params);
                     $html .= '<a href="' . $recent_url . '">`'
@@ -209,12 +209,12 @@ class RecentFavoriteTable
                     $html .= '<li class="warp_link">';
 
                     $html .= '<a class="ajax favorite_table_anchor" ';
-                    $fav_params = array(
+                    $fav_params = [
                         'db'              => $table['db'],
                         'ajax_request'    => true,
                         'favorite_table'  => $table['table'],
                         'remove_favorite' => true
-                    );
+                    ];
                     $fav_rm_url = 'db_structure.php'
                         . Url::getCommon($fav_params);
                     $html .= 'href="' . $fav_rm_url
@@ -225,10 +225,10 @@ class RecentFavoriteTable
                         . Util::getIcon('b_favorite')
                         . '</a>';
 
-                    $fav_params = array(
+                    $fav_params = [
                         'db'    => $table['db'],
                         'table' => $table['table']
-                    );
+                    ];
                     $table_url = 'tbl_recent_favorite.php'
                         . Url::getCommon($fav_params);
                     $html .= '<a href="' . $table_url . '">`'
@@ -284,7 +284,7 @@ class RecentFavoriteTable
             return true;
         }
 
-        $table_arr = array();
+        $table_arr = [];
         $table_arr['db'] = $db;
         $table_arr['table'] = $table;
 
@@ -332,7 +332,7 @@ class RecentFavoriteTable
      */
     public function remove($db, $table)
     {
-        $table_arr = array();
+        $table_arr = [];
         $table_arr['db'] = $db;
         $table_arr['table'] = $table;
         foreach ($this->_tables as $key => $value) {
@@ -361,8 +361,8 @@ class RecentFavoriteTable
         $cfgRelation = $this->relation->getRelationsParam();
         // Not to show this once list is synchronized.
         if ($cfgRelation['favoritework'] && ! isset($_SESSION['tmpval']['favorites_synced'][$server_id])) {
-            $params  = array('ajax_request' => true, 'favorite_table' => true,
-                'sync_favorite_tables' => true);
+            $params  = ['ajax_request' => true, 'favorite_table' => true,
+                'sync_favorite_tables' => true];
             $url     = 'db_structure.php' . Url::getCommon($params);
             $retval  = '<a class="hide" id="sync_favorite_tables"';
             $retval .= ' href="' . $url . '"></a>';
@@ -377,7 +377,7 @@ class RecentFavoriteTable
      */
     public static function getHtmlUpdateRecentTables()
     {
-        $params  = array('ajax_request' => true, 'recent_table' => true);
+        $params  = ['ajax_request' => true, 'recent_table' => true];
         $url     = 'index.php' . Url::getCommon($params);
         $retval  = '<a class="hide" id="update_recent_tables"';
         $retval .= ' href="' . $url . '"></a>';
diff --git a/libraries/classes/Relation.php b/libraries/classes/Relation.php
index 42eb1afce4..cd4fa43cfd 100644
--- a/libraries/classes/Relation.php
+++ b/libraries/classes/Relation.php
@@ -102,7 +102,7 @@ class Relation
     {
         $retval = '<br>';
 
-        $messages = array();
+        $messages = [];
         $messages['error'] = '<span class="caution"><strong>'
             . __('not OK')
             . '</strong></span>';
@@ -372,7 +372,7 @@ class Relation
                 $retval .= '<p>' . __('Quick steps to set up advanced features:')
                     . '</p>';
 
-                $items = array();
+                $items = [];
                 $items[] = sprintf(
                     __(
                         'Create the needed tables with the '
@@ -392,7 +392,7 @@ class Relation
                 );
 
                 $retval .= Template::get('list/unordered')->render(
-                    array('items' => $items,)
+                    ['items' => $items,]
                 );
             }
         }
@@ -466,14 +466,14 @@ class Relation
      */
     public function checkRelationsParam()
     {
-        $cfgRelation                   = array();
+        $cfgRelation                   = [];
         $cfgRelation['PMA_VERSION']    = PMA_VERSION;
 
-        $workToTable = array(
+        $workToTable = [
             'relwork' => 'relation',
-            'displaywork' => array('relation', 'table_info'),
+            'displaywork' => ['relation', 'table_info'],
             'bookmarkwork' => 'bookmarktable',
-            'pdfwork' => array('table_coords', 'pdf_pages'),
+            'pdfwork' => ['table_coords', 'pdf_pages'],
             'commwork' => 'column_info',
             'mimework' => 'column_info',
             'historywork' => 'history',
@@ -482,13 +482,13 @@ class Relation
             'uiprefswork' => 'table_uiprefs',
             'trackingwork' => 'tracking',
             'userconfigwork' => 'userconfig',
-            'menuswork' => array('users', 'usergroups'),
+            'menuswork' => ['users', 'usergroups'],
             'navwork' => 'navigationhiding',
             'savedsearcheswork' => 'savedsearches',
             'centralcolumnswork' => 'central_columns',
             'designersettingswork' => 'designer_settings',
             'exporttemplateswork' => 'export_templates',
-        );
+        ];
 
         foreach ($workToTable as $work => $table) {
             $cfgRelation[$work] = false;
@@ -690,10 +690,10 @@ class Relation
     {
         // From 4.3, new input oriented transformation feature was introduced.
         // Check whether column_info table has input transformation columns
-        $new_cols = array(
+        $new_cols = [
             "input_transformation",
             "input_transformation_options"
-        );
+        ];
         $query = 'SHOW COLUMNS FROM '
             . Util::backquote($GLOBALS['cfg']['Server']['pmadb'])
             . '.' . Util::backquote(
@@ -761,7 +761,7 @@ class Relation
     public function getForeigners($db, $table, $column = '', $source = 'both')
     {
         $cfgRelation = $this->getRelationsParam();
-        $foreign = array();
+        $foreign = [];
 
         if ($cfgRelation['relwork'] && ($source == 'both' || $source == 'internal')) {
             $rel_query = '
@@ -900,7 +900,7 @@ class Relation
      */
     public function getComments($db, $table = '')
     {
-        $comments = array();
+        $comments = [];
 
         if ($table != '') {
             // MySQL native column comments
@@ -967,7 +967,7 @@ class Relation
     public function getDbComments()
     {
         $cfgRelation = $this->getRelationsParam();
-        $comments = array();
+        $comments = [];
 
         if ($cfgRelation['commwork']) {
             // pmadb internal db comment
@@ -1064,14 +1064,14 @@ class Relation
         $cfgRelation = $this->getRelationsParam();
 
         if (! isset($_SESSION['sql_history'])) {
-            $_SESSION['sql_history'] = array();
+            $_SESSION['sql_history'] = [];
         }
 
-        $_SESSION['sql_history'][] = array(
+        $_SESSION['sql_history'][] = [
             'db' => $db,
             'table' => $table,
             'sqlquery' => $sqlquery,
-        );
+        ];
 
         if (count($_SESSION['sql_history']) > $GLOBALS['cfg']['QueryHistoryMax']) {
             // history should not exceed a maximum count
@@ -1203,7 +1203,7 @@ class Relation
      */
     public function buildForeignDropdown(array $foreign, $data, $mode)
     {
-        $reloptions = array();
+        $reloptions = [];
 
         // id-only is a special mode used when no foreign display column
         // is available
@@ -1305,7 +1305,7 @@ class Relation
             $max = $GLOBALS['cfg']['ForeignKeyMaxLimit'];
         }
 
-        $foreign = array();
+        $foreign = [];
 
         // collect the data
         foreach ($disp_row as $relrow) {
@@ -1322,8 +1322,8 @@ class Relation
         } // end foreach
 
         // put the dropdown sections in correct order
-        $top = array();
-        $bottom = array();
+        $top = [];
+        $bottom = [];
         if ($foreign_display) {
             if (Core::isValid($GLOBALS['cfg']['ForeignKeyDropdownOrder'], 'array')) {
                 if (Core::isValid($GLOBALS['cfg']['ForeignKeyDropdownOrder'][0])) {
@@ -1463,7 +1463,7 @@ class Relation
                     // array. This helps us from not needing to use mysql_data_seek by
                     // accessing a pre-cached PHP array. Usually those resultsets are
                     // not that big, so a performance hit should not be expected.
-                    $disp_row = array();
+                    $disp_row = [];
                     while ($single_disp_row = @$GLOBALS['dbi']->fetchAssoc($disp)) {
                         $disp_row[] = $single_disp_row;
                     }
@@ -1486,7 +1486,7 @@ class Relation
                 ->countRecords(true);
         }
 
-        $foreignData = array();
+        $foreignData = [];
         $foreignData['foreign_link'] = $foreign_link;
         $foreignData['the_total'] = isset($the_total) ? $the_total : null;
         $foreignData['foreign_display'] = (
@@ -1746,7 +1746,7 @@ class Relation
      */
     public function getChildReferences($db, $table, $column = '')
     {
-        $child_references = array();
+        $child_references = [];
         if (! $GLOBALS['cfg']['Server']['DisableIS']) {
             $rel_query = "SELECT `column_name`, `table_name`,"
                 . " `table_schema`, `referenced_column_name`"
@@ -1761,7 +1761,7 @@ class Relation
             }
 
             $child_references = $GLOBALS['dbi']->fetchResult(
-                $rel_query, array('referenced_column_name', null)
+                $rel_query, ['referenced_column_name', null]
             );
         }
         return $child_references;
@@ -1781,13 +1781,13 @@ class Relation
     public function checkChildForeignReferences(
         $db, $table, $column, $foreigners_full = null, $child_references_full = null
     ) {
-        $column_status = array();
+        $column_status = [];
         $column_status['isEditable'] = false;
         $column_status['isReferenced'] = false;
         $column_status['isForeignKey'] = false;
-        $column_status['references'] = array();
+        $column_status['references'] = [];
 
-        $foreigners = array();
+        $foreigners = [];
         if ($foreigners_full !== null) {
             if (isset($foreigners_full[$column])) {
                 $foreigners[$column] = $foreigners_full[$column];
@@ -1800,7 +1800,7 @@ class Relation
         }
         $foreigner = $this->searchColumnInForeigners($foreigners, $column);
 
-        $child_references = array();
+        $child_references = [];
         if ($child_references_full !== null) {
             if (isset($child_references_full[$column])) {
                 $child_references = $child_references_full[$column];
@@ -1847,7 +1847,7 @@ class Relation
             return $foreigners[$column];
         }
 
-        $foreigner = array();
+        $foreigner = [];
         foreach ($foreigners['foreign_keys_data'] as $one_key) {
             $column_index = array_search($column, $one_key['index_list']);
             if ($column_index !== false) {
@@ -1879,7 +1879,7 @@ class Relation
      */
     public function getDefaultPmaTableNames()
     {
-        $pma_tables = array();
+        $pma_tables = [];
         $create_tables_file = file_get_contents(
             SQL_DIR . 'create_tables.sql'
         );
@@ -1933,7 +1933,7 @@ class Relation
      */
     public function fixPmaTables($db, $create = true)
     {
-        $tablesToFeatures = array(
+        $tablesToFeatures = [
             'pma__bookmark' => 'bookmarktable',
             'pma__relation' => 'relation',
             'pma__table_info' => 'table_info',
@@ -1953,7 +1953,7 @@ class Relation
             'pma__central_columns' => 'central_columns',
             'pma__designer_settings' => 'designer_settings',
             'pma__export_templates' => 'export_templates',
-        );
+        ];
 
         $existingTables = $GLOBALS['dbi']->getTables($db, DatabaseInterface::CONNECT_CONTROL);
 
@@ -2020,7 +2020,7 @@ class Relation
     {
         $retval = '';
 
-        $url_query = Url::getCommon(array('db' => $GLOBALS['db']));
+        $url_query = Url::getCommon(['db' => $GLOBALS['db']]);
         if ($allTables) {
             if ($createDb) {
                 $url_query .= '&amp;goto=db_operations.php&amp;create_pmadb=1';
@@ -2076,9 +2076,9 @@ class Relation
             }
         } else {
             $have_rel = false;
-            $res_rel = array();
+            $res_rel = [];
         } // end if
-        return(array($res_rel, $have_rel));
+        return([$res_rel, $have_rel]);
     }
 
     /**
@@ -2124,7 +2124,7 @@ class Relation
      */
     public function getTables($foreignDb, $tblStorageEngine)
     {
-        $tables = array();
+        $tables = [];
         $tablesRows = $GLOBALS['dbi']->query(
             'SHOW TABLE STATUS FROM ' . Util::backquote($foreignDb),
             DatabaseInterface::CONNECT_USER,
diff --git a/libraries/classes/Replication.php b/libraries/classes/Replication.php
index 6883e4f474..767a626f09 100644
--- a/libraries/classes/Replication.php
+++ b/libraries/classes/Replication.php
@@ -34,7 +34,7 @@ class Replication
     ) {
         $GLOBALS['replication_info'][$type][$replicationInfoKey]
             = empty($mysqlInfo[$mysqlKey])
-                ? array()
+                ? []
                 : explode(
                     ",",
                     $mysqlInfo[$mysqlKey]
@@ -141,7 +141,7 @@ class Replication
     public function connectToMaster(
         $user, $password, $host = null, $port = null, $socket = null
     ) {
-        $server = array();
+        $server = [];
         $server['user'] = $user;
         $server['password'] = $password;
         $server["host"] = Core::sanitizeMySQLHost($host);
@@ -164,7 +164,7 @@ class Replication
     public function slaveBinLogMaster($link = null)
     {
         $data = $GLOBALS['dbi']->fetchResult('SHOW MASTER STATUS', null, null, $link);
-        $output = array();
+        $output = [];
 
         if (! empty($data)) {
             $output["File"] = $data[0]["File"];
diff --git a/libraries/classes/ReplicationGui.php b/libraries/classes/ReplicationGui.php
index fd6f5b52cf..cde13489de 100644
--- a/libraries/classes/ReplicationGui.php
+++ b/libraries/classes/ReplicationGui.php
@@ -436,50 +436,50 @@ class ReplicationGui
         $html .= '<pre>server-id=' . time() . '</pre>';
 
         $html .= $this->getHtmlForAddUserInputDiv(
-            array('text'=>__('User name:'), 'for'=>"text_username"),
-            array(
+            ['text'=>__('User name:'), 'for'=>"text_username"],
+            [
                 'type'=>'text',
                 'name'=>'username',
                 'id'=>'text_username',
                 'maxlength'=>$username_length,
                 'title'=>__('User name'),
                 'required'=>'required'
-            )
+            ]
         );
 
         $html .= $this->getHtmlForAddUserInputDiv(
-            array('text'=>__('Password:'), 'for'=>"text_pma_pw"),
-            array(
+            ['text'=>__('Password:'), 'for'=>"text_pma_pw"],
+            [
                 'type'=>'password',
                 'name'=>'pma_pw',
                 'id'=>'text_pma_pw',
                 'title'=>__('Password'),
                 'required'=>'required'
-            )
+            ]
         );
 
         $html .= $this->getHtmlForAddUserInputDiv(
-            array('text'=>__('Host:'), 'for'=>"text_hostname"),
-            array(
+            ['text'=>__('Host:'), 'for'=>"text_hostname"],
+            [
                 'type'=>'text',
                 'name'=>'hostname',
                 'id'=>'text_hostname',
                 'maxlength'=>$hostname_length,
                 'value'=>'',
                 'required'=>'required'
-            )
+            ]
         );
 
         $html .= $this->getHtmlForAddUserInputDiv(
-            array('text'=>__('Port:'), 'for'=>"text_port"),
-            array(
+            ['text'=>__('Port:'), 'for'=>"text_port"],
+            [
                 'type'=>'number',
                 'name'=>'text_port',
                 'id'=>'text_port',
                 'maxlength'=>6,
                 'value'=>'3306',
                 'required'=>'required'
-             )
+             ]
         );
 
         $html .= ' </fieldset>';
@@ -594,10 +594,10 @@ class ReplicationGui
                 $html .= '<span>';
             }
             // allow wrapping long table lists into multiple lines
-            $variables_wrap = array(
+            $variables_wrap = [
                 'Replicate_Do_DB', 'Replicate_Ignore_DB',
                 'Replicate_Do_Table', 'Replicate_Ignore_Table',
-                'Replicate_Wild_Do_Table', 'Replicate_Wild_Ignore_Table');
+                'Replicate_Wild_Do_Table', 'Replicate_Wild_Ignore_Table'];
             if (in_array($variable, $variables_wrap)) {
                 $html .= htmlspecialchars(str_replace(
                     ',',
@@ -694,7 +694,7 @@ class ReplicationGui
                 }
             }
         }
-        return array($username_length, $hostname_length);
+        return [$username_length, $hostname_length];
     }
 
     /**
@@ -987,7 +987,7 @@ class ReplicationGui
      */
     public function handleRequestForSlaveChangeMaster()
     {
-        $sr = array();
+        $sr = [];
         $_SESSION['replication']['m_username'] = $sr['username']
             = $GLOBALS['dbi']->escapeString($_REQUEST['username']);
         $_SESSION['replication']['m_password'] = $sr['pma_pw']
diff --git a/libraries/classes/Response.php b/libraries/classes/Response.php
index 719b749034..5b867f0317 100644
--- a/libraries/classes/Response.php
+++ b/libraries/classes/Response.php
@@ -97,11 +97,11 @@ class Response
         if (! defined('TESTSUITE')) {
             $buffer = OutputBuffering::getInstance();
             $buffer->start();
-            register_shutdown_function(array($this, 'response'));
+            register_shutdown_function([$this, 'response']);
         }
         $this->_header = new Header();
         $this->_HTML   = '';
-        $this->_JSON   = array();
+        $this->_JSON   = [];
         $this->_footer = new Footer();
 
         $this->_isSuccess  = true;
@@ -314,7 +314,7 @@ class Response
             if (isset($GLOBALS['dbi'])) {
                 $menuHash = $this->getHeader()->getMenu()->getHash();
                 $this->addJSON('_menuHash', $menuHash);
-                $hashes = array();
+                $hashes = [];
                 if (isset($_REQUEST['menuHashes'])) {
                     $hashes = explode('-', $_REQUEST['menuHashes']);
                 }
@@ -358,11 +358,11 @@ class Response
                 }
                 $this->addJSON(
                     '_reloadQuerywindow',
-                    array(
+                    [
                         'db' => Core::ifSetOr($GLOBALS['db'], ''),
                         'table' => Core::ifSetOr($GLOBALS['table'], ''),
                         'sql_query' => $query
-                    )
+                    ]
                 );
                 if (! empty($GLOBALS['focus_querywindow'])) {
                     $this->addJSON('_focusQuerywindow', $query);
@@ -412,10 +412,10 @@ class Response
                 break;
             }
             echo json_encode(
-                array(
+                [
                     'success' => false,
                     'error' => 'JSON encoding failed: ' . $error,
-                )
+                ]
             );
         } else {
             echo $result;
diff --git a/libraries/classes/Rte/Events.php b/libraries/classes/Rte/Events.php
index 337e593a7d..38563ad226 100644
--- a/libraries/classes/Rte/Events.php
+++ b/libraries/classes/Rte/Events.php
@@ -72,23 +72,23 @@ class Events
     {
         global $event_status, $event_type, $event_interval;
 
-        $event_status = array(
-            'query' => array(
+        $event_status = [
+            'query' => [
                 'ENABLE',
                 'DISABLE',
                 'DISABLE ON SLAVE',
-            ),
-            'display' => array(
+            ],
+            'display' => [
                 'ENABLED',
                 'DISABLED',
                 'SLAVESIDE_DISABLED',
-            ),
-        );
-        $event_type = array(
+            ],
+        ];
+        $event_type = [
             'RECURRING',
             'ONE TIME',
-        );
-        $event_interval = array(
+        ];
+        $event_interval = [
             'YEAR',
             'QUARTER',
             'MONTH',
@@ -104,7 +104,7 @@ class Events
             'HOUR_MINUTE',
             'HOUR_SECOND',
             'MINUTE_SECOND',
-        );
+        ];
     }
 
     /**
@@ -307,8 +307,8 @@ class Events
      */
     public function getDataFromRequest()
     {
-        $retval = array();
-        $indices = array('item_name',
+        $retval = [];
+        $indices = ['item_name',
                          'item_original_name',
                          'item_status',
                          'item_execute_at',
@@ -319,7 +319,7 @@ class Events
                          'item_definition',
                          'item_preserve',
                          'item_comment',
-                         'item_definer');
+                         'item_definer'];
         foreach ($indices as $index) {
             $retval[$index] = isset($_REQUEST[$index]) ? $_REQUEST[$index] : '';
         }
@@ -344,7 +344,7 @@ class Events
     {
         global $db;
 
-        $retval = array();
+        $retval = [];
         $columns = "`EVENT_NAME`, `STATUS`, `EVENT_TYPE`, `EXECUTE_AT`, "
                  . "`INTERVAL_VALUE`, `INTERVAL_FIELD`, `STARTS`, `ENDS`, "
                  . "`EVENT_DEFINITION`, `ON_COMPLETION`, `DEFINER`, `EVENT_COMMENT`";
@@ -402,7 +402,7 @@ class Events
         $response = Response::getInstance();
 
         // Escape special characters
-        $need_escape = array(
+        $need_escape = [
                            'item_original_name',
                            'item_name',
                            'item_type',
@@ -413,7 +413,7 @@ class Events
                            'item_definition',
                            'item_definer',
                            'item_comment'
-                       );
+                       ];
         foreach ($need_escape as $index) {
             $item[$index] = htmlentities((string) $item[$index], ENT_QUOTES);
         }
diff --git a/libraries/classes/Rte/Footer.php b/libraries/classes/Rte/Footer.php
index 619a495f73..8cd1d55805 100644
--- a/libraries/classes/Rte/Footer.php
+++ b/libraries/classes/Rte/Footer.php
@@ -112,18 +112,18 @@ class Footer
             1
         );
         $es_state = mb_strtolower($es_state);
-        $options = array(
-                        0 => array(
+        $options = [
+                        0 => [
                             'label' => __('OFF'),
                             'value' => "SET GLOBAL event_scheduler=\"OFF\"",
                             'selected' => ($es_state != 'on')
-                        ),
-                        1 => array(
+                        ],
+                        1 => [
                             'label' => __('ON'),
                             'value' => "SET GLOBAL event_scheduler=\"ON\"",
                             'selected' => ($es_state == 'on')
-                        )
-                   );
+                        ]
+                   ];
         // Generate output
         $retval  = "<!-- FOOTER LINKS START -->\n";
         $retval .= "<div class='doubleFieldset'>\n";
diff --git a/libraries/classes/Rte/Routines.php b/libraries/classes/Rte/Routines.php
index a114acc0da..9520bbc3d4 100644
--- a/libraries/classes/Rte/Routines.php
+++ b/libraries/classes/Rte/Routines.php
@@ -78,22 +78,22 @@ class Routines
     {
         global $param_directions, $param_opts_num, $param_sqldataaccess;
 
-        $param_directions = array(
+        $param_directions = [
             'IN',
             'OUT',
             'INOUT',
-        );
-        $param_opts_num = array(
+        ];
+        $param_opts_num = [
             'UNSIGNED',
             'ZEROFILL',
             'UNSIGNED ZEROFILL',
-        );
-        $param_sqldataaccess = array(
+        ];
+        $param_sqldataaccess = [
             'NO SQL',
             'CONTAINS SQL',
             'READS SQL DATA',
             'MODIFIES SQL DATA',
-        );
+        ];
     }
 
     /**
@@ -119,7 +119,7 @@ class Routines
         /**
          * Display a list of available routines
          */
-        if (! Core::isValid($type, array('FUNCTION','PROCEDURE'))) {
+        if (! Core::isValid($type, ['FUNCTION','PROCEDURE'])) {
             $type = null;
         }
         $items = $GLOBALS['dbi']->getRoutines($db, $type);
@@ -258,7 +258,7 @@ class Routines
             if (!empty($_REQUEST['editor_process_edit'])) {
                 $isProcOrFunc = in_array(
                     $_REQUEST['item_original_type'],
-                    array('PROCEDURE', 'FUNCTION')
+                    ['PROCEDURE', 'FUNCTION']
                 );
 
                 if (!$isProcOrFunc) {
@@ -378,7 +378,7 @@ class Routines
     public function backupPrivileges()
     {
         if (! $GLOBALS['proc_priv'] || ! $GLOBALS['is_reload_priv']) {
-            return array();
+            return [];
         }
 
         // Backup the Old Privileges before dropping
@@ -386,7 +386,7 @@ class Routines
         if (! isset($_REQUEST['item_adjust_privileges'])
             || empty($_REQUEST['item_adjust_privileges'])
         ) {
-            return array();
+            return [];
         }
 
         $privilegesBackupQuery = 'SELECT * FROM ' . Util::backquote(
@@ -421,7 +421,7 @@ class Routines
     ) {
         $result = $GLOBALS['dbi']->tryQuery($routine_query);
         if (!$result) {
-            $errors = array();
+            $errors = [];
             $errors[] = sprintf(
                 __('The following query has failed: "%s"'),
                 htmlspecialchars($routine_query)
@@ -442,7 +442,7 @@ class Routines
                 $errors
             );
 
-            return array($errors, null);
+            return [$errors, null];
         }
 
         // Default value
@@ -472,7 +472,7 @@ class Routines
 
         $message = $this->flushPrivileges($resultAdjust);
 
-        return array(array(), $message);
+        return [[], $message];
     }
 
     /**
@@ -518,15 +518,15 @@ class Routines
     {
         global $_REQUEST, $param_directions, $param_sqldataaccess;
 
-        $retval = array();
-        $indices = array('item_name',
+        $retval = [];
+        $indices = ['item_name',
                          'item_original_name',
                          'item_returnlength',
                          'item_returnopts_num',
                          'item_returnopts_text',
                          'item_definition',
                          'item_comment',
-                         'item_definer');
+                         'item_definer'];
         foreach ($indices as $index) {
             $retval[$index] = isset($_REQUEST[$index]) ? $_REQUEST[$index] : '';
         }
@@ -544,12 +544,12 @@ class Routines
             $retval['item_original_type'] = 'FUNCTION';
         }
         $retval['item_num_params']      = 0;
-        $retval['item_param_dir']       = array();
-        $retval['item_param_name']      = array();
-        $retval['item_param_type']      = array();
-        $retval['item_param_length']    = array();
-        $retval['item_param_opts_num']  = array();
-        $retval['item_param_opts_text'] = array();
+        $retval['item_param_dir']       = [];
+        $retval['item_param_name']      = [];
+        $retval['item_param_type']      = [];
+        $retval['item_param_length']    = [];
+        $retval['item_param_opts_num']  = [];
+        $retval['item_param_opts_text'] = [];
         if (isset($_REQUEST['item_param_name'])
             && isset($_REQUEST['item_param_type'])
             && isset($_REQUEST['item_param_length'])
@@ -633,7 +633,7 @@ class Routines
     {
         global $db;
 
-        $retval  = array();
+        $retval  = [];
 
         // Build and execute the query
         $fields  = "SPECIFIC_NAME, ROUTINE_TYPE, DTD_IDENTIFIER, "
@@ -699,7 +699,7 @@ class Routines
         $retval['item_returnopts_text'] = '';
 
         if (! empty($routine['DTD_IDENTIFIER'])) {
-            $options = array();
+            $options = [];
             foreach ($stmt->return->options->options as $opt) {
                 $options[] = is_string($opt) ? $opt : $opt['value'];
             }
@@ -741,7 +741,7 @@ class Routines
      *
      * @return string    HTML code of one row of parameter table for the editor.
      */
-    public function getParameterRow(array $routine = array(), $index = null, $class = '')
+    public function getParameterRow(array $routine = [], $index = null, $class = '')
     {
         global $param_directions, $param_opts_num, $titles;
 
@@ -750,14 +750,14 @@ class Routines
             $i = 0;
             $index = '%s';
             $drop_class = '';
-            $routine = array(
-                'item_param_dir'       => array(0 => ''),
-                'item_param_name'      => array(0 => ''),
-                'item_param_type'      => array(0 => ''),
-                'item_param_length'    => array(0 => ''),
-                'item_param_opts_num'  => array(0 => ''),
-                'item_param_opts_text' => array(0 => '')
-            );
+            $routine = [
+                'item_param_dir'       => [0 => ''],
+                'item_param_name'      => [0 => ''],
+                'item_param_type'      => [0 => ''],
+                'item_param_length'    => [0 => ''],
+                'item_param_opts_num'  => [0 => ''],
+                'item_param_opts_text' => [0 => '']
+            ];
         } elseif (! empty($routine)) {
             // regular row for routine editor
             $drop_class = ' hide';
@@ -801,7 +801,7 @@ class Routines
         $retval .= "                <div class='enum_hint'>\n";
         $retval .= "                    <a href='#' class='open_enum_editor'>\n";
         $retval .= "                        "
-            . Util::getImage('b_edit', '', array('title'=>__('ENUM/SET editor')))
+            . Util::getImage('b_edit', '', ['title'=>__('ENUM/SET editor')])
             . "\n";
         $retval .= "                    </a>\n";
         $retval .= "                </div>\n";
@@ -861,14 +861,14 @@ class Routines
         $response = Response::getInstance();
 
         // Escape special characters
-        $need_escape = array(
+        $need_escape = [
             'item_original_name',
             'item_name',
             'item_returnlength',
             'item_definition',
             'item_definer',
             'item_comment'
-        );
+        ];
         foreach ($need_escape as $key => $index) {
             $routine[$index] = htmlentities($routine[$index], ENT_QUOTES, 'UTF-8');
         }
@@ -1244,7 +1244,7 @@ class Routines
                     }
                     if (! empty($_REQUEST['item_param_opts_text'][$i])) {
                         if ($dbi->types->getTypeClass($item_param_type[$i]) == 'CHAR') {
-                            if(! in_array($item_param_type[$i], array('VARBINARY', 'BINARY'))) {
+                            if(! in_array($item_param_type[$i], ['VARBINARY', 'BINARY'])) {
                                 $params .= ' CHARSET '
                                     . mb_strtolower(
                                         $_REQUEST['item_param_opts_text'][$i]
@@ -1387,9 +1387,9 @@ class Routines
                 }
             }
 
-            $queries   = array();
-            $end_query = array();
-            $args      = array();
+            $queries   = [];
+            $end_query = [];
+            $args      = [];
             $all_functions = $GLOBALS['dbi']->types->getAllFunctions();
             for ($i = 0; $i < $routine['item_num_params']; $i++) {
                 if (isset($_REQUEST['params'][$routine['item_param_name'][$i]])) {
@@ -1690,7 +1690,7 @@ class Routines
                 ) {
                     $retval .= "--\n";
                 } else {
-                    $field = array(
+                    $field = [
                         'True_Type'       => mb_strtolower(
                             $routine['item_param_type'][$i]
                         ),
@@ -1699,10 +1699,10 @@ class Routines
                         'Field'           => '',
                         'Default'         => '',
                         'first_timestamp' => false
-                    );
+                    ];
                     $retval .= "<select name='funcs["
                         . $routine['item_param_name'][$i] . "]'>";
-                    $retval .= Util::getFunctionsForField($field, false, array());
+                    $retval .= Util::getFunctionsForField($field, false, []);
                     $retval .= "</select>";
                 }
                 $retval .= "</td>\n";
@@ -1718,7 +1718,7 @@ class Routines
                 $class = 'datefield';
             }
             $retval .= "<td class='nowrap'>\n";
-            if (in_array($routine['item_param_type'][$i], array('ENUM', 'SET'))) {
+            if (in_array($routine['item_param_type'][$i], ['ENUM', 'SET'])) {
                 if ($routine['item_param_type'][$i] == 'ENUM') {
                     $input_type = 'radio';
                 } else {
diff --git a/libraries/classes/Rte/RteList.php b/libraries/classes/Rte/RteList.php
index 86ca51e89c..1b81c5f63a 100644
--- a/libraries/classes/Rte/RteList.php
+++ b/libraries/classes/Rte/RteList.php
@@ -172,11 +172,11 @@ class RteList
             $retval .= '<div class="withSelected">';
             $retval .= Template::get('select_all')
                 ->render(
-                    array(
+                    [
                         'pma_theme_image' => $GLOBALS['pmaThemeImage'],
                         'text_dir'        => $GLOBALS['text_dir'],
                         'form_name'       => 'rteListForm',
-                    )
+                    ]
                 );
             $retval .= Util::getButtonOrImage(
                 'submit_mult', 'mult_submit',
diff --git a/libraries/classes/Rte/Triggers.php b/libraries/classes/Rte/Triggers.php
index 9e9976f549..c268e488b6 100644
--- a/libraries/classes/Rte/Triggers.php
+++ b/libraries/classes/Rte/Triggers.php
@@ -73,15 +73,15 @@ class Triggers
         global $action_timings, $event_manipulations;
 
         // Some definitions for triggers
-        $action_timings = array(
+        $action_timings = [
             'BEFORE',
             'AFTER',
-        );
-        $event_manipulations = array(
+        ];
+        $event_manipulations = [
             'INSERT',
             'UPDATE',
             'DELETE',
-        );
+        ];
     }
 
     /**
@@ -285,14 +285,14 @@ class Triggers
      */
     public function getDataFromRequest()
     {
-        $retval = array();
-        $indices = array('item_name',
+        $retval = [];
+        $indices = ['item_name',
                          'item_table',
                          'item_original_name',
                          'item_action_timing',
                          'item_event_manipulation',
                          'item_definition',
-                         'item_definer');
+                         'item_definer'];
         foreach ($indices as $index) {
             $retval[$index] = isset($_REQUEST[$index]) ? $_REQUEST[$index] : '';
         }
@@ -311,7 +311,7 @@ class Triggers
     {
         global $db, $table, $_REQUEST;
 
-        $temp = array();
+        $temp = [];
         $items = $GLOBALS['dbi']->getTriggers($db, $table, '');
         foreach ($items as $value) {
             if ($value['name'] == $name) {
@@ -321,7 +321,7 @@ class Triggers
         if (empty($temp)) {
             return false;
         } else {
-            $retval = array();
+            $retval = [];
             $retval['create']                  = $temp['create'];
             $retval['drop']                    = $temp['drop'];
             $retval['item_name']               = $temp['name'];
@@ -352,12 +352,12 @@ class Triggers
         $response = Response::getInstance();
 
         // Escape special characters
-        $need_escape = array(
+        $need_escape = [
                            'item_original_name',
                            'item_name',
                            'item_definition',
                            'item_definer'
-                       );
+                       ];
         foreach ($need_escape as $key => $index) {
             $item[$index] = htmlentities($item[$index], ENT_QUOTES, 'UTF-8');
         }
diff --git a/libraries/classes/Rte/Words.php b/libraries/classes/Rte/Words.php
index 2b8a6e9911..39f96ee04e 100644
--- a/libraries/classes/Rte/Words.php
+++ b/libraries/classes/Rte/Words.php
@@ -30,7 +30,7 @@ class Words
 
         switch ($_PMA_RTE) {
         case 'RTN':
-            $words = array(
+            $words = [
                 'add'       => __('Add routine'),
                 'docu'      => 'STORED_ROUTINES',
                 'export'    => __('Export of routine %s'),
@@ -49,10 +49,10 @@ class Words
                 'not_found' => __('No routine with name %1$s found in database %2$s.'),
                 'nothing'   => __('There are no routines to display.'),
                 'title'     => __('Routines'),
-            );
+            ];
             break;
         case 'TRI':
-            $words = array(
+            $words = [
                 'add'       => __('Add trigger'),
                 'docu'      => 'TRIGGERS',
                 'export'    => __('Export of trigger %s'),
@@ -63,10 +63,10 @@ class Words
                 'not_found' => __('No trigger with name %1$s found in database %2$s.'),
                 'nothing'   => __('There are no triggers to display.'),
                 'title'     => __('Triggers'),
-            );
+            ];
             break;
         case 'EVN':
-            $words = array(
+            $words = [
                 'add'       => __('Add event'),
                 'docu'      => 'EVENTS',
                 'export'    => __('Export of event %s'),
@@ -77,10 +77,10 @@ class Words
                 'not_found' => __('No event with name %1$s found in database %2$s.'),
                 'nothing'   => __('There are no events to display.'),
                 'title'     => __('Events'),
-            );
+            ];
             break;
         default:
-            $words = array();
+            $words = [];
             break;
         }
 
diff --git a/libraries/classes/Sanitize.php b/libraries/classes/Sanitize.php
index 0345e615a2..d54b6c6472 100644
--- a/libraries/classes/Sanitize.php
+++ b/libraries/classes/Sanitize.php
@@ -31,7 +31,7 @@ class Sanitize
     public static function checkLink($url, $http=false, $other=false)
     {
         $url = strtolower($url);
-        $valid_starts = array(
+        $valid_starts = [
             'https://',
             './url.php?url=https%3a%2f%2f',
             './doc/html/',
@@ -55,7 +55,7 @@ class Sanitize
             './db_routines.php?',
             './server_privileges.php?',
             './tbl_structure.php?',
-        );
+        ];
         $is_setup = !is_null($GLOBALS['PMA_Config']) && $GLOBALS['PMA_Config']->get('is_setup');
         // Adjust path to setup script location
         if ($is_setup) {
@@ -169,11 +169,11 @@ class Sanitize
     public static function sanitize($message, $escape = false, $safe = false)
     {
         if (!$safe) {
-            $message = strtr((string) $message, array('<' => '&lt;', '>' => '&gt;'));
+            $message = strtr((string) $message, ['<' => '&lt;', '>' => '&gt;']);
         }
 
         /* Interpret bb code */
-        $replace_pairs = array(
+        $replace_pairs = [
             '[em]'      => '<em>',
             '[/em]'     => '</em>',
             '[strong]'  => '<strong>',
@@ -191,7 +191,7 @@ class Sanitize
             '[conferr]' => '<iframe src="show_config_errors.php"><a href="show_config_errors.php">show_config_errors.php</a></iframe>',
             // used in libraries/Util.php
             '[dochelpicon]' => Util::getImage('b_help', __('Documentation')),
-        );
+        ];
 
         $message = strtr($message, $replace_pairs);
 
@@ -293,14 +293,14 @@ class Sanitize
             '@</script@i', '</\' + \'script',
             strtr(
                 (string) $string,
-                array(
+                [
                     "\000" => '',
                     '\\' => '\\\\',
                     '\'' => '\\\'',
                     '"' => '\"',
                     "\n" => '\n',
                     "\r" => '\r'
-                )
+                ]
             )
         );
     }
@@ -428,16 +428,16 @@ class Sanitize
         // and use type casting because the variables could have become
         // strings
         if (! isset($_REQUEST)) {
-            $_REQUEST = array();
+            $_REQUEST = [];
         }
         if (! isset($_GET)) {
-            $_GET = array();
+            $_GET = [];
         }
         if (! isset($_POST)) {
-            $_POST = array();
+            $_POST = [];
         }
         if (! isset($_COOKIE)) {
-            $_COOKIE = array();
+            $_COOKIE = [];
         }
         $keys = array_keys(
             array_merge((array)$_REQUEST, (array)$_GET, (array)$_POST, (array)$_COOKIE)
diff --git a/libraries/classes/SavedSearches.php b/libraries/classes/SavedSearches.php
index a70edf7c07..32cf606f5e 100644
--- a/libraries/classes/SavedSearches.php
+++ b/libraries/classes/SavedSearches.php
@@ -162,7 +162,7 @@ class SavedSearches
             return $this;
         }
 
-        $aListFieldsToGet = array(
+        $aListFieldsToGet = [
             'criteriaColumn',
             'criteriaSort',
             'criteriaShow',
@@ -171,9 +171,9 @@ class SavedSearches
             'criteriaAndOrColumn',
             'rows',
             'TableList'
-        );
+        ];
 
-        $data = array();
+        $data = [];
 
         $data['criteriaColumnCount'] = count($criterias['criteriaColumn']);
 
@@ -295,10 +295,10 @@ class SavedSearches
 
         //If it's an insert.
         if (null === $this->getId()) {
-            $wheres = array(
+            $wheres = [
                 "search_name = '" . $GLOBALS['dbi']->escapeString($this->getSearchName())
                 . "'"
-            );
+            ];
             $existingSearches = $this->getList($wheres);
 
             if (!empty($existingSearches)) {
@@ -332,10 +332,10 @@ class SavedSearches
         }
 
         //Else, it's an update.
-        $wheres = array(
+        $wheres = [
             "id != " . $this->getId(),
             "search_name = '" . $GLOBALS['dbi']->escapeString($this->getSearchName()) . "'"
-        );
+        ];
         $existingSearches = $this->getList($wheres);
 
         if (!empty($existingSearches)) {
@@ -435,12 +435,12 @@ class SavedSearches
      *
      * @return array List of saved searches or empty array on failure
      */
-    public function getList(array $wheres = array())
+    public function getList(array $wheres = [])
     {
         if (null == $this->getUsername()
             || null == $this->getDbname()
         ) {
-            return array();
+            return [];
         }
 
         $savedSearchesTbl = Util::backquote($this->_config['cfgRelation']['db'])
@@ -460,7 +460,7 @@ class SavedSearches
 
         $resList = $this->relation->queryAsControlUser($sqlQuery);
 
-        $list = array();
+        $list = [];
         while ($oneResult = $GLOBALS['dbi']->fetchArray($resList)) {
             $list[$oneResult['id']] = $oneResult['search_name'];
         }
diff --git a/libraries/classes/Scripts.php b/libraries/classes/Scripts.php
index 43abab8dff..378e54e66f 100644
--- a/libraries/classes/Scripts.php
+++ b/libraries/classes/Scripts.php
@@ -49,7 +49,7 @@ class Scripts
         $result = '';
         foreach ($files as $value) {
             if (strpos($value['filename'], ".php") !== false) {
-                $file_name = $value['filename'] . Url::getCommon($value['params'] + array('v' => PMA_VERSION));
+                $file_name = $value['filename'] . Url::getCommon($value['params'] + ['v' => PMA_VERSION]);
                 $result .= "<script data-cfasync='false' "
                     . "type='text/javascript' src='js/" . $file_name
                     . "'></script>\n";
@@ -67,7 +67,7 @@ class Scripts
      */
     public function __construct()
     {
-        $this->_files  = array();
+        $this->_files  = [];
         $this->_code   = '';
 
     }
@@ -82,7 +82,7 @@ class Scripts
      */
     public function addFile(
         $filename,
-        array $params = array()
+        array $params = []
     ) {
         $hash = md5($filename);
         if (!empty($this->_files[$hash])) {
@@ -90,11 +90,11 @@ class Scripts
         }
 
         $has_onload = $this->_eventBlacklist($filename);
-        $this->_files[$hash] = array(
+        $this->_files[$hash] = [
             'has_onload' => $has_onload,
             'filename' => $filename,
             'params' => $params,
-        );
+        ];
     }
 
     /**
@@ -153,16 +153,16 @@ class Scripts
      */
     public function getFiles()
     {
-        $retval = array();
+        $retval = [];
         foreach ($this->_files as $file) {
             //If filename contains a "?", continue.
             if (strpos($file['filename'], "?") !== false) {
                 continue;
             }
-            $retval[] = array(
+            $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 dcb3b0892d..5d4abde469 100644
--- a/libraries/classes/Server/Privileges.php
+++ b/libraries/classes/Server/Privileges.php
@@ -186,7 +186,7 @@ class Privileges
             $this->fillInTablePrivileges($row);
         }
 
-        $privs = array();
+        $privs = [];
         $allPrivileges = true;
         foreach ($grants as $current_grant) {
             if ((! is_null($row) && isset($row[$current_grant[0]]))
@@ -229,12 +229,12 @@ class Privileges
             && (! isset($_POST['grant_count']) || count($privs) == $_POST['grant_count'])
         ) {
             if ($enableHTML) {
-                $privs = array('<dfn title="'
+                $privs = ['<dfn title="'
                     . __('Includes all privileges except GRANT.')
                     . '">ALL PRIVILEGES</dfn>'
-                );
+                ];
             } else {
-                $privs = array('ALL PRIVILEGES');
+                $privs = ['ALL PRIVILEGES'];
             }
         }
         return $privs;
@@ -247,48 +247,48 @@ class Privileges
      */
     public function getTableGrantsArray()
     {
-        return array(
-            array(
+        return [
+            [
                 'Delete',
                 'DELETE',
                 $GLOBALS['strPrivDescDelete']
-            ),
-            array(
+            ],
+            [
                 'Create',
                 'CREATE',
                 $GLOBALS['strPrivDescCreateTbl']
-            ),
-            array(
+            ],
+            [
                 'Drop',
                 'DROP',
                 $GLOBALS['strPrivDescDropTbl']
-            ),
-            array(
+            ],
+            [
                 'Index',
                 'INDEX',
                 $GLOBALS['strPrivDescIndex']
-            ),
-            array(
+            ],
+            [
                 'Alter',
                 'ALTER',
                 $GLOBALS['strPrivDescAlter']
-            ),
-            array(
+            ],
+            [
                 'Create View',
                 'CREATE_VIEW',
                 $GLOBALS['strPrivDescCreateView']
-            ),
-            array(
+            ],
+            [
                 'Show view',
                 'SHOW_VIEW',
                 $GLOBALS['strPrivDescShowView']
-            ),
-            array(
+            ],
+            [
                 'Trigger',
                 'TRIGGER',
                 $GLOBALS['strPrivDescTrigger']
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -299,78 +299,78 @@ class Privileges
      */
     public function getGrantsArray()
     {
-        return array(
-            array(
+        return [
+            [
                 'Select_priv',
                 'SELECT',
                 __('Allows reading data.')
-            ),
-            array(
+            ],
+            [
                 'Insert_priv',
                 'INSERT',
                 __('Allows inserting and replacing data.')
-            ),
-            array(
+            ],
+            [
                 'Update_priv',
                 'UPDATE',
                 __('Allows changing data.')
-            ),
-            array(
+            ],
+            [
                 'Delete_priv',
                 'DELETE',
                 __('Allows deleting data.')
-            ),
-            array(
+            ],
+            [
                 'Create_priv',
                 'CREATE',
                 __('Allows creating new databases and tables.')
-            ),
-            array(
+            ],
+            [
                 'Drop_priv',
                 'DROP',
                 __('Allows dropping databases and tables.')
-            ),
-            array(
+            ],
+            [
                 'Reload_priv',
                 'RELOAD',
                 __('Allows reloading server settings and flushing the server\'s caches.')
-            ),
-            array(
+            ],
+            [
                 'Shutdown_priv',
                 'SHUTDOWN',
                 __('Allows shutting down the server.')
-            ),
-            array(
+            ],
+            [
                 'Process_priv',
                 'PROCESS',
                 __('Allows viewing processes of all users.')
-            ),
-            array(
+            ],
+            [
                 'File_priv',
                 'FILE',
                 __('Allows importing data from and exporting data into files.')
-            ),
-            array(
+            ],
+            [
                 'References_priv',
                 'REFERENCES',
                 __('Has no effect in this MySQL version.')
-            ),
-            array(
+            ],
+            [
                 'Index_priv',
                 'INDEX',
                 __('Allows creating and dropping indexes.')
-            ),
-            array(
+            ],
+            [
                 'Alter_priv',
                 'ALTER',
                 __('Allows altering the structure of existing tables.')
-            ),
-            array(
+            ],
+            [
                 'Show_db_priv',
                 'SHOW DATABASES',
                 __('Gives access to the complete list of databases.')
-            ),
-            array(
+            ],
+            [
                 'Super_priv',
                 'SUPER',
                 __(
@@ -378,80 +378,80 @@ class Privileges
                     . 'is reached; required for most administrative operations '
                     . 'like setting global variables or killing threads of other users.'
                 )
-            ),
-            array(
+            ],
+            [
                 'Create_tmp_table_priv',
                 'CREATE TEMPORARY TABLES',
                 __('Allows creating temporary tables.')
-            ),
-            array(
+            ],
+            [
                 'Lock_tables_priv',
                 'LOCK TABLES',
                 __('Allows locking tables for the current thread.')
-            ),
-            array(
+            ],
+            [
                 'Repl_slave_priv',
                 'REPLICATION SLAVE',
                 __('Needed for the replication slaves.')
-            ),
-            array(
+            ],
+            [
                 'Repl_client_priv',
                 'REPLICATION CLIENT',
                 __('Allows the user to ask where the slaves / masters are.')
-            ),
-            array(
+            ],
+            [
                 'Create_view_priv',
                 'CREATE VIEW',
                 __('Allows creating new views.')
-            ),
-            array(
+            ],
+            [
                 'Event_priv',
                 'EVENT',
                 __('Allows to set up events for the event scheduler.')
-            ),
-            array(
+            ],
+            [
                 'Trigger_priv',
                 'TRIGGER',
                 __('Allows creating and dropping triggers.')
-            ),
+            ],
             // for table privs:
-            array(
+            [
                 'Create View_priv',
                 'CREATE VIEW',
                 __('Allows creating new views.')
-            ),
-            array(
+            ],
+            [
                 'Show_view_priv',
                 'SHOW VIEW',
                 __('Allows performing SHOW CREATE VIEW queries.')
-            ),
+            ],
             // for table privs:
-            array(
+            [
                 'Show view_priv',
                 'SHOW VIEW',
                 __('Allows performing SHOW CREATE VIEW queries.')
-            ),
-            array(
+            ],
+            [
                 'Create_routine_priv',
                 'CREATE ROUTINE',
                 __('Allows creating stored routines.')
-            ),
-            array(
+            ],
+            [
                 'Alter_routine_priv',
                 'ALTER ROUTINE',
                 __('Allows altering and dropping stored routines.')
-            ),
-            array(
+            ],
+            [
                 'Create_user_priv',
                 'CREATE USER',
                 __('Allows creating, dropping and renaming user accounts.')
-            ),
-            array(
+            ],
+            [
                 'Execute_priv',
                 'EXECUTE',
                 __('Allows executing stored routines.')
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -471,7 +471,7 @@ class Privileges
     public function getHtmlForColumnPrivileges(array $columns, array $row, $name_for_select,
         $priv_for_header, $name, $name_for_dfn, $name_for_current
     ) {
-        $data = array(
+        $data = [
             'columns'          => $columns,
             'row'              => $row,
             'name_for_select'  => $name_for_select,
@@ -479,7 +479,7 @@ class Privileges
             'name'             => $name,
             'name_for_dfn'     => $name_for_dfn,
             'name_for_current' => $name_for_current
-        );
+        ];
 
         $html_output = Template::get('privileges/column_privileges')
             ->render($data);
@@ -544,7 +544,7 @@ class Privileges
             );
         }
 
-        $allUserGroups = array('' => '');
+        $allUserGroups = ['' => ''];
         $sql_query = "SELECT DISTINCT `usergroup` FROM " . $groupTable;
         $result = $relation->queryAsControlUser($sql_query, false);
         if ($result) {
@@ -555,11 +555,11 @@ class Privileges
         $GLOBALS['dbi']->freeResult($result);
 
         // render the template
-        $data = array(
+        $data = [
             'all_user_groups' => $allUserGroups,
             'user_group'      => $userGroup,
-            'params'          => array('username' => $username)
-        );
+            'params'          => ['username' => $username]
+        ];
         $html_output = Template::get('privileges/choose_user_group')
             ->render($data);
 
@@ -642,7 +642,7 @@ class Privileges
         }
         if (empty($row)) {
             if ($table == '*' && $GLOBALS['dbi']->isSuperuser()) {
-                $row = array();
+                $row = [];
                 if ($db == '*') {
                     $sql_query = 'SHOW COLUMNS FROM `mysql`.`user`;';
                 } elseif ($table == '*') {
@@ -662,9 +662,9 @@ class Privileges
                 }
                 $GLOBALS['dbi']->freeResult($res);
             } elseif ($table == '*') {
-                $row = array();
+                $row = [];
             } else {
-                $row = array('Table_priv' => '');
+                $row = ['Table_priv' => ''];
             }
         }
         if (isset($row['Table_priv'])) {
@@ -678,15 +678,15 @@ class Privileges
                 )
                 . '.' . Util::backquote($table) . ';'
             );
-            $columns = array();
+            $columns = [];
             if ($res) {
                 while ($row1 = $GLOBALS['dbi']->fetchRow($res)) {
-                    $columns[$row1[0]] = array(
+                    $columns[$row1[0]] = [
                         'Select' => false,
                         'Insert' => false,
                         'Update' => false,
                         'References' => false
-                    );
+                    ];
                 }
                 $GLOBALS['dbi']->freeResult($res);
             }
@@ -722,8 +722,8 @@ class Privileges
     public function getHtmlForRequires(array $row)
     {
         $specified = (isset($row['ssl_type']) && $row['ssl_type'] == 'SPECIFIED');
-        $require_options = array(
-            array(
+        $require_options = [
+            [
                 'name'        => 'ssl_type',
                 'value'       => 'NONE',
                 'description' => __(
@@ -738,8 +738,8 @@ class Privileges
                 ),
                 'disabled'    => false,
                 'radio'       => true
-            ),
-            array(
+            ],
+            [
                 'name'        => 'ssl_type',
                 'value'       => 'ANY',
                 'description' => __(
@@ -752,8 +752,8 @@ class Privileges
                 ),
                 'disabled'    => false,
                 'radio'       => true
-            ),
-            array(
+            ],
+            [
                 'name'        => 'ssl_type',
                 'value'       => 'X509',
                 'description' => __(
@@ -766,8 +766,8 @@ class Privileges
                 ),
                 'disabled'    => false,
                 'radio'       => true
-            ),
-            array(
+            ],
+            [
                 'name'        => 'ssl_type',
                 'value'       => 'SPECIFIED',
                 'description' => '',
@@ -775,8 +775,8 @@ class Privileges
                 'checked'     => ($specified ? 'checked="checked"' : ''),
                 'disabled'    => false,
                 'radio'       => true
-            ),
-            array(
+            ],
+            [
                 'name'        => 'ssl_cipher',
                 'value'       => (isset($row['ssl_cipher'])
                     ? htmlspecialchars($row['ssl_cipher']) : ''
@@ -788,8 +788,8 @@ class Privileges
                 'checked'     => '',
                 'disabled'    => ! $specified,
                 'radio'       => false
-            ),
-            array(
+            ],
+            [
                 'name'        => 'x509_issuer',
                 'value'       => (isset($row['x509_issuer'])
                     ? htmlspecialchars($row['x509_issuer']) : ''
@@ -801,8 +801,8 @@ class Privileges
                 'checked'     => '',
                 'disabled'    => ! $specified,
                 'radio'       => false
-            ),
-            array(
+            ],
+            [
                 'name'        => 'x509_subject',
                 'value'       => (isset($row['x509_subject'])
                     ? htmlspecialchars($row['x509_subject']) : ''
@@ -814,11 +814,11 @@ class Privileges
                 'checked'     => '',
                 'disabled'    => ! $specified,
                 'radio'       => false
-            ),
-        );
+            ],
+        ];
 
         $html_output = Template::get('privileges/require_options')
-            ->render(array('require_options' => $require_options));
+            ->render(['require_options' => $require_options]);
 
         return $html_output;
     }
@@ -832,16 +832,16 @@ class Privileges
      */
     public function getHtmlForResourceLimits(array $row)
     {
-        $limits = array(
-            array(
+        $limits = [
+            [
                 'input_name'  => 'max_questions',
                 'name_main'   => 'MAX QUERIES PER HOUR',
                 'value'       => (isset($row['max_questions']) ? $row['max_questions'] : '0'),
                 'description' => __(
                     'Limits the number of queries the user may send to the server per hour.'
                 )
-            ),
-            array(
+            ],
+            [
                 'input_name'  => 'max_updates',
                 'name_main'   => 'MAX UPDATES PER HOUR',
                 'value'       => (isset($row['max_updates']) ? $row['max_updates'] : '0'),
@@ -849,16 +849,16 @@ class Privileges
                     'Limits the number of commands that change any table '
                     . 'or database the user may execute per hour.'
                 )
-            ),
-            array(
+            ],
+            [
                 'input_name'  => 'max_connections',
                 'name_main'   => 'MAX CONNECTIONS PER HOUR',
                 'value'       => (isset($row['max_connections']) ? $row['max_connections'] : '0'),
                 'description' => __(
                     'Limits the number of new connections the user may open per hour.'
                 )
-            ),
-            array(
+            ],
+            [
                 'input_name'  => 'max_user_connections',
                 'name_main'   => 'MAX USER_CONNECTIONS',
                 'value'       => (isset($row['max_user_connections']) ?
@@ -867,11 +867,11 @@ class Privileges
                     'Limits the number of simultaneous connections '
                     . 'the user may have.'
                 )
-            )
-        );
+            ]
+        ];
 
         $html_output = Template::get('privileges/resource_limits')
-            ->render(array('limits' => $limits));
+            ->render(['limits' => $limits]);
 
         $html_output .= '</fieldset>' . "\n";
 
@@ -908,13 +908,13 @@ class Privileges
 
         $privs = $this->parseProcPriv($res);
 
-        $routineArray   = array($this->getTriggerPrivilegeTable());
-        $privTableNames = array(__('Routine'));
+        $routineArray   = [$this->getTriggerPrivilegeTable()];
+        $privTableNames = [__('Routine')];
         $privCheckboxes = $this->getHtmlForGlobalPrivTableWithCheckboxes(
             $routineArray, $privTableNames, $privs
         );
 
-        $data = array(
+        $data = [
             'username'       => $username,
             'hostname'       => $hostname,
             'database'       => $db,
@@ -922,7 +922,7 @@ class Privileges
             'grant_count'     => count($privs),
             'priv_checkboxes' => $privCheckboxes,
             'header'         => $header,
-        );
+        ];
         $html_output = Template::get('privileges/edit_routine_privileges')
             ->render($data);
 
@@ -936,26 +936,26 @@ class Privileges
      */
     public function getTriggerPrivilegeTable()
     {
-        $routinePrivTable = array(
-            array(
+        $routinePrivTable = [
+            [
                 'Grant',
                 'GRANT',
                 __(
                     'Allows user to give to other users or remove from other users '
                     . 'privileges that user possess on this routine.'
                 )
-            ),
-            array(
+            ],
+            [
                 'Alter_routine',
                 'ALTER ROUTINE',
                 __('Allows altering and dropping this routine.')
-            ),
-            array(
+            ],
+            [
                 'Execute',
                 'EXECUTE',
                 __('Allows executing this routine.')
-            )
-        );
+            ]
+        ];
         return $routinePrivTable;
     }
 
@@ -1070,7 +1070,7 @@ class Privileges
 
         foreach ($row as $current_grant => $current_grant_value) {
             $grant_type = substr($current_grant, 0, -5);
-            if (in_array($grant_type, array('Select', 'Insert', 'Update', 'References'))
+            if (in_array($grant_type, ['Select', 'Insert', 'Update', 'References'])
             ) {
                 continue;
             }
@@ -1144,11 +1144,11 @@ class Privileges
      */
     public function getHtmlForGlobalOrDbSpecificPrivs($db, $table, array $row)
     {
-        $privTable_names = array(0 => __('Data'),
+        $privTable_names = [0 => __('Data'),
             1 => __('Structure'),
             2 => __('Administration')
-        );
-        $privTable = array();
+        ];
+        $privTable = [];
         $privTable[0] = $this->getDataPrivilegeTable($db);
         $privTable[1] = $this->getStructurePrivilegeTable($table, $row);
         $privTable[2] = $this->getAdministrationPrivilegeTable($db);
@@ -1205,18 +1205,18 @@ class Privileges
      */
     public function getDataPrivilegeTable($db)
     {
-        $data_privTable = array(
-            array('Select', 'SELECT', __('Allows reading data.')),
-            array('Insert', 'INSERT', __('Allows inserting and replacing data.')),
-            array('Update', 'UPDATE', __('Allows changing data.')),
-            array('Delete', 'DELETE', __('Allows deleting data.'))
-        );
+        $data_privTable = [
+            ['Select', 'SELECT', __('Allows reading data.')],
+            ['Insert', 'INSERT', __('Allows inserting and replacing data.')],
+            ['Update', 'UPDATE', __('Allows changing data.')],
+            ['Delete', 'DELETE', __('Allows deleting data.')]
+        ];
         if ($db == '*') {
             $data_privTable[]
-                = array('File',
+                = ['File',
                     'FILE',
                     __('Allows importing data from and exporting data into files.')
-                );
+                ];
         }
         return $data_privTable;
     }
@@ -1231,68 +1231,68 @@ class Privileges
      */
     public function getStructurePrivilegeTable($table, array $row)
     {
-        $structure_privTable = array(
-            array('Create',
+        $structure_privTable = [
+            ['Create',
                 'CREATE',
                 ($table == '*'
                     ? __('Allows creating new databases and tables.')
                     : __('Allows creating new tables.')
                 )
-            ),
-            array('Alter',
+            ],
+            ['Alter',
                 'ALTER',
                 __('Allows altering the structure of existing tables.')
-            ),
-            array('Index', 'INDEX', __('Allows creating and dropping indexes.')),
-            array('Drop',
+            ],
+            ['Index', 'INDEX', __('Allows creating and dropping indexes.')],
+            ['Drop',
                 'DROP',
                 ($table == '*'
                     ? __('Allows dropping databases and tables.')
                     : __('Allows dropping tables.')
                 )
-            ),
-            array('Create_tmp_table',
+            ],
+            ['Create_tmp_table',
                 'CREATE TEMPORARY TABLES',
                 __('Allows creating temporary tables.')
-            ),
-            array('Show_view',
+            ],
+            ['Show_view',
                 'SHOW VIEW',
                 __('Allows performing SHOW CREATE VIEW queries.')
-            ),
-            array('Create_routine',
+            ],
+            ['Create_routine',
                 'CREATE ROUTINE',
                 __('Allows creating stored routines.')
-            ),
-            array('Alter_routine',
+            ],
+            ['Alter_routine',
                 'ALTER ROUTINE',
                 __('Allows altering and dropping stored routines.')
-            ),
-            array('Execute', 'EXECUTE', __('Allows executing stored routines.')),
-        );
+            ],
+            ['Execute', 'EXECUTE', __('Allows executing stored routines.')],
+        ];
         // this one is for a db-specific priv: Create_view_priv
         if (isset($row['Create_view_priv'])) {
-            $structure_privTable[] = array('Create_view',
+            $structure_privTable[] = ['Create_view',
                 'CREATE VIEW',
                 __('Allows creating new views.')
-            );
+            ];
         }
         // this one is for a table-specific priv: Create View_priv
         if (isset($row['Create View_priv'])) {
-            $structure_privTable[] = array('Create View',
+            $structure_privTable[] = ['Create View',
                 'CREATE VIEW',
                 __('Allows creating new views.')
-            );
+            ];
         }
         if (isset($row['Event_priv'])) {
             // MySQL 5.1.6
-            $structure_privTable[] = array('Event',
+            $structure_privTable[] = ['Event',
                 'EVENT',
                 __('Allows to set up events for the event scheduler.')
-            );
-            $structure_privTable[] = array('Trigger',
+            ];
+            $structure_privTable[] = ['Trigger',
                 'TRIGGER',
                 __('Allows creating and dropping triggers.')
-            );
+            ];
         }
         return $structure_privTable;
     }
@@ -1307,16 +1307,16 @@ class Privileges
     public function getAdministrationPrivilegeTable($db)
     {
         if ($db == '*') {
-            $adminPrivTable = array(
-                array('Grant',
+            $adminPrivTable = [
+                ['Grant',
                     'GRANT',
                     __(
                         'Allows adding users and privileges '
                         . 'without reloading the privilege tables.'
                     )
-                ),
-            );
-            $adminPrivTable[] = array('Super',
+                ],
+            ];
+            $adminPrivTable[] = ['Super',
                 'SUPER',
                 __(
                     'Allows connecting, even if maximum number '
@@ -1324,56 +1324,56 @@ class Privileges
                     . 'most administrative operations like '
                     . 'setting global variables or killing threads of other users.'
                 )
-            );
-            $adminPrivTable[] = array('Process',
+            ];
+            $adminPrivTable[] = ['Process',
                 'PROCESS',
                 __('Allows viewing processes of all users.')
-            );
-            $adminPrivTable[] = array('Reload',
+            ];
+            $adminPrivTable[] = ['Reload',
                 'RELOAD',
                 __('Allows reloading server settings and flushing the server\'s caches.')
-            );
-            $adminPrivTable[] = array('Shutdown',
+            ];
+            $adminPrivTable[] = ['Shutdown',
                 'SHUTDOWN',
                 __('Allows shutting down the server.')
-            );
-            $adminPrivTable[] = array('Show_db',
+            ];
+            $adminPrivTable[] = ['Show_db',
                 'SHOW DATABASES',
                 __('Gives access to the complete list of databases.')
-            );
+            ];
         }
         else {
-            $adminPrivTable = array(
-                array('Grant',
+            $adminPrivTable = [
+                ['Grant',
                     'GRANT',
                     __(
                         'Allows user to give to other users or remove from other'
                         . ' users the privileges that user possess yourself.'
                     )
-               ),
-            );
+               ],
+            ];
         }
-        $adminPrivTable[] = array('Lock_tables',
+        $adminPrivTable[] = ['Lock_tables',
             'LOCK TABLES',
             __('Allows locking tables for the current thread.')
-        );
-        $adminPrivTable[] = array('References',
+        ];
+        $adminPrivTable[] = ['References',
             'REFERENCES',
             __('Has no effect in this MySQL version.')
-        );
+        ];
         if ($db == '*') {
-            $adminPrivTable[] = array('Repl_client',
+            $adminPrivTable[] = ['Repl_client',
                 'REPLICATION CLIENT',
                 __('Allows the user to ask where the slaves / masters are.')
-            );
-            $adminPrivTable[] = array('Repl_slave',
+            ];
+            $adminPrivTable[] = ['Repl_slave',
                 'REPLICATION SLAVE',
                 __('Needed for the replication slaves.')
-            );
-            $adminPrivTable[] = array('Create_user',
+            ];
+            $adminPrivTable[] = ['Create_user',
                 'CREATE USER',
                 __('Allows creating, dropping and renaming user accounts.')
-            );
+            ];
         }
         return $adminPrivTable;
     }
@@ -1391,11 +1391,11 @@ class Privileges
     public function getHtmlForGlobalPrivTableWithCheckboxes(
         array $privTable, array $privTableNames, array $row
     ) {
-        return Template::get('privileges/global_priv_table')->render(array(
+        return Template::get('privileges/global_priv_table')->render([
             'priv_table' => $privTable,
             'priv_table_names' => $privTableNames,
             'row' => $row,
-        ));
+        ]);
     }
 
     /**
@@ -1424,9 +1424,9 @@ class Privileges
                 unset($active_auth_plugins['mysql_old_password']);
             }
         } else {
-            $active_auth_plugins = array(
+            $active_auth_plugins = [
                 'mysql_native_password' => __('Native MySQL authentication')
-            );
+            ];
         }
 
         $html_output = Util::getDropdown(
@@ -1451,7 +1451,7 @@ class Privileges
             . "WHERE `PLUGIN_TYPE` = 'AUTHENTICATION';";
         $resultset = $GLOBALS['dbi']->query($get_plugins_query);
 
-        $result = array();
+        $result = [];
 
         while ($row = $GLOBALS['dbi']->fetchAssoc($resultset)) {
             // if description is known, enable its translation
@@ -1774,7 +1774,7 @@ class Privileges
                 $hostname_length = $val['CHARACTER_MAXIMUM_LENGTH'];
             }
         }
-        return array($username_length, $hostname_length);
+        return [$username_length, $hostname_length];
     }
 
     /**
@@ -2058,7 +2058,7 @@ class Privileges
         );
         $message->addParam('\'' . $username . '\'@\'' . $hostname . '\'');
 
-        return array($message, $sql_query);
+        return [$message, $sql_query];
     }
 
     /**
@@ -2070,7 +2070,7 @@ class Privileges
     {
         $arr = isset($_POST['ssl_type']) ? $_POST : $GLOBALS;
         if (isset($arr['ssl_type']) && $arr['ssl_type'] == 'SPECIFIED') {
-            $require = array();
+            $require = [];
             if (! empty($arr['ssl_cipher'])) {
                 $require[] = "CIPHER '"
                         . $GLOBALS['dbi']->escapeString($arr['ssl_cipher']) . "'";
@@ -2165,37 +2165,37 @@ class Privileges
 
         $html_output .= Template::get('checkbox')
             ->render(
-                array(
+                [
                     'html_field_name'   => 'createdb-1',
                     'label'             => __('Create database with same name and grant all privileges.'),
                     'checked'           => false,
                     'onclick'           => false,
                     'html_field_id'     => 'createdb-1',
-                )
+                ]
             );
         $html_output .= '<br />' . "\n";
         $html_output .= Template::get('checkbox')
             ->render(
-                array(
+                [
                     'html_field_name'   => 'createdb-2',
                     'label'             => __('Grant all privileges on wildcard name (username\\_%).'),
                     'checked'           => false,
                     'onclick'           => false,
                     'html_field_id'     => 'createdb-2',
-                )
+                ]
             );
         $html_output .= '<br />' . "\n";
 
         if (! empty($dbname) ) {
             $html_output .= Template::get('checkbox')
                 ->render(
-                    array(
+                    [
                         'html_field_name'   => 'createdb-3',
                         'label'             => sprintf(__('Grant all privileges on database %s.'), htmlspecialchars($dbname)),
                         'checked'           => true,
                         'onclick'           => false,
                         'html_field_id'     => 'createdb-3',
-                    )
+                    ]
                 );
             $html_output .= '<input type="hidden" name="dbname" value="'
                 . htmlspecialchars($dbname) . '" />' . "\n";
@@ -2269,7 +2269,7 @@ class Privileges
         $listOfComparedPrivs .=
             ' AND `Event_priv` = \'N\''
             . ' AND `Trigger_priv` = \'N\'';
-        return array($list_of_privileges, $listOfComparedPrivs);
+        return [$list_of_privileges, $listOfComparedPrivs];
     }
 
     /**
@@ -2369,7 +2369,7 @@ class Privileges
                     '<a href="' . Util::getScriptNameForOption(
                         $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
                     )
-                    . Url::getCommon(array('db' => $db)) . '">'
+                    . Url::getCommon(['db' => $db]) . '">'
                     .  htmlspecialchars($db)
                     . '</a>'
                 )
@@ -2387,11 +2387,11 @@ class Privileges
             $html_output .= '<div class="floatleft">';
             $html_output .= Template::get('select_all')
                 ->render(
-                    array(
+                    [
                         'pma_theme_image' => $GLOBALS['pmaThemeImage'],
                         'text_dir'        => $GLOBALS['text_dir'],
                         'form_name'       => "usersForm",
-                    )
+                    ]
                 );
             $html_output .= Util::getButtonOrImage(
                 'submit_mult', 'mult_submit',
@@ -2444,10 +2444,10 @@ class Privileges
                         $GLOBALS['cfg']['DefaultTabTable'], 'table'
                     )
                     . Url::getCommon(
-                        array(
+                        [
                             'db' => $db,
                             'table' => $table,
-                        )
+                        ]
                     ) . '">'
                     .  htmlspecialchars($db) . '.' . htmlspecialchars($table)
                     . '</a>'
@@ -2473,11 +2473,11 @@ class Privileges
             $html_output .= '<div class="floatleft">';
             $html_output .= Template::get('select_all')
                 ->render(
-                    array(
+                    [
                         'pma_theme_image' => $GLOBALS['pmaThemeImage'],
                         'text_dir'        => $GLOBALS['text_dir'],
                         'form_name'       => "usersForm",
-                    )
+                    ]
                 );
             $html_output .= Util::getButtonOrImage(
                 'submit_mult', 'mult_submit',
@@ -2520,7 +2520,7 @@ class Privileges
             . ")"
             . " ORDER BY `User` ASC, `Host` ASC, `Db` ASC;";
         $res = $GLOBALS['dbi']->query($sql_query);
-        $privMap = array();
+        $privMap = [];
         $this->mergePrivMapFromResult($privMap, $res);
         return $privMap;
     }
@@ -2539,10 +2539,10 @@ class Privileges
             $user = $row['User'];
             $host = $row['Host'];
             if (! isset($privMap[$user])) {
-                $privMap[$user] = array();
+                $privMap[$user] = [];
             }
             if (! isset($privMap[$user][$host])) {
-                $privMap[$user][$host] = array();
+                $privMap[$user][$host] = [];
             }
             $privMap[$user][$host][] = $row;
         }
@@ -2697,7 +2697,7 @@ class Privileges
             $html_output .= '<td>';
             if (isset($current['Table_name'])) {
                 $privList = explode(',', $current['Table_priv']);
-                $privs = array();
+                $privs = [];
                 $grantsArr = $this->getTableGrantsArray();
                 foreach ($grantsArr as $grant) {
                     $privs[$grant[0]] = 'N';
@@ -2800,10 +2800,10 @@ class Privileges
             $html .= ' class="export_user_anchor ajax"';
             break;
         }
-        $params = array(
+        $params = [
             'username' => $username,
             'hostname' => $hostname
-        );
+        ];
         switch($linktype) {
         case 'edit':
             $params['dbname'] = $dbname;
@@ -2853,7 +2853,7 @@ class Privileges
     {
          return '<a class="edit_user_group_anchor ajax"'
             . ' href="server_privileges.php'
-            . Url::getCommon(array('username' => $username))
+            . Url::getCommon(['username' => $username])
             . '">'
             . Util::getIcon('b_usrlist', __('Edit user group'))
             . '</a>';
@@ -2941,7 +2941,7 @@ class Privileges
             $user_group_count = $this->getUserGroupCount();
         }
 
-        $extra_data = array();
+        $extra_data = [];
         if (strlen($sql_query) > 0) {
             $extra_data['sql_query'] = Util::getMessage(null, $sql_query);
         }
@@ -3029,7 +3029,7 @@ class Privileges
                 mb_substr($username, 0, 1)
             );
             $newUserInitialString = '<a href="server_privileges.php'
-                . Url::getCommon(array('initial' => $new_user_initial)) . '">'
+                . Url::getCommon(['initial' => $new_user_initial]) . '">'
                 . $new_user_initial . '</a>';
             $extra_data['new_user_initial'] = $new_user_initial;
             $extra_data['new_user_initial_string'] = $newUserInitialString;
@@ -3072,7 +3072,7 @@ class Privileges
      */
     public function getChangeLoginInformationHtmlForm($username, $hostname)
     {
-        $choices = array(
+        $choices = [
             '4' => __('… keep the old one.'),
             '1' => __('… delete the old one from the user tables.'),
             '2' => __(
@@ -3083,7 +3083,7 @@ class Privileges
                 '… delete the old one from the user tables '
                 . 'and reload the privileges afterwards.'
             )
-        );
+        ];
 
         $html_output = '<form action="server_privileges.php" '
             . 'onsubmit="return checkAddUser(this);" '
@@ -3142,10 +3142,10 @@ class Privileges
                 $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
             )
             . Url::getCommon(
-                array(
+                [
                     'db' => $url_dbname,
                     'reload' => 1
-                )
+                ]
             )
             . '">'
             . htmlspecialchars(Util::unescapeMysqlWildcards($dbname)) . ': '
@@ -3160,11 +3160,11 @@ class Privileges
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
                 . Url::getCommon(
-                    array(
+                    [
                         'db' => $url_dbname,
                         'table' => $tablename,
                         'reload' => 1,
-                    )
+                    ]
                 )
                 . '">' . htmlspecialchars($tablename) . ': '
                 . Util::getTitleForTarget(
@@ -3195,26 +3195,26 @@ class Privileges
             . " = '" . $GLOBALS['dbi']->escapeString($hostname) . "'";
 
         if ($type == 'database') {
-            $tables_to_search_for_users = array(
+            $tables_to_search_for_users = [
                 'tables_priv', 'columns_priv', 'procs_priv'
-            );
+            ];
             $dbOrTableName = 'Db';
         } elseif ($type == 'table') {
             $user_host_condition .= " AND `Db` LIKE '"
                 . $GLOBALS['dbi']->escapeString($dbname) . "'";
-            $tables_to_search_for_users = array('columns_priv',);
+            $tables_to_search_for_users = ['columns_priv',];
             $dbOrTableName = 'Table_name';
         } else { // routine
             $user_host_condition .= " AND `Db` LIKE '"
                 . $GLOBALS['dbi']->escapeString($dbname) . "'";
-            $tables_to_search_for_users = array('procs_priv',);
+            $tables_to_search_for_users = ['procs_priv',];
             $dbOrTableName = 'Routine_name';
         }
 
         // we also want privileges for this user not in table `db` but in other table
         $tables = $GLOBALS['dbi']->fetchResult('SHOW TABLES FROM `mysql`;');
 
-        $db_rights_sqls = array();
+        $db_rights_sqls = [];
         foreach ($tables_to_search_for_users as $table_search_in) {
             if (in_array($table_search_in, $tables)) {
                 $db_rights_sqls[] = '
@@ -3224,15 +3224,15 @@ class Privileges
             }
         }
 
-        $user_defaults = array(
+        $user_defaults = [
             $dbOrTableName  => '',
             'Grant_priv'    => 'N',
-            'privs'         => array('USAGE'),
+            'privs'         => ['USAGE'],
             'Column_priv'   => true,
-        );
+        ];
 
         // for the rights
-        $db_rights = array();
+        $db_rights = [];
 
         $db_rights_sql = '(' . implode(') UNION (', $db_rights_sqls) . ')'
             . ' ORDER BY `' . $dbOrTableName . '` ASC';
@@ -3301,11 +3301,11 @@ class Privileges
      */
     public function parseProcPriv($privs)
     {
-        $result = array(
+        $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';
@@ -3329,26 +3329,26 @@ class Privileges
     public function getHtmlForAllTableSpecificRights(
         $username, $hostname, $type, $dbname = ''
     ) {
-        $uiData = array(
-            'database' => array(
+        $uiData = [
+            'database' => [
                 'form_id'        => 'database_specific_priv',
                 'sub_menu_label' => __('Database'),
                 'legend'         => __('Database-specific privileges'),
                 'type_label'     => __('Database'),
-            ),
-            'table' => array(
+            ],
+            'table' => [
                 'form_id'        => 'table_specific_priv',
                 'sub_menu_label' => __('Table'),
                 'legend'         => __('Table-specific privileges'),
                 'type_label'     => __('Table'),
-            ),
-            'routine' => array(
+            ],
+            'routine' => [
                 'form_id'        => 'routine_specific_priv',
                 'sub_menu_label' => __('Routine'),
                 'legend'         => __('Routine-specific privileges'),
                 'type_label'     => __('Routine'),
-            ),
-        );
+            ],
+        ];
 
         /**
          * no db name given, so we want all privs for the given user
@@ -3357,10 +3357,10 @@ class Privileges
         $db_rights = $this->getUserSpecificRights($username, $hostname, $type, $dbname);
         ksort($db_rights);
 
-        $foundRows = array();
-        $privileges = array();
+        $foundRows = [];
+        $privileges = [];
         foreach ($db_rights as $row) {
-            $onePrivilege = array();
+            $onePrivilege = [];
 
             $paramTableName = '';
             $paramRoutineName = '';
@@ -3445,9 +3445,9 @@ class Privileges
             // we already have the list of databases from libraries/common.inc.php
             // via $pma = new PMA;
             $pred_db_array = $GLOBALS['dblist']->databases;
-            $databases_to_skip = array('information_schema', 'performance_schema');
+            $databases_to_skip = ['information_schema', 'performance_schema'];
 
-            $databases = array();
+            $databases = [];
             if (! empty($pred_db_array)) {
                 foreach ($pred_db_array as $current_db) {
                     if (in_array($current_db, $databases_to_skip)) {
@@ -3472,7 +3472,7 @@ class Privileges
                 DatabaseInterface::QUERY_STORE
             );
 
-            $tables = array();
+            $tables = [];
             if ($result) {
                 while ($row = $GLOBALS['dbi']->fetchRow($result)) {
                     if (! in_array($row[0], $foundRows)) {
@@ -3486,7 +3486,7 @@ class Privileges
         } else { // routine
             $routineData = $GLOBALS['dbi']->getRoutines($dbname);
 
-            $routines = array();
+            $routines = [];
             foreach ($routineData as $routine) {
                 if (! in_array($routine['name'], $foundRows)) {
                     $routines[] = $routine['name'];
@@ -3557,11 +3557,11 @@ class Privileges
         $html_output .= '<div class="floatleft">'
             . Template::get('select_all')
                 ->render(
-                    array(
+                    [
                         'pma_theme_image' => $pmaThemeImage,
                         'text_dir'        => $text_dir,
                         'form_name'       => 'usersForm',
-                    )
+                    ]
                 ) . "\n";
         $html_output .= Util::getButtonOrImage(
             'submit_mult', 'mult_submit',
@@ -3595,7 +3595,7 @@ class Privileges
                 . "." . Util::backquote($cfgRelation['users']);
             $sql_query = 'SELECT * FROM ' . $users_table;
             $result = $relation->queryAsControlUser($sql_query, false);
-            $group_assignment = array();
+            $group_assignment = [];
             if ($result) {
                 while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
                     $group_assignment[$row['username']] = $row['usergroup'];
@@ -3730,7 +3730,7 @@ class Privileges
         $html_output = $this->getAddUserHtmlFieldset();
 
         $html_output .= Template::get('privileges/delete_user_fieldset')
-            ->render(array());
+            ->render([]);
 
         return $html_output;
     }
@@ -3771,10 +3771,10 @@ class Privileges
 
         $html_output = Template::get('privileges/initials_row')
             ->render(
-                array(
+                [
                     'array_initials' => $array_initials,
                     'initial' => isset($_REQUEST['initial']) ? $_REQUEST['initial'] : null,
-                )
+                ]
             );
 
         return $html_output;
@@ -3790,11 +3790,11 @@ class Privileges
         // we also want users not in table `user` but in other table
         $tables = $GLOBALS['dbi']->fetchResult('SHOW TABLES FROM `mysql`;');
 
-        $tablesSearchForUsers = array(
+        $tablesSearchForUsers = [
             'user', 'db', 'tables_priv', 'columns_priv', 'procs_priv',
-        );
+        ];
 
-        $db_rights_sqls = array();
+        $db_rights_sqls = [];
         foreach ($tablesSearchForUsers as $table_search_in) {
             if (in_array($table_search_in, $tables)) {
                 $db_rights_sqls[] = 'SELECT DISTINCT `User`, `Host` FROM `mysql`.`'
@@ -3804,16 +3804,16 @@ class Privileges
                     : '');
             }
         }
-        $user_defaults = array(
+        $user_defaults = [
             'User'       => '',
             'Host'       => '%',
             'Password'   => '?',
             'Grant_priv' => 'N',
-            'privs'      => array('USAGE'),
-        );
+            'privs'      => ['USAGE'],
+        ];
 
         // for the rights
-        $db_rights = array();
+        $db_rights = [];
 
         $db_rights_sql = '(' . implode(') UNION (', $db_rights_sqls) . ')'
             . ' ORDER BY `User` ASC, `Host` ASC';
@@ -3868,7 +3868,7 @@ class Privileges
                 );
             }
         }
-        return array($sql_query, $message);
+        return [$sql_query, $message];
     }
 
     /**
@@ -3942,7 +3942,7 @@ class Privileges
         $message = Message::success(__('You have updated the privileges for %s.'));
         $message->addParam('\'' . $username . '\'@\'' . $hostname . '\'');
 
-        return array($sql_query, $message);
+        return [$sql_query, $message];
     }
 
     /**
@@ -4010,11 +4010,11 @@ class Privileges
                     $password = $authentication_string;
                 }
 
-                $queries = array();
+                $queries = [];
             }
         }
 
-        return array($queries, $password);
+        return [$queries, $password];
     }
 
     /**
@@ -4027,17 +4027,17 @@ class Privileges
     public function getDataForDeleteUsers($queries)
     {
         if (isset($_REQUEST['change_copy'])) {
-            $selected_usr = array(
+            $selected_usr = [
                 $_REQUEST['old_username'] . '&amp;#27;' . $_REQUEST['old_hostname']
-            );
+            ];
         } else {
             $selected_usr = $_REQUEST['selected_usr'];
-            $queries = array();
+            $queries = [];
         }
 
         // this happens, was seen in https://reports.phpmyadmin.net/reports/view/17146
         if (! is_array($selected_usr)) {
-            return array();
+            return [];
         }
 
         foreach ($selected_usr as $each_user) {
@@ -4133,9 +4133,9 @@ class Privileges
         $sql_query = null;
 
         if (!isset($_REQUEST['adduser_submit']) && !isset($_REQUEST['change_copy'])) {
-            return array(
+            return [
                 $message, $queries, $queries_for_display, $sql_query, $_add_user_error
-            );
+            ];
         }
 
         $sql_query = '';
@@ -4170,13 +4170,13 @@ class Privileges
             $_REQUEST['adduser'] = true;
             $_add_user_error = true;
 
-            return array(
+            return [
                 $message,
                 $queries,
                 $queries_for_display,
                 $sql_query,
                 $_add_user_error
-            );
+            ];
         }
 
         list(
@@ -4218,13 +4218,13 @@ class Privileges
                 $this->setUserGroup($GLOBALS['username'], $_REQUEST['userGroup']);
             }
 
-            return array(
+            return [
                 $message,
                 $queries,
                 $queries_for_display,
                 $sql_query,
                 $_add_user_error
-            );
+            ];
         }
 
         // Copy the user group while copying a user
@@ -4261,9 +4261,9 @@ class Privileges
             $queries_for_display[$tmp_count - 1] = $sql_query;
         }
 
-        return array(
+        return [
             $message, $queries, $queries_for_display, $sql_query, $_add_user_error
-        );
+        ];
     }
 
     /**
@@ -4400,14 +4400,14 @@ class Privileges
             }
         }
 
-        return array(
+        return [
             $username, $hostname,
             isset($dbname)? $dbname : null,
             isset($tablename)? $tablename : null,
             isset($routinename) ? $routinename : null,
             $db_and_table,
             $dbname_is_wildcard,
-        );
+        ];
     }
 
     /**
@@ -4456,7 +4456,7 @@ class Privileges
 
         $export .= '</textarea>';
 
-        return array($title, $export);
+        return [$title, $export];
     }
 
     /**
@@ -4472,10 +4472,10 @@ class Privileges
         if (!$GLOBALS['is_createuser']) {
             return '';
         }
-        $rel_params = array();
-        $url_params = array(
+        $rel_params = [];
+        $url_params = [
             'adduser' => 1
-        );
+        ];
         if (!empty($db)) {
             $url_params['dbname']
                 = $rel_params['checkprivsdb']
@@ -4489,10 +4489,10 @@ class Privileges
 
         return Template::get('privileges/add_user_fieldset')
             ->render(
-                array(
+                [
                     'url_params' => $url_params,
                     'rel_params' => $rel_params
-                )
+                ]
             );
     }
 
@@ -4522,12 +4522,12 @@ class Privileges
             $html_output .= ' <i><a class="edit_user_anchor"'
                 . ' href="server_privileges.php'
                 . Url::getCommon(
-                    array(
+                    [
                         'username' => $username,
                         'hostname' => $hostname,
                         'dbname' => '',
                         'tablename' => '',
-                    )
+                    ]
                 )
                 . '">\'' . htmlspecialchars($username)
                 . '\'@\'' . htmlspecialchars($hostname)
@@ -4540,12 +4540,12 @@ class Privileges
             if (! empty($entity_name) && $entity_type === 'table') {
                 $html_output .= ' <i><a href="server_privileges.php'
                     . Url::getCommon(
-                        array(
+                        [
                             'username' => $username,
                             'hostname' => $hostname,
                             'dbname' => $url_dbname,
                             'tablename' => '',
-                        )
+                        ]
                     )
                     . '">' . htmlspecialchars($dbname)
                     . '</a></i>';
@@ -4555,12 +4555,12 @@ class Privileges
             } elseif (! empty($entity_name)) {
                 $html_output .= ' <i><a href="server_privileges.php'
                     . Url::getCommon(
-                        array(
+                        [
                             'username' => $username,
                             'hostname' => $hostname,
                             'dbname' => $url_dbname,
                             'routinename' => '',
-                        )
+                        ]
                     )
                     . '">' . htmlspecialchars($dbname)
                     . '</a></i>';
@@ -4569,7 +4569,7 @@ class Privileges
                     . ' <i>' . htmlspecialchars($entity_name) . '</i>';
             } else {
                 if (! is_array($dbname)) {
-                    $dbname = array($dbname);
+                    $dbname = [$dbname];
                 }
                 $html_output .= ' <i>'
                     . htmlspecialchars(implode(', ', $dbname))
@@ -4678,7 +4678,7 @@ class Privileges
         } else {
             $db_rights = $this->getDbRightsForUserOverview();
             // for all initials, even non A-Z
-            $array_initials = array();
+            $array_initials = [];
 
             foreach ($db_rights as $right) {
                 foreach ($right as $account) {
@@ -4737,7 +4737,7 @@ class Privileges
                     );
                     $flushnote->addParamHtml(
                         '<a href="server_privileges.php'
-                        . Url::getCommon(array('flush_privileges' => 1))
+                        . Url::getCommon(['flush_privileges' => 1])
                         . '" id="reload_privileges_anchor">'
                     );
                     $flushnote->addParamHtml('</a>');
@@ -4800,10 +4800,10 @@ class Privileges
             $html_output .= $this->getHtmlForLoginInformationFields();
         }
 
-        $_params = array(
+        $_params = [
             'username' => $username,
             'hostname' => $hostname,
-        );
+        ];
         if (! is_array($dbname) && strlen($dbname) > 0) {
             $_params['dbname'] = $dbname;
             if (strlen($tablename) > 0) {
@@ -4905,12 +4905,12 @@ class Privileges
             );
 
             $tmp_privs1 = $this->extractPrivInfo($row);
-            $tmp_privs2 = array(
-                'Select' => array(),
-                'Insert' => array(),
-                'Update' => array(),
-                'References' => array()
-            );
+            $tmp_privs2 = [
+                'Select' => [],
+                'Insert' => [],
+                'Update' => [],
+                'References' => []
+            ];
 
             while ($row2 = $GLOBALS['dbi']->fetchAssoc($res2)) {
                 $tmp_array = explode(',', $row2['Column_priv']);
@@ -5078,7 +5078,7 @@ class Privileges
                 $message = Message::rawError($GLOBALS['dbi']->getError());
             }
         }
-        return array($sql_query, $message);
+        return [$sql_query, $message];
     }
 
     /**
@@ -5332,13 +5332,13 @@ class Privileges
             $password_set_show .= ";";
         }
 
-        return array($create_user_real,
+        return [$create_user_real,
             $create_user_show,
             $real_sql_query,
             $sql_query,
             $password_set_real,
             $password_set_show
-        );
+        ];
     }
 
     /**
diff --git a/libraries/classes/Server/Select.php b/libraries/classes/Server/Select.php
index 4976ea4598..a474e3d116 100644
--- a/libraries/classes/Server/Select.php
+++ b/libraries/classes/Server/Select.php
@@ -50,7 +50,7 @@ class Select
                 $retval .= '<fieldset>';
             }
 
-            $retval .= Url::getHiddenFields(array());
+            $retval .= Url::getHiddenFields([]);
             $retval .= '<label for="select_server">'
                 . __('Current server:') . '</label> ';
 
@@ -101,7 +101,7 @@ class Select
                         . Util::getScriptNameForOption(
                             $GLOBALS['cfg']['DefaultTabServer'], 'server'
                         )
-                        . Url::getCommon(array('server' => $key))
+                        . Url::getCommon(['server' => $key])
                         . '" >' . htmlspecialchars($label) . '</a>';
                 }
                 $retval .= '</li>';
diff --git a/libraries/classes/Server/Status/Data.php b/libraries/classes/Server/Status/Data.php
index b0b45c7397..4d71d91265 100644
--- a/libraries/classes/Server/Status/Data.php
+++ b/libraries/classes/Server/Status/Data.php
@@ -57,7 +57,7 @@ class Data
      */
     private function _getAllocations()
     {
-        return array(
+        return [
             // variable name => section
             // variable names match when they begin with the given string
 
@@ -101,7 +101,7 @@ class Data
             'Open_files'        => 'files',
             'Open_streams'      => 'files',
             'Opened_files'      => 'files',
-        );
+        ];
     }
 
     /**
@@ -111,7 +111,7 @@ class Data
      */
     private function _getSections()
     {
-        return array(
+        return [
             // section => section name (description)
             'com'           => 'Com',
             'query'         => __('SQL query'),
@@ -132,7 +132,7 @@ class Data
             'files'         => __('Files'),
             'ssl'           => 'SSL',
             'other'         => __('Other')
-        );
+        ];
     }
 
     /**
@@ -142,30 +142,30 @@ class Data
      */
     private function _getLinks()
     {
-        $links = array();
+        $links = [];
         // variable or section name => (name => url)
 
         $links['table'][__('Flush (close) all tables')] = $this->selfUrl
             . Url::getCommon(
-                array(
+                [
                     'flush' => 'TABLES'
-                )
+                ]
             );
         $links['table'][__('Show open tables')]
             = 'sql.php' . Url::getCommon(
-                array(
+                [
                     'sql_query' => 'SHOW OPEN TABLES',
                     'goto' => $this->selfUrl,
-                )
+                ]
             );
 
         if ($GLOBALS['replication_info']['master']['status']) {
             $links['repl'][__('Show slave hosts')]
                 = 'sql.php' . Url::getCommon(
-                    array(
+                    [
                         'sql_query' => 'SHOW SLAVE HOSTS',
                         'goto' => $this->selfUrl,
-                    )
+                    ]
                 );
             $links['repl'][__('Show master status')] = '#replication_master';
         }
@@ -178,9 +178,9 @@ class Data
         $links['qcache'][__('Flush query cache')]
             = $this->selfUrl
             . Url::getCommon(
-                array(
+                [
                     'flush' => 'QUERY CACHE'
-                )
+                ]
             );
         $links['qcache']['doc'] = 'query_cache';
 
@@ -193,14 +193,14 @@ class Data
         $links['Slow_queries']['doc'] = 'slow_query_log';
 
         $links['innodb'][__('Variables')]
-            = 'server_engines.php?' . Url::getCommon(array('engine' => 'InnoDB'));
+            = 'server_engines.php?' . Url::getCommon(['engine' => 'InnoDB']);
         $links['innodb'][__('InnoDB Status')]
             = 'server_engines.php'
             . Url::getCommon(
-                array(
+                [
                     'engine' => 'InnoDB',
                     'page' => 'Status'
-                )
+                ]
             );
         $links['innodb']['doc'] = 'innodb';
 
@@ -306,7 +306,7 @@ class Data
                 $sectionUsed['other'] = true;
             }
         }
-        return array($allocationMap, $sectionUsed, $used_queries);
+        return [$allocationMap, $sectionUsed, $used_queries];
     }
 
     /**
@@ -318,7 +318,7 @@ class Data
 
         // get status from server
         $server_status_result = $GLOBALS['dbi']->tryQuery('SHOW GLOBAL STATUS');
-        $server_status = array();
+        $server_status = [];
         if ($server_status_result === false) {
             $this->dataLoaded = false;
         } else {
@@ -351,14 +351,14 @@ class Data
         $links = $this->_getLinks();
 
         // Variable to contain all com_ variables (query statistics)
-        $used_queries = array();
+        $used_queries = [];
 
         // Variable to map variable names to their respective section name
         // (used for js category filtering)
-        $allocationMap = array();
+        $allocationMap = [];
 
         // Variable to mark used sections
-        $sectionUsed = array();
+        $sectionUsed = [];
 
         // sort vars into arrays
         list(
@@ -401,11 +401,11 @@ class Data
      */
     public static function cleanDeprecated(array $server_status)
     {
-        $deprecated = array(
+        $deprecated = [
             'Com_prepare_sql' => 'Com_stmt_prepare',
             'Com_execute_sql' => 'Com_stmt_execute',
             'Com_dealloc_sql' => 'Com_stmt_close',
-        );
+        ];
         foreach ($deprecated as $old => $new) {
             if (isset($server_status[$old]) && isset($server_status[$new])) {
                 unset($server_status[$old]);
@@ -422,32 +422,32 @@ class Data
     public function getMenuHtml()
     {
         $url_params = Url::getCommon();
-        $items = array(
-            array(
+        $items = [
+            [
                 'name' => __('Server'),
                 'url' => 'server_status.php'
-            ),
-            array(
+            ],
+            [
                 'name' => __('Processes'),
                 'url' => 'server_status_processes.php'
-            ),
-            array(
+            ],
+            [
                 'name' => __('Query statistics'),
                 'url' => 'server_status_queries.php'
-            ),
-            array(
+            ],
+            [
                 'name' => __('All status variables'),
                 'url' => 'server_status_variables.php'
-            ),
-            array(
+            ],
+            [
                 'name' => __('Monitor'),
                 'url' => 'server_status_monitor.php'
-            ),
-            array(
+            ],
+            [
                 'name' => __('Advisor'),
                 'url' => 'server_status_advisor.php'
-            )
-        );
+            ]
+        ];
 
         $retval  = '<ul id="topmenu2">';
         foreach ($items as $item) {
@@ -479,7 +479,7 @@ class Data
      */
     public static function getHtmlForRefreshList($name,
         $defaultRate = 5,
-        array $refreshRates = array(1, 2, 5, 10, 20, 40, 60, 120, 300, 600)
+        array $refreshRates = [1, 2, 5, 10, 20, 40, 60, 120, 300, 600]
     ) {
         $return = '<select name="' . $name . '" id="id_' . $name
             . '" class="refreshRate">';
diff --git a/libraries/classes/Server/Status/Monitor.php b/libraries/classes/Server/Status/Monitor.php
index ffeaaacd46..ac6a482d6b 100644
--- a/libraries/classes/Server/Status/Monitor.php
+++ b/libraries/classes/Server/Status/Monitor.php
@@ -297,7 +297,7 @@ class Monitor
         $retval .= Data::getHtmlForRefreshList(
             'gridChartRefresh',
             5,
-            Array(2, 3, 4, 5, 10, 20, 40, 60, 120, 300, 600, 1200)
+            [2, 3, 4, 5, 10, 20, 40, 60, 120, 300, 600, 1200]
         );
         $retval .= '<br />';
         $retval .= '</div>';
@@ -382,8 +382,8 @@ class Monitor
     public function getJsonForChartingData()
     {
         $ret = json_decode($_REQUEST['requiredData'], true);
-        $statusVars = array();
-        $serverVars = array();
+        $statusVars = [];
+        $serverVars = [];
         $sysinfo = $cpuload = $memory = 0;
 
         /* Accumulate all required variables and data */
@@ -400,7 +400,7 @@ class Monitor
                 1
             );
         } else {
-            $statusVarValues = array();
+            $statusVarValues = [];
         }
 
         // Retrieve all required server variables
@@ -412,7 +412,7 @@ class Monitor
                 1
             );
         } else {
-            $serverVarValues = array();
+            $serverVarValues = [];
         }
 
         // ...and now assign them
@@ -482,7 +482,7 @@ class Monitor
                 } /* foreach */
             } /* foreach */
         }
-        return array($serverVars, $statusVars, $ret);
+        return [$serverVars, $statusVars, $ret];
     }
 
     /**
@@ -555,7 +555,7 @@ class Monitor
             break;
         }
 
-        return array($serverVars, $statusVars, $ret);
+        return [$serverVars, $statusVars, $ret];
     }
 
     /**
@@ -580,7 +580,7 @@ class Monitor
 
         $result = $GLOBALS['dbi']->tryQuery($query);
 
-        $return = array('rows' => array(), 'sum' => array());
+        $return = ['rows' => [], 'sum' => []];
 
         while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
             $type = mb_strtolower(
@@ -650,8 +650,8 @@ class Monitor
 
         $result = $GLOBALS['dbi']->tryQuery($query);
 
-        $return = array('rows' => array(), 'sum' => array());
-        $insertTables = array();
+        $return = ['rows' => [], 'sum' => []];
+        $insertTables = [];
         $insertTablesFirst = -1;
         $i = 0;
         $removeVars = isset($_REQUEST['removeVariables'])
@@ -785,7 +785,7 @@ class Monitor
      */
     public function getJsonForQueryAnalyzer()
     {
-        $return = array();
+        $return = [];
 
         if (strlen($_REQUEST['database']) > 0) {
             $GLOBALS['dbi']->selectDb($_REQUEST['database']);
@@ -816,7 +816,7 @@ class Monitor
         $GLOBALS['dbi']->freeResult($result);
 
         if ($profiling) {
-            $return['profiling'] = array();
+            $return['profiling'] = [];
             $result = $GLOBALS['dbi']->tryQuery(
                 'SELECT seq,state,duration FROM INFORMATION_SCHEMA.PROFILING'
                 . ' WHERE QUERY_ID=1 ORDER BY seq'
diff --git a/libraries/classes/Server/Status/Processes.php b/libraries/classes/Server/Status/Processes.php
index 0ce9cb7940..0bf1106b2f 100644
--- a/libraries/classes/Server/Status/Processes.php
+++ b/libraries/classes/Server/Status/Processes.php
@@ -41,7 +41,7 @@ class Processes
         $retval .= Data::getHtmlForRefreshList(
             'refreshRate',
             5,
-            Array(2, 3, 4, 5, 10, 20, 40, 60, 120, 300, 600, 1200)
+            [2, 3, 4, 5, 10, 20, 40, 60, 120, 300, 600, 1200]
         );
         $retval .= '</label>';
         $retval .= '<a id="toggleRefresh" href="#">';
@@ -58,60 +58,60 @@ class Processes
      */
     public static function getHtmlForServerProcesslist()
     {
-        $url_params = array();
+        $url_params = [];
 
         $show_full_sql = ! empty($_REQUEST['full']);
         if ($show_full_sql) {
             $url_params['full'] = 1;
             $full_text_link = 'server_status_processes.php' . Url::getCommon(
-                array(), '?'
+                [], '?'
             );
         } else {
             $full_text_link = 'server_status_processes.php' . Url::getCommon(
-                array('full' => 1)
+                ['full' => 1]
             );
         }
 
         // This array contains display name and real column name of each
         // sortable column in the table
-        $sortable_columns = array(
-            array(
+        $sortable_columns = [
+            [
                 'column_name' => __('ID'),
                 'order_by_field' => 'Id'
-            ),
-            array(
+            ],
+            [
                 'column_name' => __('User'),
                 'order_by_field' => 'User'
-            ),
-            array(
+            ],
+            [
                 'column_name' => __('Host'),
                 'order_by_field' => 'Host'
-            ),
-            array(
+            ],
+            [
                 'column_name' => __('Database'),
                 'order_by_field' => 'db'
-            ),
-            array(
+            ],
+            [
                 'column_name' => __('Command'),
                 'order_by_field' => 'Command'
-            ),
-            array(
+            ],
+            [
                 'column_name' => __('Time'),
                 'order_by_field' => 'Time'
-            ),
-            array(
+            ],
+            [
                 'column_name' => __('Status'),
                 'order_by_field' => 'State'
-            ),
-            array(
+            ],
+            [
                 'column_name' => __('Progress'),
                 'order_by_field' => 'Progress'
-            ),
-            array(
+            ],
+            [
                 'column_name' => __('SQL query'),
                 'order_by_field' => 'Info'
-            )
-        );
+            ]
+        ];
         $sortableColCount = count($sortable_columns);
 
         $sql_query = $show_full_sql
@@ -218,14 +218,14 @@ class Processes
             $showExecuting = ' checked="checked"';
         }
 
-        $url_params = array(
+        $url_params = [
             'ajax_request' => true,
             'full' => (isset($_REQUEST['full']) ? $_REQUEST['full'] : ''),
             'column_name' => (isset($_REQUEST['column_name']) ? $_REQUEST['column_name'] : ''),
             'order_by_field'
                 => (isset($_REQUEST['order_by_field']) ? $_REQUEST['order_by_field'] : ''),
             'sort_order' => (isset($_REQUEST['sort_order']) ? $_REQUEST['sort_order'] : ''),
-        );
+        ];
 
         $retval  = '';
         $retval .= '<fieldset id="tableFilter">';
@@ -270,10 +270,10 @@ class Processes
             }
         }
 
-        $url_params = array(
+        $url_params = [
             'kill' => $process['Id'],
             'ajax_request' => true
-        );
+        ];
         $kill_process = 'server_status_processes.php' . Url::getCommon($url_params);
 
         $retval  = '<tr>';
diff --git a/libraries/classes/Server/Status/Queries.php b/libraries/classes/Server/Status/Queries.php
index 27043da5ab..7bf012013b 100644
--- a/libraries/classes/Server/Status/Queries.php
+++ b/libraries/classes/Server/Status/Queries.php
@@ -109,14 +109,14 @@ class Queries
         $retval .= '</thead>';
         $retval .= '<tbody>';
 
-        $chart_json = array();
+        $chart_json = [];
         $query_sum = array_sum($used_queries);
         $other_sum = 0;
         foreach ($used_queries as $name => $value) {
             // For the percentage column, use Questions - Connections, because
             // the number of connections is not an item of the Query types
             // but is included in Questions. Then the total of the percentages is 100.
-            $name = str_replace(array('Com_', '_'), array('', ' '), $name);
+            $name = str_replace(['Com_', '_'], ['', ' '], $name);
             // Group together values that make out less than 2% into "Other", but only
             // if we have more than 6 fractions already
             if ($value < $query_sum * 0.02 && count($chart_json)>6) {
diff --git a/libraries/classes/Server/Status/Variables.php b/libraries/classes/Server/Status/Variables.php
index 6642d00e01..932ebcc167 100644
--- a/libraries/classes/Server/Status/Variables.php
+++ b/libraries/classes/Server/Status/Variables.php
@@ -143,7 +143,7 @@ class Variables
          * define some alerts
          */
         // name => max value before alert
-        $alerts = array(
+        $alerts = [
             // lower is better
             // variable => max value
             'Aborted_clients' => 0,
@@ -197,7 +197,7 @@ class Variables
             // higher is better
             // variable => min value
             //'Handler read key' => '> ',
-        );
+        ];
 
         $retval .= self::getHtmlForRenderVariables(
             $serverStatusData,
@@ -336,7 +336,7 @@ class Variables
         /**
          * Messages are built using the message name
          */
-        return array(
+        return [
             'Aborted_clients' => __(
                 'The number of connections that were aborted because the client died'
                 . ' without closing the connection properly.'
@@ -771,6 +771,6 @@ class Variables
             'Threads_running' => __(
                 'The number of threads that are not sleeping.'
             )
-        );
+        ];
     }
 }
diff --git a/libraries/classes/Server/UserGroups.php b/libraries/classes/Server/UserGroups.php
index fd3ccf6735..18dcff1237 100644
--- a/libraries/classes/Server/UserGroups.php
+++ b/libraries/classes/Server/UserGroups.php
@@ -96,11 +96,11 @@ class UserGroups
             $html_output .= '</tr></thead>';
             $html_output .= '<tbody>';
 
-            $userGroups = array();
+            $userGroups = [];
             while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
                 $groupName = $row['usergroup'];
                 if (! isset($userGroups[$groupName])) {
-                    $userGroups[$groupName] = array();
+                    $userGroups[$groupName] = [];
                 }
                 $userGroups[$groupName][$row['tab']] = $row['allowed'];
             }
@@ -114,9 +114,9 @@ class UserGroups
                 $html_output .= '<td>';
                 $html_output .= '<a class="" href="server_user_groups.php'
                     . Url::getCommon(
-                        array(
+                        [
                             'viewUsers' => 1, 'userGroup' => $groupName
-                        )
+                        ]
                     )
                     . '">'
                     . Util::getIcon('b_usrlist', __('View users'))
@@ -124,9 +124,9 @@ class UserGroups
                 $html_output .= '&nbsp;&nbsp;';
                 $html_output .= '<a class="" href="server_user_groups.php'
                     . Url::getCommon(
-                        array(
+                        [
                             'editUserGroup' => 1, 'userGroup' => $groupName
-                        )
+                        ]
                     )
                     . '">'
                     . Util::getIcon('b_edit', __('Edit')) . '</a>';
@@ -134,9 +134,9 @@ class UserGroups
                 $html_output .= '<a class="deleteUserGroup ajax"'
                     . ' href="server_user_groups.php'
                     . Url::getCommon(
-                        array(
+                        [
                             'deleteUserGroup' => 1, 'userGroup' => $groupName
-                        )
+                        ]
                     )
                     . '">'
                     . Util::getIcon('b_drop', __('Delete')) . '</a>';
@@ -153,7 +153,7 @@ class UserGroups
 
         $html_output .= '<fieldset id="fieldset_add_user_group">';
         $html_output .= '<a href="server_user_groups.php'
-            . Url::getCommon(array('addUserGroup' => 1)) . '">'
+            . Url::getCommon(['addUserGroup' => 1]) . '">'
             . Util::getIcon('b_usradd')
             . __('Add user group') . '</a>';
         $html_output .= '</fieldset>';
@@ -172,7 +172,7 @@ class UserGroups
      */
     public static function getAllowedTabNames(array $row, $level)
     {
-        $tabNames = array();
+        $tabNames = [];
         $tabs = Util::getMenuTabList($level);
         foreach ($tabs as $tab => $tabName) {
             if (! isset($row[$level . '_' . $tab])
@@ -230,7 +230,7 @@ class UserGroups
 
         $html_output .= '<form name="userGroupForm" id="userGroupForm"'
             . ' action="server_user_groups.php" method="post">';
-        $urlParams = array();
+        $urlParams = [];
         if ($userGroup != null) {
             $urlParams['userGroup'] = $userGroup;
             $urlParams['editUserGroupSubmit'] = '1';
@@ -253,11 +253,11 @@ class UserGroups
             $html_output .= '<div class="clearfloat"></div>';
         }
 
-        $allowedTabs = array(
-            'server' => array(),
-            'db'     => array(),
-            'table'  => array()
-        );
+        $allowedTabs = [
+            'server' => [],
+            'db'     => [],
+            'table'  => []
+        ];
         if ($userGroup != null) {
             $cfgRelation = $relation->getRelationsParam();
             $groupTable = Util::backquote($cfgRelation['db'])
diff --git a/libraries/classes/Server/Users.php b/libraries/classes/Server/Users.php
index ab4654f235..0900ef2d02 100644
--- a/libraries/classes/Server/Users.php
+++ b/libraries/classes/Server/Users.php
@@ -27,20 +27,20 @@ class Users
      */
     public static function getHtmlForSubMenusOnUsersPage($selfUrl)
     {
-        $items = array(
-            array(
+        $items = [
+            [
                 'name' => __('User accounts overview'),
                 'url' => 'server_privileges.php',
-                'params' => Url::getCommon(array('viewing_mode' => 'server')),
-            )
-        );
+                'params' => Url::getCommon(['viewing_mode' => 'server']),
+            ]
+        ];
 
         if ($GLOBALS['dbi']->isSuperuser()) {
-            $items[] = array(
+            $items[] = [
                 'name' => __('User groups'),
                 'url' => 'server_user_groups.php',
                 'params' => Url::getCommon(),
-            );
+            ];
         }
 
         $retval  = '<ul id="topmenu2">';
diff --git a/libraries/classes/Session.php b/libraries/classes/Session.php
index 483d66a76c..5158799265 100644
--- a/libraries/classes/Session.php
+++ b/libraries/classes/Session.php
@@ -70,7 +70,7 @@ class Session
      */
     private static function sessionFailed(array $errors)
     {
-        $messages = array();
+        $messages = [];
         foreach ($errors as $error) {
             /*
              * Remove path from open() in error message to avoid path disclossure
diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php
index 339f70ebdb..4d21c28b3b 100644
--- a/libraries/classes/Sql.php
+++ b/libraries/classes/Sql.php
@@ -178,7 +178,7 @@ class Sql
      */
     private function resultSetContainsUniqueKey($db, $table, array $fields_meta)
     {
-        $resultSetColumnNames = array();
+        $resultSetColumnNames = [];
         foreach ($fields_meta as $oneMeta) {
             $resultSetColumnNames[] = $oneMeta->name;
         }
@@ -220,11 +220,11 @@ class Sql
         if ($foreignData['disp_row'] == null) {
             //Handle the case when number of values
             //is more than $cfg['ForeignKeyMaxLimit']
-            $_url_params = array(
+            $_url_params = [
                     'db' => $db,
                     'table' => $table,
                     'field' => $column
-            );
+            ];
 
             $dropdown = '<span class="curr_value">'
                 . htmlspecialchars($_REQUEST['curr_value'])
@@ -263,7 +263,7 @@ class Sql
         if (! empty($profiling_results)) {
             $url_query = isset($url_query)
                 ? $url_query
-                : Url::getCommon(array('db' => $db));
+                : Url::getCommon(['db' => $db]);
 
             $profiling_table = '';
             $profiling_table .= '<fieldset><legend>' . __('Profiling')
@@ -345,11 +345,11 @@ EOT;
     private function analyzeAndGetTableHtmlForProfilingResults(
         $profiling_results
     ) {
-        $profiling_stats = array(
+        $profiling_stats = [
             'total_time' => 0,
-            'states' => array(),
-        );
-        $chart_json = Array();
+            'states' => [],
+        ];
+        $chart_json = [];
         $i = 1;
         $table = '';
         foreach ($profiling_results as $one_result) {
@@ -359,10 +359,10 @@ EOT;
                     += $one_result['Duration'];
                 $states[ucwords($one_result['Status'])]['calls']++;
             } else {
-                $profiling_stats['states'][ucwords($one_result['Status'])] = array(
+                $profiling_stats['states'][ucwords($one_result['Status'])] = [
                     'total_time' => $one_result['Duration'],
                     'calls' => 1,
-                );
+                ];
             }
             $profiling_stats['total_time'] += $one_result['Duration'];
 
@@ -382,7 +382,7 @@ EOT;
                     = $one_result['Duration'];
             }
         }
-        return array($table, $chart_json, $profiling_stats);
+        return [$table, $chart_json, $profiling_stats];
     }
 
     /**
@@ -438,7 +438,7 @@ EOT;
     {
         $values = $this->getValuesForColumn($db, $table, $column);
         $dropdown = '<option value="">&nbsp;</option>';
-        $dropdown .= $this->getHtmlForOptionsList($values, array($curr_value));
+        $dropdown .= $this->getHtmlForOptionsList($values, [$curr_value]);
         $dropdown = '<select>' . $dropdown . '</select>';
         return $dropdown;
     }
@@ -577,12 +577,12 @@ EOT;
         ) {
             $goto = 'sql.php'
                 . Url::getCommon(
-                    array(
+                    [
                         'db' => $db,
                         'table' => $table,
                         'sql_query' => $sql_query,
                         'id_bookmark'=> 1,
-                    )
+                    ]
                 );
             $bkm_sql_query = isset($complete_query) ? $complete_query : $sql_query;
             $html = '<form action="sql.php" method="post"'
@@ -1023,12 +1023,12 @@ EOT;
     public function storeTheQueryAsBookmark($db, $bkm_user, $sql_query_for_bookmark,
         $bkm_label, $bkm_replace
     ) {
-        $bfields = array(
+        $bfields = [
             'bkm_database' => $db,
             'bkm_user'  => $bkm_user,
             'bkm_sql_query' => $sql_query_for_bookmark,
             'bkm_label' => $bkm_label,
-        );
+        ];
 
         // Should we replace bookmark?
         if (isset($bkm_replace)) {
@@ -1076,7 +1076,7 @@ EOT;
         // reopen session
         session_start();
 
-        return array($result, $querytime_after - $querytime_before);
+        return [$result, $querytime_after - $querytime_before];
     }
 
     /**
@@ -1333,9 +1333,9 @@ EOT;
             }
         }
 
-        return array($result, $num_rows, $unlim_num_rows,
+        return [$result, $num_rows, $unlim_num_rows,
             isset($profiling_results) ? $profiling_results : null, $extra_data
-        );
+        ];
     }
     /**
      * Delete related transformation information
@@ -1507,13 +1507,13 @@ EOT;
             }
 
             $response = Response::getInstance();
-            $response->addJSON(isset($extra_data) ? $extra_data : array());
+            $response->addJSON(isset($extra_data) ? $extra_data : []);
 
             if (!empty($analyzed_sql_results['is_select']) &&
                     !isset($extra_data['error'])) {
                 $url_query = isset($url_query) ? $url_query : null;
 
-                $displayParts = array(
+                $displayParts = [
                     'edit_lnk' => null,
                     'del_lnk' => null,
                     'sort_lnk' => '1',
@@ -1521,7 +1521,7 @@ EOT;
                     'bkm_form' => '1',
                     'text_btn' => '1',
                     'pview_lnk' => '1'
-                );
+                ];
 
                 $html_output .= $this->getHtmlForSqlQueryResultsTable(
                     $displayResultsObject,
@@ -1690,7 +1690,7 @@ EOT;
                         $browse_dist
                     );
 
-                    $displayParts = array(
+                    $displayParts = [
                         'edit_lnk' => $displayResultsObject::NO_EDIT_OR_DELETE,
                         'del_lnk' => $displayResultsObject::NO_EDIT_OR_DELETE,
                         'sort_lnk' => '1',
@@ -1698,7 +1698,7 @@ EOT;
                         'bkm_form' => '1',
                         'text_btn' => '1',
                         'pview_lnk' => '1'
-                    );
+                    ];
 
                     $table_html .= $displayResultsObject->getTable(
                         $result,
@@ -1951,7 +1951,7 @@ EOT;
 
         $_SESSION['tmpval']['possible_as_geometry'] = $editable;
 
-        $displayParts = array(
+        $displayParts = [
             'edit_lnk' => $displayResultsObject::UPDATE_ROW,
             'del_lnk' => $displayResultsObject::DELETE_ROW,
             'sort_lnk' => '1',
@@ -1959,10 +1959,10 @@ EOT;
             'bkm_form' => '1',
             'text_btn' => '0',
             'pview_lnk' => '1'
-        );
+        ];
 
         if ($GLOBALS['dbi']->isSystemSchema($db) || !$editable) {
-            $displayParts = array(
+            $displayParts = [
                 'edit_lnk' => $displayResultsObject::NO_EDIT_OR_DELETE,
                 'del_lnk' => $displayResultsObject::NO_EDIT_OR_DELETE,
                 'sort_lnk' => '1',
@@ -1970,11 +1970,11 @@ EOT;
                 'bkm_form' => '1',
                 'text_btn' => '1',
                 'pview_lnk' => '1'
-            );
+            ];
 
         }
         if (isset($_REQUEST['printview']) && $_REQUEST['printview'] == '1') {
-            $displayParts = array(
+            $displayParts = [
                 'edit_lnk' => $displayResultsObject::NO_EDIT_OR_DELETE,
                 'del_lnk' => $displayResultsObject::NO_EDIT_OR_DELETE,
                 'sort_lnk' => '0',
@@ -1982,7 +1982,7 @@ EOT;
                 'bkm_form' => '0',
                 'text_btn' => '0',
                 'pview_lnk' => '0'
-            );
+            ];
         }
 
         if (isset($_REQUEST['table_maintenance'])) {
@@ -2023,7 +2023,7 @@ EOT;
         );
 
         $profiling_chart_html = $this->getHtmlForProfilingChart(
-            $url_query, $db, isset($profiling_results) ? $profiling_results :array()
+            $url_query, $db, isset($profiling_results) ? $profiling_results :[]
         );
 
         $missing_unique_column_msg = $this->getMessageIfMissingColumnIndex(
diff --git a/libraries/classes/SqlQueryForm.php b/libraries/classes/SqlQueryForm.php
index b955e9e3df..2009d26a89 100644
--- a/libraries/classes/SqlQueryForm.php
+++ b/libraries/classes/SqlQueryForm.php
@@ -133,7 +133,7 @@ class SqlQueryForm
      */
     public function init($query)
     {
-        $columns_list    = array();
+        $columns_list    = [];
         if (strlen($GLOBALS['db']) === 0) {
             // prepare for server related
             $legend = sprintf(
@@ -151,7 +151,7 @@ class SqlQueryForm
             $tmp_db_link = '<a href="' . Util::getScriptNameForOption(
                 $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
             )
-                . Url::getCommon(array('db' => $db)) . '"';
+                . Url::getCommon(['db' => $db]) . '"';
             $tmp_db_link .= '>'
                 . htmlspecialchars($db) . '</a>';
             $legend = sprintf(__('Run SQL query/queries on database %s'), $tmp_db_link);
@@ -172,7 +172,7 @@ class SqlQueryForm
 
             $tmp_tbl_link = '<a href="' . Util::getScriptNameForOption(
                 $GLOBALS['cfg']['DefaultTabTable'], 'table'
-            ) . Url::getCommon(array('db' => $db, 'table' => $table)) . '" >';
+            ) . Url::getCommon(['db' => $db, 'table' => $table]) . '" >';
             $tmp_tbl_link .= htmlspecialchars($db)
                 . '.' . htmlspecialchars($table) . '</a>';
             $legend = sprintf(__('Run SQL query/queries on table %s'), $tmp_tbl_link);
@@ -184,7 +184,7 @@ class SqlQueryForm
         }
         $legend .= ': ' . Util::showMySQLDocu('SELECT');
 
-        return array($legend, $query, $columns_list);
+        return [$legend, $query, $columns_list];
     }
 
     /**
diff --git a/libraries/classes/StorageEngine.php b/libraries/classes/StorageEngine.php
index 590ad83d82..ca3974b025 100644
--- a/libraries/classes/StorageEngine.php
+++ b/libraries/classes/StorageEngine.php
@@ -324,7 +324,7 @@ class StorageEngine
             $like = '';
         }
 
-        $mysql_vars = array();
+        $mysql_vars = [];
 
         $sql_query = 'SHOW GLOBAL VARIABLES ' . $like . ';';
         $res = $GLOBALS['dbi']->query($sql_query);
@@ -408,7 +408,7 @@ class StorageEngine
      */
     public function getVariables()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -440,7 +440,7 @@ class StorageEngine
      */
     public function getInfoPages()
     {
-        return array();
+        return [];
     }
 
     /**
diff --git a/libraries/classes/SysInfo.php b/libraries/classes/SysInfo.php
index 508ecfd77a..fa3b40c4dd 100644
--- a/libraries/classes/SysInfo.php
+++ b/libraries/classes/SysInfo.php
@@ -34,7 +34,7 @@ class SysInfo
     public static function getOs($php_os = PHP_OS)
     {
         // look for common UNIX-like systems
-        $unix_like = array('FreeBSD', 'DragonFly');
+        $unix_like = ['FreeBSD', 'DragonFly'];
         if (in_array($php_os, $unix_like)) {
             $php_os = 'Linux';
         }
@@ -50,7 +50,7 @@ class SysInfo
     public static function get()
     {
         $php_os = self::getOs();
-        $supported = array('Linux', 'WINNT', 'SunOS');
+        $supported = ['Linux', 'WINNT', 'SunOS'];
 
         if (in_array($php_os, $supported)) {
             $class_name = 'PhpMyAdmin\SysInfo' . $php_os;
diff --git a/libraries/classes/SysInfoBase.php b/libraries/classes/SysInfoBase.php
index 4f6fab33bc..a7db7962b5 100644
--- a/libraries/classes/SysInfoBase.php
+++ b/libraries/classes/SysInfoBase.php
@@ -25,7 +25,7 @@ class SysInfoBase
      */
     public function loadavg()
     {
-        return array('loadavg' => 0);
+        return ['loadavg' => 0];
     }
 
     /**
@@ -35,7 +35,7 @@ class SysInfoBase
      */
     public function memory()
     {
-        return array();
+        return [];
     }
 
     /**
diff --git a/libraries/classes/SysInfoLinux.php b/libraries/classes/SysInfoLinux.php
index 3515693cc4..4f0ced357d 100644
--- a/libraries/classes/SysInfoLinux.php
+++ b/libraries/classes/SysInfoLinux.php
@@ -38,10 +38,10 @@ class SysInfoLinux extends SysInfoBase
             )
         );
 
-        return Array(
+        return [
             'busy' => $nums[1] + $nums[2] + $nums[3],
             'idle' => intval($nums[4]),
-        );
+        ];
     }
 
     /**
@@ -69,7 +69,7 @@ class SysInfoLinux extends SysInfoBase
 
         $mem = array_combine($matches[1], $matches[2]);
 
-        $defaults = array(
+        $defaults = [
             'MemTotal'   => 0,
             'MemFree'    => 0,
             'Cached'     => 0,
@@ -77,7 +77,7 @@ class SysInfoLinux extends SysInfoBase
             'SwapTotal'  => 0,
             'SwapFree'   => 0,
             'SwapCached' => 0,
-        );
+        ];
 
         $mem = array_merge($defaults, $mem);
 
diff --git a/libraries/classes/SysInfoSunOS.php b/libraries/classes/SysInfoSunOS.php
index 4b880e874e..20eabb08f1 100644
--- a/libraries/classes/SysInfoSunOS.php
+++ b/libraries/classes/SysInfoSunOS.php
@@ -47,7 +47,7 @@ class SysInfoSunOS extends SysInfoBase
     {
         $load1 = $this->_kstat('unix:0:system_misc:avenrun_1min');
 
-        return array('loadavg' => $load1);
+        return ['loadavg' => $load1];
     }
 
     /**
@@ -68,7 +68,7 @@ class SysInfoSunOS extends SysInfoBase
     public function memory()
     {
         $pagesize = $this->_kstat('unix:0:seg_cache:slab_size');
-        $mem = array();
+        $mem = [];
         $mem['MemTotal']
             = $this->_kstat('unix:0:system_pages:pagestotal') * $pagesize;
         $mem['MemUsed']
diff --git a/libraries/classes/SysInfoWINNT.php b/libraries/classes/SysInfoWINNT.php
index d284d738c0..c96081ee64 100644
--- a/libraries/classes/SysInfoWINNT.php
+++ b/libraries/classes/SysInfoWINNT.php
@@ -45,7 +45,7 @@ class SysInfoWINNT extends SysInfoBase
     {
         $loadavg = "";
         $sum = 0;
-        $buffer = $this->_getWMI('Win32_Processor', array('LoadPercentage'));
+        $buffer = $this->_getWMI('Win32_Processor', ['LoadPercentage']);
 
         foreach ($buffer as $load) {
             $value = $load['LoadPercentage'];
@@ -53,7 +53,7 @@ class SysInfoWINNT extends SysInfoBase
             $sum += $value;
         }
 
-        return array('loadavg' => $sum / count($buffer));
+        return ['loadavg' => $sum / count($buffer)];
     }
 
     /**
@@ -74,15 +74,15 @@ class SysInfoWINNT extends SysInfoBase
      *
      * @return array with results
      */
-    private function _getWMI($strClass, array $strValue = array())
+    private function _getWMI($strClass, array $strValue = [])
     {
-        $arrData = array();
+        $arrData = [];
 
         $objWEBM = $this->_wmi->Get($strClass);
         $arrProp = $objWEBM->Properties_;
         $arrWEBMCol = $objWEBM->Instances_();
         foreach ($arrWEBMCol as $objItem) {
-            $arrInstance = array();
+            $arrInstance = [];
             foreach ($arrProp as $propItem) {
                 $name = $propItem->Name;
                 if (empty($strValue) || in_array($name, $strValue)) {
@@ -105,9 +105,9 @@ class SysInfoWINNT extends SysInfoBase
     {
         $buffer = $this->_getWMI(
             "Win32_OperatingSystem",
-            array('TotalVisibleMemorySize', 'FreePhysicalMemory')
+            ['TotalVisibleMemorySize', 'FreePhysicalMemory']
         );
-        $mem = Array();
+        $mem = [];
         $mem['MemTotal'] = $buffer[0]['TotalVisibleMemorySize'];
         $mem['MemFree'] = $buffer[0]['FreePhysicalMemory'];
         $mem['MemUsed'] = $mem['MemTotal'] - $mem['MemFree'];
diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php
index d6aa35bd8b..516233cf4a 100644
--- a/libraries/classes/Table.php
+++ b/libraries/classes/Table.php
@@ -56,12 +56,12 @@ class Table
     /**
      * @var array errors occurred
      */
-    var $errors = array();
+    var $errors = [];
 
     /**
      * @var array messages
      */
-    var $messages = array();
+    var $messages = [];
 
     /**
      * @var string  table name
@@ -229,7 +229,7 @@ class Table
         }
 
         // use cached data or load information with SHOW command
-        if ($this->_dbi->getCachedTableContent(array($db, $table)) != null
+        if ($this->_dbi->getCachedTableContent([$db, $table]) != null
             || $GLOBALS['cfg']['Server']['DisableIS']
         ) {
             $type = $this->getStatusInfo('TABLE_TYPE');
@@ -282,7 +282,7 @@ class Table
      */
     public function isMerge()
     {
-        return $this->isEngine(array('MERGE', 'MRG_MYISAM'));
+        return $this->isEngine(['MERGE', 'MRG_MYISAM']);
     }
 
     /**
@@ -312,14 +312,14 @@ class Table
 
         // sometimes there is only one entry (ExactRows) so
         // we have to get the table's details
-        if ($this->_dbi->getCachedTableContent(array($db, $table)) == null
+        if ($this->_dbi->getCachedTableContent([$db, $table]) == null
             || $force_read
-            || count($this->_dbi->getCachedTableContent(array($db, $table))) == 1
+            || count($this->_dbi->getCachedTableContent([$db, $table])) == 1
         ) {
             $this->_dbi->getTablesFull($db, $table);
         }
 
-        if ($this->_dbi->getCachedTableContent(array($db, $table)) == null) {
+        if ($this->_dbi->getCachedTableContent([$db, $table]) == null) {
             // happens when we enter the table creation dialog
             // or when we really did not get any status info, for example
             // when $table == 'TABLE_NAMES' after the user tried SHOW TABLES
@@ -327,12 +327,12 @@ class Table
         }
 
         if (null === $info) {
-            return $this->_dbi->getCachedTableContent(array($db, $table));
+            return $this->_dbi->getCachedTableContent([$db, $table]);
         }
 
         // array_key_exists allows for null values
         if (!array_key_exists(
-            $info, $this->_dbi->getCachedTableContent(array($db, $table))
+            $info, $this->_dbi->getCachedTableContent([$db, $table])
         )
         ) {
             if (! $disable_error) {
@@ -344,7 +344,7 @@ class Table
             return false;
         }
 
-        return $this->_dbi->getCachedTableContent(array($db, $table, $info));
+        return $this->_dbi->getCachedTableContent([$db, $table, $info]);
     }
 
     /**
@@ -430,8 +430,8 @@ class Table
      */
     public function getCreateOptions() {
         $table_options = $this->getStatusInfo('CREATE_OPTIONS', false, true);
-        $create_options_tmp = empty($table_options) ? array() : explode(' ', $table_options);
-        $create_options = array();
+        $create_options_tmp = empty($table_options) ? [] : explode(' ', $table_options);
+        $create_options = [];
         // export create options by its name as variables into global namespace
         // f.e. pack_keys=1 becomes available as $pack_keys with value of '1'
         // unset($pack_keys);
@@ -658,29 +658,29 @@ class Table
         $db = $this->_db_name;
         $table = $this->_name;
 
-        if ($this->_dbi->getCachedTableContent(array($db, $table, 'ExactRows')) != null) {
+        if ($this->_dbi->getCachedTableContent([$db, $table, 'ExactRows']) != null) {
             $row_count = $this->_dbi->getCachedTableContent(
-                array($db, $table, 'ExactRows')
+                [$db, $table, 'ExactRows']
             );
             return $row_count;
         }
         $row_count = false;
 
         if (! $force_exact) {
-            if (($this->_dbi->getCachedTableContent(array($db, $table, 'Rows')) == null)
+            if (($this->_dbi->getCachedTableContent([$db, $table, 'Rows']) == null)
                 && !$is_view
             ) {
                 $tmp_tables = $this->_dbi->getTablesFull($db, $table);
                 if (isset($tmp_tables[$table])) {
                     $this->_dbi->cacheTableContent(
-                        array($db, $table),
+                        [$db, $table],
                         $tmp_tables[$table]
                     );
                 }
             }
-            if ($this->_dbi->getCachedTableContent(array($db, $table, 'Rows')) != null) {
+            if ($this->_dbi->getCachedTableContent([$db, $table, 'Rows']) != null) {
                 $row_count = $this->_dbi->getCachedTableContent(
-                    array($db, $table, 'Rows')
+                    [$db, $table, 'Rows']
                 );
             } else {
                 $row_count = false;
@@ -725,7 +725,7 @@ class Table
             }
         }
         if ($row_count) {
-            $this->_dbi->cacheTableContent(array($db, $table, 'ExactRows'), $row_count);
+            $this->_dbi->cacheTableContent([$db, $table, 'ExactRows'], $row_count);
         }
 
         return $row_count;
@@ -797,21 +797,21 @@ class Table
             return true;
         }
 
-        $select_parts = array();
-        $row_fields = array();
+        $select_parts = [];
+        $row_fields = [];
         foreach ($get_fields as $get_field) {
             $select_parts[] = Util::backquote($get_field);
             $row_fields[$get_field] = 'cc';
         }
 
-        $where_parts = array();
+        $where_parts = [];
         foreach ($where_fields as $_where => $_value) {
             $where_parts[] = Util::backquote($_where) . ' = \''
                 . $GLOBALS['dbi']->escapeString($_value) . '\'';
         }
 
-        $new_parts = array();
-        $new_value_parts = array();
+        $new_parts = [];
+        $new_value_parts = [];
         foreach ($new_fields as $_where => $_value) {
             $new_parts[] = Util::backquote($_where);
             $new_value_parts[] = $GLOBALS['dbi']->escapeString($_value);
@@ -830,7 +830,7 @@ class Table
         );
 
         while ($table_copy_row = @$GLOBALS['dbi']->fetchAssoc($table_copy_rs)) {
-            $value_parts = array();
+            $value_parts = [];
             foreach ($table_copy_row as $_key => $_val) {
                 if (isset($row_fields[$_key]) && $row_fields[$_key] == 'cc') {
                     $value_parts[] = $GLOBALS['dbi']->escapeString($_val);
@@ -943,10 +943,10 @@ class Table
                 "export",
                 "sql",
                 'libraries/classes/Plugins/Export/',
-                array(
+                [
                     'export_type' => 'table',
                     'single_table' => false,
-                )
+                ]
             );
 
             $no_constraints_comments = true;
@@ -1001,13 +1001,13 @@ class Table
                 $tbl = new Table($target_db, $target_table);
 
                 $statement->options = new OptionsArray(
-                    array(
+                    [
                         $tbl->isView() ? 'VIEW' : 'TABLE',
                         'IF EXISTS',
-                    )
+                    ]
                 );
 
-                $statement->fields = array($destination);
+                $statement->fields = [$destination];
 
                 // Building the query.
                 $drop_query = $statement->build() . ';';
@@ -1278,15 +1278,15 @@ class Table
         // duplicating the bookmarks must not be done here, but
         // just once per db
 
-        $get_fields = array('display_field');
-        $where_fields = array(
+        $get_fields = ['display_field'];
+        $where_fields = [
             'db_name' => $source_db,
             'table_name' => $source_table
-        );
-        $new_fields = array(
+        ];
+        $new_fields = [
             'db_name' => $target_db,
             'table_name' => $target_table
-        );
+        ];
         self::duplicateInfo(
             'displaywork',
             'table_info',
@@ -1298,20 +1298,20 @@ class Table
         /**
          * @todo revise this code when we support cross-db relations
          */
-        $get_fields = array(
+        $get_fields = [
             'master_field',
             'foreign_table',
             'foreign_field'
-        );
-        $where_fields = array(
+        ];
+        $where_fields = [
             'master_db' => $source_db,
             'master_table' => $source_table
-        );
-        $new_fields = array(
+        ];
+        $new_fields = [
             'master_db' => $target_db,
             'foreign_db' => $target_db,
             'master_table' => $target_table
-        );
+        ];
         self::duplicateInfo(
             'relwork',
             'relation',
@@ -1320,20 +1320,20 @@ class Table
             $new_fields
         );
 
-        $get_fields = array(
+        $get_fields = [
             'foreign_field',
             'master_table',
             'master_field'
-        );
-        $where_fields = array(
+        ];
+        $where_fields = [
             'foreign_db' => $source_db,
             'foreign_table' => $source_table
-        );
-        $new_fields = array(
+        ];
+        $new_fields = [
             'master_db' => $target_db,
             'foreign_db' => $target_db,
             'foreign_table' => $target_table
-        );
+        ];
         self::duplicateInfo(
             'relwork',
             'relation',
@@ -1547,11 +1547,11 @@ class Table
         );
         $uniques = $this->_dbi->fetchResult(
             $sql,
-            array('Key_name', null),
+            ['Key_name', null],
             'Column_name'
         );
 
-        $return = array();
+        $return = [];
         foreach ($uniques as $index) {
             if (count($index) > 1) {
                 continue;
@@ -1590,7 +1590,7 @@ class Table
      */
     private function _formatColumns(array $indexed, $backquoted, $fullName)
     {
-        $return = array();
+        $return = [];
         foreach ($indexed as $column) {
             $return[] = ($fullName ? $this->getFullName($backquoted) . '.' : '')
                 . ($backquoted ? Util::backquote($column) : $column);
@@ -1658,7 +1658,7 @@ class Table
             return $this->_dbi->getFieldsMeta($move_columns_sql_result);
         } else {
             // unsure how to reproduce but it was seen on the reporting server
-            return array();
+            return [];
         }
     }
 
@@ -1672,7 +1672,7 @@ class Table
     public function getNonGeneratedColumns($backquoted = true)
     {
         $columns_meta_query = 'SHOW COLUMNS FROM ' . $this->getFullName(true);
-        $ret = array();
+        $ret = [];
 
         $columns_meta_query_result = $this->_dbi->fetchResult(
             $columns_meta_query
@@ -1718,7 +1718,7 @@ class Table
             return json_decode($row[0], true);
         }
 
-        return array();
+        return [];
     }
 
     /**
@@ -1812,7 +1812,7 @@ class Table
             $_SESSION['tmpval']['table_uiprefs'][$server_id][$this->_db_name]
             [$this->_name] = $cfgRelation['uiprefswork']
                 ?  $this->getUiPrefsFromDb()
-                : array();
+                : [];
         }
         $this->uiprefs =& $_SESSION['tmpval']['table_uiprefs'][$server_id]
         [$this->_db_name][$this->_name];
@@ -1981,7 +1981,7 @@ class Table
     public function getReservedColumnNames()
     {
         $columns = $this->getColumns(false);
-        $return = array();
+        $return = [];
         foreach ($columns as $column) {
             $temp = explode('.', $column);
             $column_name = $temp[2];
@@ -1999,7 +1999,7 @@ class Table
      */
     public function getNameAndTypeOfTheColumns()
     {
-        $columns = array();
+        $columns = [];
         foreach ($this->_dbi->getColumnsFull(
             $this->_db_name, $this->_name
         ) as $row) {
@@ -2088,7 +2088,7 @@ class Table
             break;
         } // end switch
 
-        $index_fields = array();
+        $index_fields = [];
         foreach ($index->getColumns() as $key => $column) {
             $index_fields[$key] = Util::backquote($column->getName());
             if ($column->getSubPart()) {
@@ -2117,7 +2117,7 @@ class Table
         if ($index->getChoice() != 'SPATIAL'
             && $index->getChoice() != 'FULLTEXT'
             && in_array($type, Index::getIndexTypes())
-            && ! $this->isEngine(array('TOKUDB'))
+            && ! $this->isEngine(['TOKUDB'])
         ) {
             $sql_query .= ' USING ' . $type;
         }
@@ -2450,12 +2450,12 @@ class Table
             }
         } // end foreach
 
-        return array(
+        return [
             $html_output,
             $preview_sql_data,
             $display_query,
             $seen_error
-        );
+        ];
     }
 
     /**
@@ -2557,10 +2557,10 @@ class Table
         if ($column != null) {
             $expression = isset($fields[$column]['expr']) ?
                 substr($fields[$column]['expr'], 1, -1) : '';
-            return array($column => $expression);
+            return [$column => $expression];
         }
 
-        $ret = array();
+        $ret = [];
         foreach ($fields as $field => $options) {
             if (isset($options['expr'])) {
                 $ret[$field] = substr($options['expr'], 1, -1);
@@ -2611,7 +2611,7 @@ class Table
      */
     public function getColumnsWithIndex($types)
     {
-        $columns_with_index = array();
+        $columns_with_index = [];
         foreach (
             Index::getFromTableByChoice(
                 $this->_name,
diff --git a/libraries/classes/Template.php b/libraries/classes/Template.php
index 37275ad79f..a0b622475a 100644
--- a/libraries/classes/Template.php
+++ b/libraries/classes/Template.php
@@ -65,11 +65,11 @@ class Template
             if (is_null($cache_dir)) {
                 $cache_dir = false;
             }
-            $twig = new Environment($loader, array(
+            $twig = new Environment($loader, [
                 'auto_reload' => true,
                 'cache' => $cache_dir,
                 'debug' => false,
-            ));
+            ]);
             $twig->addExtension(new CharsetsExtension());
             $twig->addExtension(new CoreExtension());
             $twig->addExtension(new I18nExtension());
@@ -109,7 +109,7 @@ class Template
      *
      * @return string
      */
-    public function render(array $data = array())
+    public function render(array $data = [])
     {
         try {
             $template = $this::$twig->load($this->name . '.twig');
diff --git a/libraries/classes/Theme.php b/libraries/classes/Theme.php
index 754453b7c8..fef28509f5 100644
--- a/libraries/classes/Theme.php
+++ b/libraries/classes/Theme.php
@@ -72,7 +72,7 @@ class Theme
      * @var array List of css files to load
      * @access private
      */
-    private $_cssFiles = array(
+    private $_cssFiles = [
         'common',
         'enum_editor',
         'gis',
@@ -83,7 +83,7 @@ class Theme
         'jqplot',
         'resizable-menu',
         'icons',
-    );
+    ];
 
     /**
      * Loads theme information
@@ -112,7 +112,7 @@ class Theme
             return false;
         }
         // Check that all required data are there
-        $members = array('name', 'version', 'supports');
+        $members = ['name', 'version', 'supports'];
         foreach ($members as $member) {
             if (! isset($data[$member])) {
                 return false;
@@ -427,7 +427,7 @@ class Theme
      */
     function getCssGradient($start_color, $end_color)
     {
-        $result = array();
+        $result = [];
         // Opera 9.5+, IE 9
         $result[] = 'background-image: url(./themes/svg_gradient.php?from='
             . $start_color . '&to=' . $end_color . ');';
diff --git a/libraries/classes/ThemeManager.php b/libraries/classes/ThemeManager.php
index 02500c302e..13159b4606 100644
--- a/libraries/classes/ThemeManager.php
+++ b/libraries/classes/ThemeManager.php
@@ -37,7 +37,7 @@ class ThemeManager
     /**
      * @var array available themes
      */
-    var $themes = array();
+    var $themes = [];
 
     /**
      * @var string  cookie name
@@ -76,7 +76,7 @@ class ThemeManager
      */
     public function __construct()
     {
-        $this->themes = array();
+        $this->themes = [];
         $this->theme_default = self::FALLBACK_THEME;
         $this->active_theme = '';
 
@@ -273,7 +273,7 @@ class ThemeManager
      */
     public function loadThemes()
     {
-        $this->themes = array();
+        $this->themes = [];
 
         if (false === ($handleThemes = opendir($this->_themes_path))) {
             trigger_error(
diff --git a/libraries/classes/Tracker.php b/libraries/classes/Tracker.php
index c83ccd1f5e..0bbff8535d 100644
--- a/libraries/classes/Tracker.php
+++ b/libraries/classes/Tracker.php
@@ -41,7 +41,7 @@ class Tracker
     /**
      * Cache to avoid quering tracking status multiple times.
      */
-    static protected $_tracking_cache = array();
+    static protected $_tracking_cache = [];
 
     /**
      * Actually enables tracking. This needs to be done after all
@@ -202,10 +202,10 @@ class Tracker
             "export",
             "sql",
             'libraries/classes/Plugins/Export/',
-            array(
+            [
                 'export_type' => $export_type,
                 'single_table' => false,
-            )
+            ]
         );
 
         $sql_backquotes = true;
@@ -224,7 +224,7 @@ class Tracker
 
         $indexes = $GLOBALS['dbi']->getTableIndexes($dbname, $tablename);
 
-        $snapshot = array('COLUMNS' => $columns, 'INDEXES' => $indexes);
+        $snapshot = ['COLUMNS' => $columns, 'INDEXES' => $indexes];
         $snapshot = serialize($snapshot);
 
         // Get DROP TABLE / DROP VIEW and CREATE TABLE SQL statements
@@ -557,7 +557,7 @@ class Tracker
 
         $ddl_date_from = $date = Util::date('Y-m-d H:i:s');
 
-        $ddlog = array();
+        $ddlog = [];
         $first_iteration = true;
 
         // Iterate tracked data definition statements
@@ -574,9 +574,9 @@ class Tracker
                 }
                 $statement = rtrim(mb_strstr($log_entry, "\n"));
 
-                $ddlog[] = array( 'date' => $date,
+                $ddlog[] = [ 'date' => $date,
                                   'username'=> $username,
-                                  'statement' => $statement );
+                                  'statement' => $statement ];
             }
         }
 
@@ -585,7 +585,7 @@ class Tracker
 
         $dml_date_from = $date_from;
 
-        $dmlog = array();
+        $dmlog = [];
         $first_iteration = true;
 
         // Iterate tracked data manipulation statements
@@ -602,16 +602,16 @@ class Tracker
                 }
                 $statement = rtrim(mb_strstr($log_entry, "\n"));
 
-                $dmlog[] = array( 'date' => $date,
+                $dmlog[] = [ 'date' => $date,
                                   'username' => $username,
-                                  'statement' => $statement );
+                                  'statement' => $statement ];
             }
         }
 
         $dml_date_to = $date;
 
         // Define begin and end of date range for both logs
-        $data = array();
+        $data = [];
         if (strtotime($ddl_date_from) <= strtotime($dml_date_from)) {
             $data['date_from'] = $ddl_date_from;
         } else {
@@ -663,7 +663,7 @@ class Tracker
             $GLOBALS['db'] = $tokens[2]->value;
         }
 
-        $result = array();
+        $result = [];
 
         if (!empty($parser->statements)) {
             $statement = $parser->statements[0];
diff --git a/libraries/classes/Tracking.php b/libraries/classes/Tracking.php
index 8815e67cc2..3002f73481 100644
--- a/libraries/classes/Tracking.php
+++ b/libraries/classes/Tracking.php
@@ -53,7 +53,7 @@ class Tracking
     public function filter(
         array $data, $filter_ts_from, $filter_ts_to, array $filter_users
     ) {
-        $tmp_entries = array();
+        $tmp_entries = [];
         $id = 0;
         foreach ($data as $entry) {
             $timestamp = strtotime($entry['date']);
@@ -62,12 +62,12 @@ class Tracking
                 && $timestamp <= $filter_ts_to
                 && (in_array('*', $filter_users) || $filtered_user)
             ) {
-                $tmp_entries[] = array(
+                $tmp_entries[] = [
                     'id'        => $id,
                     'timestamp' => $timestamp,
                     'username'  => $entry['username'],
                     'statement' => $entry['statement']
-                );
+                ];
             }
             $id++;
         }
@@ -216,17 +216,17 @@ class Tracking
                 . ' href="' . $delete_link . '" >' . $delete . '</a></td>';
             $html .= '<td><a href="tbl_tracking.php';
             $html .= Url::getCommon(
-                $url_params + array(
+                $url_params + [
                     'report' => 'true', 'version' => $version['version']
-                )
+                ]
             );
             $html .= '">' . $report . '</a>';
             $html .= '&nbsp;&nbsp;';
             $html .= '<a href="tbl_tracking.php';
             $html .= Url::getCommon(
-                $url_params + array(
+                $url_params + [
                     'snapshot' => 'true', 'version' => $version['version']
-                )
+                ]
             );
             $html .= '">' . $structure . '</a>';
             $html .= '</td>';
@@ -238,11 +238,11 @@ class Tracking
 
         $html .= Template::get('select_all')
             ->render(
-                array(
+                [
                     'pma_theme_image' => $pmaThemeImage,
                     'text_dir'        => $text_dir,
                     'form_name'       => 'versionsForm',
-                )
+                ]
             );
         $html .= Util::getButtonOrImage(
             'submit_mult', 'mult_submit',
@@ -423,7 +423,7 @@ class Tracking
             . htmlspecialchars($_REQUEST['users']) . '" />';
         $str5 = '<input type="hidden" name="list_report" value="1" />'
             . '<input type="submit" value="' . __('Go') . '" />';
-        return array($str1, $str2, $str3, $str4, $str5);
+        return [$str1, $str2, $str3, $str4, $str5];
     }
 
     /**
@@ -455,9 +455,9 @@ class Tracking
 
         $html = '<form method="post" action="tbl_tracking.php'
             . Url::getCommon(
-                $url_params + array(
+                $url_params + [
                     'report' => 'true', 'version' => $_REQUEST['version']
-                )
+                ]
             )
             . '">';
         $html .= Url::getHiddenInputs();
@@ -506,9 +506,9 @@ class Tracking
     ) {
         $html = '<form method="post" action="tbl_tracking.php'
             . Url::getCommon(
-                $url_params + array(
+                $url_params + [
                     'report' => 'true', 'version' => $_REQUEST['version']
-                )
+                ]
             )
             . '">';
         $html .= Url::getHiddenInputs();
@@ -521,7 +521,7 @@ class Tracking
         $html .= '<form class="disableAjax" method="post" action="tbl_tracking.php'
             . Url::getCommon(
                 $url_params
-                + array('report' => 'true', 'version' => $_REQUEST['version'])
+                + ['report' => 'true', 'version' => $_REQUEST['version']]
             )
             . '">';
         $html .= Url::getHiddenInputs();
@@ -601,7 +601,7 @@ class Tracking
             1, 'ddl_versions'
         );
 
-        return array($html, $line_number);
+        return [$html, $line_number];
     }
 
     /**
@@ -700,7 +700,7 @@ class Tracking
         // Unserialize snapshot
         $temp = Core::safeUnserialize($data['schema_snapshot']);
         if ($temp === null) {
-            $temp = array('COLUMNS' => array(), 'INDEXES' => array());
+            $temp = ['COLUMNS' => [], 'INDEXES' => []];
         }
         $columns = $temp['COLUMNS'];
         $indexes = $temp['INDEXES'];
@@ -862,7 +862,7 @@ class Tracking
      */
     public function exportAsSqlExecution(array $entries)
     {
-        $sql_result = array();
+        $sql_result = [];
         foreach ($entries as $entry) {
             $sql_result = $GLOBALS['dbi']->query("/*NOTRACK*/\n" . $entry['statement']);
         }
@@ -1085,7 +1085,7 @@ class Tracking
      */
     public function getEntries(array $data, $filter_ts_from, $filter_ts_to, array $filter_users)
     {
-        $entries = array();
+        $entries = [];
         // Filtering data definition statements
         if ($_REQUEST['logtype'] == 'schema'
             || $_REQUEST['logtype'] == 'schema_and_data'
@@ -1111,7 +1111,7 @@ class Tracking
         }
 
         // Sort it
-        $ids = $timestamps = $usernames = $statements = array();
+        $ids = $timestamps = $usernames = $statements = [];
         foreach ($entries as $key => $row) {
             $ids[$key]        = $row['id'];
             $timestamps[$key] = $row['timestamp'];
@@ -1181,7 +1181,7 @@ class Tracking
      */
     public function extractTableNames(array $table_list, $db, $testing = false)
     {
-        $untracked_tables = array();
+        $untracked_tables = [];
         $sep = $GLOBALS['cfg']['NavigationTreeTableSeparator'];
 
         foreach ($table_list as $key => $value) {
@@ -1275,18 +1275,18 @@ class Tracking
     private function getStatusButton(array $versionData, $urlQuery)
     {
         $state = $this->getVersionStatus($versionData);
-        $options = array(
-            0 => array(
+        $options = [
+            0 => [
                 'label' => __('not active'),
                 'value' => 'deactivate_now',
                 'selected' => ($state != 'active')
-            ),
-            1 => array(
+            ],
+            1 => [
                 'label' => __('active'),
                 'value' => 'activate_now',
                 'selected' => ($state == 'active')
-            )
-        );
+            ]
+        ];
         $link = 'tbl_tracking.php' . $urlQuery . '&amp;table='
             . htmlspecialchars($versionData['table_name'])
             . '&amp;version=' . $versionData['version'];
diff --git a/libraries/classes/Transformations.php b/libraries/classes/Transformations.php
index b94f9e5e1c..0eeb30e544 100644
--- a/libraries/classes/Transformations.php
+++ b/libraries/classes/Transformations.php
@@ -50,7 +50,7 @@ class Transformations
      */
     public function getOptions($option_string)
     {
-        $result = array();
+        $result = [];
 
         if (strlen($option_string) === 0
             || ! $transform_options = preg_split('/,/', $option_string)
@@ -101,23 +101,23 @@ class Transformations
             return $stack;
         }
 
-        $stack = array();
-        $sub_dirs = array(
+        $stack = [];
+        $sub_dirs = [
             'Input/' => 'input_',
             'Output/' => '',
             '' => ''
-        );
+        ];
 
         foreach ($sub_dirs as $sd => $prefix) {
             $handle = opendir('libraries/classes/Plugins/Transformations/' . $sd);
 
             if (! $handle) {
-                $stack[$prefix . 'transformation'] = array();
-                $stack[$prefix . 'transformation_file'] = array();
+                $stack[$prefix . 'transformation'] = [];
+                $stack[$prefix . 'transformation_file'] = [];
                 continue;
             }
 
-            $filestack = array();
+            $filestack = [];
             while ($file = readdir($handle)) {
                 // Ignore hidden files
                 if ($file[0] == '.') {
@@ -227,7 +227,7 @@ class Transformations
     public function fixUpMime($value)
     {
         $value = str_replace(
-            array("jpeg", "png"), array("JPEG", "PNG"), $value
+            ["jpeg", "png"], ["JPEG", "PNG"], $value
         );
         return str_replace(
             ' ',
diff --git a/libraries/classes/Twig/CharsetsExtension.php b/libraries/classes/Twig/CharsetsExtension.php
index b191ba7be5..fb2097816e 100644
--- a/libraries/classes/Twig/CharsetsExtension.php
+++ b/libraries/classes/Twig/CharsetsExtension.php
@@ -26,7 +26,7 @@ class CharsetsExtension extends AbstractExtension
      */
     public function getFunctions()
     {
-        return array(
+        return [
             new TwigFunction(
                 'Charsets_getCollationDescr',
                 'PhpMyAdmin\Charsets::getCollationDescr'
@@ -34,13 +34,13 @@ class CharsetsExtension extends AbstractExtension
             new TwigFunction(
                 'Charsets_getCharsetDropdownBox',
                 'PhpMyAdmin\Charsets::getCharsetDropdownBox',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Charsets_getCollationDropdownBox',
                 'PhpMyAdmin\Charsets::getCollationDropdownBox',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
-        );
+        ];
     }
 }
diff --git a/libraries/classes/Twig/CoreExtension.php b/libraries/classes/Twig/CoreExtension.php
index 69f1f676ec..f7a660cf55 100644
--- a/libraries/classes/Twig/CoreExtension.php
+++ b/libraries/classes/Twig/CoreExtension.php
@@ -26,12 +26,12 @@ class CoreExtension extends AbstractExtension
      */
     public function getFunctions()
     {
-        return array(
+        return [
             new TwigFunction(
                 'Core_mimeDefaultFunction',
                 'PhpMyAdmin\Core::mimeDefaultFunction',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
-        );
+        ];
     }
 }
diff --git a/libraries/classes/Twig/I18n/NodeTrans.php b/libraries/classes/Twig/I18n/NodeTrans.php
index dca285a41d..49633bca87 100644
--- a/libraries/classes/Twig/I18n/NodeTrans.php
+++ b/libraries/classes/Twig/I18n/NodeTrans.php
@@ -44,7 +44,7 @@ class NodeTrans extends TransNode
         $lineno,
         $tag = null
     ) {
-        $nodes = array('body' => $body);
+        $nodes = ['body' => $body];
         if (null !== $count) {
             $nodes['count'] = $count;
         }
@@ -58,7 +58,7 @@ class NodeTrans extends TransNode
             $nodes['notes'] = $notes;
         }
 
-        Node::__construct($nodes, array(), $lineno, $tag);
+        Node::__construct($nodes, [], $lineno, $tag);
     }
 
     /**
@@ -89,7 +89,7 @@ class NodeTrans extends TransNode
             $message = trim($this->getNode('notes')->getAttribute('data'));
 
             // line breaks are not allowed cause we want a single line comment
-            $message = str_replace(array("\n", "\r"), ' ', $message);
+            $message = str_replace(["\n", "\r"], ' ', $message);
             $compiler->write("// l10n: {$message}\n");
         }
 
diff --git a/libraries/classes/Twig/I18n/TokenParserTrans.php b/libraries/classes/Twig/I18n/TokenParserTrans.php
index 01834a924b..bf1a4d8a9f 100644
--- a/libraries/classes/Twig/I18n/TokenParserTrans.php
+++ b/libraries/classes/Twig/I18n/TokenParserTrans.php
@@ -41,24 +41,24 @@ class TokenParserTrans extends TransTokenParser
             $body = $this->parser->getExpressionParser()->parseExpression();
         } else {
             $stream->expect(Token::BLOCK_END_TYPE);
-            $body = $this->parser->subparse(array($this, 'decideForFork'));
+            $body = $this->parser->subparse([$this, 'decideForFork']);
             $next = $stream->next()->getValue();
 
             if ('plural' === $next) {
                 $count = $this->parser->getExpressionParser()->parseExpression();
                 $stream->expect(Token::BLOCK_END_TYPE);
-                $plural = $this->parser->subparse(array($this, 'decideForFork'));
+                $plural = $this->parser->subparse([$this, 'decideForFork']);
 
                 if ('notes' === $stream->next()->getValue()) {
                     $stream->expect(Token::BLOCK_END_TYPE);
-                    $notes = $this->parser->subparse(array($this, 'decideForEnd'), true);
+                    $notes = $this->parser->subparse([$this, 'decideForEnd'], true);
                 }
             } elseif ('context' === $next) {
                 $stream->expect(Token::BLOCK_END_TYPE);
-                $context = $this->parser->subparse(array($this, 'decideForEnd'), true);
+                $context = $this->parser->subparse([$this, 'decideForEnd'], true);
             } elseif ('notes' === $next) {
                 $stream->expect(Token::BLOCK_END_TYPE);
-                $notes = $this->parser->subparse(array($this, 'decideForEnd'), true);
+                $notes = $this->parser->subparse([$this, 'decideForEnd'], true);
             }
         }
 
@@ -78,6 +78,6 @@ class TokenParserTrans extends TransTokenParser
      */
     public function decideForFork(Token $token)
     {
-        return $token->test(array('plural', 'context', 'notes', 'endtrans'));
+        return $token->test(['plural', 'context', 'notes', 'endtrans']);
     }
 }
diff --git a/libraries/classes/Twig/I18nExtension.php b/libraries/classes/Twig/I18nExtension.php
index 1f63b236c3..b89c7473dd 100644
--- a/libraries/classes/Twig/I18nExtension.php
+++ b/libraries/classes/Twig/I18nExtension.php
@@ -27,7 +27,7 @@ class I18nExtension extends TwigI18nExtension
      */
     public function getTokenParsers()
     {
-        return array(new TokenParserTrans());
+        return [new TokenParserTrans()];
     }
 
     /**
@@ -37,8 +37,8 @@ class I18nExtension extends TwigI18nExtension
      */
     public function getFilters()
     {
-        return array(
+        return [
              new TwigFilter('trans', '_gettext'),
-        );
+        ];
     }
 }
diff --git a/libraries/classes/Twig/IndexExtension.php b/libraries/classes/Twig/IndexExtension.php
index 0e1fde6c05..2d4b0f1f5f 100644
--- a/libraries/classes/Twig/IndexExtension.php
+++ b/libraries/classes/Twig/IndexExtension.php
@@ -26,12 +26,12 @@ class IndexExtension extends AbstractExtension
      */
     public function getFunctions()
     {
-        return array(
+        return [
             new TwigFunction(
                 'Index_getHtmlForDisplayIndexes',
                 'PhpMyAdmin\Index::getHtmlForDisplayIndexes',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
-        );
+        ];
     }
 }
diff --git a/libraries/classes/Twig/MessageExtension.php b/libraries/classes/Twig/MessageExtension.php
index 2cec75ab02..f5ad4fd892 100644
--- a/libraries/classes/Twig/MessageExtension.php
+++ b/libraries/classes/Twig/MessageExtension.php
@@ -27,21 +27,21 @@ class MessageExtension extends AbstractExtension
      */
     public function getFunctions()
     {
-        return array(
+        return [
             new TwigFunction(
                 'Message_notice',
                 function ($string) {
                     return Message::notice($string)->getDisplay();
                 },
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Message_error',
                 function ($string) {
                     return Message::error($string)->getDisplay();
                 },
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
-        );
+        ];
     }
 }
diff --git a/libraries/classes/Twig/PartitionExtension.php b/libraries/classes/Twig/PartitionExtension.php
index 3c442f12a2..90a179aeb6 100644
--- a/libraries/classes/Twig/PartitionExtension.php
+++ b/libraries/classes/Twig/PartitionExtension.php
@@ -26,12 +26,12 @@ class PartitionExtension extends AbstractExtension
      */
     public function getFunctions()
     {
-        return array(
+        return [
             new TwigFunction(
                 'Partition_getPartitions',
                 'PhpMyAdmin\Partition::getPartitions',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
-        );
+        ];
     }
 }
diff --git a/libraries/classes/Twig/PluginsExtension.php b/libraries/classes/Twig/PluginsExtension.php
index 4b88229047..20cf922508 100644
--- a/libraries/classes/Twig/PluginsExtension.php
+++ b/libraries/classes/Twig/PluginsExtension.php
@@ -26,27 +26,27 @@ class PluginsExtension extends AbstractExtension
      */
     public function getFunctions()
     {
-        return array(
+        return [
             new TwigFunction(
                 'Plugins_checkboxCheck',
                 'PhpMyAdmin\Plugins::checkboxCheck',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Plugins_getChoice',
                 'PhpMyAdmin\Plugins::getChoice',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Plugins_getDefault',
                 'PhpMyAdmin\Plugins::getDefault',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Plugins_getOptions',
                 'PhpMyAdmin\Plugins::getOptions',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
-        );
+        ];
     }
 }
diff --git a/libraries/classes/Twig/RelationExtension.php b/libraries/classes/Twig/RelationExtension.php
index 221f350cd8..daf50d71f0 100644
--- a/libraries/classes/Twig/RelationExtension.php
+++ b/libraries/classes/Twig/RelationExtension.php
@@ -28,16 +28,16 @@ class RelationExtension extends AbstractExtension
     public function getFunctions()
     {
         $relation = new Relation();
-        return array(
+        return [
             new TwigFunction(
                 'Relation_foreignDropdown',
                 [$relation, 'foreignDropdown'],
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Relation_getDisplayField',
                 [$relation, 'getDisplayField'],
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Relation_getForeignData',
@@ -51,6 +51,6 @@ class RelationExtension extends AbstractExtension
                 'Relation_searchColumnInForeigners',
                 [$relation, 'searchColumnInForeigners']
             ),
-        );
+        ];
     }
 }
diff --git a/libraries/classes/Twig/SanitizeExtension.php b/libraries/classes/Twig/SanitizeExtension.php
index 4a1390532e..de54866c0a 100644
--- a/libraries/classes/Twig/SanitizeExtension.php
+++ b/libraries/classes/Twig/SanitizeExtension.php
@@ -26,22 +26,22 @@ class SanitizeExtension extends AbstractExtension
      */
     public function getFunctions()
     {
-        return array(
+        return [
             new TwigFunction(
                 'Sanitize_escapeJsString',
                 'PhpMyAdmin\Sanitize::escapeJsString',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Sanitize_jsFormat',
                 'PhpMyAdmin\Sanitize::jsFormat',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Sanitize_sanitize',
                 'PhpMyAdmin\Sanitize::sanitize',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
-        );
+        ];
     }
 }
diff --git a/libraries/classes/Twig/ServerPrivilegesExtension.php b/libraries/classes/Twig/ServerPrivilegesExtension.php
index 078470248e..c1848a501f 100644
--- a/libraries/classes/Twig/ServerPrivilegesExtension.php
+++ b/libraries/classes/Twig/ServerPrivilegesExtension.php
@@ -28,12 +28,12 @@ class ServerPrivilegesExtension extends AbstractExtension
     public function getFunctions()
     {
         $serverPrivileges = new Privileges();
-        return array(
+        return [
             new TwigFunction(
                 'ServerPrivileges_formatPrivilege',
                 [$serverPrivileges, 'formatPrivilege'],
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
-        );
+        ];
     }
 }
diff --git a/libraries/classes/Twig/StorageEngineExtension.php b/libraries/classes/Twig/StorageEngineExtension.php
index cd94771c26..808536920e 100644
--- a/libraries/classes/Twig/StorageEngineExtension.php
+++ b/libraries/classes/Twig/StorageEngineExtension.php
@@ -26,12 +26,12 @@ class StorageEngineExtension extends AbstractExtension
      */
     public function getFunctions()
     {
-        return array(
+        return [
             new TwigFunction(
                 'StorageEngine_getHtmlSelect',
                 'PhpMyAdmin\StorageEngine::getHtmlSelect',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
-        );
+        ];
     }
 }
diff --git a/libraries/classes/Twig/TableExtension.php b/libraries/classes/Twig/TableExtension.php
index 0e257df840..4b2b3349fd 100644
--- a/libraries/classes/Twig/TableExtension.php
+++ b/libraries/classes/Twig/TableExtension.php
@@ -26,11 +26,11 @@ class TableExtension extends AbstractExtension
      */
     public function getFunctions()
     {
-        return array(
+        return [
             new TwigFunction(
                 'Table_get',
                 'PhpMyAdmin\Table::get'
             ),
-        );
+        ];
     }
 }
diff --git a/libraries/classes/Twig/TrackerExtension.php b/libraries/classes/Twig/TrackerExtension.php
index da6843990b..cbe5dd9ae7 100644
--- a/libraries/classes/Twig/TrackerExtension.php
+++ b/libraries/classes/Twig/TrackerExtension.php
@@ -26,11 +26,11 @@ class TrackerExtension extends AbstractExtension
      */
     public function getFunctions()
     {
-        return array(
+        return [
             new TwigFunction(
                 'Tracker_getVersion',
                 'PhpMyAdmin\Tracker::getVersion'
             ),
-        );
+        ];
     }
 }
diff --git a/libraries/classes/Twig/TransformationsExtension.php b/libraries/classes/Twig/TransformationsExtension.php
index 6636b8d79e..fec1eeffe3 100644
--- a/libraries/classes/Twig/TransformationsExtension.php
+++ b/libraries/classes/Twig/TransformationsExtension.php
@@ -28,7 +28,7 @@ class TransformationsExtension extends AbstractExtension
     public function getFunctions()
     {
         $transformations = new Transformations();
-        return array(
+        return [
             new TwigFunction(
                 'Transformations_getDescription',
                 [$transformations, 'getDescription']
@@ -37,6 +37,6 @@ class TransformationsExtension extends AbstractExtension
                 'Transformations_getName',
                 [$transformations, 'getName']
             ),
-        );
+        ];
     }
 }
diff --git a/libraries/classes/Twig/UrlExtension.php b/libraries/classes/Twig/UrlExtension.php
index 7cbd1f7cec..1c281008ae 100644
--- a/libraries/classes/Twig/UrlExtension.php
+++ b/libraries/classes/Twig/UrlExtension.php
@@ -26,31 +26,31 @@ class UrlExtension extends AbstractExtension
      */
     public function getFunctions()
     {
-        return array(
+        return [
             new TwigFunction(
                 'Url_getHiddenInputs',
                 'PhpMyAdmin\Url::getHiddenInputs',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Url_getHiddenFields',
                 'PhpMyAdmin\Url::getHiddenFields',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Url_getCommon',
                 'PhpMyAdmin\Url::getCommon',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Url_getCommonRaw',
                 'PhpMyAdmin\Url::getCommonRaw',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Url_link',
                 'PhpMyAdmin\Core::linkURL'
             ),
-        );
+        ];
     }
 }
diff --git a/libraries/classes/Twig/UtilExtension.php b/libraries/classes/Twig/UtilExtension.php
index 622e8f97ac..c6277c7158 100644
--- a/libraries/classes/Twig/UtilExtension.php
+++ b/libraries/classes/Twig/UtilExtension.php
@@ -26,7 +26,7 @@ class UtilExtension extends AbstractExtension
      */
     public function getFunctions()
     {
-        return array(
+        return [
             new TwigFunction(
                 'Util_backquote',
                 'PhpMyAdmin\Util::backquote'
@@ -34,7 +34,7 @@ class UtilExtension extends AbstractExtension
             new TwigFunction(
                 'Util_getBrowseUploadFileBlock',
                 'PhpMyAdmin\Util::getBrowseUploadFileBlock',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Util_convertBitDefaultValue',
@@ -59,47 +59,47 @@ class UtilExtension extends AbstractExtension
             new TwigFunction(
                 'Util_formatSql',
                 'PhpMyAdmin\Util::formatSql',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Util_getButtonOrImage',
                 'PhpMyAdmin\Util::getButtonOrImage',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Util_getClassForType',
                 'PhpMyAdmin\Util::getClassForType',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Util_getDivForSliderEffect',
                 'PhpMyAdmin\Util::getDivForSliderEffect',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Util_getDocuLink',
                 'PhpMyAdmin\Util::getDocuLink',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Util_getListNavigator',
                 'PhpMyAdmin\Util::getListNavigator',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Util_showDocu',
                 'PhpMyAdmin\Util::showDocu',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Util_getDropdown',
                 'PhpMyAdmin\Util::getDropdown',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Util_getFKCheckbox',
                 'PhpMyAdmin\Util::getFKCheckbox',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Util_getGISDatatypes',
@@ -112,42 +112,42 @@ class UtilExtension extends AbstractExtension
             new TwigFunction(
                 'Util_getHtmlTab',
                 'PhpMyAdmin\Util::getHtmlTab',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Util_getIcon',
                 'PhpMyAdmin\Util::getIcon',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Util_getImage',
                 'PhpMyAdmin\Util::getImage',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Util_getRadioFields',
                 'PhpMyAdmin\Util::getRadioFields',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Util_getSelectUploadFileBlock',
                 'PhpMyAdmin\Util::getSelectUploadFileBlock',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Util_getScriptNameForOption',
                 'PhpMyAdmin\Util::getScriptNameForOption',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Util_getStartAndNumberOfRowsPanel',
                 'PhpMyAdmin\Util::getStartAndNumberOfRowsPanel',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Util_getSupportedDatatypes',
                 'PhpMyAdmin\Util::getSupportedDatatypes',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Util_isForeignKeySupported',
@@ -156,7 +156,7 @@ class UtilExtension extends AbstractExtension
             new TwigFunction(
                 'Util_linkOrButton',
                 'PhpMyAdmin\Util::linkOrButton',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Util_localisedDate',
@@ -165,12 +165,12 @@ class UtilExtension extends AbstractExtension
             new TwigFunction(
                 'Util_showHint',
                 'PhpMyAdmin\Util::showHint',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Util_showDocu',
                 'PhpMyAdmin\Util::showDocu',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Util_showIcons',
@@ -179,13 +179,13 @@ class UtilExtension extends AbstractExtension
             new TwigFunction(
                 'Util_showMySQLDocu',
                 'PhpMyAdmin\Util::showMySQLDocu',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
             new TwigFunction(
                 'Util_sortableTableHeader',
                 'PhpMyAdmin\Util::sortableTableHeader',
-                array('is_safe' => array('html'))
+                ['is_safe' => ['html']]
             ),
-        );
+        ];
     }
 }
diff --git a/libraries/classes/Types.php b/libraries/classes/Types.php
index c34199b91b..82a29aad1f 100644
--- a/libraries/classes/Types.php
+++ b/libraries/classes/Types.php
@@ -38,12 +38,12 @@ class Types
      */
     public function getUnaryOperators()
     {
-        return array(
+        return [
             'IS NULL',
             'IS NOT NULL',
             "= ''",
             "!= ''",
-        );
+        ];
     }
 
     /**
@@ -65,10 +65,10 @@ class Types
      */
     public function getNullOperators()
     {
-        return array(
+        return [
             'IS NULL',
             'IS NOT NULL',
-        );
+        ];
     }
 
     /**
@@ -78,10 +78,10 @@ class Types
      */
     public function getEnumOperators()
     {
-        return array(
+        return [
             '=',
             '!=',
-        );
+        ];
     }
 
     /**
@@ -91,7 +91,7 @@ class Types
      */
     public function getTextOperators()
     {
-        return array(
+        return [
             'LIKE',
             'LIKE %...%',
             'NOT LIKE',
@@ -106,7 +106,7 @@ class Types
             'NOT IN (...)',
             'BETWEEN',
             'NOT BETWEEN',
-        );
+        ];
     }
 
     /**
@@ -116,7 +116,7 @@ class Types
      */
     public function getNumberOperators()
     {
-        return array(
+        return [
             '=',
             '>',
             '>=',
@@ -130,7 +130,7 @@ class Types
             'NOT IN (...)',
             'BETWEEN',
             'NOT BETWEEN',
-        );
+        ];
     }
 
     /**
@@ -143,7 +143,7 @@ class Types
      */
     public function getTypeOperators($type, $null)
     {
-        $ret = array();
+        $ret = [];
         $class = $this->getTypeClass($type);
 
         if (strncasecmp($type, 'enum', 4) == 0) {
@@ -472,7 +472,7 @@ class Types
 
         switch ($class) {
         case 'CHAR':
-            $ret = array(
+            $ret = [
                 'AES_DECRYPT',
                 'AES_ENCRYPT',
                 'BIN',
@@ -507,17 +507,17 @@ class Types
                 'USER',
                 'UUID',
                 'VERSION',
-            );
+            ];
 
             if (($isMariaDB && $serverVersion < 100012)
                 || $serverVersion < 50603
             ) {
-                $ret = array_diff($ret, array('INET6_NTOA'));
+                $ret = array_diff($ret, ['INET6_NTOA']);
             }
             return $ret;
 
         case 'DATE':
-            return array(
+            return [
                 'CURRENT_DATE',
                 'CURRENT_TIME',
                 'DATE',
@@ -533,10 +533,10 @@ class Types
                 'UTC_TIME',
                 'UTC_TIMESTAMP',
                 'YEAR',
-            );
+            ];
 
         case 'NUMBER':
-            $ret = array(
+            $ret = [
                 'ABS',
                 'ACOS',
                 'ASCII',
@@ -589,16 +589,16 @@ class Types
                 'WEEKDAY',
                 'WEEKOFYEAR',
                 'YEARWEEK',
-            );
+            ];
             if (($isMariaDB && $serverVersion < 100012)
                 || $serverVersion < 50603
             ) {
-                $ret = array_diff($ret, array('INET6_ATON'));
+                $ret = array_diff($ret, ['INET6_ATON']);
             }
             return $ret;
 
         case 'SPATIAL':
-            return array(
+            return [
                 'GeomFromText',
                 'GeomFromWKB',
 
@@ -617,10 +617,10 @@ class Types
                 'MPointFromWKB',
                 'PolyFromWKB',
                 'MPolyFromWKB',
-            );
+            ];
 
         }
-        return array();
+        return [];
     }
 
     /**
@@ -663,13 +663,13 @@ class Types
      */
     public function getAttributes()
     {
-        return array(
+        return [
             '',
             'BINARY',
             'UNSIGNED',
             'UNSIGNED ZEROFILL',
             'on update CURRENT_TIMESTAMP',
-        );
+        ];
     }
 
     /**
@@ -687,14 +687,14 @@ class Types
         $serverVersion = $this->_dbi->getVersion();
 
         // most used types
-        $ret = array(
+        $ret = [
             'INT',
             'VARCHAR',
             'TEXT',
             'DATE',
-        );
+        ];
         // numeric
-        $ret[_pgettext('numeric types', 'Numeric')] = array(
+        $ret[_pgettext('numeric types', 'Numeric')] = [
             'TINYINT',
             'SMALLINT',
             'MEDIUMINT',
@@ -709,19 +709,19 @@ class Types
             'BIT',
             'BOOLEAN',
             'SERIAL',
-        );
+        ];
 
         // Date/Time
-        $ret[_pgettext('date and time types', 'Date and time')] = array(
+        $ret[_pgettext('date and time types', 'Date and time')] = [
             'DATE',
             'DATETIME',
             'TIMESTAMP',
             'TIME',
             'YEAR',
-        );
+        ];
 
         // Text
-        $ret[_pgettext('string types', 'String')] = array(
+        $ret[_pgettext('string types', 'String')] = [
             'CHAR',
             'VARCHAR',
             '-',
@@ -740,9 +740,9 @@ class Types
             '-',
             'ENUM',
             'SET',
-        );
+        ];
 
-        $ret[_pgettext('spatial types', 'Spatial')] = array(
+        $ret[_pgettext('spatial types', 'Spatial')] = [
             'GEOMETRY',
             'POINT',
             'LINESTRING',
@@ -751,13 +751,13 @@ class Types
             'MULTILINESTRING',
             'MULTIPOLYGON',
             'GEOMETRYCOLLECTION',
-        );
+        ];
 
         if (($isMariaDB && $serverVersion > 100207)
             || (!$isMariaDB && $serverVersion >= 50708)) {
-          $ret['JSON'] = array(
+          $ret['JSON'] = [
               'JSON',
-          );
+          ];
         }
 
         return $ret;
@@ -770,7 +770,7 @@ class Types
      */
     public function getIntegerTypes()
     {
-        return array('tinyint', 'smallint', 'mediumint', 'int', 'bigint');
+        return ['tinyint', 'smallint', 'mediumint', 'int', 'bigint'];
     }
 
     /**
@@ -783,25 +783,25 @@ class Types
      */
     public function getIntegerRange($type, $signed = true)
     {
-        static $min_max_data = array(
-            'unsigned' => array(
-                'tinyint'   => array('0', '255'),
-                'smallint'  => array('0', '65535'),
-                'mediumint' => array('0', '16777215'),
-                'int'       => array('0', '4294967295'),
-                'bigint'    => array('0', '18446744073709551615')
-            ),
-            'signed' => array(
-                'tinyint'   => array('-128', '127'),
-                'smallint'  => array('-32768', '32767'),
-                'mediumint' => array('-8388608', '8388607'),
-                'int'       => array('-2147483648', '2147483647'),
-                'bigint'    => array('-9223372036854775808', '9223372036854775807')
-            )
-        );
+        static $min_max_data = [
+            'unsigned' => [
+                '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']
+            ]
+        ];
         $relevantArray = $signed
             ? $min_max_data['signed']
             : $min_max_data['unsigned'];
-        return isset($relevantArray[$type]) ? $relevantArray[$type] : array('', '');
+        return isset($relevantArray[$type]) ? $relevantArray[$type] : ['', ''];
     }
 }
diff --git a/libraries/classes/Url.php b/libraries/classes/Url.php
index 2723176685..61b728fe4b 100644
--- a/libraries/classes/Url.php
+++ b/libraries/classes/Url.php
@@ -33,7 +33,7 @@ class Url
      * @access  public
      */
     public static function getHiddenInputs($db = '', $table = '',
-        $indent = 0, $skip = array()
+        $indent = 0, $skip = []
     ) {
         if (is_array($db)) {
             $params  =& $db;
@@ -42,7 +42,7 @@ class Url
             $indent  =& $_indent;
             $skip    =& $_skip;
         } else {
-            $params = array();
+            $params = [];
             if (strlen((string) $db) > 0) {
                 $params['db'] = $db;
             }
@@ -163,7 +163,7 @@ class Url
      * @return string   string with URL parameters
      * @access  public
      */
-    public static function getCommon($params = array(), $divider = '?')
+    public static function getCommon($params = [], $divider = '?')
     {
         return htmlspecialchars(
             Url::getCommonRaw($params, $divider)
@@ -199,7 +199,7 @@ class Url
      * @return string   string with URL parameters
      * @access  public
      */
-    public static function getCommonRaw($params = array(), $divider = '?')
+    public static function getCommonRaw($params = [], $divider = '?')
     {
         $separator = Url::getArgSeparator();
 
diff --git a/libraries/classes/UserPassword.php b/libraries/classes/UserPassword.php
index c38b490a3e..d02bdc6c38 100644
--- a/libraries/classes/UserPassword.php
+++ b/libraries/classes/UserPassword.php
@@ -90,7 +90,7 @@ class UserPassword
                 $error = true;
             }
         }
-        return array('error' => $error, 'msg' => $message);
+        return ['error' => $error, 'msg' => $message];
     }
 
     /**
diff --git a/libraries/classes/UserPreferences.php b/libraries/classes/UserPreferences.php
index 2aa92c85ce..a0fe9ed59d 100644
--- a/libraries/classes/UserPreferences.php
+++ b/libraries/classes/UserPreferences.php
@@ -51,10 +51,10 @@ class UserPreferences
         $cf->resetConfigData(); // start with a clean instance
         $cf->setAllowedKeys($forms_all_keys);
         $cf->setCfgUpdateReadMapping(
-            array(
+            [
                 'Server/hide_db' => 'Servers/1/hide_db',
                 'Server/only_db' => 'Servers/1/only_db'
-            )
+            ]
         );
         $cf->updateWithGlobalConfig($GLOBALS['cfg']);
     }
@@ -75,14 +75,14 @@ class UserPreferences
         if (! $cfgRelation['userconfigwork']) {
             // no pmadb table, use session storage
             if (! isset($_SESSION['userconfig'])) {
-                $_SESSION['userconfig'] = array(
-                    'db' => array(),
-                    'ts' => time());
+                $_SESSION['userconfig'] = [
+                    'db' => [],
+                    'ts' => time()];
             }
-            return array(
+            return [
                 'config_data' => $_SESSION['userconfig']['db'],
                 'mtime' => $_SESSION['userconfig']['ts'],
-                'type' => 'session');
+                'type' => 'session'];
         }
         // load configuration from pmadb
         $query_table = Util::backquote($cfgRelation['db']) . '.'
@@ -94,10 +94,10 @@ class UserPreferences
             . '\'';
         $row = $GLOBALS['dbi']->fetchSingleRow($query, 'ASSOC', DatabaseInterface::CONNECT_CONTROL);
 
-        return array(
-            'config_data' => $row ? json_decode($row['config_data'], true) : array(),
+        return [
+            'config_data' => $row ? json_decode($row['config_data'], true) : [],
             'mtime' => $row ? $row['ts'] : time(),
-            'type' => 'db');
+            'type' => 'db'];
     }
 
     /**
@@ -116,9 +116,9 @@ class UserPreferences
         $cache_key = 'server_' . $server;
         if (! $cfgRelation['userconfigwork']) {
             // no pmadb table, use session storage
-            $_SESSION['userconfig'] = array(
+            $_SESSION['userconfig'] = [
                 'db' => $config_array,
-                'ts' => time());
+                'ts' => time()];
             if (isset($_SESSION['cache'][$cache_key]['userprefs'])) {
                 unset($_SESSION['cache'][$cache_key]['userprefs']);
             }
@@ -178,7 +178,7 @@ class UserPreferences
      */
     public function apply(array $config_data)
     {
-        $cfg = array();
+        $cfg = [];
         $blacklist = array_flip($GLOBALS['cfg']['UserprefsDisallow']);
         $whitelist = array_flip(UserFormList::getFields());
         // whitelist some additional fields which are custom handled
@@ -235,7 +235,7 @@ class UserPreferences
         $params = null, $hash = null
     ) {
         // redirect
-        $url_params = array('saved' => 1);
+        $url_params = ['saved' => 1];
         if (is_array($params)) {
             $url_params = array_merge($params, $url_params);
         }
@@ -267,10 +267,10 @@ class UserPreferences
 
         return Template::get('prefs_autoload')
             ->render(
-                array(
+                [
                     'hidden_inputs' => Url::getHiddenInputs(),
                     'return_url' => $return_url,
-                )
+                ]
             );
     }
 }
diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index 97baba2fbc..f0d6f145aa 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -40,7 +40,7 @@ class Util
      */
     public static function showIcons($value)
     {
-        return in_array($GLOBALS['cfg'][$value], array('icons', 'both'));
+        return in_array($GLOBALS['cfg'][$value], ['icons', 'both']);
     }
 
     /**
@@ -52,7 +52,7 @@ class Util
      */
     public static function showText($value)
     {
-        return in_array($GLOBALS['cfg'][$value], array('text', 'both'));
+        return in_array($GLOBALS['cfg'][$value], ['text', 'both']);
     }
 
     /**
@@ -114,7 +114,7 @@ class Util
      *
      * @return string an html IMG tag
      */
-    public static function getImage($image, $alternate = '', array $attributes = array())
+    public static function getImage($image, $alternate = '', array $attributes = [])
     {
         $alternate = htmlspecialchars($alternate);
 
@@ -134,7 +134,7 @@ class Util
         // set all other attributes
         $attr_str = '';
         foreach ($attributes as $key => $value) {
-            if (! in_array($key, array('alt', 'title'))) {
+            if (! in_array($key, ['alt', 'title'])) {
                 $attr_str .= " $key=\"$value\"";
             }
         }
@@ -206,7 +206,7 @@ class Util
      */
     public static function escapeMysqlWildcards($name)
     {
-        return strtr($name, array('_' => '\\_', '%' => '\\%'));
+        return strtr($name, ['_' => '\\_', '%' => '\\%']);
     } // end of the 'escapeMysqlWildcards()' function
 
     /**
@@ -221,7 +221,7 @@ class Util
      */
     public static function unescapeMysqlWildcards($name)
     {
-        return strtr($name, array('\\_' => '_', '\\%' => '%'));
+        return strtr($name, ['\\_' => '_', '\\%' => '%']);
     } // end of the 'unescapeMysqlWildcards()' function
 
     /**
@@ -236,7 +236,7 @@ class Util
      */
     public static function unQuote($quoted_string, $quote = null)
     {
-        $quotes = array();
+        $quotes = [];
 
         if ($quote === null) {
             $quotes[] = '`';
@@ -531,7 +531,7 @@ class Util
          * The errors found by the lexer and the parser.
          * @var array $errors
          */
-        $errors = ParserError::get(array($lexer, $parser));
+        $errors = ParserError::get([$lexer, $parser]);
 
         if (empty($sql_query)) {
             $formatted_sql = '';
@@ -575,10 +575,10 @@ class Util
             }
 
             if ($is_modify_link) {
-                $_url_params = array(
+                $_url_params = [
                     'sql_query' => $sql_query,
                     'show_query' => 1,
-                );
+                ];
                 if (strlen($table) > 0) {
                     $_url_params['db'] = $db;
                     $_url_params['table'] = $table;
@@ -625,8 +625,8 @@ class Util
             // All non-single blanks and  TAB-characters are replaced with their
             // HTML-counterpart
             $server_msg = str_replace(
-                array('  ', "\t"),
-                array('&nbsp;&nbsp;', '&nbsp;&nbsp;&nbsp;&nbsp;'),
+                ['  ', "\t"],
+                ['&nbsp;&nbsp;', '&nbsp;&nbsp;&nbsp;&nbsp;'],
                 $server_msg
             );
 
@@ -740,14 +740,14 @@ class Util
             return $tables;
         }
 
-        $default = array(
+        $default = [
             'Name'      => '',
             'Rows'      => 0,
             'Comment'   => '',
             'disp_name' => '',
-        );
+        ];
 
-        $table_groups = array();
+        $table_groups = [];
 
         foreach ($tables as $table_name => $table) {
             $table['Rows'] = self::_checkRowCount($db, $table);
@@ -771,7 +771,7 @@ class Util
                     $group_name_full .= $group_name;
 
                     if (! isset($group[$group_name])) {
-                        $group[$group_name] = array();
+                        $group[$group_name] = [];
                         $group[$group_name]['is' . $sep . 'group'] = true;
                         $group[$group_name]['tab' . $sep . 'count'] = 1;
                         $group[$group_name]['tab' . $sep . 'group']
@@ -779,7 +779,7 @@ class Util
 
                     } elseif (! isset($group[$group_name]['is' . $sep . 'group'])) {
                         $table = $group[$group_name];
-                        $group[$group_name] = array();
+                        $group[$group_name] = [];
                         $group[$group_name][$group_name] = $table;
                         $group[$group_name]['is' . $sep . 'group'] = true;
                         $group[$group_name]['tab' . $sep . 'count'] = 1;
@@ -796,7 +796,7 @@ class Util
 
             } else {
                 if (! isset($table_groups[$table_name])) {
-                    $table_groups[$table_name] = array();
+                    $table_groups[$table_name] = [];
                 }
                 $group =& $table_groups;
             }
@@ -1012,7 +1012,7 @@ class Util
             // where the query box is available)
 
             // Basic url query part
-            $url_params = array();
+            $url_params = [];
             if (! isset($GLOBALS['db'])) {
                 $GLOBALS['db'] = '';
             }
@@ -1060,7 +1060,7 @@ class Util
                         . self::linkOrButton(
                             htmlspecialchars('url.php?url=' . urlencode($url)),
                             sprintf(__('Analyze Explain at %s'), 'mariadb.org'),
-                            array(),
+                            [],
                             '_blank'
                         ) . '&nbsp;]';
                 }
@@ -1142,13 +1142,13 @@ class Util
                 $retval .= '<input type="hidden" name="profiling_form" value="1" />';
                 $retval .= Template::get('checkbox')
                     ->render(
-                        array(
+                        [
                             'html_field_name'   => 'profiling',
                             'label'             => __('Profiling'),
                             'checked'           => isset($_SESSION['profiling']),
                             'onclick'           => true,
                             'html_field_id'     => '',
-                        )
+                        ]
                     );
             }
             $retval .= '</form>';
@@ -1164,7 +1164,7 @@ class Util
                     . self::linkOrButton(
                         '#',
                         _pgettext('Inline edit query', 'Edit inline'),
-                        array('class' => 'inline_edit_sql')
+                        ['class' => 'inline_edit_sql']
                     )
                     . ']';
             } else {
@@ -1259,7 +1259,7 @@ class Util
             return null;
         }
 
-        $byteUnits = array(
+        $byteUnits = [
             /* l10n: shortcuts for Byte */
             __('B'),
             /* l10n: shortcuts for Kilobyte */
@@ -1274,7 +1274,7 @@ class Util
             __('PiB'),
             /* l10n: shortcuts for Exabyte */
             __('EiB')
-        );
+        ];
 
         $dh   = pow(10, $comma);
         $li   = pow(10, $limes);
@@ -1300,7 +1300,7 @@ class Util
             $return_value = self::formatNumber($value, 0);
         }
 
-        return array(trim($return_value), $unit);
+        return [trim($return_value), $unit];
     } // end of the 'formatByteDown' function
 
 
@@ -1359,7 +1359,7 @@ class Util
         }
 
         // this units needs no translation, ISO
-        $units = array(
+        $units = [
             -8 => 'y',
             -7 => 'z',
             -6 => 'a',
@@ -1377,7 +1377,7 @@ class Util
             6 => 'E',
             7 => 'Z',
             8 => 'Y'
-        );
+        ];
         /* l10n: Decimal separator */
         $decimal_sep = __('.');
         /* l10n: Thousands separator */
@@ -1478,7 +1478,7 @@ class Util
      */
     public static function localisedDate($timestamp = -1, $format = '')
     {
-        $month = array(
+        $month = [
             /* l10n: Short month name */
             __('Jan'),
             /* l10n: Short month name */
@@ -1502,8 +1502,8 @@ class Util
             /* l10n: Short month name */
             __('Nov'),
             /* l10n: Short month name */
-            __('Dec'));
-        $day_of_week = array(
+            __('Dec')];
+        $day_of_week = [
             /* l10n: Short week day name */
             _pgettext('Short week day name', 'Sun'),
             /* l10n: Short week day name */
@@ -1517,7 +1517,7 @@ class Util
             /* l10n: Short week day name */
             __('Fri'),
             /* l10n: Short week day name */
-            __('Sat'));
+            __('Sat')];
 
         if ($format == '') {
             /* l10n: See https://secure.php.net/manual/en/function.strftime.php */
@@ -1569,10 +1569,10 @@ class Util
      *
      * @access  public
      */
-    public static function getHtmlTab(array $tab, array $url_params = array())
+    public static function getHtmlTab(array $tab, array $url_params = [])
     {
         // default values
-        $defaults = array(
+        $defaults = [
             'text'      => '',
             'class'     => '',
             'active'    => null,
@@ -1583,7 +1583,7 @@ class Util
             'warning'   => '',
             'fragment'  => '',
             'id'        => '',
-        );
+        ];
 
         $tab = array_merge($defaults, $tab);
 
@@ -1639,16 +1639,16 @@ class Util
         //Set the id for the tab, if set in the params
         $tabId = (empty($tab['id']) ? null : $tab['id']);
 
-        $item = array();
+        $item = [];
         if (!empty($tab['link'])) {
-            $item = array(
+            $item = [
                 'content' => $tab['text'],
-                'url' => array(
+                'url' => [
                     'href' => empty($tab['link']) ? null : $tab['link'],
                     'id' => $tabId,
                     'class' => 'tab' . htmlentities($tab['class']),
-                ),
-            );
+                ],
+            ];
         } else {
             $item['content'] = '<span class="tab' . htmlentities($tab['class']) . '"'
                 . $tabId . '>' . $tab['text'] . '</span>';
@@ -1718,13 +1718,13 @@ class Util
      * @return string  the results to be echoed or saved in an array
      */
     public static function linkOrButton(
-        $url, $message, $tag_params = array(), $target = ''
+        $url, $message, $tag_params = [], $target = ''
     ) {
         $url_length = strlen($url);
 
         if (! is_array($tag_params)) {
             $tmp = $tag_params;
-            $tag_params = array();
+            $tag_params = [];
             if (! empty($tmp)) {
                 $tag_params['onclick'] = 'return confirmLink(this, \''
                     . Sanitize::escapeJsString($tmp) . '\')';
@@ -1759,7 +1759,7 @@ class Util
             }
         }
 
-        $tag_params_strings = array();
+        $tag_params_strings = [];
         if (($url_length > $GLOBALS['cfg']['LinkLengthLimit'])
             || ! $in_suhosin_limits
             || strpos($url, 'sql_query=') !== false
@@ -1816,7 +1816,7 @@ class Util
             return explode($separator, $url_parts['query']);
         }
 
-        return array();
+        return [];
     }
 
     /**
@@ -1917,10 +1917,10 @@ class Util
         $unique_key           = '';
         $nonprimary_condition = '';
         $preferred_condition = '';
-        $primary_key_array    = array();
-        $unique_key_array     = array();
-        $nonprimary_condition_array = array();
-        $condition_array = array();
+        $primary_key_array    = [];
+        $unique_key_array     = [];
+        $nonprimary_condition_array = [];
+        $condition_array = [];
 
         for ($i = 0; $i < $fields_cnt; ++$i) {
 
@@ -2068,7 +2068,7 @@ class Util
         }
 
         $where_clause = trim(preg_replace('|\s?AND$|', '', $preferred_condition));
-        return(array($where_clause, $clause_is_unique, $condition_array));
+        return([$where_clause, $clause_is_unique, $condition_array]);
     } // end function
 
     /**
@@ -2159,7 +2159,7 @@ class Util
         if ($nbTotalPage < $showAll) {
             $pages = range(1, $nbTotalPage);
         } else {
-            $pages = array();
+            $pages = [];
 
             // Always show first X pages
             for ($i = 1; $i <= $sliceStart; $i++) {
@@ -2279,7 +2279,7 @@ class Util
      */
     public static function getListNavigator(
         $count, $pos, array $_url_params, $script, $frame, $max_count, $name = 'pos',
-        $classes = array()
+        $classes = []
     ) {
 
         // This is often coming from $cfg['MaxTableList'] and
@@ -2420,7 +2420,7 @@ class Util
             . self::getScriptNameForOption(
                 $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
             )
-            . Url::getCommon(array('db' => $database)) . '" title="'
+            . Url::getCommon(['db' => $database]) . '" title="'
             . htmlspecialchars(
                 sprintf(
                     __('Jump to database “%s”.'),
@@ -2804,7 +2804,7 @@ class Util
             $unsigned = false;
             $zerofill = false;
         } else {
-            $enum_set_values = array();
+            $enum_set_values = [];
 
             /* Create printable type name */
             $printtype = mb_strtolower($columnspec);
@@ -2865,7 +2865,7 @@ class Util
             $displayed_type .= '</abbr>';
         }
 
-        return array(
+        return [
             'type' => $type,
             'spec_in_brackets' => $spec_in_brackets,
             'enum_set_values'  => $enum_set_values,
@@ -2876,7 +2876,7 @@ class Util
             'attribute' => $attribute,
             'can_contain_collation' => $can_contain_collation,
             'displayed_type' => $displayed_type
-        );
+        ];
     }
 
     /**
@@ -3026,7 +3026,7 @@ class Util
      */
     public static function getTitleForTarget($target)
     {
-        $mapping = array(
+        $mapping = [
             'structure' =>  __('Structure'),
             'sql' => __('SQL'),
             'search' =>__('Search'),
@@ -3047,7 +3047,7 @@ class Util
             'db_sql.php' => __('SQL'),
             'db_search.php' => __('Search'),
             'db_operations.php' => __('Operations'),
-        );
+        ];
         return isset($mapping[$target]) ? $mapping[$target] : false;
     }
 
@@ -3129,10 +3129,10 @@ class Util
      * @return string
      */
     public static function expandUserString(
-        $string, $escape = null, array $updates = array()
+        $string, $escape = null, array $updates = []
     ) {
         /* Content */
-        $vars = array();
+        $vars = [];
         $vars['http_host'] = Core::getenv('HTTP_HOST');
         $vars['server_name'] = $GLOBALS['cfg']['Server']['host'];
         $vars['server_verbose'] = $GLOBALS['cfg']['Server']['verbose'];
@@ -3157,7 +3157,7 @@ class Util
          * The __VAR__ ones are for backward compatibility, because user
          * might still have it in cookies.
          */
-        $replace = array(
+        $replace = [
             '@HTTP_HOST@' => $vars['http_host'],
             '@SERVER@' => $vars['server_name'],
             '__SERVER__' => $vars['server_name'],
@@ -3168,7 +3168,7 @@ class Util
             '@TABLE@' => $vars['table'],
             '__TABLE__' => $vars['table'],
             '@PHPMYADMIN@' => $vars['phpmyadmin_version'],
-            );
+            ];
 
         /* Optional escaping */
         if (! is_null($escape)) {
@@ -3189,7 +3189,7 @@ class Util
 
         /* Backward compatibility in 3.5.x */
         if (mb_strpos($string, '@FIELDS@') !== false) {
-            $string = strtr($string, array('@FIELDS@' => '@COLUMNS@'));
+            $string = strtr($string, ['@FIELDS@' => '@COLUMNS@']);
         }
 
         /* Fetch columns list if required */
@@ -3200,7 +3200,7 @@ class Util
 
             // sometimes the table no longer exists at this point
             if (! is_null($columns_list)) {
-                $column_names = array();
+                $column_names = [];
                 foreach ($columns_list as $column) {
                     if (! is_null($escape)) {
                         $column_names[] = self::$escape($column['Field']);
@@ -3317,7 +3317,7 @@ class Util
      */
     public static function buildActionTitles()
     {
-        $titles = array();
+        $titles = [];
 
         $titles['Browse']     = self::getIcon('b_browse', __('Browse'));
         $titles['NoBrowse']   = self::getIcon('bd_browse', __('Browse'));
@@ -3402,7 +3402,7 @@ class Util
                 }
             }
         } else {
-            $retval = array();
+            $retval = [];
             foreach ($GLOBALS['dbi']->types->getColumns() as $value) {
                 if (is_array($value)) {
                     foreach ($value as $subvalue) {
@@ -3429,7 +3429,7 @@ class Util
      */
     public static function unsupportedDatatypes()
     {
-        $no_support_types = array();
+        $no_support_types = [];
         return $no_support_types;
     }
 
@@ -3442,7 +3442,7 @@ class Util
      */
     public static function getGISDatatypes($upper_case = false)
     {
-        $gis_data_types = array(
+        $gis_data_types = [
             'geometry',
             'point',
             'linestring',
@@ -3451,7 +3451,7 @@ class Util
             'multilinestring',
             'multipolygon',
             'geometrycollection'
-        );
+        ];
         if ($upper_case) {
             for ($i = 0, $nb = count($gis_data_types); $i < $nb; $i++) {
                 $gis_data_types[$i]
@@ -3499,97 +3499,97 @@ class Util
     public static function getGISFunctions(
         $geom_type = null, $binary = true, $display = false
     ) {
-        $funcs = array();
+        $funcs = [];
         if ($display) {
-            $funcs[] = array('display' => ' ');
+            $funcs[] = ['display' => ' '];
         }
 
         // Unary functions common to all geometry types
-        $funcs['Dimension']    = array('params' => 1, 'type' => 'int');
-        $funcs['Envelope']     = array('params' => 1, 'type' => 'Polygon');
-        $funcs['GeometryType'] = array('params' => 1, 'type' => 'text');
-        $funcs['SRID']         = array('params' => 1, 'type' => 'int');
-        $funcs['IsEmpty']      = array('params' => 1, 'type' => 'int');
-        $funcs['IsSimple']     = array('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'];
 
         $geom_type = trim(mb_strtolower((string) $geom_type));
         if ($display && $geom_type != 'geometry' && $geom_type != 'multipoint') {
-            $funcs[] = array('display' => '--------');
+            $funcs[] = ['display' => '--------'];
         }
 
         // Unary functions that are specific to each geometry type
         if ($geom_type == 'point') {
-            $funcs['X'] = array('params' => 1, 'type' => 'float');
-            $funcs['Y'] = array('params' => 1, 'type' => 'float');
+            $funcs['X'] = ['params' => 1, 'type' => 'float'];
+            $funcs['Y'] = ['params' => 1, 'type' => 'float'];
 
         } elseif ($geom_type == 'multipoint') {
             // no functions here
         } elseif ($geom_type == 'linestring') {
-            $funcs['EndPoint']   = array('params' => 1, 'type' => 'point');
-            $funcs['GLength']    = array('params' => 1, 'type' => 'float');
-            $funcs['NumPoints']  = array('params' => 1, 'type' => 'int');
-            $funcs['StartPoint'] = array('params' => 1, 'type' => 'point');
-            $funcs['IsRing']     = array('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 ($geom_type == 'multilinestring') {
-            $funcs['GLength']  = array('params' => 1, 'type' => 'float');
-            $funcs['IsClosed'] = array('params' => 1, 'type' => 'int');
+            $funcs['GLength']  = ['params' => 1, 'type' => 'float'];
+            $funcs['IsClosed'] = ['params' => 1, 'type' => 'int'];
 
         } elseif ($geom_type == 'polygon') {
-            $funcs['Area']         = array('params' => 1, 'type' => 'float');
-            $funcs['ExteriorRing'] = array('params' => 1, 'type' => 'linestring');
-            $funcs['NumInteriorRings'] = array('params' => 1, 'type' => 'int');
+            $funcs['Area']         = ['params' => 1, 'type' => 'float'];
+            $funcs['ExteriorRing'] = ['params' => 1, 'type' => 'linestring'];
+            $funcs['NumInteriorRings'] = ['params' => 1, 'type' => 'int'];
 
         } elseif ($geom_type == 'multipolygon') {
-            $funcs['Area']     = array('params' => 1, 'type' => 'float');
-            $funcs['Centroid'] = array('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 ($geom_type == 'geometrycollection') {
-            $funcs['NumGeometries'] = array('params' => 1, 'type' => 'int');
+            $funcs['NumGeometries'] = ['params' => 1, 'type' => 'int'];
         }
 
         // If we are asked for binary functions as well
         if ($binary) {
             // section separator
             if ($display) {
-                $funcs[] = array('display' => '--------');
+                $funcs[] = ['display' => '--------'];
             }
 
             if ($GLOBALS['dbi']->getVersion() < 50601) {
-                $funcs['Crosses']    = array('params' => 2, 'type' => 'int');
-                $funcs['Contains']   = array('params' => 2, 'type' => 'int');
-                $funcs['Disjoint']   = array('params' => 2, 'type' => 'int');
-                $funcs['Equals']     = array('params' => 2, 'type' => 'int');
-                $funcs['Intersects'] = array('params' => 2, 'type' => 'int');
-                $funcs['Overlaps']   = array('params' => 2, 'type' => 'int');
-                $funcs['Touches']    = array('params' => 2, 'type' => 'int');
-                $funcs['Within']     = array('params' => 2, 'type' => 'int');
+                $funcs['Crosses']    = ['params' => 2, 'type' => 'int'];
+                $funcs['Contains']   = ['params' => 2, 'type' => 'int'];
+                $funcs['Disjoint']   = ['params' => 2, 'type' => 'int'];
+                $funcs['Equals']     = ['params' => 2, 'type' => 'int'];
+                $funcs['Intersects'] = ['params' => 2, 'type' => 'int'];
+                $funcs['Overlaps']   = ['params' => 2, 'type' => 'int'];
+                $funcs['Touches']    = ['params' => 2, 'type' => 'int'];
+                $funcs['Within']     = ['params' => 2, 'type' => 'int'];
             } else {
                 // If MySQl version is greater than or equal 5.6.1,
                 // use the ST_ prefix.
-                $funcs['ST_Crosses']    = array('params' => 2, 'type' => 'int');
-                $funcs['ST_Contains']   = array('params' => 2, 'type' => 'int');
-                $funcs['ST_Disjoint']   = array('params' => 2, 'type' => 'int');
-                $funcs['ST_Equals']     = array('params' => 2, 'type' => 'int');
-                $funcs['ST_Intersects'] = array('params' => 2, 'type' => 'int');
-                $funcs['ST_Overlaps']   = array('params' => 2, 'type' => 'int');
-                $funcs['ST_Touches']    = array('params' => 2, 'type' => 'int');
-                $funcs['ST_Within']     = array('params' => 2, 'type' => 'int');
+                $funcs['ST_Crosses']    = ['params' => 2, 'type' => 'int'];
+                $funcs['ST_Contains']   = ['params' => 2, 'type' => 'int'];
+                $funcs['ST_Disjoint']   = ['params' => 2, 'type' => 'int'];
+                $funcs['ST_Equals']     = ['params' => 2, 'type' => 'int'];
+                $funcs['ST_Intersects'] = ['params' => 2, 'type' => 'int'];
+                $funcs['ST_Overlaps']   = ['params' => 2, 'type' => 'int'];
+                $funcs['ST_Touches']    = ['params' => 2, 'type' => 'int'];
+                $funcs['ST_Within']     = ['params' => 2, 'type' => 'int'];
             }
 
             if ($display) {
-                $funcs[] = array('display' => '--------');
+                $funcs[] = ['display' => '--------'];
             }
             // Minimum bounding rectangle functions
-            $funcs['MBRContains']   = array('params' => 2, 'type' => 'int');
-            $funcs['MBRDisjoint']   = array('params' => 2, 'type' => 'int');
-            $funcs['MBREquals']     = array('params' => 2, 'type' => 'int');
-            $funcs['MBRIntersects'] = array('params' => 2, 'type' => 'int');
-            $funcs['MBROverlaps']   = array('params' => 2, 'type' => 'int');
-            $funcs['MBRTouches']    = array('params' => 2, 'type' => 'int');
-            $funcs['MBRWithin']     = array('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;
     }
@@ -3670,7 +3670,7 @@ class Util
     public static function getFunctionsForField(array $field, $insert_mode, array $foreignData)
     {
         $default_function = self::getDefaultFunctionForField($field, $insert_mode);
-        $dropdown_built = array();
+        $dropdown_built = [];
 
         // Create the output
         $retval = '<option></option>' . "\n";
@@ -3787,7 +3787,7 @@ class Util
         // find any valid privileges, try table-wise privileges.
         if ($tbl !== null) {
             // need to escape wildcards in db and table names, see bug #3518484
-            $tbl = str_replace(array('%', '_'), array('\%', '\_'), $tbl);
+            $tbl = str_replace(['%', '_'], ['\%', '\_'], $tbl);
             $query .= " AND TABLE_NAME='%s'";
             $table_privileges = $GLOBALS['dbi']->fetchValue(
                 sprintf(
@@ -3882,7 +3882,7 @@ class Util
         // There is a JS port of the below parser in functions.js
         // If you are fixing something here,
         // you need to also update the JS port.
-        $values = array();
+        $values = [];
         $in_string = false;
         $buffer = '';
 
@@ -3964,8 +3964,8 @@ class Util
      */
     public static function getMenuTabList($level = null)
     {
-        $tabList = array(
-            'server' => array(
+        $tabList = [
+            'server' => [
                 'databases'   => __('Databases'),
                 'sql'         => __('SQL'),
                 'status'      => __('Status'),
@@ -3979,8 +3979,8 @@ class Util
                 'charset'     => __('Charsets'),
                 'plugins'     => __('Plugins'),
                 'engine'      => __('Engines')
-            ),
-            'db'     => array(
+            ],
+            'db'     => [
                 'structure'   => __('Structure'),
                 'sql'         => __('SQL'),
                 'search'      => __('Search'),
@@ -3995,8 +3995,8 @@ class Util
                 'tracking'    => __('Tracking'),
                 'designer'    => __('Designer'),
                 'central_columns' => __('Central columns')
-            ),
-            'table'  => array(
+            ],
+            'table'  => [
                 'browse'      => __('Browse'),
                 'structure'   => __('Structure'),
                 'sql'         => __('SQL'),
@@ -4008,8 +4008,8 @@ class Util
                 'operation'   => __('Operations'),
                 'tracking'    => __('Tracking'),
                 'triggers'    => __('Triggers'),
-            )
-        );
+            ]
+        ];
 
         if ($level == null) {
             return $tabList;
@@ -4098,7 +4098,7 @@ class Util
         $linkId = '',
         $disableAjax = false,
         $linkTarget = '',
-        array $classes = array()
+        array $classes = []
     ) {
         $retval = '<a href="' . $link . '"';
         if (! empty($linkId)) {
@@ -4159,9 +4159,9 @@ class Util
         $lastIndex    = '';
 
         $primary      = '';
-        $pk_array     = array(); // will be use to emphasis prim. keys in the table
-        $indexes_info = array();
-        $indexes_data = array();
+        $pk_array     = []; // will be use to emphasis prim. keys in the table
+        $indexes_info = [];
+        $indexes_data = [];
 
         // view
         foreach ($indexes as $row) {
@@ -4194,7 +4194,7 @@ class Util
 
         } // end while
 
-        return array($primary, $pk_array, $indexes_info, $indexes_data);
+        return [$primary, $pk_array, $indexes_info, $indexes_data];
     }
 
     /**
@@ -4221,12 +4221,12 @@ class Util
 
         return Template::get('start_and_number_of_rows_panel')
             ->render(
-                array(
+                [
                     'pos' => $pos,
                     'unlim_num_rows' => intval($_REQUEST['unlim_num_rows']),
                     'rows' => $rows,
                     'sql_query' => $sql_query,
-                )
+                ]
             );
     }
 
@@ -4308,10 +4308,10 @@ class Util
         /**
          * information about tables in db
          */
-        $tables = array();
+        $tables = [];
 
-        $tooltip_truename = array();
-        $tooltip_aliasname = array();
+        $tooltip_truename = [];
+        $tooltip_aliasname = [];
 
         // Special speedup for newer MySQL Versions (in 4.0 format changed)
         if (true === $cfg['SkipLockedTables']) {
@@ -4334,7 +4334,7 @@ class Util
             $sort_order = 'ASC';
 
             if (isset($_REQUEST['sort'])) {
-                $sortable_name_mappings = array(
+                $sortable_name_mappings = [
                     'table'       => 'Name',
                     'records'     => 'Rows',
                     'type'        => 'Engine',
@@ -4345,7 +4345,7 @@ class Util
                     'last_update' => 'Update_time',
                     'last_check'  => 'Check_time',
                     'comment'     => 'Comment',
-                );
+                ];
 
                 // Make sure the sort type is implemented
                 if (isset($sortable_name_mappings[$_REQUEST['sort']])) {
@@ -4360,7 +4360,7 @@ class Util
             $tbl_type = null;
             $limit_offset = 0;
             $limit_count = false;
-            $groupTable = array();
+            $groupTable = [];
 
             if (! empty($_REQUEST['tbl_group']) || ! empty($_REQUEST['tbl_type'])) {
                 if (! empty($_REQUEST['tbl_type'])) {
@@ -4422,7 +4422,7 @@ class Util
             $sub_part = '_structure';
         }
 
-        return array(
+        return [
             $tables,
             $num_tables,
             $total_num_tables,
@@ -4432,7 +4432,7 @@ class Util
             $tooltip_truename,
             $tooltip_aliasname,
             $pos
-        );
+        ];
     }
 
     /**
@@ -4447,7 +4447,7 @@ class Util
      */
     public static function getTablesWhenOpen($db, $db_info_result)
     {
-        $sot_cache = $tables = array();
+        $sot_cache = $tables = [];
 
         while ($tmp = $GLOBALS['dbi']->fetchAssoc($db_info_result)) {
             $sot_cache[$tmp['Table']] = true;
@@ -4472,7 +4472,7 @@ class Util
                     . " LIKE '" . $group . "')";
                 $whereAdded = true;
             }
-            if (Core::isValid($_REQUEST['tbl_type'], array('table', 'view'))) {
+            if (Core::isValid($_REQUEST['tbl_type'], ['table', 'view'])) {
                 $tblGroupSql .= $whereAdded ? " AND" : " WHERE";
                 if ($_REQUEST['tbl_type'] == 'view') {
                     $tblGroupSql .= " `Table_type` != 'BASE TABLE'";
@@ -4487,18 +4487,18 @@ class Util
             unset($tblGroupSql, $whereAdded);
 
             if ($db_info_result && $GLOBALS['dbi']->numRows($db_info_result) > 0) {
-                $names = array();
+                $names = [];
                 while ($tmp = $GLOBALS['dbi']->fetchRow($db_info_result)) {
                     if (! isset($sot_cache[$tmp[0]])) {
                         $names[] = $tmp[0];
                     } else { // table in use
-                        $tables[$tmp[0]] = array(
+                        $tables[$tmp[0]] = [
                             'TABLE_NAME' => $tmp[0],
                             'ENGINE' => '',
                             'TABLE_TYPE' => '',
                             'TABLE_ROWS' => 0,
                             'TABLE_COMMENT' => '',
-                        );
+                        ];
                     }
                 } // end while
                 if (count($names) > 0) {
@@ -4526,7 +4526,7 @@ class Util
      */
     public static function listPHPExtensions()
     {
-        $result = array();
+        $result = [];
         if (DatabaseInterface::checkDbExtension('mysqli')) {
             $result[] = 'mysqli';
         } else {
@@ -4570,7 +4570,7 @@ class Util
     {
         $result = '';
         if (class_exists('phpseclib\\Crypt\\Random')) {
-            $random_func = array('phpseclib\\Crypt\\Random', 'string');
+            $random_func = ['phpseclib\\Crypt\\Random', 'string'];
         } else {
             $random_func = 'openssl_random_pseudo_bytes';
         }
@@ -4661,7 +4661,7 @@ class Util
             }
         }
         $orderImg = '';
-        $orderLinkParams = array();
+        $orderLinkParams = [];
         $orderLinkParams['title'] = __('Sort');
         // If this column was requested to be sorted.
         if ($requestedSort == $sort) {
@@ -4671,12 +4671,12 @@ class Util
                 $orderImg = ' ' . self::getImage(
                     's_asc',
                     __('Ascending'),
-                    array('class' => 'sort_arrow', 'title' => '')
+                    ['class' => 'sort_arrow', 'title' => '']
                 );
                 $orderImg .= ' ' . self::getImage(
                     's_desc',
                      __('Descending'),
-                    array('class' => 'sort_arrow hide', 'title' => '')
+                    ['class' => 'sort_arrow hide', 'title' => '']
                 );
                 // but on mouse over, show the reverse order (DESC)
                 $orderLinkParams['onmouseover'] = "$('.sort_arrow').toggle();";
@@ -4688,12 +4688,12 @@ class Util
                 $orderImg = ' ' . self::getImage(
                     's_asc',
                     __('Ascending'),
-                    array('class' => 'sort_arrow hide', 'title' => '')
+                    ['class' => 'sort_arrow hide', 'title' => '']
                 );
                 $orderImg .= ' ' . self::getImage(
                     's_desc',
                     __('Descending'),
-                    array('class' => 'sort_arrow', 'title' => '')
+                    ['class' => 'sort_arrow', 'title' => '']
                 );
                 // but on mouse over, show the reverse order (ASC)
                 $orderLinkParams['onmouseover'] = "$('.sort_arrow').toggle();";
@@ -4701,14 +4701,14 @@ class Util
                 $orderLinkParams['onmouseout'] = "$('.sort_arrow').toggle();";
             }
         }
-        $urlParams = array(
+        $urlParams = [
             'db' => $_REQUEST['db'],
             'pos' => 0, // We set the position back to 0 every time they sort.
             'sort' => $sort,
             'sort_order' => $futureSortOrder,
-        );
+        ];
 
-        if (Core::isValid($_REQUEST['tbl_type'], array('view', 'table'))) {
+        if (Core::isValid($_REQUEST['tbl_type'], ['view', 'table'])) {
             $urlParams['tbl_type'] = $_REQUEST['tbl_type'];
         }
         if (! empty($_REQUEST['tbl_group'])) {
diff --git a/libraries/classes/Utils/HttpRequest.php b/libraries/classes/Utils/HttpRequest.php
index 1ae0bada4f..66c9d6a08f 100644
--- a/libraries/classes/Utils/HttpRequest.php
+++ b/libraries/classes/Utils/HttpRequest.php
@@ -43,10 +43,10 @@ class HttpRequest
     private function handleContext(array $context)
     {
         if (strlen($this->proxyUrl) > 0) {
-            $context['http'] = array(
+            $context['http'] = [
                 'proxy' => $this->proxyUrl,
                 'request_fulluri' => true
-            );
+            ];
             if (strlen($this->proxyUser) > 0) {
                 $auth = base64_encode(
                     $this->proxyUser . ':' . $this->proxyPass
@@ -125,7 +125,7 @@ class HttpRequest
             $curlStatus &= curl_setopt($curlHandle, CURLOPT_CUSTOMREQUEST, $method);
         }
         if ($header) {
-            $curlStatus &= curl_setopt($curlHandle, CURLOPT_HTTPHEADER, array($header));
+            $curlStatus &= curl_setopt($curlHandle, CURLOPT_HTTPHEADER, [$header]);
         }
 
         if ($method == "POST") {
@@ -203,15 +203,15 @@ class HttpRequest
         $content = null,
         $header = ''
     ) {
-        $context = array(
-            'http' => array(
+        $context = [
+            'http' => [
                 'method'  => $method,
                 'request_fulluri' => true,
                 'timeout' => 10,
                 'user_agent' => 'phpMyAdmin',
                 'header' => "Accept: */*",
-            )
-        );
+            ]
+        ];
         if ($header) {
             $context['http']['header'] .= "\n" . $header;
         }
diff --git a/libraries/classes/VersionInformation.php b/libraries/classes/VersionInformation.php
index 3d5dcdfb95..731d4363f5 100644
--- a/libraries/classes/VersionInformation.php
+++ b/libraries/classes/VersionInformation.php
@@ -58,10 +58,10 @@ class VersionInformation
         }
 
         if ($save) {
-            $_SESSION['cache']['version_check'] = array(
+            $_SESSION['cache']['version_check'] = [
                 'response' => $response,
                 'timestamp' => time()
-            );
+            ];
         }
         return $data;
     }
@@ -102,7 +102,7 @@ class VersionInformation
         }
 
         if (!empty($suffix)) {
-            $matches = array();
+            $matches = [];
             if (preg_match('/^(\D+)(\d+)$/', $suffix, $matches)) {
                 $suffix = $matches[1];
                 $result += intval($matches[2]);
@@ -162,10 +162,10 @@ class VersionInformation
                 }
             }
 
-            return array(
+            return [
                 'version' => $release->version,
                 'date' => $release->date,
-            );
+            ];
         }
 
         // no compatible version
@@ -183,7 +183,7 @@ class VersionInformation
     public function evaluateVersionCondition($type, $condition)
     {
         $operator = null;
-        $operators = array("<=", ">=", "!=", "<>", "<", ">", "="); // preserve order
+        $operators = ["<=", ">=", "!=", "<>", "<", ">", "="]; // preserve order
         foreach ($operators as $oneOperator) {
             if (strpos($condition, $oneOperator) === 0) {
                 $operator = $oneOperator;
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index bb56915782..b9bfa436ad 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -133,7 +133,7 @@ Session::setUp($GLOBALS['PMA_Config'], $GLOBALS['error_handler']);
  * holds parameters to be passed to next page
  * @global array $GLOBALS['url_params']
  */
-$GLOBALS['url_params'] = array();
+$GLOBALS['url_params'] = [];
 
 /**
  * holds page that should be displayed
@@ -198,7 +198,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
          * We don't allow any POST operation parameters if the token is mismatched
          * or is not provided
          */
-        $whitelist = array('ajax_request');
+        $whitelist = ['ajax_request'];
         PhpMyAdmin\Sanitize::removeRequestVars($whitelist);
     }
 }
@@ -386,7 +386,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
         if ($GLOBALS['dbi']->getVersion() < $cfg['MysqlMinVersion']['internal']) {
             Core::fatalError(
                 __('You should upgrade to %s %s or later.'),
-                array('MySQL', $cfg['MysqlMinVersion']['human'])
+                ['MySQL', $cfg['MysqlMinVersion']['human']]
             );
         }
 
diff --git a/libraries/config.default.php b/libraries/config.default.php
index a2acd4756d..deba084a51 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -122,7 +122,7 @@ $cfg['blowfish_secret'] = '';
  *
  * @global array $cfg['Servers']
  */
-$cfg['Servers'] = array();
+$cfg['Servers'] = [];
 
 $i = 1;
 
@@ -284,7 +284,7 @@ $cfg['Servers'][$i]['SignonSession'] = '';
  *
  * @global array $cfg['Servers'][$i]['SignonCookieParams']
  */
-$cfg['Servers'][$i]['SignonCookieParams'] = array();
+$cfg['Servers'][$i]['SignonCookieParams'] = [];
 
 /**
  * PHP script to use for 'signon' authentication method
@@ -552,7 +552,7 @@ $cfg['Servers'][$i]['AllowDeny']['order'] = '';
  *
  * @global array $cfg['Servers'][$i]['AllowDeny']['rules']
  */
-$cfg['Servers'][$i]['AllowDeny']['rules'] = array();
+$cfg['Servers'][$i]['AllowDeny']['rules'] = [];
 
 /**
  * Disable use of INFORMATION_SCHEMA.
@@ -1285,7 +1285,7 @@ $cfg['InsertRows'] = 2;
  *
  * @global array $cfg['ForeignKeyDropdownOrder']
  */
-$cfg['ForeignKeyDropdownOrder'] = array('content-id', 'id-content');
+$cfg['ForeignKeyDropdownOrder'] = ['content-id', 'id-content'];
 
 /**
  * A drop-down list will be used if fewer items are present
@@ -1406,7 +1406,7 @@ $cfg['RowActionType'] = 'both';
 /*******************************************************************************
  * Export defaults
  */
-$cfg['Export'] = array();
+$cfg['Export'] = [];
 
 /**
  * codegen/csv/excel/htmlexcel/htmlword/latex/ods/odt/pdf/sql/texytext/xml/yaml
@@ -2156,7 +2156,7 @@ $cfg['Export']['yaml_structure_or_data'] = 'data';
 /*******************************************************************************
  * Import defaults
  */
-$cfg['Import'] = array();
+$cfg['Import'] = [];
 
 /**
  *
@@ -2350,7 +2350,7 @@ $cfg['Import']['ods_recognize_currency'] = true;
 /*******************************************************************************
  * Schema export defaults
 */
-$cfg['Schema'] = array();
+$cfg['Schema'] = [];
 
 /**
  * pdf/eps/dia/svg
@@ -2501,7 +2501,7 @@ $cfg['Schema']['svg_all_tables_same_width'] = false;
  *
  * @global array $cfg['PDFPageSizes']
  */
-$cfg['PDFPageSizes'] = array('A3', 'A4', 'A5', 'letter', 'legal');
+$cfg['PDFPageSizes'] = ['A3', 'A4', 'A5', 'letter', 'legal'];
 
 /**
  *
@@ -2575,7 +2575,7 @@ $cfg['IconvExtraParams'] = '//TRANSLIT';
  *
  * @global array $cfg['AvailableCharsets']
  */
-$cfg['AvailableCharsets'] = array(
+$cfg['AvailableCharsets'] = [
     'iso-8859-1',
     'iso-8859-2',
     'iso-8859-3',
@@ -2609,7 +2609,7 @@ $cfg['AvailableCharsets'] = array(
     'SHIFT_JIS',
     'SJIS',
     'SJIS-win',
-);
+];
 
 
 /*******************************************************************************
@@ -2803,7 +2803,7 @@ $cfg['InitialSlidersState'] = 'closed';
  *
  * @global array $cfg['UserprefsDisallow']
  */
-$cfg['UserprefsDisallow'] = array();
+$cfg['UserprefsDisallow'] = [];
 
 /**
  * User preferences: enable the Developer tab
@@ -2894,7 +2894,7 @@ $cfg['DefaultQueryDatabase'] = '';
  *
  * @global array $cfg['SQLQuery']
  */
-$cfg['SQLQuery'] = array();
+$cfg['SQLQuery'] = [];
 
 /**
  * Display an "Edit" link on the results page to change a query
@@ -2983,7 +2983,7 @@ $cfg['GD2Available'] = 'auto';
  *
  * @global array $cfg['TrustedProxies']
  */
-$cfg['TrustedProxies'] = array();
+$cfg['TrustedProxies'] = [];
 
 /**
  * We normally check the permissions on the configuration file to ensure
@@ -3046,7 +3046,7 @@ $cfg['ZeroConf'] = true;
  *
  * @global array $cfg['DBG']
  */
-$cfg['DBG'] = array();
+$cfg['DBG'] = [];
 
 /**
  * Output executed queries and their execution times
@@ -3086,14 +3086,14 @@ $cfg['DBG']['simple2fa'] = false;
  *
  * @global array $cfg['DefaultFunctions']
  */
-$cfg['DefaultFunctions'] = array(
+$cfg['DefaultFunctions'] = [
     'FUNC_CHAR' => '',
     'FUNC_DATE' => '',
     'FUNC_NUMBER' => '',
     'FUNC_SPATIAL' => 'GeomFromText',
     'FUNC_UUID' => 'UUID',
     'first_timestamp' => 'NOW',
-);
+];
 
 /**
  * Max rows retrieved for zoom search
@@ -3112,10 +3112,10 @@ $cfg['ShowGitRevision'] = true;
  *
  * @global array $cfg['MysqlMinVersion']
  */
-$cfg['MysqlMinVersion'] = array(
+$cfg['MysqlMinVersion'] = [
     'internal' => 50500,
     'human' => '5.5.0'
-);
+];
 
 /**
  * Disable shortcuts
@@ -3152,56 +3152,56 @@ $cfg['Console'] = [
  *
  * @global array $cfg['DefaultTransformations']
  */
-$cfg['DefaultTransformations'] = array();
+$cfg['DefaultTransformations'] = [];
 
 /**
  * Default transformations for Substring
  *
  * @global array $cfg['DefaultTransformations']['Substring']
  */
-$cfg['DefaultTransformations']['Substring'] = array(0, 'all', '…');
+$cfg['DefaultTransformations']['Substring'] = [0, 'all', '…'];
 
 /**
  * Default transformations for Bool2Text
  *
  * @global array $cfg['DefaultTransformations']['Bool2Text']
  */
-$cfg['DefaultTransformations']['Bool2Text'] = array('T', 'F');
+$cfg['DefaultTransformations']['Bool2Text'] = ['T', 'F'];
 
 /**
  * Default transformations for External
  *
  * @global array $cfg['DefaultTransformations']['External']
  */
-$cfg['DefaultTransformations']['External'] = array(0, '-f /dev/null -i -wrap -q', 1, 1);
+$cfg['DefaultTransformations']['External'] = [0, '-f /dev/null -i -wrap -q', 1, 1];
 
 /**
  * Default transformations for PreApPend
  *
  * @global array $cfg['DefaultTransformations']['PreApPend']
  */
-$cfg['DefaultTransformations']['PreApPend'] = array('', '');
+$cfg['DefaultTransformations']['PreApPend'] = ['', ''];
 
 /**
  * Default transformations for Hex
  *
  * @global array $cfg['DefaultTransformations']['Hex']
  */
-$cfg['DefaultTransformations']['Hex'] = array('2');
+$cfg['DefaultTransformations']['Hex'] = ['2'];
 
 /**
  * Default transformations for DateFormat
  *
  * @global array $cfg['DefaultTransformations']['DateFormat']
  */
-$cfg['DefaultTransformations']['DateFormat'] = array(0, '', 'local');
+$cfg['DefaultTransformations']['DateFormat'] = [0, '', 'local'];
 
 /**
  * Default transformations for Inline
  *
  * @global array $cfg['DefaultTransformations']['Inline']
  */
-$cfg['DefaultTransformations']['Inline'] = array('100', 100);
+$cfg['DefaultTransformations']['Inline'] = ['100', 100];
 $cfg['DefaultTransformations']['Inline']['wrapper_link'] = null;
 
 /**
@@ -3209,11 +3209,11 @@ $cfg['DefaultTransformations']['Inline']['wrapper_link'] = null;
  *
  * @global array $cfg['DefaultTransformations']['TextImageLink']
  */
-$cfg['DefaultTransformations']['TextImageLink'] = array(null, 100, 50);
+$cfg['DefaultTransformations']['TextImageLink'] = [null, 100, 50];
 
 /**
  * Default transformations for TextLink
  *
  * @global array $cfg['DefaultTransformations']['TextLink']
  */
-$cfg['DefaultTransformations']['TextLink'] = array(null, null, null);
+$cfg['DefaultTransformations']['TextLink'] = [null, null, null];
diff --git a/libraries/config.values.php b/libraries/config.values.php
index 5e0bad93a8..39b99cd050 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -19,191 +19,191 @@ if (!defined('PHPMYADMIN')) {
  *
  * Use normal array, paths won't be expanded
  */
-$cfg_db = array();
+$cfg_db = [];
 
-$cfg_db['Servers'] = array(
-    1 => array(
+$cfg_db['Servers'] = [
+    1 => [
         'port'         => 'integer',
-        'auth_type'    => array('config', 'http', 'signon', 'cookie'),
-        'AllowDeny'    => array(
-            'order' => array('', 'deny,allow', 'allow,deny', 'explicit')
-        ),
+        'auth_type'    => ['config', 'http', 'signon', 'cookie'],
+        'AllowDeny'    => [
+            'order' => ['', 'deny,allow', 'allow,deny', 'explicit']
+        ],
         'only_db'      => 'array'
-    )
-);
-$cfg_db['RecodingEngine'] = array('auto', 'iconv', 'recode', 'mb', 'none');
-$cfg_db['OBGzip'] = array('auto', true, false);
+    ]
+];
+$cfg_db['RecodingEngine'] = ['auto', 'iconv', 'recode', 'mb', 'none'];
+$cfg_db['OBGzip'] = ['auto', true, false];
 $cfg_db['MemoryLimit'] = 'short_string';
-$cfg_db['NavigationLogoLinkWindow'] = array('main', 'new');
-$cfg_db['NavigationTreeDefaultTabTable'] = array(
+$cfg_db['NavigationLogoLinkWindow'] = ['main', 'new'];
+$cfg_db['NavigationTreeDefaultTabTable'] = [
     'structure' => __('Structure'), // fields list
     'sql' => __('SQL'),             // SQL form
     'search' => __('Search'),       // search page
     'insert' => __('Insert'),       // insert row page
     'browse' => __('Browse')        // browse page
-);
-$cfg_db['NavigationTreeDefaultTabTable2'] = array(
+];
+$cfg_db['NavigationTreeDefaultTabTable2'] = [
     '' => '', //don't display
     'structure' => __('Structure'), // fields list
     'sql' => __('SQL'),             // SQL form
     'search' => __('Search'),       // search page
     'insert' => __('Insert'),       // insert row page
     'browse' => __('Browse')        // browse page
-);
+];
 $cfg_db['NavigationTreeDbSeparator'] = 'short_string';
 $cfg_db['NavigationTreeTableSeparator'] = 'short_string';
 $cfg_db['NavigationWidth'] = 'integer';
-$cfg_db['TableNavigationLinksMode'] = array(
+$cfg_db['TableNavigationLinksMode'] = [
     'icons' => __('Icons'),
     'text'  => __('Text'),
     'both'  => __('Both')
-);
-$cfg_db['MaxRows'] = array(25, 50, 100, 250, 500);
-$cfg_db['Order'] = array('ASC', 'DESC', 'SMART');
-$cfg_db['RowActionLinks'] = array(
+];
+$cfg_db['MaxRows'] = [25, 50, 100, 250, 500];
+$cfg_db['Order'] = ['ASC', 'DESC', 'SMART'];
+$cfg_db['RowActionLinks'] = [
     'none'  => __('Nowhere'),
     'left'  => __('Left'),
     'right' => __('Right'),
     'both'  => __('Both')
-);
-$cfg_db['TablePrimaryKeyOrder'] = array(
+];
+$cfg_db['TablePrimaryKeyOrder'] = [
     'NONE'  => __('None'),
     'ASC'   => __('Ascending'),
     'DESC'  => __('Descending')
-);
-$cfg_db['ProtectBinary'] = array(false, 'blob', 'noblob', 'all');
-$cfg_db['CharEditing'] = array('input', 'textarea');
-$cfg_db['TabsMode'] = array(
+];
+$cfg_db['ProtectBinary'] = [false, 'blob', 'noblob', 'all'];
+$cfg_db['CharEditing'] = ['input', 'textarea'];
+$cfg_db['TabsMode'] = [
     'icons' => __('Icons'),
     'text'  => __('Text'),
     'both'  => __('Both')
-);
-$cfg_db['PDFDefaultPageSize'] = array(
+];
+$cfg_db['PDFDefaultPageSize'] = [
     'A3'     => 'A3',
     'A4'     => 'A4',
     'A5'     => 'A5',
     'letter' => 'letter',
     'legal'  => 'legal'
-);
-$cfg_db['ActionLinksMode'] = array(
+];
+$cfg_db['ActionLinksMode'] = [
     'icons' => __('Icons'),
     'text'  => __('Text'),
     'both'  => __('Both')
-);
-$cfg_db['GridEditing'] = array(
+];
+$cfg_db['GridEditing'] = [
     'click' => __('Click'),
     'double-click' => __('Double click'),
     'disabled' => __('Disabled'),
-);
-$cfg_db['RelationalDisplay'] = array(
+];
+$cfg_db['RelationalDisplay'] = [
     'K' => __('key'),
     'D' => __('display column')
-);
-$cfg_db['DefaultTabServer'] = array(
+];
+$cfg_db['DefaultTabServer'] = [
     // the welcome page (recommended for multiuser setups)
     'welcome' => __('Welcome'),
     'databases' => __('Databases'),    // list of databases
     'status' => __('Status'),          // runtime information
     'variables' => __('Variables'),    // MySQL server variables
     'privileges' => __('Privileges')   // user management
-);
-$cfg_db['DefaultTabDatabase'] = array(
+];
+$cfg_db['DefaultTabDatabase'] = [
     'structure' => __('Structure'),   // tables list
     'sql' => __('SQL'),               // SQL form
     'search' => __('Search'),         // search query
     'operations' => __('Operations')  // operations on database
-);
-$cfg_db['DefaultTabTable'] = array(
+];
+$cfg_db['DefaultTabTable'] = [
     'structure' => __('Structure'),  // fields list
     'sql' => __('SQL'),              // SQL form
     'search' => __('Search'),        // search page
     'insert' => __('Insert'),        // insert row page
     'browse' => __('Browse')         // browse page
-);
-$cfg_db['InitialSlidersState'] = array(
+];
+$cfg_db['InitialSlidersState'] = [
     'open'     => __('Open'),
     'closed'   => __('Closed'),
     'disabled' => __('Disabled')
-);
-$cfg_db['SendErrorReports'] = array(
+];
+$cfg_db['SendErrorReports'] = [
     'ask'     => __('Ask before sending error reports'),
     'always'   => __('Always send error reports'),
     'never' => __('Never send error reports')
-);
-$cfg_db['DefaultForeignKeyChecks'] = array(
+];
+$cfg_db['DefaultForeignKeyChecks'] = [
     'default'   => __('Server default'),
     'enable'    => __('Enable'),
     'disable'   => __('Disable')
-);
-$cfg_db['Import']['format'] = array(
+];
+$cfg_db['Import']['format'] = [
     'csv',    // CSV
     'docsql', // DocSQL
     'ldi',    // CSV using LOAD DATA
     'sql'     // SQL
-);
+];
 $cfg_db['Import']['charset'] = array_merge(
-    array(''),
+    [''],
     $GLOBALS['cfg']['AvailableCharsets']
 );
 $cfg_db['Import']['sql_compatibility']
-    = $cfg_db['Export']['sql_compatibility'] = array(
+    = $cfg_db['Export']['sql_compatibility'] = [
         'NONE', 'ANSI', 'DB2', 'MAXDB', 'MYSQL323',
         'MYSQL40', 'MSSQL', 'ORACLE',
         // removed; in MySQL 5.0.33, this produces exports that
         // can't be read by POSTGRESQL (see our bug #1596328)
         //'POSTGRESQL',
         'TRADITIONAL'
-    );
+    ];
 $cfg_db['Import']['csv_terminated'] = 'short_string';
 $cfg_db['Import']['csv_enclosed'] = 'short_string';
 $cfg_db['Import']['csv_escaped'] = 'short_string';
 $cfg_db['Import']['ldi_terminated'] = 'short_string';
 $cfg_db['Import']['ldi_enclosed'] = 'short_string';
 $cfg_db['Import']['ldi_escaped'] = 'short_string';
-$cfg_db['Import']['ldi_local_option'] = array('auto', true, false);
-$cfg_db['Export']['_sod_select'] = array(
+$cfg_db['Import']['ldi_local_option'] = ['auto', true, false];
+$cfg_db['Export']['_sod_select'] = [
     'structure'          => __('structure'),
     'data'               => __('data'),
     'structure_and_data' => __('structure and data')
-);
-$cfg_db['Export']['method'] = array(
+];
+$cfg_db['Export']['method'] = [
     'quick'          => __('Quick - display only the minimal options to configure'),
     'custom'         => __('Custom - display all possible options to configure'),
     'custom-no-form' => __(
         'Custom - like above, but without the quick/custom choice'
     ),
-);
-$cfg_db['Export']['format'] = array(
+];
+$cfg_db['Export']['format'] = [
     'codegen', 'csv', 'excel', 'htmlexcel','htmlword', 'latex', 'ods',
     'odt', 'pdf', 'sql', 'texytext', 'xml', 'yaml'
-);
-$cfg_db['Export']['compression'] = array('none', 'zip', 'gzip');
+];
+$cfg_db['Export']['compression'] = ['none', 'zip', 'gzip'];
 $cfg_db['Export']['charset'] = array_merge(
-    array(''),
+    [''],
     $GLOBALS['cfg']['AvailableCharsets']
 );
-$cfg_db['Export']['codegen_format'] = array(
+$cfg_db['Export']['codegen_format'] = [
     '#', 'NHibernate C# DO', 'NHibernate XML'
-);
+];
 $cfg_db['Export']['csv_separator'] = 'short_string';
 $cfg_db['Export']['csv_terminated'] = 'short_string';
 $cfg_db['Export']['csv_enclosed'] = 'short_string';
 $cfg_db['Export']['csv_escaped'] = 'short_string';
 $cfg_db['Export']['csv_null'] = 'short_string';
 $cfg_db['Export']['excel_null'] = 'short_string';
-$cfg_db['Export']['excel_edition'] = array(
+$cfg_db['Export']['excel_edition'] = [
     'win'           => 'Windows',
     'mac_excel2003' => 'Excel 2003 / Macintosh',
     'mac_excel2008' => 'Excel 2008 / Macintosh'
-);
+];
 $cfg_db['Export']['sql_structure_or_data'] = $cfg_db['Export']['_sod_select'];
-$cfg_db['Export']['sql_type'] = array('INSERT', 'UPDATE', 'REPLACE');
-$cfg_db['Export']['sql_insert_syntax'] = array(
+$cfg_db['Export']['sql_type'] = ['INSERT', 'UPDATE', 'REPLACE'];
+$cfg_db['Export']['sql_insert_syntax'] = [
     'complete' => __('complete inserts'),
     'extended' => __('extended inserts'),
     'both'     => __('both of the above'),
     'none'     => __('neither of the above')
-);
+];
 $cfg_db['Export']['htmlword_structure_or_data'] = $cfg_db['Export']['_sod_select'];
 $cfg_db['Export']['htmlword_null'] = 'short_string';
 $cfg_db['Export']['ods_null'] = 'short_string';
@@ -212,9 +212,9 @@ $cfg_db['Export']['odt_structure_or_data'] = $cfg_db['Export']['_sod_select'];
 $cfg_db['Export']['texytext_structure_or_data'] = $cfg_db['Export']['_sod_select'];
 $cfg_db['Export']['texytext_null'] = 'short_string';
 
-$cfg_db['Console']['Mode'] = array(
+$cfg_db['Console']['Mode'] = [
     'info', 'show', 'collapse'
-);
+];
 $cfg_db['Console']['Height'] = 'integer';
 $cfg_db['Console']['OrderBy'] = ['exec', 'time', 'count'];
 $cfg_db['Console']['Order'] = ['asc', 'desc'];
@@ -223,26 +223,26 @@ $cfg_db['Console']['Order'] = ['asc', 'desc'];
  * Default values overrides
  * Use only full paths
  */
-$cfg_db['_overrides'] = array();
+$cfg_db['_overrides'] = [];
 
 /**
  * Basic validator assignments (functions from libraries/config/Validator.php
  * and 'validators' object in js/config.js)
  * Use only full paths and form ids
  */
-$cfg_db['_validators'] = array(
+$cfg_db['_validators'] = [
     'CharTextareaCols' => 'validatePositiveNumber',
     'CharTextareaRows' => 'validatePositiveNumber',
     'ExecTimeLimit' => 'validateNonNegativeNumber',
     'Export/sql_max_query_size' => 'validatePositiveNumber',
     'FirstLevelNavigationItems' => 'validatePositiveNumber',
     'ForeignKeyMaxLimit' => 'validatePositiveNumber',
-    'Import/csv_enclosed' => array(array('validateByRegex', '/^.?$/')),
-    'Import/csv_escaped' => array(array('validateByRegex', '/^.$/')),
-    'Import/csv_terminated' => array(array('validateByRegex', '/^.$/')),
-    'Import/ldi_enclosed' => array(array('validateByRegex', '/^.?$/')),
-    'Import/ldi_escaped' => array(array('validateByRegex', '/^.$/')),
-    'Import/ldi_terminated' => array(array('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',
@@ -255,7 +255,7 @@ $cfg_db['_validators'] = array(
     'MaxCharactersInDisplayedSQL' => 'validatePositiveNumber',
     'MaxRows' => 'validatePositiveNumber',
     'MaxTableList' => 'validatePositiveNumber',
-    'MemoryLimit' => array(array('validateByRegex', '/^(-1|(\d+(?:[kmg])?))$/i')),
+    'MemoryLimit' => [['validateByRegex', '/^(-1|(\d+(?:[kmg])?))$/i']],
     'NavigationTreeTableLevel' => 'validatePositiveNumber',
     'NavigationWidth' => 'validateNonNegativeNumber',
     'QueryHistoryMax' => 'validatePositiveNumber',
@@ -266,19 +266,19 @@ $cfg_db['_validators'] = array(
     'Servers/1/hide_db' => 'validateRegex',
     'TextareaCols' => 'validatePositiveNumber',
     'TextareaRows' => 'validatePositiveNumber',
-    'TrustedProxies' => 'validateTrustedProxies');
+    'TrustedProxies' => 'validateTrustedProxies'];
 
 /**
  * Additional validators used for user preferences
  */
-$cfg_db['_userValidators'] = array(
-    'MaxDbList'       => array(
-        array('validateUpperBound', 'value:MaxDbList')
-    ),
-    'MaxTableList'    => array(
-        array('validateUpperBound', 'value:MaxTableList')
-    ),
-    'QueryHistoryMax' => array(
-        array('validateUpperBound', 'value:QueryHistoryMax')
-    )
-);
+$cfg_db['_userValidators'] = [
+    'MaxDbList'       => [
+        ['validateUpperBound', 'value:MaxDbList']
+    ],
+    'MaxTableList'    => [
+        ['validateUpperBound', 'value:MaxTableList']
+    ],
+    'QueryHistoryMax' => [
+        ['validateUpperBound', 'value:QueryHistoryMax']
+    ]
+];
diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php
index 771949d031..3c61033902 100644
--- a/libraries/db_common.inc.php
+++ b/libraries/db_common.inc.php
@@ -18,7 +18,7 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-PhpMyAdmin\Util::checkParameters(array('db'));
+PhpMyAdmin\Util::checkParameters(['db']);
 
 global $cfg;
 global $db;
@@ -39,7 +39,7 @@ $err_url_0 = 'index.php' . Url::getCommon();
 $err_url = PhpMyAdmin\Util::getScriptNameForOption(
     $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
 )
-    . Url::getCommon(array('db' => $db));
+    . Url::getCommon(['db' => $db]);
 
 /**
  * Ensures the database exists (else move to the "parent" script) and displays
@@ -59,7 +59,7 @@ if (! isset($is_db) || ! $is_db) {
         $is_db = false;
     }
     // Not a valid db name -> back to the welcome page
-    $params = array('reload' => '1');
+    $params = ['reload' => '1'];
     if (isset($message)) {
         $params['message'] = $message;
     }
@@ -140,4 +140,4 @@ if (isset($_REQUEST['submitcollation'])
 /**
  * Set parameters for links
  */
-$url_query = Url::getCommon(array('db' => $db));
+$url_query = Url::getCommon(['db' => $db]);
diff --git a/libraries/db_table_exists.inc.php b/libraries/db_table_exists.inc.php
index 6297e57abe..9c0647be07 100644
--- a/libraries/db_table_exists.inc.php
+++ b/libraries/db_table_exists.inc.php
@@ -35,7 +35,7 @@ if (empty($is_db)) {
                     Message::error(__('No databases selected.'))
                 );
             } else {
-                $url_params = array('reload' => 1);
+                $url_params = ['reload' => 1];
                 if (isset($message)) {
                     $url_params['message'] = $message;
                 }
@@ -62,7 +62,7 @@ if (empty($is_table)
     // Not a valid table name -> back to the db_sql.php
 
     if (strlen($table) > 0) {
-        $is_table = $GLOBALS['dbi']->getCachedTableContent(array($db, $table), false);
+        $is_table = $GLOBALS['dbi']->getCachedTableContent([$db, $table], false);
 
         if (! $is_table) {
             $_result = $GLOBALS['dbi']->tryQuery(
diff --git a/libraries/information_schema_relations.inc.php b/libraries/information_schema_relations.inc.php
index 65122edc6b..cd998f1be2 100644
--- a/libraries/information_schema_relations.inc.php
+++ b/libraries/information_schema_relations.inc.php
@@ -14,315 +14,315 @@ if (! defined('PHPMYADMIN')) {
 /**
  *
  */
-$GLOBALS['information_schema_relations'] = array(
-    'CHARACTER_SETS' => array(
-        'DEFAULT_COLLATE_NAME' => array(
+$GLOBALS['information_schema_relations'] = [
+    'CHARACTER_SETS' => [
+        'DEFAULT_COLLATE_NAME' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'COLLATIONS',
             'foreign_field' => 'COLLATION_NAME'
-        )
-    ),
-    'COLLATIONS' => array(
-        'CHARACTER_SET_NAME' => array(
+        ]
+    ],
+    'COLLATIONS' => [
+        'CHARACTER_SET_NAME' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'CHARACTER_SETS',
             'foreign_field' => 'CHARACTER_SET_NAME'
-        )
-    ),
-    'COLLATION_CHARACTER_SET_APPLICABILITY' => array(
-        'CHARACTER_SET_NAME' => array(
+        ]
+    ],
+    'COLLATION_CHARACTER_SET_APPLICABILITY' => [
+        'CHARACTER_SET_NAME' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'CHARACTER_SETS',
             'foreign_field' => 'CHARACTER_SET_NAME'
-        ),
-        'COLLATION_NAME' => array(
+        ],
+        'COLLATION_NAME' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'COLLATIONS',
             'foreign_field' => 'COLLATION_NAME'
-        )
-    ),
-    'COLUMNS' => array(
-        'TABLE_SCHEMA' => array(
+        ]
+    ],
+    'COLUMNS' => [
+        'TABLE_SCHEMA' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'CHARACTER_SET_NAME' => array(
+        ],
+        'CHARACTER_SET_NAME' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'CHARACTER_SETS',
             'foreign_field' => 'CHARACTER_SET_NAME'
-        ),
-        'COLLATION_NAME' => array(
+        ],
+        'COLLATION_NAME' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'COLLATIONS',
             'foreign_field' => 'COLLATION_NAME'
-        )
-    ),
-    'COLUMN_PRIVILEGES' => array(
-        'TABLE_SCHEMA' => array(
+        ]
+    ],
+    'COLUMN_PRIVILEGES' => [
+        'TABLE_SCHEMA' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        )
-    ),
-    'EVENTS' => array(
-        'EVENT_SCHEMA' => array(
+        ]
+    ],
+    'EVENTS' => [
+        'EVENT_SCHEMA' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'CHARACTER_SET_CLIENT' => array(
+        ],
+        'CHARACTER_SET_CLIENT' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'CHARACTER_SETS',
             'foreign_field' => 'CHARACTER_SET_NAME'
-        ),
-        'COLLATION_CONNECTION' => array(
+        ],
+        'COLLATION_CONNECTION' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'COLLATIONS',
             'foreign_field' => 'COLLATION_NAME'
-        ),
-        'DATABASE_COLLATION' => array(
+        ],
+        'DATABASE_COLLATION' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'COLLATIONS',
             'foreign_field' => 'COLLATION_NAME'
-        )
-    ),
-    'FILES' => array(
-        'TABLESPACE_NAME' => array(
+        ]
+    ],
+    'FILES' => [
+        'TABLESPACE_NAME' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'TABLESPACES',
             'foreign_field' => 'TABLESPACE_NAME'
-        ),
-        'TABLE_SCHEMA' => array(
+        ],
+        'TABLE_SCHEMA' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'COLLATION_CONNECTION' => array(
+        ],
+        'COLLATION_CONNECTION' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'COLLATIONS',
             'foreign_field' => 'COLLATION_NAME'
-        ),
-        'ENGINE' => array(
+        ],
+        'ENGINE' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'ENGINES',
             'foreign_field' => 'ENGINE'
-        )
-    ),
-    'KEY_COLUMN_USAGE' => array(
-        'CONSTRAINT_SCHEMA' => array(
+        ]
+    ],
+    'KEY_COLUMN_USAGE' => [
+        'CONSTRAINT_SCHEMA' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'TABLE_SCHEMA' => array(
+        ],
+        'TABLE_SCHEMA' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'REFERENCED_TABLE_SCHEMA' => array(
+        ],
+        'REFERENCED_TABLE_SCHEMA' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        )
-    ),
-    'PARAMETERS' => array(
-        'SPECIFIC_SCHEMA' => array(
+        ]
+    ],
+    'PARAMETERS' => [
+        'SPECIFIC_SCHEMA' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'CHARACTER_SET_NAME' => array(
+        ],
+        'CHARACTER_SET_NAME' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'CHARACTER_SETS',
             'foreign_field' => 'CHARACTER_SET_NAME'
-        ),
-        'COLLATION_NAME' => array(
+        ],
+        'COLLATION_NAME' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'COLLATIONS',
             'foreign_field' => 'COLLATION_NAME'
-        )
-    ),
-    'PARTITIONS' => array(
-        'TABLE_SCHEMA' => array(
+        ]
+    ],
+    'PARTITIONS' => [
+        'TABLE_SCHEMA' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'TABLESPACE_NAME' => array(
+        ],
+        'TABLESPACE_NAME' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'TABLESPACES',
             'foreign_field' => 'TABLESPACE_NAME'
-        )
-    ),
-    'PROCESSLIST' => array(
-        'DB' => array(
+        ]
+    ],
+    'PROCESSLIST' => [
+        'DB' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        )
-    ),
-    'REFERENTIAL_CONSTRAINTS' => array(
-        'CONSTRAINT_SCHEMA' => array(
+        ]
+    ],
+    'REFERENTIAL_CONSTRAINTS' => [
+        'CONSTRAINT_SCHEMA' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'UNIQUE_CONSTRAINT_SCHEMA' => array(
+        ],
+        'UNIQUE_CONSTRAINT_SCHEMA' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        )
-    ),
-    'ROUTINES' => array(
-        'ROUTINE_SCHEMA' => array(
+        ]
+    ],
+    'ROUTINES' => [
+        'ROUTINE_SCHEMA' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'CHARACTER_SET_NAME' => array(
+        ],
+        'CHARACTER_SET_NAME' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'CHARACTER_SETS',
             'foreign_field' => 'CHARACTER_SET_NAME'
-        ),
-        'COLLATION_NAME' => array(
+        ],
+        'COLLATION_NAME' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'COLLATIONS',
             'foreign_field' => 'COLLATION_NAME'
-        ),
-        'CHARACTER_SET_CLIENT' => array(
+        ],
+        'CHARACTER_SET_CLIENT' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'CHARACTER_SETS',
             'foreign_field' => 'CHARACTER_SET_NAME'
-        ),
-        'COLLATION_CONNECTION' => array(
+        ],
+        'COLLATION_CONNECTION' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'COLLATIONS',
             'foreign_field' => 'COLLATION_NAME'
-        ),
-        'DATABASE_COLLATION' => array(
+        ],
+        'DATABASE_COLLATION' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'COLLATIONS',
             'foreign_field' => 'COLLATION_NAME'
-        )
-    ),
-    'SCHEMATA' => array(
-        'DEFAULT_CHARACTER_SET_NAME' => array(
+        ]
+    ],
+    'SCHEMATA' => [
+        'DEFAULT_CHARACTER_SET_NAME' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'CHARACTER_SETS',
             'foreign_field' => 'CHARACTER_SET_NAME'
-        ),
-        'DEFAULT_COLLATION_NAME' => array(
+        ],
+        'DEFAULT_COLLATION_NAME' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'COLLATIONS',
             'foreign_field' => 'COLLATION_NAME'
-        )
-    ),
-    'SCHEMA_PRIVILEGES' => array(
-        'TABLE_SCHEMA' => array(
+        ]
+    ],
+    'SCHEMA_PRIVILEGES' => [
+        'TABLE_SCHEMA' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        )
-    ),
-    'STATISTICS' => array(
-        'TABLE_SCHEMA' => array(
+        ]
+    ],
+    'STATISTICS' => [
+        'TABLE_SCHEMA' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'INDEX_SCHEMA' => array(
+        ],
+        'INDEX_SCHEMA' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        )
-    ),
-    'TABLES' => array(
-        'TABLE_SCHEMA' => array(
+        ]
+    ],
+    'TABLES' => [
+        'TABLE_SCHEMA' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'TABLE_COLLATION' => array(
+        ],
+        'TABLE_COLLATION' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'COLLATIONS',
             'foreign_field' => 'COLLATION_NAME'
-        ),
-        'ENGINE' => array(
+        ],
+        'ENGINE' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'ENGINES',
             'foreign_field' => 'ENGINE'
-        ),
-    ),
-    'TABLESAPCES' => array(
-        'ENGINE' => array(
+        ],
+    ],
+    'TABLESAPCES' => [
+        'ENGINE' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'ENGINES',
             'foreign_field' => 'ENGINE'
-        )
-    ),
-    'TABLE_CONSTRAINTS' => array(
-        'CONSTRAINT_SCHEMA' => array(
+        ]
+    ],
+    'TABLE_CONSTRAINTS' => [
+        'CONSTRAINT_SCHEMA' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'TABLE_SCHEMA' => array(
+        ],
+        'TABLE_SCHEMA' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        )
-    ),
-    'TABLE_PRIVILEGES' => array(
-        'TABLE_SCHEMA' => array(
+        ]
+    ],
+    'TABLE_PRIVILEGES' => [
+        'TABLE_SCHEMA' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        )
-    ),
-    'TRIGGERS' => array(
-        'TRIGGER_SCHEMA' => array(
+        ]
+    ],
+    'TRIGGERS' => [
+        'TRIGGER_SCHEMA' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'EVENT_OBJECT_SCHEMA' => array(
+        ],
+        'EVENT_OBJECT_SCHEMA' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'CHARACTER_SET_CLIENT' => array(
+        ],
+        'CHARACTER_SET_CLIENT' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'CHARACTER_SETS',
             'foreign_field' => 'CHARACTER_SET_NAME'
-        ),
-        'COLLATION_CONNECTION' => array(
+        ],
+        'COLLATION_CONNECTION' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'COLLATIONS',
             'foreign_field' => 'COLLATION_NAME'
-        ),
-        'DATABASE_COLLATION' => array(
+        ],
+        'DATABASE_COLLATION' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'COLLATIONS',
             'foreign_field' => 'COLLATION_NAME'
-        )
-    ),
-    'VIEWS' => array(
-        'TABLE_SCHEMA' => array(
+        ]
+    ],
+    'VIEWS' => [
+        'TABLE_SCHEMA' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'CHARACTER_SET_CLIENT' => array(
+        ],
+        'CHARACTER_SET_CLIENT' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'CHARACTER_SETS',
             'foreign_field' => 'CHARACTER_SET_NAME'
-        ),
-        'COLLATION_CONNECTION' => array(
+        ],
+        'COLLATION_CONNECTION' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'COLLATIONS',
             'foreign_field' => 'COLLATION_NAME'
-        )
-    )
-);
+        ]
+    ]
+];
 
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index 1ffcc201d7..9cddc41578 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -19,7 +19,7 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-$request_params = array(
+$request_params = [
     'clause_is_unique',
     'from_prefix',
     'goto',
@@ -35,7 +35,7 @@ $request_params = array(
     'table_type',
     'to_prefix',
     'url_query'
-);
+];
 
 foreach ($request_params as $one_request_param) {
     if (isset($_REQUEST[$one_request_param])) {
@@ -115,11 +115,11 @@ if (! empty($submit_mult)
                 'database/structure/show_create'
             )
                 ->render(
-                    array(
+                    [
                         'db'         => $GLOBALS['db'],
                         'db_objects' => $selected,
                         'dbi'        => $GLOBALS['dbi'],
-                    )
+                    ]
                 );
             // Send response to client.
             $response->addJSON('message', $show_create);
diff --git a/libraries/mysql_relations.inc.php b/libraries/mysql_relations.inc.php
index 8a8b6a870a..908f387f87 100644
--- a/libraries/mysql_relations.inc.php
+++ b/libraries/mysql_relations.inc.php
@@ -14,157 +14,157 @@ if (! defined('PHPMYADMIN')) {
 /**
  * Internal relations for mysql database.
  */
-$GLOBALS['mysql_relations'] = array(
-    'columns_priv' => array(
-        'Db' => array(
+$GLOBALS['mysql_relations'] = [
+    'columns_priv' => [
+        'Db' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-    ),
-    'db' => array(
-        'Db' => array(
+        ],
+    ],
+    'db' => [
+        'Db' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-    ),
-    'event' => array(
-        'db' => array(
+        ],
+    ],
+    'event' => [
+        'db' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'character_set_client' => array(
+        ],
+        'character_set_client' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'CHARACTER_SETS',
             'foreign_field' => 'CHARACTER_SET_NAME'
-        ),
-        'collation_connection' => array(
+        ],
+        'collation_connection' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'COLLATIONS',
             'foreign_field' => 'COLLATION_NAME'
-        ),
-        'db_collation' => array(
+        ],
+        'db_collation' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'COLLATIONS',
             'foreign_field' => 'COLLATION_NAME'
-        ),
-    ),
-    'help_category' => array(
-        'parent_category_id' => array(
+        ],
+    ],
+    'help_category' => [
+        'parent_category_id' => [
             'foreign_db'    => 'mysql',
             'foreign_table' => 'help_category',
             'foreign_field' => 'help_category_id'
-        ),
-    ),
-    'help_relation' => array(
-        'help_topic_id' => array(
+        ],
+    ],
+    'help_relation' => [
+        'help_topic_id' => [
             'foreign_db'    => 'mysql',
             'foreign_table' => 'help_topic',
             'foreign_field' => 'help_topic_id'
-        ),
-        'help_keyword_id' => array(
+        ],
+        'help_keyword_id' => [
             'foreign_db'    => 'mysql',
             'foreign_table' => 'help_keyword',
             'foreign_field' => 'help_keyword_id'
-        ),
-    ),
-    'help_topic' => array(
-        'help_category_id' => array(
+        ],
+    ],
+    'help_topic' => [
+        'help_category_id' => [
             'foreign_db'    => 'mysql',
             'foreign_table' => 'help_category',
             'foreign_field' => 'help_category_id'
-        ),
-    ),
-    'innodb_index_stats' => array(
-        'database_name' => array(
+        ],
+    ],
+    'innodb_index_stats' => [
+        'database_name' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-    ),
-    'innodb_table_stats' => array(
-        'database_name' => array(
+        ],
+    ],
+    'innodb_table_stats' => [
+        'database_name' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-    ),
-    'proc' => array(
-        'db' => array(
+        ],
+    ],
+    'proc' => [
+        'db' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-        'character_set_client' => array(
+        ],
+        'character_set_client' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'CHARACTER_SETS',
             'foreign_field' => 'CHARACTER_SET_NAME'
-        ),
-        'collation_connection' => array(
+        ],
+        'collation_connection' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'COLLATIONS',
             'foreign_field' => 'COLLATION_NAME'
-        ),
-        'db_collation' => array(
+        ],
+        'db_collation' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'COLLATIONS',
             'foreign_field' => 'COLLATION_NAME'
-        ),
-    ),
-    'proc_priv' => array(
-        'Db' => array(
+        ],
+    ],
+    'proc_priv' => [
+        'Db' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-    ),
-    'servers' => array(
-        'Db' => array(
+        ],
+    ],
+    'servers' => [
+        'Db' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-    ),
-    'slow_log' => array(
-        'db' => array(
+        ],
+    ],
+    'slow_log' => [
+        'db' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-    ),
-    'tables_priv' => array(
-        'Db' => array(
+        ],
+    ],
+    'tables_priv' => [
+        'Db' => [
             'foreign_db'    => 'information_schema',
             'foreign_table' => 'SCHEMATA',
             'foreign_field' => 'SCHEMA_NAME'
-        ),
-    ),
-    'time_zone_name' => array(
-        'Time_zone_id' => array(
+        ],
+    ],
+    'time_zone_name' => [
+        'Time_zone_id' => [
             'foreign_db'    => 'mysql',
             'foreign_table' => 'time_zone',
             'foreign_field' => 'Time_zone_id'
-        ),
-    ),
-    'time_zone_transition' => array(
-        'Time_zone_id' => array(
+        ],
+    ],
+    'time_zone_transition' => [
+        'Time_zone_id' => [
             'foreign_db'    => 'mysql',
             'foreign_table' => 'time_zone',
             'foreign_field' => 'Time_zone_id'
-        ),
-        'Transition_time' => array(
+        ],
+        'Transition_time' => [
             'foreign_db'    => 'mysql',
             'foreign_table' => 'time_zone_leap_second',
             'foreign_field' => 'Transition_time'
-        )
-    ),
-    'time_zone_transition_type' => array(
-        'Time_zone_id' => array(
+        ]
+    ],
+    'time_zone_transition_type' => [
+        'Time_zone_id' => [
             'foreign_db'    => 'mysql',
             'foreign_table' => 'time_zone',
             'foreign_field' => 'Time_zone_id'
-        ),
-    ),
-);
+        ],
+    ],
+];
diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php
index 289f8c53e9..4a5a47a610 100644
--- a/libraries/replication.inc.php
+++ b/libraries/replication.inc.php
@@ -49,23 +49,23 @@ $server_slave_replication = $GLOBALS['dbi']->fetchResult('SHOW SLAVE STATUS');
 /**
  * replication types
  */
-$replication_types = array('master', 'slave');
+$replication_types = ['master', 'slave'];
 
 
 /**
  * define variables for master status
  */
-$master_variables = array(
+$master_variables = [
     'File',
     'Position',
     'Binlog_Do_DB',
     'Binlog_Ignore_DB',
-);
+];
 
 /**
  * Define variables for slave status
  */
-$slave_variables  = array(
+$slave_variables  = [
     'Slave_IO_State',
     'Master_Host',
     'Master_User',
@@ -99,7 +99,7 @@ $slave_variables  = array(
     'Master_SSL_Cipher',
     'Master_SSL_Key',
     'Seconds_Behind_Master',
-);
+];
 /**
  * define important variables, which need to be watched for
  * correct running of replication in slave mode
@@ -109,20 +109,20 @@ $slave_variables  = array(
 // TODO change to regexp or something, to allow for negative match.
 // To e.g. highlight 'Last_Error'
 //
-$slave_variables_alerts = array(
+$slave_variables_alerts = [
     'Slave_IO_Running' => 'No',
     'Slave_SQL_Running' => 'No',
-);
-$slave_variables_oks = array(
+];
+$slave_variables_oks = [
     'Slave_IO_Running' => 'Yes',
     'Slave_SQL_Running' => 'Yes',
-);
+];
 
 // check which replication is available and
 // set $server_{master/slave}_status and assign values
 
 // replication info is more easily passed to functions
-$GLOBALS['replication_info'] = array();
+$GLOBALS['replication_info'] = [];
 
 foreach ($replication_types as $type) {
     if (count(${"server_{$type}_replication"}) > 0) {
diff --git a/libraries/rte/rte_main.inc.php b/libraries/rte/rte_main.inc.php
index 330851b3de..674f265d7a 100644
--- a/libraries/rte/rte_main.inc.php
+++ b/libraries/rte/rte_main.inc.php
@@ -55,9 +55,9 @@ if (! $response->isAjax()) {
         $GLOBALS['dbi']->selectDb($db);
         if (! isset($url_query)) {
             $url_query = Url::getCommon(
-                array(
+                [
                     'db' => $db, 'table' => $table
-                )
+                ]
             );
         }
     }
@@ -72,7 +72,7 @@ $titles = PhpMyAdmin\Util::buildActionTitles();
  * Keep a list of errors that occurred while
  * processing an 'Add' or 'Edit' operation.
  */
-$errors = array();
+$errors = [];
 
 
 /**
diff --git a/libraries/special_schema_links.inc.php b/libraries/special_schema_links.inc.php
index 77109c69b6..866315b1d1 100644
--- a/libraries/special_schema_links.inc.php
+++ b/libraries/special_schema_links.inc.php
@@ -46,447 +46,447 @@ if (! defined('PHPMYADMIN')) {
  * );
  *
  */
-$GLOBALS['special_schema_links'] = array(
-    'mysql' => array(
-        'columns_priv' => array(
-            'user' => array(
+$GLOBALS['special_schema_links'] = [
+    'mysql' => [
+        'columns_priv' => [
+            'user' => [
                 'link_param' => 'username',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'hostname',
                         'column_name' => 'host'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './server_privileges.php'
-            ),
-            'table_name' => array(
+            ],
+            'table_name' => [
                 'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'Db'
-                    ),
-                ),
+                    ],
+                ],
                 'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
-            ),
-            'column_name' => array(
+            ],
+            'column_name' => [
                 'link_param' => 'field',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'Db'
-                    ),
-                    1 => array(
+                    ],
+                    1 => [
                         'param_info' => 'table',
                         'column_name' => 'Table_name'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './tbl_structure.php?change_column=1'
-            ),
-        ),
-        'db' => array(
-            'user' => array(
+            ],
+        ],
+        'db' => [
+            'user' => [
                 'link_param' => 'username',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'hostname',
                         'column_name' => 'host'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './server_privileges.php'
-            )
-        ),
-        'event' => array(
-            'name' => array(
+            ]
+        ],
+        'event' => [
+            'name' => [
                 'link_param' => 'item_name',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'db'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './db_events.php?edit_item=1'
-            ),
+            ],
 
-        ),
-        'innodb_index_stats' => array(
-            'table_name' => array(
+        ],
+        'innodb_index_stats' => [
+            'table_name' => [
                 'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'database_name'
-                    ),
-                ),
+                    ],
+                ],
                 'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
-            ),
-            'index_name' => array(
+            ],
+            'index_name' => [
                 'link_param' => 'index',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'database_name'
-                    ),
-                    1 => array(
+                    ],
+                    1 => [
                         'param_info' => 'table',
                         'column_name' => 'table_name'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './tbl_structure.php'
-            ),
-        ),
-        'innodb_table_stats' => array(
-            'table_name' => array(
+            ],
+        ],
+        'innodb_table_stats' => [
+            'table_name' => [
                 'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'database_name'
-                    ),
-                ),
+                    ],
+                ],
                 'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
-            ),
-        ),
-        'proc' => array(
-            'name' => array(
+            ],
+        ],
+        'proc' => [
+            'name' => [
                 'link_param' => 'item_name',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'db'
-                    ),
-                    1 => array(
+                    ],
+                    1 => [
                         'param_info' => 'item_type',
                         'column_name' => 'type'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './db_routines.php?edit_item=1'
-            ),
-            'specific_name' => array(
+            ],
+            'specific_name' => [
                 'link_param' => 'item_name',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'db'
-                    ),
-                    1 => array(
+                    ],
+                    1 => [
                         'param_info' => 'item_type',
                         'column_name' => 'type'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './db_routines.php?edit_item=1'
-            ),
-        ),
-        'proc_priv' => array(
-            'user' => array(
+            ],
+        ],
+        'proc_priv' => [
+            'user' => [
                 'link_param' => 'username',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'hostname',
                         'column_name' => 'Host'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './server_privileges.php'
-            ),
-            'routine_name' => array(
+            ],
+            'routine_name' => [
                 'link_param' => 'item_name',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'Db'
-                    ),
-                    1 => array(
+                    ],
+                    1 => [
                         'param_info' => 'item_type',
                         'column_name' => 'Routine_type'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './db_routines.php?edit_item=1'
-            ),
-        ),
-        'proxies_priv' => array(
-            'user' => array(
+            ],
+        ],
+        'proxies_priv' => [
+            'user' => [
                 'link_param' => 'username',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'hostname',
                         'column_name' => 'Host'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './server_privileges.php'
-            ),
-        ),
-        'tables_priv' => array(
-            'user' => array(
+            ],
+        ],
+        'tables_priv' => [
+            'user' => [
                 'link_param' => 'username',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'hostname',
                         'column_name' => 'Host'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './server_privileges.php'
-            ),
-            'table_name' => array(
+            ],
+            'table_name' => [
                 'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'Db'
-                    ),
-                ),
+                    ],
+                ],
                 'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
-            ),
-        ),
-        'user' => array(
-            'user' => array(
+            ],
+        ],
+        'user' => [
+            'user' => [
                 'link_param' => 'username',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'hostname',
                         'column_name' => 'host'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './server_privileges.php'
-            )
-        )
-    ),
-    'information_schema' => array(
-        'columns' => array(
-            'table_name' => array(
+            ]
+        ]
+    ],
+    'information_schema' => [
+        'columns' => [
+            'table_name' => [
                 'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'table_schema'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
-            ),
-            'column_name' => array(
+            ],
+            'column_name' => [
                 'link_param' => 'field',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'table_schema'
-                    ),
-                    1 => array(
+                    ],
+                    1 => [
                         'param_info' => 'table',
                         'column_name' => 'table_name'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './tbl_structure.php?change_column=1'
-            )
-        ),
-        'key_column_usage' => array(
-            'table_name' => array(
+            ]
+        ],
+        'key_column_usage' => [
+            'table_name' => [
                 'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'constraint_schema'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
-            ),
-            'column_name' => array(
+            ],
+            'column_name' => [
                 'link_param' => 'field',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'table_schema'
-                    ),
-                    1 => array(
+                    ],
+                    1 => [
                         'param_info' => 'table',
                         'column_name' => 'table_name'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './tbl_structure.php?change_column=1'
-            ),
-            'referenced_table_name' => array(
+            ],
+            'referenced_table_name' => [
                 'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'referenced_table_schema'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
-            ),
-            'referenced_column_name' => array(
+            ],
+            'referenced_column_name' => [
                 'link_param' => 'field',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'referenced_table_schema'
-                    ),
-                    1 => array(
+                    ],
+                    1 => [
                         'param_info' => 'table',
                         'column_name' => 'referenced_table_name'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './tbl_structure.php?change_column=1'
-            )
-        ),
-        'partitions' => array(
-            'table_name' => array(
+            ]
+        ],
+        'partitions' => [
+            'table_name' => [
                 'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'table_schema'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
-            )
-        ),
-        'processlist' => array(
-            'user' => array(
+            ]
+        ],
+        'processlist' => [
+            'user' => [
                 'link_param' => 'username',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'hostname',
                         'column_name' => 'host'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './server_privileges.php'
-            )
-        ),
-        'referential_constraints' => array(
-            'table_name' => array(
+            ]
+        ],
+        'referential_constraints' => [
+            'table_name' => [
                 'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'constraint_schema'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
-            ),
-            'referenced_table_name' => array(
+            ],
+            'referenced_table_name' => [
                 'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'constraint_schema'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
-            )
-        ),
-        'routines' => array(
-            'routine_name' => array(
+            ]
+        ],
+        'routines' => [
+            'routine_name' => [
                 'link_param' => 'item_name',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'routine_schema'
-                    ),
-                    1 => array(
+                    ],
+                    1 => [
                         'param_info' => 'item_type',
                         'column_name' => 'routine_type'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './db_routines.php'
-            ),
-        ),
-        'schemata' => array(
-            'schema_name' => array(
+            ],
+        ],
+        'schemata' => [
+            'schema_name' => [
                 'link_param' => 'db',
                 'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
-            )
-        ),
-        'statistics' => array(
-            'table_name' => array(
+            ]
+        ],
+        'statistics' => [
+            'table_name' => [
                 'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'table_schema'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
-            ),
-            'column_name' => array(
+            ],
+            'column_name' => [
                 'link_param' => 'field',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'table_schema'
-                    ),
-                    1 => array(
+                    ],
+                    1 => [
                         'param_info' => 'table',
                         'column_name' => 'table_name'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './tbl_structure.php?change_column=1'
-            )
-        ),
-        'tables' => array(
-            'table_name' => array(
+            ]
+        ],
+        'tables' => [
+            'table_name' => [
                 'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'table_schema'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
-            ),
-        ),
-        'table_constraints' => array(
-            'table_name' => array(
+            ],
+        ],
+        'table_constraints' => [
+            'table_name' => [
                 'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'table_schema'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
-            ),
-        ),
-        'views' => array(
-            'table_name' => array(
+            ],
+        ],
+        'views' => [
+            'table_name' => [
                 'link_param' => 'table',
-                'link_dependancy_params' => array(
-                    0 => array(
+                'link_dependancy_params' => [
+                    0 => [
                         'param_info' => 'db',
                         'column_name' => 'table_schema'
-                    )
-                ),
+                    ]
+                ],
                 'default_page' => './' . PhpMyAdmin\Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
-            ),
-        ),
-    )
-);
+            ],
+        ],
+    ]
+];
 
diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 99baf19e6a..346d131d83 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -25,7 +25,7 @@ if (!defined('PHPMYADMIN')) {
  * Check parameters
  */
 Util::checkParameters(
-    array('server', 'db', 'table', 'action', 'num_fields')
+    ['server', 'db', 'table', 'action', 'num_fields']
 );
 
 global $db, $table;
@@ -44,25 +44,25 @@ if (!isset($mime_map)) {
     $mime_map = null;
 }
 if (!isset($columnMeta)) {
-    $columnMeta = array();
+    $columnMeta = [];
 }
 
 $length_values_input_size = 8;
 
-$content_cells = array();
+$content_cells = [];
 
 /** @var string $db */
-$form_params = array(
+$form_params = [
     'db' => $db
-);
+];
 
 if ($action == 'tbl_create.php') {
     $form_params['reload'] = 1;
 } else {
     if ($action == 'tbl_addfield.php') {
         $form_params = array_merge(
-            $form_params, array(
-            'field_where' => Util::getValueByKey($_REQUEST, 'field_where'))
+            $form_params, [
+            'field_where' => Util::getValueByKey($_REQUEST, 'field_where')]
         );
         if (isset($_REQUEST['field_where'])) {
             $form_params['after_field'] = $_REQUEST['after_field'];
@@ -77,10 +77,10 @@ if (isset($num_fields)) {
 
 $form_params = array_merge(
     $form_params,
-    array(
+    [
         'orig_field_where' => Util::getValueByKey($_REQUEST, 'field_where'),
         'orig_after_field' => Util::getValueByKey($_REQUEST, 'after_field'),
-    )
+    ]
 );
 
 if (isset($selected) && is_array($selected)) {
@@ -95,14 +95,14 @@ $cfgRelation = $relation->getRelationsParam();
 
 $comments_map = $relation->getComments($db, $table);
 
-$move_columns = array();
+$move_columns = [];
 if (isset($fields_meta)) {
     /** @var PhpMyAdmin\DatabaseInterface $dbi */
     $dbi = Container::getDefaultContainer()->get('dbi');
     $move_columns = $dbi->getTable($db, $table)->getColumnsMeta();
 }
 
-$available_mime = array();
+$available_mime = [];
 if ($cfgRelation['mimework'] && $GLOBALS['cfg']['BrowseMIME']) {
     $mime_map = $transformations->getMime($db, $table);
     $available_mime = $transformations->getAvailableMimeTypes();
@@ -145,15 +145,15 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
 
     $type = '';
     $length = '';
-    $columnMeta = array();
+    $columnMeta = [];
     $submit_attribute = null;
-    $extracted_columnspec = array();
+    $extracted_columnspec = [];
 
     if (!empty($regenerate)) {
 
         $columnMeta = array_merge(
             $columnMeta,
-            array(
+            [
                 'Field'        => Util::getValueByKey(
                     $_REQUEST, "field_name.${columnNumber}", false
                 ),
@@ -181,7 +181,7 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
                 'Expression'   => Util::getValueByKey(
                     $_REQUEST, "field_expression.${columnNumber}", ''
                 ),
-            )
+            ]
         );
 
         $columnMeta['Key'] = '';
@@ -190,13 +190,13 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
         );
         if (count($parts) == 2 && $parts[1] == $columnNumber) {
             $columnMeta['Key'] = Util::getValueByKey(
-                array(
+                [
                     'primary' => 'PRI',
                     'index' => 'MUL',
                     'unique' => 'UNI',
                     'fulltext' => 'FULLTEXT',
                     'spatial' => 'SPATIAL'
-                ),
+                ],
                 $parts[0], ''
             );
         }
@@ -230,7 +230,7 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
 
         $mime_map[$columnMeta['Field']] = array_merge(
             $mime_map[$columnMeta['Field']],
-            array(
+            [
                 'mimetype' => Util::getValueByKey($_REQUEST, "field_mimetype.${$columnNumber}"),
                 'transformation' => Util::getValueByKey(
                     $_REQUEST, "field_transformation.${$columnNumber}"
@@ -238,14 +238,14 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
                 'transformation_options' => Util::getValueByKey(
                     $_REQUEST, "field_transformation_options.${$columnNumber}"
                 ),
-            )
+            ]
         );
 
     } elseif (isset($fields_meta[$columnNumber])) {
         $columnMeta = $fields_meta[$columnNumber];
-        $virtual = array(
+        $virtual = [
             'VIRTUAL', 'PERSISTENT', 'VIRTUAL GENERATED', 'STORED GENERATED'
-        );
+        ];
         if (in_array($columnMeta['Extra'], $virtual)) {
             $tableObj = new Table($GLOBALS['table'], $GLOBALS['db']);
             $expressions = $tableObj->getColumnGenerationExpression(
@@ -358,7 +358,7 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
         // old column default
         $form_params = array_merge(
             $form_params,
-            array(
+            [
                 "field_default_value_orig[${columnNumber}]" => Util::getValueByKey(
                     $columnMeta, 'Default', ''
                 ),
@@ -386,7 +386,7 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
                 "field_expression_orig[${columnNumber}]"    => Util::getValueByKey(
                     $columnMeta, 'Expression', ''
                 ),
-            )
+            ]
         );
     }
 
@@ -403,7 +403,7 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
         $default_value = bin2hex($columnMeta['DefaultValue']);
     }
 
-    $content_cells[$columnNumber] = array(
+    $content_cells[$columnNumber] = [
         'column_number' => $columnNumber,
         'column_meta' => $columnMeta,
         'type_upper' => $type_upper,
@@ -418,8 +418,8 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
         'move_columns' => $move_columns,
         'cfg_relation' => $cfgRelation,
         'available_mime' => $available_mime,
-        'mime_map' => isset($mime_map) ? $mime_map : array()
-    );
+        'mime_map' => isset($mime_map) ? $mime_map : []
+    ];
 } // end for
 
 include 'libraries/tbl_partition_definition.inc.php';
@@ -461,9 +461,9 @@ unset($form_params);
 
 $response = Response::getInstance();
 $response->getHeader()->getScripts()->addFiles(
-    array(
+    [
         'vendor/jquery/jquery.uitablefilter.js',
         'indexes.js'
-    )
+    ]
 );
 $response->addHTML($html);
diff --git a/libraries/tbl_common.inc.php b/libraries/tbl_common.inc.php
index 025f3b5d90..2fd384a8ee 100644
--- a/libraries/tbl_common.inc.php
+++ b/libraries/tbl_common.inc.php
@@ -14,7 +14,7 @@ if (! defined('PHPMYADMIN')) {
 }
 
 // Check parameters
-PhpMyAdmin\Util::checkParameters(array('db', 'table'));
+PhpMyAdmin\Util::checkParameters(['db', 'table']);
 
 $db_is_system_schema = $GLOBALS['dbi']->isSystemSchema($db);
 
@@ -22,12 +22,12 @@ $db_is_system_schema = $GLOBALS['dbi']->isSystemSchema($db);
  * Set parameters for links
  * @deprecated
  */
-$url_query = Url::getCommon(array('db' => $db, 'table' => $table));
+$url_query = Url::getCommon(['db' => $db, 'table' => $table]);
 
 /**
  * Set parameters for links
  */
-$url_params = array();
+$url_params = [];
 $url_params['db']    = $db;
 $url_params['table'] = $table;
 
@@ -37,7 +37,7 @@ $url_params['table'] = $table;
 $err_url_0 = PhpMyAdmin\Util::getScriptNameForOption(
     $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
 )
-    . Url::getCommon(array('db' => $db));
+    . Url::getCommon(['db' => $db]);
 
 $err_url = PhpMyAdmin\Util::getScriptNameForOption(
     $GLOBALS['cfg']['DefaultTabTable'], 'table'
diff --git a/libraries/tbl_partition_definition.inc.php b/libraries/tbl_partition_definition.inc.php
index 2c6c9b5c6e..afb28304e9 100644
--- a/libraries/tbl_partition_definition.inc.php
+++ b/libraries/tbl_partition_definition.inc.php
@@ -11,13 +11,13 @@ use PhpMyAdmin\Core;
 
 if (!isset($partitionDetails)) {
 
-    $partitionDetails = array();
+    $partitionDetails = [];
 
     // Extract some partitioning and subpartitioning parameters from the request
-    $partitionParams = array(
+    $partitionParams = [
         'partition_by', 'partition_expr',
         'subpartition_by', 'subpartition_expr',
-    );
+    ];
     foreach ($partitionParams as $partitionParam) {
         $partitionDetails[$partitionParam] = isset($_REQUEST[$partitionParam])
             ? $_REQUEST[$partitionParam] : '';
@@ -59,7 +59,7 @@ if (!isset($partitionDetails)) {
     if ($partition_count > 1) {
         $partitions = isset($_REQUEST['partitions'])
             ? $_REQUEST['partitions']
-            : array();
+            : [];
 
         // Remove details of the additional partitions
         // when number of partitions have been reduced
@@ -67,7 +67,7 @@ if (!isset($partitionDetails)) {
 
         for ($i = 0; $i < $partition_count; $i++) {
             if (! isset($partitions[$i])) { // Newly added partition
-                $partitions[$i] = array(
+                $partitions[$i] = [
                     'name' => 'p' . $i,
                     'value_type' => '',
                     'value' => '',
@@ -79,7 +79,7 @@ if (!isset($partitionDetails)) {
                     'min_rows' => '',
                     'tablespace' => '',
                     'node_group' => '',
-                );
+                ];
             }
 
             $partition =& $partitions[$i];
@@ -107,7 +107,7 @@ if (!isset($partitionDetails)) {
                 $partition['subpartition_count'] = $subpartition_count;
 
                 if (! isset($partition['subpartitions'])) {
-                    $partition['subpartitions'] = array();
+                    $partition['subpartitions'] = [];
                 }
                 $subpartitions =& $partition['subpartitions'];
 
@@ -117,7 +117,7 @@ if (!isset($partitionDetails)) {
 
                 for ($j = 0; $j < $subpartition_count; $j++) {
                     if (! isset($subpartitions[$j])) { // Newly added subpartition
-                        $subpartitions[$j] = array(
+                        $subpartitions[$j] = [
                             'name' => $partition['name'] . '_s' . $j,
                             'engine' => '',
                             'comment' => '',
@@ -127,7 +127,7 @@ if (!isset($partitionDetails)) {
                             'min_rows' => '',
                             'tablespace' => '',
                             'node_group' => '',
-                        );
+                        ];
                     }
 
                     $subpartition =& $subpartitions[$j];
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index a3d901e35a..d01f4d02a0 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -19,44 +19,44 @@ if (!defined('PHPMYADMIN')) {
 // build user preferences menu
 
 $form_param = isset($_GET['form']) ? $_GET['form'] : null;
-$tabs_icons = array(
+$tabs_icons = [
     'Features'    => 'b_tblops',
     'Sql'         => 'b_sql',
     'Navi'        => 'b_select',
     'Main'        => 'b_props',
     'Import'      => 'b_import',
-    'Export'      => 'b_export');
+    'Export'      => 'b_export'];
 
 $content = PhpMyAdmin\Util::getHtmlTab(
-    array(
+    [
         'link' => 'prefs_manage.php',
         'text' => __('Manage your settings')
-    )
+    ]
 ) . "\n";
 /* Second authentication factor */
 $content .= PhpMyAdmin\Util::getHtmlTab(
-    array(
+    [
         'link' => 'prefs_twofactor.php',
         'text' => __('Two-factor authentication')
-    )
+    ]
 ) . "\n";
 $script_name = basename($GLOBALS['PMA_PHP_SELF']);
 foreach (UserFormList::getAll() as $formset) {
     $formset_class = UserFormList::get($formset);
-    $tab = array(
+    $tab = [
         'link' => 'prefs_forms.php',
         'text' => $formset_class::getName(),
         'icon' => $tabs_icons[$formset],
-        'active' => ($script_name == 'prefs_forms.php' && $formset == $form_param));
-    $content .= PhpMyAdmin\Util::getHtmlTab($tab, array('form' => $formset))
+        'active' => ($script_name == 'prefs_forms.php' && $formset == $form_param)];
+    $content .= PhpMyAdmin\Util::getHtmlTab($tab, ['form' => $formset])
         . "\n";
 }
 echo PhpMyAdmin\Template::get('list/unordered')->render(
-    array(
+    [
         'id' => 'topmenu2',
         'class' => 'user_prefs_tabs',
         'content' => $content,
-    )
+    ]
 );
 echo '<div class="clearfloat"></div>';
 
diff --git a/normalization.php b/normalization.php
index d7961ec500..f2852220cc 100644
--- a/normalization.php
+++ b/normalization.php
@@ -37,7 +37,7 @@ if (isset($_REQUEST['splitColumn'])) {
 }
 if (isset($_REQUEST['addNewPrimary'])) {
     $num_fields = 1;
-    $columnMeta = array('Field'=>$table . "_id", 'Extra'=>'auto_increment');
+    $columnMeta = ['Field'=>$table . "_id", 'Extra'=>'auto_increment'];
     $html = $normalization->getHtmlForCreateNewColumn(
         $num_fields, $db, $table, $columnMeta
     );
@@ -75,7 +75,7 @@ $scripts = $header->getScripts();
 $scripts->addFile('normalization.js');
 $scripts->addFile('vendor/jquery/jquery.uitablefilter.js');
 $normalForm = '1nf';
-if (Core::isValid($_REQUEST['normalizeTo'], array('1nf', '2nf', '3nf'))) {
+if (Core::isValid($_REQUEST['normalizeTo'], ['1nf', '2nf', '3nf'])) {
     $normalForm = $_REQUEST['normalizeTo'];
 }
 if (isset($_REQUEST['createNewTables2NF'])) {
diff --git a/prefs_forms.php b/prefs_forms.php
index 08e0082293..bccb8730aa 100644
--- a/prefs_forms.php
+++ b/prefs_forms.php
@@ -38,7 +38,7 @@ if (isset($_POST['revert'])) {
     // revert erroneous fields to their default values
     $form_display->fixErrors();
     // redirect
-    $url_params = array('form' => $form_param);
+    $url_params = ['form' => $form_param];
     Core::sendHeaderLocation(
         './prefs_forms.php'
         . Url::getCommonRaw($url_params)
@@ -57,7 +57,7 @@ if ($form_display->process(false) && !$form_display->hasErrors()) {
         $hash = ltrim($tabHash, '#');
         $userPreferences->redirect(
             'prefs_forms.php',
-            array('form' => $form_param),
+            ['form' => $form_param],
             $hash
         );
         exit;
diff --git a/prefs_manage.php b/prefs_manage.php
index 05dcd0c7e2..71552fb929 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -150,7 +150,7 @@ if (isset($_POST['submit_export'])
         }
 
         // check for ThemeDefault
-        $params = array();
+        $params = [];
         $tmanager = ThemeManager::getInstance();
         if (isset($config['ThemeDefault'])
             && $tmanager->theme->getId() != $config['ThemeDefault']
@@ -192,9 +192,9 @@ if (isset($_POST['submit_export'])
         }
     }
 } elseif (isset($_POST['submit_clear'])) {
-    $result = $userPreferences->save(array());
+    $result = $userPreferences->save([]);
     if ($result === true) {
-        $params = array();
+        $params = [];
         $GLOBALS['PMA_Config']->removeCookie('pma_collaction_connection');
         $GLOBALS['PMA_Config']->removeCookie('pma_lang');
         $userPreferences->redirect('prefs_manage.php', $params);
diff --git a/schema_export.php b/schema_export.php
index 18c8cfe111..85148c5223 100644
--- a/schema_export.php
+++ b/schema_export.php
@@ -24,7 +24,7 @@ $relation = new Relation();
 $cfgRelation = $relation->getRelationsParam();
 
 if (! isset($_REQUEST['export_type'])) {
-    Util::checkParameters(array('export_type'));
+    Util::checkParameters(['export_type']);
 }
 
 /**
diff --git a/server_binlog.php b/server_binlog.php
index 2d57ae7828..b4d79d8f7a 100644
--- a/server_binlog.php
+++ b/server_binlog.php
@@ -26,6 +26,6 @@ $container->alias('response', 'PhpMyAdmin\Response');
 
 /** @var ServerBinlogController $controller */
 $controller = $container->get(
-    'ServerBinlogController', array()
+    'ServerBinlogController', []
 );
 $controller->indexAction();
diff --git a/server_collations.php b/server_collations.php
index 5d36da4e7a..86564dff89 100644
--- a/server_collations.php
+++ b/server_collations.php
@@ -26,6 +26,6 @@ $container->alias('response', 'PhpMyAdmin\Response');
 
 /** @var ServerCollationsController $controller */
 $controller = $container->get(
-    'ServerCollationsController', array()
+    'ServerCollationsController', []
 );
 $controller->indexAction();
diff --git a/server_databases.php b/server_databases.php
index 51a4b5fbee..d74474ccbf 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -26,6 +26,6 @@ $container->alias('response', 'PhpMyAdmin\Response');
 
 /** @var ServerDatabasesController $controller */
 $controller = $container->get(
-    'ServerDatabasesController', array()
+    'ServerDatabasesController', []
 );
 $controller->indexAction();
diff --git a/server_engines.php b/server_engines.php
index 7e6c5f2fce..e389ffefcf 100644
--- a/server_engines.php
+++ b/server_engines.php
@@ -26,6 +26,6 @@ $container->alias('response', 'PhpMyAdmin\Response');
 
 /** @var ServerEnginesController $controller */
 $controller = $container->get(
-    'ServerEnginesController', array()
+    'ServerEnginesController', []
 );
 $controller->indexAction();
diff --git a/server_plugins.php b/server_plugins.php
index 311bc27361..7275d336af 100644
--- a/server_plugins.php
+++ b/server_plugins.php
@@ -26,6 +26,6 @@ $container->alias('response', 'PhpMyAdmin\Response');
 
 /** @var ServerPluginsController $controller */
 $controller = $container->get(
-    'ServerPluginsController', array()
+    'ServerPluginsController', []
 );
 $controller->indexAction();
diff --git a/server_privileges.php b/server_privileges.php
index 21a7856ae2..4eb9eee133 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -52,10 +52,10 @@ if ((isset($_REQUEST['viewing_mode'])
  * Sets globals from $_POST patterns, for privileges and max_* vars
  */
 
-$post_patterns = array(
+$post_patterns = [
     '/_priv$/i',
     '/^max_/i'
-);
+];
 
 Core::setPostAsGlobal($post_patterns);
 
@@ -429,8 +429,8 @@ if (isset($_REQUEST['adduser'])) {
     if (isset($dbname) && ! is_array($dbname)) {
         $url_dbname = urlencode(
             str_replace(
-                array('\_', '\%'),
-                array('_', '%'),
+                ['\_', '\%'],
+                ['_', '%'],
                 $dbname
             )
         );
diff --git a/server_status_variables.php b/server_status_variables.php
index 4635d4a39e..e8dc61e6f7 100644
--- a/server_status_variables.php
+++ b/server_status_variables.php
@@ -20,11 +20,11 @@ require_once 'libraries/replication.inc.php';
  * flush status variables if requested
  */
 if (isset($_REQUEST['flush'])) {
-    $_flush_commands = array(
+    $_flush_commands = [
         'STATUS',
         'TABLES',
         'QUERY CACHE',
-    );
+    ];
 
     if (in_array($_REQUEST['flush'], $_flush_commands)) {
         $GLOBALS['dbi']->query('FLUSH ' . $_REQUEST['flush'] . ';');
diff --git a/server_variables.php b/server_variables.php
index 956d9f8d5c..b140d4ac64 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -26,6 +26,6 @@ $container->alias('response', 'PhpMyAdmin\Response');
 
 /** @var ServerVariablesController $controller */
 $controller = $container->get(
-    'ServerVariablesController', array()
+    'ServerVariablesController', []
 );
 $controller->indexAction();
diff --git a/setup/config.php b/setup/config.php
index 899d6b273e..3c3a48c398 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -47,6 +47,6 @@ if (Core::ifSetOr($_POST['submit_clear'], '')) {
     //
     // Show generated config file in a <textarea>
     //
-    $response->generateHeader303('index.php' . Url::getCommonRaw(array('page' => 'config')));
+    $response->generateHeader303('index.php' . Url::getCommonRaw(['page' => 'config']));
     exit;
 }
diff --git a/setup/frames/config.inc.php b/setup/frames/config.inc.php
index 4dbbf65bbb..957eb421db 100644
--- a/setup/frames/config.inc.php
+++ b/setup/frames/config.inc.php
@@ -20,7 +20,7 @@ echo '<h2>' , __('Configuration file') , '</h2>';
 echo FormDisplayTemplate::displayFormTop('config.php');
 echo '<input type="hidden" name="eol" value="'
     , htmlspecialchars(Core::ifSetOr($_GET['eol'], 'unix')) , '" />';
-echo FormDisplayTemplate::displayFieldsetTop('config.inc.php', '', null, array('class' => 'simple'));
+echo FormDisplayTemplate::displayFieldsetTop('config.inc.php', '', null, ['class' => 'simple']);
 echo '<tr>';
 echo '<td>';
 echo '<textarea cols="50" rows="20" name="textconfig" '
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index 6da94847e6..2da8ec0c50 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -66,7 +66,7 @@ echo '</label></bdo><br />';
 echo '<select id="lang" name="lang" class="autosubmit" lang="en" dir="ltr">';
 
 // create language list
-$lang_list = array();
+$lang_list = [];
 foreach ($all_languages as $each_lang) {
     //Is current one active?
     $selected = $each_lang->isActive() ? ' selected="selected"' : '';
@@ -129,10 +129,10 @@ echo '</legend>';
 //
 echo FormDisplayTemplate::displayFormTop(
     'index.php', 'get',
-    array(
+    [
         'page' => 'servers',
         'mode' => 'add'
-    )
+    ]
 );
 echo '<div class="form">';
 if ($cf->getServerCount() > 0) {
@@ -154,10 +154,10 @@ if ($cf->getServerCount() > 0) {
         echo '<td>' , htmlspecialchars($cf->getServerDSN($id)) , '</td>';
         echo '<td class="nowrap">';
         echo '<small>';
-        echo '<a href="' , Url::getCommon(array('page' => 'servers', 'mode' => 'edit', 'id' => $id)), '">'
+        echo '<a href="' , Url::getCommon(['page' => 'servers', 'mode' => 'edit', 'id' => $id]), '">'
             , __('Edit') , '</a>';
         echo ' | ';
-        echo '<a href="' , Url::getCommon(array('page' => 'servers', 'mode' => 'remove', 'id' => $id)), '">'
+        echo '<a href="' , Url::getCommon(['page' => 'servers', 'mode' => 'remove', 'id' => $id]), '">'
             , __('Delete') , '</a>';
         echo '</small>';
         echo '</td>';
@@ -198,10 +198,10 @@ echo FormDisplayTemplate::displayFormTop('config.php');
 echo '<table width="100%" cellspacing="0">';
 
 // Display language list
-$opts = array(
+$opts = [
     'doc' => $form_display->getDocLink('DefaultLang'),
-    'values' => array(),
-    'values_escaped' => true);
+    'values' => [],
+    'values_escaped' => true];
 foreach ($all_languages as $each_lang) {
     $opts['values'][$each_lang->getCode()] = $each_lang->getName();
 }
@@ -211,10 +211,10 @@ echo FormDisplayTemplate::displayInput(
 );
 
 // Display server list
-$opts = array(
+$opts = [
     'doc' => $form_display->getDocLink('ServerDefault'),
-    'values' => array(),
-    'values_disabled' => array());
+    'values' => [],
+    'values_disabled' => []];
 if ($cf->getServerCount() > 0) {
     $opts['values']['0'] = __('let the user choose');
     $opts['values']['-'] = '------------------------------';
@@ -236,11 +236,11 @@ echo FormDisplayTemplate::displayInput(
 );
 
 // Display EOL list
-$opts = array(
-    'values' => array(
+$opts = [
+    'values' => [
         'unix' => 'UNIX / Linux (\n)',
-        'win' => 'Windows (\r\n)'),
-    'values_escaped' => true);
+        'win' => 'Windows (\r\n)'],
+    'values_escaped' => true];
 $eol = Core::ifSetOr($_SESSION['eol'], (PMA_IS_WINDOWS ? 'win' : 'unix'));
 echo FormDisplayTemplate::displayInput(
     'eol', __('End of line'), 'select',
@@ -265,6 +265,6 @@ echo '<div id="footer">';
 echo '<a href="../url.php?url=https://www.phpmyadmin.net/">' , __('phpMyAdmin homepage') , '</a>';
 echo '<a href="../url.php?url=https://www.phpmyadmin.net/donate/">'
     ,  __('Donate') , '</a>';
-echo '<a href="' ,  Url::getCommon(array('version_check' => '1')), '">'
+echo '<a href="' ,  Url::getCommon(['version_check' => '1']), '">'
     , __('Check for latest version') , '</a>';
 echo '</div>';
diff --git a/setup/frames/menu.inc.php b/setup/frames/menu.inc.php
index 104d446010..5d3df18a85 100644
--- a/setup/frames/menu.inc.php
+++ b/setup/frames/menu.inc.php
@@ -21,13 +21,13 @@ echo '<li><a href="index.php' , Url::getCommon() , '"'
     , ($formset_id === null ? ' class="active' : '')
     , '">' , __('Overview') , '</a></li>';
 
-$ignored = array('Config', 'Servers');
+$ignored = ['Config', 'Servers'];
 foreach (SetupFormList::getAll() as $formset) {
     if (in_array($formset, $ignored)) {
         continue;
     }
     $form_class = SetupFormList::get($formset);
-    echo '<li><a href="index.php' , Url::getCommon(array('page' => 'form', 'formset' => $formset)) , '" '
+    echo '<li><a href="index.php' , Url::getCommon(['page' => 'form', 'formset' => $formset]) , '" '
         , ($formset_id === $formset ? ' class="active' : '')
         , '">' , $form_class::getName() , '</a></li>';
 }
diff --git a/setup/lib/ConfigGenerator.php b/setup/lib/ConfigGenerator.php
index c1c1329f07..d916e00a69 100644
--- a/setup/lib/ConfigGenerator.php
+++ b/setup/lib/ConfigGenerator.php
@@ -128,7 +128,7 @@ class ConfigGenerator
      */
     private static function _exportZeroBasedArray(array $array, $crlf)
     {
-        $retv = array();
+        $retv = [];
         foreach ($array as $v) {
             $retv[] = var_export($v, true);
         }
diff --git a/setup/lib/FormProcessing.php b/setup/lib/FormProcessing.php
index e1b47cf17a..16720a18ab 100644
--- a/setup/lib/FormProcessing.php
+++ b/setup/lib/FormProcessing.php
@@ -62,7 +62,7 @@ class FormProcessing
         <div class="error">
             <h4><?php echo __('Warning') ?></h4>
             <?php echo __('Submitted form contains errors') ?><br />
-            <a href="<?php echo Url::getCommon(array('page' => $page, 'formset' => $formset, 'id' => $formId, 'mode' => 'revert')) ?>">
+            <a href="<?php echo Url::getCommon(['page' => $page, 'formset' => $formset, 'id' => $formId, 'mode' => 'revert']) ?>">
                 <?php echo __('Try to revert erroneous fields to their default values') ?>
             </a>
         </div>
@@ -71,7 +71,7 @@ class FormProcessing
             <?php echo __('Ignore errors') ?>
         </a>
         &nbsp;
-        <a class="btn" href="<?php echo Url::getCommon(array('page' => $page, 'formset' => $formset, 'id' => $formId, 'mode' => 'edit')) ?>">
+        <a class="btn" href="<?php echo Url::getCommon(['page' => $page, 'formset' => $formset, 'id' => $formId, 'mode' => 'edit']) ?>">
             <?php echo __('Show form') ?>
         </a>
         <?php
diff --git a/setup/lib/Index.php b/setup/lib/Index.php
index 4d4909f117..44a802c026 100644
--- a/setup/lib/Index.php
+++ b/setup/lib/Index.php
@@ -29,7 +29,7 @@ class Index
     public static function messagesBegin()
     {
         if (! isset($_SESSION['messages']) || !is_array($_SESSION['messages'])) {
-            $_SESSION['messages'] = array('error' => array(), 'notice' => array());
+            $_SESSION['messages'] = ['error' => [], 'notice' => []];
         } else {
             // reset message states
             foreach ($_SESSION['messages'] as &$messages) {
@@ -54,11 +54,11 @@ class Index
     public static function messagesSet($type, $msgId, $title, $message)
     {
         $fresh = ! isset($_SESSION['messages'][$type][$msgId]);
-        $_SESSION['messages'][$type][$msgId] = array(
+        $_SESSION['messages'][$type][$msgId] = [
             'fresh' => $fresh,
             'active' => true,
             'title' => $title,
-            'message' => $message);
+            'message' => $message];
     }
 
     /**
@@ -69,7 +69,7 @@ class Index
     public static function messagesEnd()
     {
         foreach ($_SESSION['messages'] as &$messages) {
-            $remove_ids = array();
+            $remove_ids = [];
             foreach ($messages as $id => &$msg) {
                 if ($msg['active'] == false) {
                     $remove_ids[] = $id;
diff --git a/setup/lib/common.inc.php b/setup/lib/common.inc.php
index 954db91125..6850dec95c 100644
--- a/setup/lib/common.inc.php
+++ b/setup/lib/common.inc.php
@@ -32,7 +32,7 @@ $GLOBALS['PMA_Config']->set('is_setup', true);
 
 $GLOBALS['ConfigFile'] = new ConfigFile();
 $GLOBALS['ConfigFile']->setPersistKeys(
-    array(
+    [
         'DefaultLang',
         'ServerDefault',
         'UploadDir',
@@ -44,7 +44,7 @@ $GLOBALS['ConfigFile']->setPersistKeys(
         'Servers/1/auth_type',
         'Servers/1/user',
         'Servers/1/password'
-    )
+    ]
 );
 
 // allows for redirection even after sending some data
diff --git a/setup/validate.php b/setup/validate.php
index 0d567df9da..4842e4adf6 100644
--- a/setup/validate.php
+++ b/setup/validate.php
@@ -15,7 +15,7 @@ use PhpMyAdmin\Core;
  */
 require './lib/common.inc.php';
 
-$validators = array();
+$validators = [];
 
 Core::headerJSON();
 
diff --git a/sql.php b/sql.php
index 4fa7000435..ad65e1016f 100644
--- a/sql.php
+++ b/sql.php
@@ -60,7 +60,7 @@ if (empty($goto)) {
 
 if (! isset($err_url)) {
     $err_url = (! empty($back) ? $back : $goto)
-        . '?' . Url::getCommon(array('db' => $GLOBALS['db']))
+        . '?' . Url::getCommon(['db' => $GLOBALS['db']])
         . ((mb_strpos(' ' . $goto, 'db_') != 1
             && strlen($table) > 0)
             ? '&amp;table=' . urlencode($table)
@@ -128,7 +128,7 @@ if (empty($sql_query) && strlen($table) > 0 && strlen($db) > 0) {
     $goto = '';
 } else {
     // Now we can check the parameters
-    Util::checkParameters(array('sql_query'));
+    Util::checkParameters(['sql_query']);
 }
 
 /**
@@ -188,11 +188,11 @@ if (isset($_POST['store_bkm'])) {
 if ($goto == 'sql.php') {
     $is_gotofile = false;
     $goto = 'sql.php' . Url::getCommon(
-        array(
+        [
             'db' => $db,
             'table' => $table,
             'sql_query' => $sql_query
-        )
+        ]
     );
 } // end if
 
diff --git a/tbl_addfield.php b/tbl_addfield.php
index 37fa8eecca..2b61ae2a40 100644
--- a/tbl_addfield.php
+++ b/tbl_addfield.php
@@ -25,7 +25,7 @@ $scripts  = $header->getScripts();
 $scripts->addFile('tbl_structure.js');
 
 // Check parameters
-Util::checkParameters(array('db', 'table'));
+Util::checkParameters(['db', 'table']);
 
 $transformations = new Transformations();
 
@@ -33,9 +33,9 @@ $transformations = new Transformations();
  * Defines the url to return to in case of error in a sql statement
  */
 $err_url = 'tbl_sql.php' . Url::getCommon(
-    array(
+    [
         'db' => $db, 'table' => $table
-    )
+    ]
 );
 
 /**
diff --git a/tbl_change.php b/tbl_change.php
index bad60b84ce..bdfdc1d0ea 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -128,7 +128,7 @@ $has_blob_field = false;
 foreach ($table_columns as $column) {
     if ($insertEdit->isColumn(
         $column,
-        array('blob', 'tinyblob', 'mediumblob', 'longblob')
+        ['blob', 'tinyblob', 'mediumblob', 'longblob']
     )) {
         $has_blob_field = true;
         break;
@@ -157,10 +157,10 @@ if (! $cfg['ShowFieldTypesInDataEditView']) {
     $html_output .= $insertEdit->showTypeOrFunction('type', $url_params, false);
 }
 
-$GLOBALS['plugin_scripts'] = array();
+$GLOBALS['plugin_scripts'] = [];
 foreach ($rows as $row_id => $current_row) {
     if (empty($current_row)) {
-        $current_row = array();
+        $current_row = [];
     }
 
     $jsvkey = $row_id;
@@ -169,7 +169,7 @@ foreach ($rows as $row_id => $current_row) {
     $current_result = (isset($result) && is_array($result) && isset($result[$row_id])
         ? $result[$row_id]
         : $result);
-    $repopulate = array();
+    $repopulate = [];
     $checked = true;
     if (isset($unsaved_values[$row_id])) {
         $repopulate = $unsaved_values[$row_id];
diff --git a/tbl_chart.php b/tbl_chart.php
index 252aa583fb..e05d4b618f 100644
--- a/tbl_chart.php
+++ b/tbl_chart.php
@@ -22,11 +22,11 @@ $container->set('PhpMyAdmin\Response', Response::getInstance());
 $container->alias('response', 'PhpMyAdmin\Response');
 
 /* Define dependencies for the concerned controller */
-$dependency_definitions = array(
+$dependency_definitions = [
     "sql_query" => &$GLOBALS['sql_query'],
     "url_query" => &$GLOBALS['url_query'],
     "cfg" => &$GLOBALS['cfg']
-);
+];
 
 /** @var TableChartController $controller */
 $controller = $container->get('TableChartController', $dependency_definitions);
diff --git a/tbl_create.php b/tbl_create.php
index 3217a75b3a..c129b5472a 100644
--- a/tbl_create.php
+++ b/tbl_create.php
@@ -20,7 +20,7 @@ use PhpMyAdmin\Util;
 require_once 'libraries/common.inc.php';
 
 // Check parameters
-Util::checkParameters(array('db'));
+Util::checkParameters(['db']);
 
 $transformations = new Transformations();
 
@@ -49,7 +49,7 @@ if ($GLOBALS['dbi']->getColumns($db, $table)) {
         sprintf(__('Table %s already exists!'), htmlspecialchars($table)),
         '',
         false,
-        'db_structure.php' . Url::getCommon(array('db' => $db))
+        'db_structure.php' . Url::getCommon(['db' => $db])
     );
 }
 
diff --git a/tbl_export.php b/tbl_export.php
index 655784dcb0..9ac0e8f661 100644
--- a/tbl_export.php
+++ b/tbl_export.php
@@ -58,7 +58,7 @@ if (! empty($sql_query)) {
 
         // Finding aliases and removing them, but we keep track of them to be
         // able to replace them in select expression too.
-        $aliases = array();
+        $aliases = [];
         foreach ($parser->statements[0]->from as $from) {
             if ((!empty($from->table)) && (!empty($from->alias))) {
                 $aliases[$from->alias] = $from->table;
@@ -73,24 +73,24 @@ if (! empty($sql_query)) {
         if (count($parser->statements[0]->from) > 0
             && count($parser->statements[0]->union) === 0
         ) {
-            $replaces = array(
-                array(
+            $replaces = [
+                [
                     'FROM', 'FROM ' . PhpMyAdmin\SqlParser\Components\ExpressionArray::build(
                         $parser->statements[0]->from
                     ),
-                ),
-            );
+                ],
+            ];
         }
 
         // Checking if the WHERE clause has to be replaced.
         if ((!empty($where_clause)) && (is_array($where_clause))) {
-            $replaces[] = array(
+            $replaces[] = [
                 'WHERE', 'WHERE (' . implode(') OR (', $where_clause) . ')'
-            );
+            ];
         }
 
         // Preparing to remove the LIMIT clause.
-        $replaces[] = array('LIMIT', '');
+        $replaces[] = ['LIMIT', ''];
 
         // Replacing the clauses.
         $sql_query = PhpMyAdmin\SqlParser\Utils\Query::replaceClauses(
@@ -104,19 +104,19 @@ if (! empty($sql_query)) {
         foreach ($aliases as $alias => $table) {
             $tokens = PhpMyAdmin\SqlParser\Utils\Tokens::replaceTokens(
                 $tokens,
-                array(
-                    array(
+                [
+                    [
                         'value_str' => $alias,
-                    ),
-                    array(
+                    ],
+                    [
                         'type' => PhpMyAdmin\SqlParser\Token::TYPE_OPERATOR,
                         'value_str' => '.',
-                    )
-                ),
-                array(
+                    ]
+                ],
+                [
                     new PhpMyAdmin\SqlParser\Token($table),
                     new PhpMyAdmin\SqlParser\Token('.',PhpMyAdmin\SqlParser\Token::TYPE_OPERATOR)
-                )
+                ]
             );
         }
         $sql_query = PhpMyAdmin\SqlParser\TokensList::build($tokens);
diff --git a/tbl_find_replace.php b/tbl_find_replace.php
index 5bb67cba8e..a11972d601 100644
--- a/tbl_find_replace.php
+++ b/tbl_find_replace.php
@@ -26,10 +26,10 @@ $container->alias(
 $container->set('PhpMyAdmin\Response', Response::getInstance());
 $container->alias('response', 'PhpMyAdmin\Response');
 
-$dependency_definitions = array(
+$dependency_definitions = [
     'searchType' => 'replace',
     'url_query' => &$url_query
-);
+];
 
 /** @var PhpMyAdmin\Controllers\Table\TableSearchController $controller */
 $controller = $container->get('TableSearchController', $dependency_definitions);
diff --git a/tbl_get_field.php b/tbl_get_field.php
index 508b700e50..ddbbed5765 100644
--- a/tbl_get_field.php
+++ b/tbl_get_field.php
@@ -23,7 +23,7 @@ $response->disable();
 
 /* Check parameters */
 PhpMyAdmin\Util::checkParameters(
-    array('db', 'table')
+    ['db', 'table']
 );
 
 /* Select database */
diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php
index b7df80f4e3..6c09cdf0bd 100644
--- a/tbl_gis_visualization.php
+++ b/tbl_gis_visualization.php
@@ -26,15 +26,15 @@ $container->set('PhpMyAdmin\Response', Response::getInstance());
 $container->alias('response', 'PhpMyAdmin\Response');
 
 /* Define dependencies for the concerned controller */
-$dependency_definitions = array(
+$dependency_definitions = [
     "sql_query" => &$GLOBALS['sql_query'],
     "url_params" => &$GLOBALS['url_params'],
     "goto" => Util::getScriptNameForOption(
         $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
     ),
     "back" => 'sql.php',
-    "visualizationSettings" => array()
-);
+    "visualizationSettings" => []
+];
 
 /** @var TableGisVisualizationController $controller */
 $controller = $container->get(
diff --git a/tbl_indexes.php b/tbl_indexes.php
index 2ce1ef465d..e92cce072a 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -42,9 +42,9 @@ if (isset($_REQUEST['index'])) {
     $index = new Index;
 }
 
-$dependency_definitions = array(
+$dependency_definitions = [
     "index" => $index
-);
+];
 
 /** @var TableIndexesController $controller */
 $controller = $container->get('TableIndexesController', $dependency_definitions);
diff --git a/tbl_operations.php b/tbl_operations.php
index 31d2d46bd2..fb6060afc4 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -95,7 +95,7 @@ $pma_table = $GLOBALS['dbi']->getTable(
     $GLOBALS['table']
 );
 $reread_info = false;
-$table_alters = array();
+$table_alters = [];
 
 $operations = new Operations();
 
@@ -120,7 +120,7 @@ if (isset($_REQUEST['table_maintenance'])) {
  */
 if (isset($_REQUEST['submitoptions'])) {
     $_message = '';
-    $warning_messages = array();
+    $warning_messages = [];
 
     if (isset($_REQUEST['new_name'])) {
         // Get original names before rename operation
@@ -392,8 +392,8 @@ $response->addHTML(
 );
 
 if (! (isset($db_is_system_schema) && $db_is_system_schema)) {
-    $truncate_table_url_params = array();
-    $drop_table_url_params = array();
+    $truncate_table_url_params = [];
+    $drop_table_url_params = [];
 
     if (! $tbl_is_view
         && ! (isset($db_is_system_schema) && $db_is_system_schema)
@@ -402,7 +402,7 @@ if (! (isset($db_is_system_schema) && $db_is_system_schema)) {
             . Util::backquote($GLOBALS['table']);
         $truncate_table_url_params = array_merge(
             $url_params,
-            array(
+            [
                 'sql_query' => $this_sql_query,
                 'goto' => 'tbl_structure.php',
                 'reload' => '1',
@@ -410,7 +410,7 @@ if (! (isset($db_is_system_schema) && $db_is_system_schema)) {
                     __('Table %s has been emptied.'),
                     htmlspecialchars($table)
                 ),
-            )
+            ]
         );
     }
     if (! (isset($db_is_system_schema) && $db_is_system_schema)) {
@@ -418,7 +418,7 @@ if (! (isset($db_is_system_schema) && $db_is_system_schema)) {
             . Util::backquote($GLOBALS['table']);
         $drop_table_url_params = array_merge(
             $url_params,
-            array(
+            [
                 'sql_query' => $this_sql_query,
                 'goto' => 'db_operations.php',
                 'reload' => '1',
@@ -433,7 +433,7 @@ if (! (isset($db_is_system_schema) && $db_is_system_schema)) {
                 // table name is needed to avoid running
                 // PhpMyAdmin\RelationCleanup::database() on the whole db later
                 'table' => $GLOBALS['table'],
-            )
+            ]
         );
     }
     $response->addHTML(
diff --git a/tbl_relation.php b/tbl_relation.php
index 4f1cdd9c4a..f70bdd2222 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -37,12 +37,12 @@ $container->alias('response', 'PhpMyAdmin\Response');
 $db = $container->get('db');
 $table = $container->get('table');
 $dbi = $container->get('dbi');
-$options_array = array(
+$options_array = [
     'CASCADE' => 'CASCADE',
     'SET_NULL' => 'SET NULL',
     'NO_ACTION' => 'NO ACTION',
     'RESTRICT' => 'RESTRICT',
-);
+];
 $relation = new Relation();
 $cfgRelation = $relation->getRelationsParam();
 $tbl_storage_engine = mb_strtoupper(
@@ -50,12 +50,12 @@ $tbl_storage_engine = mb_strtoupper(
 );
 $upd_query = new Table($table, $db, $dbi);
 
-$dependency_definitions = array(
+$dependency_definitions = [
     "options_array" => $options_array,
     "cfgRelation" => $cfgRelation,
     "tbl_storage_engine" => $tbl_storage_engine,
     "upd_query" => $upd_query
-);
+];
 if ($cfgRelation['relwork']) {
     $dependency_definitions['existrel'] = $relation->getForeigners(
         $db, $table, '', 'internal'
diff --git a/tbl_replace.php b/tbl_replace.php
index 9d7b73062b..ca9bf81ee8 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -30,7 +30,7 @@ use PhpMyAdmin\Util;
 require_once 'libraries/common.inc.php';
 
 // Check parameters
-Util::checkParameters(array('db', 'table', 'goto'));
+Util::checkParameters(['db', 'table', 'goto']);
 
 $GLOBALS['dbi']->selectDb($GLOBALS['db']);
 
@@ -55,7 +55,7 @@ $insertEdit = new InsertEdit($GLOBALS['dbi']);
 // check whether insert row mode, if so include tbl_change.php
 $insertEdit->isInsertRow();
 
-$after_insert_actions = array('new_insert', 'same_insert', 'edit_next');
+$after_insert_actions = ['new_insert', 'same_insert', 'edit_next'];
 if (isset($_REQUEST['after_insert'])
     && in_array($_REQUEST['after_insert'], $after_insert_actions)
 ) {
@@ -82,9 +82,9 @@ $err_url = $insertEdit->getErrorUrl($url_params);
 list($loop_array, $using_key, $is_insert, $is_insertignore)
     = $insertEdit->getParamsForUpdateOrInsert();
 
-$query = array();
-$value_sets = array();
-$func_no_param = array(
+$query = [];
+$value_sets = [];
+$func_no_param = [
     'CONNECTION_ID',
     'CURRENT_USER',
     'CURDATE',
@@ -105,13 +105,13 @@ $func_no_param = array(
     'UUID',
     'UUID_SHORT',
     'VERSION',
-);
-$func_optional_param = array(
+];
+$func_optional_param = [
     'RAND',
     'UNIX_TIMESTAMP',
-);
+];
 
-$gis_from_text_functions = array(
+$gis_from_text_functions = [
     'GeomFromText',
     'GeomCollFromText',
     'LineFromText',
@@ -120,9 +120,9 @@ $gis_from_text_functions = array(
     'MPointFromText',
     'PolyFromText',
     'MPolyFromText',
-);
+];
 
-$gis_from_wkb_functions = array(
+$gis_from_wkb_functions = [
     'GeomFromWKB',
     'GeomCollFromWKB',
     'LineFromWKB',
@@ -131,18 +131,18 @@ $gis_from_wkb_functions = array(
     'MPointFromWKB',
     'PolyFromWKB',
     'MPolyFromWKB',
-);
+];
 
 //if some posted fields need to be transformed.
 $mime_map = $transformations->getMime($GLOBALS['db'], $GLOBALS['table']);
 if ($mime_map === false) {
-    $mime_map = array();
+    $mime_map = [];
 }
 
-$query_fields = array();
-$insert_errors = array();
+$query_fields = [];
+$insert_errors = [];
 $row_skipped = false;
-$unsaved_values = array();
+$unsaved_values = [];
 foreach ($loop_array as $rownumber => $where_clause) {
     // skip fields to be ignored
     if (! $using_key && isset($_REQUEST['insert_ignore_' . $where_clause])) {
@@ -150,17 +150,17 @@ foreach ($loop_array as $rownumber => $where_clause) {
     }
 
     // Defines the SET part of the sql query
-    $query_values = array();
+    $query_values = [];
 
     // Map multi-edit keys to single-level arrays, dependent on how we got the fields
     $multi_edit_columns
         = isset($_REQUEST['fields']['multi_edit'][$rownumber])
         ? $_REQUEST['fields']['multi_edit'][$rownumber]
-        : array();
+        : [];
     $multi_edit_columns_name
         = isset($_REQUEST['fields_name']['multi_edit'][$rownumber])
         ? $_REQUEST['fields_name']['multi_edit'][$rownumber]
-        : array();
+        : [];
     $multi_edit_columns_prev
         = isset($_REQUEST['fields_prev']['multi_edit'][$rownumber])
         ? $_REQUEST['fields_prev']['multi_edit'][$rownumber]
@@ -389,7 +389,7 @@ if ($response->isAjax() && ! isset($_POST['ajax_page_request'])) {
 
         $map = $relation->getForeigners($db, $table, '', 'both');
 
-        $relation_fields = array();
+        $relation_fields = [];
         parse_str($_REQUEST['rel_fields_list'], $relation_fields);
 
         // loop for each relation cell
@@ -412,16 +412,16 @@ if ($response->isAjax() && ! isset($_POST['ajax_page_request'])) {
     if (isset($_REQUEST['do_transformations'])
         && $_REQUEST['do_transformations'] == true
     ) {
-        $edited_values = array();
+        $edited_values = [];
         parse_str($_REQUEST['transform_fields_list'], $edited_values);
 
         if (! isset($extra_data)) {
-            $extra_data = array();
+            $extra_data = [];
         }
-        $transformation_types = array(
+        $transformation_types = [
             "input_transformation",
             "transformation"
-        );
+        ];
         foreach ($mime_map as $transformation) {
             $column_name = $transformation['column_name'];
             foreach ($transformation_types as $type) {
diff --git a/tbl_row_action.php b/tbl_row_action.php
index c6fd61e948..48070d9543 100644
--- a/tbl_row_action.php
+++ b/tbl_row_action.php
@@ -84,7 +84,7 @@ if (!empty($submit_mult)) {
         // 'rows_to_delete' checkbox, we use the index of it as the
         // indicating WHERE clause. Then we build the array which is used
         // for the tbl_change.php script.
-        $where_clause = array();
+        $where_clause = [];
         if (isset($_REQUEST['rows_to_delete'])
             && is_array($_REQUEST['rows_to_delete'])
         ) {
@@ -104,7 +104,7 @@ if (!empty($submit_mult)) {
         // 'rows_to_delete' checkbox, we use the index of it as the
         // indicating WHERE clause. Then we build the array which is used
         // for the tbl_change.php script.
-        $where_clause = array();
+        $where_clause = [];
         if (isset($_REQUEST['rows_to_delete'])
             && is_array($_REQUEST['rows_to_delete'])
         ) {
diff --git a/tbl_select.php b/tbl_select.php
index c4be2746ec..76e1d0f4df 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -29,10 +29,10 @@ $container->set('PhpMyAdmin\Response', Response::getInstance());
 $container->alias('response', 'PhpMyAdmin\Response');
 
 /* Define dependencies for the concerned controller */
-$dependency_definitions = array(
+$dependency_definitions = [
     'searchType' => 'normal',
     'url_query' => &$url_query
-);
+];
 
 /** @var TableSearchController $controller */
 $controller = $container->get('TableSearchController', $dependency_definitions);
diff --git a/tbl_structure.php b/tbl_structure.php
index 3a992a5b4a..728fb06f96 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -42,7 +42,7 @@ if ($table_class_object->isView()) {
 $tbl_collation = $table_class_object->getCollation();
 $table_info_num_rows = $table_class_object->getNumRows();
 /* Define dependencies for the concerned controller */
-$dependency_definitions = array(
+$dependency_definitions = [
     'db' => $db,
     'table' => $table,
     'db_is_system_schema' => $db_is_system_schema,
@@ -51,7 +51,7 @@ $dependency_definitions = array(
     'table_info_num_rows' => $table_info_num_rows,
     'tbl_collation' => $tbl_collation,
     'showtable' => $GLOBALS['showtable']
-);
+];
 
 /** @var TableStructureController $controller */
 $controller = $container->get('TableStructureController', $dependency_definitions);
diff --git a/tbl_tracking.php b/tbl_tracking.php
index 308bde5fe8..a90cf455b3 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -203,7 +203,7 @@ $html .= $tracking->getHtmlForDataDefinitionAndManipulationStatements(
     'tbl_tracking.php' . $url_query,
     $last_version,
     $GLOBALS['db'],
-    array($GLOBALS['table']),
+    [$GLOBALS['table']],
     $type
 );
 
diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
index d54e3ac5cd..5b56d50552 100644
--- a/tbl_zoom_select.php
+++ b/tbl_zoom_select.php
@@ -27,10 +27,10 @@ $container->set('PhpMyAdmin\Response', Response::getInstance());
 $container->alias('response', 'PhpMyAdmin\Response');
 
 /* Define dependencies for the concerned controller */
-$dependency_definitions = array(
+$dependency_definitions = [
     'searchType' => 'zoom',
     'url_query' => &$url_query
-);
+];
 
 /** @var PhpMyAdmin\Controllers\Table\TableSearchController $controller */
 $controller = $container->get('TableSearchController', $dependency_definitions);
diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php
index b22ddaf5eb..47979a26d5 100644
--- a/test/bootstrap-dist.php
+++ b/test/bootstrap-dist.php
@@ -30,7 +30,7 @@ define('PHPMYADMIN', 1);
 define('TESTSUITE', 1);
 
 // Selenium tests setup
-$test_defaults = array(
+$test_defaults = [
     'TESTSUITE_SERVER' => 'localhost',
     'TESTSUITE_USER' => 'root',
     'TESTSUITE_PASSWORD' => '',
@@ -44,7 +44,7 @@ $test_defaults = array(
     'TESTSUITE_BROWSERSTACK_KEY' => '',
     'TESTSUITE_FULL' => '',
     'CI_MODE' => ''
-);
+];
 if (PHP_SAPI == 'cli') {
     foreach ($test_defaults as $varname => $defvalue) {
         $envvar = getenv($varname);
diff --git a/test/classes/AdvisorTest.php b/test/classes/AdvisorTest.php
index fae6e2dd35..69c2e8b465 100644
--- a/test/classes/AdvisorTest.php
+++ b/test/classes/AdvisorTest.php
@@ -56,12 +56,12 @@ class AdvisorTest extends PmaTestCase
      */
     public function escapeStrings()
     {
-        return array(
-            array('80%', '80%%'),
-            array('%s%', '%s%%'),
-            array('80% foo', '80%% foo'),
-            array('%s% foo', '%s%% foo'),
-            );
+        return [
+            ['80%', '80%%'],
+            ['%s%', '%s%%'],
+            ['80% foo', '80%% foo'],
+            ['%s% foo', '%s%% foo'],
+            ];
     }
 
     /**
@@ -73,7 +73,7 @@ class AdvisorTest extends PmaTestCase
     {
         $advisor = new Advisor($GLOBALS['dbi'], new ExpressionLanguage());
         $parseResult = $advisor->parseRulesFile();
-        $this->assertEquals($parseResult['errors'], array());
+        $this->assertEquals($parseResult['errors'], []);
     }
 
     /**
@@ -97,13 +97,13 @@ class AdvisorTest extends PmaTestCase
      */
     public function advisorTimes()
     {
-        return array(
-            array(10, "10 per second"),
-            array(0.02, "1.2 per minute"),
-            array(0.003, "10.8 per hour"),
-            array(0.00003, "2.59 per day"),
-            array(0.0000000003, "<0.01 per day"),
-        );
+        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"],
+        ];
     }
 
     /**
@@ -136,15 +136,15 @@ class AdvisorTest extends PmaTestCase
     {
         $advisor = new Advisor($GLOBALS['dbi'], new ExpressionLanguage());
         $parseResult = $advisor->parseRulesFile();
-        $this->assertEquals($parseResult['errors'], array());
+        $this->assertEquals($parseResult['errors'], []);
         $advisor->setVariable('value', 0);
         $advisor->addRule('fired', $rule);
         $runResult = $advisor->getRunResult();
         if (isset($runResult['errors']) || !is_null($error)) {
-            $this->assertEquals(array($error), $runResult['errors']);
+            $this->assertEquals([$error], $runResult['errors']);
         }
-        if (isset($runResult['fired']) || $expected != array()) {
-            $this->assertEquals(array($expected), $runResult['fired']);
+        if (isset($runResult['fired']) || $expected != []) {
+            $this->assertEquals([$expected], $runResult['fired']);
         }
     }
 
@@ -155,186 +155,186 @@ class AdvisorTest extends PmaTestCase
      */
     public function rulesProvider()
     {
-        return array(
-            array(
-                array(
+        return [
+            [
+                [
                     'justification' => 'foo',
                     'name' => 'Basic',
                     'issue' => 'issue',
                     'recommendation' => 'Recommend'
-                ),
-                array(
+                ],
+                [
                     'justification' => 'foo',
                     'id' => 'Basic',
                     'name' => 'Basic',
                     'issue' => 'issue',
                     'recommendation' => 'Recommend'
-                ),
+                ],
                 null,
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'justification' => 'foo',
                     'name' => 'Variable',
                     'issue' => 'issue',
                     'recommendation' => 'Recommend {status_var}'
-                ),
-                array(
+                ],
+                [
                     'justification' => 'foo',
                     'id' => 'Variable',
                     'name' => 'Variable',
                     'issue' => 'issue',
                     'recommendation' => 'Recommend <a href="server_variables.php?' .
                     'filter=status_var&amp;lang=en">status_var</a>'
-                ),
+                ],
                 null,
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'justification' => '%s foo | value',
                     'name' => 'Format',
                     'issue' => 'issue',
                     'recommendation' => 'Recommend'
-                ),
-                array(
+                ],
+                [
                     'justification' => '0 foo',
                     'id' => 'Format',
                     'name' => 'Format',
                     'issue' => 'issue',
                     'recommendation' => 'Recommend'
-                ),
+                ],
                 null,
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'justification' => '%s% foo | value',
                     'name' => 'Percent',
                     'issue' => 'issue',
                     'recommendation' => 'Recommend'
-                ),
-                array(
+                ],
+                [
                     'justification' => '0% foo',
                     'id' => 'Percent',
                     'name' => 'Percent',
                     'issue' => 'issue',
                     'recommendation' => 'Recommend'
-                ),
+                ],
                 null,
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'justification' => '%s% %d foo | value, value',
                     'name' => 'Double',
                     'issue' => 'issue',
                     'recommendation' => 'Recommend'
-                ),
-                array(
+                ],
+                [
                     'justification' => '0% 0 foo',
                     'id' => 'Double',
                     'name' => 'Double',
                     'issue' => 'issue',
                     'recommendation' => 'Recommend'
-                ),
+                ],
                 null,
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'justification' => '"\'foo',
                     'name' => 'Quotes',
                     'issue' => 'issue',
                     'recommendation' => 'Recommend"\''
-                ),
-                array(
+                ],
+                [
                     'justification' => '"\'foo',
                     'id' => 'Quotes',
                     'name' => 'Quotes',
                     'issue' => 'issue',
                     'recommendation' => 'Recommend"\''
-                ),
+                ],
                 null,
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'justification' => 'foo | fsafdsa',
                     'name' => 'Failure',
                     'issue' => 'issue',
                     'recommendation' => 'Recommend'
-                ),
-                array(),
+                ],
+                [],
                 'Failed formatting string for rule \'Failure\'. ' .
                 'Error when evaluating: Variable "fsafdsa" is not ' .
                 'valid around position 2 for expression `[fsafdsa]`.'
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'justification' => 'Version string (%s) | value',
                     'name' => 'Distribution',
                     'issue' => 'official MySQL binaries.',
                     'recommendation' => 'See <a href="https://example.com/">web</a>',
-                ),
-                array(
+                ],
+                [
                     'justification' => 'Version string (0)',
                     'name' => 'Distribution',
                     'issue' => 'official MySQL binaries.',
                     'recommendation' => 'See <a href="./url.php?url=https%3A%2F%2F' .
                         'example.com%2F" target="_blank" rel="noopener noreferrer">web</a>',
                     'id' => 'Distribution'
-                ),
+                ],
                 null,
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'justification' => 'Timestamp (%s) | ADVISOR_timespanFormat(1377027)',
                     'name' => 'Distribution',
                     'issue' => 'official MySQL binaries.',
                     'recommendation' => 'See <a href="https://example.com/">web</a>',
-                ),
-                array(
+                ],
+                [
                     'justification' => 'Timestamp (15 days, 22 hours, 30 minutes and 27 seconds)',
                     'name' => 'Distribution',
                     'issue' => 'official MySQL binaries.',
                     'recommendation' => 'See <a href="./url.php?url=https%3A%2F%2F' .
                         'example.com%2F" target="_blank" rel="noopener noreferrer">web</a>',
                     'id' => 'Distribution'
-                ),
+                ],
                 null,
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'justification' => 'Memory: %s | ADVISOR_formatByteDown(1000000, 2, 2)',
                     'name' => 'Distribution',
                     'issue' => 'official MySQL binaries.',
                     'recommendation' => 'See <a href="https://example.com/">web</a>',
-                ),
-                array(
+                ],
+                [
                     'justification' => 'Memory: 0.95 MiB',
                     'name' => 'Distribution',
                     'issue' => 'official MySQL binaries.',
                     'recommendation' => 'See <a href="./url.php?url=https%3A%2F%2F' .
                         'example.com%2F" target="_blank" rel="noopener noreferrer">web</a>',
                     'id' => 'Distribution'
-                ),
+                ],
                 null,
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'justification' => 'Time: %s | ADVISOR_bytime(0.02, 2)',
                     'name' => 'Distribution',
                     'issue' => 'official MySQL binaries.',
                     'recommendation' => 'See <a href="https://example.com/">web</a>',
-                ),
-                array(
+                ],
+                [
                     'justification' => 'Time: 1.2 per minute',
                     'name' => 'Distribution',
                     'issue' => 'official MySQL binaries.',
                     'recommendation' => 'See <a href="./url.php?url=https%3A%2F%2F' .
                         'example.com%2F" target="_blank" rel="noopener noreferrer">web</a>',
                     'id' => 'Distribution'
-                ),
+                ],
                 null,
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'justification' => 'Current version: %s | value',
                     'name' => 'Minor Version',
                     'precondition' => '! fired(\'Release Series\')',
@@ -342,8 +342,8 @@ class AdvisorTest extends PmaTestCase
                     'recommendation' => 'You should upgrade',
                     'formula' => 'version',
                     'test' => "substr(value,0,2) <= '5.' && substr(value,2,1) <= 1 && substr(value,4,2) < 30",
-                ),
-                array(
+                ],
+                [
                     'justification' => 'Current version: 0',
                     'name' => 'Minor Version',
                     'issue' => 'Version less than 5.1.30',
@@ -352,9 +352,9 @@ class AdvisorTest extends PmaTestCase
                     'precondition' => '! fired(\'Release Series\')',
                     'formula' => 'version',
                     'test' => "substr(value,0,2) <= '5.' && substr(value,2,1) <= 1 && substr(value,4,2) < 30",
-                ),
+                ],
                 null,
-            ),
-        );
+            ],
+        ];
     }
 }
diff --git a/test/classes/BookmarkTest.php b/test/classes/BookmarkTest.php
index ac4a11ff8f..3817728b16 100644
--- a/test/classes/BookmarkTest.php
+++ b/test/classes/BookmarkTest.php
@@ -55,7 +55,7 @@ class BookmarkTest extends TestCase
     public function testGetList()
     {
         $this->assertEquals(
-            array(),
+            [],
             Bookmark::getList(
                 $GLOBALS['dbi'],
                 $GLOBALS['cfg']['Server']['user'],
@@ -88,12 +88,12 @@ class BookmarkTest extends TestCase
      */
     public function testSave()
     {
-        $bookmarkData = array(
+        $bookmarkData = [
             'bkm_database' => 'phpmyadmin',
             'bkm_user' => 'root',
             'bkm_sql_query' => 'SELECT "phpmyadmin"',
             'bkm_label' => 'bookmark1',
-        );
+        ];
 
         $bookmark = Bookmark::createBookmark(
             $GLOBALS['dbi'],
diff --git a/test/classes/BrowseForeignersTest.php b/test/classes/BrowseForeignersTest.php
index 231546b5bc..ba84ddc9c1 100644
--- a/test/classes/BrowseForeignersTest.php
+++ b/test/classes/BrowseForeignersTest.php
@@ -110,8 +110,8 @@ class BrowseForeignersTest extends TestCase
         );
 
         $_REQUEST['pos'] = 15;
-        $foreignData = array();
-        $foreignData['disp_row'] = array();
+        $foreignData = [];
+        $foreignData['disp_row'] = [];
         $foreignData['the_total'] = 5;
 
         $this->assertEquals(
@@ -165,7 +165,7 @@ class BrowseForeignersTest extends TestCase
         $desc = 'foobar<baz';
 
         $this->assertEquals(
-            array('foobar&lt;baz', ''),
+            ['foobar&lt;baz', ''],
             $this->callProtectedMethod(
                 'getDescriptionAndTitle',
                 [$desc]
@@ -175,7 +175,7 @@ class BrowseForeignersTest extends TestCase
         $browseForeigners = new BrowseForeigners(5, 25, 100, false, '');
 
         $this->assertEquals(
-            array('fooba...', 'foobar&lt;baz'),
+            ['fooba...', 'foobar&lt;baz'],
             $this->callProtectedMethod(
                 'getDescriptionAndTitle',
                 [$desc],
@@ -194,7 +194,7 @@ class BrowseForeignersTest extends TestCase
         $db = '';
         $table = '';
         $field = 'foo';
-        $foreignData = array();
+        $foreignData = [];
         $foreignData['disp_row'] = '';
         $fieldkey = 'bar';
         $current_value = '';
@@ -269,7 +269,7 @@ class BrowseForeignersTest extends TestCase
             $result
         );
 
-        $foreignData['disp_row'] = array();
+        $foreignData['disp_row'] = [];
         $foreignData['the_total'] = 5;
         $result = $this->browseForeigners->getHtmlForRelationalFieldSelection(
             $db,
diff --git a/test/classes/CentralColumnsTest.php b/test/classes/CentralColumnsTest.php
index eeb0286600..16816e76ea 100644
--- a/test/classes/CentralColumnsTest.php
+++ b/test/classes/CentralColumnsTest.php
@@ -29,42 +29,42 @@ class CentralColumnsTest extends TestCase
 {
     private $centralColumns;
 
-    private $columnData = array(
-        array(
+    private $columnData = [
+        [
             'col_name' => "id", "col_type" => 'integer',
             'col_length' => 0, 'col_isNull' => 0,
             'col_extra' => 'UNSIGNED,auto_increment',
             'col_default' => 1, 'col_collation' => ''
-        ),
-        array('col_name' => "col1", 'col_type' => 'varchar',
+        ],
+        ['col_name' => "col1", 'col_type' => 'varchar',
             'col_length' => 100, 'col_isNull' => 1, 'col_extra' => 'BINARY',
             'col_default' => 1, 'col_collation' => ''
-        ),
-        array(
+        ],
+        [
             'col_name' => "col2", 'col_type' => 'DATETIME',
             'col_length' => 0, 'col_isNull' => 1,
             'col_extra' => 'on update CURRENT_TIMESTAMP',
             'col_default' => 'CURRENT_TIMESTAMP', 'col_collation' => ''
-        )
-    );
+        ]
+    ];
 
-    private $modifiedColumnData = array(
-        array(
+    private $modifiedColumnData = [
+        [
             'col_name' => "id", "col_type" => 'integer',
             'col_length' => 0, 'col_isNull' => 0, 'col_extra' => 'auto_increment',
             'col_default' => 1, 'col_collation' => '', 'col_attribute' => 'UNSIGNED'
-        ),
-        array('col_name' => "col1", 'col_type' => 'varchar',
+        ],
+        ['col_name' => "col1", 'col_type' => 'varchar',
             'col_length' => 100, 'col_isNull' => 1, 'col_extra' => '',
             'col_default' => 1, 'col_collation' => '', 'col_attribute' => 'BINARY'
-        ),
-        array(
+        ],
+        [
             'col_name' => "col2", 'col_type' => 'DATETIME',
             'col_length' => 0, 'col_isNull' => 1, 'col_extra' => '',
             'col_default' => 'CURRENT_TIMESTAMP', 'col_collation' => '',
             'col_attribute' => 'on update CURRENT_TIMESTAMP'
-        )
-    );
+        ]
+    ];
 
     /**
      * prepares environment for tests
@@ -86,14 +86,14 @@ class CentralColumnsTest extends TestCase
 
         //$_SESSION
         $GLOBALS['server'] = 1;
-        $_SESSION['relation'][1] = array(
+        $_SESSION['relation'][1] = [
             'PMA_VERSION' => PMA_VERSION,
             'centralcolumnswork' => true,
             'relwork' => 1,
             'db' => 'phpmyadmin',
             'relation' => 'relation',
             'central_columns' => 'pma_central_columns'
-        );
+        ];
 
         // mock DBI
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
@@ -110,23 +110,23 @@ class CentralColumnsTest extends TestCase
             ->method('getColumns')
             ->will(
                 $this->returnValue(
-                    array(
-                        "id"=>array("Type"=>"integer", "Null"=>"NO"),
-                        "col1"=>array("Type"=>'varchar(100)', "Null"=>"YES"),
-                        "col2"=>array("Type"=>'DATETIME', "Null"=>"NO")
-                    )
+                    [
+                        "id"=>["Type"=>"integer", "Null"=>"NO"],
+                        "col1"=>["Type"=>'varchar(100)', "Null"=>"YES"],
+                        "col2"=>["Type"=>'DATETIME', "Null"=>"NO"]
+                    ]
                 )
             );
         $dbi->expects($this->any())
             ->method('getColumnNames')
-            ->will($this->returnValue(array("id", "col1", "col2")));
+            ->will($this->returnValue(["id", "col1", "col2"]));
         $dbi->expects($this->any())
             ->method('tryQuery')
             ->will($this->returnValue(true));
         $dbi->expects($this->any())
             ->method('getTables')
             ->will(
-                $this->returnValue(array("PMA_table", "PMA_table1", "PMA_table2"))
+                $this->returnValue(["PMA_table", "PMA_table1", "PMA_table2"])
             );
         $dbi->expects($this->any())->method('escapeString')
             ->will($this->returnArgument(0));
@@ -165,11 +165,11 @@ class CentralColumnsTest extends TestCase
     public function testGetParams()
     {
         $this->assertSame(
-            array(
+            [
                 'user' => 'pma_user',
                 'db' => 'phpmyadmin',
                 'table' => 'pma_central_columns'
-            ),
+            ],
             $this->centralColumns->getParams()
         );
     }
@@ -213,7 +213,7 @@ class CentralColumnsTest extends TestCase
                 null, null, DatabaseInterface::CONNECT_CONTROL
             )
             ->will(
-                $this->returnValue(array(3))
+                $this->returnValue([3])
             );
 
         $this->assertEquals(
@@ -234,7 +234,7 @@ class CentralColumnsTest extends TestCase
 
         $this->assertTrue(
             $this->centralColumns->syncUniqueColumns(
-                array('PMA_table')
+                ['PMA_table']
             )
         );
     }
@@ -258,7 +258,7 @@ class CentralColumnsTest extends TestCase
                 null, null, DatabaseInterface::CONNECT_CONTROL
             )
             ->will(
-                $this->returnValue(array('col1'))
+                $this->returnValue(['col1'])
             );
 
         $GLOBALS['dbi']->expects($this->at(7))
@@ -269,12 +269,12 @@ class CentralColumnsTest extends TestCase
                 DatabaseInterface::CONNECT_CONTROL
             )
             ->will(
-                $this->returnValue(array('col1'))
+                $this->returnValue(['col1'])
             );
 
         $this->assertTrue(
             $this->centralColumns->deleteColumnsFromList(
-                array("col1"),
+                ["col1"],
                 false
             )
         );
@@ -282,14 +282,14 @@ class CentralColumnsTest extends TestCase
         // when column does not exist in the central column list
         $this->assertInstanceOf(
             'PhpMyAdmin\Message', $this->centralColumns->deleteColumnsFromList(
-                array('column1'),
+                ['column1'],
                 false
             )
         );
 
         $this->assertInstanceOf(
             'PhpMyAdmin\Message', $this->centralColumns->deleteColumnsFromList(
-                array('PMA_table')
+                ['PMA_table']
             )
         );
     }
@@ -314,7 +314,7 @@ class CentralColumnsTest extends TestCase
         $this->assertTrue(
             $this->centralColumns->makeConsistentWithList(
                 "phpmyadmin",
-                array('PMA_table')
+                ['PMA_table']
             )
         );
     }
@@ -337,10 +337,10 @@ class CentralColumnsTest extends TestCase
                 null, null, DatabaseInterface::CONNECT_CONTROL
             )
             ->will(
-                $this->returnValue(array('id','col1'))
+                $this->returnValue(['id','col1'])
             );
         $this->assertEquals(
-            array("id", "col1"),
+            ["id", "col1"],
             $this->centralColumns->getFromTable(
                 $db,
                 $table
@@ -405,14 +405,14 @@ class CentralColumnsTest extends TestCase
     public function testUpdateMultipleColumn()
     {
         $_POST['db'] = 'phpmyadmin';
-        $_POST['orig_col_name'] = array("col1","col2");
-        $_POST['field_name'] = array("col1","col2");
-        $_POST['field_default_type'] = array("","");
-        $_POST['col_extra'] = array("","");
-        $_POST['field_length'] = array("","");
-        $_POST['field_attribute'] = array("","");
-        $_POST['field_type'] = array("","");
-        $_POST['field_collation'] = array("","");
+        $_POST['orig_col_name'] = ["col1","col2"];
+        $_POST['field_name'] = ["col1","col2"];
+        $_POST['field_default_type'] = ["",""];
+        $_POST['col_extra'] = ["",""];
+        $_POST['field_length'] = ["",""];
+        $_POST['field_attribute'] = ["",""];
+        $_POST['field_type'] = ["",""];
+        $_POST['field_collation'] = ["",""];
         $this->assertTrue(
             $this->centralColumns->updateMultipleColumn()
         );
@@ -437,17 +437,17 @@ class CentralColumnsTest extends TestCase
                 $this->returnValue($this->columnData)
             );
         $result = $this->centralColumns->getHtmlForEditingPage(
-            array("col1", "col2"),
+            ["col1", "col2"],
             'phpmyadmin'
         );
         $this->assertContains(
             '<form',
             $result
         );
-        $header_cells = array(
+        $header_cells = [
         __('Name'), __('Type'), __('Length/Values'), __('Default'),
         __('Collation'), __('Attributes'), __('Null'), __('A_I')
-        );
+        ];
         $this->assertContains(
             $this->callProtectedMethod(
                 'getEditTableHeader',
diff --git a/test/classes/CharsetsTest.php b/test/classes/CharsetsTest.php
index 4e19be3d2d..e119a24163 100644
--- a/test/classes/CharsetsTest.php
+++ b/test/classes/CharsetsTest.php
@@ -53,97 +53,97 @@ class CharsetsTest extends TestCase
      */
     public function collationDescr()
     {
-        return array(
-            array('binary', 'Binary'),
-            array('foo_bulgarian_bar', 'Bulgarian'),
-            array('gb2312_chinese', 'Simplified Chinese'),
-            array('gbk_chinese', 'Simplified Chinese'),
-            array('big5_chinese_ci', 'Traditional Chinese, case-insensitive'),
-            array('big5_chinese', 'Traditional Chinese'),
-            array('foo_ci_bar', 'Unknown, case-insensitive'),
-            array('foo_croatian_bar', 'Croatian'),
-            array('foo_czech_bar', 'Czech'),
-            array('foo_danish_bar', 'Danish'),
-            array('foo_english_bar', 'English'),
-            array('foo_esperanto_bar', 'Esperanto'),
-            array('foo_estonian_bar', 'Estonian'),
-            array('foo_german1_bar', 'German (dictionary order)'),
-            array('foo_german2_bar', 'German (phone book order)'),
-            array('foo_hungarian_bar', 'Hungarian'),
-            array('foo_icelandic_bar', 'Icelandic'),
-            array('foo_japanese_bar', 'Japanese'),
-            array('foo_latvian_bar', 'Latvian'),
-            array('foo_lithuanian_bar', 'Lithuanian'),
-            array('foo_korean_bar', 'Korean'),
-            array('foo_persian_bar', 'Persian'),
-            array('foo_polish_bar', 'Polish'),
-            array('foo_roman_bar', 'West European'),
-            array('foo_romanian_bar', 'Romanian'),
-            array('foo_slovak_bar', 'Slovak'),
-            array('foo_slovenian_bar', 'Slovenian'),
-            array('foo_spanish_bar', 'Spanish (modern)'),
-            array('foo_spanish2_bar', 'Spanish (traditional)'),
-            array('foo_swedish_bar', 'Swedish'),
-            array('foo_thai_bar', 'Thai'),
-            array('foo_turkish_bar', 'Turkish'),
-            array('foo_ukrainian_bar', 'Ukrainian'),
-            array('foo_unicode_bar', 'Unicode'),
-            array('ucs2', 'Unicode'),
-            array('utf8', 'Unicode'),
-            array('ascii', 'West European'),
-            array('cp850', 'West European'),
-            array('dec8', 'West European'),
-            array('hp8', 'West European'),
-            array('latin1', 'West European'),
-            array('cp1250', 'Central European'),
-            array('cp852', 'Central European'),
-            array('latin2', 'Central European'),
-            array('macce', 'Central European'),
-            array('cp866', 'Russian'),
-            array('koi8r', 'Russian'),
-            array('gb2312', 'Simplified Chinese'),
-            array('gbk', 'Simplified Chinese'),
-            array('sjis', 'Japanese'),
-            array('ujis', 'Japanese'),
-            array('cp932', 'Japanese'),
-            array('eucjpms', 'Japanese'),
-            array('cp1257', 'Baltic'),
-            array('latin7', 'Baltic'),
-            array('armscii8', 'Armenian'),
-            array('armscii', 'Armenian'),
-            array('big5', 'Traditional Chinese'),
-            array('cp1251', 'Cyrillic'),
-            array('cp1256', 'Arabic'),
-            array('euckr', 'Korean'),
-            array('hebrew', 'Hebrew'),
-            array('geostd8', 'Georgian'),
-            array('greek', 'Greek'),
-            array('keybcs2', 'Czech-Slovak'),
-            array('koi8u', 'Ukrainian'),
-            array('latin5', 'Turkish'),
-            array('swe7', 'Swedish'),
-            array('tis620', 'Thai'),
-            array('foobar', 'Unknown'),
-            array('foo_test_bar', 'Unknown'),
-            array('foo_bin_bar', 'Unknown, binary'),
-            array('utf8mb4_0900_ai_ci', 'Unicode (UCA 9.0.0), accent-insensitive, case-insensitive'),
-            array('utf8mb4_unicode_520_ci', 'Unicode (UCA 5.2.0), case-insensitive'),
-            array('utf8mb4_unicode_ci', 'Unicode (UCA 4.0.0), case-insensitive'),
-            array('utf8mb4_tr_0900_ai_ci', 'Turkish (UCA 9.0.0), accent-insensitive, case-insensitive'),
-            array('utf8mb4_turkish_ci', 'Turkish (UCA 4.0.0), case-insensitive'),
-            array('utf32_thai_520_w2', 'Thai (UCA 5.2.0), multi-level'),
-            array('utf8mb4_czech_ci', 'Czech (UCA 4.0.0), case-insensitive'),
-            array('cp1250_czech_cs', 'Czech, case-sensitive'),
-            array('latin1_general_ci', 'West European, case-insensitive'),
-            array('utf8mb4_bin', 'Unicode (UCA 4.0.0), binary'),
-            array('utf8mb4_croatian_mysql561_ci', 'Croatian (MySQL 5.6.1), case-insensitive'),
-            array('ucs2_general_mysql500_ci', 'Unicode (MySQL 5.0.0), case-insensitive'),
-            array('utf32_general_ci', 'Unicode, case-insensitive'),
-            array('utf8mb4_es_trad_0900_ai_ci', 'Spanish (traditional) (UCA 9.0.0), accent-insensitive, case-insensitive'),
-            array('utf8mb4_es_0900_ai_ci', 'Spanish (modern) (UCA 9.0.0), accent-insensitive, case-insensitive'),
-            array('utf8mb4_de_pb_0900_ai_ci', 'German (phone book order) (UCA 9.0.0), accent-insensitive, case-insensitive'),
-            array('utf8mb4_de_0900_ai_ci', 'German (dictionary order) (UCA 9.0.0), accent-insensitive, case-insensitive'),
-        );
+        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'],
+            ['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'],
+        ];
     }
 
     /**
diff --git a/test/classes/Config/ConfigFileTest.php b/test/classes/Config/ConfigFileTest.php
index 52cfd8de05..3b2eb5fc5d 100644
--- a/test/classes/Config/ConfigFileTest.php
+++ b/test/classes/Config/ConfigFileTest.php
@@ -65,13 +65,13 @@ class ConfigFileTest extends PmaTestCase
     {
         // Check default dynamic values
         $this->assertEquals(
-            array(),
+            [],
             $this->object->getConfig()
         );
 
         // Check environment state
         $this->assertEquals(
-            array(),
+            [],
             $_SESSION["ConfigFile1"]
         );
 
@@ -94,10 +94,10 @@ class ConfigFileTest extends PmaTestCase
             self::SIMPLE_KEY_WITH_DEFAULT_VALUE
         );
         $default_host = $this->object->getDefault('Servers/1/host');
-        $default_config = array(
+        $default_config = [
             self::SIMPLE_KEY_WITH_DEFAULT_VALUE => $default_simple_value,
             'Servers/1/host' => $default_host,
-            'Servers/2/host' => $default_host);
+            'Servers/2/host' => $default_host];
 
         /**
          * Case 1: set default value, key should not be persisted
@@ -127,7 +127,7 @@ class ConfigFileTest extends PmaTestCase
          */
         $this->object->set('Servers/2/host', $default_host);
         $this->assertEquals(
-            array('Servers' => array(2 => array('host' => $default_host))),
+            ['Servers' => [2 => ['host' => $default_host]]],
             $this->object->getConfig()
         );
     }
@@ -143,13 +143,13 @@ class ConfigFileTest extends PmaTestCase
         /**
          * Case 1: filter should not allow to set b
          */
-        $this->object->setAllowedKeys(array('a', 'c'));
+        $this->object->setAllowedKeys(['a', 'c']);
         $this->object->set('a', 1);
         $this->object->set('b', 2);
         $this->object->set('c', 3);
 
         $this->assertEquals(
-            array('a' => 1, 'c' => 3),
+            ['a' => 1, 'c' => 3],
             $this->object->getConfig()
         );
 
@@ -160,7 +160,7 @@ class ConfigFileTest extends PmaTestCase
         $this->object->set('b', 2);
 
         $this->assertEquals(
-            array('a' => 1, 'b' => 2, 'c' => 3),
+            ['a' => 1, 'b' => 2, 'c' => 3],
             $this->object->getConfig()
         );
     }
@@ -174,21 +174,21 @@ class ConfigFileTest extends PmaTestCase
     public function testConfigReadMapping()
     {
         $this->object->setCfgUpdateReadMapping(
-            array(
+            [
                 '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(array('Servers/value1' => 3));
+        $this->object->updateWithGlobalConfig(['Servers/value1' => 3]);
 
         $this->assertEquals(
-            array('Servers' => array(
-                1 => array(
+            ['Servers' => [
+                1 => [
                     'passthrough1' => 1,
                     'passthrough2' => 2,
-                    'value1' => 3))),
+                    'value1' => 3]]],
             $this->object->getConfig()
         );
         $this->assertEquals(
@@ -222,14 +222,14 @@ class ConfigFileTest extends PmaTestCase
     public function testSetConfigData()
     {
         $this->object->set('abc', 'should be deleted by setConfigData');
-        $this->object->setConfigData(array('a' => 'b'));
+        $this->object->setConfigData(['a' => 'b']);
 
         $this->assertEquals(
-            array('a' => 'b'),
+            ['a' => 'b'],
             $this->object->getConfig()
         );
         $this->assertEquals(
-            array('a' => 'b'),
+            ['a' => 'b'],
             $this->object->getConfigArray()
         );
     }
@@ -266,8 +266,8 @@ class ConfigFileTest extends PmaTestCase
             $this->object->get('key not excist')
         );
         $this->assertEquals(
-            array(1),
-            $this->object->get('key not excist', array(1))
+            [1],
+            $this->object->get('key not excist', [1])
         );
         $default = new stdClass();
         $this->assertInstanceOf(
@@ -307,7 +307,7 @@ class ConfigFileTest extends PmaTestCase
 
         // values are not written when they are the same as in config.inc.php
         $this->object = new ConfigFile(
-            array(self::SIMPLE_KEY_WITH_DEFAULT_VALUE => $default_value)
+            [self::SIMPLE_KEY_WITH_DEFAULT_VALUE => $default_value]
         );
         $this->object->set(self::SIMPLE_KEY_WITH_DEFAULT_VALUE, $default_value);
         $this->assertEmpty($this->object->getConfig());
@@ -316,11 +316,11 @@ class ConfigFileTest extends PmaTestCase
         // allow to overwrite with value from config.default.php
         $config_inc_php_value = $default_value . 'suffix';
         $this->object = new ConfigFile(
-            array(self::SIMPLE_KEY_WITH_DEFAULT_VALUE => $config_inc_php_value)
+            [self::SIMPLE_KEY_WITH_DEFAULT_VALUE => $config_inc_php_value]
         );
         $this->object->set(self::SIMPLE_KEY_WITH_DEFAULT_VALUE, $default_value);
         $this->assertEquals(
-            array(self::SIMPLE_KEY_WITH_DEFAULT_VALUE => $default_value),
+            [self::SIMPLE_KEY_WITH_DEFAULT_VALUE => $default_value],
             $this->object->getConfig()
         );
     }
@@ -348,7 +348,7 @@ class ConfigFileTest extends PmaTestCase
             $localhost_value, $flat_default_config['Servers/1/host']
         );
 
-        $cfg = array();
+        $cfg = [];
         include './libraries/config.default.php';
         // verify that $cfg read from config.default.php is valid
         $this->assertGreaterThanOrEqual(100, count($cfg));
@@ -365,10 +365,10 @@ class ConfigFileTest extends PmaTestCase
     {
         $this->object->set('key', 'value');
         $this->object->set('key2', 'value');
-        $this->object->updateWithGlobalConfig(array('key' => 'ABC'));
+        $this->object->updateWithGlobalConfig(['key' => 'ABC']);
 
         $this->assertEquals(
-            array('key' => 'ABC', 'key2' => 'value'),
+            ['key' => 'ABC', 'key2' => 'value'],
             $this->object->getConfig()
         );
     }
@@ -400,7 +400,7 @@ class ConfigFileTest extends PmaTestCase
      */
     public function testGetDbEntry()
     {
-        $cfg_db = array();
+        $cfg_db = [];
         include './libraries/config.values.php';
         // verify that $cfg_db read from config.values.php is valid
         $this->assertGreaterThanOrEqual(20, count($cfg_db));
@@ -411,8 +411,8 @@ class ConfigFileTest extends PmaTestCase
         );
         $this->assertNull($this->object->getDbEntry('no such key'));
         $this->assertEquals(
-            array(1),
-            $this->object->getDbEntry('no such key', array(1))
+            [1],
+            $this->object->getDbEntry('no such key', [1])
         );
     }
 
@@ -448,11 +448,11 @@ class ConfigFileTest extends PmaTestCase
             $this->object->get('ServerDefault')
         );
         $this->assertEquals(
-            array('Servers' => array(1 => array('x' => 1), 2 => array('x' => 4))),
+            ['Servers' => [1 => ['x' => 1], 2 => ['x' => 4]]],
             $this->object->getConfig()
         );
         $this->assertEquals(
-            array('Servers/1/x' => 1, 'Servers/2/x' => 4),
+            ['Servers/1/x' => 1, 'Servers/2/x' => 4],
             $this->object->getConfigArray()
         );
     }
@@ -469,7 +469,7 @@ class ConfigFileTest extends PmaTestCase
         $this->object->set('Servers/2/x', 'b');
 
         $this->assertEquals(
-            array(1 => array('x' => 'a'), 2 => array('x' => 'b')),
+            [1 => ['x' => 'a'], 2 => ['x' => 'b']],
             $this->object->getServers()
         );
     }
@@ -488,16 +488,16 @@ class ConfigFileTest extends PmaTestCase
         );
 
         $this->object->updateWithGlobalConfig(
-            array(
-                'Servers' => array(
-                    1 => array(
+            [
+                'Servers' => [
+                    1 => [
                         "auth_type" => "config",
                         "user" => "testUser",
                         "host" => "example.com",
                         "port" => "21"
-                    )
-                )
-            )
+                    ]
+                ]
+            ]
         );
         $this->assertEquals(
             "mysqli://testUser@example.com:21",
@@ -505,18 +505,18 @@ class ConfigFileTest extends PmaTestCase
         );
 
         $this->object->updateWithGlobalConfig(
-            array(
-                'Servers' => array(
-                    1 => array(
+            [
+                'Servers' => [
+                    1 => [
                         "auth_type" => "config",
                         "user" => "testUser",
                         "host" => "localhost",
                         "port" => "21",
                         "socket" => "123",
                         "password" => "",
-                    )
-                )
-            )
+                    ]
+                ]
+            ]
         );
         $this->assertEquals(
             "mysqli://testUser@123",
@@ -524,17 +524,17 @@ class ConfigFileTest extends PmaTestCase
         );
 
         $this->object->updateWithGlobalConfig(
-            array(
-                'Servers' => array(
-                    1 => array(
+            [
+                'Servers' => [
+                    1 => [
                         "auth_type" => "config",
                         "user" => "testUser",
                         "host" => "example.com",
                         "port" => "21",
                         "password" => "testPass"
-                    )
-                )
-            )
+                    ]
+                ]
+            ]
         );
         $this->assertEquals(
             "mysqli://testUser:***@example.com:21",
@@ -576,17 +576,17 @@ class ConfigFileTest extends PmaTestCase
      */
     public function testGetConfigArray()
     {
-        $this->object->setPersistKeys(array(self::SIMPLE_KEY_WITH_DEFAULT_VALUE));
-        $this->object->set('Array/test', array('x', 'y'));
+        $this->object->setPersistKeys([self::SIMPLE_KEY_WITH_DEFAULT_VALUE]);
+        $this->object->set('Array/test', ['x', 'y']);
         $default_value = $this->object->getDefault(
             self::SIMPLE_KEY_WITH_DEFAULT_VALUE
         );
 
         $this->assertEquals(
-            array(
+            [
                 self::SIMPLE_KEY_WITH_DEFAULT_VALUE => $default_value,
-                'Array/test' => array('x', 'y')
-            ),
+                'Array/test' => ['x', 'y']
+            ],
             $this->object->getConfigArray()
         );
     }
diff --git a/test/classes/Config/DescriptionTest.php b/test/classes/Config/DescriptionTest.php
index 9f85886ce6..c1cd399f0e 100644
--- a/test/classes/Config/DescriptionTest.php
+++ b/test/classes/Config/DescriptionTest.php
@@ -49,23 +49,23 @@ class DescriptionTest extends PmaTestCase
      */
     public function getValues()
     {
-        return array(
-            array(
+        return [
+            [
                 'AllowArbitraryServer',
                 'name',
                 'Allow login to any MySQL server',
-            ),
-            array(
+            ],
+            [
                 'UnknownSetting',
                 'name',
                 'UnknownSetting',
-            ),
-            array(
+            ],
+            [
                 'UnknownSetting',
                 'desc',
                 '',
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -89,16 +89,16 @@ class DescriptionTest extends PmaTestCase
      */
     public function testAll()
     {
-        $nested = array(
+        $nested = [
             'Export',
             'Import',
             'Schema',
             'DBG',
             'DefaultTransformations',
             'SQLQuery',
-        );
+        ];
 
-        $cfg = array();
+        $cfg = [];
         include './libraries/config.default.php';
         foreach ($cfg as $key => $value) {
             $this->assertGet($key);
diff --git a/test/classes/Config/FormDisplayTemplateTest.php b/test/classes/Config/FormDisplayTemplateTest.php
index 7b10969792..8be1271802 100644
--- a/test/classes/Config/FormDisplayTemplateTest.php
+++ b/test/classes/Config/FormDisplayTemplateTest.php
@@ -40,7 +40,7 @@ class FormDisplayTemplateTest extends TestCase
     {
         $_SERVER['REQUEST_URI'] = 'https://www.phpmyadmin.net';
         $GLOBALS['cfg']['ServerDefault'] = '';
-        $result = FormDisplayTemplate::displayFormTop(null, 'posted', array(1));
+        $result = FormDisplayTemplate::displayFormTop(null, 'posted', [1]);
 
         $this->assertContains(
             '<form method="get" action="https://www.phpmyadmin.net" ' .
@@ -76,7 +76,7 @@ class FormDisplayTemplateTest extends TestCase
      */
     public function testDisplayTabsTop()
     {
-        $result = FormDisplayTemplate::displayTabsTop(array('one', 'two'));
+        $result = FormDisplayTemplate::displayTabsTop(['one', 'two']);
 
         $this->assertContains(
             '<ul class="tabs responsivetable"',
@@ -106,8 +106,8 @@ class FormDisplayTemplateTest extends TestCase
      */
     public function testDisplayFieldsetTop()
     {
-        $attributes = array('name' => 'attrname');
-        $errors = array('e1', 'e2');
+        $attributes = ['name' => 'attrname'];
+        $errors = ['e1', 'e2'];
 
         $result = FormDisplayTemplate::displayFieldsetTop("TitleTest", "DescTest", $errors, $attributes);
 
@@ -150,8 +150,8 @@ class FormDisplayTemplateTest extends TestCase
     public function testDisplayInput()
     {
         $GLOBALS['_FormDislayGroup'] = 1;
-        $opts = array();
-        $opts['errors'] = array('e1');
+        $opts = [];
+        $opts['errors'] = ['e1'];
         $opts['userprefs_allow'] = false;
         $opts['setvalue'] = ':group';
         $opts['doc'] = "https://example.com/";
@@ -220,8 +220,8 @@ class FormDisplayTemplateTest extends TestCase
 
         $GLOBALS['PMA_Config']->set('is_setup', true);
         $GLOBALS['_FormDislayGroup'] = 0;
-        $opts = array();
-        $opts['errors'] = array();
+        $opts = [];
+        $opts['errors'] = [];
         $opts['setvalue'] = 'setVal';
         $opts['comment'] = "testComment";
         $opts['show_restore_default'] = true;
@@ -263,8 +263,8 @@ class FormDisplayTemplateTest extends TestCase
 
         // short_text
         $GLOBALS['_FormDislayGroup'] = 0;
-        $opts = array();
-        $opts['errors'] = array();
+        $opts = [];
+        $opts['errors'] = [];
 
         $result = FormDisplayTemplate::displayInput(
             'test/path', 'testName', 'short_text', 'val',
@@ -291,12 +291,12 @@ class FormDisplayTemplateTest extends TestCase
 
         // select case 1
         $opts['values_escaped'] = true;
-        $opts['values_disabled'] = array(1, 2);
-        $opts['values'] = array(
+        $opts['values_disabled'] = [1, 2];
+        $opts['values'] = [
             1 => 'test',
             'key1' => true,
             'key2' => false,
-        );
+        ];
         $result = FormDisplayTemplate::displayInput(
             'test/path', 'testName', 'select', true,
             '', true, $opts
@@ -323,12 +323,12 @@ class FormDisplayTemplateTest extends TestCase
 
         // select case 2
         $opts['values_escaped'] = false;
-        $opts['values_disabled'] = array(1, 2);
-        $opts['values'] = array(
+        $opts['values_disabled'] = [1, 2];
+        $opts['values'] = [
             'a<b' => 'c&d',
             'key1' => true,
             'key2' => false,
-        );
+        ];
         $result = FormDisplayTemplate::displayInput(
             'test/path', 'testName', 'select', false,
             '', true, $opts
@@ -347,7 +347,7 @@ class FormDisplayTemplateTest extends TestCase
 
         // list
         $result = FormDisplayTemplate::displayInput(
-            'test/path', 'testName', 'list', array('foo', 'bar'),
+            'test/path', 'testName', 'list', ['foo', 'bar'],
             '', true, $opts
         );
 
@@ -486,22 +486,22 @@ class FormDisplayTemplateTest extends TestCase
      */
     public function testAddJsValidate()
     {
-        $validators = array(
-            'one' => array('\\\';', '\r\n\\\'<scrIpt></\' + \'script>'),
-            'two' => array()
-        );
+        $validators = [
+            'one' => ['\\\';', '\r\n\\\'<scrIpt></\' + \'script>'],
+            'two' => []
+        ];
 
-        $js = array();
+        $js = [];
 
         FormDisplayTemplate::addJsValidate('testID', $validators, $js);
 
         $this->assertEquals(
-            array(
+            [
                 'validateField(\'testID\', \'PMA_\\\';\', true, '
                     . '[\'\\\\r\\\\n\\\\\\\''
                     . '<scrIpt></\\\' + \\\'script>\'])',
                 'validateField(\'testID\', \'PMA_\', true)'
-            ),
+            ],
             $js
         );
     }
@@ -514,10 +514,10 @@ class FormDisplayTemplateTest extends TestCase
     public function testDisplayJavascript()
     {
         $this->assertNull(
-            FormDisplayTemplate::displayJavascript(array())
+            FormDisplayTemplate::displayJavascript([])
         );
 
-        $result = FormDisplayTemplate::displayJavascript(array('var i = 1', 'i++'));
+        $result = FormDisplayTemplate::displayJavascript(['var i = 1', 'i++']);
 
         $this->assertEquals(
             '<script type="text/javascript">' . "\n"
@@ -542,7 +542,7 @@ class FormDisplayTemplateTest extends TestCase
      */
     public function testDisplayErrors()
     {
-        $errors = array('<err1>', '&err2');
+        $errors = ['<err1>', '&err2'];
 
         $result = FormDisplayTemplate::displayErrors('err"Name1"', $errors);
 
diff --git a/test/classes/Config/FormDisplayTest.php b/test/classes/Config/FormDisplayTest.php
index 37e5cb03a8..a6837395b9 100644
--- a/test/classes/Config/FormDisplayTest.php
+++ b/test/classes/Config/FormDisplayTest.php
@@ -79,14 +79,14 @@ class FormDisplayTest extends PmaTestCase
         $attrForms = $reflection->getProperty('_forms');
         $attrForms->setAccessible(true);
 
-        $array = array(
-            "Servers" => array(
-                "1" => array(
+        $array = [
+            "Servers" => [
+                "1" => [
                     'test' => 1,
                     1 => ':group:end'
-                )
-            )
-        );
+                ]
+            ]
+        ];
 
         $this->object->registerForm('pma_testform', $array, 2);
         $_forms = $attrForms->getValue($this->object);
@@ -96,18 +96,18 @@ class FormDisplayTest extends PmaTestCase
         );
 
         $this->assertEquals(
-            array(
+            [
                 "Servers/2/test" => "Servers/1/test",
                 "Servers/2/:group:end:0" => "Servers/1/:group:end:0"
-            ),
+            ],
             $this->readAttribute($this->object, '_systemPaths')
         );
 
         $this->assertEquals(
-            array(
+            [
                 "Servers/2/test" => "Servers-2-test",
                 "Servers/2/:group:end:0" => "Servers-2-:group:end:0"
-            ),
+            ],
             $this->readAttribute($this->object, '_translatedPaths')
         );
     }
@@ -126,23 +126,23 @@ class FormDisplayTest extends PmaTestCase
 
         $this->object = $this->getMockBuilder('PhpMyAdmin\Config\FormDisplay')
             ->disableOriginalConstructor()
-            ->setMethods(array('save'))
+            ->setMethods(['save'])
             ->getMock();
 
         $attrForms = new ReflectionProperty('PhpMyAdmin\Config\FormDisplay', '_forms');
         $attrForms->setAccessible(true);
-        $attrForms->setValue($this->object, array(1, 2, 3));
+        $attrForms->setValue($this->object, [1, 2, 3]);
 
         $this->object->expects($this->once())
             ->method('save')
-            ->with(array(0, 1, 2), false)
+            ->with([0, 1, 2], false)
             ->will($this->returnValue(true));
 
         $this->assertTrue(
             $this->object->process(false, false)
         );
 
-        $attrForms->setValue($this->object, array());
+        $attrForms->setValue($this->object, []);
 
         $this->assertFalse(
             $this->object->process(false, false)
@@ -164,20 +164,20 @@ class FormDisplayTest extends PmaTestCase
 
         $attrIsValidated = $reflection->getProperty('_errors');
         $attrIsValidated->setAccessible(true);
-        $attrIsValidated->setValue($this->object, array());
+        $attrIsValidated->setValue($this->object, []);
 
         $this->assertNull(
             $this->object->displayErrors()
         );
 
-        $arr = array(
-            "Servers/1/test" => array('e1'),
-            "foobar" => array('e2', 'e3')
-        );
+        $arr = [
+            "Servers/1/test" => ['e1'],
+            "foobar" => ['e2', 'e3']
+        ];
 
-        $sysArr = array(
+        $sysArr = [
             "Servers/1/test" => "Servers/1/test2"
-        );
+        ];
 
         $attrSystemPaths = $reflection->getProperty('_systemPaths');
         $attrSystemPaths->setAccessible(true);
@@ -209,21 +209,21 @@ class FormDisplayTest extends PmaTestCase
 
         $attrIsValidated = $reflection->getProperty('_errors');
         $attrIsValidated->setAccessible(true);
-        $attrIsValidated->setValue($this->object, array());
+        $attrIsValidated->setValue($this->object, []);
 
         $this->assertNull(
             $this->object->fixErrors()
         );
 
-        $arr = array(
-            "Servers/1/test" => array('e1'),
-            "Servers/2/test" => array('e2', 'e3'),
-            "Servers/3/test" => array()
-        );
+        $arr = [
+            "Servers/1/test" => ['e1'],
+            "Servers/2/test" => ['e2', 'e3'],
+            "Servers/3/test" => []
+        ];
 
-        $sysArr = array(
+        $sysArr = [
             "Servers/1/test" => "Servers/1/host"
-        );
+        ];
 
         $attrSystemPaths = $reflection->getProperty('_systemPaths');
         $attrSystemPaths->setAccessible(true);
@@ -234,13 +234,13 @@ class FormDisplayTest extends PmaTestCase
         $this->object->fixErrors();
 
         $this->assertEquals(
-            array(
-                'Servers' => array(
-                    '1' => array(
+            [
+                'Servers' => [
+                    '1' => [
                         'test' => 'localhost'
-                    )
-                )
-            ),
+                    ]
+                ]
+            ],
             $_SESSION['ConfigFile0']
         );
     }
@@ -258,21 +258,21 @@ class FormDisplayTest extends PmaTestCase
         );
         $attrValidateSelect->setAccessible(true);
 
-        $arr = array('foo' => 'var');
+        $arr = ['foo' => 'var'];
         $value = 'foo';
         $this->assertTrue(
             $attrValidateSelect->invokeArgs(
                 $this->object,
-                array(&$value, $arr)
+                [&$value, $arr]
             )
         );
 
-        $arr = array('' => 'foobar');
+        $arr = ['' => 'foobar'];
         $value = null;
         $this->assertTrue(
             $attrValidateSelect->invokeArgs(
                 $this->object,
-                array(&$value, $arr)
+                [&$value, $arr]
             )
         );
         $this->assertEquals(
@@ -280,21 +280,21 @@ class FormDisplayTest extends PmaTestCase
             gettype($value)
         );
 
-        $arr = array(0 => 'foobar');
+        $arr = [0 => 'foobar'];
         $value = 0;
         $this->assertTrue(
             $attrValidateSelect->invokeArgs(
                 $this->object,
-                array(&$value, $arr)
+                [&$value, $arr]
             )
         );
 
-        $arr = array('1' => 'foobar');
+        $arr = ['1' => 'foobar'];
         $value = 0;
         $this->assertFalse(
             $attrValidateSelect->invokeArgs(
                 $this->object,
-                array(&$value, $arr)
+                [&$value, $arr]
             )
         );
     }
@@ -315,7 +315,7 @@ class FormDisplayTest extends PmaTestCase
 
         $attrErrors->setValue(
             $this->object,
-            array(1, 2)
+            [1, 2]
         );
 
         $this->assertTrue(
@@ -386,7 +386,7 @@ class FormDisplayTest extends PmaTestCase
         $attrUserprefs->setAccessible(true);
         $method->invoke($this->object, null);
         $this->assertEquals(
-            array(),
+            [],
             $attrUserprefs->getValue($this->object)
         );
     }
@@ -402,7 +402,7 @@ class FormDisplayTest extends PmaTestCase
         $method->setAccessible(true);
 
         // recoding
-        $opts = array('values' => array());
+        $opts = ['values' => []];
         $opts['values']['iconv'] = 'testIconv';
         $opts['values']['recode'] = 'testRecode';
         $opts['values']['mb'] = 'testMB';
@@ -411,7 +411,7 @@ class FormDisplayTest extends PmaTestCase
 
         $method->invokeArgs(
             $this->object,
-            array('RecodingEngine', &$opts)
+            ['RecodingEngine', &$opts]
         );
 
         $expect['comment'] = '';
@@ -434,7 +434,7 @@ class FormDisplayTest extends PmaTestCase
         // ZipDump, GZipDump, BZipDump
         $method->invokeArgs(
             $this->object,
-            array('ZipDump', &$opts)
+            ['ZipDump', &$opts]
         );
 
         $comment = '';
@@ -458,7 +458,7 @@ class FormDisplayTest extends PmaTestCase
 
         $method->invokeArgs(
             $this->object,
-            array('GZipDump', &$opts)
+            ['GZipDump', &$opts]
         );
 
         $comment = '';
@@ -482,7 +482,7 @@ class FormDisplayTest extends PmaTestCase
 
         $method->invokeArgs(
             $this->object,
-            array('BZipDump', &$opts)
+            ['BZipDump', &$opts]
         );
 
         $comment = '';
@@ -512,7 +512,7 @@ class FormDisplayTest extends PmaTestCase
 
         $method->invokeArgs(
             $this->object,
-            array('MaxDbList', &$opts)
+            ['MaxDbList', &$opts]
         );
 
         $this->assertEquals(
@@ -522,7 +522,7 @@ class FormDisplayTest extends PmaTestCase
 
         $method->invokeArgs(
             $this->object,
-            array('MaxTableList', &$opts)
+            ['MaxTableList', &$opts]
         );
 
         $this->assertEquals(
@@ -532,7 +532,7 @@ class FormDisplayTest extends PmaTestCase
 
         $method->invokeArgs(
             $this->object,
-            array('QueryHistoryMax', &$opts)
+            ['QueryHistoryMax', &$opts]
         );
 
         $this->assertEquals(
diff --git a/test/classes/Config/FormTest.php b/test/classes/Config/FormTest.php
index 89760a9874..f1bff27f55 100644
--- a/test/classes/Config/FormTest.php
+++ b/test/classes/Config/FormTest.php
@@ -39,7 +39,7 @@ class FormTest extends PmaTestCase
         $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['server'] = 0;
         $this->object = new Form(
-            'pma_form_name', array('pma_form1','pma_form2'), new ConfigFile(), 1
+            'pma_form_name', ['pma_form1','pma_form2'], new ConfigFile(), 1
         );
     }
 
@@ -86,7 +86,7 @@ class FormTest extends PmaTestCase
         $attrFieldsTypes->setAccessible(true);
         $attrFieldsTypes->setValue(
             $this->object,
-            array("7" => "Seven")
+            ["7" => "Seven"]
         );
 
         $this->assertNull(
@@ -107,26 +107,26 @@ class FormTest extends PmaTestCase
     public function testGetOptionValueList()
     {
         $this->assertEquals(
-            array('NHibernate C# DO', 'NHibernate XML'),
+            ['NHibernate C# DO', 'NHibernate XML'],
             $this->object->getOptionValueList("Export/codegen_format")
         );
 
         $this->assertEquals(
-            array(
+            [
                 'auto' => 'auto',
                 '1' => 1,
                 '0' => 0
-            ),
+            ],
             $this->object->getOptionValueList("OBGzip")
         );
 
         $this->assertEquals(
-            array(
+            [
                 'none' => 'Nowhere',
                 'left' => 'Left',
                 'right' => 'Right',
                 'both' =>   "Both"
-            ),
+            ],
             $this->object->getOptionValueList("RowActionLinks")
         );
     }
@@ -142,14 +142,14 @@ class FormTest extends PmaTestCase
         $method = $reflection->getMethod('_readFormPathsCallback');
         $method->setAccessible(true);
 
-        $array = array(
-            "foo" => array(
-                "bar" => array(
+        $array = [
+            "foo" => [
+                "bar" => [
                     'test' => 1,
                     1 => ':group:end'
-                )
-            )
-        );
+                ]
+            ]
+        ];
 
         $method->invoke($this->object, $array, 'foo', 'pref');
 
@@ -194,14 +194,14 @@ class FormTest extends PmaTestCase
         $method = $reflection->getMethod('readFormPaths');
         $method->setAccessible(true);
 
-        $array = array(
-            "foo" => array(
-                "bar" => array(
+        $array = [
+            "foo" => [
+                "bar" => [
                     'test' => 1,
                     1 => ':group:end'
-                )
-            )
-        );
+                ]
+            ]
+        ];
 
         $method->invoke($this->object, $array);
 
@@ -249,12 +249,12 @@ class FormTest extends PmaTestCase
         $method = $reflection->getMethod('readTypes');
         $method->setAccessible(true);
 
-        $this->object->fields = array(
+        $this->object->fields = [
             "pma_form1" => "Servers/1/port",
             "pma_form2" => "Servers/1/auth_type",
             ":group:end:0" => "preffoo/foo/bar/test",
             "1" => "preffoo/foo/bar/:group:end:0"
-        );
+        ];
 
         $attrFieldsTypes = $reflection->getProperty('_fieldsTypes');
         $attrFieldsTypes->setAccessible(true);
@@ -262,12 +262,12 @@ class FormTest extends PmaTestCase
         $method->invoke($this->object, null);
 
         $this->assertEquals(
-            array(
+            [
                 "pma_form1" => "integer",
                 "pma_form2" => "select",
                 ":group:end:0" => "group",
                 "1" => "NULL"
-            ),
+            ],
             $attrFieldsTypes->getValue($this->object)
         );
     }
@@ -281,7 +281,7 @@ class FormTest extends PmaTestCase
     {
         $this->object = $this->getMockBuilder('PhpMyAdmin\Config\Form')
             ->disableOriginalConstructor()
-            ->setMethods(array('readFormPaths', 'readTypes'))
+            ->setMethods(['readFormPaths', 'readTypes'])
             ->getMock();
 
         $this->object->expects($this->exactly(1))
diff --git a/test/classes/Config/Forms/FormListTest.php b/test/classes/Config/Forms/FormListTest.php
index 8eb9b546f9..c94e46efe2 100644
--- a/test/classes/Config/Forms/FormListTest.php
+++ b/test/classes/Config/Forms/FormListTest.php
@@ -75,19 +75,19 @@ class FormListTest extends PmaTestCase
      */
     public function formObjects()
     {
-        return array(
-            array(
+        return [
+            [
                 '\\PhpMyAdmin\\Config\\Forms\\User\\UserFormList',
                 '\\PhpMyAdmin\\Config\\Forms\\User\\',
-            ),
-            array(
+            ],
+            [
                 '\\PhpMyAdmin\\Config\\Forms\\Page\\PageFormList',
                 '\\PhpMyAdmin\\Config\\Forms\\Page\\',
-            ),
-            array(
+            ],
+            [
                 '\\PhpMyAdmin\\Config\\Forms\\Setup\\SetupFormList',
                 '\\PhpMyAdmin\\Config\\Forms\\Setup\\',
-            ),
-        );
+            ],
+        ];
     }
 }
diff --git a/test/classes/Config/ServerConfigChecksTest.php b/test/classes/Config/ServerConfigChecksTest.php
index 833e61b5c4..e7f3264de9 100644
--- a/test/classes/Config/ServerConfigChecksTest.php
+++ b/test/classes/Config/ServerConfigChecksTest.php
@@ -35,7 +35,7 @@ class ServeConfigChecksTest extends PmaTestCase
     public function setUp()
     {
         $GLOBALS['PMA_Config'] = new Config();
-        $GLOBALS['cfg']['AvailableCharsets'] = array();
+        $GLOBALS['cfg']['AvailableCharsets'] = [];
         $GLOBALS['cfg']['ServerDefault'] = 0;
         $GLOBALS['server'] = 0;
 
@@ -55,8 +55,8 @@ class ServeConfigChecksTest extends PmaTestCase
      */
     public function testManyErrors()
     {
-        $_SESSION[$this->sessionID]['Servers'] = array(
-            '1' => array(
+        $_SESSION[$this->sessionID]['Servers'] = [
+            '1' => [
                 'host' => 'localhost',
                 'ssl' => false,
                 'auth_type' => 'config',
@@ -64,8 +64,8 @@ class ServeConfigChecksTest extends PmaTestCase
                 'password' => 'password',
                 'AllowRoot' => true,
                 'AllowNoPassword' => true,
-            )
-        );
+            ]
+        ];
 
         $_SESSION[$this->sessionID]['AllowArbitraryServer'] = true;
         $_SESSION[$this->sessionID]['LoginCookieValidity'] = 5000;
@@ -87,7 +87,7 @@ class ServeConfigChecksTest extends PmaTestCase
         $configChecker->performConfigChecks();
 
         $this->assertEquals(
-            array(
+            [
                 'Servers/1/ssl',
                 'Servers/1/auth_type',
                 'Servers/1/AllowNoPassword',
@@ -95,18 +95,18 @@ class ServeConfigChecksTest extends PmaTestCase
                 'LoginCookieValidity',
                 'SaveDir',
                 'TempDir',
-            ),
+            ],
             array_keys($_SESSION['messages']['notice'])
         );
 
         $this->assertEquals(
-            array(
+            [
                 'LoginCookieValidity',
                 'GZipDump',
                 'BZipDump',
                 'ZipDump_import',
                 'ZipDump_export',
-            ),
+            ],
             array_keys($_SESSION['messages']['error'])
         );
     }
@@ -116,14 +116,14 @@ class ServeConfigChecksTest extends PmaTestCase
      */
     public function testBlowfishCreate()
     {
-        $_SESSION[$this->sessionID]['Servers'] = array(
-            '1' => array(
+        $_SESSION[$this->sessionID]['Servers'] = [
+            '1' => [
                 'host' => 'localhost',
                 'ssl' => true,
                 'auth_type' => 'cookie',
                 'AllowRoot' => false
-            )
-        );
+            ]
+        ];
 
         $_SESSION[$this->sessionID]['AllowArbitraryServer'] = false;
         $_SESSION[$this->sessionID]['LoginCookieValidity'] = -1;
@@ -138,7 +138,7 @@ class ServeConfigChecksTest extends PmaTestCase
         $configChecker->performConfigChecks();
 
         $this->assertEquals(
-            array('blowfish_secret_created'),
+            ['blowfish_secret_created'],
             array_keys($_SESSION['messages']['notice'])
         );
 
@@ -155,12 +155,12 @@ class ServeConfigChecksTest extends PmaTestCase
     {
         $_SESSION[$this->sessionID]['blowfish_secret'] = 'sec';
 
-        $_SESSION[$this->sessionID]['Servers'] = array(
-            '1' => array(
+        $_SESSION[$this->sessionID]['Servers'] = [
+            '1' => [
                 'host' => 'localhost',
                 'auth_type' => 'cookie'
-            )
-        );
+            ]
+        ];
 
         $configChecker = new ServerConfigChecks($GLOBALS['ConfigFile']);
         $configChecker->performConfigChecks();
diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php
index d2649fbf6c..6c50333a5e 100644
--- a/test/classes/ConfigTest.php
+++ b/test/classes/ConfigTest.php
@@ -143,104 +143,104 @@ class ConfigTest extends PmaTestCase
      */
     public function userAgentProvider()
     {
-        return array(
-            array(
+        return [
+            [
                 'Opera/9.80 (X11; Linux x86_64; U; pl) Presto/2.7.62 Version/11.00',
                 'Linux',
                 'OPERA',
                 '9.80',
-            ),
-            array(
+            ],
+            [
                 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US) AppleWebKit/'
                 . '528.16 OmniWeb/622.8.0.112941',
                 'Mac',
                 'OMNIWEB',
                 '622',
-            ),
-            array(
+            ],
+            [
                 'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1)',
                 'Win',
                 'IE',
                 '8.0',
-            ),
-            array(
+            ],
+            [
                 'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)',
                 'Win',
                 'IE',
                 '9.0',
-            ),
-            array(
+            ],
+            [
                 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Win64; x64; '
                 . 'Trident/6.0)',
                 'Win',
                 'IE',
                 '10.0',
-            ),
-            array(
+            ],
+            [
                 'Mozilla/5.0 (IE 11.0; Windows NT 6.3; Trident/7.0; .NET4.0E; '
                 . '.NET4.0C; rv:11.0) like Gecko',
                 'Win',
                 'IE',
                 '11.0',
-            ),
-            array(
+            ],
+            [
                 'Mozilla/5.0 (Windows NT 6.3; WOW64; Trident/7.0; .NET4.0E; '
                 . '.NET4.0C; .NET CLR 3.5.30729; .NET CLR 2.0.50727; '
                 . '.NET CLR 3.0.30729; InfoPath.3; rv:11.0) like Gecko',
                 'Win',
                 'IE',
                 '11.0',
-            ),
-            array(
+            ],
+            [
                 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.22 (KHTML, '
                 . 'like Gecko) Chrome/25.0.1364.172 Safari/537.22',
                 'Win',
                 'CHROME',
                 '25.0.1364.172',
-            ),
-            array(
+            ],
+            [
                 'Mozilla/5.0 (Unknown; U; Unix BSD/SYSV system; C -) '
                 . 'AppleWebKit/527+ (KHTML, like Gecko, Safari/419.3) Arora/0.10.2',
                 'Unix',
                 'SAFARI',
                 '5.0.419',
-            ),
-            array(
+            ],
+            [
                 'Mozilla/5.0 (Windows; U; Win95; en-US; rv:1.9b) Gecko/20031208',
                 'Win',
                 'GECKO',
                 '1.9',
-            ),
-            array(
+            ],
+            [
                 'Mozilla/5.0 (compatible; Konqueror/4.5; NetBSD 5.0.2; X11; '
                 . 'amd64; en_US) KHTML/4.5.4 (like Gecko)',
                 'Other',
                 'KONQUEROR',
-            ),
-            array(
+            ],
+            [
                 'Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20100101 Firefox/5.0',
                 'Linux',
                 'FIREFOX',
                 '5.0',
-            ),
-            array(
+            ],
+            [
                 '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?
              */
-            array(
+            [
                 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.4+ (KHTML, like G'
                 . 'ecko) Version/5.0 Safari/535.4+ SUSE/12.1 (3.2.1) Epiphany/3.2.1',
                 'Linux',
                 'SAFARI',
                 '5.0',
-            ),
-        );
+            ],
+        ];
 
     }
 
@@ -340,16 +340,16 @@ class ConfigTest extends PmaTestCase
      */
     public function serverNames()
     {
-        return array(
-            array(
+        return [
+            [
                 "Microsoft-IIS 7.0",
                 1,
-            ),
-            array(
+            ],
+            [
                 "Apache/2.2.17",
                 0,
-            ),
-        );
+            ],
+        ];
     }
 
 
@@ -520,17 +520,17 @@ class ConfigTest extends PmaTestCase
      */
     public function httpsParams()
     {
-        return array(
-            array('http', '', '', '', '', 'http', 80, false),
-            array('http', '', 'http://', '', '', 'http', 80, false),
-            array('http', '', '', '', '', 'http', 443, true),
-            array('http', '', '', '', '', 'https', 80, true),
-            array('http', '', '', '', 'on', 'http', 80, true),
-            array('http', '', '', 'on', '', 'http', 80, true),
-            array('http', '', 'https://', '', '', 'http', 80, true),
-            array('http', 'on', '', '', '', 'http', 80, true),
-            array('https', '', '', '', '', 'http', 80, true),
-        );
+        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],
+        ];
     }
 
     /**
@@ -548,7 +548,7 @@ class ConfigTest extends PmaTestCase
     {
         $this->object->enableBc();
 
-        $defines = array(
+        $defines = [
             'PMA_VERSION',
             'PMA_MAJOR_VERSION',
             'PMA_IS_WINDOWS',
@@ -556,7 +556,7 @@ class ConfigTest extends PmaTestCase
             'PMA_USR_OS',
             'PMA_USR_BROWSER_VER',
             'PMA_USR_BROWSER_AGENT'
-            );
+            ];
 
         foreach ($defines as $define) {
             $this->assertTrue(defined($define));
@@ -589,88 +589,88 @@ class ConfigTest extends PmaTestCase
      */
     public function rootUris()
     {
-        return array(
-            array(
+        return [
+            [
                 '',
                 '',
                 '/',
-            ),
-            array(
+            ],
+            [
                 '/',
                 '',
                 '/',
-            ),
-            array(
+            ],
+            [
                 '/index.php',
                 '',
                 '/',
-            ),
-            array(
+            ],
+            [
                 '\\index.php',
                 '',
                 '/',
-            ),
-            array(
+            ],
+            [
                 '\\',
                 '',
                 '/',
-            ),
-            array(
+            ],
+            [
                 '\\path\\to\\index.php',
                 '',
                 '/path/to/',
-            ),
-            array(
+            ],
+            [
                 '/foo/bar/phpmyadmin/index.php',
                 '',
                 '/foo/bar/phpmyadmin/',
-            ),
-            array(
+            ],
+            [
                 '/foo/bar/phpmyadmin/',
                 '',
                 '/foo/bar/phpmyadmin/',
-            ),
-            array(
+            ],
+            [
                 'https://example.net/baz/phpmyadmin/',
                 '',
                 '/baz/phpmyadmin/',
-            ),
-            array(
+            ],
+            [
                 'http://example.net/baz/phpmyadmin/',
                 '',
                 '/baz/phpmyadmin/',
-            ),
-            array(
+            ],
+            [
                 'http://example.net/phpmyadmin/',
                 '',
                 '/phpmyadmin/',
-            ),
-            array(
+            ],
+            [
                 'http://example.net/',
                 '',
                 '/',
-            ),
-            array(
+            ],
+            [
                 'http://example.net/',
                 'http://example.net/phpmyadmin/',
                 '/phpmyadmin/',
-            ),
-            array(
+            ],
+            [
                 'http://example.net/',
                 'http://example.net/phpmyadmin',
                 '/phpmyadmin/',
-            ),
-            array(
+            ],
+            [
                 'http://example.net/',
                 '/phpmyadmin2',
                 '/phpmyadmin2/',
-            ),
-            array(
+            ],
+            [
                 'http://example.net/',
                 '/phpmyadmin3/',
                 '/phpmyadmin3/',
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -699,20 +699,20 @@ class ConfigTest extends PmaTestCase
      */
     public function configPaths()
     {
-        return array(
-            array(
+        return [
+            [
                 './test/test_data/config.inc.php',
                 true,
-            ),
-            array(
+            ],
+            [
                 './test/test_data/config-nonexisting.inc.php',
                 false,
-            ),
-            array(
+            ],
+            [
                 './libraries/config.default.php',
                 true,
-            ),
-        );
+            ],
+        ];
     }
 
     /**
diff --git a/test/classes/Controllers/Database/DatabaseStructureControllerTest.php b/test/classes/Controllers/Database/DatabaseStructureControllerTest.php
index 41a6b17177..2768e17de0 100644
--- a/test/classes/Controllers/Database/DatabaseStructureControllerTest.php
+++ b/test/classes/Controllers/Database/DatabaseStructureControllerTest.php
@@ -112,15 +112,15 @@ class DatabaseStructureControllerTest extends PmaTestCase
         $property->setValue($ctrl, true);
 
         $GLOBALS['cfg']['MaxExactCount'] = 10;
-        $current_table = array(
+        $current_table = [
             'ENGINE' => 'InnoDB',
             'TABLE_ROWS' => 5,
             'Data_length' => 16384,
             'Index_length' => 0,
             'TABLE_NAME' => 'table'
-        );
+        ];
         list($current_table,,, $sum_size)
-            = $method->invokeArgs($ctrl, array($current_table, 10));
+            = $method->invokeArgs($ctrl, [$current_table, 10]);
 
         $this->assertEquals(
             true,
@@ -137,7 +137,7 @@ class DatabaseStructureControllerTest extends PmaTestCase
 
         $current_table['ENGINE'] = 'MYISAM';
         list($current_table,,, $sum_size)
-            = $method->invokeArgs($ctrl, array($current_table, 10));
+            = $method->invokeArgs($ctrl, [$current_table, 10]);
 
         $this->assertEquals(
             false,
@@ -157,7 +157,7 @@ class DatabaseStructureControllerTest extends PmaTestCase
 
         $current_table['ENGINE'] = 'InnoDB';
         list($current_table,,, $sum_size)
-            = $method->invokeArgs($ctrl, array($current_table, 10));
+            = $method->invokeArgs($ctrl, [$current_table, 10]);
         $this->assertEquals(
             true,
             $current_table['COUNTED']
@@ -169,7 +169,7 @@ class DatabaseStructureControllerTest extends PmaTestCase
 
         $current_table['ENGINE'] = 'MYISAM';
         list($current_table,,, $sum_size)
-            = $method->invokeArgs($ctrl, array($current_table, 10));
+            = $method->invokeArgs($ctrl, [$current_table, 10]);
         $this->assertEquals(
             false,
             $current_table['COUNTED']
@@ -206,14 +206,14 @@ class DatabaseStructureControllerTest extends PmaTestCase
         $property->setAccessible(true);
         $property->setValue($ctrl, true);
 
-        $current_table = array(
+        $current_table = [
             'Data_length'  => 16384,
             'Index_length' => 0,
             'Name'         => 'table',
             'Data_free'    => 300,
-        );
+        ];
         list($current_table,,,,, $overhead_size, $sum_size)
-            = $method->invokeArgs($ctrl, array($current_table, 0, 0, 0, 0, 0, 0,));
+            = $method->invokeArgs($ctrl, [$current_table, 0, 0, 0, 0, 0, 0,]);
         $this->assertEquals(
             6,
             $current_table['Rows']
@@ -229,7 +229,7 @@ class DatabaseStructureControllerTest extends PmaTestCase
 
         unset($current_table['Data_free']);
         list($current_table,,,,, $overhead_size,)
-            = $method->invokeArgs($ctrl, array($current_table, 0, 0, 0, 0, 0, 0,));
+            = $method->invokeArgs($ctrl, [$current_table, 0, 0, 0, 0, 0, 0,]);
         $this->assertEquals(0, $overhead_size);
 
         $is_show_stats = false;
@@ -239,7 +239,7 @@ class DatabaseStructureControllerTest extends PmaTestCase
             $container->get('db')
         );
         list($current_table,,,,,, $sum_size)
-            = $method->invokeArgs($ctrl, array($current_table, 0, 0, 0, 0, 0, 0));
+            = $method->invokeArgs($ctrl, [$current_table, 0, 0, 0, 0, 0, 0]);
         $this->assertEquals(0, $sum_size);
 
         $db_is_system_schema = false;
@@ -249,7 +249,7 @@ class DatabaseStructureControllerTest extends PmaTestCase
             $container->get('db')
         );
         list($current_table,,,,,,)
-            = $method->invokeArgs($ctrl, array($current_table, 0, 0, 0, 0, 0, 0,));
+            = $method->invokeArgs($ctrl, [$current_table, 0, 0, 0, 0, 0, 0,]);
         $this->assertArrayNotHasKey('Row', $current_table);
     }
 
@@ -275,25 +275,25 @@ class DatabaseStructureControllerTest extends PmaTestCase
         // When parameter $db is empty
         $this->assertEquals(
             false,
-            $method->invokeArgs($ctrl, array(array(), 'table'))
+            $method->invokeArgs($ctrl, [[], 'table'])
         );
 
         // Correct parameter
-        $tables = array(
+        $tables = [
             'db.table'
-        );
+        ];
         $this->assertEquals(
             true,
-            $method->invokeArgs($ctrl, array($tables, 'table'))
+            $method->invokeArgs($ctrl, [$tables, 'table'])
         );
 
         // Table not in database
-        $tables = array(
+        $tables = [
             'db.tab1e'
-        );
+        ];
         $this->assertEquals(
             false,
-            $method->invokeArgs($ctrl, array($tables, 'table'))
+            $method->invokeArgs($ctrl, [$tables, 'table'])
         );
     }
 
@@ -316,18 +316,18 @@ class DatabaseStructureControllerTest extends PmaTestCase
             $container->get('db')
         );
 
-        $_SESSION['tmpval']['favorite_tables'][$GLOBALS['server']] = array(
-            array('db' => 'db', 'table' => 'table')
-        );
+        $_SESSION['tmpval']['favorite_tables'][$GLOBALS['server']] = [
+            ['db' => 'db', 'table' => 'table']
+        ];
 
         $this->assertEquals(
             false,
-            $method->invokeArgs($ctrl, array(''))
+            $method->invokeArgs($ctrl, [''])
         );
 
         $this->assertEquals(
             true,
-            $method->invokeArgs($ctrl, array('table'))
+            $method->invokeArgs($ctrl, ['table'])
         );
     }
 
@@ -344,14 +344,14 @@ class DatabaseStructureControllerTest extends PmaTestCase
             ->disableOriginalConstructor()
             ->getMock();
         $fav_instance->expects($this->at(1))->method('getTables')
-            ->will($this->returnValue(array()));
+            ->will($this->returnValue([]));
         $fav_instance->expects($this->at(2))
             ->method('getTables')
             ->will(
                 $this->returnValue(
-                    array(
-                        array('db' => 'db', 'table' => 'table'),
-                    )
+                    [
+                        ['db' => 'db', 'table' => 'table'],
+                    ]
                 )
             );
 
@@ -367,13 +367,13 @@ class DatabaseStructureControllerTest extends PmaTestCase
 
         // The user hash for test
         $user = 'abcdefg';
-        $favorite_table = array(
-            $user => array(
-                array('db' => 'db', 'table' => 'table')
-            ),
-        );
+        $favorite_table = [
+            $user => [
+                ['db' => 'db', 'table' => 'table']
+            ],
+        ];
 
-        $method->invokeArgs($ctrl, array($fav_instance, $user, $favorite_table));
+        $method->invokeArgs($ctrl, [$fav_instance, $user, $favorite_table]);
         $json = $this->_response->getJSONResult();
 
         $this->assertEquals(json_encode($favorite_table), $json['favorite_tables']);
@@ -412,21 +412,21 @@ class DatabaseStructureControllerTest extends PmaTestCase
         $_REQUEST['real_row_count_all'] = 'abc';
         $property->setValue(
             $ctrl,
-            array(
-                array(
+            [
+                [
                     'TABLE_NAME' => 'table'
-                )
-            )
+                ]
+            ]
         );
         $ctrl->handleRealRowCountRequestAction();
         $json = $this->_response->getJSONResult();
 
-        $expected_result = array(
-            array(
+        $expected_result = [
+            [
                 'table' => 'table',
                 'row_count' => 6
-            )
-        );
+            ]
+        ];
         $this->assertEquals(
             json_encode($expected_result),
             $json['real_row_count_all']
diff --git a/test/classes/Controllers/Server/ServerBinlogControllerTest.php b/test/classes/Controllers/Server/ServerBinlogControllerTest.php
index e0aa025a8c..ff49199bed 100644
--- a/test/classes/Controllers/Server/ServerBinlogControllerTest.php
+++ b/test/classes/Controllers/Server/ServerBinlogControllerTest.php
@@ -40,7 +40,7 @@ class ServerBinlogControllerTest extends PmaTestCase
         $GLOBALS['server'] = 1;
         $GLOBALS['cfg']['ServerDefault'] = "server";
         $GLOBALS['cfg']['RememberSorting'] = true;
-        $GLOBALS['cfg']['SQP'] = array();
+        $GLOBALS['cfg']['SQP'] = [];
         $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
         $GLOBALS['cfg']['ShowSQL'] = true;
         $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
@@ -55,9 +55,9 @@ class ServerBinlogControllerTest extends PmaTestCase
 
         Util::cacheSet('profiling_supported', true);
 
-        $binary_log_file_names = array();
-        $binary_log_file_names[] = array("Log_name"=>"index1", "File_size"=>100);
-        $binary_log_file_names[] = array("Log_name"=>"index2", "File_size"=>200);
+        $binary_log_file_names = [];
+        $binary_log_file_names[] = ["Log_name"=>"index1", "File_size"=>100];
+        $binary_log_file_names[] = ["Log_name"=>"index2", "File_size"=>200];
 
         //Mock DBI
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
@@ -81,7 +81,7 @@ class ServerBinlogControllerTest extends PmaTestCase
     {
         $container = Container::getDefaultContainer();
 
-        $url_params = array();
+        $url_params = [];
         $url_params['log'] = "log";
         $url_params['dontlimitchars'] = 1;
 
@@ -132,30 +132,30 @@ class ServerBinlogControllerTest extends PmaTestCase
         );
 
         //expects return value
-        $result = array(
-            array(
+        $result = [
+            [
                 "SHOW BINLOG EVENTS IN 'index1' LIMIT 3, 10",
                 null,
                 1,
                 true,
-                array("log1"=>"logd")
-            ),
-            array(
-                array("log2"=>"logb"),
+                ["log1"=>"logd"]
+            ],
+            [
+                ["log2"=>"logb"],
                 null,
                 0,
                 false,
                 'executed'
-            )
-        );
-        $value = array(
+            ]
+        ];
+        $value = [
                 'Info' => "index1_Info",
                 'Log_name' => "index1_Log_name",
                 'Pos' => "index1_Pos",
                 'Event_type' => "index1_Event_type",
                 'End_log_pos' => "index1_End_log_pos",
                 'Server_id' => "index1_Server_id",
-        );
+        ];
         $count = 3;
 
         //expects functions
@@ -174,7 +174,7 @@ class ServerBinlogControllerTest extends PmaTestCase
         $container->set('dbi', $dbi);
 
         //Call the test function
-        $url_params = array();
+        $url_params = [];
         $url_params['log'] = "log";
         $url_params['dontlimitchars'] = 1;
         $html = $method->invoke($ctrl, $url_params);
@@ -246,7 +246,7 @@ class ServerBinlogControllerTest extends PmaTestCase
             $dbi
         );
 
-        $fetchAssoc = array(
+        $fetchAssoc = [
             'Info' => 'Info',
             'Log_name' => 'Log_name',
             'Pos' => 'Pos',
@@ -254,7 +254,7 @@ class ServerBinlogControllerTest extends PmaTestCase
             'Server_id' => 'Server_id',
             'Orig_log_pos' => 'Orig_log_pos',
             'End_log_pos' => 'End_log_pos',
-        );
+        ];
         $dbi->expects($this->at(0))->method('fetchAssoc')
             ->will($this->returnValue($fetchAssoc));
         $dbi->expects($this->at(1))->method('fetchAssoc')
@@ -263,7 +263,7 @@ class ServerBinlogControllerTest extends PmaTestCase
 
         $GLOBALS['cfg']['LimitChars'] = 2;
 
-        $result = array();
+        $result = [];
         $dontlimitchars = ";";
         $html = $method->invoke($ctrl, $result, $dontlimitchars);
 
diff --git a/test/classes/Controllers/Server/ServerCollationsControllerTest.php b/test/classes/Controllers/Server/ServerCollationsControllerTest.php
index 8621c8b370..e4a8e4aa2c 100644
--- a/test/classes/Controllers/Server/ServerCollationsControllerTest.php
+++ b/test/classes/Controllers/Server/ServerCollationsControllerTest.php
@@ -49,31 +49,31 @@ class ServerCollationsControllerTest extends PmaTestCase
      */
     public function testPMAGetHtmlForCharsets()
     {
-        $mysql_charsets = array("armscii8", "ascii", "big5", "binary");
-        $mysql_collations = array(
-            "armscii8" => array("armscii8"),
-            "ascii" => array("ascii"),
-            "big5" => array("big5"),
-            "binary" => array("binary"),
-        );
-        $mysql_charsets_descriptions = array(
+        $mysql_charsets = ["armscii8", "ascii", "big5", "binary"];
+        $mysql_collations = [
+            "armscii8" => ["armscii8"],
+            "ascii" => ["ascii"],
+            "big5" => ["big5"],
+            "binary" => ["binary"],
+        ];
+        $mysql_charsets_descriptions = [
             "armscii8" => "PMA_armscii8_general_ci",
             "ascii" => "PMA_ascii_general_ci",
             "big5" => "PMA_big5_general_ci",
             "binary" => "PMA_binary_general_ci",
-        );
-        $mysql_default_collations = array(
+        ];
+        $mysql_default_collations = [
             "armscii8" => "armscii8",
             "ascii" => "ascii",
             "big5" => "big5",
             "binary" => "binary",
-        );
-        $mysql_collations_available = array(
+        ];
+        $mysql_collations_available = [
             "armscii8" => true,
             "ascii" => true,
             "big5" => true,
             "binary" => true,
-        );
+        ];
 
         $container = Container::getDefaultContainer();
         $container->set('PhpMyAdmin\Response', new ResponseStub());
diff --git a/test/classes/Controllers/Server/ServerDatabasesControllerTest.php b/test/classes/Controllers/Server/ServerDatabasesControllerTest.php
index 18bd6fb25b..ec0eb6af49 100644
--- a/test/classes/Controllers/Server/ServerDatabasesControllerTest.php
+++ b/test/classes/Controllers/Server/ServerDatabasesControllerTest.php
@@ -77,13 +77,13 @@ class ServerDatabasesControllerTest extends PmaTestCase
         $ctrl = $container->get('ServerDatabasesController');
 
         //Call the test function
-        $databases = array(
-            array("SCHEMA_NAME" => "pma_bookmark"),
-            array("SCHEMA_NAME" => "information_schema"),
-            array("SCHEMA_NAME" => "mysql"),
-            array("SCHEMA_NAME" => "performance_schema"),
-            array("SCHEMA_NAME" => "phpmyadmin")
-        );
+        $databases = [
+            ["SCHEMA_NAME" => "pma_bookmark"],
+            ["SCHEMA_NAME" => "information_schema"],
+            ["SCHEMA_NAME" => "mysql"],
+            ["SCHEMA_NAME" => "performance_schema"],
+            ["SCHEMA_NAME" => "phpmyadmin"]
+        ];
         $property = $class->getProperty('_databases');
         $property->setAccessible(true);
         $property->setValue($ctrl, $databases);
@@ -108,7 +108,7 @@ class ServerDatabasesControllerTest extends PmaTestCase
         $property->setAccessible(true);
         $property->setValue($ctrl, 'asc');
 
-        $replication_types = array("master", "slave");
+        $replication_types = ["master", "slave"];
 
         $html = $method->invoke($ctrl, $replication_types);
 
@@ -203,7 +203,7 @@ class ServerDatabasesControllerTest extends PmaTestCase
         $ctrl = $container->get('ServerDatabasesController');
 
         //$_REQUEST['sort_by'] and $_REQUEST['sort_order'] are empty
-        $method->invoke($ctrl, array("master", "slave"));
+        $method->invoke($ctrl, ["master", "slave"]);
         $this->assertEquals(
             'SCHEMA_NAME',
             $propertySortBy->getValue($ctrl)
@@ -275,47 +275,47 @@ class ServerDatabasesControllerTest extends PmaTestCase
         $ctrl = $container->get('ServerDatabasesController');
 
         $this->assertEquals(
-            array(
-                'DEFAULT_COLLATION_NAME' => array(
+            [
+                'DEFAULT_COLLATION_NAME' => [
                     'disp_name' => __('Collation'),
-                    'description_function' => array(
+                    'description_function' => [
                         Charsets::class,
                         'getCollationDescr'
-                    ),
+                    ],
                     'format'    => 'string',
                     'footer'    => 'utf8_general_ci'
-                ),
-                'SCHEMA_TABLES' => array(
+                ],
+                'SCHEMA_TABLES' => [
                     'disp_name' => __('Tables'),
                     'format'    => 'number',
                     'footer'    => 0
-                ),
-                'SCHEMA_TABLE_ROWS' => array(
+                ],
+                'SCHEMA_TABLE_ROWS' => [
                     'disp_name' => __('Rows'),
                     'format'    => 'number',
                     'footer'    => 0
-                ),
-                'SCHEMA_DATA_LENGTH' => array(
+                ],
+                'SCHEMA_DATA_LENGTH' => [
                     'disp_name' => __('Data'),
                     'format'    => 'byte',
                     'footer'    => 0
-                ),
-                'SCHEMA_INDEX_LENGTH' => array(
+                ],
+                'SCHEMA_INDEX_LENGTH' => [
                     'disp_name' => __('Indexes'),
                     'format'    => 'byte',
                     'footer'    => 0
-                ),
-                'SCHEMA_LENGTH' => array(
+                ],
+                'SCHEMA_LENGTH' => [
                     'disp_name' => __('Total'),
                     'format'    => 'byte',
                     'footer'    => 0
-                ),
-                'SCHEMA_DATA_FREE' => array(
+                ],
+                'SCHEMA_DATA_FREE' => [
                     'disp_name' => __('Overhead'),
                     'format'    => 'byte',
                     'footer'    => 0
-                )
-            ),
+                ]
+            ],
             $method->invoke($ctrl)
         );
     }
diff --git a/test/classes/Controllers/Server/ServerEnginesControllerTest.php b/test/classes/Controllers/Server/ServerEnginesControllerTest.php
index fd0e48a0da..57cbb3d17c 100644
--- a/test/classes/Controllers/Server/ServerEnginesControllerTest.php
+++ b/test/classes/Controllers/Server/ServerEnginesControllerTest.php
@@ -160,14 +160,14 @@ class ServerEnginesControllerTest extends PmaTestCase
         );
         $this->assertContains(
             Url::getCommon(
-                array('engine' => $_REQUEST['engine'], 'page' => "Documentation")
+                ['engine' => $_REQUEST['engine'], 'page' => "Documentation"]
             ),
             $html
         );
 
         //validate 5: other items
         $this->assertContains(
-            Url::getCommon(array('engine' => $_REQUEST['engine'])),
+            Url::getCommon(['engine' => $_REQUEST['engine']]),
             $html
         );
         $this->assertContains(
diff --git a/test/classes/Controllers/Server/ServerPluginsControllerTest.php b/test/classes/Controllers/Server/ServerPluginsControllerTest.php
index 8c4869ad85..cfe0b2f83c 100644
--- a/test/classes/Controllers/Server/ServerPluginsControllerTest.php
+++ b/test/classes/Controllers/Server/ServerPluginsControllerTest.php
@@ -51,7 +51,7 @@ class ServerPluginsControllerTest extends PmaTestCase
         /**
          * Prepare plugin list
          */
-        $row = array();
+        $row = [];
         $row["plugin_name"] = "plugin_name1";
         $row["plugin_type"] = "plugin_type1";
         $row["plugin_type_version"] = "plugin_version1";
diff --git a/test/classes/Controllers/Server/ServerVariablesControllerTest.php b/test/classes/Controllers/Server/ServerVariablesControllerTest.php
index 9c280a22ba..3591fd986a 100644
--- a/test/classes/Controllers/Server/ServerVariablesControllerTest.php
+++ b/test/classes/Controllers/Server/ServerVariablesControllerTest.php
@@ -55,37 +55,37 @@ class ServerVariablesControllerTest extends PmaTestCase
             ->getMock();
 
         //this data is needed when PhpMyAdmin\Server\Status\Data constructs
-        $server_session_variable = array(
+        $server_session_variable = [
             "auto_increment_increment" => "1",
             "auto_increment_offset" => "13",
             "automatic_sp_privileges" => "ON",
             "back_log" => "50",
             "big_tables" => "OFF",
-        );
+        ];
 
-        $server_global_variables = array(
+        $server_global_variables = [
             "auto_increment_increment" => "0",
             "auto_increment_offset" => "12"
-        );
+        ];
 
-        $fetchResult = array(
-            array(
+        $fetchResult = [
+            [
                 "SHOW SESSION VARIABLES;",
                 0,
                 1,
                 DatabaseInterface::CONNECT_USER,
                 0,
                 $server_session_variable
-            ),
-            array(
+            ],
+            [
                 "SHOW GLOBAL VARIABLES;",
                 0,
                 1,
                 DatabaseInterface::CONNECT_USER,
                 0,
                 $server_global_variables
-            )
-        );
+            ]
+        ];
 
         $dbi->expects($this->any())->method('fetchResult')
             ->will($this->returnValueMap($fetchResult));
@@ -128,7 +128,7 @@ class ServerVariablesControllerTest extends PmaTestCase
         $name_for_value_not_num = "PMA_key";
 
         //name is_numeric and the value type is byte
-        $args = array($name_for_value_byte, "3");
+        $args = [$name_for_value_byte, "3"];
         list($formattedValue, $isHtmlFormatted) = $method->invokeArgs($ctrl, $args);
         $this->assertEquals(
             '<abbr title="3">3 B</abbr>',
@@ -137,7 +137,7 @@ class ServerVariablesControllerTest extends PmaTestCase
         $this->assertEquals(true, $isHtmlFormatted);
 
         //name is_numeric and the value type is not byte
-        $args = array($name_for_value_not_byte, "3");
+        $args = [$name_for_value_not_byte, "3"];
         list($formattedValue, $isHtmlFormatted) = $method->invokeArgs($ctrl, $args);
         $this->assertEquals(
             '3',
@@ -146,7 +146,7 @@ class ServerVariablesControllerTest extends PmaTestCase
         $this->assertEquals(false, $isHtmlFormatted);
 
         //value is not a number
-        $args = array($name_for_value_not_byte, "value");
+        $args = [$name_for_value_not_byte, "value"];
         list($formattedValue, $isHtmlFormatted) = $method->invokeArgs($ctrl, $args);
         $this->assertEquals(
             'value',
@@ -306,7 +306,7 @@ class ServerVariablesControllerTest extends PmaTestCase
         $formatVariable = $class->getMethod('_formatVariable');
         $formatVariable->setAccessible(true);
 
-        $args = array($name, "12");
+        $args = [$name, "12"];
         list($value, $isHtmlFormatted) = $formatVariable->invokeArgs($ctrl, $args);
         $this->assertContains(
             $value,
@@ -319,7 +319,7 @@ class ServerVariablesControllerTest extends PmaTestCase
             $html
         );
 
-        $args = array($name, "13");
+        $args = [$name, "13"];
         list($value, $isHtmlFormatted) = $formatVariable->invokeArgs($ctrl, $args);
         $this->assertContains(
             $value,
diff --git a/test/classes/Controllers/Table/TableIndexesControllerTest.php b/test/classes/Controllers/Table/TableIndexesControllerTest.php
index e098710c75..ade697d6bc 100644
--- a/test/classes/Controllers/Table/TableIndexesControllerTest.php
+++ b/test/classes/Controllers/Table/TableIndexesControllerTest.php
@@ -42,32 +42,32 @@ class TableIndexesControllerTest extends PmaTestCase
         $GLOBALS['table'] = 'table';
         $GLOBALS['PMA_PHP_SELF'] = 'index.php';
         $GLOBALS['cfg']['Server']['pmadb'] = '';
-        $GLOBALS['url_params'] = array(
+        $GLOBALS['url_params'] = [
             'db' => 'db',
             'server' => 1
-        );
+        ];
 
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
             ->disableOriginalConstructor()
             ->getMock();
 
-        $indexs = array(
-            array(
+        $indexs = [
+            [
                 "Schema" => "Schema1",
                 "Key_name"=>"Key_name1",
                 "Column_name"=>"Column_name1"
-            ),
-            array(
+            ],
+            [
                 "Schema" => "Schema2",
                 "Key_name"=>"Key_name2",
                 "Column_name"=>"Column_name2"
-            ),
-            array(
+            ],
+            [
                 "Schema" => "Schema3",
                 "Key_name"=>"Key_name3",
                 "Column_name"=>"Column_name3"
-            ),
-        );
+            ],
+        ];
 
         $dbi->expects($this->any())->method('getTableIndexes')
             ->will($this->returnValue($indexs));
@@ -149,7 +149,7 @@ class TableIndexesControllerTest extends PmaTestCase
         $table->expects($this->any())->method('isView')
             ->will($this->returnValue(false));
         $table->expects($this->any())->method('getNameAndTypeOfTheColumns')
-            ->will($this->returnValue(array("field_name" => "field_type")));
+            ->will($this->returnValue(["field_name" => "field_type"]));
 
         $GLOBALS['dbi']->expects($this->any())->method('getTable')
             ->will($this->returnValue($table));
@@ -179,11 +179,11 @@ class TableIndexesControllerTest extends PmaTestCase
         //Url::getHiddenInputs
         $this->assertContains(
             Url::getHiddenInputs(
-                array(
+                [
                     'db' => 'db',
                     'table' => 'table',
                     'create_index' => 1,
-                )
+                ]
             ),
             $html
         );
diff --git a/test/classes/Controllers/Table/TableRelationControllerTest.php b/test/classes/Controllers/Table/TableRelationControllerTest.php
index fea73928c2..fd8ce669fd 100644
--- a/test/classes/Controllers/Table/TableRelationControllerTest.php
+++ b/test/classes/Controllers/Table/TableRelationControllerTest.php
@@ -54,23 +54,23 @@ class TableRelationControllerTest extends PmaTestCase
             }
         };
 
-        $indexes = array(
-            array(
+        $indexes = [
+            [
                 'Schema' => 'Schema1',
                 'Key_name' => 'Key_name1',
                 'Column_name' => 'Column_name1',
-            ),
-            array(
+            ],
+            [
                 'Schema' => 'Schema2',
                 'Key_name' => 'Key_name2',
                 'Column_name' => 'Column_name2',
-            ),
-            array(
+            ],
+            [
                 'Schema' => 'Schema3',
                 'Key_name' => 'Key_name3',
                 'Column_name' => 'Column_name3',
-            ),
-        );
+            ],
+        ];
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
             ->disableOriginalConstructor()
             ->getMock();
@@ -99,9 +99,9 @@ class TableRelationControllerTest extends PmaTestCase
      */
     public function testGetDropdownValueForTableActionIsView()
     {
-        $viewColumns = array(
+        $viewColumns = [
             'viewCol', 'viewCol2', 'viewCol3'
-        );
+        ];
         $tableMock = $this->getMockBuilder('PhpMyAdmin\Table')
             ->disableOriginalConstructor()
             ->getMock();
@@ -145,9 +145,9 @@ class TableRelationControllerTest extends PmaTestCase
      */
     public function testGetDropdownValueForTableActionNotView()
     {
-        $indexedColumns = array(
+        $indexedColumns = [
             'primaryTableCol'
-        );
+        ];
         $tableMock = $this->getMockBuilder('PhpMyAdmin\Table')
             ->disableOriginalConstructor()
             ->getMock();
@@ -195,7 +195,7 @@ class TableRelationControllerTest extends PmaTestCase
                         static $count = 0;
                         if ($count == 0) {
                             $count++;
-                            return array('Engine' => 'InnoDB', 'Name'   => 'table',);
+                            return ['Engine' => 'InnoDB', 'Name'   => 'table',];
                         }
                         return null;
                     }
@@ -211,14 +211,14 @@ class TableRelationControllerTest extends PmaTestCase
         );
         $ctrl = $container->get(
             'TableRelationController',
-            array('tbl_storage_engine' => 'INNODB')
+            ['tbl_storage_engine' => 'INNODB']
         );
 
         $_REQUEST['foreign'] = 'true';
         $ctrl->getDropdownValueForDbAction();
         $json = $this->_response->getJSONResult();
         $this->assertEquals(
-            array('table'),
+            ['table'],
             $json['tables']
         );
     }
@@ -241,7 +241,7 @@ class TableRelationControllerTest extends PmaTestCase
                         static $count = 0;
                         if ($count == 0) {
                             $count++;
-                            return array('table');
+                            return ['table'];
                         }
                         return null;
                     }
@@ -257,14 +257,14 @@ class TableRelationControllerTest extends PmaTestCase
         );
         $ctrl = $container->get(
             'TableRelationController',
-            array('tbl_storage_engine' => 'INNODB',)
+            ['tbl_storage_engine' => 'INNODB',]
         );
 
         $_REQUEST['foreign'] = 'false';
         $ctrl->getDropdownValueForDbAction();
         $json = $this->_response->getJSONResult();
         $this->assertEquals(
-            array('table'),
+            ['table'],
             $json['tables']
         );
     }
diff --git a/test/classes/Controllers/Table/TableSearchControllerTest.php b/test/classes/Controllers/Table/TableSearchControllerTest.php
index f9db5ee44e..fc7b4eada6 100644
--- a/test/classes/Controllers/Table/TableSearchControllerTest.php
+++ b/test/classes/Controllers/Table/TableSearchControllerTest.php
@@ -56,20 +56,20 @@ class TableSearchControllerTest extends PmaTestCase
             ->getMock();
         $dbi->types = new Types($dbi);
 
-        $columns =array(
-            array(
+        $columns =[
+            [
                 'Field' => 'Field1',
                 'Type' => 'Type1',
                 'Null' => 'Null1',
                 'Collation' => 'Collation1',
-            ),
-            array(
+            ],
+            [
                 'Field' => 'Field2',
                 'Type' => 'Type2',
                 'Null' => 'Null2',
                 'Collation' => 'Collation2',
-            )
-        );
+            ]
+        ];
         $dbi->expects($this->any())->method('getColumns')
             ->will($this->returnValue($columns));
 
@@ -193,7 +193,7 @@ class TableSearchControllerTest extends PmaTestCase
             $sql
         );
 
-        $_POST['criteriaValues'] = array(
+        $_POST['criteriaValues'] = [
             'value1',
             'value2',
             'value3',
@@ -201,8 +201,8 @@ class TableSearchControllerTest extends PmaTestCase
             'value5',
             'value6',
             'value7,value8'
-        );
-        $_POST['criteriaColumnNames'] = array(
+        ];
+        $_POST['criteriaColumnNames'] = [
             'name',
             'id',
             'index',
@@ -210,8 +210,8 @@ class TableSearchControllerTest extends PmaTestCase
             'index3',
             'index4',
             'index5',
-        );
-        $_POST['criteriaColumnTypes'] = array(
+        ];
+        $_POST['criteriaColumnTypes'] = [
             'varchar',
             'int',
             'enum',
@@ -219,8 +219,8 @@ class TableSearchControllerTest extends PmaTestCase
             'type2',
             'type3',
             'type4'
-        );
-        $_POST['criteriaColumnCollations'] = array(
+        ];
+        $_POST['criteriaColumnCollations'] = [
             "char1",
             "char2",
             "char3",
@@ -228,8 +228,8 @@ class TableSearchControllerTest extends PmaTestCase
             "char5",
             "char6",
             "char7",
-        );
-        $_POST['criteriaColumnOperators'] = array(
+        ];
+        $_POST['criteriaColumnOperators'] = [
             "!=",
             ">",
             "IS NULL",
@@ -237,7 +237,7 @@ class TableSearchControllerTest extends PmaTestCase
             "REGEXP ^...$",
             "IN (...)",
             "BETWEEN"
-        );
+        ];
 
         $sql = $method->invoke($tableSearch);
         $result = "SELECT DISTINCT *  FROM `PMA` WHERE `name` != 'value1'"
@@ -317,18 +317,18 @@ class TableSearchControllerTest extends PmaTestCase
             $method->invoke($ctrl)
         );
 
-        $_POST['criteriaColumnNames'] = array(
+        $_POST['criteriaColumnNames'] = [
             'b', 'a', 'c', 'd'
-        );
-        $_POST['criteriaColumnOperators'] = array(
+        ];
+        $_POST['criteriaColumnOperators'] = [
             '<=', '=', 'IS NULL', 'IS NOT NULL'
-        );
-        $_POST['criteriaValues'] = array(
+        ];
+        $_POST['criteriaValues'] = [
             '10', '2', '', ''
-        );
-        $_POST['criteriaColumnTypes'] = array(
+        ];
+        $_POST['criteriaColumnTypes'] = [
             'int(11)', 'int(11)', 'int(11)', 'int(11)'
-        );
+        ];
         $result = $method->invoke($ctrl);
         $this->assertEquals(
             ' WHERE `b` <= 10 AND `a` = 2 AND `c` IS NULL AND `d` IS NOT NULL',
@@ -350,9 +350,9 @@ class TableSearchControllerTest extends PmaTestCase
         $meta_two = new stdClass();
         $meta_two->length = 11;
         $meta_two->type = 'int';
-        $fields_meta = array(
+        $fields_meta = [
             $meta_one, $meta_two
-        );
+        ];
         $GLOBALS['dbi']->expects($this->any())->method('getFieldsMeta')
             ->will($this->returnValue($fields_meta));
 
@@ -364,10 +364,10 @@ class TableSearchControllerTest extends PmaTestCase
                         if ($count == 0) {
                             $count++;
 
-                            return array(
+                            return [
                                 'col1' => 1,
                                 'col2' => 2,
-                            );
+                            ];
                         } else {
                             return null;
                         }
@@ -386,10 +386,10 @@ class TableSearchControllerTest extends PmaTestCase
         $_REQUEST['db'] = 'PMA';
         $_REQUEST['table'] = 'PMA_BookMark';
         $_REQUEST['where_clause'] = '`col1` = 1';
-        $expected = array(
+        $expected = [
             'col1' => 1,
             'col2' => 2
-        );
+        ];
         $ctrl->getDataRowAction();
 
         $json = $this->_response->getJSONResult();
diff --git a/test/classes/Controllers/Table/TableStructureControllerTest.php b/test/classes/Controllers/Table/TableStructureControllerTest.php
index 658d6363c4..3177d364d4 100644
--- a/test/classes/Controllers/Table/TableStructureControllerTest.php
+++ b/test/classes/Controllers/Table/TableStructureControllerTest.php
@@ -121,10 +121,10 @@ class TableStructureControllerTest extends PmaTestCase
                         if ($callCount == 0) {
                             $callCount++;
 
-                            return array(
+                            return [
                                 'Key_name'    => 'PRIMARY',
                                 'Column_name' => 'column',
-                            );
+                            ];
                         } else {
                             return null;
                         }
@@ -221,7 +221,7 @@ class TableStructureControllerTest extends PmaTestCase
             $method->invoke($ctrl)
         );
 
-        $_REQUEST['selected'] = array('a', 'b');
+        $_REQUEST['selected'] = ['a', 'b'];
         $method->invoke($ctrl);
         $this->assertEquals(
             $_REQUEST['selected'],
@@ -259,15 +259,15 @@ class TableStructureControllerTest extends PmaTestCase
         $submit_mult = "index";
         $db = "PMA_db";
         $table = "PMA_table";
-        $selected = array(
+        $selected = [
             "table1", "table2"
-        );
+        ];
         $action = 'db_delete_row';
 
         list($what, $query_type, $is_unset_submit_mult, $mult_btn, $centralColsError)
             = $method->invokeArgs(
                 $ctrl,
-                array($submit_mult, $db, $table, $selected, $action)
+                [$submit_mult, $db, $table, $selected, $action]
             );
 
         //validate 1: $what
@@ -305,7 +305,7 @@ class TableStructureControllerTest extends PmaTestCase
         list($what, $query_type, $is_unset_submit_mult, $mult_btn, $centralColsError)
             = $method->invokeArgs(
                 $ctrl,
-                array($submit_mult, $db, $table, $selected, $action)
+                [$submit_mult, $db, $table, $selected, $action]
             );
 
         //validate 1: $what
diff --git a/test/classes/CoreTest.php b/test/classes/CoreTest.php
index 5826cfb5d8..8d8f44f85e 100644
--- a/test/classes/CoreTest.php
+++ b/test/classes/CoreTest.php
@@ -22,7 +22,7 @@ use stdClass;
  */
 class CoreTest extends PmaTestCase
 {
-    protected $goto_whitelist = array(
+    protected $goto_whitelist = [
         'db_datadict.php',
         'db_sql.php',
         'db_export.php',
@@ -39,7 +39,7 @@ class CoreTest extends PmaTestCase
         'transformation_overview.php',
         'transformation_wrapper.php',
         'user_password.php',
-    );
+    ];
 
     /**
      * Setup for test cases
@@ -61,15 +61,15 @@ class CoreTest extends PmaTestCase
      */
     function testArrayRead()
     {
-        $arr = array(
+        $arr = [
             "int" => 1,
             "str" => "str_val",
-            "arr" => array('val1', 'val2', 'val3'),
-            "sarr" => array(
-                'arr1' => array(1, 2, 3),
-                array(3, array('a', 'b', 'c'), 4)
-            )
-        );
+            "arr" => ['val1', 'val2', 'val3'],
+            "sarr" => [
+                'arr1' => [1, 2, 3],
+                [3, ['a', 'b', 'c'], 4]
+            ]
+        ];
 
         $this->assertEquals(
             Core::arrayRead('int', $arr),
@@ -149,15 +149,15 @@ class CoreTest extends PmaTestCase
      */
     function testArrayWrite()
     {
-        $arr = array(
+        $arr = [
             "int" => 1,
             "str" => "str_val",
-            "arr" => array('val1', 'val2', 'val3'),
-            "sarr" => array(
-                'arr1' => array(1, 2, 3),
-                array(3, array('a', 'b', 'c'), 4)
-            )
-        );
+            "arr" => ['val1', 'val2', 'val3'],
+            "sarr" => [
+                'arr1' => [1, 2, 3],
+                [3, ['a', 'b', 'c'], 4]
+            ]
+        ];
 
         Core::arrayWrite('int', $arr, 5);
         $this->assertEquals($arr['int'], 5);
@@ -203,15 +203,15 @@ class CoreTest extends PmaTestCase
      */
     function testArrayRemove()
     {
-        $arr = array(
+        $arr = [
             "int" => 1,
             "str" => "str_val",
-            "arr" => array('val1', 'val2', 'val3'),
-            "sarr" => array(
-                'arr1' => array(1, 2, 3),
-                array(3, array('a', 'b', 'c'), 4)
-            )
-        );
+            "arr" => ['val1', 'val2', 'val3'],
+            "sarr" => [
+                'arr1' => [1, 2, 3],
+                [3, ['a', 'b', 'c'], 4]
+            ]
+        ];
 
         Core::arrayRemove('int', $arr);
         $this->assertArrayNotHasKey('int', $arr);
@@ -281,15 +281,15 @@ class CoreTest extends PmaTestCase
      */
     public function providerTestGotoNowhere()
     {
-        return array(
-            array('', [], false),
-            array('', [''], false),
-            array('export.php', [], true),
-            array('export.php', $this->goto_whitelist, true),
-            array('shell.php', $this->goto_whitelist, false),
-            array('index.php?sql.php&test=true', $this->goto_whitelist, true),
-            array('index.php%3Fsql.php%26test%3Dtrue', $this->goto_whitelist, true),
-        );
+        return [
+            ['', [], false],
+            ['', [''], false],
+            ['export.php', [], true],
+            ['export.php', $this->goto_whitelist, true],
+            ['shell.php', $this->goto_whitelist, false],
+            ['index.php?sql.php&test=true', $this->goto_whitelist, true],
+            ['index.php%3Fsql.php%26test%3Dtrue', $this->goto_whitelist, true],
+        ];
     }
 
     /**
@@ -323,56 +323,56 @@ class CoreTest extends PmaTestCase
      */
     public function providerTestPathInfo()
     {
-        return array(
-            array(
+        return [
+            [
                 '/phpmyadmin/index.php/; cookieinj=value/',
                 '/phpmyadmin/index.php/;%20cookieinj=value///',
                 '/; cookieinj=value/',
                 '/phpmyadmin/index.php'
-            ),
-            array(
+            ],
+            [
                 '',
                 '/phpmyadmin/index.php/;%20cookieinj=value///',
                 '/; cookieinj=value/',
                 '/phpmyadmin/index.php'
-            ),
-            array(
+            ],
+            [
                 '',
                 '//example.com/../phpmyadmin/index.php',
                 '',
                 '/phpmyadmin/index.php'
-            ),
-            array(
+            ],
+            [
                 '',
                 '//example.com/../../.././phpmyadmin/index.php',
                 '',
                 '/phpmyadmin/index.php'
-            ),
-            array(
+            ],
+            [
                 '',
                 '/page.php/malicouspathinfo?malicouspathinfo',
                 'malicouspathinfo',
                 '/page.php'
-            ),
-            array(
+            ],
+            [
                 '/phpmyadmin/./index.php',
                 '/phpmyadmin/./index.php',
                 '',
                 '/phpmyadmin/index.php'
-            ),
-            array(
+            ],
+            [
                 '/phpmyadmin/index.php',
                 '/phpmyadmin/index.php',
                 '',
                 '/phpmyadmin/index.php'
-            ),
-            array(
+            ],
+            [
                 '',
                 '/phpmyadmin/index.php',
                 '',
                 '/phpmyadmin/index.php'
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -394,7 +394,7 @@ class CoreTest extends PmaTestCase
     public function testFatalErrorMessageWithArgs()
     {
         $message = "Fatal error #%d in file %s.";
-        $params = array(1, 'error_file.php');
+        $params = [1, 'error_file.php'];
 
         $this->expectOutputRegex("/Fatal error #1 in file error_file.php./");
         Core::fatalError($message, $params);
@@ -428,14 +428,14 @@ class CoreTest extends PmaTestCase
      */
     public function providerTestGetRealSize()
     {
-        return array(
-            array('0', 0),
-            array('1kb', 1024),
-            array('1024k', 1024 * 1024),
-            array('8m', 8 * 1024 * 1024),
-            array('12gb', 12 * 1024 * 1024 * 1024),
-            array('1024', 1024),
-        );
+        return [
+            ['0', 0],
+            ['1kb', 1024],
+            ['1024k', 1024 * 1024],
+            ['8m', 8 * 1024 * 1024],
+            ['12gb', 12 * 1024 * 1024 * 1024],
+            ['1024', 1024],
+        ];
     }
 
     /**
@@ -475,14 +475,14 @@ class CoreTest extends PmaTestCase
      */
     public function providerTestLinkURL()
     {
-        return array(
-            array('https://wiki.phpmyadmin.net',
-             './url.php?url=https%3A%2F%2Fwiki.phpmyadmin.net'),
-            array('https://wiki.phpmyadmin.net',
-             './url.php?url=https%3A%2F%2Fwiki.phpmyadmin.net'),
-            array('wiki.phpmyadmin.net', 'wiki.phpmyadmin.net'),
-            array('index.php?db=phpmyadmin', 'index.php?db=phpmyadmin')
-        );
+        return [
+            ['https://wiki.phpmyadmin.net',
+             './url.php?url=https%3A%2F%2Fwiki.phpmyadmin.net'],
+            ['https://wiki.phpmyadmin.net',
+             './url.php?url=https%3A%2F%2Fwiki.phpmyadmin.net'],
+            ['wiki.phpmyadmin.net', 'wiki.phpmyadmin.net'],
+            ['index.php?db=phpmyadmin', 'index.php?db=phpmyadmin']
+        ];
     }
 
     /**
@@ -650,16 +650,16 @@ class CoreTest extends PmaTestCase
      */
     function provideTestIsAllowedDomain()
     {
-        return array(
-            array('https://www.phpmyadmin.net/', true),
-            array('http://duckduckgo.com\\@github.com', false),
-            array('https://github.com/', true),
-            array('https://github.com:123/', false),
-            array('https://user:pass@github.com:123/', false),
-            array('https://user:pass@github.com/', false),
-            array('https://server.local/', true),
-            array('./relative/', false),
-        );
+        return [
+            ['https://www.phpmyadmin.net/', true],
+            ['http://duckduckgo.com\\@github.com', false],
+            ['https://github.com/', true],
+            ['https://github.com:123/', false],
+            ['https://user:pass@github.com:123/', false],
+            ['https://user:pass@github.com/', false],
+            ['https://server.local/', true],
+            ['./relative/', false],
+        ];
     }
 
     /**
@@ -685,19 +685,19 @@ class CoreTest extends PmaTestCase
      */
     public static function providerTestNoVarType()
     {
-        return array(
-            array(0, false, 0),
-            array(0, false, 1),
-            array(1, false, null),
-            array(1.1, false, null),
-            array('', false, null),
-            array(' ', false, null),
-            array('0', false, null),
-            array('string', false, null),
-            array(array(), false, null),
-            array(array(1, 2, 3), false, null),
-            array(true, false, null),
-            array(false, false, null));
+        return [
+            [0, false, 0],
+            [0, false, 1],
+            [1, false, null],
+            [1.1, false, null],
+            ['', false, null],
+            [' ', false, null],
+            ['0', false, null],
+            ['string', false, null],
+            [[], false, null],
+            [[1, 2, 3], false, null],
+            [true, false, null],
+            [false, false, null]];
     }
 
     /**
@@ -838,7 +838,7 @@ class CoreTest extends PmaTestCase
      */
     public function testNotScalarArray()
     {
-        $var = array('test');
+        $var = ['test'];
         $this->assertFalse(Core::isValid($var, 'scalar'));
     }
 
@@ -905,7 +905,7 @@ class CoreTest extends PmaTestCase
     public function testValueInArray()
     {
         $var = 'a';
-        $this->assertTrue(Core::isValid($var, array('a', 'b',)));
+        $this->assertTrue(Core::isValid($var, ['a', 'b',]));
     }
 
     /**
@@ -916,7 +916,7 @@ class CoreTest extends PmaTestCase
     public function testValueNotInArray()
     {
         $var = 'c';
-        $this->assertFalse(Core::isValid($var, array('a', 'b',)));
+        $this->assertFalse(Core::isValid($var, ['a', 'b',]));
     }
 
     /**
@@ -965,14 +965,14 @@ class CoreTest extends PmaTestCase
      */
     public function provideTestSimilarType()
     {
-        return array(
-            array(1, 1),
-            array(1.5, 1.5),
-            array(true, true),
-            array('string', "string"),
-            array(array(1, 2, 3.4), array(1, 2, 3.4)),
-            array(array(1, '2', '3.4', 5, 'text'), array('1', '2', 3.4,'5'))
-        );
+        return [
+            [1, 1],
+            [1.5, 1.5],
+            [true, true],
+            ['string', "string"],
+            [[1, 2, 3.4], [1, 2, 3.4]],
+            [[1, '2', '3.4', 5, 'text'], ['1', '2', 3.4,'5']]
+        ];
     }
 
     /**
@@ -1011,18 +1011,18 @@ class CoreTest extends PmaTestCase
      */
     function provideTestSafeUnserialize()
     {
-        return array(
-            array('s:6:"foobar";', 'foobar'),
-            array('foobar', null),
-            array('b:0;', false),
-            array('O:1:"a":1:{s:5:"value";s:3:"100";}', null),
-            array('O:8:"stdClass":1:{s:5:"field";O:8:"stdClass":0:{}}', null),
-            array('a:2:{i:0;s:90:"1234567890;a345678901234567890123456789012345678901234567890123456789012345678901234567890";i:1;O:8:"stdClass":0:{}}', null),
-            array(serialize(array(1, 2, 3)), array(1, 2, 3)),
-            array(serialize('string""'), 'string""'),
-            array(serialize(array('foo' => 'bar')), array('foo' => 'bar')),
-            array(serialize(array('1', new stdClass(), '2')), null),
-        );
+        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],
+            ['a:2:{i:0;s:90:"1234567890;a345678901234567890123456789012345678901234567890123456789012345678901234567890";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],
+        ];
     }
 
     /**
@@ -1050,12 +1050,12 @@ class CoreTest extends PmaTestCase
      */
     function provideTestSanitizeMySQLHost()
     {
-        return array(
-            array('p:foo.bar', 'foo.bar'),
-            array('p:p:foo.bar', 'foo.bar'),
-            array('bar.baz', 'bar.baz'),
-            array('P:example.com', 'example.com'),
-        );
+        return [
+            ['p:foo.bar', 'foo.bar'],
+            ['p:p:foo.bar', 'foo.bar'],
+            ['bar.baz', 'bar.baz'],
+            ['P:example.com', 'example.com'],
+        ];
     }
 
     /**
diff --git a/test/classes/Database/Designer/CommonTest.php b/test/classes/Database/Designer/CommonTest.php
index bf802a62e6..72fe47baf4 100644
--- a/test/classes/Database/Designer/CommonTest.php
+++ b/test/classes/Database/Designer/CommonTest.php
@@ -33,17 +33,17 @@ class CommonTest extends TestCase
     protected function setUp()
     {
         $GLOBALS['server'] = 1;
-        $_SESSION = array(
-            'relation' => array(
-                '1' => array(
+        $_SESSION = [
+            'relation' => [
+                '1' => [
                     'PMA_VERSION' => PMA_VERSION,
                     'db' => 'pmadb',
                     'pdf_pages' => 'pdf_pages',
                     'pdfwork' => true,
                     'table_coords' => 'table_coords'
-                )
-            )
-        );
+                ]
+            ]
+        ];
     }
 
     /**
@@ -110,7 +110,7 @@ class CommonTest extends TestCase
                 DatabaseInterface::CONNECT_CONTROL,
                 DatabaseInterface::QUERY_STORE
             )
-            ->will($this->returnValue(array($pageName)));
+            ->will($this->returnValue([$pageName]));
         $GLOBALS['dbi'] = $dbi;
 
         $this->designerCommon = new Common($GLOBALS['dbi']);
@@ -175,7 +175,7 @@ class CommonTest extends TestCase
                 DatabaseInterface::CONNECT_CONTROL,
                 DatabaseInterface::QUERY_STORE
             )
-            ->will($this->returnValue(array($default_pg)));
+            ->will($this->returnValue([$default_pg]));
         $dbi->expects($this->any())->method('escapeString')
             ->will($this->returnArgument(0));
 
@@ -210,7 +210,7 @@ class CommonTest extends TestCase
                 DatabaseInterface::CONNECT_CONTROL,
                 DatabaseInterface::QUERY_STORE
             )
-            ->will($this->returnValue(array()));
+            ->will($this->returnValue([]));
         $dbi->expects($this->any())->method('escapeString')
             ->will($this->returnArgument(0));
 
@@ -246,7 +246,7 @@ class CommonTest extends TestCase
                 DatabaseInterface::CONNECT_CONTROL,
                 DatabaseInterface::QUERY_STORE
             )
-            ->will($this->returnValue(array($default_pg)));
+            ->will($this->returnValue([$default_pg]));
         $dbi->expects($this->any())->method('escapeString')
             ->will($this->returnArgument(0));
 
@@ -274,8 +274,8 @@ class CommonTest extends TestCase
         $dbi->expects($this->exactly(2))
             ->method('fetchResult')
             ->willReturnOnConsecutiveCalls(
-                array(),
-                array(array($first_pg))
+                [],
+                [[$first_pg]]
             );
         $dbi->expects($this->any())->method('escapeString')
             ->will($this->returnArgument(0));
diff --git a/test/classes/Database/QbeTest.php b/test/classes/Database/QbeTest.php
index 12aad29d5c..003d923efb 100644
--- a/test/classes/Database/QbeTest.php
+++ b/test/classes/Database/QbeTest.php
@@ -56,7 +56,7 @@ class QbeTest extends PmaTestCase
 
         $dbi->expects($this->any())
             ->method('getTableIndexes')
-            ->will($this->returnValue(array()));
+            ->will($this->returnValue([]));
 
         $GLOBALS['dbi'] = $dbi;
         $this->object->dbi = $dbi;
@@ -102,21 +102,21 @@ class QbeTest extends PmaTestCase
             'style="width:12ex" name="criteriaSort[1]"',
             $this->_callProtectedFunction(
                 '_getSortSelectCell',
-                array(1)
+                [1]
             )
         );
         $this->assertNotContains(
             'selected="selected"',
             $this->_callProtectedFunction(
                 '_getSortSelectCell',
-                array(1)
+                [1]
             )
         );
         $this->assertContains(
             'value="ASC" selected="selected">',
             $this->_callProtectedFunction(
                 '_getSortSelectCell',
-                array(1, 'ASC')
+                [1, 'ASC']
             )
         );
     }
@@ -132,28 +132,28 @@ class QbeTest extends PmaTestCase
             '<th>Sort:</th>',
             $this->_callProtectedFunction(
                 '_getSortRow',
-                array()
+                []
             )
         );
         $this->assertContains(
             'name="criteriaSort[0]"',
             $this->_callProtectedFunction(
                 '_getSortRow',
-                array()
+                []
             )
         );
         $this->assertContains(
             'name="criteriaSort[1]"',
             $this->_callProtectedFunction(
                 '_getSortRow',
-                array()
+                []
             )
         );
         $this->assertContains(
             'name="criteriaSort[2]"',
             $this->_callProtectedFunction(
                 '_getSortRow',
-                array()
+                []
             )
         );
     }
@@ -173,7 +173,7 @@ class QbeTest extends PmaTestCase
             . '</td></tr>',
             $this->_callProtectedFunction(
                 '_getShowRow',
-                array()
+                []
             )
         );
     }
@@ -198,7 +198,7 @@ class QbeTest extends PmaTestCase
             . 'style="width: 12ex" size="20" /></td></tr>',
             $this->_callProtectedFunction(
                 '_getCriteriaInputboxRow',
-                array()
+                []
             )
         );
     }
@@ -214,21 +214,21 @@ class QbeTest extends PmaTestCase
             'Add/Delete criteria rows',
             $this->_callProtectedFunction(
                 '_getFootersOptions',
-                array('row')
+                ['row']
             )
         );
         $this->assertContains(
             'name="criteriaRowAdd"',
             $this->_callProtectedFunction(
                 '_getFootersOptions',
-                array('row')
+                ['row']
             )
         );
         $this->assertContains(
             '<option value="0" selected="selected">0</option>',
             $this->_callProtectedFunction(
                 '_getFootersOptions',
-                array('row')
+                ['row']
             )
         );
     }
@@ -244,21 +244,21 @@ class QbeTest extends PmaTestCase
             'name="criteriaRowAdd"',
             $this->_callProtectedFunction(
                 '_getTableFooters',
-                array()
+                []
             )
         );
         $this->assertContains(
             'name="criteriaColumnAdd"',
             $this->_callProtectedFunction(
                 '_getTableFooters',
-                array()
+                []
             )
         );
         $this->assertContains(
             '<input type="submit" name="modify" value="Update Query" />',
             $this->_callProtectedFunction(
                 '_getTableFooters',
-                array()
+                []
             )
         );
     }
@@ -279,7 +279,7 @@ class QbeTest extends PmaTestCase
             . 'name="criteriaColumnDelete[1]" /></td>',
             $this->_callProtectedFunction(
                 '_getAndOrColCell',
-                array(1)
+                [1]
             )
         );
     }
@@ -309,7 +309,7 @@ class QbeTest extends PmaTestCase
             . '</tr>',
             $this->_callProtectedFunction(
                 '_getModifyColumnsRow',
-                array()
+                []
             )
         );
     }
@@ -333,7 +333,7 @@ class QbeTest extends PmaTestCase
             . 'value="or" checked="checked" /></td></tr></table></td>',
             $this->_callProtectedFunction(
                 '_getInsDelAndOrCell',
-                array(3, array('and' => '', 'or' => ' checked="checked"'))
+                [3, ['and' => '', 'or' => ' checked="checked"']]
             )
         );
     }
@@ -354,7 +354,7 @@ class QbeTest extends PmaTestCase
             . '12ex" size="20" /></td>',
             $this->_callProtectedFunction(
                 '_getInputboxRow',
-                array(2)
+                [2]
             )
         );
     }
@@ -384,7 +384,7 @@ class QbeTest extends PmaTestCase
             . '"textfield" style="width: 12ex" size="20" /></td></tr>',
             $this->_callProtectedFunction(
                 '_getInsDelAndOrCriteriaRows',
-                array(2,3)
+                [2,3]
             )
         );
     }
@@ -400,7 +400,7 @@ class QbeTest extends PmaTestCase
             '',
             $this->_callProtectedFunction(
                 '_getSelectClause',
-                array()
+                []
             )
         );
     }
@@ -416,7 +416,7 @@ class QbeTest extends PmaTestCase
             '',
             $this->_callProtectedFunction(
                 '_getWhereClause',
-                array()
+                []
             )
         );
     }
@@ -432,7 +432,7 @@ class QbeTest extends PmaTestCase
             '',
             $this->_callProtectedFunction(
                 '_getOrderByClause',
-                array()
+                []
             )
         );
     }
@@ -445,17 +445,17 @@ class QbeTest extends PmaTestCase
     public function testGetIndexes()
     {
         $this->assertEquals(
-            array(
-                'unique' => array(),
-                'index' => array()
-            ),
+            [
+                'unique' => [],
+                'index' => []
+            ],
             $this->_callProtectedFunction(
                 '_getIndexes',
-                array(
-                    array('`table1`','table2'),
-                    array('column1', 'column2', 'column3'),
-                    array('column2')
-                )
+                [
+                    ['`table1`','table2'],
+                    ['column1', 'column2', 'column3'],
+                    ['column2']
+                ]
             )
         );
     }
@@ -468,16 +468,16 @@ class QbeTest extends PmaTestCase
     public function testGetLeftJoinColumnCandidates()
     {
         $this->assertEquals(
-            array(
+            [
                 0 => 'column2'
-            ),
+            ],
             $this->_callProtectedFunction(
                 '_getLeftJoinColumnCandidates',
-                array(
-                    array('`table1`','table2'),
-                    array('column1', 'column2', 'column3'),
-                    array('column2')
-                )
+                [
+                    ['`table1`','table2'],
+                    ['column1', 'column2', 'column3'],
+                    ['column2']
+                ]
             )
         );
     }
@@ -493,12 +493,12 @@ class QbeTest extends PmaTestCase
             0,
             $this->_callProtectedFunction(
                 '_getMasterTable',
-                array(
-                    array('table1','table2'),
-                    array('column1', 'column2', 'column3'),
-                    array('column2'),
-                    array('qbe_test')
-                )
+                [
+                    ['table1','table2'],
+                    ['column1', 'column2', 'column3'],
+                    ['column2'],
+                    ['qbe_test']
+                ]
             )
         );
     }
@@ -510,20 +510,20 @@ class QbeTest extends PmaTestCase
      */
     public function testGetWhereClauseTablesAndColumns()
     {
-        $_POST['criteriaColumn'] = array(
+        $_POST['criteriaColumn'] = [
             'table1.id',
             'table1.value',
             'table1.name',
             'table1.deleted'
-        );
+        ];
         $this->assertEquals(
-            array(
-                'where_clause_tables' => array(),
-                'where_clause_columns' => array()
-            ),
+            [
+                'where_clause_tables' => [],
+                'where_clause_columns' => []
+            ],
             $this->_callProtectedFunction(
                 '_getWhereClauseTablesAndColumns',
-                array()
+                []
             )
         );
     }
@@ -535,17 +535,17 @@ class QbeTest extends PmaTestCase
      */
     public function testGetFromClause()
     {
-        $_POST['criteriaColumn'] = array(
+        $_POST['criteriaColumn'] = [
             'table1.id',
             'table1.value',
             'table1.name',
             'table1.deleted'
-        );
+        ];
         $this->assertEquals(
             '`table1`',
             $this->_callProtectedFunction(
                 '_getFromClause',
-                array(array('`table1`.`id`'))
+                [['`table1`.`id`']]
             )
         );
     }
@@ -557,18 +557,18 @@ class QbeTest extends PmaTestCase
      */
     public function testGetSQLQuery()
     {
-        $_POST['criteriaColumn'] = array(
+        $_POST['criteriaColumn'] = [
             'table1.id',
             'table1.value',
             'table1.name',
             'table1.deleted'
-        );
+        ];
         $this->assertEquals(
             'FROM `table1`
 ',
             $this->_callProtectedFunction(
                 '_getSQLQuery',
-                array(array('`table1`.`id`'))
+                [['`table1`.`id`']]
             )
         );
     }
diff --git a/test/classes/Database/SearchTest.php b/test/classes/Database/SearchTest.php
index 0b11e15e0b..f9efb044de 100644
--- a/test/classes/Database/SearchTest.php
+++ b/test/classes/Database/SearchTest.php
@@ -45,10 +45,10 @@ class SearchTest extends PmaTestCase
         $dbi->expects($this->any())
             ->method('getColumns')
             ->with('pma', 'table1')
-            ->will($this->returnValue(array(
-                array('Field' => 'column1'),
-                array('Field' => 'column2'),
-            )));
+            ->will($this->returnValue([
+                ['Field' => 'column1'],
+                ['Field' => 'column2'],
+            ]));
 
         $dbi->expects($this->any())
             ->method('escapeString')
@@ -106,7 +106,7 @@ class SearchTest extends PmaTestCase
             $expected,
             $this->callProtectedFunction(
                 'getWhereClause',
-                array('table1')
+                ['table1']
             )
         );
     }
@@ -118,28 +118,28 @@ class SearchTest extends PmaTestCase
      */
     public function searchTypes()
     {
-        return array(
-            array(
+        return [
+            [
                 '1',
                 " WHERE (CONVERT(`column1` USING utf8) LIKE '%search%' OR CONVERT(`column2` USING utf8) LIKE '%search%')  OR  (CONVERT(`column1` USING utf8) LIKE '%string%' OR CONVERT(`column2` USING utf8) LIKE '%string%')"
-            ),
-            array(
+            ],
+            [
                 '2',
                 " WHERE (CONVERT(`column1` USING utf8) LIKE '%search%' OR CONVERT(`column2` USING utf8) LIKE '%search%')  AND  (CONVERT(`column1` USING utf8) LIKE '%string%' OR CONVERT(`column2` USING utf8) LIKE '%string%')"
-            ),
-            array(
+            ],
+            [
                 '3',
                 " WHERE (CONVERT(`column1` USING utf8) LIKE '%search string%' OR CONVERT(`column2` USING utf8) LIKE '%search string%')"
-            ),
-            array(
+            ],
+            [
                 '4',
                 " WHERE (CONVERT(`column1` USING utf8) LIKE 'search string' OR CONVERT(`column2` USING utf8) LIKE 'search string')"
-            ),
-            array(
+            ],
+            [
                 '5',
                 " WHERE (CONVERT(`column1` USING utf8) REGEXP 'search string' OR CONVERT(`column2` USING utf8) REGEXP 'search string')"
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -150,15 +150,15 @@ class SearchTest extends PmaTestCase
     public function testGetSearchSqls()
     {
         $this->assertEquals(
-            array (
+             [
                 'select_columns' => 'SELECT *  FROM `pma`.`table1` WHERE FALSE',
                 'select_count' => 'SELECT COUNT(*) AS `count` FROM `pma`.`table1` ' .
                     'WHERE FALSE',
                 'delete' => 'DELETE FROM `pma`.`table1` WHERE FALSE'
-            ),
+            ],
             $this->callProtectedFunction(
                 'getSearchSqls',
-                array('table1')
+                ['table1']
             )
         );
     }
@@ -198,7 +198,7 @@ class SearchTest extends PmaTestCase
     {
         $actual = $this->callProtectedFunction(
             'getResultDivs',
-            array()
+            []
         );
         $this->assertContains(
             '<div id="table-info"',
diff --git a/test/classes/DatabaseInterfaceTest.php b/test/classes/DatabaseInterfaceTest.php
index e9fadc73f5..de0f347b1c 100644
--- a/test/classes/DatabaseInterfaceTest.php
+++ b/test/classes/DatabaseInterfaceTest.php
@@ -76,11 +76,11 @@ class DatabaseInterfaceTest extends PmaTestCase
      */
     public function currentUserData()
     {
-        return array(
-            array(array(array('pma@localhost')), 'pma@localhost', array('pma', 'localhost')),
-            array(array(array('@localhost')), '@localhost', array('', 'localhost')),
-            array(false, '@', array('', '')),
-        );
+        return [
+            [[['pma@localhost']], 'pma@localhost', ['pma', 'localhost']],
+            [[['@localhost']], '@localhost', ['', 'localhost']],
+            [false, '@', ['', '']],
+        ];
     }
 
     /**
@@ -111,37 +111,37 @@ class DatabaseInterfaceTest extends PmaTestCase
             ->method('getFieldsMeta')
             ->will(
                 $this->returnValue(
-                    array(
+                    [
                         $meta1, $meta2
-                    )
+                    ]
                 )
             );
 
         $dbi = new DatabaseInterface($extension);
 
         $sql_query = "PMA_sql_query";
-        $view_columns = array(
+        $view_columns = [
             "view_columns1", "view_columns2"
-        );
+        ];
 
         $column_map = $dbi->getColumnMapFromSql(
             $sql_query, $view_columns
         );
 
         $this->assertEquals(
-            array(
+            [
                 'table_name' => 'meta1_table',
                 'refering_column' => 'meta1_name',
                 'real_column' => 'view_columns1'
-            ),
+            ],
             $column_map[0]
         );
         $this->assertEquals(
-            array(
+            [
                 'table_name' => 'meta2_table',
                 'refering_column' => 'meta2_name',
                 'real_column' => 'view_columns2'
-            ),
+            ],
             $column_map[1]
         );
     }
@@ -167,7 +167,7 @@ class DatabaseInterfaceTest extends PmaTestCase
     public function testPostConnectControl()
     {
         $GLOBALS['db'] = '';
-        $GLOBALS['cfg']['Server']['only_db'] = array();
+        $GLOBALS['cfg']['Server']['only_db'] = [];
         $this->_dbi->postConnectControl();
         $this->assertInstanceOf('PhpMyAdmin\Database\DatabaseList', $GLOBALS['dblist']);
     }
@@ -235,38 +235,38 @@ class DatabaseInterfaceTest extends PmaTestCase
      */
     public function connectionParams()
     {
-        $cfg_basic = array(
+        $cfg_basic = [
             'user' => 'u',
             'password' => 'pass',
             'host' => '',
             'controluser' => 'u2',
             'controlpass' => 'p2',
-        );
-        $cfg_ssl = array(
+        ];
+        $cfg_ssl = [
             'user' => 'u',
             'password' => 'pass',
             'host' => '',
             'ssl' => true,
             'controluser' => 'u2',
             'controlpass' => 'p2',
-        );
-        $cfg_control_ssl = array(
+        ];
+        $cfg_control_ssl = [
             'user' => 'u',
             'password' => 'pass',
             'host' => '',
             'control_ssl' => true,
             'controluser' => 'u2',
             'controlpass' => 'p2',
-        );
-        return array(
-            array(
+        ];
+        return [
+            [
                 $cfg_basic,
                 DatabaseInterface::CONNECT_USER,
                 null,
-                array(
+                [
                     'u',
                     'pass',
-                    array(
+                    [
                         'user' => 'u',
                         'password' => 'pass',
                         'host' => 'localhost',
@@ -276,33 +276,33 @@ class DatabaseInterfaceTest extends PmaTestCase
                         'compress' => false,
                         'controluser' => 'u2',
                         'controlpass' => 'p2',
-                    )
-                ),
-            ),
-            array(
+                    ]
+                ],
+            ],
+            [
                 $cfg_basic,
                 DatabaseInterface::CONNECT_CONTROL,
                 null,
-                array(
+                [
                     'u2',
                     'p2',
-                    array(
+                    [
                         'host' => 'localhost',
                         'socket' => null,
                         'port' => 0,
                         'ssl' => false,
                         'compress' => false,
-                    )
-                ),
-            ),
-            array(
+                    ]
+                ],
+            ],
+            [
                 $cfg_ssl,
                 DatabaseInterface::CONNECT_USER,
                 null,
-                array(
+                [
                     'u',
                     'pass',
-                    array(
+                    [
                         'user' => 'u',
                         'password' => 'pass',
                         'host' => 'localhost',
@@ -312,33 +312,33 @@ class DatabaseInterfaceTest extends PmaTestCase
                         'compress' => false,
                         'controluser' => 'u2',
                         'controlpass' => 'p2',
-                    )
-                ),
-            ),
-            array(
+                    ]
+                ],
+            ],
+            [
                 $cfg_ssl,
                 DatabaseInterface::CONNECT_CONTROL,
                 null,
-                array(
+                [
                     'u2',
                     'p2',
-                    array(
+                    [
                         'host' => 'localhost',
                         'socket' => null,
                         'port' => 0,
                         'ssl' => true,
                         'compress' => false,
-                    )
-                ),
-            ),
-            array(
+                    ]
+                ],
+            ],
+            [
                 $cfg_control_ssl,
                 DatabaseInterface::CONNECT_USER,
                 null,
-                array(
+                [
                     'u',
                     'pass',
-                    array(
+                    [
                         'user' => 'u',
                         'password' => 'pass',
                         'host' => 'localhost',
@@ -349,26 +349,26 @@ class DatabaseInterfaceTest extends PmaTestCase
                         'controluser' => 'u2',
                         'controlpass' => 'p2',
                         'control_ssl' => true,
-                    )
-                ),
-            ),
-            array(
+                    ]
+                ],
+            ],
+            [
                 $cfg_control_ssl,
                 DatabaseInterface::CONNECT_CONTROL,
                 null,
-                array(
+                [
                     'u2',
                     'p2',
-                    array(
+                    [
                         'host' => 'localhost',
                         'socket' => null,
                         'port' => 0,
                         'ssl' => true,
                         'compress' => false,
-                    )
-                ),
-            ),
-        );
+                    ]
+                ],
+            ],
+        ];
     }
 
     /**
@@ -395,14 +395,14 @@ class DatabaseInterfaceTest extends PmaTestCase
      */
     public function errorData()
     {
-        return array(
-            array(2002, 'msg', 'The server is not responding'),
-            array(2003, 'msg', 'The server is not responding'),
-            array(1698, 'msg', 'logout.php'),
-            array(1005, 'msg', 'server_engines.php'),
-            array(1005, 'errno: 13', 'Please check privileges'),
-            array(-1, 'error message', 'error message'),
-        );
+        return [
+            [2002, 'msg', 'The server is not responding'],
+            [2003, 'msg', 'The server is not responding'],
+            [1698, 'msg', 'logout.php'],
+            [1005, 'msg', 'server_engines.php'],
+            [1005, 'errno: 13', 'Please check privileges'],
+            [-1, 'error message', 'error message'],
+        ];
     }
 
     /**
@@ -437,12 +437,12 @@ class DatabaseInterfaceTest extends PmaTestCase
      */
     public function isAmazonRdsData()
     {
-        return array(
-            array(array(array('/usr')), false),
-            array(array(array('E:/mysql')), false),
-            array(array(array('/rdsdbbin/mysql/')), true),
-            array(array(array('/rdsdbbin/mysql-5.7.18/')), true),
-        );
+        return [
+            [[['/usr']], false],
+            [[['E:/mysql']], false],
+            [[['/rdsdbbin/mysql/']], true],
+            [[['/rdsdbbin/mysql-5.7.18/']], true],
+        ];
     }
 
     /**
@@ -470,12 +470,12 @@ class DatabaseInterfaceTest extends PmaTestCase
      */
     public function versionData()
     {
-        return array(
-            array('5.0.5', 50005, 5, true),
-            array('5.05.01', 50501, 5, false),
-            array('5.6.35', 50635, 5, false),
-            array('10.1.22-MariaDB-', 100122, 10, false),
-        );
+        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],
+        ];
     }
 
     /**
@@ -495,10 +495,10 @@ class DatabaseInterfaceTest extends PmaTestCase
         $extension->expects($this->exactly(4))
             ->method('realQuery')
             ->withConsecutive(
-                array("SET collation_connection = 'utf8_czech_ci';"),
-                array("SET collation_connection = 'utf8mb4_bin_ci';"),
-                array("SET collation_connection = 'utf8_czech_ci';"),
-                array("SET collation_connection = 'utf8_bin_ci';")
+                ["SET collation_connection = 'utf8_czech_ci';"],
+                ["SET collation_connection = 'utf8mb4_bin_ci';"],
+                ["SET collation_connection = 'utf8_czech_ci';"],
+                ["SET collation_connection = 'utf8_bin_ci';"]
             )
             ->willReturnOnConsecutiveCalls(
                 true,
diff --git a/test/classes/Dbi/DbiDummyTest.php b/test/classes/Dbi/DbiDummyTest.php
index f81b655333..2f2e009e69 100644
--- a/test/classes/Dbi/DbiDummyTest.php
+++ b/test/classes/Dbi/DbiDummyTest.php
@@ -52,7 +52,7 @@ class DbiDummyTest extends TestCase
     public function testFetch()
     {
         $result = $GLOBALS['dbi']->tryQuery('SELECT 1');
-        $this->assertEquals(array('1'), $GLOBALS['dbi']->fetchArray($result));
+        $this->assertEquals(['1'], $GLOBALS['dbi']->fetchArray($result));
     }
 
     /**
@@ -77,10 +77,10 @@ class DbiDummyTest extends TestCase
      */
     public function schemaData()
     {
-        return array(
-            array('information_schema', true),
-            array('pma_test', false),
-        );
+        return [
+            ['information_schema', true],
+            ['pma_test', false],
+        ];
     }
 
     /**
@@ -110,14 +110,14 @@ class DbiDummyTest extends TestCase
      */
     public function errorData()
     {
-        return array(
-            array(1234, '', '#1234 - '),
-            array(1234, 'foobar', '#1234 - foobar'),
-            array(
+        return [
+            [1234, '', '#1234 - '],
+            [1234, 'foobar', '#1234 - foobar'],
+            [
                 2002, 'foobar',
                 '#2002 - foobar &mdash; The server is not responding (or the local '
                 . 'server\'s socket is not correctly configured).'
-            ),
-        );
+            ],
+        ];
     }
 }
diff --git a/test/classes/Display/ExportTest.php b/test/classes/Display/ExportTest.php
index 817b461680..8c2ee1a238 100644
--- a/test/classes/Display/ExportTest.php
+++ b/test/classes/Display/ExportTest.php
@@ -133,16 +133,16 @@ class ExportTest extends TestCase
         $num_tables_str = "10";
         $unlim_num_rows_str = "unlim_num_rows_str";
         $single_table = "single_table";
-        $GLOBALS['dbi']->cacheTableContent(array($db, $table, 'ENGINE'), 'MERGE');
+        $GLOBALS['dbi']->cacheTableContent([$db, $table, 'ENGINE'], 'MERGE');
 
-        $columns_info = array(
-            'test_column1' => array(
+        $columns_info = [
+            'test_column1' => [
                 'COLUMN_NAME' => 'test_column1'
-            ),
-            'test_column2' => array(
+            ],
+            'test_column2' => [
                 'COLUMN_NAME' => 'test_column2'
-            )
-        );
+            ]
+        ];
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
             ->disableOriginalConstructor()
             ->getMock();
@@ -150,7 +150,7 @@ class ExportTest extends TestCase
         $dbi->expects($this->any())->method('getColumnsFull')
             ->will($this->returnValue($columns_info));
         $dbi->expects($this->any())->method('getCompatibilities')
-            ->will($this->returnValue(array()));
+            ->will($this->returnValue([]));
 
         $GLOBALS['dbi'] = $dbi;
 
@@ -158,10 +158,10 @@ class ExportTest extends TestCase
         $export_list = Plugins::getPlugins(
             "export",
             'libraries/classes/Plugins/Export/',
-            array(
+            [
                 'export_type' => $export_type,
                 'single_table' => isset($single_table)
-            )
+            ]
         );
 
         //Call the test function
@@ -269,18 +269,18 @@ class ExportTest extends TestCase
      */
     public function testGetHtmlForAliasModalDialog()
     {
-        $columns_info = array(
-            'test\'_db' => array(
-                'test_<b>table' => array(
-                    'co"l1' => array(
+        $columns_info = [
+            'test\'_db' => [
+                'test_<b>table' => [
+                    'co"l1' => [
                         'COLUMN_NAME' => 'co"l1'
-                    ),
-                    'col<2' => array(
+                    ],
+                    'col<2' => [
                         'COLUMN_NAME' => 'col<2'
-                    )
-                )
-            )
-        );
+                    ]
+                ]
+            ]
+        ];
 
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
             ->disableOriginalConstructor()
diff --git a/test/classes/Display/ResultsTest.php b/test/classes/Display/ResultsTest.php
index ce490fabf8..43060d0839 100644
--- a/test/classes/Display/ResultsTest.php
+++ b/test/classes/Display/ResultsTest.php
@@ -98,12 +98,12 @@ class ResultsTest extends PmaTestCase
         $this->assertTrue(
             $this->_callPrivateFunction(
                 '_isSelect',
-                array(
-                    array(
+                [
+                    [
                         'statement' => $parser->statements[0],
                         'select_from' => true,
-                    ),
-                )
+                    ],
+                ]
             )
         );
     }
@@ -128,7 +128,7 @@ class ResultsTest extends PmaTestCase
 
         $actual = $this->_callPrivateFunction(
             '_getTableNavigationButton',
-            array(&$caption, $title, $pos, $html_sql_query, true)
+            [&$caption, $title, $pos, $html_sql_query, true]
         );
 
         $this->assertContains(
@@ -156,14 +156,14 @@ class ResultsTest extends PmaTestCase
      */
     public function providerForTestGetTableNavigationButton()
     {
-        return array(
-            array(
+        return [
+            [
                 'btn',
                 'Submit',
                 1,
                 'SELECT * FROM `pma_bookmark` WHERE 1',
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -173,14 +173,14 @@ class ResultsTest extends PmaTestCase
      */
     public function providerForTestGetTableNavigation()
     {
-        return array(
-            array(
+        return [
+            [
                 21,
                 41,
                 false,
                 '310'
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -190,16 +190,16 @@ class ResultsTest extends PmaTestCase
      */
     public function dataProviderForTestGetClassesForColumn()
     {
-        return array(
-            array(
+        return [
+            [
                 'grid_edit',
                 'not_null',
                 '',
                 '',
                 '',
                 'data grid_edit not_null   '
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -227,10 +227,10 @@ class ResultsTest extends PmaTestCase
             $output,
             $this->_callPrivateFunction(
                 '_getClassesForColumn',
-                array(
+                [
                     $grid_edit_class, $not_null_class, $relation_class,
                     $hide_class, $field_type_class
-                )
+                ]
             )
         );
     }
@@ -246,7 +246,7 @@ class ResultsTest extends PmaTestCase
             'datetimefield',
             $this->_callPrivateFunction(
                 '_getClassForDateTimeRelatedFields',
-                array(DisplayResults::DATETIME_FIELD)
+                [DisplayResults::DATETIME_FIELD]
             )
         );
     }
@@ -262,7 +262,7 @@ class ResultsTest extends PmaTestCase
             'datefield',
             $this->_callPrivateFunction(
                 '_getClassForDateTimeRelatedFields',
-                array(DisplayResults::DATE_FIELD)
+                [DisplayResults::DATE_FIELD]
             )
         );
     }
@@ -278,7 +278,7 @@ class ResultsTest extends PmaTestCase
             'text',
             $this->_callPrivateFunction(
                 '_getClassForDateTimeRelatedFields',
-                array(DisplayResults::STRING_FIELD)
+                [DisplayResults::STRING_FIELD]
             )
         );
     }
@@ -292,8 +292,8 @@ class ResultsTest extends PmaTestCase
     {
         $_SESSION['tmpval']['max_rows'] = DisplayResults::ALL_ROWS;
         $this->assertEquals(
-            array(0, 0),
-            $this->_callPrivateFunction('_getOffsets', array())
+            [0, 0],
+            $this->_callPrivateFunction('_getOffsets', [])
         );
     }
 
@@ -307,8 +307,8 @@ class ResultsTest extends PmaTestCase
         $_SESSION['tmpval']['max_rows'] = 5;
         $_SESSION['tmpval']['pos'] = 4;
         $this->assertEquals(
-            array(9, 0),
-            $this->_callPrivateFunction('_getOffsets', array())
+            [9, 0],
+            $this->_callPrivateFunction('_getOffsets', [])
         );
     }
 
@@ -319,15 +319,15 @@ class ResultsTest extends PmaTestCase
      */
     public function dataProviderForGetCheckboxForMultiRowSubmissions()
     {
-        return array(
-            array(
+        return [
+            [
                 'sql.php?db=data&amp;table=new&amp;sql_query=DELETE+FROM+%60data%60'
                 . '.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&amp;message_to_show='
                 . 'The+row+has+been+deleted&amp;goto=sql.php%3Fdb%3Ddata%26table%3D'
                 . 'new%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26message'
                 . '_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_'
                 . 'structure.php',
-                array(
+                [
                     'edit_lnk' => 'ur',
                     'del_lnk' => 'dr',
                     'sort_lnk' => '0',
@@ -335,10 +335,10 @@ class ResultsTest extends PmaTestCase
                     'bkm_form' => '1',
                     'text_btn' => '1',
                     'pview_lnk' => '1'
-                ),
+                ],
                 0,
                 '%60new%60.%60id%60+%3D+1',
-                array('`new`.`id`' => '= 1'),
+                ['`new`.`id`' => '= 1'],
                 '[%_PMA_CHECKBOX_DIR_%]',
                 'klass',
                 '<td class="klass" class="center print_ignore"><input type'
@@ -347,8 +347,8 @@ class ResultsTest extends PmaTestCase
                 . 'new%60.%60id%60+%3D+1"  /><input type="hidden" class="condition_'
                 . 'array" value="{&quot;`new`.`id`&quot;:&quot;= 1&quot;}" />    '
                 . '</td>'
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -376,10 +376,10 @@ class ResultsTest extends PmaTestCase
             $output,
             $this->_callPrivateFunction(
                 '_getCheckboxForMultiRowSubmissions',
-                array(
+                [
                     $del_url, $displayParts, $row_no, $where_clause_html,
                     $condition_array, $id_suffix, $class
-                )
+                ]
             )
         );
     }
@@ -391,8 +391,8 @@ class ResultsTest extends PmaTestCase
      */
     public function dataProviderForGetEditLink()
     {
-        return array(
-            array(
+        return [
+            [
                 'tbl_change.php?db=Data&amp;table=customer&amp;where_clause=%60'
                 . 'customer%60.%60id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query='
                 . 'SELECT+%2A+FROM+%60customer%60&amp;goto=sql.php&amp;default_'
@@ -412,8 +412,8 @@ class ResultsTest extends PmaTestCase
                 . 'alt="Edit" class="icon ic_b_edit" /> Edit</span></a>'
                 . '<input type="hidden" class="where_clause" value ="%60customer'
                 . '%60.%60id%60+%3D+1" /></span></td>'
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -440,9 +440,9 @@ class ResultsTest extends PmaTestCase
             $output,
             $this->_callPrivateFunction(
                 '_getEditLink',
-                array(
+                [
                     $edit_url, $class, $edit_str, $where_clause, $where_clause_html
-                )
+                ]
             )
         );
     }
@@ -454,8 +454,8 @@ class ResultsTest extends PmaTestCase
      */
     public function dataProviderForGetCopyLink()
     {
-        return array(
-            array(
+        return [
+            [
                 'tbl_change.php?db=Data&amp;table=customer&amp;where_clause=%60cust'
                 . 'omer%60.%60id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query='
                 . 'SELECT+%2A+FROM+%60customer%60&amp;goto=sql.php&amp;default_'
@@ -475,8 +475,8 @@ class ResultsTest extends PmaTestCase
                 . 'alt="Copy" class="icon ic_b_insrow" /> Copy</span></a>'
                 . '<input type="hidden" class="where_clause" value="%60customer%60'
                 . '.%60id%60+%3D+1" /></span></td>'
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -503,9 +503,9 @@ class ResultsTest extends PmaTestCase
             $output,
             $this->_callPrivateFunction(
                 '_getCopyLink',
-                array(
+                [
                     $copy_url, $copy_str, $where_clause, $where_clause_html, $class
-                )
+                ]
             )
         );
     }
@@ -517,8 +517,8 @@ class ResultsTest extends PmaTestCase
      */
     public function dataProviderForGetDeleteLink()
     {
-        return array(
-            array(
+        return [
+            [
                 'sql.php?db=Data&amp;table=customer&amp;sql_query=DELETE+FROM+%60'
                 . 'Data%60.%60customer%60+WHERE+%60customer%60.%60id%60+%3D+1&amp;'
                 . 'message_to_show=The+row+has+been+deleted&amp;goto=sql.php%3Fdb'
@@ -541,8 +541,8 @@ class ResultsTest extends PmaTestCase
                 . 'Delete</span></a>'
                 . '<div class="hide">DELETE FROM `Data`.`customer` WHERE '
                 . '`customer`.`id` = 1</div></td>'
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -568,9 +568,9 @@ class ResultsTest extends PmaTestCase
             $output,
             $this->_callPrivateFunction(
                 '_getDeleteLink',
-                array(
+                [
                     $del_url, $del_str, $js_conf, $class
-                )
+                ]
             )
         );
     }
@@ -582,8 +582,8 @@ class ResultsTest extends PmaTestCase
      */
     public function dataProviderForGetCheckboxAndLinks()
     {
-        return array(
-            array(
+        return [
+            [
                 DisplayResults::POSITION_LEFT,
                 'sql.php?db=data&amp;table=new&amp;sql_query=DELETE+FROM+%60data'
                 . '%60.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&amp;message_to_show='
@@ -591,7 +591,7 @@ class ResultsTest extends PmaTestCase
                 . 'new%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26'
                 . 'message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3D'
                 . 'tbl_structure.php',
-                array(
+                [
                     'edit_lnk' => 'ur',
                     'del_lnk' => 'dr',
                     'sort_lnk' => '0',
@@ -599,13 +599,13 @@ class ResultsTest extends PmaTestCase
                     'bkm_form' => '1',
                     'text_btn' => '1',
                     'pview_lnk' => '1'
-                ),
+                ],
                 0,
                 '`new`.`id` = 1',
                 '%60new%60.%60id%60+%3D+1',
-                array(
+                [
                     '`new`.`id`' => '= 1',
-                ),
+                ],
                 'tbl_change.php?db=data&amp;table=new&amp;where_clause=%60new%60.'
                 . '%60id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query=SELECT+%2A+'
                 . 'FROM+%60new%60&amp;goto=sql.php&amp;default_action=update',
@@ -654,8 +654,8 @@ class ResultsTest extends PmaTestCase
                 . 'Delete</span></a>'
                 . '<div class="hide">DELETE FROM `data`.`new` WHERE `new`.`id` = 1'
                 . '</div></td>'
-            ),
-            array(
+            ],
+            [
                 DisplayResults::POSITION_RIGHT,
                 'sql.php?db=data&amp;table=new&amp;sql_query=DELETE+FROM+%60data%60'
                 . '.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&amp;message_to_show='
@@ -663,7 +663,7 @@ class ResultsTest extends PmaTestCase
                 . 'new%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26message'
                 . '_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_'
                 . 'structure.php',
-                array(
+                [
                     'edit_lnk' => 'ur',
                     'del_lnk' => 'dr',
                     'sort_lnk' => '0',
@@ -671,13 +671,13 @@ class ResultsTest extends PmaTestCase
                     'bkm_form' => '1',
                     'text_btn' => '1',
                     'pview_lnk' => '1'
-                ),
+                ],
                 0,
                 '`new`.`id` = 1',
                 '%60new%60.%60id%60+%3D+1',
-                array(
+                [
                     '`new`.`id`' => '= 1',
-                ),
+                ],
                 'tbl_change.php?db=data&amp;table=new&amp;where_clause=%60new%60.'
                 . '%60id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query=SELECT+%2A+'
                 . 'FROM+%60new%60&amp;goto=sql.php&amp;default_action=update',
@@ -724,8 +724,8 @@ class ResultsTest extends PmaTestCase
                 . '[0]" class="multi_checkbox checkall" value="%60new%60.%60id%60'
                 . '+%3D+1"  /><input type="hidden" class="condition_array" value="'
                 . '{&quot;`new`.`id`&quot;:&quot;= 1&quot;}" />    </td>'
-            ),
-            array(
+            ],
+            [
                 DisplayResults::POSITION_NONE,
                 'sql.php?db=data&amp;table=new&amp;sql_query=DELETE+FROM+%60data%60.'
                 . '%60new%60+WHERE+%60new%60.%60id%60+%3D+1&amp;message_to_show=The+'
@@ -733,7 +733,7 @@ class ResultsTest extends PmaTestCase
                 . '%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26message_'
                 . 'to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure'
                 . '.php',
-                array(
+                [
                     'edit_lnk' => 'ur',
                     'del_lnk' => 'dr',
                     'sort_lnk' => '0',
@@ -741,13 +741,13 @@ class ResultsTest extends PmaTestCase
                     'bkm_form' => '1',
                     'text_btn' => '1',
                     'pview_lnk' => '1'
-                ),
+                ],
                 0,
                 '`new`.`id` = 1',
                 '%60new%60.%60id%60+%3D+1',
-                array(
+                [
                     '`new`.`id`' => '= 1',
-                ),
+                ],
                 'tbl_change.php?db=data&amp;table=new&amp;where_clause=%60new%60.%60'
                 . 'id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query=SELECT+%2A+FROM+'
                 . '%60new%60&amp;goto=sql.php&amp;default_action=update',
@@ -767,8 +767,8 @@ class ResultsTest extends PmaTestCase
                 . 'checkall" value="%60new%60.%60id%60+%3D+1"  /><input type='
                 . '"hidden" class="condition_array" value="{&quot;`new`.`id`&quot;:'
                 . '&quot;= 1&quot;}" />    </td>'
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -804,12 +804,12 @@ class ResultsTest extends PmaTestCase
             $output,
             $this->_callPrivateFunction(
                 '_getCheckboxAndLinks',
-                array(
+                [
                     $position, $del_url, $displayParts, $row_no, $where_clause,
                     $where_clause_html, $condition_array,
                     $edit_url, $copy_url, $class, $edit_str,
                     $copy_str, $del_str, $js_conf
-                )
+                ]
             )
         );
     }
@@ -821,8 +821,8 @@ class ResultsTest extends PmaTestCase
      */
     public function dataProviderForGetPlacedLinks()
     {
-        return array(
-            array(
+        return [
+            [
                 DisplayResults::POSITION_NONE,
                 'sql.php?db=data&amp;table=new&amp;sql_query=DELETE+FROM+%60data%60.'
                 . '%60new%60+WHERE+%60new%60.%60id%60+%3D+1&amp;message_to_show=The+'
@@ -830,7 +830,7 @@ class ResultsTest extends PmaTestCase
                 . '%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26message_'
                 . 'to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure'
                 . '.php',
-                array(
+                [
                     'edit_lnk' => 'ur',
                     'del_lnk' => 'dr',
                     'sort_lnk' => '0',
@@ -838,13 +838,13 @@ class ResultsTest extends PmaTestCase
                     'bkm_form' => '1',
                     'text_btn' => '1',
                     'pview_lnk' => '1'
-                ),
+                ],
                 0,
                 '`new`.`id` = 1',
                 '%60new%60.%60id%60+%3D+1',
-                array(
+                [
                     '`new`.`id`' => '= 1',
-                ),
+                ],
                 'tbl_change.php?db=data&amp;table=new&amp;where_clause=%60new%60.%60'
                 . 'id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query=SELECT+%2A+FROM+'
                 . '%60new%60&amp;goto=sql.php&amp;default_action=update',
@@ -864,8 +864,8 @@ class ResultsTest extends PmaTestCase
                 . 'checkall" value="%60new%60.%60id%60+%3D+1"  /><input type='
                 . '"hidden" class="condition_array" value="{&quot;`new`.`id`&quot;:'
                 . '&quot;= 1&quot;}" />    </td>'
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -900,12 +900,12 @@ class ResultsTest extends PmaTestCase
             $output,
             $this->_callPrivateFunction(
                 '_getPlacedLinks',
-                array(
+                [
                     $dir, $del_url, $displayParts, $row_no, $where_clause,
                     $where_clause_html, $condition_array,
                     $edit_url, $copy_url, $edit_anchor_class,
                     $edit_str, $copy_str, $del_str, $js_conf
-                )
+                ]
             )
         );
     }
@@ -918,47 +918,47 @@ class ResultsTest extends PmaTestCase
      */
     public function dataProviderForTestGetSpecialLinkUrl()
     {
-        return array(
-            array(
+        return [
+            [
                 'information_schema',
                 'routines',
                 'circumference',
-                array(
+                [
                     'routine_name' => 'circumference',
                     'routine_schema' => 'data',
                     'routine_type' => 'FUNCTION'
-                ),
+                ],
                 'routine_name',
                 'db_routines.php?item_name=circumference&db=data'
                 . '&item_type=FUNCTION&server=0&lang=en'
-            ),
-            array(
+            ],
+            [
                 'information_schema',
                 'routines',
                 'area',
-                array(
+                [
                     'routine_name' => 'area',
                     'routine_schema' => 'data',
                     'routine_type' => 'PROCEDURE'
-                ),
+                ],
                 'routine_name',
                 'db_routines.php?item_name=area&db=data'
                 . '&item_type=PROCEDURE&server=0&lang=en'
-            ),
-            array(
+            ],
+            [
                 'information_schema',
                 'columns',
                 'CHARACTER_SET_NAME',
-                array(
+                [
                     'table_schema' => 'information_schema',
                     'table_name' => 'CHARACTER_SETS'
-                ),
+                ],
                 'column_name',
                 'index.php?sql_query=SELECT+%60CHARACTER_SET_NAME%60+FROM+%60info'
                 . 'rmation_schema%60.%60CHARACTER_SETS%60&db=information_schema'
                 . '&test_name=value&server=0&lang=en'
-            )
-        );
+            ]
+        ];
     }
 
 
@@ -979,45 +979,45 @@ class ResultsTest extends PmaTestCase
     public function testGetSpecialLinkUrl(
         $db, $table, $column_value, $row_info, $field_name,  $output
     ) {
-        $GLOBALS['special_schema_links'] = array(
-            'information_schema' => array(
-                'routines' => array(
-                    'routine_name' => array(
+        $GLOBALS['special_schema_links'] = [
+            'information_schema' => [
+                'routines' => [
+                    'routine_name' => [
                         'link_param' => 'item_name',
-                        'link_dependancy_params' => array(
-                            0 => array(
+                        'link_dependancy_params' => [
+                            0 => [
                                 'param_info' => 'db',
                                 'column_name' => 'routine_schema'
-                            ),
-                            1 => array(
+                            ],
+                            1 => [
                                 'param_info' => 'item_type',
                                 'column_name' => 'routine_type'
-                            )
-                        ),
+                            ]
+                        ],
                         'default_page' => 'db_routines.php'
-                    )
-                ),
-                'columns' => array(
-                    'column_name' => array(
-                        'link_param' => array(
+                    ]
+                ],
+                'columns' => [
+                    'column_name' => [
+                        'link_param' => [
                             'sql_query',
                             'table_schema',
                             'table_name'
-                        ),
-                        'link_dependancy_params' => array(
-                            0 => array(
+                        ],
+                        'link_dependancy_params' => [
+                            0 => [
                                 'param_info' => 'db',
                                 'column_name' => 'table_schema'
-                            ),
-                            1 => array(
-                                'param_info' => array('test_name', 'value')
-                            )
-                        ),
+                            ],
+                            1 => [
+                                'param_info' => ['test_name', 'value']
+                            ]
+                        ],
                         'default_page' => 'index.php'
-                    )
-                )
-            )
-        );
+                    ]
+                ]
+            ]
+        ];
 
         $this->object->__set('db', $db);
         $this->object->__set('table', $table);
@@ -1026,7 +1026,7 @@ class ResultsTest extends PmaTestCase
             $output,
             $this->_callPrivateFunction(
                 '_getSpecialLinkUrl',
-                array($column_value, $row_info, $field_name)
+                [$column_value, $row_info, $field_name]
             )
         );
     }
@@ -1039,8 +1039,8 @@ class ResultsTest extends PmaTestCase
      */
     public function dataProviderForTestGetRowInfoForSpecialLinks()
     {
-        $column_names = array('host', 'db', 'user', 'select_privilages');
-        $fields_mata = array();
+        $column_names = ['host', 'db', 'user', 'select_privilages'];
+        $fields_mata = [];
 
         foreach ($column_names as $column_name) {
             $field_meta = new stdClass();
@@ -1048,30 +1048,30 @@ class ResultsTest extends PmaTestCase
             $fields_mata[] = $field_meta;
         }
 
-        return array(
-            array(
+        return [
+            [
                 $fields_mata,
                 count($fields_mata),
-                array(
+                [
                     0 => 'localhost',
                     1 => 'phpmyadmin',
                     2 => 'pmauser',
                     3 => 'Y'
-                ),
-                array(
+                ],
+                [
                     0 => '0',
                     1 => '3',
                     2 => '1',
                     3 => '2'
-                ),
-                array(
+                ],
+                [
                     'host' => 'localhost',
                     'select_privilages' => 'Y',
                     'db' => 'phpmyadmin',
                     'user' => 'pmauser'
-                )
-            )
-        );
+                ]
+            ]
+        ];
     }
 
 
@@ -1098,7 +1098,7 @@ class ResultsTest extends PmaTestCase
             $output,
             $this->_callPrivateFunction(
                 '_getRowInfoForSpecialLinks',
-                array($row, $col_order)
+                [$row, $col_order]
             )
         );
     }
@@ -1111,8 +1111,8 @@ class ResultsTest extends PmaTestCase
      */
     public function dataProviderForTestGetShowAllCheckboxForTableNavigation()
     {
-        return array(
-            array(
+        return [
+            [
                 'mysql',
                 'user',
                 'tbl_structure.php',
@@ -1132,8 +1132,8 @@ class ResultsTest extends PmaTestCase
                 . '<input type="checkbox" name="navig" id="showAll_0"'
                 . ' class="showAllRows" value="all" />'
                 . '<label for="showAll_0">Show all</label></form></td>'
-            )
-        );
+            ]
+        ];
     }
 
 
@@ -1161,7 +1161,7 @@ class ResultsTest extends PmaTestCase
 
         $result = $this->_callPrivateFunction(
             '_getShowAllCheckboxForTableNavigation',
-            array(false, $html_sql_query)
+            [false, $html_sql_query]
         );
 
         $this->assertContains(
@@ -1197,16 +1197,16 @@ class ResultsTest extends PmaTestCase
         $parser = new Parser(
             'SELECT * FROM db_name WHERE `db_name`.`tbl`.id > 0 AND `id` < 10'
         );
-        return array(
-            array(
-                array('statement' => $parser->statements[0]),
-                array(
+        return [
+            [
+                ['statement' => $parser->statements[0]],
+                [
                     'db_name' => 'true',
                     'tbl' => 'true',
                     'id' => 'true',
-                ),
-            ),
-        );
+                ],
+            ],
+        ];
     }
 
 
@@ -1224,7 +1224,7 @@ class ResultsTest extends PmaTestCase
     {
         $this->_callPrivateFunction(
             '_setHighlightedColumnGlobalField',
-            array($analyzed_sql)
+            [$analyzed_sql]
         );
 
         $this->assertEquals(
@@ -1241,12 +1241,12 @@ class ResultsTest extends PmaTestCase
      */
     public function dataProviderForTestGetPartialText()
     {
-        return array(
-            array('P', 10, 'foo', array(false, 'foo', 3)),
-            array('P', 1, 'foo', array(true, 'f...', 3)),
-            array('F', 10, 'foo', array(false, 'foo', 3)),
-            array('F', 1, 'foo', array(false, 'foo', 3))
-        );
+        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]]
+        ];
     }
 
 
@@ -1270,7 +1270,7 @@ class ResultsTest extends PmaTestCase
             $output,
             $this->_callPrivateFunction(
                 '_getPartialText',
-                array($str)
+                [$str]
             )
         );
     }
@@ -1287,10 +1287,10 @@ class ResultsTest extends PmaTestCase
         $meta = new stdClass();
         $meta->type = 'BLOB';
         $meta->orgtable = 'bar';
-        $url_params = array('db' => 'foo', 'table' => 'bar');
+        $url_params = ['db' => 'foo', 'table' => 'bar'];
 
-        return array(
-            array(
+        return [
+            [
                 true,
                 true,
                 'BLOB',
@@ -1304,8 +1304,8 @@ class ResultsTest extends PmaTestCase
                 '<a href="tbl_get_field.php?db=foo&amp;table=bar&amp;server=0'
                 . '&amp;lang=en'
                 . '" class="disableAjax">1001</a>'
-            ),
-            array(
+            ],
+            [
                 true,
                 true,
                 'BLOB',
@@ -1319,8 +1319,8 @@ class ResultsTest extends PmaTestCase
                 '<a href="tbl_get_field.php?db=foo&amp;table=bar&amp;server=0'
                 . '&amp;lang=en'
                 . '" class="disableAjax">0x123456</a>'
-            ),
-            array(
+            ],
+            [
                 true,
                 false,
                 'BLOB',
@@ -1334,8 +1334,8 @@ class ResultsTest extends PmaTestCase
                 '<a href="tbl_get_field.php?db=foo&amp;table=bar&amp;server=0'
                 . '&amp;lang=en'
                 . '" class="disableAjax">[BLOB - 4 B]</a>'
-            ),
-            array(
+            ],
+            [
                 false,
                 false,
                 'BINARY',
@@ -1347,8 +1347,8 @@ class ResultsTest extends PmaTestCase
                 $url_params,
                 null,
                 '1001'
-            ),
-            array(
+            ],
+            [
                 false,
                 true,
                 'GEOMETRY',
@@ -1360,8 +1360,8 @@ class ResultsTest extends PmaTestCase
                 $url_params,
                 null,
                 '[GEOMETRY - NULL]'
-            )
-        );
+            ]
+        ];
     }
 
 
@@ -1399,11 +1399,11 @@ class ResultsTest extends PmaTestCase
             $output,
             $this->_callPrivateFunction(
                 '_handleNonPrintableContents',
-                array(
+                [
                     $category, $content, $transformation_plugin,
                     $transform_options, $default_function,
                     $meta, $url_params, &$is_truncated
-                )
+                ]
             )
         );
     }
@@ -1435,22 +1435,22 @@ class ResultsTest extends PmaTestCase
         $meta2->decimals = 0;
         $meta2->name = 'varchar';
         $meta2->orgname = 'varchar';
-        $url_params = array('db' => 'foo', 'table' => 'tbl');
+        $url_params = ['db' => 'foo', 'table' => 'tbl'];
 
-        return array(
-            array(
+        return [
+            [
                 'all',
                 '1001',
                 'grid_edit',
                 $meta,
-                array(),
+                [],
                 $url_params,
                 false,
                 [Core::class, 'mimeDefaultFunction'],
                 [Core::class, 'mimeDefaultFunction'],
-                array('https://www.example.com/'),
+                ['https://www.example.com/'],
                 false,
-                array(),
+                [],
                 0,
                 'binary',
                 '<td class="left   hex">' . PHP_EOL
@@ -1459,39 +1459,39 @@ class ResultsTest extends PmaTestCase
                 . '" '
                 . 'class="disableAjax">[BLOB - 4 B]</a>' . PHP_EOL
                 . '</td>' . PHP_EOL
-            ),
-            array(
+            ],
+            [
                 'noblob',
                 '1001',
                 'grid_edit',
                 $meta,
-                array(),
+                [],
                 $url_params,
                 false,
                 $transformation_plugin,
                 [Core::class, 'mimeDefaultFunction'],
                 [],
                 false,
-                array(),
+                [],
                 0,
                 'binary',
                 '<td class="left grid_edit  transformed hex">' . PHP_EOL
                 . '    1001' . PHP_EOL
                 . '</td>' . PHP_EOL
-            ),
-            array(
+            ],
+            [
                 'noblob',
                 null,
                 'grid_edit',
                 $meta2,
-                array(),
+                [],
                 $url_params,
                 false,
                 $transformation_plugin,
                 [Core::class, 'mimeDefaultFunction'],
                 [],
                 false,
-                array(),
+                [],
                 0,
                 0,
                 '<td ' . PHP_EOL
@@ -1500,27 +1500,27 @@ class ResultsTest extends PmaTestCase
                 . '        class="grid_edit  null">' . PHP_EOL
                 . '    <em>NULL</em>' . PHP_EOL
                 . '</td>' . PHP_EOL
-            ),
-            array(
+            ],
+            [
                 'all',
                 'foo bar baz',
                 'grid_edit',
                 $meta2,
-                array(),
+                [],
                 $url_params,
                 false,
                 [Core::class, 'mimeDefaultFunction'],
                 [Core::class, 'mimeDefaultFunction'],
                 [],
                 false,
-                array(),
+                [],
                 0,
                 0,
                 '<td data-decimals="0" data-type="string" '
                 . 'data-originallength="11" '
                 . 'class="grid_edit ">foo bar baz</td>' . "\n"
-            )
-        );
+            ]
+        ];
     }
 
 
@@ -1564,11 +1564,11 @@ class ResultsTest extends PmaTestCase
             $output,
             $this->_callPrivateFunction(
                 '_getDataCellForNonNumericColumns',
-                array(
+                [
                     $column, $class, $meta, $map, $_url_params, $condition_field,
                     $transformation_plugin, $default_function, $transform_options,
                     $is_field_truncated, $analyzed_sql_results, &$dt_result, $col_index
-                )
+                ]
             )
         );
     }
@@ -1621,23 +1621,23 @@ class ResultsTest extends PmaTestCase
         $meta2->numeric = true;
         $meta2->primary_key = false;
         $meta2->unique_key = false;
-        $fields_meta = array($meta, $meta2);
+        $fields_meta = [$meta, $meta2];
         $this->object->__set('fields_meta', $fields_meta);
 
         // MIME transformations
         $GLOBALS['dbi']->expects($this->exactly(1))
             ->method('fetchResult')
             ->willReturn(
-                array(
-                    'db.table.1' => array(
+                [
+                    'db.table.1' => [
                         'mimetype' => '',
                         'transformation' => 'output/text_plain_dateformat.php',
-                    ),
-                    'db.table.2' => array(
+                    ],
+                    'db.table.2' => [
                         'mimetype' => '',
                         'transformation' => 'output/text_plain_bool2text.php',
-                    ),
-                )
+                    ],
+                ]
             );
 
         $transformations = new Transformations();
@@ -1649,11 +1649,11 @@ class ResultsTest extends PmaTestCase
         // Actually invoke tested method
         $output = $this->_callPrivateFunction(
             '_getRowValues',
-            array(
-                &$result, array(3600, true), 0, false, array(),
+            [
+                &$result, [3600, true], 0, false, [],
                 '', false, $query,
                 Query::getAll($query)
-            )
+            ]
         );
 
         // Dateformat
diff --git a/test/classes/Engines/BdbTest.php b/test/classes/Engines/BdbTest.php
index f3e19bfb24..9221367aa6 100644
--- a/test/classes/Engines/BdbTest.php
+++ b/test/classes/Engines/BdbTest.php
@@ -57,42 +57,42 @@ class BdbTest extends PmaTestCase
     {
         $this->assertEquals(
             $this->object->getVariables(),
-            array(
-                'version_bdb' => array(
+            [
+                'version_bdb' => [
                     'title' => __('Version information'),
-                ),
-                'bdb_cache_size' => array(
+                ],
+                'bdb_cache_size' => [
                     'type'  => 1,
-                ),
-                'bdb_home' => array(
-                ),
-                'bdb_log_buffer_size' => array(
+                ],
+                'bdb_home' => [
+                ],
+                'bdb_log_buffer_size' => [
                     'type'  => 1,
-                ),
-                'bdb_logdir' => array(
-                ),
-                'bdb_max_lock' => array(
+                ],
+                'bdb_logdir' => [
+                ],
+                'bdb_max_lock' => [
                     'type'  => 2,
-                ),
-                'bdb_shared_data' => array(
-                ),
-                'bdb_tmpdir' => array(
-                ),
-                'bdb_data_direct' => array(
-                ),
-                'bdb_lock_detect' => array(
-                ),
-                'bdb_log_direct' => array(
-                ),
-                'bdb_no_recover' => array(
-                ),
-                'bdb_no_sync' => array(
-                ),
-                'skip_sync_bdb_logs' => array(
-                ),
-                'sync_bdb_logs' => array(
-                ),
-            )
+                ],
+                'bdb_shared_data' => [
+                ],
+                'bdb_tmpdir' => [
+                ],
+                'bdb_data_direct' => [
+                ],
+                'bdb_lock_detect' => [
+                ],
+                'bdb_log_direct' => [
+                ],
+                'bdb_no_recover' => [
+                ],
+                'bdb_no_sync' => [
+                ],
+                'skip_sync_bdb_logs' => [
+                ],
+                'sync_bdb_logs' => [
+                ],
+            ]
         );
     }
 
diff --git a/test/classes/Engines/InnodbTest.php b/test/classes/Engines/InnodbTest.php
index 5eb9ad5399..5e7fa2f801 100644
--- a/test/classes/Engines/InnodbTest.php
+++ b/test/classes/Engines/InnodbTest.php
@@ -56,99 +56,99 @@ class InnodbTest extends PmaTestCase
     public function testGetVariables()
     {
         $this->assertEquals(
-            array(
-                'innodb_data_home_dir' => array(
+            [
+                'innodb_data_home_dir' => [
                     'title' => __('Data home directory'),
                     'desc'  => __('The common part of the directory path for all InnoDB data files.'),
-                ),
-                'innodb_data_file_path' => array(
+                ],
+                'innodb_data_file_path' => [
                     'title' => __('Data files'),
-                ),
-                'innodb_autoextend_increment' => array(
+                ],
+                'innodb_autoextend_increment' => [
                     'title' => __('Autoextend increment'),
                     'desc'  => __('The increment size for extending the size of an autoextending tablespace when it becomes full.'),
                     'type'  => 2,
-                ),
-                'innodb_buffer_pool_size' => array(
+                ],
+                'innodb_buffer_pool_size' => [
                     'title' => __('Buffer pool size'),
                     'desc'  => __('The size of the memory buffer InnoDB uses to cache data and indexes of its tables.'),
                     'type'  => 1,
-                ),
-                'innodb_additional_mem_pool_size' => array(
+                ],
+                'innodb_additional_mem_pool_size' => [
                     'title' => 'innodb_additional_mem_pool_size',
                     'type'  => 1,
-                ),
-                'innodb_buffer_pool_awe_mem_mb' => array(
+                ],
+                'innodb_buffer_pool_awe_mem_mb' => [
                     'type'  => 1,
-                ),
-                'innodb_checksums' => array(
-                ),
-                'innodb_commit_concurrency' => array(
-                ),
-                'innodb_concurrency_tickets' => array(
+                ],
+                'innodb_checksums' => [
+                ],
+                'innodb_commit_concurrency' => [
+                ],
+                'innodb_concurrency_tickets' => [
                     'type'  => 2,
-                ),
-                'innodb_doublewrite' => array(
-                ),
-                'innodb_fast_shutdown' => array(
-                ),
-                'innodb_file_io_threads' => array(
+                ],
+                'innodb_doublewrite' => [
+                ],
+                'innodb_fast_shutdown' => [
+                ],
+                'innodb_file_io_threads' => [
                     'type'  => 2,
-                ),
-                'innodb_file_per_table' => array(
-                ),
-                'innodb_flush_log_at_trx_commit' => array(
-                ),
-                'innodb_flush_method' => array(
-                ),
-                'innodb_force_recovery' => array(
-                ),
-                'innodb_lock_wait_timeout' => array(
+                ],
+                'innodb_file_per_table' => [
+                ],
+                'innodb_flush_log_at_trx_commit' => [
+                ],
+                'innodb_flush_method' => [
+                ],
+                'innodb_force_recovery' => [
+                ],
+                'innodb_lock_wait_timeout' => [
                     'type'  => 2,
-                ),
-                'innodb_locks_unsafe_for_binlog' => array(
-                ),
-                'innodb_log_arch_dir' => array(
-                ),
-                'innodb_log_archive' => array(
-                ),
-                'innodb_log_buffer_size' => array(
+                ],
+                'innodb_locks_unsafe_for_binlog' => [
+                ],
+                'innodb_log_arch_dir' => [
+                ],
+                'innodb_log_archive' => [
+                ],
+                'innodb_log_buffer_size' => [
                     'type'  => 1,
-                ),
-                'innodb_log_file_size' => array(
+                ],
+                'innodb_log_file_size' => [
                     'type'  => 1,
-                ),
-                'innodb_log_files_in_group' => array(
+                ],
+                'innodb_log_files_in_group' => [
                     'type'  => 2,
-                ),
-                'innodb_log_group_home_dir' => array(
-                ),
-                'innodb_max_dirty_pages_pct' => array(
+                ],
+                'innodb_log_group_home_dir' => [
+                ],
+                'innodb_max_dirty_pages_pct' => [
                     'type'  => 2,
-                ),
-                'innodb_max_purge_lag' => array(
-                ),
-                'innodb_mirrored_log_groups' => array(
+                ],
+                'innodb_max_purge_lag' => [
+                ],
+                'innodb_mirrored_log_groups' => [
                     'type'  => 2,
-                ),
-                'innodb_open_files' => array(
+                ],
+                'innodb_open_files' => [
                     'type'  => 2,
-                ),
-                'innodb_support_xa' => array(
-                ),
-                'innodb_sync_spin_loops' => array(
+                ],
+                'innodb_support_xa' => [
+                ],
+                'innodb_sync_spin_loops' => [
                     'type'  => 2,
-                ),
-                'innodb_table_locks' => array(
+                ],
+                'innodb_table_locks' => [
                     'type'  => 3,
-                ),
-                'innodb_thread_concurrency' => array(
+                ],
+                'innodb_thread_concurrency' => [
                     'type'  => 2,
-                ),
-                'innodb_thread_sleep_delay' => array(
+                ],
+                'innodb_thread_sleep_delay' => [
                     'type'  => 2,
-                ),
-            ),
+                ],
+            ],
             $this->object->getVariables()
         );
     }
@@ -174,15 +174,15 @@ class InnodbTest extends PmaTestCase
     public function testGetInfoPages()
     {
         $this->assertEquals(
-            array(),
+            [],
             $this->object->getInfoPages()
         );
         $this->object->support = 2;
         $this->assertEquals(
-            array (
+             [
                 'Bufferpool' => 'Buffer Pool',
                 'Status' => 'InnoDB Status'
-            ),
+            ],
             $this->object->getInfoPages()
         );
     }
diff --git a/test/classes/Engines/MemoryTest.php b/test/classes/Engines/MemoryTest.php
index f87dee0fea..d0fc5f6dff 100644
--- a/test/classes/Engines/MemoryTest.php
+++ b/test/classes/Engines/MemoryTest.php
@@ -57,11 +57,11 @@ class MemoryTest extends PmaTestCase
     {
         $this->assertEquals(
             $this->object->getVariables(),
-            array(
-                'max_heap_table_size' => array(
+            [
+                'max_heap_table_size' => [
                                             'type'  => 1,
-                                         )
-                )
+                                         ]
+                ]
         );
     }
 }
diff --git a/test/classes/Engines/MyisamTest.php b/test/classes/Engines/MyisamTest.php
index 06a6105b5e..b601e91b1a 100644
--- a/test/classes/Engines/MyisamTest.php
+++ b/test/classes/Engines/MyisamTest.php
@@ -57,46 +57,46 @@ class MyisamTest extends PmaTestCase
     {
         $this->assertEquals(
             $this->object->getVariables(),
-            array(
-                'myisam_data_pointer_size' => array(
+            [
+                'myisam_data_pointer_size' => [
                     'title' => __('Data pointer size'),
                     'desc'  => __('The default pointer size in bytes, to be used by CREATE TABLE for MyISAM tables when no MAX_ROWS option is specified.'),
                     'type'  => 1,
-                ),
-                'myisam_recover_options' => array(
+                ],
+                'myisam_recover_options' => [
                     'title' => __('Automatic recovery mode'),
                     'desc'  => __('The mode for automatic recovery of crashed MyISAM tables, as set via the --myisam-recover server startup option.'),
-                ),
-                'myisam_max_sort_file_size' => array(
+                ],
+                'myisam_max_sort_file_size' => [
                     'title' => __('Maximum size for temporary sort files'),
                     'desc'  => __('The maximum size of the temporary file MySQL is allowed to use while re-creating a MyISAM index (during REPAIR TABLE, ALTER TABLE, or LOAD DATA INFILE).'),
                     'type'  => 1,
-                ),
-                'myisam_max_extra_sort_file_size' => array(
+                ],
+                'myisam_max_extra_sort_file_size' => [
                     'title' => __('Maximum size for temporary files on index creation'),
                     'desc'  => __('If the temporary file used for fast MyISAM index creation would be larger than using the key cache by the amount specified here, prefer the key cache method.'),
                     'type'  => 1,
-                ),
-                'myisam_repair_threads' => array(
+                ],
+                'myisam_repair_threads' => [
                     'title' => __('Repair threads'),
                     'desc'  => __('If this value is greater than 1, MyISAM table indexes are created in parallel (each index in its own thread) during the repair by sorting process.'),
                     'type'  => 2,
-                ),
-                'myisam_sort_buffer_size' => array(
+                ],
+                'myisam_sort_buffer_size' => [
                     'title' => __('Sort buffer size'),
                     'desc'  => __('The buffer that is allocated when sorting MyISAM indexes during a REPAIR TABLE or when creating indexes with CREATE INDEX or ALTER TABLE.'),
                     'type'  => 1,
-                ),
-                'myisam_stats_method' => array(
-                ),
-                'delay_key_write' => array(
-                ),
-                'bulk_insert_buffer_size' => array(
+                ],
+                'myisam_stats_method' => [
+                ],
+                'delay_key_write' => [
+                ],
+                'bulk_insert_buffer_size' => [
                     'type'  => 1,
-                ),
-                'skip_external_locking' => array(
-                ),
-            )
+                ],
+                'skip_external_locking' => [
+                ],
+            ]
         );
     }
 
diff --git a/test/classes/Engines/NdbclusterTest.php b/test/classes/Engines/NdbclusterTest.php
index 22ea71f805..92bf39ff42 100644
--- a/test/classes/Engines/NdbclusterTest.php
+++ b/test/classes/Engines/NdbclusterTest.php
@@ -57,10 +57,10 @@ class NdbclusterTest extends PmaTestCase
     {
         $this->assertEquals(
             $this->object->getVariables(),
-            array(
-                'ndb_connectstring' => array(
-                ),
-            )
+            [
+                'ndb_connectstring' => [
+                ],
+            ]
         );
     }
 
diff --git a/test/classes/Engines/PbxtTest.php b/test/classes/Engines/PbxtTest.php
index 8532266103..8b6a89f80a 100644
--- a/test/classes/Engines/PbxtTest.php
+++ b/test/classes/Engines/PbxtTest.php
@@ -59,8 +59,8 @@ class PbxtTest extends PmaTestCase
     {
         $this->assertEquals(
             $this->object->getVariables(),
-            array(
-                'pbxt_index_cache_size' => array(
+            [
+                'pbxt_index_cache_size' => [
                     'title' => __('Index cache size'),
                     'desc'  => __(
                         'This is the amount of memory allocated to the'
@@ -68,8 +68,8 @@ class PbxtTest extends PmaTestCase
                         . ' allocated here is used only for caching index pages.'
                     ),
                     'type'  => 1
-                ),
-                'pbxt_record_cache_size' => array(
+                ],
+                'pbxt_record_cache_size' => [
                     'title' => __('Record cache size'),
                     'desc'  => __(
                         'This is the amount of memory allocated to the'
@@ -78,8 +78,8 @@ class PbxtTest extends PmaTestCase
                         . ' the handle data (.xtd) and row pointer (.xtr) files.'
                     ),
                     'type'  => 1
-                ),
-                'pbxt_log_cache_size' => array(
+                ],
+                'pbxt_log_cache_size' => [
                     'title' => __('Log cache size'),
                     'desc'  => __(
                         'The amount of memory allocated to the'
@@ -87,16 +87,16 @@ class PbxtTest extends PmaTestCase
                         . ' data. The default is 16MB.'
                     ),
                     'type'  => 1
-                ),
-                'pbxt_log_file_threshold' => array(
+                ],
+                'pbxt_log_file_threshold' => [
                     'title' => __('Log file threshold'),
                     'desc'  => __(
                         'The size of a transaction log before rollover,'
                         . ' and a new log is created. The default value is 16MB.'
                     ),
                     'type'  => 1
-                ),
-                'pbxt_transaction_buffer_size' => array(
+                ],
+                'pbxt_transaction_buffer_size' => [
                     'title' => __('Transaction buffer size'),
                     'desc'  => __(
                         'The size of the global transaction log buffer'
@@ -104,8 +104,8 @@ class PbxtTest extends PmaTestCase
                         . ' The default is 1MB.'
                     ),
                     'type'  => 1
-                ),
-                'pbxt_checkpoint_frequency' => array(
+                ],
+                'pbxt_checkpoint_frequency' => [
                     'title' => __('Checkpoint frequency'),
                     'desc'  => __(
                         'The amount of data written to the transaction'
@@ -113,8 +113,8 @@ class PbxtTest extends PmaTestCase
                         . ' The default value is 24MB.'
                     ),
                     'type'  => 1
-                ),
-                'pbxt_data_log_threshold' => array(
+                ],
+                'pbxt_data_log_threshold' => [
                     'title' => __('Data log threshold'),
                     'desc'  => __(
                         'The maximum size of a data log file. The default'
@@ -124,8 +124,8 @@ class PbxtTest extends PmaTestCase
                         . ' amount of data that can be stored in the database.'
                     ),
                     'type'  => 1
-                ),
-                'pbxt_garbage_threshold' => array(
+                ],
+                'pbxt_garbage_threshold' => [
                     'title' => __('Garbage threshold'),
                     'desc'  => __(
                         'The percentage of garbage in a data log file'
@@ -133,8 +133,8 @@ class PbxtTest extends PmaTestCase
                         . ' 99. The default is 50.'
                     ),
                     'type'  => 2
-                ),
-                'pbxt_log_buffer_size' => array(
+                ],
+                'pbxt_log_buffer_size' => [
                     'title' => __('Log buffer size'),
                     'desc'  => __(
                         'The size of the buffer used when writing a data'
@@ -143,18 +143,18 @@ class PbxtTest extends PmaTestCase
                         . ' to write a data log.'
                     ),
                     'type'  => 1
-                ),
-                'pbxt_data_file_grow_size' => array(
+                ],
+                'pbxt_data_file_grow_size' => [
                     'title' => __('Data file grow size'),
                     'desc'  => __('The grow size of the handle data (.xtd) files.'),
                     'type'  => 1
-                ),
-                'pbxt_row_file_grow_size' => array(
+                ],
+                'pbxt_row_file_grow_size' => [
                     'title' => __('Row file grow size'),
                     'desc'  => __('The grow size of the row pointer (.xtr) files.'),
                     'type'  => 1
-                ),
-                'pbxt_log_file_count' => array(
+                ],
+                'pbxt_log_file_count' => [
                     'title' => __('Log file count'),
                     'desc'  => __(
                         'This is the number of transaction log files'
@@ -164,8 +164,8 @@ class PbxtTest extends PmaTestCase
                         . ' highest number.'
                     ),
                     'type'  => 2
-                ),
-            )
+                ],
+            ]
         );
     }
 
@@ -194,29 +194,29 @@ class PbxtTest extends PmaTestCase
      */
     public function providerFortTestResolveTypeSize()
     {
-        return array(
-            array(
+        return [
+            [
                 '8MB',
-                array (
+                 [
                     0 => '8,192',
                     1 => 'KiB'
-                )
-            ),
-            array(
+                ]
+            ],
+            [
                 '10mb',
-                array (
+                 [
                     0 => '-1',
                     1 => 'B'
-                )
-            ),
-            array(
+                ]
+            ],
+            [
                 'A4',
-                array (
+                 [
                     0 => '0',
                     1 => 'B'
-                )
-            )
-        );
+                ]
+            ]
+        ];
     }
 
     /**
@@ -228,9 +228,9 @@ class PbxtTest extends PmaTestCase
     {
         $this->assertEquals(
             $this->object->getInfoPages(),
-            array(
+            [
                 'Documentation' => 'Documentation'
-            )
+            ]
         );
     }
 
diff --git a/test/classes/ErrorHandlerTest.php b/test/classes/ErrorHandlerTest.php
index e369113002..cb227d6ec5 100644
--- a/test/classes/ErrorHandlerTest.php
+++ b/test/classes/ErrorHandlerTest.php
@@ -71,24 +71,24 @@ class ErrorHandlerTest extends PmaTestCase
      */
     public function providerForTestHandleError()
     {
-        return array(
-            array(
+        return [
+            [
                 E_RECOVERABLE_ERROR,
                 'Compile Error',
                 'error.txt',
                 12,
                 'Compile Error',
                 '',
-            ),
-            array(
+            ],
+            [
                 E_USER_NOTICE,
                 'User notice',
                 'error.txt',
                 12,
                 'User notice',
                 'User notice',
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -160,11 +160,11 @@ class ErrorHandlerTest extends PmaTestCase
     public function testCheckSavedErrors()
     {
 
-        $_SESSION['errors'] = array();
+        $_SESSION['errors'] = [];
 
         $this->_callProtectedFunction(
             'checkSavedErrors',
-            array()
+            []
         );
         $this->assertArrayNotHasKey('errors', $_SESSION);
     }
@@ -204,7 +204,7 @@ class ErrorHandlerTest extends PmaTestCase
             $this->object->countErrors()
         );
         $this->assertEquals(
-            array(),
+            [],
             $this->object->sliceErrors(1)
         );
         $this->assertEquals(
diff --git a/test/classes/ErrorTest.php b/test/classes/ErrorTest.php
index 6ea6c31e90..2761eaa962 100644
--- a/test/classes/ErrorTest.php
+++ b/test/classes/ErrorTest.php
@@ -57,7 +57,7 @@ class ErrorTest extends PmaTestCase
      */
     public function testSetBacktrace()
     {
-        $bt = array(array('file'=>'bt1','line'=>2, 'function'=>'bar', 'args'=>array('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());
@@ -97,11 +97,11 @@ class ErrorTest extends PmaTestCase
      */
     public function filePathProvider()
     {
-        return array(
-            array('./ChangeLog', './ChangeLog'),
-            array(__FILE__, './test/classes/ErrorTest.php'),
-            array('./NONEXISTING', 'NONEXISTING'),
-        );
+        return [
+            ['./ChangeLog', './ChangeLog'],
+            [__FILE__, './test/classes/ErrorTest.php'],
+            ['./NONEXISTING', 'NONEXISTING'],
+        ];
     }
 
     /**
@@ -170,12 +170,12 @@ class ErrorTest extends PmaTestCase
      */
     public function testGetBacktrace()
     {
-        $bt = array(
-            array('file'=>'bt1','line'=>2, 'function'=>'bar', 'args'=>array('foo'=>1)),
-            array('file'=>'bt2','line'=>2, 'function'=>'bar', 'args'=>array('foo'=>2)),
-            array('file'=>'bt3','line'=>2, 'function'=>'bar', 'args'=>array('foo'=>3)),
-            array('file'=>'bt4','line'=>2, 'function'=>'bar', 'args'=>array('foo'=>4)),
-        );
+        $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]],
+        ];
 
         $this->object->setBacktrace($bt);
 
diff --git a/test/classes/ExportTest.php b/test/classes/ExportTest.php
index 4e9131229f..c72d7668fa 100644
--- a/test/classes/ExportTest.php
+++ b/test/classes/ExportTest.php
@@ -44,70 +44,70 @@ class ExportTest extends TestCase
      */
     public function testMergeAliases()
     {
-        $aliases1 = array(
-            'test_db' => array(
+        $aliases1 = [
+            'test_db' => [
                 'alias' => 'aliastest',
-                'tables' => array(
-                    'foo' => array(
+                'tables' => [
+                    'foo' => [
                         'alias' => 'foobar',
-                        'columns' => array(
+                        'columns' => [
                             'bar' => 'foo',
                             'baz' => 'barbaz'
-                        )
-                    ),
-                    'bar' => array(
+                        ]
+                    ],
+                    'bar' => [
                         'alias' => 'foobaz',
-                        'columns' => array(
+                        'columns' => [
                             'a' => 'a_alias',
                             'b' => 'b'
-                        )
-                    )
-                )
-            )
-        );
-        $aliases2 = array(
-            'test_db' => array(
+                        ]
+                    ]
+                ]
+            ]
+        ];
+        $aliases2 = [
+            'test_db' => [
                 'alias' => 'test',
-                'tables' => array(
-                    'foo' => array(
-                        'columns' => array(
+                'tables' => [
+                    'foo' => [
+                        'columns' => [
                             'bar' => 'foobar'
-                        )
-                    ),
-                    'baz' => array(
-                        'columns' => array(
+                        ]
+                    ],
+                    'baz' => [
+                        'columns' => [
                             'a' => 'x'
-                        )
-                    )
-                )
-            )
-        );
-        $expected = array(
-            'test_db' => array(
+                        ]
+                    ]
+                ]
+            ]
+        ];
+        $expected = [
+            'test_db' => [
                 'alias' => 'test',
-                'tables' => array(
-                    'foo' => array(
+                'tables' => [
+                    'foo' => [
                         'alias' => 'foobar',
-                        'columns' => array(
+                        'columns' => [
                             'bar' => 'foobar',
                             'baz' => 'barbaz'
-                        )
-                    ),
-                    'bar' => array(
+                        ]
+                    ],
+                    'bar' => [
                         'alias' => 'foobaz',
-                        'columns' => array(
+                        'columns' => [
                             'a' => 'a_alias',
                             'b' => 'b'
-                        )
-                    ),
-                    'baz' => array(
-                        'columns' => array(
+                        ]
+                    ],
+                    'baz' => [
+                        'columns' => [
                             'a' => 'x'
-                        )
-                    )
-                )
-            )
-        );
+                        ]
+                    ]
+                ]
+            ]
+        ];
         $actual = $this->export->mergeAliases($aliases1, $aliases2);
         $this->assertEquals($expected, $actual);
     }
diff --git a/test/classes/FileTest.php b/test/classes/FileTest.php
index bd57e0b2d6..f966da9976 100644
--- a/test/classes/FileTest.php
+++ b/test/classes/FileTest.php
@@ -83,10 +83,10 @@ class FileTest extends PmaTestCase
      */
     public function compressedFiles()
     {
-        return array(
-            array('./test/test_data/test.gz', 'application/gzip'),
-            array('./test/test_data/test.bz2', 'application/bzip2'),
-            array('./test/test_data/test.zip', 'application/zip'),
-        );
+        return [
+            ['./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/FontTest.php b/test/classes/FontTest.php
index 69fa2eeb8d..c4db328d0f 100644
--- a/test/classes/FontTest.php
+++ b/test/classes/FontTest.php
@@ -230,7 +230,7 @@ class FontTest extends PmaTestCase
         // string "a", with invalid charlist (= array without proper structure)
         $this->assertEquals(
             6,
-            $this->font->getStringWidth("a", "arial", 10, array("list"))
+            $this->font->getStringWidth("a", "arial", 10, ["list"])
         );
 
         // string "a", with invalid charlist (= array without proper structure :
@@ -239,7 +239,7 @@ class FontTest extends PmaTestCase
             6,
             $this->font->getStringWidth(
                 "a", "arial", 10,
-                array(array("chars" => "a"))
+                [["chars" => "a"]]
             )
         );
 
@@ -249,7 +249,7 @@ class FontTest extends PmaTestCase
             6,
             $this->font->getStringWidth(
                 "a", "arial", 10,
-                array(array("modifier" => 0.61))
+                [["modifier" => 0.61]]
             )
         );
 
@@ -259,7 +259,7 @@ class FontTest extends PmaTestCase
             6,
             $this->font->getStringWidth(
                 "a", "arial", 10,
-                array(array("chars" => "a", "modifier" => 0.61))
+                [["chars" => "a", "modifier" => 0.61]]
             )
         );
 
@@ -268,7 +268,7 @@ class FontTest extends PmaTestCase
             7,
             $this->font->getStringWidth(
                 "a", "arial", 10,
-                array(array("chars" => array("a"), "modifier" => 0.61))
+                [["chars" => ["a"], "modifier" => 0.61]]
             )
         );
     }
diff --git a/test/classes/FooterTest.php b/test/classes/FooterTest.php
index 2e4f0ad51a..510916113a 100644
--- a/test/classes/FooterTest.php
+++ b/test/classes/FooterTest.php
@@ -26,7 +26,7 @@ class FooterTest extends PmaTestCase
     /**
      * @var array store private attributes of PhpMyAdmin\Footer
      */
-    public $privates = array();
+    public $privates = [];
 
     /**
      * @access protected
@@ -99,18 +99,18 @@ class FooterTest extends PmaTestCase
     public function testGetDebugMessage()
     {
         $GLOBALS['cfg']['DBG']['sql'] = true;
-        $_SESSION['debug']['queries'] = array(
-            array(
+        $_SESSION['debug']['queries'] = [
+            [
                 'count' => 1,
                 'time' => 0.2,
                 'query' => 'SELECT * FROM `pma_bookmark` WHERE 1',
-            ),
-            array(
+            ],
+            [
                 'count' => 1,
                 'time' => 2.5,
                 'query' => 'SELECT * FROM `db` WHERE 1',
-            ),
-        );
+            ],
+        ];
 
         $this->assertEquals(
             '{"queries":[{"count":1,"time":0.2,"query":"SELECT * FROM `pma_bookmark` WHERE 1"},'
@@ -126,15 +126,15 @@ class FooterTest extends PmaTestCase
      */
     public function testRemoveRecursion()
     {
-        $object = (object) array();
-        $object->child = (object) array();
+        $object = (object) [];
+        $object->child = (object) [];
         $object->child->parent = $object;
 
         $this->_callPrivateFunction(
             '_removeRecursion',
-            array(
+            [
                 &$object
-            )
+            ]
         );
 
         $this->assertEquals(
@@ -161,9 +161,9 @@ class FooterTest extends PmaTestCase
             . 'target="_blank" rel="noopener noreferrer">Open new phpMyAdmin window</a></div>',
             $this->_callPrivateFunction(
                 '_getSelfLink',
-                array(
+                [
                     $this->object->getSelfUrl()
-                )
+                ]
             )
         );
     }
@@ -188,9 +188,9 @@ class FooterTest extends PmaTestCase
             . 'class="icon ic_window-new" /></a></div>',
             $this->_callPrivateFunction(
                 '_getSelfLink',
-                array(
+                [
                     $this->object->getSelfUrl()
-                )
+                ]
             )
         );
     }
diff --git a/test/classes/Gis/GisFactoryTest.php b/test/classes/Gis/GisFactoryTest.php
index 9d6bf7bf6e..1e3ab9ce58 100644
--- a/test/classes/Gis/GisFactoryTest.php
+++ b/test/classes/Gis/GisFactoryTest.php
@@ -41,35 +41,35 @@ class GisFactoryTest extends TestCase
      */
     public function providerForTestFactory()
     {
-        return array(
-            array(
+        return [
+            [
                 'MULTIPOLYGON',
                 'PhpMyAdmin\Gis\GisMultiPolygon'
-            ),
-            array(
+            ],
+            [
                 'POLYGON',
                 'PhpMyAdmin\Gis\GisPolygon'
-            ),
-            array(
+            ],
+            [
                 'MULTILINESTRING',
                 'PhpMyAdmin\Gis\GisMultiLineString'
-            ),
-            array(
+            ],
+            [
                 'LINESTRING',
                 'PhpMyAdmin\Gis\GisLineString'
-            ),
-            array(
+            ],
+            [
                 'MULTIPOINT',
                 'PhpMyAdmin\Gis\GisMultiPoint'
-            ),
-            array(
+            ],
+            [
                 'POINT',
                 'PhpMyAdmin\Gis\GisPoint'
-            ),
-            array(
+            ],
+            [
                 'GEOMETRYCOLLECTION',
                 'PhpMyAdmin\Gis\GisGeometryCollection'
-            ),
-        );
+            ],
+        ];
     }
 }
diff --git a/test/classes/Gis/GisGeometryCollectionTest.php b/test/classes/Gis/GisGeometryCollectionTest.php
index 824cc9f750..71cb71b99a 100644
--- a/test/classes/Gis/GisGeometryCollectionTest.php
+++ b/test/classes/Gis/GisGeometryCollectionTest.php
@@ -71,18 +71,18 @@ class GisGeometryCollectionTest extends TestCase
      */
     public function providerForScaleRow()
     {
-        return array(
-            array(
+        return [
+            [
                 'GEOMETRYCOLLECTION(POLYGON((35 10,10 20,15 40,45 45,35 10),'
                     . '(20 30,35 32,30 20,20 30)))',
-                array(
+                [
                     'maxX' => 45.0,
                     'minX' => 10.0,
                     'maxY' => 45.0,
                     'minY' => 10.0
-                )
-            )
-        );
+                ]
+            ]
+        ];
     }
 
     /**
@@ -112,25 +112,25 @@ class GisGeometryCollectionTest extends TestCase
      */
     public function providerForGenerateWkt()
     {
-        $temp1 = array(
-            0 => array(
+        $temp1 = [
+            0 => [
                 'gis_type' => 'LINESTRING',
-                'LINESTRING' => array(
+                'LINESTRING' => [
                     'no_of_points' => 2,
-                    0 => array('x' => 5.02, 'y' => 8.45),
-                    1 => array('x' => 6.14, 'y' => 0.15)
-                )
-            )
-        );
+                    0 => ['x' => 5.02, 'y' => 8.45],
+                    1 => ['x' => 6.14, 'y' => 0.15]
+                ]
+            ]
+        ];
 
-        return array(
-            array(
+        return [
+            [
                 $temp1,
                 0,
                 null,
                 'GEOMETRYCOLLECTION(LINESTRING(5.02 8.45,6.14 0.15))'
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -155,29 +155,29 @@ class GisGeometryCollectionTest extends TestCase
      */
     public function providerForGenerateParams()
     {
-        return array(
-            array(
+        return [
+            [
                 'GEOMETRYCOLLECTION(LINESTRING(5.02 8.45,6.14 0.15))',
-                array(
+                [
                     'srid' => 0,
-                    'GEOMETRYCOLLECTION' => array('geom_count' => 1),
-                    '0' => array(
+                    'GEOMETRYCOLLECTION' => ['geom_count' => 1],
+                    '0' => [
                         'gis_type' => 'LINESTRING',
-                        'LINESTRING' => array(
+                        'LINESTRING' => [
                             'no_of_points' => 2,
-                            '0' => array(
+                            '0' => [
                                 'x' => 5.02,
                                 'y' => 8.45
-                            ),
-                            '1' => array(
+                            ],
+                            '1' => [
                                 'x' => 6.14,
                                 'y' => 0.15
-                            )
-                        )
-                    )
-                ),
-            ),
-        );
+                            ]
+                        ]
+                    ]
+                ],
+            ],
+        ];
     }
 
     /**
@@ -213,21 +213,21 @@ class GisGeometryCollectionTest extends TestCase
         if (! function_exists('imagecreatetruecolor')) {
             $this->markTestSkipped('GD extension missing!');
         }
-        return array(
-            array(
+        return [
+            [
                 'GEOMETRYCOLLECTION(POLYGON((35 10,10 20,15 40,45 45,35 10),'
                     . '(20 30,35 32,30 20,20 30)))',
                 'image',
                 '#B02EE0',
-                array(
+                [
                     'x' => 12,
                     'y' => 69,
                     'scale' => 2,
                     'height' => 150
-                ),
+                ],
                 imagecreatetruecolor(120, 150)
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -259,21 +259,21 @@ class GisGeometryCollectionTest extends TestCase
      */
     public function providerForPrepareRowAsPdf()
     {
-        return array(
-            array(
+        return [
+            [
                 'GEOMETRYCOLLECTION(POLYGON((35 10,10 20,15 40,45 45,35 10),'
                     . '(20 30,35 32,30 20,20 30)))',
                 'pdf',
                 '#B02EE0',
-                array(
+                [
                     'x' => 12,
                     'y' => 69,
                     'scale' => 2,
                     'height' => 150
-                ),
+                ],
                 new TCPDF(),
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -311,24 +311,24 @@ class GisGeometryCollectionTest extends TestCase
      */
     public function providerForPrepareRowAsSvg()
     {
-        return array(
-            array(
+        return [
+            [
                 'GEOMETRYCOLLECTION(POLYGON((35 10,10 20,15 40,45 45,35 10),'
                     . '(20 30,35 32,30 20,20 30)))',
                 'svg',
                 '#B02EE0',
-                array(
+                [
                     '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="svg)(\d+)'
                     . '(" class="polygon vector" stroke="black" stroke-width="0.5"'
                     . ' fill="#B02EE0" fill-rule="evenodd" fill-opacity="0.8"\/>)$/'
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -363,19 +363,19 @@ class GisGeometryCollectionTest extends TestCase
      */
     public function providerForPrepareRowAsOl()
     {
-        return array(
-            array(
+        return [
+            [
                 'GEOMETRYCOLLECTION(POLYGON((35 10,10 20,15 40,45 45,35 10),'
                     . '(20 30,35 32,30 20,20 30)))',
                 4326,
                 'Ol',
                 '#B02EE0',
-                array(
+                [
                     'minX' => '0',
                     'minY' => '0',
                     'maxX' => '1',
                     'maxY' => '1',
-                ),
+                ],
                 'bound = new OpenLayers.Bounds(); bound.extend(new OpenLayers.'
                 . 'LonLat(0, 0).transform(new OpenLayers.Projection("EPSG:4326'
                 . '"), map.getProjectionObject())); bound.extend(new OpenLayer'
@@ -404,7 +404,7 @@ class GisGeometryCollectionTest extends TestCase
                 . '26"), map.getProjectionObject()))))), null, {"strokeColor":'
                 . '"#000000","strokeWidth":0.5,"fillColor":"#B02EE0","fillOpac'
                 . 'ity":0.8,"label":"Ol","fontSize":10}));'
-            )
-        );
+            ]
+        ];
     }
 }
diff --git a/test/classes/Gis/GisGeometryTest.php b/test/classes/Gis/GisGeometryTest.php
index 11e487646a..94a3aa3f31 100644
--- a/test/classes/Gis/GisGeometryTest.php
+++ b/test/classes/Gis/GisGeometryTest.php
@@ -80,7 +80,7 @@ class GisGeometryTest extends TestCase
             $output,
             $this->_callProtectedFunction(
                 'setMinMax',
-                array($point_set, $min_max)
+                [$point_set, $min_max]
             )
         );
     }
@@ -92,33 +92,33 @@ class GisGeometryTest extends TestCase
      */
     public function providerForTestSetMinMax()
     {
-        return array(
-            array(
+        return [
+            [
                 '12 35,48 75,69 23,25 45,14 53,35 78',
-                array(),
-                array(
+                [],
+                [
                     'minX' => 12,
                     'maxX' => 69,
                     'minY' => 23,
                     'maxY' => 78
-                )
-            ),
-            array(
+                ]
+            ],
+            [
                 '12 35,48 75,69 23,25 45,14 53,35 78',
-                array(
+                [
                     'minX' => 2,
                     'maxX' => 29,
                     'minY' => 23,
                     'maxY' => 128
-                ),
-                array(
+                ],
+                [
                     'minX' => 2,
                     'maxX' => 69,
                     'minY' => 23,
                     'maxY' => 128
-                )
-            )
-        );
+                ]
+            ]
+        ];
     }
 
     /**
@@ -136,7 +136,7 @@ class GisGeometryTest extends TestCase
             $output,
             $this->_callProtectedFunction(
                 'generateParams',
-                array($value)
+                [$value]
             )
         );
     }
@@ -148,29 +148,29 @@ class GisGeometryTest extends TestCase
      */
     public function providerForTestGenerateParams()
     {
-        return array(
-            array(
+        return [
+            [
                 "'MULTIPOINT(125 50,156 25,178 43,175 80)',125",
-                array(
+                [
                     'srid' => '125',
                     'wkt'  => 'MULTIPOINT(125 50,156 25,178 43,175 80)',
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 'MULTIPOINT(125 50,156 25,178 43,175 80)',
-                array(
+                [
                     'srid' => '0',
                     'wkt'  => 'MULTIPOINT(125 50,156 25,178 43,175 80)',
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 "foo",
-                array(
+                [
                     'srid' => '0',
                     'wkt'  => '',
-                ),
-            ),
-        );
+                ],
+            ],
+        ];
     }
 
     /**
@@ -190,7 +190,7 @@ class GisGeometryTest extends TestCase
             $output,
             $this->_callProtectedFunction(
                 'extractPoints',
-                array($point_set, $scale_data, $linear)
+                [$point_set, $scale_data, $linear]
             )
         );
     }
@@ -202,53 +202,53 @@ class GisGeometryTest extends TestCase
      */
     public function providerForTestExtractPoints()
     {
-        return array(
+        return [
             // with no scale data
-            array(
+            [
                 '12 35,48 75,69 23',
                 null,
                 false,
-                array(
-                    0 => array(12, 35),
-                    1 => array(48, 75),
-                    2 => array(69, 23),
-                ),
-            ),
+                [
+                    0 => [12, 35],
+                    1 => [48, 75],
+                    2 => [69, 23],
+                ],
+            ],
             // with scale data
-            array(
+            [
                 '12 35,48 75,69 23',
-                array(
+                [
                     'x'      => 5,
                     'y'      => 5,
                     'scale'  => 2,
                     'height' => 200,
-                ),
+                ],
                 false,
-                array(
-                    0 => array(14, 140),
-                    1 => array(86, 60),
-                    2 => array(128, 164),
-                ),
-            ),
+                [
+                    0 => [14, 140],
+                    1 => [86, 60],
+                    2 => [128, 164],
+                ],
+            ],
             // linear output
-            array(
+            [
                 '12 35,48 75,69 23',
                 null,
                 true,
-                array(12, 35, 48, 75, 69, 23),
-            ),
+                [12, 35, 48, 75, 69, 23],
+            ],
             // if a single part of a coordinate is empty
-            array(
+            [
                 '12 35,48 75,69 ',
                 null,
                 false,
-                array(
-                    0 => array(12, 35),
-                    1 => array(48, 75),
-                    2 => array(0, 0),
-                ),
-            ),
-        );
+                [
+                    0 => [12, 35],
+                    1 => [48, 75],
+                    2 => [0, 0],
+                ],
+            ],
+        ];
     }
 
     /**
@@ -267,7 +267,7 @@ class GisGeometryTest extends TestCase
             $output,
             $this->_callProtectedFunction(
                 'getBoundsForOl',
-                array($srid, $scale_data)
+                [$srid, $scale_data]
             )
         );
     }
@@ -279,15 +279,15 @@ class GisGeometryTest extends TestCase
      */
     public function providerForTestGetBoundsForOl()
     {
-        return array(
-            array(
+        return [
+            [
                 4326,
-                array(
+                [
                     'minX' => '0',
                     'minY' => '0',
                     'maxX' => '1',
                     'maxY' => '1',
-                ),
+                ],
                 'bound = new OpenLayers.Bounds(); '
                     . 'bound.extend(new OpenLayers.LonLat(0, 0).transform('
                     . 'new OpenLayers.Projection("EPSG:4326"), '
@@ -295,9 +295,9 @@ class GisGeometryTest extends TestCase
                     . 'bound.extend(new OpenLayers.LonLat(1, 1).transform('
                     . 'new OpenLayers.Projection("EPSG:4326"), '
                     . 'map.getProjectionObject()));'
-            )
+            ]
 
-        );
+        ];
     }
 
     /**
@@ -316,7 +316,7 @@ class GisGeometryTest extends TestCase
             $output,
             $this->_callProtectedFunction(
                 'getPolygonArrayForOpenLayers',
-                array($polygons, $srid)
+                [$polygons, $srid]
             )
         );
     }
@@ -328,9 +328,9 @@ class GisGeometryTest extends TestCase
      */
     public function providerForTestGetPolygonArrayForOpenLayers()
     {
-        return array(
-            array(
-                array('Triangle'),
+        return [
+            [
+                ['Triangle'],
                 4326,
                 'new Array('
                     . 'new OpenLayers.Geometry.Polygon('
@@ -340,7 +340,7 @@ class GisGeometryTest extends TestCase
                     . '(new OpenLayers.Geometry.Point(0,0)).transform('
                     . 'new OpenLayers.Projection("EPSG:4326"), '
                     . 'map.getProjectionObject()))))))'
-            )
-        );
+            ]
+        ];
     }
 }
diff --git a/test/classes/Gis/GisLineStringTest.php b/test/classes/Gis/GisLineStringTest.php
index a97a2ccc5a..f23eb334cc 100644
--- a/test/classes/Gis/GisLineStringTest.php
+++ b/test/classes/Gis/GisLineStringTest.php
@@ -57,19 +57,19 @@ class GisLineStringTest extends GisGeomTestCase
      */
     public function providerForTestGenerateWkt()
     {
-        $temp1 = array(
-            0 => array(
-                'LINESTRING' => array(
+        $temp1 = [
+            0 => [
+                'LINESTRING' => [
                     'no_of_points' => 2,
-                    0 => array('x' => 5.02, 'y' => 8.45),
-                    1 => array('x' => 6.14, 'y' => 0.15)
-                )
-            )
-        );
+                    0 => ['x' => 5.02, 'y' => 8.45],
+                    1 => ['x' => 6.14, 'y' => 0.15]
+                ]
+            ]
+        ];
 
         $temp2 = $temp1;
         $temp2[0]['LINESTRING']['no_of_points'] = 3;
-        $temp2[0]['LINESTRING'][2] = array('x' => 1.56);
+        $temp2[0]['LINESTRING'][2] = ['x' => 1.56];
 
         $temp3 = $temp2;
         $temp3[0]['LINESTRING']['no_of_points'] = -1;
@@ -78,35 +78,35 @@ class GisLineStringTest extends GisGeomTestCase
         $temp4[0]['LINESTRING']['no_of_points'] = 3;
         unset($temp4[0]['LINESTRING'][2]['x']);
 
-        return array(
-            array(
+        return [
+            [
                 $temp1,
                 0,
                 null,
                 'LINESTRING(5.02 8.45,6.14 0.15)'
-            ),
+            ],
             // if a coordinate is missing, default is empty string
-            array(
+            [
                 $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
-            array(
+            [
                 $temp3,
                 0,
                 null,
                 'LINESTRING(5.02 8.45,6.14 0.15)'
-            ),
+            ],
             // missing coordinates are replaced with provided values (3rd parameter)
-            array(
+            [
                 $temp4,
                 0,
                 '0',
                 'LINESTRING(5.02 8.45,6.14 0.15,0 0)'
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -116,33 +116,33 @@ class GisLineStringTest extends GisGeomTestCase
      */
     public function providerForTestGenerateParams()
     {
-        $temp = array(
-            'LINESTRING' => array(
+        $temp = [
+            'LINESTRING' => [
                 'no_of_points' => 2,
-                0 => array('x' => '5.02', 'y' => '8.45'),
-                1 => array('x' => '6.14', 'y' => '0.15')
-            )
-        );
+                0 => ['x' => '5.02', 'y' => '8.45'],
+                1 => ['x' => '6.14', 'y' => '0.15']
+            ]
+        ];
         $temp1 = $temp;
         $temp1['gis_type'] = 'LINESTRING';
 
-        return array(
-            array(
+        return [
+            [
                 "'LINESTRING(5.02 8.45,6.14 0.15)',124",
                 null,
-                array(
+                [
                     'srid' => '124',
                     0 => $temp
-                )
-            ),
-            array(
+                ]
+            ],
+            [
                 'LINESTRING(5.02 8.45,6.14 0.15)',
                 2,
-                array(
+                [
                     2 => $temp1
-                )
-            )
-        );
+                ]
+            ]
+        ];
     }
 
     /**
@@ -152,17 +152,17 @@ class GisLineStringTest extends GisGeomTestCase
      */
     public function providerForTestScaleRow()
     {
-        return array(
-            array(
+        return [
+            [
                 'LINESTRING(12 35,48 75,69 23,25 45,14 53,35 78)',
-                array(
+                [
                     'minX' => 12,
                     'maxX' => 69,
                     'minY' => 23,
                     'maxY' => 78
-                )
-            )
-        );
+                ]
+            ]
+        ];
     }
 
     /**
@@ -197,20 +197,20 @@ class GisLineStringTest extends GisGeomTestCase
         if (! function_exists('imagecreatetruecolor')) {
             $this->markTestSkipped('GD extension missing!');
         }
-        return array(
-            array(
+        return [
+            [
                 'LINESTRING(12 35,48 75,69 23,25 45,14 53,35 78)',
                 'image',
                 '#B02EE0',
-                array(
+                [
                     'x' => 12,
                     'y' => 69,
                     'scale' => 2,
                     'height' => 150
-                ),
+                ],
                 imagecreatetruecolor(120, 150)
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -241,20 +241,20 @@ class GisLineStringTest extends GisGeomTestCase
      */
     public function providerForPrepareRowAsPdf()
     {
-        return array(
-            array(
+        return [
+            [
                 'LINESTRING(12 35,48 75,69 23,25 45,14 53,35 78)',
                 'pdf',
                 '#B02EE0',
-                array(
+                [
                     'x' => 12,
                     'y' => 69,
                     'scale' => 2,
                     'height' => 150
-                ),
+                ],
                 new TCPDF(),
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -285,22 +285,22 @@ class GisLineStringTest extends GisGeomTestCase
      */
     public function providerForPrepareRowAsSvg()
     {
-        return array(
-            array(
+        return [
+            [
                 'LINESTRING(12 35,48 75,69 23,25 45,14 53,35 78)',
                 'svg',
                 '#B02EE0',
-                array(
+                [
                     '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="svg)(\d+)(" class="linestring vector" fill="none" '
                 . 'stroke="#B02EE0" stroke-width="2"\/>)$/'
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -334,18 +334,18 @@ class GisLineStringTest extends GisGeomTestCase
      */
     public function providerForPrepareRowAsOl()
     {
-        return array(
-            array(
+        return [
+            [
                 'LINESTRING(12 35,48 75,69 23,25 45,14 53,35 78)',
                 4326,
                 'Ol',
                 '#B02EE0',
-                array(
+                [
                     'minX' => '0',
                     'minY' => '0',
                     'maxX' => '1',
                     'maxY' => '1',
-                ),
+                ],
                 'bound = new OpenLayers.Bounds(); bound.extend(new OpenLayers.'
                 . 'LonLat(0, 0).transform(new OpenLayers.Projection("EPSG:4326"), '
                 . 'map.getProjectionObject())); bound.extend(new OpenLayers.LonLat'
@@ -365,7 +365,7 @@ class GisLineStringTest extends GisGeomTestCase
                 . 'transform(new OpenLayers.Projection("EPSG:4326"), map.'
                 . 'getProjectionObject()))), null, {"strokeColor":"#B02EE0",'
                 . '"strokeWidth":2,"label":"Ol","fontSize":10}));'
-            )
-        );
+            ]
+        ];
     }
 }
diff --git a/test/classes/Gis/GisMultiLineStringTest.php b/test/classes/Gis/GisMultiLineStringTest.php
index ce63dea1a6..555791e4af 100644
--- a/test/classes/Gis/GisMultiLineStringTest.php
+++ b/test/classes/Gis/GisMultiLineStringTest.php
@@ -57,23 +57,23 @@ class GisMultiLineStringTest extends GisGeomTestCase
      */
     public function providerForTestGenerateWkt()
     {
-        $temp = array(
-            0 => array(
-                'MULTILINESTRING' => array(
+        $temp = [
+            0 => [
+                'MULTILINESTRING' => [
                     'no_of_lines' => 2,
-                    0 => array(
+                    0 => [
                         'no_of_points' => 2,
-                        0 => array('x' => 5.02, 'y' => 8.45),
-                        1 => array('x' => 6.14, 'y' => 0.15)
-                    ),
-                    1 => array(
+                        0 => ['x' => 5.02, 'y' => 8.45],
+                        1 => ['x' => 6.14, 'y' => 0.15]
+                    ],
+                    1 => [
                         'no_of_points' => 2,
-                        0 => array('x' => 1.23, 'y' => 4.25),
-                        1 => array('x' => 9.15, 'y' => 0.47)
-                    )
-                )
-            )
-        );
+                        0 => ['x' => 1.23, 'y' => 4.25],
+                        1 => ['x' => 9.15, 'y' => 0.47]
+                    ]
+                ]
+            ]
+        ];
 
         $temp1 = $temp;
         unset($temp1[0]['MULTILINESTRING'][1][1]['y']);
@@ -84,49 +84,49 @@ class GisMultiLineStringTest extends GisGeomTestCase
         $temp3 = $temp;
         $temp3[0]['MULTILINESTRING'][1]['no_of_points'] = 1;
 
-        return array(
-            array(
+        return [
+            [
                 $temp,
                 0,
                 null,
                 'MULTILINESTRING((5.02 8.45,6.14 0.15),(1.23 4.25,9.15 0.47))'
-            ),
+            ],
             // values at undefined index
-            array(
+            [
                 $temp,
                 1,
                 null,
                 'MULTILINESTRING(( , ))'
-            ),
+            ],
             // if a coordinate is missing, default is empty string
-            array(
+            [
                 $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)
-            array(
+            [
                 $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
-            array(
+            [
                 $temp2,
                 0,
                 null,
                 'MULTILINESTRING((5.02 8.45,6.14 0.15))'
-            ),
+            ],
             // a line should have at least two points
-            array(
+            [
                 $temp3,
                 0,
                 '0',
                 'MULTILINESTRING((5.02 8.45,6.14 0.15),(1.23 4.25,9.15 0.47))'
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -136,23 +136,23 @@ class GisMultiLineStringTest extends GisGeomTestCase
      */
     public function testGetShape()
     {
-        $row_data = array(
+        $row_data = [
             'numparts' => 2,
-            'parts'    => array(
-                0 => array(
-                    'points' => array(
-                        0 => array('x' => 5.02, 'y' => 8.45),
-                        1 => array('x' => 6.14, 'y' => 0.15),
-                    ),
-                ),
-                1 => array(
-                    'points' => array(
-                        0 => array('x' => 1.23, 'y' => 4.25),
-                        1 => array('x' => 9.15, 'y' => 0.47),
-                    ),
-                ),
-            ),
-        );
+            '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],
+                    ],
+                ],
+            ],
+        ];
 
         $this->assertEquals(
             $this->object->getShape($row_data),
@@ -167,42 +167,42 @@ class GisMultiLineStringTest extends GisGeomTestCase
      */
     public function providerForTestGenerateParams()
     {
-        $temp = array(
-            'MULTILINESTRING' => array(
+        $temp = [
+            'MULTILINESTRING' => [
                 'no_of_lines' => 2,
-                0 => array(
+                0 => [
                     'no_of_points' => 2,
-                    0 => array('x' => 5.02, 'y' => 8.45),
-                    1 => array('x' => 6.14, 'y' => 0.15),
-                ),
-                1 => array(
+                    0 => ['x' => 5.02, 'y' => 8.45],
+                    1 => ['x' => 6.14, 'y' => 0.15],
+                ],
+                1 => [
                     'no_of_points' => 2,
-                    0 => array('x' => 1.23, 'y' => 4.25),
-                    1 => array('x' => 9.15, 'y' => 0.47),
-                )
-            )
-        );
+                    0 => ['x' => 1.23, 'y' => 4.25],
+                    1 => ['x' => 9.15, 'y' => 0.47],
+                ]
+            ]
+        ];
 
         $temp1 = $temp;
         $temp1['gis_type'] = 'MULTILINESTRING';
 
-        return array(
-            array(
+        return [
+            [
                 "'MULTILINESTRING((5.02 8.45,6.14 0.15),(1.23 4.25,9.15 0.47))',124",
                 null,
-                array(
+                [
                     'srid' => '124',
                     0 => $temp
-                )
-            ),
-            array(
+                ]
+            ],
+            [
                 'MULTILINESTRING((5.02 8.45,6.14 0.15),(1.23 4.25,9.15 0.47))',
                 2,
-                array(
+                [
                     2 => $temp1
-                )
-            )
-        );
+                ]
+            ]
+        ];
     }
 
     /**
@@ -212,17 +212,17 @@ class GisMultiLineStringTest extends GisGeomTestCase
      */
     public function providerForTestScaleRow()
     {
-        return array(
-            array(
+        return [
+            [
                 'MULTILINESTRING((36 14,47 23,62 75),(36 10,17 23,178 53))',
-                array(
+                [
                     'minX' => 17,
                     'maxX' => 178,
                     'minY' => 10,
                     'maxY' => 75
-                )
-            )
-        );
+                ]
+            ]
+        ];
     }
 
 
@@ -258,20 +258,20 @@ class GisMultiLineStringTest extends GisGeomTestCase
         if (! function_exists('imagecreatetruecolor')) {
             $this->markTestSkipped('GD extension missing!');
         }
-        return array(
-            array(
+        return [
+            [
                 'MULTILINESTRING((36 14,47 23,62 75),(36 10,17 23,178 53))',
                 'image',
                 '#B02EE0',
-                array(
+                [
                     'x' => 12,
                     'y' => 69,
                     'scale' => 2,
                     'height' => 150
-                ),
+                ],
                 imagecreatetruecolor(120, 150)
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -302,20 +302,20 @@ class GisMultiLineStringTest extends GisGeomTestCase
      */
     public function providerForPrepareRowAsPdf()
     {
-        return array(
-            array(
+        return [
+            [
                 'MULTILINESTRING((36 14,47 23,62 75),(36 10,17 23,178 53))',
                 'pdf',
                 '#B02EE0',
-                array(
+                [
                     'x' => 12,
                     'y' => 69,
                     'scale' => 2,
                     'height' => 150
-                ),
+                ],
                 new TCPDF(),
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -346,24 +346,24 @@ class GisMultiLineStringTest extends GisGeomTestCase
      */
     public function providerForPrepareRowAsSvg()
     {
-        return array(
-            array(
+        return [
+            [
                 'MULTILINESTRING((36 14,47 23,62 75),(36 10,17 23,178 53))',
                 'svg',
                 '#B02EE0',
-                array(
+                [
                     '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="svg)(\d+)("\/><polyline points="48,268 10,'
                 . '242 332,182 " name="svg" class="linestring vector" fill="none" '
                 . 'stroke="#B02EE0" stroke-width="2" id="svg)(\d+)("\/>)$/'
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -397,18 +397,18 @@ class GisMultiLineStringTest extends GisGeomTestCase
      */
     public function providerForPrepareRowAsOl()
     {
-        return array(
-            array(
+        return [
+            [
                 'MULTILINESTRING((36 14,47 23,62 75),(36 10,17 23,178 53))',
                 4326,
                 'Ol',
                 '#B02EE0',
-                array(
+                [
                     'minX' => '0',
                     'minY' => '0',
                     'maxX' => '1',
                     'maxY' => '1',
-                ),
+                ],
                 'bound = new OpenLayers.Bounds(); bound.extend(new OpenLayers.'
                 . 'LonLat(0, 0).transform(new OpenLayers.Projection("EPSG:4326"), '
                 . 'map.getProjectionObject())); bound.extend(new OpenLayers.LonLat'
@@ -429,7 +429,7 @@ class GisMultiLineStringTest extends GisGeomTestCase
                 . 'metry.Point(178,53)).transform(new OpenLayers.Projection("EPSG:'
                 . '4326"), map.getProjectionObject()))))), null, {"strokeColor":"'
                 . '#B02EE0","strokeWidth":2,"label":"Ol","fontSize":10}));'
-            )
-        );
+            ]
+        ];
     }
 }
diff --git a/test/classes/Gis/GisMultiPointTest.php b/test/classes/Gis/GisMultiPointTest.php
index 582107b99a..b976895b58 100644
--- a/test/classes/Gis/GisMultiPointTest.php
+++ b/test/classes/Gis/GisMultiPointTest.php
@@ -57,39 +57,39 @@ class GisMultiPointTest extends GisGeomTestCase
      */
     public function providerForTestGenerateWkt()
     {
-        $gis_data1 = array(
-            0 => array(
-                'MULTIPOINT' => array(
+        $gis_data1 = [
+            0 => [
+                'MULTIPOINT' => [
                     'no_of_points' => 2,
-                    0 => array(
+                    0 => [
                         'x' => 5.02,
                         'y' => 8.45
-                    ),
-                    1 => array(
+                    ],
+                    1 => [
                         'x' => 1.56,
                         'y' => 4.36
-                    )
-                )
-            )
-        );
+                    ]
+                ]
+            ]
+        ];
 
         $gis_data2 = $gis_data1;
         $gis_data2[0]['MULTIPOINT']['no_of_points'] = -1;
 
-        return array(
-            array(
+        return [
+            [
                 $gis_data1,
                 0,
                 null,
                 'MULTIPOINT(5.02 8.45,1.56 4.36)'
-            ),
-            array(
+            ],
+            [
                 $gis_data2,
                 0,
                 null,
                 'MULTIPOINT(5.02 8.45)'
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -99,13 +99,13 @@ class GisMultiPointTest extends GisGeomTestCase
      */
     public function testGetShape()
     {
-        $gis_data = array(
+        $gis_data = [
             'numpoints' => 2,
-            'points' => array(
-                0 => array('x' => 5.02, 'y' => 8.45),
-                1 => array('x' => 6.14, 'y' => 0.15)
-            )
-        );
+            'points' => [
+                0 => ['x' => 5.02, 'y' => 8.45],
+                1 => ['x' => 6.14, 'y' => 0.15]
+            ]
+        ];
 
         $this->assertEquals(
             $this->object->getShape($gis_data),
@@ -120,33 +120,33 @@ class GisMultiPointTest extends GisGeomTestCase
      */
     public function providerForTestGenerateParams()
     {
-        $temp1 = array(
-            'MULTIPOINT' => array(
+        $temp1 = [
+            'MULTIPOINT' => [
                 'no_of_points' => 2,
-                0 => array('x' => '5.02', 'y' => '8.45'),
-                1 => array('x' => '6.14', 'y' => '0.15')
-            )
-        );
+                0 => ['x' => '5.02', 'y' => '8.45'],
+                1 => ['x' => '6.14', 'y' => '0.15']
+            ]
+        ];
         $temp2 = $temp1;
         $temp2['gis_type'] = 'MULTIPOINT';
 
-        return array(
-            array(
+        return [
+            [
                 "'MULTIPOINT(5.02 8.45,6.14 0.15)',124",
                 null,
-                array(
+                [
                     'srid' => '124',
                     0 => $temp1
-                )
-            ),
-            array(
+                ]
+            ],
+            [
                 'MULTIPOINT(5.02 8.45,6.14 0.15)',
                 2,
-                array(
+                [
                     2 => $temp2
-                )
-            )
-        );
+                ]
+            ]
+        ];
     }
 
     /**
@@ -156,17 +156,17 @@ class GisMultiPointTest extends GisGeomTestCase
      */
     public function providerForTestScaleRow()
     {
-        return array(
-            array(
+        return [
+            [
                 'MULTIPOINT(12 35,48 75,69 23,25 45,14 53,35 78)',
-                array(
+                [
                     'minX' => 12,
                     'maxX' => 69,
                     'minY' => 23,
                     'maxY' => 78
-                )
-            )
-        );
+                ]
+            ]
+        ];
     }
 
 
@@ -201,20 +201,20 @@ class GisMultiPointTest extends GisGeomTestCase
         if (! function_exists('imagecreatetruecolor')) {
             $this->markTestSkipped('GD extension missing!');
         }
-        return array(
-            array(
+        return [
+            [
                 'MULTIPOINT(12 35,48 75,69 23,25 45,14 53,35 78)',
                 'image',
                 '#B02EE0',
-                array(
+                [
                     'x' => 12,
                     'y' => 69,
                     'scale' => 2,
                     'height' => 150
-                ),
+                ],
                 imagecreatetruecolor(120, 150),
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -245,20 +245,20 @@ class GisMultiPointTest extends GisGeomTestCase
      */
     public function providerForPrepareRowAsPdf()
     {
-        return array(
-            array(
+        return [
+            [
                 'MULTIPOINT(12 35,48 75,69 23,25 45,14 53,35 78)',
                 'pdf',
                 '#B02EE0',
-                array(
+                [
                     'x' => 12,
                     'y' => 69,
                     'scale' => 2,
                     'height' => 150
-                ),
+                ],
                 new TCPDF(),
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -289,17 +289,17 @@ class GisMultiPointTest extends GisGeomTestCase
      */
     public function providerForPrepareRowAsSvg()
     {
-        return array(
-            array(
+        return [
+            [
                 'MULTIPOINT(12 35,48 75,69 23,25 45,14 53,35 78)',
                 'svg',
                 '#B02EE0',
-                array(
+                [
                     '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="svg)'
                 . '(\d+)("\/><circle cx="114" cy="242" r="3" name="svg" class="mult'
@@ -311,8 +311,8 @@ class GisMultiPointTest extends GisGeomTestCase
                 . 'width="2" id="svg)(\d+)("\/><circle cx="46" cy="132" r="3" name='
                 . '"svg" class="multipoint vector" fill="white" stroke="#B02EE0" '
                 . 'stroke-width="2" id="svg)(\d+)("\/>)$/'
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -346,18 +346,18 @@ class GisMultiPointTest extends GisGeomTestCase
      */
     public function providerForPrepareRowAsOl()
     {
-        return array(
-            array(
+        return [
+            [
                 'MULTIPOINT(12 35,48 75,69 23,25 45,14 53,35 78)',
                 4326,
                 'Ol',
                 '#B02EE0',
-                array(
+                [
                     'minX' => '0',
                     'minY' => '0',
                     'maxX' => '1',
                     'maxY' => '1',
-                ),
+                ],
                 'bound = new OpenLayers.Bounds(); bound.extend(new OpenLayers.Lon'
                 . 'Lat(0, 0).transform(new OpenLayers.Projection("EPSG:4326"), '
                 . 'map.getProjectionObject())); bound.extend(new OpenLayers.LonLat'
@@ -378,7 +378,7 @@ class GisMultiPointTest extends GisGeomTestCase
                 . ')))), null, {"pointRadius":3,"fillColor":"#ffffff","strokeColor"'
                 . ':"#B02EE0","strokeWidth":2,"label":"Ol","labelYOffset":-8,'
                 . '"fontSize":10}));'
-            )
-        );
+            ]
+        ];
     }
 }
diff --git a/test/classes/Gis/GisMultiPolygonTest.php b/test/classes/Gis/GisMultiPolygonTest.php
index 9de3defe33..0e613adc1d 100644
--- a/test/classes/Gis/GisMultiPolygonTest.php
+++ b/test/classes/Gis/GisMultiPolygonTest.php
@@ -57,39 +57,39 @@ class GisMultiPolygonTest extends GisGeomTestCase
      */
     private function _getData()
     {
-        return array(
-            'MULTIPOLYGON' => array(
+        return [
+            'MULTIPOLYGON' => [
                 'no_of_polygons' => 2,
-                0 => array(
+                0 => [
                     'no_of_lines' => 2,
-                    0 => array(
+                    0 => [
                         'no_of_points' => 5,
-                        0 => array('x' => 35, 'y' => 10),
-                        1 => array('x' => 10, 'y' => 20),
-                        2 => array('x' => 15, 'y' => 40),
-                        3 => array('x' => 45, 'y' => 45),
-                        4 => array('x' => 35, 'y' => 10),
-                    ),
-                    1 => array(
+                        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 => array('x' => 20, 'y' => 30),
-                        1 => array('x' => 35, 'y' => 32),
-                        2 => array('x' => 30, 'y' => 20),
-                        3 => array('x' => 20, 'y' => 30),
-                    )
-                ),
-                1 => array(
+                        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 => array(
+                    0 => [
                         'no_of_points' => 4,
-                        0 => array('x' => 123, 'y' => 0),
-                        1 => array('x' => 23, 'y' => 30),
-                        2 => array('x' => 17, 'y' => 63),
-                        3 => array('x' => 123, 'y' => 0),
-                    )
-                )
-            )
-        );
+                        0 => ['x' => 123, 'y' => 0],
+                        1 => ['x' => 23, 'y' => 30],
+                        2 => ['x' => 17, 'y' => 63],
+                        3 => ['x' => 123, 'y' => 0],
+                    ]
+                ]
+            ]
+        ];
     }
 
     /**
@@ -99,9 +99,9 @@ class GisMultiPolygonTest extends GisGeomTestCase
      */
     public function providerForTestGenerateWkt()
     {
-        $temp = array(
+        $temp = [
             0 => $this->_getData()
-        );
+        ];
 
         $temp1 = $temp;
         $temp1[0]['MULTIPOLYGON']['no_of_polygons'] = 0;
@@ -112,39 +112,39 @@ class GisMultiPolygonTest extends GisGeomTestCase
         $temp3 = $temp;
         $temp3[0]['MULTIPOLYGON'][1][0]['no_of_points'] = 3;
 
-        return array(
-            array(
+        return [
+            [
                 $temp,
                 0,
                 null,
                 '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)))'
-            ),
+            ],
             // at lease one polygon should be there
-            array(
+            [
                 $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
-            array(
+            [
                 $temp2,
                 0,
                 null,
                 '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)))'
-            ),
+            ],
             // a ring should have at least four points
-            array(
+            [
                 $temp3,
                 0,
                 '0',
                 '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)))'
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -159,25 +159,25 @@ class GisMultiPolygonTest extends GisGeomTestCase
         $temp1 = $this->_getData();
         $temp1['gis_type'] = 'MULTIPOLYGON';
 
-        return array(
-            array(
+        return [
+            [
                 "'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",
                 null,
-                array(
+                [
                     'srid' => '124',
                     0 => $temp
-                )
-            ),
-            array(
+                ]
+            ],
+            [
                 '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)))',
                 2,
-                array(
+                [
                     2 => $temp1
-                )
-            )
-        );
+                ]
+            ]
+        ];
     }
 
     /**
@@ -201,41 +201,41 @@ class GisMultiPolygonTest extends GisGeomTestCase
      */
     public function providerForTestGetShape()
     {
-        return array(
-            array(
-                array(
-                    'parts' => array(
-                        0 => array(
-                            'points' => array(
-                                0 => array('x' => 10, 'y' => 10),
-                                1 => array('x' => 10, 'y' => 40),
-                                2 => array('x' => 50, 'y' => 40),
-                                3 => array('x' => 50, 'y' => 10),
-                                4 => array('x' => 10, 'y' => 10),
-                            ),
-                        ),
-                        1 => array(
-                            'points' => array(
-                                0 => array('x' => 60, 'y' => 40),
-                                1 => array('x' => 75, 'y' => 65),
-                                2 => array('x' => 90, 'y' => 40),
-                                3 => array('x' => 60, 'y' => 40),
-                            ),
-                        ),
-                        2 => array(
-                            'points' => array(
-                                0 => array('x' => 20, 'y' => 20),
-                                1 => array('x' => 40, 'y' => 20),
-                                2 => array('x' => 25, 'y' => 30),
-                                3 => array('x' => 20, 'y' => 20),
-                            ),
-                        ),
-                    ),
-                ),
+        return [
+            [
+                [
+                    '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],
+                            ],
+                        ],
+                        1 => [
+                            'points' => [
+                                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],
+                            ],
+                        ],
+                    ],
+                ],
                 'MULTIPOLYGON(((10 10,10 40,50 40,50 10,10 10),(20 20,40 20,25 30'
                     . ',20 20)),((60 40,75 65,90 40,60 40)))'
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -245,28 +245,28 @@ class GisMultiPolygonTest extends GisGeomTestCase
      */
     public function providerForTestScaleRow()
     {
-        return array(
-            array(
+        return [
+            [
                 'MULTIPOLYGON(((136 40,147 83,16 75,136 40)),'
                     . '((105 0,56 20,78 73,105 0)))',
-                array(
+                [
                     'minX' => 16,
                     'maxX' => 147,
                     'minY' => 0,
                     'maxY' => 83
-                )
-            ),
-            array(
+                ]
+            ],
+            [
                 'MULTIPOLYGON(((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20'
                     . ',20 30)),((105 0,56 20,78 73,105 0)))',
-                array(
+                [
                     'minX' => 10,
                     'maxX' => 105,
                     'minY' => 0,
                     'maxY' => 73
-                )
-            )
-        );
+                ]
+            ]
+        ];
     }
 
 
@@ -301,22 +301,22 @@ class GisMultiPolygonTest extends GisGeomTestCase
         if (! function_exists('imagecreatetruecolor')) {
             $this->markTestSkipped('GD extension missing!');
         }
-        return array(
-            array(
+        return [
+            [
                 'MULTIPOLYGON(((136 40,147 83,16 75,136 40)),'
                     . '((105 0,56 20,78 73,105 0)))',
                 'image',
                 '#B02EE0',
-                array(
+                [
                     'x' => 12,
                     'y' => 69,
                     'scale' => 2,
                     'height' => 150
-                ),
+                ],
                 imagecreatetruecolor(120, 150),
-            )
+            ]
 
-        );
+        ];
     }
 
     /**
@@ -347,21 +347,21 @@ class GisMultiPolygonTest extends GisGeomTestCase
      */
     public function providerForPrepareRowAsPdf()
     {
-        return array(
-            array(
+        return [
+            [
                 'MULTIPOLYGON(((136 40,147 83,16 75,136 40)),'
                     . '((105 0,56 20,78 73,105 0)))',
                 'pdf',
                 '#B02EE0',
-                array(
+                [
                     'x' => 12,
                     'y' => 69,
                     'scale' => 2,
                     'height' => 150
-                ),
+                ],
                 new TCPDF(),
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -392,18 +392,18 @@ class GisMultiPolygonTest extends GisGeomTestCase
      */
     public function providerForPrepareRowAsSvg()
     {
-        return array(
-            array(
+        return [
+            [
                 'MULTIPOLYGON(((136 40,147 83,16 75,136 40)),'
                     . '((105 0,56 20,78 73,105 0)))',
                 'svg',
                 '#B02EE0',
-                array(
+                [
                     'x' => 12,
                     'y' => 69,
                     'scale' => 2,
                     'height' => 150
-                ),
+                ],
                 '/^(<path d=" M 248, 208 L 270, 122 L 8, 138 Z " name="svg" class="'
                 . 'multipolygon vector" stroke="black" stroke-width="0.5" fill="'
                 . '#B02EE0" fill-rule="evenodd" fill-opacity="0.8" id="svg)(\d+)'
@@ -411,8 +411,8 @@ class GisMultiPolygonTest extends GisGeomTestCase
                 . 'class="multipolygon vector" stroke="black" stroke-width="0.5" '
                 . 'fill="#B02EE0" fill-rule="evenodd" fill-opacity="0.8" id="svg)'
                 . '(\d+)("\/>)$/'
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -446,19 +446,19 @@ class GisMultiPolygonTest extends GisGeomTestCase
      */
     public function providerForPrepareRowAsOl()
     {
-        return array(
-            array(
+        return [
+            [
                 'MULTIPOLYGON(((136 40,147 83,16 75,136 40)),'
                     . '((105 0,56 20,78 73,105 0)))',
                 4326,
                 'Ol',
                 '#B02EE0',
-                array(
+                [
                     'minX' => '0',
                     'minY' => '0',
                     'maxX' => '1',
                     'maxY' => '1',
-                ),
+                ],
                 'bound = new OpenLayers.Bounds(); bound.extend(new OpenLayers.'
                 . 'LonLat(0, 0).transform(new OpenLayers.Projection("EPSG:4326"), '
                 . 'map.getProjectionObject())); bound.extend(new OpenLayers.LonLat'
@@ -485,7 +485,7 @@ class GisMultiPolygonTest extends GisGeomTestCase
                 . 'Layers.Projection("EPSG:4326"), map.getProjectionObject()))))))'
                 . '), null, {"strokeColor":"#000000","strokeWidth":0.5,"fillColor":'
                 . '"#B02EE0","fillOpacity":0.8,"label":"Ol","fontSize":10}));'
-            )
-        );
+            ]
+        ];
     }
 }
diff --git a/test/classes/Gis/GisPointTest.php b/test/classes/Gis/GisPointTest.php
index 17155aac39..73a22561d7 100644
--- a/test/classes/Gis/GisPointTest.php
+++ b/test/classes/Gis/GisPointTest.php
@@ -57,38 +57,38 @@ class GisPointTest extends GisGeomTestCase
      */
     public function providerForTestGenerateWkt()
     {
-        return array(
-            array(
-                array(0 => array('POINT' => array('x' => 5.02, 'y' => 8.45))),
+        return [
+            [
+                [0 => ['POINT' => ['x' => 5.02, 'y' => 8.45]]],
                 0,
                 null,
                 'POINT(5.02 8.45)'
-            ),
-            array(
-                array(0 => array('POINT' => array('x' => 5.02, 'y' => 8.45))),
+            ],
+            [
+                [0 => ['POINT' => ['x' => 5.02, 'y' => 8.45]]],
                 1,
                 null,
                 'POINT( )'
-            ),
-            array(
-                array(0 => array('POINT' => array('x' => 5.02))),
+            ],
+            [
+                [0 => ['POINT' => ['x' => 5.02]]],
                 0,
                 null,
                 'POINT(5.02 )'
-            ),
-            array(
-                array(0 => array('POINT' => array('y' => 8.45))),
+            ],
+            [
+                [0 => ['POINT' => ['y' => 8.45]]],
                 0,
                 null,
                 'POINT( 8.45)'
-            ),
-            array(
-                array(0 => array('POINT' => array())),
+            ],
+            [
+                [0 => ['POINT' => []]],
                 0,
                 null,
                 'POINT( )'
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -112,12 +112,12 @@ class GisPointTest extends GisGeomTestCase
      */
     public function providerForTestGetShape()
     {
-        return array(
-            array(
-                array('x' => 5.02, 'y' => 8.45),
+        return [
+            [
+                ['x' => 5.02, 'y' => 8.45],
                 'POINT(5.02 8.45)'
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -127,28 +127,28 @@ class GisPointTest extends GisGeomTestCase
      */
     public function providerForTestGenerateParams()
     {
-        return array(
-            array(
+        return [
+            [
                 "'POINT(5.02 8.45)',124",
                 null,
-                array(
+                [
                     'srid' => '124',
-                    0      => array(
-                        'POINT'    => array('x' => '5.02', 'y' => '8.45')
-                    ),
-                )
-            ),
-            array(
+                    0      => [
+                        'POINT'    => ['x' => '5.02', 'y' => '8.45']
+                    ],
+                ]
+            ],
+            [
                 'POINT(5.02 8.45)',
                 2,
-                array(
-                    2 => array(
+                [
+                    2 => [
                         'gis_type' => 'POINT',
-                        'POINT'    => array('x' => '5.02', 'y' => '8.45')
-                    ),
-                )
-            )
-        );
+                        'POINT'    => ['x' => '5.02', 'y' => '8.45']
+                    ],
+                ]
+            ]
+        ];
     }
 
     /**
@@ -158,17 +158,17 @@ class GisPointTest extends GisGeomTestCase
      */
     public function providerForTestScaleRow()
     {
-        return array(
-            array(
+        return [
+            [
                 'POINT(12 35)',
-                array(
+                [
                     'minX' => 12,
                     'maxX' => 12,
                     'minY' => 35,
                     'maxY' => 35,
-                )
-            )
-        );
+                ]
+            ]
+        ];
     }
 
     /**
@@ -202,20 +202,20 @@ class GisPointTest extends GisGeomTestCase
         if (! function_exists('imagecreatetruecolor')) {
             $this->markTestSkipped('GD extension missing!');
         }
-        return array(
-            array(
+        return [
+            [
                 'POINT(12 35)',
                 'image',
                 '#B02EE0',
-                array(
+                [
                     'x' => 12,
                     'y' => 69,
                     'scale' => 2,
                     'height' => 150
-                ),
+                ],
                 imagecreatetruecolor(120, 150)
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -246,20 +246,20 @@ class GisPointTest extends GisGeomTestCase
      */
     public function providerForPrepareRowAsPdf()
     {
-        return array(
-            array(
+        return [
+            [
                 'POINT(12 35)',
                 'pdf',
                 '#B02EE0',
-                array(
+                [
                     'x' => 12,
                     'y' => 69,
                     'scale' => 2,
                     'height' => 150
-                ),
+                ],
                 new TCPDF(),
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -292,20 +292,20 @@ class GisPointTest extends GisGeomTestCase
      */
     public function providerForPrepareRowAsSvg()
     {
-        return array(
-            array(
+        return [
+            [
                 'POINT(12 35)',
                 'svg',
                 '#B02EE0',
-                array(
+                [
                     'x' => 12,
                     'y' => 69,
                     'scale' => 2,
                     'height' => 150
-                ),
+                ],
                 ''
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -339,18 +339,18 @@ class GisPointTest extends GisGeomTestCase
      */
     public function providerForPrepareRowAsOl()
     {
-        return array(
-            array(
+        return [
+            [
                 'POINT(12 35)',
                 4326,
                 'Ol',
                 '#B02EE0',
-                array(
+                [
                     'minX' => '0',
                     'minY' => '0',
                     'maxX' => '1',
                     'maxY' => '1',
-                ),
+                ],
                 'bound = new OpenLayers.Bounds(); bound.extend(new OpenLayers.'
                 . 'LonLat(0, 0).transform(new OpenLayers.Projection("EPSG:4326"), '
                 . 'map.getProjectionObject())); bound.extend(new OpenLayers.LonLat'
@@ -361,7 +361,7 @@ class GisPointTest extends GisGeomTestCase
                 . 'ProjectionObject()), null, {"pointRadius":3,"fillColor":"#ffffff"'
                 . ',"strokeColor":"#B02EE0","strokeWidth":2,"label":"Ol","labelY'
                 . 'Offset":-8,"fontSize":10}));'
-            )
-        );
+            ]
+        ];
     }
 }
diff --git a/test/classes/Gis/GisPolygonTest.php b/test/classes/Gis/GisPolygonTest.php
index 4645f75bd1..e75a9cbed8 100644
--- a/test/classes/Gis/GisPolygonTest.php
+++ b/test/classes/Gis/GisPolygonTest.php
@@ -57,26 +57,26 @@ class GisPolygonTest extends GisGeomTestCase
      */
     private function _getData()
     {
-        return array(
-            'POLYGON' => array(
+        return [
+            'POLYGON' => [
                 'no_of_lines' => 2,
-                0 => array(
+                0 => [
                     'no_of_points' => 5,
-                    0 => array('x' => 35, 'y' => 10),
-                    1 => array('x' => 10, 'y' => 20),
-                    2 => array('x' => 15, 'y' => 40),
-                    3 => array('x' => 45, 'y' => 45),
-                    4 => array('x' => 35, 'y' => 10),
-                ),
-                1 => array(
+                    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 => array('x' => 20, 'y' => 30),
-                    1 => array('x' => 35, 'y' => 32),
-                    2 => array('x' => 30, 'y' => 20),
-                    3 => array('x' => 20, 'y' => 30),
-                )
-            )
-        );
+                    0 => ['x' => 20, 'y' => 30],
+                    1 => ['x' => 35, 'y' => 32],
+                    2 => ['x' => 30, 'y' => 20],
+                    3 => ['x' => 20, 'y' => 30],
+                ]
+            ]
+        ];
     }
 
     /**
@@ -86,9 +86,9 @@ class GisPolygonTest extends GisGeomTestCase
      */
     public function providerForTestGenerateWkt()
     {
-        $temp = array(
+        $temp = [
             0 => $this->_getData()
-        );
+        ];
 
         $temp1 = $temp;
         unset($temp1[0]['POLYGON'][1][3]['y']);
@@ -99,49 +99,49 @@ class GisPolygonTest extends GisGeomTestCase
         $temp3 = $temp;
         $temp3[0]['POLYGON'][1]['no_of_points'] = 3;
 
-        return array(
-            array(
+        return [
+            [
                 $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
-            array(
+            [
                 $temp,
                 1,
                 null,
                 'POLYGON(( , , , ))'
-            ),
+            ],
             // if a coordinate is missing, default is empty string
-            array(
+            [
                 $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)
-            array(
+            [
                 $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
-            array(
+            [
                 $temp2,
                 0,
                 '0',
                 'POLYGON((35 10,10 20,15 40,45 45,35 10))'
-            ),
+            ],
             // a ring should have at least four points
-            array(
+            [
                 $temp3,
                 0,
                 '0',
                 'POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 30))'
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -156,24 +156,24 @@ class GisPolygonTest extends GisGeomTestCase
         $temp1 = $temp;
         $temp1['gis_type'] = 'POLYGON';
 
-        return array(
-            array(
+        return [
+            [
                 "'POLYGON((35 10,10 20,15 40,45 45,35 10),"
                     . "(20 30,35 32,30 20,20 30))',124",
                 null,
-                array(
+                [
                     'srid' => '124',
                     0 => $temp
-                )
-            ),
-            array(
+                ]
+            ],
+            [
                 'POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 30))',
                 2,
-                array(
+                [
                     2 => $temp1
-                )
-            )
-        );
+                ]
+            ]
+        ];
     }
 
     /**
@@ -197,35 +197,35 @@ class GisPolygonTest extends GisGeomTestCase
      */
     public function providerForTestArea()
     {
-        return array(
-            array(
-                array(
-                    0 => array('x' => 35, 'y' => 10),
-                    1 => array('x' => 10, 'y' => 10),
-                    2 => array('x' => 15, 'y' => 40)
-                ),
+        return [
+            [
+                [
+                    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
-            array(
-                array(
-                    0 => array('x' => 35, 'y' => 10),
-                    1 => array('x' => 10, 'y' => 10),
-                    2 => array('x' => 15, 'y' => 40),
-                    3 => array('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
-            array(
-                array(
-                    0 => array('x' => 15, 'y' => 40),
-                    1 => array('x' => 10, 'y' => 10),
-                    2 => array('x' => 35, 'y' => 10)
-                ),
+            [
+                [
+                    0 => ['x' => 15, 'y' => 40],
+                    1 => ['x' => 10, 'y' => 10],
+                    2 => ['x' => 35, 'y' => 10]
+                ],
                 375.00
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -253,39 +253,39 @@ class GisPolygonTest extends GisGeomTestCase
      */
     public function providerForTestIsPointInsidePolygon()
     {
-        $ring = array(
-            0 => array('x' => 35, 'y' => 10),
-            1 => array('x' => 10, 'y' => 10),
-            2 => array('x' => 15, 'y' => 40),
-            3 => array('x' => 35, 'y' => 10)
-        );
+        $ring = [
+            0 => ['x' => 35, 'y' => 10],
+            1 => ['x' => 10, 'y' => 10],
+            2 => ['x' => 15, 'y' => 40],
+            3 => ['x' => 35, 'y' => 10]
+        ];
 
-        return array(
+        return [
             // point inside the ring
-            array(
-                array('x' => 20, 'y' => 15),
+            [
+                ['x' => 20, 'y' => 15],
                 $ring,
                 true
-            ),
+            ],
             // point on an edge of the ring
-            array(
-                array('x' => 20, 'y' => 10),
+            [
+                ['x' => 20, 'y' => 10],
                 $ring,
                 false
-            ),
+            ],
             // point on a vertex of the ring
-            array(
-                array('x' => 10, 'y' => 10),
+            [
+                ['x' => 10, 'y' => 10],
                 $ring,
                 false
-            ),
+            ],
             // point outside the ring
-            array(
-                array('x' => 5, 'y' => 10),
+            [
+                ['x' => 5, 'y' => 10],
                 $ring,
                 false
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -318,14 +318,14 @@ class GisPolygonTest extends GisGeomTestCase
         unset($temp['POLYGON'][0]['no_of_points']);
         unset($temp['POLYGON'][1]['no_of_points']);
 
-        return array(
-            array(
+        return [
+            [
                 $temp['POLYGON'][0]
-            ),
-            array(
+            ],
+            [
                 $temp['POLYGON'][1]
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -335,27 +335,27 @@ class GisPolygonTest extends GisGeomTestCase
      */
     public function providerForTestScaleRow()
     {
-        return array(
-            array(
+        return [
+            [
                 'POLYGON((123 0,23 30,17 63,123 0))',
-                array(
+                [
                     'minX' => 17,
                     'maxX' => 123,
                     'minY' => 0,
                     'maxY' => 63,
-                )
-            ),
-            array(
+                ]
+            ],
+            [
                 'POLYGON((35 10,10 20,15 40,45 45,35 10),'
                     . '(20 30,35 32,30 20,20 30)))',
-                array(
+                [
                     'minX' => 10,
                     'maxX' => 45,
                     'minY' => 10,
                     'maxY' => 45
-                )
-            ),
-        );
+                ]
+            ],
+        ];
     }
 
     /**
@@ -389,20 +389,20 @@ class GisPolygonTest extends GisGeomTestCase
         if (! function_exists('imagecreatetruecolor')) {
             $this->markTestSkipped('GD extension missing!');
         }
-        return array(
-            array(
+        return [
+            [
                 'POLYGON((123 0,23 30,17 63,123 0))',
                 'image',
                 '#B02EE0',
-                array(
+                [
                     'x' => 12,
                     'y' => 69,
                     'scale' => 2,
                     'height' => 150
-                ),
+                ],
                 imagecreatetruecolor(120, 150)
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -433,20 +433,20 @@ class GisPolygonTest extends GisGeomTestCase
      */
     public function providerForPrepareRowAsPdf()
     {
-        return array(
-            array(
+        return [
+            [
                 'POLYGON((123 0,23 30,17 63,123 0))',
                 'pdf',
                 '#B02EE0',
-                array(
+                [
                     'x' => 12,
                     'y' => 69,
                     'scale' => 2,
                     'height' => 150
-                ),
+                ],
                 new TCPDF(),
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -477,23 +477,23 @@ class GisPolygonTest extends GisGeomTestCase
      */
     public function providerForPrepareRowAsSvg()
     {
-        return array(
-            array(
+        return [
+            [
                 'POLYGON((123 0,23 30,17 63,123 0))',
                 'svg',
                 '#B02EE0',
-                array(
+                [
                     'x' => 12,
                     'y' => 69,
                     'scale' => 2,
                     'height' => 150
-                ),
+                ],
                 '/^(<path d=" M 222, 288 L 22, 228 L 10, 162 Z " name="svg" '
                 . 'id="svg)(\d+)(" class="polygon vector" stroke="black" '
                 . 'stroke-width="0.5" fill="#B02EE0" fill-rule="evenodd" '
                 . 'fill-opacity="0.8"\/>)$/'
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -527,18 +527,18 @@ class GisPolygonTest extends GisGeomTestCase
      */
     public function providerForPrepareRowAsOl()
     {
-        return array(
-            array(
+        return [
+            [
                 'POLYGON((123 0,23 30,17 63,123 0))',
                 4326,
                 'Ol',
                 '#B02EE0',
-                array(
+                [
                     'minX' => '0',
                     'minY' => '0',
                     'maxX' => '1',
                     'maxY' => '1',
-                ),
+                ],
                 'bound = new OpenLayers.Bounds(); bound.extend(new OpenLayers.Lon'
                 . 'Lat(0, 0).transform(new OpenLayers.Projection("EPSG:4326"), '
                 . 'map.getProjectionObject())); bound.extend(new OpenLayers.'
@@ -556,8 +556,8 @@ class GisPolygonTest extends GisGeomTestCase
                 . '("EPSG:4326"), map.getProjectionObject()))))), null, {"stroke'
                 . 'Color":"#000000","strokeWidth":0.5,"fillColor":"#B02EE0",'
                 . '"fillOpacity":0.8,"label":"Ol","fontSize":10}));'
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -580,15 +580,15 @@ class GisPolygonTest extends GisGeomTestCase
      */
     public function providerForIsOuterRing()
     {
-        return array(
-            array(
-                array(
-                    array('x' => 0, 'y' => 0),
-                    array('x' => 0, 'y' => 1),
-                    array('x' => 1, 'y' => 1),
-                    array('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/ImportTest.php b/test/classes/ImportTest.php
index 10d3090e89..31277c7a24 100644
--- a/test/classes/ImportTest.php
+++ b/test/classes/ImportTest.php
@@ -92,37 +92,37 @@ class ImportTest extends TestCase
     function testLookForUse()
     {
         $this->assertEquals(
-            array(null, null),
+            [null, null],
             $this->import->lookForUse(null, null, null)
         );
 
         $this->assertEquals(
-            array('myDb', null),
+            ['myDb', null],
             $this->import->lookForUse(null, 'myDb', null)
         );
 
         $this->assertEquals(
-            array('myDb', true),
+            ['myDb', true],
             $this->import->lookForUse(null, 'myDb', true)
         );
 
         $this->assertEquals(
-            array('myDb', true),
+            ['myDb', true],
             $this->import->lookForUse('select 1 from myTable', 'myDb', true)
         );
 
         $this->assertEquals(
-            array('anotherDb', true),
+            ['anotherDb', true],
             $this->import->lookForUse('use anotherDb', 'myDb', false)
         );
 
         $this->assertEquals(
-            array('anotherDb', true),
+            ['anotherDb', true],
             $this->import->lookForUse('use anotherDb', 'myDb', true)
         );
 
         $this->assertEquals(
-            array('anotherDb', true),
+            ['anotherDb', true],
             $this->import->lookForUse('use `anotherDb`;', 'myDb', true)
         );
     }
@@ -149,14 +149,14 @@ class ImportTest extends TestCase
      */
     function provGetColumnAlphaName()
     {
-        return array(
-            array('A', 1),
-            array('Z', 0),
-            array('AA', 27),
-            array('AZ', 52),
-            array('BA', 53),
-            array('BB', 54),
-        );
+        return [
+            ['A', 1],
+            ['Z', 0],
+            ['AA', 27],
+            ['AZ', 52],
+            ['BA', 53],
+            ['BB', 54],
+        ];
     }
 
     /**
@@ -181,14 +181,14 @@ class ImportTest extends TestCase
      */
     function provGetColumnNumberFromName()
     {
-        return array(
-            array(1, 'A'),
-            array(26, 'Z'),
-            array(27, 'AA'),
-            array(52, 'AZ'),
-            array(53, 'BA'),
-            array(54, 'BB'),
-        );
+        return [
+            [1, 'A'],
+            [26, 'Z'],
+            [27, 'AA'],
+            [52, 'AZ'],
+            [53, 'BA'],
+            [54, 'BB'],
+        ];
     }
 
     /**
@@ -213,12 +213,12 @@ class ImportTest extends TestCase
      */
     function provGetDecimalPrecision()
     {
-        return array(
-            array(2, '2,1'),
-            array(6, '6,2'),
-            array(6, '6,0'),
-            array(16, '16,2'),
-        );
+        return [
+            [2, '2,1'],
+            [6, '6,2'],
+            [6, '6,0'],
+            [16, '16,2'],
+        ];
     }
 
     /**
@@ -243,12 +243,12 @@ class ImportTest extends TestCase
      */
     function provGetDecimalScale()
     {
-        return array(
-            array(1, '2,1'),
-            array(2, '6,2'),
-            array(0, '6,0'),
-            array(20, '30,20'),
-        );
+        return [
+            [1, '2,1'],
+            [2, '6,2'],
+            [0, '6,0'],
+            [20, '30,20'],
+        ];
     }
 
     /**
@@ -273,12 +273,12 @@ class ImportTest extends TestCase
      */
     function provGetDecimalSize()
     {
-        return array(
-            array(array(2, 1, '2,1'), '2.1'),
-            array(array(2, 1, '2,1'), '6.2'),
-            array(array(3, 1, '3,1'), '10.0'),
-            array(array(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'],
+        ];
     }
 
     /**
@@ -306,21 +306,21 @@ class ImportTest extends TestCase
      */
     function provDetectType()
     {
-        return array(
-            array(Import::NONE, null, 'NULL'),
-            array(Import::NONE, Import::NONE, 'NULL'),
-            array(Import::INT, Import::INT, 'NULL'),
-            array(Import::VARCHAR, Import::VARCHAR, 'NULL'),
-            array(Import::VARCHAR, null, null),
-            array(Import::VARCHAR, Import::INT, null),
-            array(Import::INT, Import::INT, '10'),
-            array(Import::DECIMAL, Import::DECIMAL, '10.2'),
-            array(Import::DECIMAL, Import::INT, '10.2'),
-            array(Import::BIGINT, Import::BIGINT, '2147483648'),
-            array(Import::BIGINT, Import::INT, '2147483648'),
-            array(Import::VARCHAR, Import::VARCHAR, 'test'),
-            array(Import::VARCHAR, Import::INT, 'test'),
-        );
+        return [
+            [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::BIGINT, Import::BIGINT, '2147483648'],
+            [Import::BIGINT, Import::INT, '2147483648'],
+            [Import::VARCHAR, Import::VARCHAR, 'test'],
+            [Import::VARCHAR, Import::INT, 'test'],
+        ];
     }
 
     /**
@@ -347,7 +347,7 @@ class ImportTest extends TestCase
 
         $dbi->expects($this->any())
             ->method('numRows')
-            ->with(array())
+            ->with([])
             ->will($this->returnValue(2));
 
         $dbi->expects($this->any())
@@ -358,12 +358,12 @@ class ImportTest extends TestCase
         $dbi->expects($this->at(1))
             ->method('tryQuery')
             ->with($simulated_update_query)
-            ->will($this->returnValue(array()));
+            ->will($this->returnValue([]));
 
         $dbi->expects($this->at(4))
             ->method('tryQuery')
             ->with($simulated_delete_query)
-            ->will($this->returnValue(array()));
+            ->will($this->returnValue([]));
 
         $GLOBALS['dbi'] = $dbi;
 
@@ -382,29 +382,29 @@ class ImportTest extends TestCase
     function simulatedQueryTest($sql_query, $simulated_query)
     {
         $parser = new Parser($sql_query);
-        $analyzed_sql_results = array(
+        $analyzed_sql_results = [
             'query' => $sql_query,
             'parser' => $parser,
             'statement' => $parser->statements[0],
-        );
+        ];
 
         $simulated_data = $this->import->getMatchedRows($analyzed_sql_results);
 
         // URL to matched rows.
-        $_url_params = array(
+        $_url_params = [
             'db'        => 'PMA',
             'sql_query' => $simulated_query
-        );
+        ];
         $matched_rows_url  = 'sql.php' . Url::getCommon($_url_params);
 
         $this->assertEquals(
-            array(
+            [
                 'sql_query' => Util::formatSql(
                     $analyzed_sql_results['query']
                 ),
                 'matched_rows' => 2,
                 'matched_rows_url' => $matched_rows_url
-            ),
+            ],
             $simulated_data
         );
     }
@@ -423,7 +423,7 @@ class ImportTest extends TestCase
             ->getMock();
 
         // List of Transactional Engines.
-        $transactional_engines = array(
+        $transactional_engines = [
             'INNODB',
             'FALCON',
             'NDB',
@@ -432,7 +432,7 @@ class ImportTest extends TestCase
             'XTRADB',
             'SEQUENCE',
             'BDB'
-        );
+        ];
 
         $check_query = 'SELECT `ENGINE` FROM `information_schema`.`tables` '
             . 'WHERE `table_name` = "%s" '
@@ -447,7 +447,7 @@ class ImportTest extends TestCase
         $dbi->expects($this->at(0))
             ->method('tryQuery')
             ->with(sprintf($check_table_query, 'PMA', 'table_1'))
-            ->will($this->returnValue(array('table')));
+            ->will($this->returnValue(['table']));
 
         $dbi->expects($this->at(1))
             ->method('tryQuery')
@@ -461,7 +461,7 @@ class ImportTest extends TestCase
         $dbi->expects($this->at(3))
             ->method('tryQuery')
             ->with(sprintf($check_table_query, 'PMA', 'table_2'))
-            ->will($this->returnValue(array('table')));
+            ->will($this->returnValue(['table']));
 
         $dbi->expects($this->at(4))
             ->method('tryQuery')
diff --git a/test/classes/IndexTest.php b/test/classes/IndexTest.php
index 139455dc80..d3ac4e2400 100644
--- a/test/classes/IndexTest.php
+++ b/test/classes/IndexTest.php
@@ -19,7 +19,7 @@ use PhpMyAdmin\Tests\PmaTestCase;
  */
 class IndexTest extends PmaTestCase
 {
-    private $_params = array();
+    private $_params = [];
 
     /**
      * Configures parameters.
@@ -38,18 +38,18 @@ class IndexTest extends PmaTestCase
         $this->_params['Packed'] = "PMA_Packed";
 
         //test add columns
-        $column1 = array("Column_name"=>"column1","Seq_in_index"=>"index1",
+        $column1 = ["Column_name"=>"column1","Seq_in_index"=>"index1",
                          "Collation"=>"Collation1","Cardinality"=>"Cardinality1",
                          "Null"=>"null1"
-                        );
-        $column2 = array("Column_name"=>"column2","Seq_in_index"=>"index2",
+                        ];
+        $column2 = ["Column_name"=>"column2","Seq_in_index"=>"index2",
                          "Collation"=>"Collation2","Cardinality"=>"Cardinality2",
                          "Null"=>"null2"
-                        );
-        $column3 = array("Column_name"=>"column3","Seq_in_index"=>"index3",
+                        ];
+        $column3 = ["Column_name"=>"column3","Seq_in_index"=>"index3",
                          "Collation"=>"Collation3","Cardinality"=>"Cardinality3",
                          "Null"=>"null3"
-                        );
+                        ];
         $this->_params['columns'][] = $column1;
         $this->_params['columns'][] = $column2;
         $this->_params['columns'][] = $column3;
diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php
index 2f40cbd79e..9a6b881aac 100644
--- a/test/classes/InsertEditTest.php
+++ b/test/classes/InsertEditTest.php
@@ -97,17 +97,17 @@ class InsertEditTest extends TestCase
      */
     public function testGetFormParametersForInsertForm()
     {
-        $where_clause = array('foo' => 'bar ', '1' => ' test');
+        $where_clause = ['foo' => 'bar ', '1' => ' test'];
         $_REQUEST['clause_is_unique'] = false;
         $_POST['sql_query'] = 'SELECT a';
         $GLOBALS['goto'] = 'index.php';
 
         $result = $this->insertEdit->getFormParametersForInsertForm(
-            'dbname', 'tablename', array(), $where_clause, 'localhost'
+            'dbname', 'tablename', [], $where_clause, 'localhost'
         );
 
         $this->assertEquals(
-            array(
+            [
                 'db'        => 'dbname',
                 'table'     => 'tablename',
                 'goto'      => 'index.php',
@@ -116,7 +116,7 @@ class InsertEditTest extends TestCase
                 'where_clause[foo]' => 'bar',
                 'where_clause[1]' => 'test',
                 'clause_is_unique' => false
-            ),
+            ],
             $result
         );
     }
@@ -129,17 +129,17 @@ class InsertEditTest extends TestCase
     public function testGetWhereClauseArray()
     {
         $this->assertEquals(
-            array(),
+            [],
             $this->callProtectedMethod('getWhereClauseArray', [null])
         );
 
         $this->assertEquals(
-            array(1, 2, 3),
+            [1, 2, 3],
             $this->callProtectedMethod('getWhereClauseArray', [[1, 2, 3]])
         );
 
         $this->assertEquals(
-            array('clause'),
+            ['clause'],
             $this->callProtectedMethod('getWhereClauseArray', ['clause'])
         );
     }
@@ -151,7 +151,7 @@ class InsertEditTest extends TestCase
      */
     public function testAnalyzeWhereClause()
     {
-        $clauses = array('a=1', 'b="fo\o"');
+        $clauses = ['a=1', 'b="fo\o"'];
 
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
             ->disableOriginalConstructor()
@@ -167,15 +167,15 @@ class InsertEditTest extends TestCase
         $dbi->expects($this->exactly(2))
             ->method('fetchAssoc')
             ->willReturnOnConsecutiveCalls(
-                array('assoc1'),
-                array('assoc2')
+                ['assoc1'],
+                ['assoc2']
             );
 
         $dbi->expects($this->exactly(2))
             ->method('getFieldsMeta')
             ->willReturnOnConsecutiveCalls(
-                array(),
-                array()
+                [],
+                []
             );
 
         $GLOBALS['dbi'] = $dbi;
@@ -187,15 +187,15 @@ class InsertEditTest extends TestCase
         ]);
 
         $this->assertEquals(
-            array(
-                array('a=1', 'b="fo\\\\o"'),
-                array('result1', 'result2'),
-                array(
-                    array('assoc1'),
-                    array('assoc2')
-                ),
+            [
+                ['a=1', 'b="fo\\\\o"'],
+                ['result1', 'result2'],
+                [
+                    ['assoc1'],
+                    ['assoc2']
+                ],
                 ''
-            ),
+            ],
             $result
         );
     }
@@ -212,7 +212,7 @@ class InsertEditTest extends TestCase
         $temp->table = 'table';
         $temp->type = 'real';
         $temp->primary_key = 1;
-        $meta_arr = array($temp);
+        $meta_arr = [$temp];
 
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
             ->disableOriginalConstructor()
@@ -227,8 +227,8 @@ class InsertEditTest extends TestCase
         $this->insertEdit = new InsertEdit($GLOBALS['dbi']);
 
         $result = $this->callProtectedMethod('showEmptyResultMessageOrSetUniqueCondition', [
-            array('1' => array('1' => 1)), 1, array(),
-            'SELECT', array('1' => 'result1')
+            ['1' => ['1' => 1]], 1, [],
+            'SELECT', ['1' => 'result1']
         ]);
 
         $this->assertTrue($result);
@@ -238,7 +238,7 @@ class InsertEditTest extends TestCase
 
         $responseMock = $this->getMockBuilder('PhpMyAdmin\Response')
             ->disableOriginalConstructor()
-            ->setMethods(array('addHtml'))
+            ->setMethods(['addHtml'])
             ->getMock();
 
         $restoreInstance = Response::getInstance();
@@ -247,7 +247,7 @@ class InsertEditTest extends TestCase
         $response->setValue($responseMock);
 
         $result = $this->callProtectedMethod('showEmptyResultMessageOrSetUniqueCondition', [
-            array(false), 0, array('1'), 'SELECT', array('1' => 'result1')
+            [false], 0, ['1'], 'SELECT', ['1' => 'result1']
         ]);
 
         $response->setValue($restoreInstance);
@@ -283,7 +283,7 @@ class InsertEditTest extends TestCase
         $result = $this->callProtectedMethod('loadFirstRow', ['table', 'db']);
 
         $this->assertEquals(
-            array('result1', array(false, false)),
+            ['result1', [false, false]],
             $result
         );
     }
@@ -295,17 +295,17 @@ class InsertEditTest extends TestCase
      */
     public function testUrlParamsInEditMode()
     {
-        $where_clause_array = array('foo=1', 'bar=2');
+        $where_clause_array = ['foo=1', 'bar=2'];
         $_POST['sql_query'] = 'SELECT 1';
 
-        $result = $this->insertEdit->urlParamsInEditMode(array(1), $where_clause_array, '');
+        $result = $this->insertEdit->urlParamsInEditMode([1], $where_clause_array, '');
 
         $this->assertEquals(
-            array(
+            [
                 '0' => 1,
                 'where_clause' => 'bar=2',
                 'sql_query' => 'SELECT 1'
-            ),
+            ],
             $result
         );
     }
@@ -319,7 +319,7 @@ class InsertEditTest extends TestCase
     {
         $GLOBALS['cfg']['ShowFieldTypesInDataEditView'] = true;
         $GLOBALS['cfg']['ServerDefault'] = 1;
-        $url_params = array('ShowFunctionFields' => 2);
+        $url_params = ['ShowFunctionFields' => 2];
 
         $result = $this->insertEdit->showTypeOrFunction('function', $url_params, false);
 
@@ -368,14 +368,14 @@ class InsertEditTest extends TestCase
      */
     public function testAnalyzeTableColumnsArray()
     {
-        $column = array(
+        $column = [
             'Field' => '1<2',
             'Field_md5' => 'pswd',
             'Type' => 'float(10, 1)'
-        );
+        ];
 
         $result = $this->callProtectedMethod('analyzeTableColumnsArray', [
-            $column, array(), false
+            $column, [], false
         ]);
 
         $this->assertEquals(
@@ -441,18 +441,18 @@ class InsertEditTest extends TestCase
      */
     public function testGetColumnTitle()
     {
-        $column = array();
+        $column = [];
         $column['Field'] = 'f1<';
         $column['Field_html'] = 'f1&lt;';
 
         $this->assertEquals(
             $this->callProtectedMethod('getColumnTitle', [
-                $column, array()
+                $column, []
             ]),
             'f1&lt;'
         );
 
-        $comments = array();
+        $comments = [];
         $comments['f1<'] = 'comment>';
 
         $result = $this->callProtectedMethod('getColumnTitle', [
@@ -477,8 +477,8 @@ class InsertEditTest extends TestCase
      */
     public function testIsColumn()
     {
-        $column = array();
-        $types = array('binary', 'varbinary');
+        $column = [];
+        $types = ['binary', 'varbinary'];
 
         $column['Type'] = 'binaryfoo';
         $this->assertTrue($this->insertEdit->isColumn($column, $types));
@@ -492,7 +492,7 @@ class InsertEditTest extends TestCase
         $column['Type'] = 'barbinaryfoo';
         $this->assertFalse($this->insertEdit->isColumn($column, $types));
 
-        $types = array('char', 'varchar');
+        $types = ['char', 'varchar'];
 
         $column['Type'] = 'char(10)';
         $this->assertTrue($this->insertEdit->isColumn($column, $types));
@@ -503,7 +503,7 @@ class InsertEditTest extends TestCase
         $column['Type'] = 'foochar';
         $this->assertFalse($this->insertEdit->isColumn($column, $types));
 
-        $types = array('blob', 'tinyblob', 'mediumblob', 'longblob');
+        $types = ['blob', 'tinyblob', 'mediumblob', 'longblob'];
 
         $column['Type'] = 'blob';
         $this->assertTrue($this->insertEdit->isColumn($column, $types));
@@ -531,10 +531,10 @@ class InsertEditTest extends TestCase
      */
     public function testGetEnumAndTimestampColumns()
     {
-        $column = array();
+        $column = [];
         $column['True_Type'] = 'set';
         $this->assertEquals(
-            array('set', '', false),
+            ['set', '', false],
             $this->callProtectedMethod('getEnumSetAndTimestampColumns', [
                 $column, false
             ])
@@ -542,7 +542,7 @@ class InsertEditTest extends TestCase
 
         $column['True_Type'] = 'enum';
         $this->assertEquals(
-            array('enum', '', false),
+            ['enum', '', false],
             $this->callProtectedMethod('getEnumSetAndTimestampColumns', [
                 $column, false
             ])
@@ -551,7 +551,7 @@ class InsertEditTest extends TestCase
         $column['True_Type'] = 'timestamp';
         $column['Type'] = 'date';
         $this->assertEquals(
-            array('date', ' nowrap', true),
+            ['date', ' nowrap', true],
             $this->callProtectedMethod('getEnumSetAndTimestampColumns', [
                 $column, false
             ])
@@ -560,7 +560,7 @@ class InsertEditTest extends TestCase
         $column['True_Type'] = 'timestamp';
         $column['Type'] = 'date';
         $this->assertEquals(
-            array('date', ' nowrap', false),
+            ['date', ' nowrap', false],
             $this->callProtectedMethod('getEnumSetAndTimestampColumns', [
                 $column, true
             ])
@@ -569,7 +569,7 @@ class InsertEditTest extends TestCase
         $column['True_Type'] = 'SET';
         $column['Type'] = 'num';
         $this->assertEquals(
-            array('num', ' nowrap', false),
+            ['num', ' nowrap', false],
             $this->callProtectedMethod('getEnumSetAndTimestampColumns', [
                 $column, false
             ])
@@ -578,7 +578,7 @@ class InsertEditTest extends TestCase
         $column['True_Type'] = '';
         $column['Type'] = 'num';
         $this->assertEquals(
-            array('num', ' nowrap', false),
+            ['num', ' nowrap', false],
             $this->callProtectedMethod('getEnumSetAndTimestampColumns', [
                 $column, false
             ])
@@ -593,12 +593,12 @@ class InsertEditTest extends TestCase
     public function testGetFunctionColumn()
     {
         $GLOBALS['cfg']['ProtectBinary'] = 'blob';
-        $column = array();
+        $column = [];
         $column['is_blob'] = true;
         $this->assertContains(
             '<td class="center">Binary</td>',
             $this->callProtectedMethod('getFunctionColumn', [
-                $column, false, '', '', array(), 0, 0, 0, false, false, array()
+                $column, false, '', '', [], 0, 0, 0, false, false, []
             ])
         );
 
@@ -607,7 +607,7 @@ class InsertEditTest extends TestCase
         $this->assertContains(
             '<td class="center">Binary</td>',
             $this->callProtectedMethod('getFunctionColumn', [
-                $column, true, '', '', array(), 0, 0, 0, false, false, array()
+                $column, true, '', '', [], 0, 0, 0, false, false, []
             ])
         );
 
@@ -616,7 +616,7 @@ class InsertEditTest extends TestCase
         $this->assertContains(
             '<td class="center">Binary</td>',
             $this->callProtectedMethod('getFunctionColumn', [
-                $column, true, '', '', array(), 0, 0, 0, false, false, array()
+                $column, true, '', '', [], 0, 0, 0, false, false, []
             ])
         );
 
@@ -625,7 +625,7 @@ class InsertEditTest extends TestCase
         $this->assertContains(
             '<td class="center">--</td>',
             $this->callProtectedMethod('getFunctionColumn', [
-                $column, true, '', '', array(), 0, 0, 0, false, false, array()
+                $column, true, '', '', [], 0, 0, 0, false, false, []
             ])
         );
 
@@ -633,7 +633,7 @@ class InsertEditTest extends TestCase
         $this->assertContains(
             '<td class="center">--</td>',
             $this->callProtectedMethod('getFunctionColumn', [
-                $column, true, '', '', array(), 0, 0, 0, false, false, array()
+                $column, true, '', '', [], 0, 0, 0, false, false, []
             ])
         );
 
@@ -642,7 +642,7 @@ class InsertEditTest extends TestCase
         $this->assertContains(
             '<td class="center">--</td>',
             $this->callProtectedMethod('getFunctionColumn', [
-                $column, true, '', '', array('int'), 0, 0, 0, false, false, array()
+                $column, true, '', '', ['int'], 0, 0, 0, false, false, []
             ])
         );
 
@@ -650,7 +650,7 @@ class InsertEditTest extends TestCase
         $this->assertContains(
             '<select name="funcsa" b tabindex="5" id="field_3_1"',
             $this->callProtectedMethod('getFunctionColumn', [
-                $column, true, 'a', 'b', array(), 2, 3, 3, false, false, array()
+                $column, true, 'a', 'b', [], 2, 3, 3, false, false, []
             ])
         );
     }
@@ -662,18 +662,18 @@ class InsertEditTest extends TestCase
      */
     public function testGetNullColumn()
     {
-        $column = array('Field' => '');
+        $column = ['Field' => ''];
         $column['Null'] = 'YES';
         $column['first_timestamp'] = false;
         $column['True_Type'] = 'enum';
         $column['Type'] = 0;
         $column['Field_md5'] = 'foobar';
-        $foreigners = array(
-            'foreign_keys_data' => array()
-        );
+        $foreigners = [
+            'foreign_keys_data' => []
+        ];
 
         $result = $this->callProtectedMethod('getNullColumn', [
-            $column, 'a', true, 2, 0, 1, "<script>", $foreigners, array(), false
+            $column, 'a', true, 2, 0, 1, "<script>", $foreigners, [], false
         ]);
 
         $this->assertContains(
@@ -708,7 +708,7 @@ class InsertEditTest extends TestCase
         // case 2
         $column['Null'] = 'NO';
         $result = $this->callProtectedMethod('getNullColumn', [
-            $column, 'a', true, 2, 0, 1, "<script>", array(), array(), false
+            $column, 'a', true, 2, 0, 1, "<script>", [], [], false
         ]);
 
         $this->assertEquals(
@@ -719,7 +719,7 @@ class InsertEditTest extends TestCase
         // case 3
         $column['Null'] = 'YES';
         $result = $this->callProtectedMethod('getNullColumn', [
-            $column, 'a', true, 2, 0, 1, "<script>", array(), array(), true
+            $column, 'a', true, 2, 0, 1, "<script>", [], [], true
         ]);
 
         $this->assertEquals(
@@ -735,17 +735,17 @@ class InsertEditTest extends TestCase
      */
     public function testGetNullifyCodeForNullColumn()
     {
-        $column = $foreignData = array();
-        $foreigners = array(
-            'foreign_keys_data' => array()
-        );
+        $column = $foreignData = [];
+        $foreigners = [
+            'foreign_keys_data' => []
+        ];
         $column['Field'] = 'f';
         $column['True_Type'] = 'enum';
         $column['Type'] = 'ababababababababababa';
         $this->assertEquals(
             '1',
             $this->callProtectedMethod('getNullifyCodeForNullColumn', [
-                $column, $foreigners, array()
+                $column, $foreigners, []
             ])
         );
 
@@ -754,7 +754,7 @@ class InsertEditTest extends TestCase
         $this->assertEquals(
             '2',
             $this->callProtectedMethod('getNullifyCodeForNullColumn', [
-                $column, $foreigners, array()
+                $column, $foreigners, []
             ])
         );
 
@@ -762,7 +762,7 @@ class InsertEditTest extends TestCase
         $this->assertEquals(
             '3',
             $this->callProtectedMethod('getNullifyCodeForNullColumn', [
-                $column, $foreigners, array()
+                $column, $foreigners, []
             ])
         );
 
@@ -784,12 +784,12 @@ class InsertEditTest extends TestCase
      */
     public function testGetForeignLink()
     {
-        $column = $titles = array();
+        $column = $titles = [];
         $column['Field'] = 'f';
         $titles['Browse'] = "'";
         $GLOBALS['cfg']['ServerDefault'] = 2;
         $result = $this->callProtectedMethod('getForeignLink', [
-            $column, 'a', 'b', 'd', 2, 0, 1, "abc", array('tbl', 'db'), 8,
+            $column, 'a', 'b', 'd', 2, 0, 1, "abc", ['tbl', 'db'], 8,
             $titles, false
         ]);
 
@@ -819,10 +819,10 @@ class InsertEditTest extends TestCase
      */
     public function testDispRowForeignData()
     {
-        $column = array();
+        $column = [];
         $column['is_binary'] = false;
-        $foreignData = array();
-        $foreignData['disp_row'] = array();
+        $foreignData = [];
+        $foreignData['disp_row'] = [];
         $foreignData['foreign_field'] = null;
         $foreignData['foreign_display'] = null;
         $GLOBALS['cfg']['ForeignKeyMaxLimit'] = 1;
@@ -855,10 +855,10 @@ class InsertEditTest extends TestCase
      */
     public function testDispRowForeignDataWithHex()
     {
-        $column = array();
+        $column = [];
         $column['is_binary'] = true;
-        $foreignData = array();
-        $foreignData['disp_row'] = array();
+        $foreignData = [];
+        $foreignData['disp_row'] = [];
         $foreignData['foreign_field'] = null;
         $foreignData['foreign_display'] = null;
         $GLOBALS['cfg']['ForeignKeyMaxLimit'] = 1;
@@ -897,7 +897,7 @@ class InsertEditTest extends TestCase
         $GLOBALS['cfg']['CharTextareaCols'] = 1;
         $GLOBALS['cfg']['LimitChars'] = 20;
 
-        $column = array();
+        $column = [];
         $column['is_char'] = true;
         $column['Type'] = 'char(10)';
         $column['True_Type'] = 'char';
@@ -920,15 +920,15 @@ class InsertEditTest extends TestCase
      */
     public function testGetPmaTypeEnum()
     {
-        $extracted_columnspec = $column = array();
-        $extracted_columnspec['enum_set_values'] = array();
+        $extracted_columnspec = $column = [];
+        $extracted_columnspec['enum_set_values'] = [];
         $column['Type'] = 'abababababababababab';
-        $column['values'] = array(
-            array(
+        $column['values'] = [
+            [
                 'html' => 'foo',
                 'plain' => 'data'
-            )
-        );
+            ]
+        ];
         $result = $this->callProtectedMethod('getPmaTypeEnum', [
             $column, 'a', 'b', $extracted_columnspec, 'd', 2, 0, 1,
             'foobar', false
@@ -969,10 +969,10 @@ class InsertEditTest extends TestCase
      */
     public function testGetColumnEnumValues()
     {
-        $extracted_columnspec = $column = array();
-        $extracted_columnspec['enum_set_values'] = array(
+        $extracted_columnspec = $column = [];
+        $extracted_columnspec['enum_set_values'] = [
             '<abc>', '"foo"'
-        );
+        ];
 
         $column['values'] = 'abc';
 
@@ -980,10 +980,10 @@ class InsertEditTest extends TestCase
             $column, $extracted_columnspec
         ]);
         $this->assertEquals(
-            array(
-                array('plain' => '<abc>', 'html' => '&lt;abc&gt;'),
-                array('plain' => '"foo"', 'html' => '&quot;foo&quot;'),
-            ),
+            [
+                ['plain' => '<abc>', 'html' => '&lt;abc&gt;'],
+                ['plain' => '"foo"', 'html' => '&quot;foo&quot;'],
+            ],
             $result
         );
     }
@@ -995,19 +995,19 @@ class InsertEditTest extends TestCase
      */
     public function testGetDropDownDependingOnLength()
     {
-        $column_enum_values = array(
-            array(
+        $column_enum_values = [
+            [
                 'html' => 'foo',
                 'plain' => 'data'
-            ),
-            array(
+            ],
+            [
                 'html' => 'bar',
                 'plain' => ''
-            )
-        );
+            ]
+        ];
 
         $result = $this->callProtectedMethod('getDropDownDependingOnLength', [
-            array(), 'a', 'b', 2, 0, 1, 'data', $column_enum_values, false
+            [], 'a', 'b', 2, 0, 1, 'data', $column_enum_values, false
         ]);
 
         $this->assertContains(
@@ -1027,14 +1027,14 @@ class InsertEditTest extends TestCase
         );
 
         // case 2
-        $column_enum_values = array(
-            array(
+        $column_enum_values = [
+            [
                 'html' => 'foo',
                 'plain' => 'data'
-            )
-        );
+            ]
+        ];
 
-        $column = array();
+        $column = [];
         $column['Default'] = 'data';
         $column['Null'] = 'YES';
         $result = $this->callProtectedMethod('getDropDownDependingOnLength', [
@@ -1054,19 +1054,19 @@ class InsertEditTest extends TestCase
      */
     public function testGetRadioButtonDependingOnLength()
     {
-        $column_enum_values = array(
-            array(
+        $column_enum_values = [
+            [
                 'html' => 'foo',
                 'plain' => 'data'
-            ),
-            array(
+            ],
+            [
                 'html' => 'bar',
                 'plain' => ''
-            )
-        );
+            ]
+        ];
 
         $result = $this->callProtectedMethod('getRadioButtonDependingOnLength', [
-            'a', 'b', 2, array(), 0, 1, 'data', $column_enum_values, false
+            'a', 'b', 2, [], 0, 1, 'data', $column_enum_values, false
         ]);
 
         $this->assertContains(
@@ -1092,14 +1092,14 @@ class InsertEditTest extends TestCase
         );
 
         // case 2
-        $column_enum_values = array(
-            array(
+        $column_enum_values = [
+            [
                 'html' => 'foo',
                 'plain' => 'data'
-            )
-        );
+            ]
+        ];
 
-        $column = array();
+        $column = [];
         $column['Default'] = 'data';
         $column['Null'] = 'YES';
         $result = $this->callProtectedMethod('getRadioButtonDependingOnLength', [
@@ -1120,18 +1120,18 @@ class InsertEditTest extends TestCase
      */
     public function testGetPmaTypeSet()
     {
-        $column = array();
-        $column['values']  = array(
-            array(
+        $column = [];
+        $column['values']  = [
+            [
                 'html' => '&lt;',
                 'plain' => '<'
-            )
-        );
+            ]
+        ];
 
         $column['select_size'] = 1;
 
         $result = $this->callProtectedMethod('getPmaTypeSet', [
-            $column, array(), 'a', 'b', 'c', 2, 0, 1, 'data,<', false
+            $column, [], 'a', 'b', 'c', 2, 0, 1, 'data,<', false
         ]);
 
         $this->assertContains("a\n", $result);
@@ -1160,34 +1160,34 @@ class InsertEditTest extends TestCase
      */
     public function testGetColumnSetValueAndSelectSize()
     {
-        $extracted_columnspec = $column = array();
-        $extracted_columnspec['enum_set_values'] = array('a', '<');
+        $extracted_columnspec = $column = [];
+        $extracted_columnspec['enum_set_values'] = ['a', '<'];
         $result = $this->callProtectedMethod('getColumnSetValueAndSelectSize', [
-            array(), $extracted_columnspec
+            [], $extracted_columnspec
         ]);
 
         $this->assertEquals(
-            array(
-                array(
-                    array('plain' => 'a', 'html' => 'a'),
-                    array('plain' => '<', 'html' => '&lt;')
-                ),
+            [
+                [
+                    ['plain' => 'a', 'html' => 'a'],
+                    ['plain' => '<', 'html' => '&lt;']
+                ],
                 2
-            ),
+            ],
             $result
         );
 
-        $column['values'] = array(1, 2);
+        $column['values'] = [1, 2];
         $column['select_size'] = 3;
         $result = $this->callProtectedMethod('getColumnSetValueAndSelectSize', [
             $column, $extracted_columnspec
         ]);
 
         $this->assertEquals(
-            array(
-                array(1, 2),
+            [
+                [1, 2],
                 3
-            ),
+            ],
             $result
         );
     }
@@ -1201,7 +1201,7 @@ class InsertEditTest extends TestCase
     {
         $GLOBALS['cfg']['ProtectBinary'] = 'blob';
         $GLOBALS['cfg']['ShowFunctionFields'] = true;
-        $column = array();
+        $column = [];
         $column['is_blob'] = true;
         $column['Field_md5'] = '123';
         $column['pma_type'] = 'blob';
@@ -1338,7 +1338,7 @@ class InsertEditTest extends TestCase
     public function testGetHTMLinput()
     {
         $GLOBALS['cfg']['ShowFunctionFields'] = true;
-        $column = array();
+        $column = [];
         $column['pma_type'] = 'date';
         $column['True_Type'] = 'date';
         $result = $this->callProtectedMethod('getHtmlInput', [
@@ -1384,14 +1384,14 @@ class InsertEditTest extends TestCase
     public function testGetMaxUploadSize()
     {
         $GLOBALS['max_upload_size'] = 257;
-        $column = array();
+        $column = [];
         $column['pma_type'] = 'tinyblob';
         $result = $this->callProtectedMethod('getMaxUploadSize', [
             $column, 256
         ]);
 
         $this->assertEquals(
-            array("(Max: 256B)\n", 256),
+            ["(Max: 256B)\n", 256],
             $result
         );
 
@@ -1403,7 +1403,7 @@ class InsertEditTest extends TestCase
         ]);
 
         $this->assertEquals(
-            array("(Max: 250B)\n", 250),
+            ["(Max: 250B)\n", 250],
             $result
         );
     }
@@ -1415,7 +1415,7 @@ class InsertEditTest extends TestCase
      */
     public function testGetValueColumnForOtherDatatypes()
     {
-        $column = array();
+        $column = [];
         $column['len'] = 20;
         $column['is_char'] = true;
         $column['Type'] = 'char(25)';
@@ -1430,7 +1430,7 @@ class InsertEditTest extends TestCase
         $GLOBALS['cfg']['LimitChars'] = 50;
         $GLOBALS['cfg']['ShowFunctionFields'] = true;
 
-        $extracted_columnspec = array();
+        $extracted_columnspec = [];
         $extracted_columnspec['spec_in_brackets'] = 25;
         $result = $this->callProtectedMethod('getValueColumnForOtherDatatypes', [
             $column, 'defchar', 'a', 'b', 'c', 22, '&lt;', 12, 1, "/", "&lt;",
@@ -1485,7 +1485,7 @@ class InsertEditTest extends TestCase
      */
     public function testGetColumnSize()
     {
-        $column = $extracted_columnspec = array();
+        $column = $extracted_columnspec = [];
         $column['is_char'] = true;
         $extracted_columnspec['spec_in_brackets'] = 45;
         $GLOBALS['cfg']['MinSizeForInputField'] = 30;
@@ -1538,7 +1538,7 @@ class InsertEditTest extends TestCase
      */
     public function testGetContinueInsertionForm()
     {
-        $where_clause_array = array("a<b");
+        $where_clause_array = ["a<b"];
         $GLOBALS['cfg']['InsertRows'] = 1;
         $GLOBALS['cfg']['ServerDefault'] = 1;
         $GLOBALS['goto'] = "index.php";
@@ -1621,7 +1621,7 @@ class InsertEditTest extends TestCase
     public function testGetSubmitTypeDropDown()
     {
         $result = $this->callProtectedMethod('getSubmitTypeDropDown', [
-            array(), 2, 2
+            [], 2, 2
         ]);
 
         $this->assertContains(
@@ -1703,7 +1703,7 @@ class InsertEditTest extends TestCase
         $GLOBALS['cfg']['ShowFieldTypesInDataEditView'] = true;
         $GLOBALS['cfg']['ShowFunctionFields'] = true;
         $GLOBALS['cfg']['ServerDefault'] = 1;
-        $url_params = array('ShowFunctionFields' => 2);
+        $url_params = ['ShowFunctionFields' => 2];
 
         $result = $this->callProtectedMethod('getHeadAndFootOfInsertRowTable', [
             $url_params
@@ -1727,7 +1727,7 @@ class InsertEditTest extends TestCase
      */
     public function testGetSpecialCharsAndBackupFieldForExistingRow()
     {
-        $column = $current_row = $extracted_columnspec = array();
+        $column = $current_row = $extracted_columnspec = [];
         $column['Field'] = 'f';
         $current_row['f'] = null;
         $_REQUEST['default_action'] = 'insert';
@@ -1735,17 +1735,17 @@ class InsertEditTest extends TestCase
         $column['Extra'] = 'fooauto_increment';
 
         $result = $this->callProtectedMethod('getSpecialCharsAndBackupFieldForExistingRow', [
-            $current_row, $column, array(), false, array(), 'a', false
+            $current_row, $column, [], false, [], 'a', false
         ]);
 
         $this->assertEquals(
-            array(
+            [
                 true,
                 null,
                 null,
                 null,
                 '<input type="hidden" name="fields_preva" value="" />'
-            ),
+            ],
             $result
         );
 
@@ -1757,33 +1757,33 @@ class InsertEditTest extends TestCase
         $column['True_Type'] = 'bit';
 
         $result = $this->callProtectedMethod('getSpecialCharsAndBackupFieldForExistingRow', [
-            $current_row, $column, $extracted_columnspec, false, array(), 'a', false
+            $current_row, $column, $extracted_columnspec, false, [], 'a', false
         ]);
 
         $this->assertEquals(
-            array(
+            [
                 false,
                 "",
                 "00000000000001111011",
                 null,
                 '<input type="hidden" name="fields_preva" value="123" />'
-            ),
+            ],
             $result
         );
 
         $current_row['f'] = "abcd";
         $result = $this->callProtectedMethod('getSpecialCharsAndBackupFieldForExistingRow', [
-            $current_row, $column, $extracted_columnspec, false, array(), 'a', true
+            $current_row, $column, $extracted_columnspec, false, [], 'a', true
         ]);
 
         $this->assertEquals(
-            array(
+            [
                 false,
                 "",
                 "abcd",
                 null,
                 '<input type="hidden" name="fields_preva" value="abcd" />'
-            ),
+            ],
             $result
         );
 
@@ -1801,17 +1801,17 @@ class InsertEditTest extends TestCase
 
         $result = $this->callProtectedMethod('getSpecialCharsAndBackupFieldForExistingRow', [
             $current_row, $column, $extracted_columnspec,
-            false, array('int'), 'a', false
+            false, ['int'], 'a', false
         ]);
 
         $this->assertEquals(
-            array(
+            [
                 false,
                 "",
                 "'',",
                 null,
                 '<input type="hidden" name="fields_preva" value="\'\'," />'
-            ),
+            ],
             $result
         );
 
@@ -1826,17 +1826,17 @@ class InsertEditTest extends TestCase
 
         $result = $this->callProtectedMethod('getSpecialCharsAndBackupFieldForExistingRow', [
             $current_row, $column, $extracted_columnspec,
-            false, array('int'), 'a', false
+            false, ['int'], 'a', false
         ]);
 
         $this->assertEquals(
-            array(
+            [
                 false,
                 "3131303031",
                 "3131303031",
                 "3131303031",
                 '<input type="hidden" name="fields_preva" value="3131303031" />'
-            ),
+            ],
             $result
         );
 
@@ -1845,17 +1845,17 @@ class InsertEditTest extends TestCase
 
         $result = $this->callProtectedMethod('getSpecialCharsAndBackupFieldForExistingRow', [
             $current_row, $column, $extracted_columnspec,
-            false, array('int'), 'a', false
+            false, ['int'], 'a', false
         ]);
 
         $this->assertEquals(
-            array(
+            [
                 false,
                 "313130303100",
                 "313130303100",
                 "313130303100",
                 '<input type="hidden" name="fields_preva" value="313130303100" />'
-            ),
+            ],
             $result
         );
     }
@@ -1867,7 +1867,7 @@ class InsertEditTest extends TestCase
      */
     public function testGetSpecialCharsAndBackupFieldForInsertingMode()
     {
-        $column = array();
+        $column = [];
         $column['True_Type'] = 'bit';
         $column['Default'] = b'101';
         $column['is_binary'] = true;
@@ -1879,13 +1879,13 @@ class InsertEditTest extends TestCase
         ]);
 
         $this->assertEquals(
-            array(
+            [
                 false,
                 '101',
                 '101',
                 '',
                 '101'
-            ),
+            ],
             $result
         );
 
@@ -1898,13 +1898,13 @@ class InsertEditTest extends TestCase
         ]);
 
         $this->assertEquals(
-            array(
+            [
                 true,
                 '',
                 '',
                 '',
                 ''
-            ),
+            ],
             $result
         );
     }
@@ -1922,27 +1922,27 @@ class InsertEditTest extends TestCase
         $result = $this->insertEdit->getParamsForUpdateOrInsert();
 
         $this->assertEquals(
-            array(
-                array('LIMIT 1'),
+            [
+                ['LIMIT 1'],
                 true,
                 true,
                 false
-            ),
+            ],
             $result
         );
 
         // case 2 (else)
         unset($_REQUEST['where_clause']);
-        $_REQUEST['fields']['multi_edit'] = array('a' => 'b', 'c' => 'd');
+        $_REQUEST['fields']['multi_edit'] = ['a' => 'b', 'c' => 'd'];
         $result = $this->insertEdit->getParamsForUpdateOrInsert();
 
         $this->assertEquals(
-            array(
-                array('a', 'c'),
+            [
+                ['a', 'c'],
                 false,
                 true,
                 false
-            ),
+            ],
             $result
         );
     }
@@ -1959,7 +1959,7 @@ class InsertEditTest extends TestCase
 
         $scriptsMock = $this->getMockBuilder('PhpMyAdmin\Scripts')
             ->disableOriginalConstructor()
-            ->setMethods(array('addFile'))
+            ->setMethods(['addFile'])
             ->getMock();
 
         $scriptsMock->expects($this->exactly(2))
@@ -1967,7 +1967,7 @@ class InsertEditTest extends TestCase
 
         $headerMock = $this->getMockBuilder('PhpMyAdmin\Header')
             ->disableOriginalConstructor()
-            ->setMethods(array('getScripts'))
+            ->setMethods(['getScripts'])
             ->getMock();
 
         $headerMock->expects($this->once())
@@ -1976,7 +1976,7 @@ class InsertEditTest extends TestCase
 
         $responseMock = $this->getMockBuilder('PhpMyAdmin\Response')
             ->disableOriginalConstructor()
-            ->setMethods(array('getHeader'))
+            ->setMethods(['getHeader'])
             ->getMock();
 
         $responseMock->expects($this->once())
@@ -2007,9 +2007,9 @@ class InsertEditTest extends TestCase
         $temp->table = 'table';
         $temp->type = 'real';
         $temp->primary_key = 1;
-        $meta_arr = array($temp);
+        $meta_arr = [$temp];
 
-        $row = array('1' => 1);
+        $row = ['1' => 1];
         $res = 'foobar';
 
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
@@ -2093,13 +2093,13 @@ class InsertEditTest extends TestCase
         $GLOBALS['cfg']['ServerDefault'] = 1;
         $this->assertEquals(
             'tbl_change.php?lang=en',
-            $this->insertEdit->getErrorUrl(array())
+            $this->insertEdit->getErrorUrl([])
         );
 
         $_REQUEST['err_url'] = 'localhost';
         $this->assertEquals(
             'localhost',
-            $this->insertEdit->getErrorUrl(array())
+            $this->insertEdit->getErrorUrl([])
         );
     }
 
@@ -2112,16 +2112,16 @@ class InsertEditTest extends TestCase
     {
         $GLOBALS['db'] = 'db';
         $GLOBALS['table'] = 'table';
-        $query_fields = array('a', 'b');
-        $value_sets = array(1, 2);
+        $query_fields = ['a', 'b'];
+        $value_sets = [1, 2];
 
         $this->assertEquals(
-            array('INSERT IGNORE INTO `table` (a, b) VALUES (1), (2)'),
+            ['INSERT IGNORE INTO `table` (a, b) VALUES (1), (2)'],
             $this->insertEdit->buildSqlQuery(true, $query_fields, $value_sets)
         );
 
         $this->assertEquals(
-            array('INSERT INTO `table` (a, b) VALUES (1), (2)'),
+            ['INSERT INTO `table` (a, b) VALUES (1), (2)'],
             $this->insertEdit->buildSqlQuery(false, $query_fields, $value_sets)
         );
     }
@@ -2133,7 +2133,7 @@ class InsertEditTest extends TestCase
      */
     public function testExecuteSqlQuery()
     {
-        $query = array('SELECT 1', 'SELECT 2');
+        $query = ['SELECT 1', 'SELECT 2'];
         $GLOBALS['sql_query'] = 'SELECT';
         $GLOBALS['cfg']['IgnoreMultiSubmitErrors'] = false;
         $_REQUEST['submit_type'] = '';
@@ -2166,15 +2166,15 @@ class InsertEditTest extends TestCase
 
         $dbi->expects($this->exactly(2))
             ->method('getWarnings')
-            ->will($this->returnValue(array()));
+            ->will($this->returnValue([]));
 
         $GLOBALS['dbi'] = $dbi;
         $this->insertEdit = new InsertEdit($GLOBALS['dbi']);
 
-        $result = $this->insertEdit->executeSqlQuery(array(), $query);
+        $result = $this->insertEdit->executeSqlQuery([], $query);
 
         $this->assertEquals(
-            array('sql_query' => 'SELECT'),
+            ['sql_query' => 'SELECT'],
             $result[0]
         );
 
@@ -2193,17 +2193,17 @@ class InsertEditTest extends TestCase
         $reflectionMsg->setAccessible(true);
 
         $this->assertEquals(
-            array(2),
+            [2],
             $reflectionMsg->getValue($msg)
         );
 
         $this->assertEquals(
-            array(),
+            [],
             $result[3]
         );
 
         $this->assertEquals(
-            array('err'),
+            ['err'],
             $result[4]
         );
 
@@ -2220,7 +2220,7 @@ class InsertEditTest extends TestCase
      */
     public function testExecuteSqlQueryWithTryQuery()
     {
-        $query = array('SELECT 1', 'SELECT 2');
+        $query = ['SELECT 1', 'SELECT 2'];
         $GLOBALS['sql_query'] = 'SELECT';
         $GLOBALS['cfg']['IgnoreMultiSubmitErrors'] = true;
         $_REQUEST['submit_type'] = '';
@@ -2253,15 +2253,15 @@ class InsertEditTest extends TestCase
 
         $dbi->expects($this->exactly(2))
             ->method('getWarnings')
-            ->will($this->returnValue(array()));
+            ->will($this->returnValue([]));
 
         $GLOBALS['dbi'] = $dbi;
         $this->insertEdit = new InsertEdit($GLOBALS['dbi']);
 
-        $result = $this->insertEdit->executeSqlQuery(array(), $query);
+        $result = $this->insertEdit->executeSqlQuery([], $query);
 
         $this->assertEquals(
-            array('sql_query' => 'SELECT'),
+            ['sql_query' => 'SELECT'],
             $result[0]
         );
 
@@ -2280,17 +2280,17 @@ class InsertEditTest extends TestCase
         $reflectionMsg->setAccessible(true);
 
         $this->assertEquals(
-            array(2),
+            [2],
             $reflectionMsg->getValue($msg)
         );
 
         $this->assertEquals(
-            array(),
+            [],
             $result[3]
         );
 
         $this->assertEquals(
-            array('err'),
+            ['err'],
             $result[4]
         );
 
@@ -2307,10 +2307,10 @@ class InsertEditTest extends TestCase
      */
     public function testGetWarningMessages()
     {
-        $warnings = array(
-            array('Level' => 1, 'Code' => 42, 'Message' => 'msg1'),
-            array('Level' => 2, 'Code' => 43, 'Message' => 'msg2'),
-        );
+        $warnings = [
+            ['Level' => 1, 'Code' => 42, 'Message' => 'msg1'],
+            ['Level' => 2, 'Code' => 43, 'Message' => 'msg2'],
+        ];
 
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
             ->disableOriginalConstructor()
@@ -2326,10 +2326,10 @@ class InsertEditTest extends TestCase
         $result = $this->callProtectedMethod('getWarningMessages');
 
         $this->assertEquals(
-            array(
+            [
                 "1: #42 msg1",
                 "2: #43 msg2"
-            ),
+            ],
             $result
         );
     }
@@ -2341,7 +2341,7 @@ class InsertEditTest extends TestCase
      */
     public function testGetDisplayValueForForeignTableColumn()
     {
-        $map = array();
+        $map = [];
         $map['f']['foreign_db'] = 'information_schema';
         $map['f']['foreign_table'] = 'TABLES';
         $map['f']['foreign_field'] = 'f';
@@ -2368,7 +2368,7 @@ class InsertEditTest extends TestCase
         $dbi->expects($this->once())
             ->method('fetchRow')
             ->with('r1', 0)
-            ->will($this->returnValue(array('2')));
+            ->will($this->returnValue(['2']));
 
         $GLOBALS['dbi'] = $dbi;
         $this->insertEdit = new InsertEdit($GLOBALS['dbi']);
@@ -2387,7 +2387,7 @@ class InsertEditTest extends TestCase
     {
         $GLOBALS['cfg']['ServerDefault'] = 1;
         $_SESSION['tmpval']['relational_display'] = 'K';
-        $map = array();
+        $map = [];
         $map['f']['foreign_db'] = 'information_schema';
         $map['f']['foreign_table'] = 'TABLES';
         $map['f']['foreign_field'] = 'f';
@@ -2419,23 +2419,23 @@ class InsertEditTest extends TestCase
      */
     public function testTransformEditedValues()
     {
-        $edited_values = array(
-            array('c' => 'cname')
-        );
+        $edited_values = [
+            ['c' => 'cname']
+        ];
         $GLOBALS['cfg']['DefaultTransformations']['PreApPend'] = ['', ''];
         $GLOBALS['cfg']['ServerDefault'] = 1;
         $_REQUEST['where_clause'] = 1;
-        $transformation = array(
+        $transformation = [
             'transformation_options' => "'','option ,, quoted',abd"
-        );
+        ];
         $result = $this->insertEdit->transformEditedValues(
             'db', 'table', $transformation, $edited_values,
-            'Text_Plain_PreApPend.php', 'c', array('a' => 'b'),
+            'Text_Plain_PreApPend.php', 'c', ['a' => 'b'],
             'transformation'
         );
 
         $this->assertEquals(
-            array('a' => 'b', 'transformations' => array("cnameoption ,, quoted")),
+            ['a' => 'b', 'transformations' => ["cnameoption ,, quoted"]],
             $result
         );
     }
@@ -2447,57 +2447,57 @@ class InsertEditTest extends TestCase
      */
     public function testGetQueryValuesForInsertAndUpdateInMultipleEdit()
     {
-        $multi_edit_columns_name = array('0' => 'fld');
+        $multi_edit_columns_name = ['0' => 'fld'];
 
         $result = $this->insertEdit->getQueryValuesForInsertAndUpdateInMultipleEdit(
-            $multi_edit_columns_name, array(), '', array(), array(), true, array(1),
-            array(2), 'foo', array(), '0', array()
+            $multi_edit_columns_name, [], '', [], [], true, [1],
+            [2], 'foo', [], '0', []
         );
 
         $this->assertEquals(
-            array(
-                array(1, 'foo'),
-                array(2, '`fld`')
-            ),
+            [
+                [1, 'foo'],
+                [2, '`fld`']
+            ],
             $result
         );
 
         $result = $this->insertEdit->getQueryValuesForInsertAndUpdateInMultipleEdit(
-            $multi_edit_columns_name, array(), '', array(), array(), false, array(1),
-            array(2), 'foo', array(), '0', array('a')
+            $multi_edit_columns_name, [], '', [], [], false, [1],
+            [2], 'foo', [], '0', ['a']
         );
 
         $this->assertEquals(
-            array(
-                array(1, '`fld` = foo'),
-                array(2)
-            ),
+            [
+                [1, '`fld` = foo'],
+                [2]
+            ],
             $result
         );
 
         $result = $this->insertEdit->getQueryValuesForInsertAndUpdateInMultipleEdit(
-            $multi_edit_columns_name, array('b'), "'`c`'", array('c'), array(),
-            false, array(1), array(2), 'foo', array(), '0', array('a')
+            $multi_edit_columns_name, ['b'], "'`c`'", ['c'], [],
+            false, [1], [2], 'foo', [], '0', ['a']
         );
 
         $this->assertEquals(
-            array(
-                array(1),
-                array(2)
-            ),
+            [
+                [1],
+                [2]
+            ],
             $result
         );
 
         $result = $this->insertEdit->getQueryValuesForInsertAndUpdateInMultipleEdit(
-            $multi_edit_columns_name, array('b'), "'`c`'", array('c'), array(3),
-            false, array(1), array(2), 'foo', array(), 0, array()
+            $multi_edit_columns_name, ['b'], "'`c`'", ['c'], [3],
+            false, [1], [2], 'foo', [], 0, []
         );
 
         $this->assertEquals(
-            array(
-                array(1, '`fld` = foo'),
-                array(2)
-            ),
+            [
+                [1, '`fld` = foo'],
+                [2]
+            ],
             $result
         );
     }
@@ -2510,14 +2510,14 @@ class InsertEditTest extends TestCase
     public function testGetCurrentValueAsAnArrayForMultipleEdit()
     {
         $result = $this->insertEdit->getCurrentValueAsAnArrayForMultipleEdit(
-            array(), array(), array(), 'currVal', array(),
-            array(), array(), '0'
+            [], [], [], 'currVal', [],
+            [], [], '0'
         );
 
         $this->assertEquals('currVal', $result);
 
         // case 2
-        $multi_edit_funcs = array('UUID');
+        $multi_edit_funcs = ['UUID'];
 
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
             ->disableOriginalConstructor()
@@ -2532,34 +2532,34 @@ class InsertEditTest extends TestCase
         $this->insertEdit = new InsertEdit($GLOBALS['dbi']);
 
         $result = $this->insertEdit->getCurrentValueAsAnArrayForMultipleEdit(
-            $multi_edit_funcs, array(), array(), 'currVal', array(),
-            array(), array(), '0'
+            $multi_edit_funcs, [], [], 'currVal', [],
+            [], [], '0'
         );
 
         $this->assertEquals("'uuid1234'", $result);
 
         // case 3
-        $multi_edit_funcs = array('AES_ENCRYPT');
-        $multi_edit_salt = array("");
+        $multi_edit_funcs = ['AES_ENCRYPT'];
+        $multi_edit_salt = [""];
         $result = $this->insertEdit->getCurrentValueAsAnArrayForMultipleEdit(
-            $multi_edit_funcs, $multi_edit_salt, array(), "'''", array(),
-            array('func'), array('func'), '0'
+            $multi_edit_funcs, $multi_edit_salt, [], "'''", [],
+            ['func'], ['func'], '0'
         );
         $this->assertEquals("AES_ENCRYPT(''','')", $result);
 
         // case 4
-        $multi_edit_funcs = array('func');
-        $multi_edit_salt = array();
+        $multi_edit_funcs = ['func'];
+        $multi_edit_salt = [];
         $result = $this->insertEdit->getCurrentValueAsAnArrayForMultipleEdit(
-            $multi_edit_funcs, $multi_edit_salt, array(), "'''", array(),
-            array('func'), array('func'), '0'
+            $multi_edit_funcs, $multi_edit_salt, [], "'''", [],
+            ['func'], ['func'], '0'
         );
         $this->assertEquals("func(''')", $result);
 
         // case 5
         $result = $this->insertEdit->getCurrentValueAsAnArrayForMultipleEdit(
-            $multi_edit_funcs, $multi_edit_salt, array(), "''", array(),
-            array('func'), array('func'), '0'
+            $multi_edit_funcs, $multi_edit_salt, [], "''", [],
+            ['func'], ['func'], '0'
         );
         $this->assertEquals("func()", $result);
     }
@@ -2571,7 +2571,7 @@ class InsertEditTest extends TestCase
      */
     public function testGetCurrentValueForDifferentTypes()
     {
-        $prow = array();
+        $prow = [];
         $prow['a'] = b'101';
 
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
@@ -2593,8 +2593,8 @@ class InsertEditTest extends TestCase
         $this->insertEdit = new InsertEdit($GLOBALS['dbi']);
 
         $result = $this->insertEdit->getCurrentValueForDifferentTypes(
-            '123', '0', array(), '', array(), 0, array(), array(),
-            array(), true, true, '1', 'table', array()
+            '123', '0', [], '', [], 0, [], [],
+            [], true, true, '1', 'table', []
         );
 
         $this->assertEquals(
@@ -2604,8 +2604,8 @@ class InsertEditTest extends TestCase
 
         // case 2
         $result = $this->insertEdit->getCurrentValueForDifferentTypes(
-            false, '0', array('test'), '', array(1), 0, array(), array(),
-            array(), true, true, '1', 'table', array()
+            false, '0', ['test'], '', [1], 0, [], [],
+            [], true, true, '1', 'table', []
         );
 
         $this->assertEquals(
@@ -2615,8 +2615,8 @@ class InsertEditTest extends TestCase
 
         // case 3
         $result = $this->insertEdit->getCurrentValueForDifferentTypes(
-            false, '0', array('test'), '', array(), 0, array(), array(),
-            array(), true, true, '1', 'table', array()
+            false, '0', ['test'], '', [], 0, [], [],
+            [], true, true, '1', 'table', []
         );
 
         $this->assertEquals(
@@ -2625,10 +2625,10 @@ class InsertEditTest extends TestCase
         );
 
         // case 4
-        $_REQUEST['fields']['multi_edit'][0][0] = array();
+        $_REQUEST['fields']['multi_edit'][0][0] = [];
         $result = $this->insertEdit->getCurrentValueForDifferentTypes(
-            false, '0', array('set'), '', array(), 0, array(), array(),
-            array(), true, true, '1', 'table', array()
+            false, '0', ['set'], '', [], 0, [], [],
+            [], true, true, '1', 'table', []
         );
 
         $this->assertEquals(
@@ -2638,8 +2638,8 @@ class InsertEditTest extends TestCase
 
         // case 5
         $result = $this->insertEdit->getCurrentValueForDifferentTypes(
-            false, '0', array('protected'), '', array(), 0, array('a'), array(),
-            array(), true, true, '1', 'table', array()
+            false, '0', ['protected'], '', [], 0, ['a'], [],
+            [], true, true, '1', 'table', []
         );
 
         $this->assertEquals(
@@ -2649,8 +2649,8 @@ class InsertEditTest extends TestCase
 
         // case 6
         $result = $this->insertEdit->getCurrentValueForDifferentTypes(
-            false, '0', array('protected'), '', array(), 0, array('a'), array(),
-            array(), true, true, '1', 'table', array()
+            false, '0', ['protected'], '', [], 0, ['a'], [],
+            [], true, true, '1', 'table', []
         );
 
         $this->assertEquals(
@@ -2660,8 +2660,8 @@ class InsertEditTest extends TestCase
 
         // case 7
         $result = $this->insertEdit->getCurrentValueForDifferentTypes(
-            false, '0', array('bit'), '20\'12', array(), 0, array('a'), array(),
-            array(), true, true, '1', 'table', array()
+            false, '0', ['bit'], '20\'12', [], 0, ['a'], [],
+            [], true, true, '1', 'table', []
         );
 
         $this->assertEquals(
@@ -2671,8 +2671,8 @@ class InsertEditTest extends TestCase
 
         // case 7
         $result = $this->insertEdit->getCurrentValueForDifferentTypes(
-            false, '0', array('date'), '20\'12', array(), 0, array('a'), array(),
-            array(), true, true, '1', 'table', array()
+            false, '0', ['date'], '20\'12', [], 0, ['a'], [],
+            [], true, true, '1', 'table', []
         );
 
         $this->assertEquals(
@@ -2681,10 +2681,10 @@ class InsertEditTest extends TestCase
         );
 
         // case 8
-        $_REQUEST['fields']['multi_edit'][0][0] = array();
+        $_REQUEST['fields']['multi_edit'][0][0] = [];
         $result = $this->insertEdit->getCurrentValueForDifferentTypes(
-            false, '0', array('set'), '', array(), 0, array(), array(1),
-            array(), true, true, '1', 'table', array()
+            false, '0', ['set'], '', [], 0, [], [1],
+            [], true, true, '1', 'table', []
         );
 
         $this->assertEquals(
@@ -2694,8 +2694,8 @@ class InsertEditTest extends TestCase
 
         // case 9
         $result = $this->insertEdit->getCurrentValueForDifferentTypes(
-            false, '0', array('protected'), '', array(), 0, array('a'), array(),
-            array(1), true, true, '1', 'table', array()
+            false, '0', ['protected'], '', [], 0, ['a'], [],
+            [1], true, true, '1', 'table', []
         );
 
         $this->assertEquals(
@@ -2711,7 +2711,7 @@ class InsertEditTest extends TestCase
      */
     public function testVerifyWhetherValueCanBeTruncatedAndAppendExtraData()
     {
-        $extra_data = array('isNeedToRecheck' => true);
+        $extra_data = ['isNeedToRecheck' => true];
         $meta = new stdClass();
         $_REQUEST['where_clause'][0] = 1;
 
@@ -2726,7 +2726,7 @@ class InsertEditTest extends TestCase
         $meta->type = 'int';
         $dbi->expects($this->at(1))
             ->method('getFieldsMeta')
-            ->will($this->returnValue(array($meta)));
+            ->will($this->returnValue([$meta]));
 
         $dbi->expects($this->at(2))
             ->method('fetchRow')
@@ -2742,11 +2742,11 @@ class InsertEditTest extends TestCase
         $meta->type = 'int';
         $dbi->expects($this->at(5))
             ->method('getFieldsMeta')
-            ->will($this->returnValue(array($meta)));
+            ->will($this->returnValue([$meta]));
 
         $dbi->expects($this->at(6))
             ->method('fetchRow')
-            ->will($this->returnValue(array(0 => '123')));
+            ->will($this->returnValue([0 => '123']));
 
         $dbi->expects($this->at(7))
             ->method('freeResult');
@@ -2758,11 +2758,11 @@ class InsertEditTest extends TestCase
         $meta->type = 'timestamp';
         $dbi->expects($this->at(9))
             ->method('getFieldsMeta')
-            ->will($this->returnValue(array($meta)));
+            ->will($this->returnValue([$meta]));
 
         $dbi->expects($this->at(10))
             ->method('fetchRow')
-            ->will($this->returnValue(array(0 => '2013-08-28 06:34:14')));
+            ->will($this->returnValue([0 => '2013-08-28 06:34:14']));
 
         $dbi->expects($this->at(11))
             ->method('freeResult');
@@ -2811,7 +2811,7 @@ class InsertEditTest extends TestCase
         $dbi->expects($this->at(1))
             ->method('getColumns')
             ->with('db', 'table')
-            ->will($this->returnValue(array('a' => 'b', 'c' => 'd')));
+            ->will($this->returnValue(['a' => 'b', 'c' => 'd']));
 
         $GLOBALS['dbi'] = $dbi;
         $this->insertEdit = new InsertEdit($GLOBALS['dbi']);
@@ -2819,7 +2819,7 @@ class InsertEditTest extends TestCase
         $result = $this->insertEdit->getTableColumns('db', 'table');
 
         $this->assertEquals(
-            array('b', 'd'),
+            ['b', 'd'],
             $result
         );
     }
@@ -2847,7 +2847,7 @@ class InsertEditTest extends TestCase
 
         $responseMock = $this->getMockBuilder('PhpMyAdmin\Response')
             ->disableOriginalConstructor()
-            ->setMethods(array('addHtml'))
+            ->setMethods(['addHtml'])
             ->getMock();
 
         $restoreInstance = Response::getInstance();
@@ -2860,16 +2860,16 @@ class InsertEditTest extends TestCase
         $result = $this->insertEdit->determineInsertOrEdit('1', 'db', 'table');
 
         $this->assertEquals(
-            array(
+            [
                 false,
                 null,
-                array(1),
+                [1],
                 null,
-                array(null),
-                array(null),
+                [null],
+                [null],
                 false,
                 "edit_next"
-            ),
+            ],
             $result
         );
 
@@ -2883,16 +2883,16 @@ class InsertEditTest extends TestCase
         $response->setValue($restoreInstance);
 
         $this->assertEquals(
-            array(
+            [
                 true,
                 null,
-                array(),
+                [],
                 null,
                 null,
-                array(false, false),
+                [false, false],
                 false,
                 "edit_next"
-            ),
+            ],
             $result
         );
     }
@@ -2915,7 +2915,7 @@ class InsertEditTest extends TestCase
             ->with('db', 'table', null, true)
             ->will(
                 $this->returnValue(
-                    array(array('Comment' => 'b', 'Field' => 'd'))
+                    [['Comment' => 'b', 'Field' => 'd']]
                 )
             );
 
@@ -2931,14 +2931,14 @@ class InsertEditTest extends TestCase
         $this->insertEdit = new InsertEdit($GLOBALS['dbi']);
 
         $this->assertEquals(
-            array(),
+            [],
             $this->insertEdit->getCommentsMap('db', 'table')
         );
 
         $GLOBALS['cfg']['ShowPropertyComments'] = true;
 
         $this->assertEquals(
-            array('d' => 'b'),
+            ['d' => 'b'],
             $this->insertEdit->getCommentsMap('db', 'table')
         );
     }
@@ -2954,11 +2954,11 @@ class InsertEditTest extends TestCase
         $GLOBALS['goto'] = 'tbl_change.php';
 
         $this->assertEquals(
-            array(
+            [
                 'db' => 'foo',
                 'sql_query' => 'SELECT',
                 'table' => 'bar'
-            ),
+            ],
             $this->insertEdit->getUrlParameters('foo', 'bar')
         );
     }
@@ -2994,28 +2994,28 @@ class InsertEditTest extends TestCase
     {
         $o_rows = 0;
         $tabindex = 0;
-        $GLOBALS['plugin_scripts'] = array();
-        $table_columns = array(
-            array(
+        $GLOBALS['plugin_scripts'] = [];
+        $table_columns = [
+            [
                 'Field' => 'col',
                 'Type' => 'varchar(20)',
                 'Null' => 'Yes',
                 'Privileges' => 'insert,update,select'
-            )
-        );
-        $repopulate = array(
+            ]
+        ];
+        $repopulate = [
             md5('col') => 'val'
-        );
-        $column_mime = array(
+        ];
+        $column_mime = [
             'input_transformation' => 'Input/Image_JPEG_Upload.php',
             'input_transformation_options' => '150'
-        );
+        ];
 
         // Test w/ input transformation
         $actual = $this->callProtectedMethod('getHtmlForInsertEditFormColumn', [
-            $table_columns, 0, array(), false, array(), '', '',
-            '', false, array(), &$o_rows, &$tabindex, 0, false, 0,
-            array(), 0, 0, 'table', 'db', 0, array(), 0, '', '',
+            $table_columns, 0, [], false, [], '', '',
+            '', false, [], &$o_rows, &$tabindex, 0, false, 0,
+            [], 0, 0, 'table', 'db', 0, [], 0, '', '',
             $repopulate, $column_mime, ''
         ]);
 
@@ -3054,8 +3054,8 @@ class InsertEditTest extends TestCase
         );
 
         // Test w/o input_transformation
-        $table_columns = array(
-            array(
+        $table_columns = [
+            [
                 'Field' => 'qwerty',
                 'Type' => 'datetime',
                 'Null' => 'Yes',
@@ -3063,16 +3063,16 @@ class InsertEditTest extends TestCase
                 'Extra' => '',
                 'Default' => null,
                 'Privileges' => 'insert,update,select'
-            )
-        );
-        $repopulate = array(
+            ]
+        ];
+        $repopulate = [
             md5('qwerty') => '12-10-14'
-        );
+        ];
         $actual = $this->callProtectedMethod('getHtmlForInsertEditFormColumn', [
-            $table_columns, 0, array(), false, array(), '', '',
-            '', true, array(), &$o_rows, &$tabindex, 0, false, 0,
-            array(), 0, 0, 'table', 'db', 0, array(), 0, '', '',
-            $repopulate, array(), ''
+            $table_columns, 0, [], false, [], '', '',
+            '', true, [], &$o_rows, &$tabindex, 0, false, 0,
+            [], 0, 0, 'table', 'db', 0, [], 0, '', '',
+            $repopulate, [], ''
         ]);
         $this->assertContains(
             'qwerty',
@@ -3103,24 +3103,24 @@ class InsertEditTest extends TestCase
     {
         $o_rows = 0;
         $tabindex = 0;
-        $GLOBALS['plugin_scripts'] = array();
+        $GLOBALS['plugin_scripts'] = [];
         $GLOBALS['cfg']['LongtextDoubleTextarea'] = true;
         $GLOBALS['cfg']['CharEditing'] = true;
-        $table_columns = array(
-            array(
+        $table_columns = [
+            [
                 'Field' => 'test',
                 'Type' => 'longtext',
                 'Null' => 'Yes',
                 'pma_type' => 'longtext',
                 'True_Type' => 'longtext',
                 'Privileges' => 'select,insert,update,references',
-            )
-        );
+            ]
+        ];
         $actual = $this->insertEdit->getHtmlForInsertEditRow(
-            array(), $table_columns, array(), false, array(), '', '',
-            '', false, array(), $o_rows, $tabindex, 1, false, 0,
-            array(), 0, 0, 'table', 'db', 0, array(), 0, '',
-            array(), array('wc')
+            [], $table_columns, [], false, [], '', '',
+            '', false, [], $o_rows, $tabindex, 1, false, 0,
+            [], 0, 0, 'table', 'db', 0, [], 0, '',
+            [], ['wc']
         );
         $this->assertContains(
             'test',
@@ -3157,34 +3157,34 @@ class InsertEditTest extends TestCase
     {
         $o_rows = 0;
         $tabindex = 0;
-        $GLOBALS['plugin_scripts'] = array();
+        $GLOBALS['plugin_scripts'] = [];
         $GLOBALS['cfg']['LongtextDoubleTextarea'] = true;
         $GLOBALS['cfg']['CharEditing'] = true;
 
         // edit
-        $table_columns = array(
-            array(
+        $table_columns = [
+            [
                 'Field' => 'foo',
                 'Type' => 'longtext',
                 'Null' => 'Yes',
                 'pma_type' => 'longtext',
                 'True_Type' => 'longtext',
                 'Privileges' => 'select,insert,update,references',
-            ),
-            array(
+            ],
+            [
                 'Field' => 'bar',
                 'Type' => 'longtext',
                 'Null' => 'Yes',
                 'pma_type' => 'longtext',
                 'True_Type' => 'longtext',
                 'Privileges' => 'select,insert,references',
-            )
-        );
+            ]
+        ];
         $actual = $this->insertEdit->getHtmlForInsertEditRow(
-            array(), $table_columns, array(), false, array(), '', '',
-            '', false, array(), $o_rows, $tabindex, 1, false, 0,
-            array(), 0, 0, 'table', 'db', 0, array(), 0, '',
-            array(), array('wc')
+            [], $table_columns, [], false, [], '', '',
+            '', false, [], $o_rows, $tabindex, 1, false, 0,
+            [], 0, 0, 'table', 'db', 0, [], 0, '',
+            [], ['wc']
         );
         $this->assertContains(
             'foo',
@@ -3196,8 +3196,8 @@ class InsertEditTest extends TestCase
         );
 
         // insert
-        $table_columns = array(
-            array(
+        $table_columns = [
+            [
                 'Field' => 'foo',
                 'Type' => 'longtext',
                 'Null' => 'Yes',
@@ -3205,8 +3205,8 @@ class InsertEditTest extends TestCase
                 'pma_type' => 'longtext',
                 'True_Type' => 'longtext',
                 'Privileges' => 'select,insert,update,references',
-            ),
-            array(
+            ],
+            [
                 'Field' => 'bar',
                 'Type' => 'longtext',
                 'Null' => 'Yes',
@@ -3214,13 +3214,13 @@ class InsertEditTest extends TestCase
                 'pma_type' => 'longtext',
                 'True_Type' => 'longtext',
                 'Privileges' => 'select,update,references',
-            )
-        );
+            ]
+        ];
         $actual = $this->insertEdit->getHtmlForInsertEditRow(
-            array(), $table_columns, array(), false, array(), '', '',
-            '', true, array(), $o_rows, $tabindex, 2, false, 0,
-            array(), 0, 0, 'table', 'db', 0, array(), 0, '',
-            array(), array('wc')
+            [], $table_columns, [], false, [], '', '',
+            '', true, [], $o_rows, $tabindex, 2, false, 0,
+            [], 0, 0, 'table', 'db', 0, [], 0, '',
+            [], ['wc']
         );
         $this->assertContains(
             'foo',
diff --git a/test/classes/IpAllowDenyTest.php b/test/classes/IpAllowDenyTest.php
index fe3574c2e2..93ac0d7151 100644
--- a/test/classes/IpAllowDenyTest.php
+++ b/test/classes/IpAllowDenyTest.php
@@ -68,7 +68,7 @@ class IpAllowDenyTest extends TestCase
     {
         unset($_SERVER['REMOTE_ADDR']);
         unset($_SERVER['TEST_FORWARDED_HEADER']);
-        $GLOBALS['cfg']['TrustedProxies'] = array();
+        $GLOBALS['cfg']['TrustedProxies'] = [];
 
         if (!is_null($remote)) {
             $_SERVER['REMOTE_ADDR'] = $remote;
@@ -89,7 +89,7 @@ class IpAllowDenyTest extends TestCase
 
         unset($_SERVER['REMOTE_ADDR']);
         unset($_SERVER['TEST_FORWARDED_HEADER']);
-        $GLOBALS['cfg']['TrustedProxies'] = array();
+        $GLOBALS['cfg']['TrustedProxies'] = [];
     }
 
     /**
@@ -99,20 +99,20 @@ class IpAllowDenyTest extends TestCase
      */
     public function proxyIPs()
     {
-        return array(
+        return [
             // Nothing set
-            array(null, null, false),
+            [null, null, false],
             // Remote IP set
-            array('101.0.0.25', null, '101.0.0.25'),
+            ['101.0.0.25', null, '101.0.0.25'],
             // Proxy
-            array('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
-            array('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
-            array('101.0.0.25', 'invalid', false),
+            ['101.0.0.25', 'invalid', false],
             // Direct IP with proxy enabled
-            array('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/LanguageTest.php b/test/classes/LanguageTest.php
index cd7c1e3b49..95d5d0d9a2 100644
--- a/test/classes/LanguageTest.php
+++ b/test/classes/LanguageTest.php
@@ -194,21 +194,21 @@ class LanguageTest extends PmaTestCase
      */
     public function selectDataProvider()
     {
-        return array(
-            array('cs', 'en', '', '' ,'' ,'', '', 'Czech'),
-            array('', 'cs', '', '' ,'' ,'', '', 'Czech'),
-            array('', 'cs', 'en', '' ,'' ,'', '', 'Czech'),
-            array('', '', 'cs', '' ,'' ,'', '', 'Czech'),
-            array('', '', '', 'cs' ,'' ,'', '', 'Czech'),
-            array('', '', '', '' ,'cs,en-US;q=0.7,en;q=0.3' ,'', '', 'Czech'),
-            array(
+        return [
+            ['cs', 'en', '', '' ,'' ,'', '', 'Czech'],
+            ['', 'cs', '', '' ,'' ,'', '', 'Czech'],
+            ['', 'cs', 'en', '' ,'' ,'', '', 'Czech'],
+            ['', '', 'cs', '' ,'' ,'', '', 'Czech'],
+            ['', '', '', 'cs' ,'' ,'', '', 'Czech'],
+            ['', '', '', '' ,'cs,en-US;q=0.7,en;q=0.3' ,'', '', 'Czech'],
+            [
                 '', '', '', '', '',
                 'Mozilla/5.0 (Linux; U; Android 2.2.2; tr-tr; GM FOX)',
                 '', 'Turkish'
-            ),
-            array('', '', '', '' ,'' ,'', 'cs', 'Czech'),
-            array('', '', '', '' ,'' ,'', '', 'English'),
-        );
+            ],
+            ['', '', '', '' ,'' ,'', 'cs', 'Czech'],
+            ['', '', '', '' ,'' ,'', '', 'English'],
+        ];
     }
 
     /**
@@ -243,9 +243,9 @@ class LanguageTest extends PmaTestCase
      */
     public function listLocales()
     {
-        $ret = array();
+        $ret = [];
         foreach (LanguageManager::getInstance()->availableLanguages() as $language) {
-            $ret[] = array($language->getCode());
+            $ret[] = [$language->getCode()];
         }
         return $ret;
     }
diff --git a/test/classes/LinterTest.php b/test/classes/LinterTest.php
index e8a4fcf5ef..344c075dcb 100644
--- a/test/classes/LinterTest.php
+++ b/test/classes/LinterTest.php
@@ -26,9 +26,9 @@ class LinterTest extends PmaTestCase
      */
     public function testGetLines()
     {
-        $this->assertEquals(array(0), Linter::getLines(''));
-        $this->assertEquals(array(0, 2), Linter::getLines("a\nb"));
-        $this->assertEquals(array(0, 4, 7), Linter::getLines("abc\nde\n"));
+        $this->assertEquals([0], Linter::getLines(''));
+        $this->assertEquals([0, 2], Linter::getLines("a\nb"));
+        $this->assertEquals([0, 4, 7], Linter::getLines("abc\nde\n"));
     }
 
     /**
@@ -50,20 +50,20 @@ class LinterTest extends PmaTestCase
         //      ( d, 4), ( e, 5), (\n, 6),
         //      (\n, 7).
         $this->assertEquals(
-            array(1, 0),
-            Linter::findLineNumberAndColumn(array(0, 4, 7), 4)
+            [1, 0],
+            Linter::findLineNumberAndColumn([0, 4, 7], 4)
         );
         $this->assertEquals(
-            array(1, 1),
-            Linter::findLineNumberAndColumn(array(0, 4, 7), 5)
+            [1, 1],
+            Linter::findLineNumberAndColumn([0, 4, 7], 5)
         );
         $this->assertEquals(
-            array(1, 2),
-            Linter::findLineNumberAndColumn(array(0, 4, 7), 6)
+            [1, 2],
+            Linter::findLineNumberAndColumn([0, 4, 7], 6)
         );
         $this->assertEquals(
-            array(2, 0),
-            Linter::findLineNumberAndColumn(array(0, 4, 7), 7)
+            [2, 0],
+            Linter::findLineNumberAndColumn([0, 4, 7], 7)
         );
     }
 
@@ -89,18 +89,18 @@ class LinterTest extends PmaTestCase
      */
     public static function lintProvider()
     {
-        return array(
-            array(
-                array(),
+        return [
+            [
+                [],
                 '',
-            ),
-            array(
-                array(),
+            ],
+            [
+                [],
                 'SELECT * FROM tbl'
-            ),
-            array(
-                array(
-                    array(
+            ],
+            [
+                [
+                    [
                         'message' => 'Unrecognized data type. (near ' .
                             '<code>IN</code>)',
                         'fromLine' => 0,
@@ -108,8 +108,8 @@ class LinterTest extends PmaTestCase
                         'toLine' => 0,
                         'toColumn' => 24,
                         'severity' => 'error',
-                    ),
-                    array(
+                    ],
+                    [
                         'message' => 'A closing bracket was expected. (near ' .
                             '<code>IN</code>)',
                         'fromLine' => 0,
@@ -117,13 +117,13 @@ class LinterTest extends PmaTestCase
                         'toLine' => 0,
                         'toColumn' => 24,
                         'severity' => 'error',
-                    )
-                ),
+                    ]
+                ],
                 'CREATE TABLE tbl ( id IN'
-            ),
-            array(
-                array(
-                    array(
+            ],
+            [
+                [
+                    [
                         'message' => 'Linting is disabled for this query because ' .
                             'it exceeds the maximum length.',
                         'fromLine' => 0,
@@ -131,10 +131,10 @@ class LinterTest extends PmaTestCase
                         'toLine' => 0,
                         'toColumn' => 0,
                         'severity' => 'warning',
-                    )
-                ),
+                    ]
+                ],
                 str_repeat(";", 10001)
-            )
-        );
+            ]
+        ];
     }
 }
diff --git a/test/classes/ListDatabaseTest.php b/test/classes/ListDatabaseTest.php
index 42c7cfc964..b1395abdef 100644
--- a/test/classes/ListDatabaseTest.php
+++ b/test/classes/ListDatabaseTest.php
@@ -30,7 +30,7 @@ class ListDatabaseTest extends PmaTestCase
      */
     public function setup()
     {
-        $GLOBALS['cfg']['Server']['only_db'] = array('single\\_db');
+        $GLOBALS['cfg']['Server']['only_db'] = ['single\\_db'];
         $this->object = new ListDatabase();
     }
 
@@ -97,7 +97,7 @@ class ListDatabaseTest extends PmaTestCase
         $this->assertEquals(
             $this->_callProtectedFunction(
                 'checkHideDatabase',
-                array()
+                []
             ),
             ''
         );
diff --git a/test/classes/MessageTest.php b/test/classes/MessageTest.php
index b557cdb3bb..23f019e52a 100644
--- a/test/classes/MessageTest.php
+++ b/test/classes/MessageTest.php
@@ -210,17 +210,17 @@ class MessageTest extends PmaTestCase
     {
         $this->object->addParam(Message::notice('test'));
         $this->assertEquals(
-            array(Message::notice('test')),
+            [Message::notice('test')],
             $this->object->getParams()
         );
         $this->object->addParam('test');
         $this->assertEquals(
-            array(Message::notice('test'), 'test'),
+            [Message::notice('test'), 'test'],
             $this->object->getParams()
         );
         $this->object->addParam('test');
         $this->assertEquals(
-            array(Message::notice('test'), 'test', Message::notice('test')),
+            [Message::notice('test'), 'test', Message::notice('test')],
             $this->object->getParams()
         );
     }
@@ -251,16 +251,16 @@ class MessageTest extends PmaTestCase
     {
         $this->object->addText('test', '*');
         $this->assertEquals(
-            array('*', Message::notice('test')),
+            ['*', Message::notice('test')],
             $this->object->getAddedMessages()
         );
         $this->object->addText('test', '');
         $this->assertEquals(
-            array(
+            [
                 '*',
                 Message::notice('test'),
                 Message::notice('test')
-            ),
+            ],
             $this->object->getAddedMessages()
         );
     }
@@ -274,16 +274,16 @@ class MessageTest extends PmaTestCase
     {
         $this->object->addText('test<>', '');
         $this->assertEquals(
-            array(Message::notice('test&lt;&gt;')),
+            [Message::notice('test&lt;&gt;')],
             $this->object->getAddedMessages()
         );
         $this->object->addHtml('<b>test</b>');
         $this->assertEquals(
-            array(
+            [
                 Message::notice('test&lt;&gt;'),
                 ' ',
                 Message::rawNotice('<b>test</b>')
-            ),
+            ],
             $this->object->getAddedMessages()
         );
         $this->object->addMessage(Message::notice('test<>'));
@@ -300,18 +300,18 @@ class MessageTest extends PmaTestCase
      */
     public function testAddMessages()
     {
-        $messages = array();
+        $messages = [];
         $messages[] = new Message("Test1");
         $messages[] = new Message("PMA_Test2", Message::ERROR);
         $messages[] = new Message("Test3");
         $this->object->addMessages($messages, '');
 
         $this->assertEquals(
-            array(
+            [
                 Message::notice('Test1'),
                 Message::error("PMA_Test2"),
                 Message::notice('Test3')
-            ),
+            ],
             $this->object->getAddedMessages()
         );
     }
@@ -323,15 +323,15 @@ class MessageTest extends PmaTestCase
      */
     public function testAddMessagesString()
     {
-        $messages = array('test1', 'test<b>', 'test2');
+        $messages = ['test1', 'test<b>', 'test2'];
         $this->object->addMessagesString($messages, '');
 
         $this->assertEquals(
-            array(
+            [
                 Message::notice('test1'),
                 Message::notice('test&lt;b&gt;'),
                 Message::notice('test2')
-            ),
+            ],
             $this->object->getAddedMessages()
         );
 
@@ -367,8 +367,8 @@ class MessageTest extends PmaTestCase
             Message::sanitize($this->object)
         );
         $this->assertEquals(
-            array('test&amp;string&lt;&gt;', 'test&amp;string&lt;&gt;'),
-            Message::sanitize(array($this->object, $this->object))
+            ['test&amp;string&lt;&gt;', 'test&amp;string&lt;&gt;'],
+            Message::sanitize([$this->object, $this->object])
         );
     }
 
@@ -379,39 +379,39 @@ class MessageTest extends PmaTestCase
      */
     public function decodeBBDataProvider()
     {
-        return array(
-            array(
+        return [
+            [
                 '[em]test[/em][em]aa[em/][em]test[/em]',
                 '<em>test</em><em>aa[em/]<em>test</em>'
-            ),
-            array(
+            ],
+            [
                 '[strong]test[/strong][strong]test[/strong]',
                 '<strong>test</strong><strong>test</strong>'
-            ),
-            array(
+            ],
+            [
                 '[code]test[/code][code]test[/code]',
                 '<code>test</code><code>test</code>'
-            ),
-            array(
+            ],
+            [
                 '[kbd]test[/kbd][br][sup]test[/sup]',
                 '<kbd>test</kbd><br /><sup>test</sup>'
-            ),
-            array(
+            ],
+            [
                 '[a@https://example.com/@Documentation]link[/a]',
                 '<a href="./url.php?url=https%3A%2F%2Fexample.com%2F"'
                 . ' target="Documentation">link</a>'
-            ),
-            array(
+            ],
+            [
                 '[a@./non-existing@Documentation]link[/a]',
                 '[a@./non-existing@Documentation]link</a>'
-            ),
-            array(
+            ],
+            [
                 '[doc@foo]link[/doc]',
                 '<a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2F'
                 . 'latest%2Fsetup.html%23foo" '
                 . 'target="documentation">link</a>'
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -447,11 +447,11 @@ class MessageTest extends PmaTestCase
         );
         $this->assertEquals(
             'test string',
-            Message::format('test string', array())
+            Message::format('test string', [])
         );
         $this->assertEquals(
             'test string',
-            Message::format('%s string', array('test'))
+            Message::format('%s string', ['test'])
         );
 
     }
@@ -585,23 +585,23 @@ class MessageTest extends PmaTestCase
      */
     public function providerAffectedRows()
     {
-        return array(
-            array(
+        return [
+            [
                 1,
                 '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
                 . 'class="icon ic_s_notice" />  1 row affected.</div>'
-            ),
-            array(
+            ],
+            [
                 2,
                 '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
                 . 'class="icon ic_s_notice" />  2 rows affected.</div>'
-            ),
-            array(
+            ],
+            [
                 10000,
                 '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
                 . 'class="icon ic_s_notice" />  10000 rows affected.</div>'
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -630,23 +630,23 @@ class MessageTest extends PmaTestCase
      */
     public function providerInsertedRows()
     {
-        return array(
-            array(
+        return [
+            [
                 1,
                 '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
                 . 'class="icon ic_s_notice" />  1 row inserted.</div>'
-            ),
-            array(
+            ],
+            [
                 2,
                 '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
                 . 'class="icon ic_s_notice" />  2 rows inserted.</div>'
-            ),
-            array(
+            ],
+            [
                 100000,
                 '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
                 . 'class="icon ic_s_notice" />  100000 rows inserted.</div>'
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -675,23 +675,23 @@ class MessageTest extends PmaTestCase
      */
     public function providerDeletedRows()
     {
-        return array(
-            array(
+        return [
+            [
                 1,
                 '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
                 . 'class="icon ic_s_notice" />  1 row deleted.</div>'
-            ),
-            array(
+            ],
+            [
                 2,
                 '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
                 . 'class="icon ic_s_notice" />  2 rows deleted.</div>'
-            ),
-            array(
+            ],
+            [
                 500000,
                 '<div class="notice"><img src="themes/dot.gif" title="" alt="" '
                 . 'class="icon ic_s_notice" />  500000 rows deleted.</div>'
-            )
-        );
+            ]
+        ];
     }
 
     /**
diff --git a/test/classes/MimeTest.php b/test/classes/MimeTest.php
index 861203615e..350ca0d3fc 100644
--- a/test/classes/MimeTest.php
+++ b/test/classes/MimeTest.php
@@ -44,23 +44,23 @@ class MimeTest extends TestCase
      */
     public function providerForTestDetect()
     {
-        return array(
-            array(
+        return [
+            [
                 'pma',
                 'application/octet-stream'
-            ),
-            array(
+            ],
+            [
                 'GIF',
                 'image/gif'
-            ),
-            array(
+            ],
+            [
                 "\x89PNG",
                 'image/png'
-            ),
-            array(
+            ],
+            [
                 chr(0xff) . chr(0xd8),
                 'image/jpeg'
-            ),
-        );
+            ],
+        ];
     }
 }
diff --git a/test/classes/Navigation/NavigationTest.php b/test/classes/Navigation/NavigationTest.php
index a0ac1f028d..070501c80e 100644
--- a/test/classes/Navigation/NavigationTest.php
+++ b/test/classes/Navigation/NavigationTest.php
@@ -121,20 +121,20 @@ class NavigationTest extends PmaTestCase
             ->method('fetchArray')
             ->will(
                 $this->returnValue(
-                    array(
+                    [
                         'item_name' => 'tableName',
                         'item_type' => 'table'
-                    )
+                    ]
                 )
             );
         $dbi->expects($this->at(4))
             ->method('fetchArray')
             ->will(
                 $this->returnValue(
-                    array(
+                    [
                         'item_name' => 'viewName',
                         'item_type' => 'view'
-                    )
+                    ]
                 )
             );
         $dbi->expects($this->at(5))
diff --git a/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php b/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php
index 5123bf9264..a3a17afc7c 100644
--- a/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php
+++ b/test/classes/Navigation/Nodes/NodeDatabaseChildTest.php
@@ -41,7 +41,7 @@ class NodeDatabaseChildTest extends PmaTestCase
         $_SESSION['relation'][1]['PMA_VERSION'] = PMA_VERSION;
         $_SESSION['relation'][1]['navwork'] = true;
         $this->object = $this->getMockForAbstractClass(
-            'PhpMyAdmin\Navigation\Nodes\NodeDatabaseChild', array('child')
+            'PhpMyAdmin\Navigation\Nodes\NodeDatabaseChild', ['child']
         );
     }
 
diff --git a/test/classes/Navigation/Nodes/NodeDatabaseTest.php b/test/classes/Navigation/Nodes/NodeDatabaseTest.php
index da3c158808..f08c5910eb 100644
--- a/test/classes/Navigation/Nodes/NodeDatabaseTest.php
+++ b/test/classes/Navigation/Nodes/NodeDatabaseTest.php
@@ -30,7 +30,7 @@ class NodeDatabaseTest extends PmaTestCase
         $GLOBALS['server'] = 0;
         $GLOBALS['cfg']['DefaultTabDatabase'] = 'structure';
         $GLOBALS['cfg']['MaxNavigationItems'] = 250;
-        $GLOBALS['cfg']['Server'] = array();
+        $GLOBALS['cfg']['Server'] = [];
         $GLOBALS['cfg']['Server']['DisableIS'] = true;
     }
 
diff --git a/test/classes/Navigation/Nodes/NodeTableTest.php b/test/classes/Navigation/Nodes/NodeTableTest.php
index c695797679..4ef07cb7c6 100644
--- a/test/classes/Navigation/Nodes/NodeTableTest.php
+++ b/test/classes/Navigation/Nodes/NodeTableTest.php
@@ -81,12 +81,12 @@ class NodeTableTest extends PmaTestCase
      */
     public function providerForTestIcon()
     {
-        return array(
-            array('structure', 'b_props'),
-            array('search', 'b_search'),
-            array('insert', 'b_insrow'),
-            array('sql', 'b_sql'),
-            array('browse', 'b_browse'),
-        );
+        return [
+            ['structure', 'b_props'],
+            ['search', 'b_search'],
+            ['insert', 'b_insrow'],
+            ['sql', 'b_sql'],
+            ['browse', 'b_browse'],
+        ];
     }
 }
diff --git a/test/classes/Navigation/Nodes/NodeTest.php b/test/classes/Navigation/Nodes/NodeTest.php
index d1abfdbc89..d2b6988c6d 100644
--- a/test/classes/Navigation/Nodes/NodeTest.php
+++ b/test/classes/Navigation/Nodes/NodeTest.php
@@ -175,16 +175,16 @@ class NodeTest extends PmaTestCase
     public function testParents()
     {
         $parent = NodeFactory::getInstance();
-        $this->assertEquals($parent->parents(), array()); // exclude self
-        $this->assertEquals($parent->parents(true), array($parent)); // include self
+        $this->assertEquals($parent->parents(), []); // exclude self
+        $this->assertEquals($parent->parents(true), [$parent]); // include self
 
         $child = NodeFactory::getInstance();
         $parent->addChild($child);
 
-        $this->assertEquals($child->parents(), array($parent)); // exclude self
+        $this->assertEquals($child->parents(), [$parent]); // exclude self
         $this->assertEquals(
             $child->parents(true),
-            array($child, $parent)
+            [$child, $parent]
         ); // include self
     }
 
@@ -300,7 +300,7 @@ class NodeTest extends PmaTestCase
         );
 
         if (! isset($GLOBALS['cfg']['Server'])) {
-            $GLOBALS['cfg']['Server'] = array();
+            $GLOBALS['cfg']['Server'] = [];
         }
 
         // When hide_db regular expression is present
@@ -320,7 +320,7 @@ class NodeTest extends PmaTestCase
         unset($GLOBALS['cfg']['Server']['only_db']);
 
         // When only_db directive is present and it's an array of dbs
-        $GLOBALS['cfg']['Server']['only_db'] = array('onlyDbOne', 'onlyDbTwo');
+        $GLOBALS['cfg']['Server']['only_db'] = ['onlyDbOne', 'onlyDbTwo'];
         $this->assertEquals(
             "WHERE TRUE AND ( `SCHEMA_NAME` LIKE 'onlyDbOne' "
             . "OR `SCHEMA_NAME` LIKE 'onlyDbTwo' ) ",
@@ -446,12 +446,12 @@ class NodeTest extends PmaTestCase
         $dbi->expects($this->exactly(3))
             ->method('fetchArray')
             ->willReturnOnConsecutiveCalls(
-                array(
+                [
                     '0' => 'db'
-                ),
-                array(
+                ],
+                [
                     '0' => 'aa_db'
-                ),
+                ],
                 false
             );
 
diff --git a/test/classes/OperationsTest.php b/test/classes/OperationsTest.php
index 7ed729c83e..d1c0e65771 100644
--- a/test/classes/OperationsTest.php
+++ b/test/classes/OperationsTest.php
@@ -36,11 +36,11 @@ class OperationsTest extends TestCase
         $GLOBALS['server'] = 1;
         $GLOBALS['table'] = 'table';
         $GLOBALS['db'] = 'db';
-        $GLOBALS['cfg'] = array(
+        $GLOBALS['cfg'] = [
             'ServerDefault' => 1,
             'ActionLinksMode' => 'icons',
             'LinkLengthLimit' => 1000,
-        );
+        ];
         $GLOBALS['cfg']['DBG']['sql'] = false;
         $GLOBALS['server'] = 1;
 
@@ -143,7 +143,7 @@ class OperationsTest extends TestCase
         $this->assertRegExp(
             '/.*tbl_operations.php(.|[\n])*Alter table order by([\n]|.)*order_order.*/m',
             $this->operations->getHtmlForOrderTheTable(
-                array(array('Field' => "column1"), array('Field' => "column2"))
+                [['Field' => "column1"], ['Field' => "column2"]]
             )
         );
     }
@@ -198,7 +198,7 @@ class OperationsTest extends TestCase
         $this->assertRegExp(
             '/.*Delete data or table.*Empty the table.*Delete the table.*/m',
             $this->operations->getHtmlForDeleteDataOrTable(
-                array("truncate" => 'foo'), array("drop" => 'bar')
+                ["truncate" => 'foo'], ["drop" => 'bar']
             )
         );
     }
@@ -214,7 +214,7 @@ class OperationsTest extends TestCase
         $this->assertRegExp(
             '/.*TRUNCATE.TABLE.foo.*id_truncate.*Truncate table.*/m',
             $this->operations->getDeleteDataOrTablelink(
-                array("sql" => 'TRUNCATE TABLE foo'),
+                ["sql" => 'TRUNCATE TABLE foo'],
                 "TRUNCATE_TABLE",
                 "Truncate table",
                 "id_truncate"
@@ -230,8 +230,8 @@ class OperationsTest extends TestCase
     public function testGetHtmlForPartitionMaintenance()
     {
         $html = $this->operations->getHtmlForPartitionMaintenance(
-            array("partition1", "partion2"),
-            array("param1" => 'foo', "param2" => 'bar')
+            ["partition1", "partion2"],
+            ["param1" => 'foo', "param2" => 'bar']
         );
         $this->assertRegExp('/.*action="tbl_operations.php".*/', $html);
         $this->assertRegExp('/.*ANALYZE.*/', $html);
@@ -249,14 +249,14 @@ class OperationsTest extends TestCase
         $this->assertRegExp(
             '/.*Check referential integrity.*href="sql.php(.|[\n])*/m',
             $this->operations->getHtmlForReferentialIntegrityCheck(
-                array(
-                    array(
+                [
+                    [
                         'foreign_db'    => 'db1',
                         'foreign_table' => "foreign1",
                         'foreign_field' => "foreign2"
-                    )
-                ),
-                array("param1" => 'a', "param2" => 'b')
+                    ]
+                ],
+                ["param1" => 'a', "param2" => 'b']
             )
         );
     }
diff --git a/test/classes/Plugins/Auth/AuthenticationConfigTest.php b/test/classes/Plugins/Auth/AuthenticationConfigTest.php
index 95dd00525a..3c753e4993 100644
--- a/test/classes/Plugins/Auth/AuthenticationConfigTest.php
+++ b/test/classes/Plugins/Auth/AuthenticationConfigTest.php
@@ -70,10 +70,10 @@ class AuthenticationConfigTest extends PmaTestCase
      */
     public function testAuthCheck()
     {
-        $GLOBALS['cfg']['Server'] = array(
+        $GLOBALS['cfg']['Server'] = [
             'user' => 'username',
             'password' => 'password',
-        );
+        ];
         $this->assertTrue(
             $this->object->readCredentials()
         );
@@ -100,7 +100,7 @@ class AuthenticationConfigTest extends PmaTestCase
     {
         $removeConstant = false;
         $GLOBALS['error_handler'] = new ErrorHandler;
-        $GLOBALS['cfg']['Servers'] = array(1);
+        $GLOBALS['cfg']['Servers'] = [1];
         $GLOBALS['allowDeny_forbidden'] = false;
 
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
diff --git a/test/classes/Plugins/Auth/AuthenticationCookieTest.php b/test/classes/Plugins/Auth/AuthenticationCookieTest.php
index ba2c09011f..a3909840f5 100644
--- a/test/classes/Plugins/Auth/AuthenticationCookieTest.php
+++ b/test/classes/Plugins/Auth/AuthenticationCookieTest.php
@@ -107,7 +107,7 @@ class AuthenticationCookieTest extends PmaTestCase
         // mock footer
         $mockFooter = $this->getMockBuilder('PhpMyAdmin\Footer')
             ->disableOriginalConstructor()
-            ->setMethods(array('setMinimal'))
+            ->setMethods(['setMinimal'])
             ->getMock();
 
         $mockFooter->expects($this->once())
@@ -119,12 +119,12 @@ class AuthenticationCookieTest extends PmaTestCase
         $mockHeader = $this->getMockBuilder('PhpMyAdmin\Header')
             ->disableOriginalConstructor()
             ->setMethods(
-                array(
+                [
                     'setBodyId',
                     'setTitle',
                     'disableMenuAndConsole',
                     'disableWarnings'
-                )
+                ]
             )
             ->getMock();
 
@@ -157,13 +157,13 @@ class AuthenticationCookieTest extends PmaTestCase
             ->will($this->returnValue($mockHeader));
 
         $GLOBALS['pmaThemeImage'] = 'test';
-        $GLOBALS['cfg']['Servers'] = array(1, 2);
+        $GLOBALS['cfg']['Servers'] = [1, 2];
 
         // mock error handler
 
         $mockErrorHandler = $this->getMockBuilder('PhpMyAdmin\ErrorHandler')
             ->disableOriginalConstructor()
-            ->setMethods(array('hasDisplayErrors', 'dispErrors'))
+            ->setMethods(['hasDisplayErrors', 'dispErrors'])
             ->getMock();
 
         $mockErrorHandler->expects($this->once())
@@ -297,7 +297,7 @@ class AuthenticationCookieTest extends PmaTestCase
         $GLOBALS['pmaThemeImage'] = 'test';
         $GLOBALS['cfg']['Lang'] = '';
         $GLOBALS['cfg']['AllowArbitraryServer'] = false;
-        $GLOBALS['cfg']['Servers'] = array(1);
+        $GLOBALS['cfg']['Servers'] = [1];
         $GLOBALS['cfg']['CaptchaLoginPrivateKey'] = 'testprivkey';
         $GLOBALS['cfg']['CaptchaLoginPublicKey'] = 'testpubkey';
         $GLOBALS['server'] = 0;
@@ -354,7 +354,7 @@ class AuthenticationCookieTest extends PmaTestCase
     public function testAuthHeader()
     {
         $GLOBALS['cfg']['LoginCookieDeleteAll'] = false;
-        $GLOBALS['cfg']['Servers'] = array(1);
+        $GLOBALS['cfg']['Servers'] = [1];
 
         $this->mockResponse('Location: https://example.com/logout');
 
@@ -372,7 +372,7 @@ class AuthenticationCookieTest extends PmaTestCase
     public function testAuthHeaderPartial()
     {
         $GLOBALS['cfg']['LoginCookieDeleteAll'] = false;
-        $GLOBALS['cfg']['Servers'] = array(1, 2, 3);
+        $GLOBALS['cfg']['Servers'] = [1, 2, 3];
         $GLOBALS['cfg']['Server']['LogoutURL'] = 'https://example.com/logout';
         $GLOBALS['cfg']['Server']['auth_type'] = 'cookie';
 
@@ -418,7 +418,7 @@ class AuthenticationCookieTest extends PmaTestCase
         $GLOBALS['cfg']['CaptchaLoginPublicKey'] = '';
         $GLOBALS['cfg']['LoginCookieDeleteAll'] = true;
         $GLOBALS['PMA_Config']->set('PmaAbsoluteUri', '');
-        $GLOBALS['cfg']['Servers'] = array(1);
+        $GLOBALS['cfg']['Servers'] = [1];
 
         $_COOKIE['pmaAuth-0'] = 'test';
 
@@ -443,9 +443,9 @@ class AuthenticationCookieTest extends PmaTestCase
         $GLOBALS['cfg']['CaptchaLoginPublicKey'] = '';
         $GLOBALS['cfg']['LoginCookieDeleteAll'] = false;
         $GLOBALS['PMA_Config']->set('PmaAbsoluteUri', '');
-        $GLOBALS['cfg']['Servers'] = array(1);
+        $GLOBALS['cfg']['Servers'] = [1];
         $GLOBALS['server'] = 1;
-        $GLOBALS['cfg']['Server'] = array('auth_type' => 'cookie');
+        $GLOBALS['cfg']['Server'] = ['auth_type' => 'cookie'];
 
         $_COOKIE['pmaAuth-1'] = 'test';
 
@@ -559,7 +559,7 @@ class AuthenticationCookieTest extends PmaTestCase
         // mock for blowfish function
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie')
             ->disableOriginalConstructor()
-            ->setMethods(array('cookieDecrypt'))
+            ->setMethods(['cookieDecrypt'])
             ->getMock();
 
         $this->object->expects($this->once())
@@ -599,7 +599,7 @@ class AuthenticationCookieTest extends PmaTestCase
         // mock for blowfish function
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie')
             ->disableOriginalConstructor()
-            ->setMethods(array('cookieDecrypt'))
+            ->setMethods(['cookieDecrypt'])
             ->getMock();
 
         $this->object->expects($this->at(1))
@@ -643,7 +643,7 @@ class AuthenticationCookieTest extends PmaTestCase
         // mock for blowfish function
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie')
             ->disableOriginalConstructor()
-            ->setMethods(array('showFailure', 'cookieDecrypt'))
+            ->setMethods(['showFailure', 'cookieDecrypt'])
             ->getMock();
 
         $this->object->expects($this->once())
@@ -666,13 +666,13 @@ class AuthenticationCookieTest extends PmaTestCase
     public function testAuthSetUser()
     {
         $this->object->user = 'pmaUser2';
-        $arr = array(
+        $arr = [
             'host' => 'a',
             'port' => 1,
             'socket' => true,
             'ssl' => true,
             'user' => 'pmaUser2'
-        );
+        ];
 
         $GLOBALS['cfg']['Server'] = $arr;
         $GLOBALS['cfg']['Server']['user'] = 'pmaUser';
@@ -716,13 +716,13 @@ class AuthenticationCookieTest extends PmaTestCase
     public function testAuthSetUserWithHeaders()
     {
         $this->object->user = 'pmaUser2';
-        $arr = array(
+        $arr = [
             'host' => 'a',
             'port' => 1,
             'socket' => true,
             'ssl' => true,
             'user' => 'pmaUser2'
-        );
+        ];
 
         $GLOBALS['cfg']['Server'] = $arr;
         $GLOBALS['cfg']['Server']['host'] = 'b';
@@ -752,15 +752,15 @@ class AuthenticationCookieTest extends PmaTestCase
     {
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie')
             ->disableOriginalConstructor()
-            ->setMethods(array('showLoginForm'))
+            ->setMethods(['showLoginForm'])
             ->getMock();
 
         $GLOBALS['server'] = 2;
         $_COOKIE['pmaAuth-2'] = 'pass';
 
         $this->mockResponse(
-            array('Cache-Control: no-store, no-cache, must-revalidate'),
-            array('Pragma: no-cache')
+            ['Cache-Control: no-store, no-cache, must-revalidate'],
+            ['Pragma: no-cache']
         );
         $this->object->showFailure('empty-denied');
 
@@ -779,15 +779,15 @@ class AuthenticationCookieTest extends PmaTestCase
     {
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie')
             ->disableOriginalConstructor()
-            ->setMethods(array('showLoginForm'))
+            ->setMethods(['showLoginForm'])
             ->getMock();
 
         $GLOBALS['server'] = 2;
         $_COOKIE['pmaAuth-2'] = 'pass';
 
         $this->mockResponse(
-            array('Cache-Control: no-store, no-cache, must-revalidate'),
-            array('Pragma: no-cache')
+            ['Cache-Control: no-store, no-cache, must-revalidate'],
+            ['Pragma: no-cache']
         );
         $this->object->showFailure('allow-denied');
 
@@ -804,7 +804,7 @@ class AuthenticationCookieTest extends PmaTestCase
     {
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie')
             ->disableOriginalConstructor()
-            ->setMethods(array('showLoginForm'))
+            ->setMethods(['showLoginForm'])
             ->getMock();
 
         $GLOBALS['server'] = 2;
@@ -814,8 +814,8 @@ class AuthenticationCookieTest extends PmaTestCase
         $GLOBALS['cfg']['LoginCookieValidity'] = 10;
 
         $this->mockResponse(
-            array('Cache-Control: no-store, no-cache, must-revalidate'),
-            array('Pragma: no-cache')
+            ['Cache-Control: no-store, no-cache, must-revalidate'],
+            ['Pragma: no-cache']
         );
         $this->object->showFailure('no-activity');
 
@@ -832,7 +832,7 @@ class AuthenticationCookieTest extends PmaTestCase
     {
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie')
             ->disableOriginalConstructor()
-            ->setMethods(array('showLoginForm'))
+            ->setMethods(['showLoginForm'])
             ->getMock();
 
         $GLOBALS['server'] = 2;
@@ -850,8 +850,8 @@ class AuthenticationCookieTest extends PmaTestCase
         $GLOBALS['errno'] = 42;
 
         $this->mockResponse(
-            array('Cache-Control: no-store, no-cache, must-revalidate'),
-            array('Pragma: no-cache')
+            ['Cache-Control: no-store, no-cache, must-revalidate'],
+            ['Pragma: no-cache']
         );
         $this->object->showFailure('');
 
@@ -868,7 +868,7 @@ class AuthenticationCookieTest extends PmaTestCase
     {
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationCookie')
             ->disableOriginalConstructor()
-            ->setMethods(array('showLoginForm'))
+            ->setMethods(['showLoginForm'])
             ->getMock();
 
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
@@ -886,8 +886,8 @@ class AuthenticationCookieTest extends PmaTestCase
         unset($GLOBALS['errno']);
 
         $this->mockResponse(
-            array('Cache-Control: no-store, no-cache, must-revalidate'),
-            array('Pragma: no-cache')
+            ['Cache-Control: no-store, no-cache, must-revalidate'],
+            ['Pragma: no-cache']
         );
         $this->object->showFailure('');
 
@@ -1101,10 +1101,10 @@ class AuthenticationCookieTest extends PmaTestCase
 
         $this->object->handlePasswordChange($newPassword);
 
-        $payload = array(
+        $payload = [
             'password' => $newPassword,
             'server' => 'b 2'
-        );
+        ];
         $method = new ReflectionMethod(
             'PhpMyAdmin\Plugins\Auth\AuthenticationCookie',
             '_getSessionEncryptionSecret'
@@ -1127,38 +1127,38 @@ class AuthenticationCookieTest extends PmaTestCase
      */
     public function secretsProvider()
     {
-        return array(
+        return [
             // Optimal case
-            array(
+            [
                 '1234567890123456abcdefghijklmnop',
                 '1234567890123456',
                 'abcdefghijklmnop',
-            ),
+            ],
             // Overlapping secret
-            array(
+            [
                 '12345678901234567',
                 '1234567890123456',
                 '2345678901234567',
-            ),
+            ],
             // Short secret
-            array(
+            [
                 '1234567890123456',
                 '1234567890123451',
                 '2345678901234562',
-            ),
+            ],
             // Really short secret
-            array(
+            [
                 '12',
                 '1111111111111111',
                 '2222222222222222',
-            ),
+            ],
             // Too short secret
-            array(
+            [
                 '1',
                 '1111111111111111',
                 '1111111111111111',
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -1239,133 +1239,133 @@ class AuthenticationCookieTest extends PmaTestCase
      */
     public function checkRulesProvider()
     {
-        return array(
-            'nopass-ok' => array(
+        return [
+            'nopass-ok' => [
                 'testUser',
                 '',
                 '1.2.3.4',
                 true,
                 true,
-                array(),
+                [],
                 '',
-            ),
-            'nopass' => array(
+            ],
+            'nopass' => [
                 'testUser',
                 '',
                 '1.2.3.4',
                 true,
                 false,
-                array(),
+                [],
                 'Login without a password is forbidden',
-            ),
-            'root-ok' => array(
+            ],
+            'root-ok' => [
                 'root',
                 'root',
                 '1.2.3.4',
                 true,
                 true,
-                array(),
+                [],
                 '',
-            ),
-            'root' => array(
+            ],
+            'root' => [
                 'root',
                 'root',
                 '1.2.3.4',
                 false,
                 true,
-                array(),
+                [],
                 'Access denied!',
-            ),
-            'rules-deny-allow-ok' => array(
+            ],
+            'rules-deny-allow-ok' => [
                 'root',
                 'root',
                 '1.2.3.4',
                 true,
                 true,
-                array(
+                [
                     'order' => 'deny,allow',
-                    'rules' => array(
+                    'rules' => [
                         'allow root 1.2.3.4',
                         'deny % from all',
-                    ),
-                ),
+                    ],
+                ],
                 '',
-            ),
-            'rules-deny-allow-reject' => array(
+            ],
+            'rules-deny-allow-reject' => [
                 'user',
                 'root',
                 '1.2.3.4',
                 true,
                 true,
-                array(
+                [
                     'order' => 'deny,allow',
-                    'rules' => array(
+                    'rules' => [
                         'allow root 1.2.3.4',
                         'deny % from all',
-                    ),
-                ),
+                    ],
+                ],
                 'Access denied!',
-            ),
-            'rules-allow-deny-ok' => array(
+            ],
+            'rules-allow-deny-ok' => [
                 'root',
                 'root',
                 '1.2.3.4',
                 true,
                 true,
-                array(
+                [
                     'order' => 'allow,deny',
-                    'rules' => array(
+                    'rules' => [
                         'deny user from all',
                         'allow root 1.2.3.4',
-                    ),
-                ),
+                    ],
+                ],
                 '',
-            ),
-            'rules-allow-deny-reject' => array(
+            ],
+            'rules-allow-deny-reject' => [
                 'user',
                 'root',
                 '1.2.3.4',
                 true,
                 true,
-                array(
+                [
                     'order' => 'allow,deny',
-                    'rules' => array(
+                    'rules' => [
                         'deny user from all',
                         'allow root 1.2.3.4',
-                    ),
-                ),
+                    ],
+                ],
                 'Access denied!',
-            ),
-            'rules-explicit-ok' => array(
+            ],
+            'rules-explicit-ok' => [
                 'root',
                 'root',
                 '1.2.3.4',
                 true,
                 true,
-                array(
+                [
                     'order' => 'explicit',
-                    'rules' => array(
+                    'rules' => [
                         'deny user from all',
                         'allow root 1.2.3.4',
-                    ),
-                ),
+                    ],
+                ],
                 '',
-            ),
-            'rules-explicit-reject' => array(
+            ],
+            'rules-explicit-reject' => [
                 'user',
                 'root',
                 '1.2.3.4',
                 true,
                 true,
-                array(
+                [
                     'order' => 'explicit',
-                    'rules' => array(
+                    '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 fe98e14fc6..5f1da34acf 100644
--- a/test/classes/Plugins/Auth/AuthenticationHttpTest.php
+++ b/test/classes/Plugins/Auth/AuthenticationHttpTest.php
@@ -34,7 +34,7 @@ class AuthenticationHttpTest extends PmaTestCase
     {
         $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['PMA_Config']->enableBc();
-        $GLOBALS['cfg']['Servers'] = array();
+        $GLOBALS['cfg']['Servers'] = [];
         $GLOBALS['server'] = 0;
         $GLOBALS['db'] = 'db';
         $GLOBALS['table'] = 'table';
@@ -70,7 +70,7 @@ class AuthenticationHttpTest extends PmaTestCase
         // mock footer
         $mockFooter = $this->getMockBuilder('PhpMyAdmin\Footer')
             ->disableOriginalConstructor()
-            ->setMethods(array('setMinimal'))
+            ->setMethods(['setMinimal'])
             ->getMock();
 
         $mockFooter->expects($this->exactly($set_minimal))
@@ -82,7 +82,7 @@ class AuthenticationHttpTest extends PmaTestCase
         $mockHeader = $this->getMockBuilder('PhpMyAdmin\Header')
             ->disableOriginalConstructor()
             ->setMethods(
-                array('setBodyId', 'setTitle', 'disableMenuAndConsole', 'addHTML')
+                ['setBodyId', 'setTitle', 'disableMenuAndConsole', 'addHTML']
             )
             ->getMock();
 
@@ -137,7 +137,7 @@ class AuthenticationHttpTest extends PmaTestCase
 
         $this->doMockResponse(
             0, 0, 0,
-            array('Location: https://example.com/logout')
+            ['Location: https://example.com/logout']
         );
     }
 
@@ -151,8 +151,8 @@ class AuthenticationHttpTest extends PmaTestCase
 
         $this->doMockResponse(
             1, 1, 1,
-            array('WWW-Authenticate: Basic realm="phpMyAdmin verboseMessag"'),
-            array('status: 401 Unauthorized'),
+            ['WWW-Authenticate: Basic realm="phpMyAdmin verboseMessag"'],
+            ['status: 401 Unauthorized'],
             401
         );
     }
@@ -167,8 +167,8 @@ class AuthenticationHttpTest extends PmaTestCase
 
         $this->doMockResponse(
             1, 1, 1,
-            array('WWW-Authenticate: Basic realm="phpMyAdmin hst"'),
-            array('status: 401 Unauthorized'),
+            ['WWW-Authenticate: Basic realm="phpMyAdmin hst"'],
+            ['status: 401 Unauthorized'],
             401
         );
     }
@@ -183,8 +183,8 @@ class AuthenticationHttpTest extends PmaTestCase
 
         $this->doMockResponse(
             1, 1, 1,
-            array('WWW-Authenticate: Basic realm="realmmessage"'),
-            array('status: 401 Unauthorized'),
+            ['WWW-Authenticate: Basic realm="realmmessage"'],
+            ['status: 401 Unauthorized'],
             401
         );
     }
@@ -238,8 +238,8 @@ class AuthenticationHttpTest extends PmaTestCase
      */
     public function readCredentialsProvider()
     {
-        return array(
-            array(
+        return [
+            [
                 'Basic ' . base64_encode('foo:bar'),
                 'pswd',
                 'PHP_AUTH_USER',
@@ -248,8 +248,8 @@ class AuthenticationHttpTest extends PmaTestCase
                 '',
                 'bar',
                 'foo'
-            ),
-            array(
+            ],
+            [
                 'Basic ' . base64_encode('foobar'),
                 'pswd',
                 'REMOTE_USER',
@@ -257,8 +257,8 @@ class AuthenticationHttpTest extends PmaTestCase
                 true,
                 'Basic Zm9vYmFy',
                 'pswd'
-            ),
-            array(
+            ],
+            [
                 'Basic ' . base64_encode('foobar:'),
                 'pswd',
                 'AUTH_USER',
@@ -266,8 +266,8 @@ class AuthenticationHttpTest extends PmaTestCase
                 true,
                 'foobar',
                 false
-            ),
-            array(
+            ],
+            [
                 'Basic ' . base64_encode(':foobar'),
                 'pswd',
                 'HTTP_AUTHORIZATION',
@@ -275,8 +275,8 @@ class AuthenticationHttpTest extends PmaTestCase
                 true,
                 'Basic OmZvb2Jhcg==',
                 'pswd'
-            ),
-            array(
+            ],
+            [
                 'BasicTest',
                 'pswd',
                 'Authorization',
@@ -284,8 +284,8 @@ class AuthenticationHttpTest extends PmaTestCase
                 true,
                 'BasicTest',
                 'pswd'
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -329,27 +329,27 @@ class AuthenticationHttpTest extends PmaTestCase
         // case 2
         $this->object->user = 'testUser';
         $this->object->password = 'testPass';
-        $GLOBALS['cfg']['Servers'][1] = array(
+        $GLOBALS['cfg']['Servers'][1] = [
             'host' => 'a',
             'user' => 'testUser',
             'foo' => 'bar'
-        );
+        ];
 
-        $GLOBALS['cfg']['Server']= array(
+        $GLOBALS['cfg']['Server']= [
             'host' => 'a',
             'user' => 'user2'
-        );
+        ];
 
         $this->assertTrue(
             $this->object->storeCredentials()
         );
 
         $this->assertEquals(
-            array(
+            [
                 'user' => 'testUser',
                 'password' => 'testPass',
                 'host' => 'a',
-            ),
+            ],
             $GLOBALS['cfg']['Server']
         );
 
@@ -362,27 +362,27 @@ class AuthenticationHttpTest extends PmaTestCase
         $GLOBALS['server'] = 3;
         $this->object->user = 'testUser';
         $this->object->password = 'testPass';
-        $GLOBALS['cfg']['Servers'][1] = array(
+        $GLOBALS['cfg']['Servers'][1] = [
             'host' => 'a',
             'user' => 'testUsers',
             'foo' => 'bar'
-        );
+        ];
 
-        $GLOBALS['cfg']['Server']= array(
+        $GLOBALS['cfg']['Server']= [
             'host' => 'a',
             'user' => 'user2'
-        );
+        ];
 
         $this->assertTrue(
             $this->object->storeCredentials()
         );
 
         $this->assertEquals(
-            array(
+            [
                 'user' => 'testUser',
                 'password' => 'testPass',
                 'host' => 'a'
-            ),
+            ],
             $GLOBALS['cfg']['Server']
         );
 
@@ -432,7 +432,7 @@ class AuthenticationHttpTest extends PmaTestCase
 
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationHttp')
             ->disableOriginalConstructor()
-            ->setMethods(array('authForm'))
+            ->setMethods(['authForm'])
             ->getMock();
 
         $this->object->expects($this->exactly(2))
diff --git a/test/classes/Plugins/Auth/AuthenticationSignonTest.php b/test/classes/Plugins/Auth/AuthenticationSignonTest.php
index 3ff893d201..4b58fcbcbb 100644
--- a/test/classes/Plugins/Auth/AuthenticationSignonTest.php
+++ b/test/classes/Plugins/Auth/AuthenticationSignonTest.php
@@ -92,7 +92,7 @@ class AuthenticationSignonTest extends PmaTestCase
     {
         $this->mockResponse('Location: https://example.com/SignonURL');
 
-        $GLOBALS['header'] = array();
+        $GLOBALS['header'] = [];
         $GLOBALS['cfg']['Server']['SignonURL'] = 'https://example.com/SignonURL';
         $GLOBALS['cfg']['Server']['LogoutURL'] = '';
 
@@ -125,7 +125,7 @@ class AuthenticationSignonTest extends PmaTestCase
         $_SESSION['LAST_SIGNON_URL'] = 'https://example.com/SignonURL';
         $GLOBALS['cfg']['Server']['SignonScript'] = './examples/signon-script.php';
         $GLOBALS['cfg']['Server']['SignonSession'] = 'session123';
-        $GLOBALS['cfg']['Server']['SignonCookieParams'] = array();
+        $GLOBALS['cfg']['Server']['SignonCookieParams'] = [];
         $GLOBALS['cfg']['Server']['host'] = 'localhost';
         $GLOBALS['cfg']['Server']['port'] = '80';
         $GLOBALS['cfg']['Server']['user'] = 'user';
@@ -161,7 +161,7 @@ class AuthenticationSignonTest extends PmaTestCase
 
         $GLOBALS['cfg']['Server']['SignonURL'] = 'https://example.com/SignonURL';
         $GLOBALS['cfg']['Server']['SignonSession'] = 'session123';
-        $GLOBALS['cfg']['Server']['SignonCookieParams'] = array();
+        $GLOBALS['cfg']['Server']['SignonCookieParams'] = [];
         $GLOBALS['cfg']['Server']['host'] = 'localhost';
         $GLOBALS['cfg']['Server']['port'] = '80';
         $GLOBALS['cfg']['Server']['user'] = 'user';
@@ -171,7 +171,7 @@ class AuthenticationSignonTest extends PmaTestCase
         $_SESSION['PMA_single_signon_password'] = 'pass123';
         $_SESSION['PMA_single_signon_host'] = 'local';
         $_SESSION['PMA_single_signon_port'] = '12';
-        $_SESSION['PMA_single_signon_cfgupdate'] = array('foo' => 'bar');
+        $_SESSION['PMA_single_signon_cfgupdate'] = ['foo' => 'bar'];
         $_SESSION['PMA_single_signon_token'] = 'pmaToken';
         $sessionName = session_name();
         $sessionID = session_id();
@@ -179,15 +179,15 @@ class AuthenticationSignonTest extends PmaTestCase
         $this->object->logOut();
 
         $this->assertEquals(
-            array(
+            [
                 'SignonURL' => 'https://example.com/SignonURL',
                 'SignonScript' => '',
                 'SignonSession' => 'session123',
-                'SignonCookieParams' => array(),
+                'SignonCookieParams' => [],
                 'host' => 'localhost',
                 'port' => '80',
                 'user' => 'user',
-            ),
+            ],
             $GLOBALS['cfg']['Server']
         );
 
@@ -216,7 +216,7 @@ class AuthenticationSignonTest extends PmaTestCase
     {
         $GLOBALS['cfg']['Server']['SignonURL'] = 'https://example.com/SignonURL';
         $GLOBALS['cfg']['Server']['SignonSession'] = 'session123';
-        $GLOBALS['cfg']['Server']['SignonCookieParams'] = array();
+        $GLOBALS['cfg']['Server']['SignonCookieParams'] = [];
         $GLOBALS['cfg']['Server']['host'] = 'localhost';
         $GLOBALS['cfg']['Server']['port'] = '80';
         $GLOBALS['cfg']['Server']['user'] = 'user';
@@ -227,7 +227,7 @@ class AuthenticationSignonTest extends PmaTestCase
         $_SESSION['PMA_single_signon_password'] = 'pass123';
         $_SESSION['PMA_single_signon_host'] = 'local';
         $_SESSION['PMA_single_signon_port'] = '12';
-        $_SESSION['PMA_single_signon_cfgupdate'] = array('foo' => 'bar');
+        $_SESSION['PMA_single_signon_cfgupdate'] = ['foo' => 'bar'];
         $_SESSION['PMA_single_signon_token'] = 'pmaToken';
 
         $this->assertTrue(
@@ -282,7 +282,7 @@ class AuthenticationSignonTest extends PmaTestCase
 
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationSignon')
             ->disableOriginalConstructor()
-            ->setMethods(array('showLoginForm'))
+            ->setMethods(['showLoginForm'])
             ->getMock();
 
         $this->object->expects($this->exactly(1))
@@ -309,7 +309,7 @@ class AuthenticationSignonTest extends PmaTestCase
 
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationSignon')
             ->disableOriginalConstructor()
-            ->setMethods(array('showLoginForm'))
+            ->setMethods(['showLoginForm'])
             ->getMock();
 
         $this->object->expects($this->exactly(1))
@@ -335,7 +335,7 @@ class AuthenticationSignonTest extends PmaTestCase
 
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationSignon')
             ->disableOriginalConstructor()
-            ->setMethods(array('showLoginForm'))
+            ->setMethods(['showLoginForm'])
             ->getMock();
 
         $this->object->expects($this->exactly(1))
@@ -363,7 +363,7 @@ class AuthenticationSignonTest extends PmaTestCase
 
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationSignon')
             ->disableOriginalConstructor()
-            ->setMethods(array('showLoginForm'))
+            ->setMethods(['showLoginForm'])
             ->getMock();
 
         $this->object->expects($this->exactly(1))
@@ -399,7 +399,7 @@ class AuthenticationSignonTest extends PmaTestCase
 
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Auth\AuthenticationSignon')
             ->disableOriginalConstructor()
-            ->setMethods(array('showLoginForm'))
+            ->setMethods(['showLoginForm'])
             ->getMock();
 
         $this->object->expects($this->exactly(1))
diff --git a/test/classes/Plugins/Export/ExportCodegenTest.php b/test/classes/Plugins/Export/ExportCodegenTest.php
index b807ca2902..196083687d 100644
--- a/test/classes/Plugins/Export/ExportCodegenTest.php
+++ b/test/classes/Plugins/Export/ExportCodegenTest.php
@@ -65,18 +65,18 @@ class ExportCodegenTest extends PmaTestCase
         $attrCgHandlers->setAccessible(true);
 
         $this->assertEquals(
-            array(
+            [
                 "NHibernate C# DO",
                 "NHibernate XML"
-            ),
+            ],
             $attrCgFormats->getValue($this->object)
         );
 
         $this->assertEquals(
-            array(
+            [
                 "_handleNHibernateCSBody",
                 "_handleNHibernateXMLBody"
-            ),
+            ],
             $attrCgHandlers->getValue($this->object)
         );
     }
@@ -178,10 +178,10 @@ class ExportCodegenTest extends PmaTestCase
         );
 
         $this->assertEquals(
-            array(
+            [
                 "NHibernate C# DO",
                 "NHibernate XML"
-            ),
+            ],
             $select->getValues()
         );
     }
@@ -332,7 +332,7 @@ class ExportCodegenTest extends PmaTestCase
         $dbi->expects($this->at(1))
             ->method('fetchRow')
             ->with(true)
-            ->will($this->returnValue(array('a', 'b', 'c', false, 'e', 'f')));
+            ->will($this->returnValue(['a', 'b', 'c', false, 'e', 'f']));
 
         $dbi->expects($this->at(2))
             ->method('fetchRow')
@@ -397,12 +397,12 @@ class ExportCodegenTest extends PmaTestCase
         $dbi->expects($this->at(1))
             ->method('fetchRow')
             ->with(true)
-            ->will($this->returnValue(array('a', 'b', 'c', false, 'e', 'f')));
+            ->will($this->returnValue(['a', 'b', 'c', false, 'e', 'f']));
 
         $dbi->expects($this->at(2))
             ->method('fetchRow')
             ->with(true)
-            ->will($this->returnValue(array('g', 'h', 'i', 'PRI', 'j', 'k')));
+            ->will($this->returnValue(['g', 'h', 'i', 'PRI', 'j', 'k']));
 
         $dbi->expects($this->at(3))
             ->method('fetchRow')
@@ -450,10 +450,10 @@ class ExportCodegenTest extends PmaTestCase
         $getter->setAccessible(true);
         $setter->setAccessible(true);
 
-        $setter->invoke($this->object, array(1, 2));
+        $setter->invoke($this->object, [1, 2]);
 
         $this->assertEquals(
-            array(1, 2),
+            [1, 2],
             $getter->invoke($this->object)
         );
     }
@@ -475,10 +475,10 @@ class ExportCodegenTest extends PmaTestCase
         $getter->setAccessible(true);
         $setter->setAccessible(true);
 
-        $setter->invoke($this->object, array(1, 2));
+        $setter->invoke($this->object, [1, 2]);
 
         $this->assertEquals(
-            array(1, 2),
+            [1, 2],
             $getter->invoke($this->object)
         );
     }
diff --git a/test/classes/Plugins/Export/ExportCsvTest.php b/test/classes/Plugins/Export/ExportCsvTest.php
index 8304e89021..41c8ffbdbe 100644
--- a/test/classes/Plugins/Export/ExportCsvTest.php
+++ b/test/classes/Plugins/Export/ExportCsvTest.php
@@ -525,7 +525,7 @@ class ExportCsvTest extends PmaTestCase
         $dbi->expects($this->at(3))
             ->method('fetchRow')
             ->with(true)
-            ->will($this->returnValue(array(null, 'b', 'c', false, 'e', 'f')));
+            ->will($this->returnValue([null, 'b', 'c', false, 'e', 'f']));
 
         $dbi->expects($this->at(4))
             ->method('fetchRow')
@@ -578,7 +578,7 @@ class ExportCsvTest extends PmaTestCase
         $dbi->expects($this->at(3))
             ->method('fetchRow')
             ->with(true)
-            ->will($this->returnValue(array(1 => 'a')));
+            ->will($this->returnValue([1 => 'a']));
 
         $dbi->expects($this->at(4))
             ->method('fetchRow')
@@ -625,7 +625,7 @@ class ExportCsvTest extends PmaTestCase
         $dbi->expects($this->at(3))
             ->method('fetchRow')
             ->with(true)
-            ->will($this->returnValue(array("test\015\012\n")));
+            ->will($this->returnValue(["test\015\012\n"]));
 
         $dbi->expects($this->at(4))
             ->method('fetchRow')
@@ -675,7 +675,7 @@ class ExportCsvTest extends PmaTestCase
         $dbi->expects($this->at(3))
             ->method('fetchRow')
             ->with(true)
-            ->will($this->returnValue(array("test\015\n")));
+            ->will($this->returnValue(["test\015\n"]));
 
         $dbi->expects($this->at(4))
             ->method('fetchRow')
@@ -723,7 +723,7 @@ class ExportCsvTest extends PmaTestCase
         $dbi->expects($this->at(4))
             ->method('fetchRow')
             ->with(true)
-            ->will($this->returnValue(array("test\015\n", "test\n")));
+            ->will($this->returnValue(["test\015\n", "test\n"]));
 
         $dbi->expects($this->at(5))
             ->method('fetchRow')
diff --git a/test/classes/Plugins/Export/ExportExcelTest.php b/test/classes/Plugins/Export/ExportExcelTest.php
index 2257b28a71..85a713eac1 100644
--- a/test/classes/Plugins/Export/ExportExcelTest.php
+++ b/test/classes/Plugins/Export/ExportExcelTest.php
@@ -176,11 +176,11 @@ class ExportExcelTest extends PmaTestCase
         );
 
         $this->assertEquals(
-            array(
+            [
                 'win' => 'Windows',
                 'mac_excel2003' => 'Excel 2003 / Macintosh',
                 'mac_excel2008' => 'Excel 2008 / Macintosh'
-            ),
+            ],
             $property->getValues()
         );
 
diff --git a/test/classes/Plugins/Export/ExportHtmlwordTest.php b/test/classes/Plugins/Export/ExportHtmlwordTest.php
index 8ef0c81eed..93922c1392 100644
--- a/test/classes/Plugins/Export/ExportHtmlwordTest.php
+++ b/test/classes/Plugins/Export/ExportHtmlwordTest.php
@@ -140,11 +140,11 @@ class ExportHtmlwordTest extends PmaTestCase
         );
 
         $this->assertEquals(
-            array(
+            [
                 'structure' => __('structure'),
                 'data' => __('data'),
                 'structure_and_data' => __('structure and data')
-            ),
+            ],
             $property->getValues()
         );
 
@@ -356,7 +356,7 @@ class ExportHtmlwordTest extends PmaTestCase
         $dbi->expects($this->at(7))
             ->method('fetchRow')
             ->with(true)
-            ->will($this->returnValue(array(null, '0', 'test', false)));
+            ->will($this->returnValue([null, '0', 'test', false]));
 
         $dbi->expects($this->at(8))
             ->method('fetchRow')
@@ -404,21 +404,21 @@ class ExportHtmlwordTest extends PmaTestCase
     public function testGetTableDefStandIn()
     {
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportHtmlword')
-            ->setMethods(array('formatOneColumnDefinition'))
+            ->setMethods(['formatOneColumnDefinition'])
             ->getMock();
 
         // case 1
 
-        $keys = array(
-            array(
+        $keys = [
+            [
                 'Non_unique' => 0,
                 'Column_name' => 'name1'
-            ),
-            array(
+            ],
+            [
                 'Non_unique' => 1,
                 'Column_name' => 'name2'
-            )
-        );
+            ]
+        ];
 
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
             ->disableOriginalConstructor()
@@ -432,13 +432,13 @@ class ExportHtmlwordTest extends PmaTestCase
         $dbi->expects($this->once())
             ->method('getColumns')
             ->with('database', 'view')
-            ->will($this->returnValue(array(array('Field' => 'column'))));
+            ->will($this->returnValue([['Field' => 'column']]));
 
         $GLOBALS['dbi'] = $dbi;
 
         $this->object->expects($this->once())
             ->method('formatOneColumnDefinition')
-            ->with(array('Field' => 'column'), array('name1'), 'column')
+            ->with(['Field' => 'column'], ['name1'], 'column')
             ->will($this->returnValue(1));
 
         $this->assertEquals(
@@ -460,19 +460,19 @@ class ExportHtmlwordTest extends PmaTestCase
     public function testGetTableDef()
     {
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportHtmlword')
-            ->setMethods(array('formatOneColumnDefinition'))
+            ->setMethods(['formatOneColumnDefinition'])
             ->getMock();
 
-        $keys = array(
-            array(
+        $keys = [
+            [
                 'Non_unique' => 0,
                 'Column_name' => 'name1'
-            ),
-            array(
+            ],
+            [
                 'Non_unique' => 1,
                 'Column_name' => 'name2'
-            )
-        );
+            ]
+        ];
 
         // case 1
 
@@ -483,14 +483,14 @@ class ExportHtmlwordTest extends PmaTestCase
         $dbi->expects($this->exactly(2))
             ->method('fetchResult')
             ->willReturnOnConsecutiveCalls(
-                array(),
-                array(
-                    'fieldname' => array(
+                [],
+                [
+                    'fieldname' => [
                         'values' => 'test-',
                         'transformation' => 'testfoo',
                         'mimetype' => 'test<'
-                    )
-                )
+                    ]
+                ]
             );
 
         $dbi->expects($this->once())
@@ -498,13 +498,13 @@ class ExportHtmlwordTest extends PmaTestCase
             ->with('database', '')
             ->will($this->returnValue($keys));
 
-        $columns = array(
+        $columns = [
             'Field' => 'fieldname'
-        );
+        ];
         $dbi->expects($this->once())
             ->method('getColumns')
             ->with('database', '')
-            ->will($this->returnValue(array($columns)));
+            ->will($this->returnValue([$columns]));
 
         $dbi->expects($this->any())
             ->method('query')
@@ -518,9 +518,9 @@ class ExportHtmlwordTest extends PmaTestCase
             ->method('fetchAssoc')
             ->will(
                 $this->returnValue(
-                    array(
-                        'comment' => array('fieldname' => 'testComment')
-                    )
+                    [
+                        'comment' => ['fieldname' => 'testComment']
+                    ]
                 )
             );
         $dbi->expects($this->any())->method('escapeString')
@@ -530,11 +530,11 @@ class ExportHtmlwordTest extends PmaTestCase
 
         $this->object->expects($this->exactly(3))
             ->method('formatOneColumnDefinition')
-            ->with($columns, array('name1'))
+            ->with($columns, ['name1'])
             ->will($this->returnValue(1));
 
         $GLOBALS['cfgRelation']['relation'] = true;
-        $_SESSION['relation'][0] = array(
+        $_SESSION['relation'][0] = [
             'PMA_VERSION' => PMA_VERSION,
             'relwork' => true,
             'commwork' => true,
@@ -542,7 +542,7 @@ class ExportHtmlwordTest extends PmaTestCase
             'db' => 'database',
             'relation' => 'rel',
             'column_info' => 'col'
-        );
+        ];
 
         $result = $this->object->getTableDef(
             'database',
@@ -573,19 +573,19 @@ class ExportHtmlwordTest extends PmaTestCase
         $dbi->expects($this->exactly(2))
             ->method('fetchResult')
             ->willReturnOnConsecutiveCalls(
-                array(
-                    'fieldname' => array(
+                [
+                    'fieldname' => [
                         'foreign_table' => 'ftable',
                         'foreign_field' => 'ffield'
-                    )
-                ),
-                array(
-                    'field' => array(
+                    ]
+                ],
+                [
+                    'field' => [
                         'values' => 'test-',
                         'transformation' => 'testfoo',
                         'mimetype' => 'test<'
-                    )
-                )
+                    ]
+                ]
             );
 
         $dbi->expects($this->once())
@@ -593,14 +593,14 @@ class ExportHtmlwordTest extends PmaTestCase
             ->with('database', '')
             ->will($this->returnValue($keys));
 
-        $columns = array(
+        $columns = [
             'Field' => 'fieldname'
-        );
+        ];
 
         $dbi->expects($this->once())
             ->method('getColumns')
             ->with('database', '')
-            ->will($this->returnValue(array($columns)));
+            ->will($this->returnValue([$columns]));
 
         $dbi->expects($this->any())
             ->method('query')
@@ -614,9 +614,9 @@ class ExportHtmlwordTest extends PmaTestCase
             ->method('fetchAssoc')
             ->will(
                 $this->returnValue(
-                    array(
-                        'comment' => array('field' => 'testComment')
-                    )
+                    [
+                        'comment' => ['field' => 'testComment']
+                    ]
                 )
             );
         $dbi->expects($this->any())->method('escapeString')
@@ -625,7 +625,7 @@ class ExportHtmlwordTest extends PmaTestCase
         $GLOBALS['dbi'] = $dbi;
 
         $GLOBALS['cfgRelation']['relation'] = true;
-        $_SESSION['relation'][0] = array(
+        $_SESSION['relation'][0] = [
             'PMA_VERSION' => PMA_VERSION,
             'relwork' => true,
             'commwork' => true,
@@ -633,7 +633,7 @@ class ExportHtmlwordTest extends PmaTestCase
             'db' => 'database',
             'relation' => 'rel',
             'column_info' => 'col'
-        );
+        ];
 
         $result = $this->object->getTableDef(
             'database',
@@ -664,14 +664,14 @@ class ExportHtmlwordTest extends PmaTestCase
             ->with('database', '')
             ->will($this->returnValue($keys));
 
-        $columns = array(
+        $columns = [
             'Field' => 'fieldname'
-        );
+        ];
 
         $dbi->expects($this->once())
             ->method('getColumns')
             ->with('database', '')
-            ->will($this->returnValue(array($columns)));
+            ->will($this->returnValue([$columns]));
 
         $dbi->expects($this->any())
             ->method('query')
@@ -685,9 +685,9 @@ class ExportHtmlwordTest extends PmaTestCase
             ->method('fetchAssoc')
             ->will(
                 $this->returnValue(
-                    array(
-                        'comment' => array('field' => 'testComment')
-                    )
+                    [
+                        'comment' => ['field' => 'testComment']
+                    ]
                 )
             );
         $dbi->expects($this->any())->method('escapeString')
@@ -696,7 +696,7 @@ class ExportHtmlwordTest extends PmaTestCase
         $GLOBALS['dbi'] = $dbi;
 
         $GLOBALS['cfgRelation']['relation'] = true;
-        $_SESSION['relation'][0] = array(
+        $_SESSION['relation'][0] = [
             'PMA_VERSION' => PMA_VERSION,
             'relwork' => false,
             'commwork' => false,
@@ -704,7 +704,7 @@ class ExportHtmlwordTest extends PmaTestCase
             'db' => 'database',
             'relation' => 'rel',
             'column_info' => 'col'
-        );
+        ];
 
         $result = $this->object->getTableDef(
             'database',
@@ -735,14 +735,14 @@ class ExportHtmlwordTest extends PmaTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $triggers = array(
-            array(
+        $triggers = [
+            [
                 'name' => 'tna"me',
                 'action_timing' => 'ac>t',
                 'event_manipulation' => 'manip&',
                 'definition' => 'def'
-            )
-        );
+            ]
+        ];
 
         $dbi->expects($this->once())
             ->method('getTriggers')
@@ -782,7 +782,7 @@ class ExportHtmlwordTest extends PmaTestCase
             ->will($this->returnValue(1));
 
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportHtmlword')
-            ->setMethods(array('getTableDef', 'getTriggers', 'getTableDefStandIn'))
+            ->setMethods(['getTableDef', 'getTriggers', 'getTableDefStandIn'])
             ->getMock();
 
         $this->object->expects($this->at(0))
@@ -797,7 +797,7 @@ class ExportHtmlwordTest extends PmaTestCase
 
         $this->object->expects($this->at(2))
             ->method('getTableDef')
-            ->with('db', 'tbl', false, false, false, true, array())
+            ->with('db', 'tbl', false, false, false, true, [])
             ->will($this->returnValue('dumpText3'));
 
         $this->object->expects($this->once())
@@ -872,16 +872,16 @@ class ExportHtmlwordTest extends PmaTestCase
         );
         $method->setAccessible(true);
 
-        $cols = array(
+        $cols = [
             'Null' => 'Yes',
             'Field' => 'field',
             'Key' => 'PRI',
             'Type' => 'set(abc)enum123'
-        );
+        ];
 
-        $unique_keys = array(
+        $unique_keys = [
             'field'
-        );
+        ];
 
         $this->assertEquals(
             '<tr class="print-category"><td class="print"><em>' .
@@ -890,17 +890,17 @@ class ExportHtmlwordTest extends PmaTestCase
             $method->invoke($this->object, $cols, $unique_keys)
         );
 
-        $cols = array(
+        $cols = [
             'Null' => 'NO',
             'Field' => 'fields',
             'Key' => 'COMP',
             'Type' => '',
             'Default' => 'def'
-        );
+        ];
 
-        $unique_keys = array(
+        $unique_keys = [
             'field'
-        );
+        ];
 
         $this->assertEquals(
             '<tr class="print-category"><td class="print">fields</td>' .
diff --git a/test/classes/Plugins/Export/ExportJsonTest.php b/test/classes/Plugins/Export/ExportJsonTest.php
index 460cf75a1c..b757860e59 100644
--- a/test/classes/Plugins/Export/ExportJsonTest.php
+++ b/test/classes/Plugins/Export/ExportJsonTest.php
@@ -234,12 +234,12 @@ class ExportJsonTest extends PmaTestCase
         $dbi->expects($this->at(3))
             ->method('fetchRow')
             ->with(null)
-            ->will($this->returnValue(array('foo')));
+            ->will($this->returnValue(['foo']));
 
         $dbi->expects($this->at(4))
             ->method('fetchRow')
             ->with(null)
-            ->will($this->returnValue(array('bar')));
+            ->will($this->returnValue(['bar']));
 
         $dbi->expects($this->at(5))
             ->method('fetchRow')
diff --git a/test/classes/Plugins/Export/ExportLatexTest.php b/test/classes/Plugins/Export/ExportLatexTest.php
index 5ef6ddf8e8..10f9ce816a 100644
--- a/test/classes/Plugins/Export/ExportLatexTest.php
+++ b/test/classes/Plugins/Export/ExportLatexTest.php
@@ -37,7 +37,7 @@ class ExportLatexTest extends PmaTestCase
         $GLOBALS['buffer_needed'] = false;
         $GLOBALS['asfile'] = true;
         $GLOBALS['save_on_server'] = false;
-        $GLOBALS['plugin_param'] = array();
+        $GLOBALS['plugin_param'] = [];
         $GLOBALS['plugin_param']['export_type'] = 'table';
         $GLOBALS['plugin_param']['single_table'] = false;
         $GLOBALS['cfgRelation']['relation'] = true;
@@ -177,11 +177,11 @@ class ExportLatexTest extends PmaTestCase
         );
 
         $this->assertEquals(
-            array(
+            [
                 'structure' => __('structure'),
                 'data' => __('data'),
                 'structure_and_data' => __('structure and data')
-            ),
+            ],
             $property->getValues()
         );
 
@@ -576,12 +576,12 @@ class ExportLatexTest extends PmaTestCase
         $dbi->expects($this->at(3))
             ->method('fetchAssoc')
             ->with(null)
-            ->will($this->returnValue(array('f1' => 'foo$%')));
+            ->will($this->returnValue(['f1' => 'foo$%']));
 
         $dbi->expects($this->at(4))
             ->method('fetchAssoc')
             ->with(null)
-            ->will($this->returnValue(array('f1' => null)));
+            ->will($this->returnValue(['f1' => null]));
 
         $dbi->expects($this->at(5))
             ->method('fetchAssoc')
@@ -632,12 +632,12 @@ class ExportLatexTest extends PmaTestCase
         $dbi->expects($this->at(3))
             ->method('fetchAssoc')
             ->with(null)
-            ->will($this->returnValue(array('f1' => 'foo$%')));
+            ->will($this->returnValue(['f1' => 'foo$%']));
 
         $dbi->expects($this->at(4))
             ->method('fetchAssoc')
             ->with(null)
-            ->will($this->returnValue(array('f1' => null)));
+            ->will($this->returnValue(['f1' => null]));
 
         $dbi->expects($this->at(5))
             ->method('fetchAssoc')
@@ -669,16 +669,16 @@ class ExportLatexTest extends PmaTestCase
         //     ->setMethods(array('formatOneColumnDefinition'))
         //     ->getMock();
 
-        $keys = array(
-            array(
+        $keys = [
+            [
                 'Non_unique' => 0,
                 'Column_name' => 'name1'
-            ),
-            array(
+            ],
+            [
                 'Non_unique' => 1,
                 'Column_name' => 'name2'
-            )
-        );
+            ]
+        ];
 
         // case 1
 
@@ -694,31 +694,31 @@ class ExportLatexTest extends PmaTestCase
         $dbi->expects($this->exactly(2))
             ->method('fetchResult')
             ->willReturnOnConsecutiveCalls(
-                array(),
-                array(
-                    'name1' => array(
+                [],
+                [
+                    'name1' => [
                         'values' => 'test-',
                         'transformation' => 'testfoo',
                         'mimetype' => 'testmimetype_'
-                    )
-                )
+                    ]
+                ]
             );
 
-        $columns = array(
-            array(
+        $columns = [
+            [
                 'Null' => 'Yes',
                 'Field' => 'name1',
                 'Key' => 'PRI',
                 'Type' => 'set(abc)enum123'
-            ),
-            array(
+            ],
+            [
                 'Null' => 'NO',
                 'Field' => 'fields',
                 'Key' => 'COMP',
                 'Type' => '',
                 'Default' => 'def'
-            )
-        );
+            ]
+        ];
         $dbi->expects($this->once())
             ->method('getColumns')
             ->with('database', '')
@@ -736,9 +736,9 @@ class ExportLatexTest extends PmaTestCase
             ->method('fetchAssoc')
             ->will(
                 $this->returnValue(
-                    array(
-                        'comment' => array('name1' => 'testComment')
-                    )
+                    [
+                        'comment' => ['name1' => 'testComment']
+                    ]
                 )
             );
 
@@ -748,7 +748,7 @@ class ExportLatexTest extends PmaTestCase
         }
 
         $GLOBALS['cfgRelation']['relation'] = true;
-        $_SESSION['relation'][0] = array(
+        $_SESSION['relation'][0] = [
             'PMA_VERSION' => PMA_VERSION,
             'relwork' => true,
             'commwork' => true,
@@ -756,7 +756,7 @@ class ExportLatexTest extends PmaTestCase
             'db' => 'database',
             'relation' => 'rel',
             'column_info' => 'col'
-        );
+        ];
 
         ob_start();
         $this->assertTrue(
@@ -807,20 +807,20 @@ class ExportLatexTest extends PmaTestCase
         $dbi->expects($this->exactly(2))
             ->method('fetchResult')
             ->willReturnOnConsecutiveCalls(
-                array(
-                    'name1' => array(
+                [
+                    'name1' => [
                         'foreign_table' => 'ftable',
                         'foreign_field' => 'ffield'
-                    ),
-                    'foreign_keys_data' => array()
-                ),
-                array(
-                    'field' => array(
+                    ],
+                    'foreign_keys_data' => []
+                ],
+                [
+                    'field' => [
                         'values' => 'test-',
                         'transformation' => 'testfoo',
                         'mimetype' => 'test<'
-                    )
-                )
+                    ]
+                ]
             );
 
         $dbi->expects($this->once())
@@ -845,16 +845,16 @@ class ExportLatexTest extends PmaTestCase
             ->method('fetchAssoc')
             ->will(
                 $this->returnValue(
-                    array(
-                        'comment' => array('field' => 'testComment')
-                    )
+                    [
+                        'comment' => ['field' => 'testComment']
+                    ]
                 )
             );
 
         $GLOBALS['dbi'] = $dbi;
 
         $GLOBALS['cfgRelation']['relation'] = true;
-        $_SESSION['relation'][0] = array(
+        $_SESSION['relation'][0] = [
             'PMA_VERSION' => PMA_VERSION,
             'relwork' => true,
             'commwork' => true,
@@ -862,7 +862,7 @@ class ExportLatexTest extends PmaTestCase
             'db' => 'database',
             'relation' => 'rel',
             'column_info' => 'col'
-        );
+        ];
 
         ob_start();
         $this->assertTrue(
@@ -914,9 +914,9 @@ class ExportLatexTest extends PmaTestCase
             ->method('fetchAssoc')
             ->will(
                 $this->returnValue(
-                    array(
-                        'comment' => array('field' => 'testComment')
-                    )
+                    [
+                        'comment' => ['field' => 'testComment']
+                    ]
                 )
             );
 
@@ -930,7 +930,7 @@ class ExportLatexTest extends PmaTestCase
         $GLOBALS['cfg']['Server']['host'] = 'localhost';
         $GLOBALS['cfg']['Server']['verbose'] = 'verb';
 
-        $_SESSION['relation'][0] = array(
+        $_SESSION['relation'][0] = [
             'PMA_VERSION' => PMA_VERSION,
             'relwork' => false,
             'commwork' => false,
@@ -938,7 +938,7 @@ class ExportLatexTest extends PmaTestCase
             'db' => 'database',
             'relation' => 'rel',
             'column_info' => 'col'
-        );
+        ];
 
         ob_start();
         $this->assertTrue(
diff --git a/test/classes/Plugins/Export/ExportMediawikiTest.php b/test/classes/Plugins/Export/ExportMediawikiTest.php
index 11a0f24200..dec60dbb39 100644
--- a/test/classes/Plugins/Export/ExportMediawikiTest.php
+++ b/test/classes/Plugins/Export/ExportMediawikiTest.php
@@ -153,11 +153,11 @@ class ExportMediawikiTest extends PmaTestCase
         );
 
         $this->assertEquals(
-            array(
+            [
                 'structure' => __('structure'),
                 'data' => __('data'),
                 'structure_and_data' => __('structure and data')
-            ),
+            ],
             $sgHeader->getValues()
         );
 
@@ -267,24 +267,24 @@ class ExportMediawikiTest extends PmaTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $columns = array(
-            array(
+        $columns = [
+            [
                 'Null' => 'Yes',
                 'Field' => 'name1',
                 'Key' => 'PRI',
                 'Type' => 'set(abc)enum123',
                 'Default' => '',
                 'Extra' => ''
-            ),
-            array(
+            ],
+            [
                 'Null' => 'NO',
                 'Field' => 'fields',
                 'Key' => 'COMP',
                 'Type' => '',
                 'Default' => 'def',
                 'Extra' => 'ext'
-            )
-        );
+            ]
+        ];
 
         $dbi->expects($this->at(0))
             ->method('getColumns')
@@ -348,7 +348,7 @@ class ExportMediawikiTest extends PmaTestCase
         $dbi->expects($this->once())
             ->method('getColumnNames')
             ->with('db', 'table')
-            ->will($this->returnValue(array('name1', 'fields')));
+            ->will($this->returnValue(['name1', 'fields']));
 
         $dbi->expects($this->once())
             ->method('query')
@@ -363,12 +363,12 @@ class ExportMediawikiTest extends PmaTestCase
         $dbi->expects($this->at(3))
             ->method('fetchRow')
             ->with(true)
-            ->will($this->returnValue(array('r1', 'r2')));
+            ->will($this->returnValue(['r1', 'r2']));
 
         $dbi->expects($this->at(4))
             ->method('fetchRow')
             ->with(true)
-            ->will($this->returnValue(array('r3', '')));
+            ->will($this->returnValue(['r3', '']));
 
         $dbi->expects($this->at(4))
             ->method('fetchRow')
diff --git a/test/classes/Plugins/Export/ExportOdsTest.php b/test/classes/Plugins/Export/ExportOdsTest.php
index 6885180d81..5ce85ea51e 100644
--- a/test/classes/Plugins/Export/ExportOdsTest.php
+++ b/test/classes/Plugins/Export/ExportOdsTest.php
@@ -272,7 +272,7 @@ class ExportOdsTest extends PmaTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $flags = array();
+        $flags = [];
         $a = new stdClass;
         $flags[] = $a;
 
@@ -346,10 +346,10 @@ class ExportOdsTest extends PmaTestCase
             ->with(true)
             ->will(
                 $this->returnValue(
-                    array(
+                    [
                         null, '01-01-2000', '01-01-2000', '01-01-2000 10:00:00',
                         "01-01-2014 10:02:00", "t>s", "a&b", "<"
-                    )
+                    ]
                 )
             );
 
@@ -397,7 +397,7 @@ class ExportOdsTest extends PmaTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $flags = array();
+        $flags = [];
 
         $dbi->expects($this->once())
             ->method('getFieldsMeta')
@@ -462,7 +462,7 @@ class ExportOdsTest extends PmaTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $flags = array();
+        $flags = [];
 
         $dbi->expects($this->once())
             ->method('getFieldsMeta')
diff --git a/test/classes/Plugins/Export/ExportOdtTest.php b/test/classes/Plugins/Export/ExportOdtTest.php
index 6fd5c0cae9..5257fd9ff2 100644
--- a/test/classes/Plugins/Export/ExportOdtTest.php
+++ b/test/classes/Plugins/Export/ExportOdtTest.php
@@ -39,7 +39,7 @@ class ExportOdtTest extends PmaTestCase
         $GLOBALS['buffer_needed'] = false;
         $GLOBALS['asfile'] = true;
         $GLOBALS['save_on_server'] = false;
-        $GLOBALS['plugin_param'] = array();
+        $GLOBALS['plugin_param'] = [];
         $GLOBALS['plugin_param']['export_type'] = 'table';
         $GLOBALS['plugin_param']['single_table'] = false;
         $GLOBALS['cfgRelation']['relation'] = true;
@@ -150,11 +150,11 @@ class ExportOdtTest extends PmaTestCase
         );
 
         $this->assertEquals(
-            array(
+            [
                 'structure' => __('structure'),
                 'data' => __('data'),
                 'structure_and_data' => __('structure and data')
-            ),
+            ],
             $property->getValues()
         );
 
@@ -414,7 +414,7 @@ class ExportOdtTest extends PmaTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $flags = array();
+        $flags = [];
         $a = new stdClass;
         $flags[] = $a;
 
@@ -462,9 +462,9 @@ class ExportOdtTest extends PmaTestCase
             ->with(true)
             ->will(
                 $this->returnValue(
-                    array(
+                    [
                         null, 'a<b', 'a>b', 'a&b'
-                    )
+                    ]
                 )
             );
 
@@ -510,7 +510,7 @@ class ExportOdtTest extends PmaTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $flags = array();
+        $flags = [];
 
         $dbi->expects($this->once())
             ->method('getFieldsMeta')
@@ -575,7 +575,7 @@ class ExportOdtTest extends PmaTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $flags = array();
+        $flags = [];
 
         $dbi->expects($this->once())
             ->method('getFieldsMeta')
@@ -638,13 +638,13 @@ class ExportOdtTest extends PmaTestCase
         $dbi->expects($this->once())
             ->method('getColumns')
             ->with('db', 'v&w')
-            ->will($this->returnValue(array(1, 2)));
+            ->will($this->returnValue([1, 2]));
 
         $GLOBALS['dbi'] = $dbi;
 
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportOdt')
             ->disableOriginalConstructor()
-            ->setMethods(array('formatOneColumnDefinition'))
+            ->setMethods(['formatOneColumnDefinition'])
             ->getMock();
 
         $this->object->expects($this->at(0))
@@ -681,7 +681,7 @@ class ExportOdtTest extends PmaTestCase
     public function testGetTableDef()
     {
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportOdt')
-            ->setMethods(array('formatOneColumnDefinition'))
+            ->setMethods(['formatOneColumnDefinition'])
             ->getMock();
 
         // case 1
@@ -693,23 +693,23 @@ class ExportOdtTest extends PmaTestCase
         $dbi->expects($this->exactly(2))
             ->method('fetchResult')
             ->willReturnOnConsecutiveCalls(
-                array(),
-                array(
-                    'fieldname' => array(
+                [],
+                [
+                    'fieldname' => [
                         'values' => 'test-',
                         'transformation' => 'testfoo',
                         'mimetype' => 'test<'
-                    )
-                )
+                    ]
+                ]
             );
 
-        $columns = array(
+        $columns = [
             'Field' => 'fieldname'
-        );
+        ];
         $dbi->expects($this->once())
             ->method('getColumns')
             ->with('database', '')
-            ->will($this->returnValue(array($columns)));
+            ->will($this->returnValue([$columns]));
 
         $dbi->expects($this->any())
             ->method('query')
@@ -723,9 +723,9 @@ class ExportOdtTest extends PmaTestCase
             ->method('fetchAssoc')
             ->will(
                 $this->returnValue(
-                    array(
-                        'comment' => array('fieldname' => 'testComment')
-                    )
+                    [
+                        'comment' => ['fieldname' => 'testComment']
+                    ]
                 )
             );
 
@@ -733,11 +733,11 @@ class ExportOdtTest extends PmaTestCase
 
         $this->object->expects($this->exactly(2))
             ->method('formatOneColumnDefinition')
-            ->with(array('Field' => 'fieldname'))
+            ->with(['Field' => 'fieldname'])
             ->will($this->returnValue(1));
 
         $GLOBALS['cfgRelation']['relation'] = true;
-        $_SESSION['relation'][0] = array(
+        $_SESSION['relation'][0] = [
             'PMA_VERSION' => PMA_VERSION,
             'relwork' => true,
             'commwork' => true,
@@ -745,7 +745,7 @@ class ExportOdtTest extends PmaTestCase
             'db' => 'database',
             'relation' => 'rel',
             'column_info' => 'col'
-        );
+        ];
         $this->assertTrue(
             $this->object->getTableDef(
                 'database',
@@ -793,29 +793,29 @@ class ExportOdtTest extends PmaTestCase
         $dbi->expects($this->exactly(2))
             ->method('fetchResult')
             ->willReturnOnConsecutiveCalls(
-                array(
-                    'fieldname' => array(
+                [
+                    'fieldname' => [
                         'foreign_table' => 'ftable',
                         'foreign_field' => 'ffield'
-                    )
-                ),
-                array(
-                    'field' => array(
+                    ]
+                ],
+                [
+                    'field' => [
                         'values' => 'test-',
                         'transformation' => 'testfoo',
                         'mimetype' => 'test<'
-                    )
-                )
+                    ]
+                ]
             );
 
-        $columns = array(
+        $columns = [
             'Field' => 'fieldname'
-        );
+        ];
 
         $dbi->expects($this->once())
             ->method('getColumns')
             ->with('database', '')
-            ->will($this->returnValue(array($columns)));
+            ->will($this->returnValue([$columns]));
 
         $dbi->expects($this->any())
             ->method('query')
@@ -829,16 +829,16 @@ class ExportOdtTest extends PmaTestCase
             ->method('fetchAssoc')
             ->will(
                 $this->returnValue(
-                    array(
-                        'comment' => array('field' => 'testComment')
-                    )
+                    [
+                        'comment' => ['field' => 'testComment']
+                    ]
                 )
             );
 
         $GLOBALS['dbi'] = $dbi;
         $GLOBALS['odt_buffer'] = '';
         $GLOBALS['cfgRelation']['relation'] = true;
-        $_SESSION['relation'][0] = array(
+        $_SESSION['relation'][0] = [
             'PMA_VERSION' => PMA_VERSION,
             'relwork' => true,
             'commwork' => true,
@@ -846,7 +846,7 @@ class ExportOdtTest extends PmaTestCase
             'db' => 'database',
             'relation' => 'rel',
             'column_info' => 'col'
-        );
+        ];
 
         $this->assertTrue(
             $this->object->getTableDef(
@@ -877,14 +877,14 @@ class ExportOdtTest extends PmaTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $triggers = array(
-            array(
+        $triggers = [
+            [
                 'name' => 'tna"me',
                 'action_timing' => 'ac>t',
                 'event_manipulation' => 'manip&',
                 'definition' => 'def'
-            )
-        );
+            ]
+        ];
 
         $dbi->expects($this->once())
             ->method('getTriggers')
@@ -945,7 +945,7 @@ class ExportOdtTest extends PmaTestCase
             ->will($this->returnValue(1));
 
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportOdt')
-            ->setMethods(array('getTableDef', 'getTriggers', 'getTableDefStandIn'))
+            ->setMethods(['getTableDef', 'getTriggers', 'getTableDefStandIn'])
             ->getMock();
 
         $this->object->expects($this->at(0))
@@ -1043,12 +1043,12 @@ class ExportOdtTest extends PmaTestCase
         );
         $method->setAccessible(true);
 
-        $cols = array(
+        $cols = [
             'Null' => 'Yes',
             'Field' => 'field',
             'Key' => 'PRI',
             'Type' => 'set(abc)enum123'
-        );
+        ];
 
         $col_alias = 'alias';
 
@@ -1062,13 +1062,13 @@ class ExportOdtTest extends PmaTestCase
             $method->invoke($this->object, $cols, $col_alias)
         );
 
-        $cols = array(
+        $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 b9ba1de3fe..7c714e2f15 100644
--- a/test/classes/Plugins/Export/ExportPdfTest.php
+++ b/test/classes/Plugins/Export/ExportPdfTest.php
@@ -167,11 +167,11 @@ class ExportPdfTest extends PmaTestCase
         );
 
         $this->assertEquals(
-            array(
+            [
                 'structure' => __('structure'),
                 'data' => __('data'),
                 'structure_and_data' => __('structure and data')
-            ),
+            ],
             $property->getValues()
         );
 
@@ -279,11 +279,11 @@ class ExportPdfTest extends PmaTestCase
         $pdf->expects($this->once())
             ->method('setAttributes')
             ->with(
-                array(
+                [
                     'currentDb' => 'db', 'currentTable' => 'table',
                     'dbAlias' => 'db', 'tableAlias' => 'table',
-                    'aliases' => array()
-                )
+                    'aliases' => []
+                ]
             );
 
         $pdf->expects($this->once())
diff --git a/test/classes/Plugins/Export/ExportPhparrayTest.php b/test/classes/Plugins/Export/ExportPhparrayTest.php
index 9bbb963a3d..9e6354bae0 100644
--- a/test/classes/Plugins/Export/ExportPhparrayTest.php
+++ b/test/classes/Plugins/Export/ExportPhparrayTest.php
@@ -238,7 +238,7 @@ class ExportPhparrayTest extends PmaTestCase
         $dbi->expects($this->at(4))
             ->method('fetchRow')
             ->with(true)
-            ->will($this->returnValue(array(1, 'a')));
+            ->will($this->returnValue([1, 'a']));
 
         $dbi->expects($this->at(5))
             ->method('fetchRow')
diff --git a/test/classes/Plugins/Export/ExportSqlTest.php b/test/classes/Plugins/Export/ExportSqlTest.php
index bda8104de0..087d70aceb 100644
--- a/test/classes/Plugins/Export/ExportSqlTest.php
+++ b/test/classes/Plugins/Export/ExportSqlTest.php
@@ -40,7 +40,7 @@ class ExportSqlTest extends PmaTestCase
         $GLOBALS['buffer_needed'] = false;
         $GLOBALS['asfile'] = false;
         $GLOBALS['save_on_server'] = false;
-        $GLOBALS['plugin_param'] = array();
+        $GLOBALS['plugin_param'] = [];
         $GLOBALS['plugin_param']['export_type'] = 'table';
         $GLOBALS['plugin_param']['single_table'] = false;
         $GLOBALS['cfgRelation']['relation'] = true;
@@ -89,7 +89,7 @@ class ExportSqlTest extends PmaTestCase
 
         $dbi->expects($this->once())
             ->method('getCompatibilities')
-            ->will($this->returnValue(array('v1', 'v2')));
+            ->will($this->returnValue(['v1', 'v2']));
 
         $dbi->expects($this->any())->method('escapeString')
             ->will($this->returnArgument(0));
@@ -200,10 +200,10 @@ class ExportSqlTest extends PmaTestCase
         );
 
         $this->assertEquals(
-            array(
+            [
                 'v1' => 'v1',
                 'v2' => 'v2'
-            ),
+            ],
             $property->getValues()
         );
 
@@ -335,12 +335,12 @@ class ExportSqlTest extends PmaTestCase
         $dbi->expects($this->at(0))
             ->method('getProceduresOrFunctions')
             ->with('db', 'PROCEDURE')
-            ->will($this->returnValue(array('p1', 'p2')));
+            ->will($this->returnValue(['p1', 'p2']));
 
         $dbi->expects($this->at(1))
             ->method('getProceduresOrFunctions')
             ->with('db', 'FUNCTION')
-            ->will($this->returnValue(array('f1')));
+            ->will($this->returnValue(['f1']));
 
         $dbi->expects($this->at(2))
             ->method('getDefinition')
@@ -706,16 +706,16 @@ class ExportSqlTest extends PmaTestCase
                 'SELECT EVENT_NAME FROM information_schema.EVENTS WHERE'
                 . ' EVENT_SCHEMA= \'db\';'
             )
-            ->will($this->returnValue(array('f1', 'f2')));
+            ->will($this->returnValue(['f1', 'f2']));
 
         $dbi->expects($this->exactly(2))
             ->method('getDefinition')
             ->will(
                 $this->returnValueMap(
-                    array(
-                        array('db', 'EVENT', 'f1', DatabaseInterface::CONNECT_USER, 'f1event'),
-                        array('db', 'EVENT', 'f2', DatabaseInterface::CONNECT_USER, 'f2event')
-                    )
+                    [
+                        ['db', 'EVENT', 'f1', DatabaseInterface::CONNECT_USER, 'f1event'],
+                        ['db', 'EVENT', 'f2', DatabaseInterface::CONNECT_USER, 'f2event']
+                    ]
                 )
             );
         $dbi->expects($this->any())->method('escapeString')
@@ -803,7 +803,7 @@ class ExportSqlTest extends PmaTestCase
             ->with('db', 'view')
             ->will(
                 $this->returnValue(
-                    array('cname' => array('Type' => 'int'))
+                    ['cname' => ['Type' => 'int']]
                 )
             );
 
@@ -843,16 +843,16 @@ class ExportSqlTest extends PmaTestCase
             ->with('db', 'view')
             ->will(
                 $this->returnValue(
-                    array(
-                        'cname' => array(
+                    [
+                        'cname' => [
                             'Type' => 'char',
                             'Collation' => 'utf-8',
                             'Null' => 'NO',
                             'Default' => 'a',
                             'Comment' => 'cmt',
                             'Field' => 'fname'
-                        )
-                    )
+                        ]
+                    ]
                 )
             );
 
@@ -886,15 +886,15 @@ class ExportSqlTest extends PmaTestCase
             ->with('db', 'view')
             ->will(
                 $this->returnValue(
-                    array(
-                        'cname' => array(
+                    [
+                        'cname' => [
                             'Type' => 'char',
                             'Collation' => 'utf-8',
                             'Null' => 'YES',
                             'Comment' => 'cmt',
                             'Field' => 'fname'
-                        )
-                    )
+                        ]
+                    ]
                 )
             );
         $GLOBALS['dbi'] = $dbi;
@@ -955,12 +955,12 @@ class ExportSqlTest extends PmaTestCase
             ->method('fetchValue')
             ->will($this->returnValue(false));
 
-        $tmpres = array(
+        $tmpres = [
             'Auto_increment' => 1,
             'Create_time' => '2000-01-01 10:00:00',
             'Update_time' => '2000-01-02 12:00:00',
             'Check_time' => '2000-01-02 13:00:00',
-        );
+        ];
 
         $dbi->expects($this->once())
             ->method('fetchAssoc')
@@ -970,15 +970,15 @@ class ExportSqlTest extends PmaTestCase
         $dbi->expects($this->exactly(2))
             ->method('tryQuery')
             ->withConsecutive(
-                array("SHOW TABLE STATUS FROM `db` WHERE Name = 'table'"),
-                array('SHOW CREATE TABLE `db`.`table`')
+                ["SHOW TABLE STATUS FROM `db` WHERE Name = 'table'"],
+                ['SHOW CREATE TABLE `db`.`table`']
             )
             ->willReturnOnConsecutiveCalls(
                 'res',
                 'res'
             );
 
-        $row = array(
+        $row = [
             '',
             "CREATE TABLE `table` (\n" .
             "`payment_id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,\n" .
@@ -996,15 +996,15 @@ class ExportSqlTest extends PmaTestCase
             "CONSTRAINT `fk_payment_rental` FOREIGN KEY (`rental_id`) REFERENCES `rental` (`rental_id`) ON DELETE SET NULL ON UPDATE CASCADE,\n" .
             "CONSTRAINT `fk_payment_staff` FOREIGN KEY (`staff_id`) REFERENCES `staff` (`staff_id`) ON UPDATE CASCADE\n" .
             ") ENGINE=InnoDB AUTO_INCREMENT=16050 DEFAULT CHARSET=utf8\n"
-        );
+        ];
 
         $dbi->expects($this->exactly(1))
             ->method('fetchRow')
             ->will(
                 $this->returnValueMap(
-                    array(
-                        array('res', $row)
-                    )
+                    [
+                        ['res', $row]
+                    ]
                 )
             );
         $dbi->expects($this->once())
@@ -1129,12 +1129,12 @@ class ExportSqlTest extends PmaTestCase
             ->method('fetchValue')
             ->will($this->returnValue(false));
 
-        $tmpres = array(
+        $tmpres = [
             'Auto_increment' => 1,
             'Create_time' => '2000-01-01 10:00:00',
             'Update_time' => '2000-01-02 12:00:00',
             'Check_time' => '2000-01-02 13:00:00',
-        );
+        ];
 
         $dbi->expects($this->once())
             ->method('fetchAssoc')
@@ -1144,8 +1144,8 @@ class ExportSqlTest extends PmaTestCase
         $dbi->expects($this->exactly(2))
             ->method('tryQuery')
             ->withConsecutive(
-                array("SHOW TABLE STATUS FROM `db` WHERE Name = 'table'"),
-                array('SHOW CREATE TABLE `db`.`table`')
+                ["SHOW TABLE STATUS FROM `db` WHERE Name = 'table'"],
+                ['SHOW CREATE TABLE `db`.`table`']
             )
             ->willReturnOnConsecutiveCalls(
                 'res',
@@ -1183,7 +1183,7 @@ class ExportSqlTest extends PmaTestCase
      */
     public function testGetTableComments()
     {
-        $_SESSION['relation'][0] = array(
+        $_SESSION['relation'][0] = [
             'PMA_VERSION' => PMA_VERSION,
             'relwork' => true,
             'commwork' => true,
@@ -1191,7 +1191,7 @@ class ExportSqlTest extends PmaTestCase
             'db' => 'database',
             'relation' => 'rel',
             'column_info' => 'col'
-        );
+        ];
         $GLOBALS['sql_include_comments'] = true;
         $GLOBALS['crlf'] = "\n";
 
@@ -1205,19 +1205,19 @@ class ExportSqlTest extends PmaTestCase
         $dbi->expects($this->exactly(2))
             ->method('fetchResult')
             ->willReturnOnConsecutiveCalls(
-                array(
-                    'foo' => array(
+                [
+                    'foo' => [
                         'foreign_table' => 'ftable',
                         'foreign_field' => 'ffield'
-                    )
-                ),
-                array(
-                    'fieldname' => array(
+                    ]
+                ],
+                [
+                    'fieldname' => [
                         'values' => 'test-',
                         'transformation' => 'testfoo',
                         'mimetype' => 'test<'
-                    )
-                )
+                    ]
+                ]
             );
 
         $GLOBALS['dbi'] = $dbi;
@@ -1263,14 +1263,14 @@ class ExportSqlTest extends PmaTestCase
             ->with('db', 't&bl')
             ->will(
                 $this->returnValue(
-                    array(
-                        array('create' => 'bar', 'drop' => 'foo')
-                    )
+                    [
+                        ['create' => 'bar', 'drop' => 'foo']
+                    ]
                 )
             );
 
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportSql')
-            ->setMethods(array('getTableDef', 'getTriggers', 'getTableDefStandIn'))
+            ->setMethods(['getTableDef', 'getTriggers', 'getTableDefStandIn'])
             ->getMock();
 
         $this->object->expects($this->at(0))
@@ -1376,7 +1376,7 @@ class ExportSqlTest extends PmaTestCase
             ->method('getColumns')
             ->will(
                 $this->returnValue(
-                    array()
+                    []
                 )
             );
         $GLOBALS['dbi'] = $dbi;
@@ -1428,7 +1428,7 @@ class ExportSqlTest extends PmaTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $flags = array();
+        $flags = [];
         $a = new stdClass;
         $a->blob = false;
         $a->numeric = true;
@@ -1495,7 +1495,7 @@ class ExportSqlTest extends PmaTestCase
         $dbi->expects($this->exactly(2))
             ->method('fetchRow')
             ->willReturnOnConsecutiveCalls(
-                array(null, 'test', '10', '6', "\x00\x0a\x0d\x1a"),
+                [null, 'test', '10', '6', "\x00\x0a\x0d\x1a"],
                 null
             );
         $dbi->expects($this->any())->method('escapeString')
@@ -1576,7 +1576,7 @@ class ExportSqlTest extends PmaTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $flags = array();
+        $flags = [];
         $a = new stdClass;
         $a->blob = false;
         $a->numeric = true;
@@ -1626,7 +1626,7 @@ class ExportSqlTest extends PmaTestCase
         $dbi->expects($this->exactly(2))
             ->method('fetchRow')
             ->willReturnOnConsecutiveCalls(
-                array(null, null),
+                [null, null],
                 null
             );
 
@@ -1842,19 +1842,19 @@ class ExportSqlTest extends PmaTestCase
     */
     public function testInitAlias()
     {
-        $aliases = array(
-            'a' => array(
+        $aliases = [
+            'a' => [
                 'alias' => 'aliastest',
-                'tables' => array(
-                    'foo' => array(
+                'tables' => [
+                    'foo' => [
                         'alias' => 'qwerty'
-                    ),
-                    'bar' => array(
+                    ],
+                    'bar' => [
                         'alias' => 'f'
-                    )
-                )
-            )
-        );
+                    ]
+                ]
+            ]
+        ];
         $db = 'a';
         $table = null;
 
@@ -1884,26 +1884,26 @@ class ExportSqlTest extends PmaTestCase
     */
     public function testGetAlias()
     {
-        $aliases = array(
-            'a' => array(
+        $aliases = [
+            'a' => [
                 'alias' => 'aliastest',
-                'tables' => array(
-                    'foo' => array(
+                'tables' => [
+                    'foo' => [
                         'alias' => 'qwerty',
-                        'columns' => array(
+                        'columns' => [
                             'baz' => 'p',
                             'pqr' => 'pphymdain'
-                        )
-                    ),
-                    'bar' => array(
+                        ]
+                    ],
+                    'bar' => [
                         'alias' => 'f',
-                        'columns' => array(
+                        'columns' => [
                             'xy' => 'n'
-                        )
-                    )
-                )
-            )
-        );
+                        ]
+                    ]
+                ]
+            ]
+        ];
 
         $this->assertEquals(
             'f', $this->object->getAlias($aliases, 'bar')
@@ -1929,26 +1929,26 @@ class ExportSqlTest extends PmaTestCase
     */
     public function testReplaceWithAlias()
     {
-        $aliases = array(
-            'a' => array(
+        $aliases = [
+            'a' => [
                 'alias' => 'aliastest',
-                'tables' => array(
-                    'foo' => array(
+                'tables' => [
+                    'foo' => [
                         'alias' => 'bartest',
-                        'columns' => array(
+                        'columns' => [
                             'baz' => 'p',
                             'pqr' => 'pphymdain'
-                        )
-                    ),
-                    'bar' => array(
+                        ]
+                    ],
+                    'bar' => [
                         'alias' => 'f',
-                        'columns' => array(
+                        'columns' => [
                             'xy' => 'n'
-                        )
-                    )
-                )
-            )
-        );
+                        ]
+                    ]
+                ]
+            ]
+        ];
 
         $db = 'a';
         $table = 'foo';
@@ -1976,7 +1976,7 @@ class ExportSqlTest extends PmaTestCase
             $result
         );
 
-        $result = $this->object->replaceWithAliases($sql_query, array(), '', '');
+        $result = $this->object->replaceWithAliases($sql_query, [], '', '');
 
         $this->assertEquals(
             "CREATE TABLE IF NOT EXISTS foo (\n" .
diff --git a/test/classes/Plugins/Export/ExportTexytextTest.php b/test/classes/Plugins/Export/ExportTexytextTest.php
index 4b6e1c3c80..4cb1445bab 100644
--- a/test/classes/Plugins/Export/ExportTexytextTest.php
+++ b/test/classes/Plugins/Export/ExportTexytextTest.php
@@ -37,7 +37,7 @@ class ExportTexytextTest extends PmaTestCase
         $GLOBALS['buffer_needed'] = false;
         $GLOBALS['asfile'] = false;
         $GLOBALS['save_on_server'] = false;
-        $GLOBALS['plugin_param'] = array();
+        $GLOBALS['plugin_param'] = [];
         $GLOBALS['plugin_param']['export_type'] = 'table';
         $GLOBALS['plugin_param']['single_table'] = false;
         $GLOBALS['cfgRelation']['relation'] = true;
@@ -267,7 +267,7 @@ class ExportTexytextTest extends PmaTestCase
         $dbi->expects($this->at(5))
             ->method('fetchRow')
             ->with(true)
-            ->will($this->returnValue(array(null, '0', 'test')));
+            ->will($this->returnValue([null, '0', 'test']));
 
         $GLOBALS['dbi'] = $dbi;
         $GLOBALS['what'] = 'foo';
@@ -308,18 +308,18 @@ class ExportTexytextTest extends PmaTestCase
         $dbi->expects($this->once())
             ->method('getColumns')
             ->with('db', 'view')
-            ->will($this->returnValue(array(1, 2)));
+            ->will($this->returnValue([1, 2]));
 
-        $keys = array(
-            array(
+        $keys = [
+            [
                 'Non_unique' => 0,
                 'Column_name' => 'cname'
-            ),
-            array(
+            ],
+            [
                 'Non_unique' => 1,
                 'Column_name' => 'cname2'
-            )
-        );
+            ]
+        ];
 
         $dbi->expects($this->once())
             ->method('getTableIndexes')
@@ -334,17 +334,17 @@ class ExportTexytextTest extends PmaTestCase
 
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportTexytext')
             ->disableOriginalConstructor()
-            ->setMethods(array('formatOneColumnDefinition'))
+            ->setMethods(['formatOneColumnDefinition'])
             ->getMock();
 
         $this->object->expects($this->at(0))
             ->method('formatOneColumnDefinition')
-            ->with(1, array('cname'))
+            ->with(1, ['cname'])
             ->will($this->returnValue('c1'));
 
         $this->object->expects($this->at(1))
             ->method('formatOneColumnDefinition')
-            ->with(2, array('cname'))
+            ->with(2, ['cname'])
             ->will($this->returnValue('c2'));
 
         $result = $this->object->getTableDefStandIn('db', 'view', '#');
@@ -363,7 +363,7 @@ class ExportTexytextTest extends PmaTestCase
     public function testGetTableDef()
     {
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportTexytext')
-            ->setMethods(array('formatOneColumnDefinition'))
+            ->setMethods(['formatOneColumnDefinition'])
             ->getMock();
 
         // case 1
@@ -372,16 +372,16 @@ class ExportTexytextTest extends PmaTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $keys = array(
-            array(
+        $keys = [
+            [
                 'Non_unique' => 0,
                 'Column_name' => 'cname'
-            ),
-            array(
+            ],
+            [
                 'Non_unique' => 1,
                 'Column_name' => 'cname2'
-            )
-        );
+            ]
+        ];
 
         $dbi->expects($this->once())
             ->method('getTableIndexes')
@@ -391,19 +391,19 @@ class ExportTexytextTest extends PmaTestCase
         $dbi->expects($this->exactly(2))
             ->method('fetchResult')
             ->willReturnOnConsecutiveCalls(
-                array(
-                    'fname' => array(
+                [
+                    'fname' => [
                         'foreign_table' => '<ftable',
                         'foreign_field' => 'ffield>'
-                    )
-                ),
-                array(
-                    'fname' => array(
+                    ]
+                ],
+                [
+                    'fname' => [
                         'values' => 'test-',
                         'transformation' => 'testfoo',
                         'mimetype' => 'test<'
-                    )
-                )
+                    ]
+                ]
             );
 
         $dbi->expects($this->once())
@@ -414,25 +414,25 @@ class ExportTexytextTest extends PmaTestCase
                 )
             );
 
-        $columns = array(
+        $columns = [
             'Field' => 'fname',
             'Comment' => 'comm'
-        );
+        ];
 
         $dbi->expects($this->exactly(2))
             ->method('getColumns')
             ->with('db', 'table')
-            ->will($this->returnValue(array($columns)));
+            ->will($this->returnValue([$columns]));
 
         $GLOBALS['dbi'] = $dbi;
 
         $this->object->expects($this->exactly(1))
             ->method('formatOneColumnDefinition')
-            ->with(array('Field' => 'fname', 'Comment' => 'comm'), array('cname'))
+            ->with(['Field' => 'fname', 'Comment' => 'comm'], ['cname'])
             ->will($this->returnValue(1));
 
         $GLOBALS['cfgRelation']['relation'] = true;
-        $_SESSION['relation'][0] = array(
+        $_SESSION['relation'][0] = [
             'PMA_VERSION' => PMA_VERSION,
             'relwork' => true,
             'commwork' => true,
@@ -440,7 +440,7 @@ class ExportTexytextTest extends PmaTestCase
             'db' => 'db',
             'relation' => 'rel',
             'column_info' => 'col'
-        );
+        ];
 
         $result = $this->object->getTableDef(
             'db',
@@ -469,14 +469,14 @@ class ExportTexytextTest extends PmaTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $triggers = array(
-            array(
+        $triggers = [
+            [
                 'name' => 'tna"me',
                 'action_timing' => 'ac>t',
                 'event_manipulation' => 'manip&',
                 'definition' => 'def'
-            )
-        );
+            ]
+        ];
 
         $dbi->expects($this->once())
             ->method('getTriggers')
@@ -517,7 +517,7 @@ class ExportTexytextTest extends PmaTestCase
             ->will($this->returnValue(1));
 
         $this->object = $this->getMockBuilder('PhpMyAdmin\Plugins\Export\ExportTexytext')
-            ->setMethods(array('getTableDef', 'getTriggers', 'getTableDefStandIn'))
+            ->setMethods(['getTableDef', 'getTriggers', 'getTableDefStandIn'])
             ->getMock();
 
         $this->object->expects($this->at(0))
@@ -609,33 +609,33 @@ class ExportTexytextTest extends PmaTestCase
      */
     public function testFormatOneColumnDefinition()
     {
-        $cols = array(
+        $cols = [
             'Null' => 'Yes',
             'Field' => 'field',
             'Key' => 'PRI',
             'Type' => 'set(abc)enum123'
-        );
+        ];
 
-        $unique_keys = array(
+        $unique_keys = [
             'field'
-        );
+        ];
 
         $this->assertEquals(
             '|//**field**//|set(abc)|Yes|NULL',
             $this->object->formatOneColumnDefinition($cols, $unique_keys)
         );
 
-        $cols = array(
+        $cols = [
             'Null' => 'NO',
             'Field' => 'fields',
             'Key' => 'COMP',
             'Type' => '',
             'Default' => 'def'
-        );
+        ];
 
-        $unique_keys = array(
+        $unique_keys = [
             'field'
-        );
+        ];
 
         $this->assertEquals(
             '|fields|&amp;nbsp;|No|def',
diff --git a/test/classes/Plugins/Export/ExportXmlTest.php b/test/classes/Plugins/Export/ExportXmlTest.php
index 1e409a3d4b..6b20f756a6 100644
--- a/test/classes/Plugins/Export/ExportXmlTest.php
+++ b/test/classes/Plugins/Export/ExportXmlTest.php
@@ -38,7 +38,7 @@ class ExportXmlTest extends PmaTestCase
         $GLOBALS['buffer_needed'] = false;
         $GLOBALS['asfile'] = false;
         $GLOBALS['save_on_server'] = false;
-        $GLOBALS['plugin_param'] = array();
+        $GLOBALS['plugin_param'] = [];
         $GLOBALS['plugin_param']['export_type'] = 'table';
         $GLOBALS['plugin_param']['single_table'] = false;
         $GLOBALS['cfgRelation']['relation'] = true;
@@ -220,14 +220,14 @@ class ExportXmlTest extends PmaTestCase
         $GLOBALS['crlf'] = "\n";
         $GLOBALS['db'] = 'd<"b';
 
-        $result = array(
-            0 => array(
+        $result = [
+            0 => [
                 'DEFAULT_COLLATION_NAME' => 'utf8_general_ci',
                 'DEFAULT_CHARACTER_SET_NAME' => 'utf-8',
 
-            ),
-            'table' => array(null, '"tbl"')
-        );
+            ],
+            'table' => [null, '"tbl"']
+        ];
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
             ->disableOriginalConstructor()
             ->getMock();
@@ -245,24 +245,24 @@ class ExportXmlTest extends PmaTestCase
             ->with('d<"b', 'table')
             ->will(
                 $this->returnValue(
-                    array(
-                        array(
+                    [
+                        [
                             'create' => 'crt',
                             'name' => 'trname'
-                        )
-                    )
+                        ]
+                    ]
                 )
             );
 
         $dbi->expects($this->exactly(2))
             ->method('getProceduresOrFunctions')
             ->willReturnOnConsecutiveCalls(
-                array(
+                [
                     'fn'
-                ),
-                array(
+                ],
+                [
                     'pr'
-                )
+                ]
             );
 
         $dbi->expects($this->exactly(2))
@@ -280,7 +280,7 @@ class ExportXmlTest extends PmaTestCase
 
         $GLOBALS['dbi'] = $dbi;
 
-        $GLOBALS['tables'] = array();
+        $GLOBALS['tables'] = [];
         $GLOBALS['table'] = 'table';
 
         ob_start();
@@ -329,20 +329,20 @@ class ExportXmlTest extends PmaTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $result_1 = array(
-            array(
+        $result_1 = [
+            [
                 'DEFAULT_COLLATION_NAME' => 'utf8_general_ci',
                 'DEFAULT_CHARACTER_SET_NAME' => 'utf-8',
 
-            )
-        );
-        $result_2 = array(
-            't1' => array(null, '"tbl"')
-        );
+            ]
+        ];
+        $result_2 = [
+            't1' => [null, '"tbl"']
+        ];
 
-        $result_3 = array(
-            't2' => array(null, '"tbl"')
-        );
+        $result_3 = [
+            't2' => [null, '"tbl"']
+        ];
 
         $dbi->expects($this->exactly(5))
             ->method('fetchResult')
@@ -360,7 +360,7 @@ class ExportXmlTest extends PmaTestCase
 
         $GLOBALS['dbi'] = $dbi;
 
-        $GLOBALS['tables'] = array('t1', 't2');
+        $GLOBALS['tables'] = ['t1', 't2'];
 
         ob_start();
         $this->assertTrue(
@@ -515,7 +515,7 @@ class ExportXmlTest extends PmaTestCase
         $dbi->expects($this->at(6))
             ->method('fetchRow')
             ->with(true)
-            ->will($this->returnValue(array(null, '<a>')));
+            ->will($this->returnValue([null, '<a>']));
 
         $GLOBALS['dbi'] = $dbi;
 
diff --git a/test/classes/Plugins/Export/ExportYamlTest.php b/test/classes/Plugins/Export/ExportYamlTest.php
index fd6cf28f99..6bd9ce711e 100644
--- a/test/classes/Plugins/Export/ExportYamlTest.php
+++ b/test/classes/Plugins/Export/ExportYamlTest.php
@@ -235,7 +235,7 @@ class ExportYamlTest extends PmaTestCase
             ->with(true)
             ->will(
                 $this->returnValue(
-                    array(null, '123', "\"c\\a\nb\r")
+                    [null, '123', "\"c\\a\nb\r"]
                 )
             );
 
@@ -244,7 +244,7 @@ class ExportYamlTest extends PmaTestCase
             ->with(true)
             ->will(
                 $this->returnValue(
-                    array(null)
+                    [null]
                 )
             );
 
diff --git a/test/classes/Plugins/Export/Helpers/TablePropertyTest.php b/test/classes/Plugins/Export/Helpers/TablePropertyTest.php
index 5aa0f8bea9..64a5e2eb10 100644
--- a/test/classes/Plugins/Export/Helpers/TablePropertyTest.php
+++ b/test/classes/Plugins/Export/Helpers/TablePropertyTest.php
@@ -29,7 +29,7 @@ class TablePropertyTest extends PmaTestCase
     function setup()
     {
         $GLOBALS['server'] = 0;
-        $row = array(' name ', 'int ', true, ' PRI', '0', 'mysql');
+        $row = [' name ', 'int ', true, ' PRI', '0', 'mysql'];
         $this->object = new TableProperty($row);
     }
 
@@ -129,11 +129,11 @@ class TablePropertyTest extends PmaTestCase
      */
     public function isNotNullProvider()
     {
-        return array(
-            array("NO", "true"),
-            array("", "false"),
-            array("no", "false")
-        );
+        return [
+            ["NO", "true"],
+            ["", "false"],
+            ["no", "false"]
+        ];
     }
 
     /**
@@ -162,13 +162,13 @@ class TablePropertyTest extends PmaTestCase
      */
     public function isUniqueProvider()
     {
-        return array(
-            array("PRI", "true"),
-            array("UNI", "true"),
-            array("", "false"),
-            array("pri", "false"),
-            array("uni", "false"),
-        );
+        return [
+            ["PRI", "true"],
+            ["UNI", "true"],
+            ["", "false"],
+            ["pri", "false"],
+            ["uni", "false"],
+        ];
     }
 
     /**
@@ -197,19 +197,19 @@ class TablePropertyTest extends PmaTestCase
      */
     public function getDotNetPrimitiveTypeProvider()
     {
-        return array(
-            array("int", "int"),
-            array("long", "long"),
-            array("char", "string"),
-            array("varchar", "string"),
-            array("text", "string"),
-            array("longtext", "string"),
-            array("tinyint", "bool"),
-            array("datetime", "DateTime"),
-            array("", "unknown"),
-            array("dummy", "unknown"),
-            array("INT", "unknown")
-        );
+        return [
+            ["int", "int"],
+            ["long", "long"],
+            ["char", "string"],
+            ["varchar", "string"],
+            ["text", "string"],
+            ["longtext", "string"],
+            ["tinyint", "bool"],
+            ["datetime", "DateTime"],
+            ["", "unknown"],
+            ["dummy", "unknown"],
+            ["INT", "unknown"]
+        ];
     }
 
     /**
@@ -238,19 +238,19 @@ class TablePropertyTest extends PmaTestCase
      */
     public function getDotNetObjectTypeProvider()
     {
-        return array(
-            array("int", "Int32"),
-            array("long", "Long"),
-            array("char", "String"),
-            array("varchar", "String"),
-            array("text", "String"),
-            array("longtext", "String"),
-            array("tinyint", "Boolean"),
-            array("datetime", "DateTime"),
-            array("", "Unknown"),
-            array("dummy", "Unknown"),
-            array("INT", "Unknown")
-        );
+        return [
+            ["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/ImportLdiTest.php b/test/classes/Plugins/Import/ImportLdiTest.php
index a4075c8cfc..b3a7c95bbb 100644
--- a/test/classes/Plugins/Import/ImportLdiTest.php
+++ b/test/classes/Plugins/Import/ImportLdiTest.php
@@ -120,7 +120,7 @@ class ImportLdiTest extends PmaTestCase
         $this->dbi->expects($this->any())->method('numRows')
             ->will($this->returnValue(10));
 
-        $fetchRowResult = array("ON");
+        $fetchRowResult = ["ON"];
         $this->dbi->expects($this->any())->method('fetchRow')
             ->will($this->returnValue($fetchRowResult));
 
diff --git a/test/classes/Plugins/Import/ImportMediawikiTest.php b/test/classes/Plugins/Import/ImportMediawikiTest.php
index 490a525532..4373ba338f 100644
--- a/test/classes/Plugins/Import/ImportMediawikiTest.php
+++ b/test/classes/Plugins/Import/ImportMediawikiTest.php
@@ -91,7 +91,7 @@ class ImportMediawikiTest extends PmaTestCase
             $properties->getMimeType()
         );
         $this->assertEquals(
-            array(),
+            [],
             $properties->getOptions()
         );
         $this->assertEquals(
diff --git a/test/classes/Plugins/Import/ImportShpTest.php b/test/classes/Plugins/Import/ImportShpTest.php
index 6bd6c9dd49..ba3c1e5cdc 100644
--- a/test/classes/Plugins/Import/ImportShpTest.php
+++ b/test/classes/Plugins/Import/ImportShpTest.php
@@ -113,7 +113,7 @@ class ImportShpTest extends PmaTestCase
             $properties->getExtension()
         );
         $this->assertEquals(
-            array(),
+            [],
             $properties->getOptions()
         );
         $this->assertEquals(
diff --git a/test/classes/Plugins/Import/ImportXmlTest.php b/test/classes/Plugins/Import/ImportXmlTest.php
index 4c01d33428..4e50baf288 100644
--- a/test/classes/Plugins/Import/ImportXmlTest.php
+++ b/test/classes/Plugins/Import/ImportXmlTest.php
@@ -92,7 +92,7 @@ class ImportXmlTest extends PmaTestCase
             $properties->getMimeType()
         );
         $this->assertEquals(
-            array(),
+            [],
             $properties->getOptions()
         );
         $this->assertEquals(
diff --git a/test/classes/Plugins/Schema/DiaRelationSchemaTest.php b/test/classes/Plugins/Schema/DiaRelationSchemaTest.php
index 3909e44b35..4bc0f508f9 100644
--- a/test/classes/Plugins/Schema/DiaRelationSchemaTest.php
+++ b/test/classes/Plugins/Schema/DiaRelationSchemaTest.php
@@ -38,16 +38,16 @@ class DiaRelationSchemaTest extends PmaTestCase
         $_REQUEST['dia_show_keys'] = true;
         $_REQUEST['dia_orientation'] = 'orientation';
         $_REQUEST['dia_paper'] = 'paper';
-        $_REQUEST['t_h'] = array('information_schema.files' => 1);
-        $_REQUEST['t_x'] = array('information_schema.files' => 0);
-        $_REQUEST['t_y'] = array('information_schema.files' => 0);
+        $_REQUEST['t_h'] = ['information_schema.files' => 1];
+        $_REQUEST['t_x'] = ['information_schema.files' => 0];
+        $_REQUEST['t_y'] = ['information_schema.files' => 0];
 
         $GLOBALS['server'] = 1;
         $GLOBALS['db'] = 'information_schema';
         $GLOBALS['cfg']['Server']['table_coords'] = "table_name";
 
         //_SESSION
-        $_SESSION['relation'][$GLOBALS['server']] = array(
+        $_SESSION['relation'][$GLOBALS['server']] = [
             'PMA_VERSION' => PMA_VERSION,
             'table_coords' => "table_name",
             'displaywork' => 'displaywork',
@@ -55,7 +55,7 @@ class DiaRelationSchemaTest extends PmaTestCase
             'table_info' => 'table_info',
             'relwork' => 'relwork',
             'relation' => 'relation'
-        );
+        ];
         $relation = new Relation();
         $relation->getRelationsParam();
 
@@ -75,15 +75,15 @@ class DiaRelationSchemaTest extends PmaTestCase
             ->method('tryQuery')
             ->will($this->returnValue("executed_1"));
 
-        $fetchArrayReturn = array(
+        $fetchArrayReturn = [
             //table name in information_schema_relations
             'table_name' => 'CHARACTER_SETS'
-        );
+        ];
 
-        $fetchArrayReturn2 = array(
+        $fetchArrayReturn2 = [
             //table name in information_schema_relations
             'table_name' => 'COLLATIONS'
-        );
+        ];
 
         $dbi->expects($this->at(2))
             ->method('fetchAssoc')
@@ -95,15 +95,15 @@ class DiaRelationSchemaTest extends PmaTestCase
             ->method('fetchAssoc')
             ->will($this->returnValue(false));
 
-        $getIndexesResult = array(
-            array(
+        $getIndexesResult = [
+            [
                 'Table' => 'pma_tbl',
                 'Field' => 'field1',
                 'Key' => 'PRIMARY',
                 'Key_name' => "Key_name",
                 'Column_name' => "Column_name"
-            )
-        );
+            ]
+        ];
         $dbi->expects($this->any())->method('getTableIndexes')
             ->will($this->returnValue($getIndexesResult));
 
diff --git a/test/classes/Plugins/Schema/EpsRelationSchemaTest.php b/test/classes/Plugins/Schema/EpsRelationSchemaTest.php
index 0dc56cb2d5..f889d7b865 100644
--- a/test/classes/Plugins/Schema/EpsRelationSchemaTest.php
+++ b/test/classes/Plugins/Schema/EpsRelationSchemaTest.php
@@ -39,16 +39,16 @@ class EpsRelationSchemaTest extends PmaTestCase
         $_REQUEST['eps_orientation'] = 'orientation';
         $_REQUEST['eps_show_table_dimension'] = true;
         $_REQUEST['eps_all_tables_same_width'] = true;
-        $_REQUEST['t_h'] = array('information_schema.files' => 1);
-        $_REQUEST['t_x'] = array('information_schema.files' => 0);
-        $_REQUEST['t_y'] = array('information_schema.files' => 0);
+        $_REQUEST['t_h'] = ['information_schema.files' => 1];
+        $_REQUEST['t_x'] = ['information_schema.files' => 0];
+        $_REQUEST['t_y'] = ['information_schema.files' => 0];
 
         $GLOBALS['server'] = 1;
         $GLOBALS['db'] = 'information_schema';
         $GLOBALS['cfg']['Server']['table_coords'] = "table_name";
 
         //_SESSION
-        $_SESSION['relation'][$GLOBALS['server']] = array(
+        $_SESSION['relation'][$GLOBALS['server']] = [
             'PMA_VERSION' => PMA_VERSION,
             'table_coords' => "table_name",
             'displaywork' => 'displaywork',
@@ -56,7 +56,7 @@ class EpsRelationSchemaTest extends PmaTestCase
             'table_info' => 'table_info',
             'relwork' => 'relwork',
             'relation' => 'relation'
-        );
+        ];
         $relation = new Relation();
         $relation->getRelationsParam();
 
@@ -76,15 +76,15 @@ class EpsRelationSchemaTest extends PmaTestCase
             ->method('tryQuery')
             ->will($this->returnValue("executed_1"));
 
-        $fetchArrayReturn = array(
+        $fetchArrayReturn = [
             //table name in information_schema_relations
             'table_name' => 'CHARACTER_SETS'
-        );
+        ];
 
-        $fetchArrayReturn2 = array(
+        $fetchArrayReturn2 = [
             //table name in information_schema_relations
             'table_name' => 'COLLATIONS'
-        );
+        ];
 
         $dbi->expects($this->at(2))
             ->method('fetchAssoc')
@@ -96,15 +96,15 @@ class EpsRelationSchemaTest extends PmaTestCase
             ->method('fetchAssoc')
             ->will($this->returnValue(false));
 
-        $getIndexesResult = array(
-            array(
+        $getIndexesResult = [
+            [
                 'Table' => 'pma_tbl',
                 'Field' => 'field1',
                 'Key' => 'PRIMARY',
                 'Key_name' => "Key_name",
                 'Column_name' => "Column_name"
-            )
-        );
+            ]
+        ];
         $dbi->expects($this->any())->method('getTableIndexes')
             ->will($this->returnValue($getIndexesResult));
 
diff --git a/test/classes/Plugins/Schema/PdfRelationSchemaTest.php b/test/classes/Plugins/Schema/PdfRelationSchemaTest.php
index e9238d7c07..971c7bf074 100644
--- a/test/classes/Plugins/Schema/PdfRelationSchemaTest.php
+++ b/test/classes/Plugins/Schema/PdfRelationSchemaTest.php
@@ -42,9 +42,9 @@ class PdfRelationSchemaTest extends PmaTestCase
         $_REQUEST['pdf_all_tables_same_width'] = true;
         $_REQUEST['pdf_paper'] = 'paper';
         $_REQUEST['pdf_table_order'] = '';
-        $_REQUEST['t_h'] = array('information_schema.files' => 1);
-        $_REQUEST['t_x'] = array('information_schema.files' => 0);
-        $_REQUEST['t_y'] = array('information_schema.files' => 0);
+        $_REQUEST['t_h'] = ['information_schema.files' => 1];
+        $_REQUEST['t_x'] = ['information_schema.files' => 0];
+        $_REQUEST['t_y'] = ['information_schema.files' => 0];
 
         $GLOBALS['server'] = 1;
         $GLOBALS['db'] = 'information_schema';
@@ -56,7 +56,7 @@ class PdfRelationSchemaTest extends PmaTestCase
         $GLOBALS['cfg']['Server']['table_info'] = "table_info";
 
         //_SESSION
-        $_SESSION['relation'][$GLOBALS['server']] = array(
+        $_SESSION['relation'][$GLOBALS['server']] = [
             'PMA_VERSION' => PMA_VERSION,
             'table_coords' => "table_name",
             'displaywork' => 'displaywork',
@@ -68,7 +68,7 @@ class PdfRelationSchemaTest extends PmaTestCase
             'commwork' => 'commwork',
             'column_info' => 'column_info',
             'pdf_pages' => 'pdf_pages'
-        );
+        ];
         $relation = new Relation();
         $relation->getRelationsParam();
 
@@ -88,15 +88,15 @@ class PdfRelationSchemaTest extends PmaTestCase
             ->method('tryQuery')
             ->will($this->returnValue("executed_1"));
 
-        $fetchArrayReturn = array(
+        $fetchArrayReturn = [
             //table name in information_schema_relations
             'table_name' => 'CHARACTER_SETS'
-        );
+        ];
 
-        $fetchArrayReturn2 = array(
+        $fetchArrayReturn2 = [
             //table name in information_schema_relations
             'table_name' => 'COLLATIONS'
-        );
+        ];
 
         $dbi->expects($this->at(2))
             ->method('fetchAssoc')
@@ -108,10 +108,10 @@ class PdfRelationSchemaTest extends PmaTestCase
             ->method('fetchAssoc')
             ->will($this->returnValue(false));
 
-        $fetchRowReturn = array(
+        $fetchRowReturn = [
             'table_name',
             'table_name'
-        );
+        ];
 
         //let fetchRow have more results
         for ($index=0; $index<4; ++$index) {
@@ -120,29 +120,29 @@ class PdfRelationSchemaTest extends PmaTestCase
                 ->will($this->returnValue($fetchRowReturn));
         }
 
-        $fields_info = array(
-            "Host" => array(
+        $fields_info = [
+            "Host" => [
                 "Field" => "host",
                 "Type" => "char(60)",
                 "Null" => "NO",
                 'Extra' => "Extra",
-            )
-        );
+            ]
+        ];
         $dbi->expects($this->any())->method('getColumns')
             ->will($this->returnValue($fields_info));
 
         $dbi->expects($this->any())->method('selectDb')
             ->will($this->returnValue(true));
 
-        $getIndexesResult = array(
-            array(
+        $getIndexesResult = [
+            [
                 'Table' => 'pma_tbl',
                 'Field' => 'field1',
                 'Key' => 'PRIMARY',
                 'Key_name' => "Key_name",
                 'Column_name' => "Column_name"
-            )
-        );
+            ]
+        ];
         $dbi->expects($this->any())->method('getTableIndexes')
             ->will($this->returnValue($getIndexesResult));
 
@@ -160,10 +160,10 @@ class PdfRelationSchemaTest extends PmaTestCase
             ->method('fetchValue')
             ->will($this->returnValue($fetchValue));
 
-        $fetchResult = array(
-            'column1' => array('mimetype' => 'value1', 'transformation'=> 'pdf'),
-            'column2' => array('mimetype' => 'value2', 'transformation'=> 'xml'),
-        );
+        $fetchResult = [
+            'column1' => ['mimetype' => 'value1', 'transformation'=> 'pdf'],
+            'column2' => ['mimetype' => 'value2', 'transformation'=> 'xml'],
+        ];
 
         $dbi->expects($this->any())->method('fetchResult')
             ->will($this->returnValue($fetchResult));
diff --git a/test/classes/Plugins/Schema/SvgRelationSchemaTest.php b/test/classes/Plugins/Schema/SvgRelationSchemaTest.php
index b83897241f..d2ad4bda8b 100644
--- a/test/classes/Plugins/Schema/SvgRelationSchemaTest.php
+++ b/test/classes/Plugins/Schema/SvgRelationSchemaTest.php
@@ -38,16 +38,16 @@ class SvgRelationSchemaTest extends PmaTestCase
         $_REQUEST['svg_show_keys'] = true;
         $_REQUEST['svg_show_table_dimension'] = true;
         $_REQUEST['svg_all_tables_same_width'] = true;
-        $_REQUEST['t_h'] = array('information_schema.files' => 1);
-        $_REQUEST['t_x'] = array('information_schema.files' => 0);
-        $_REQUEST['t_y'] = array('information_schema.files' => 0);
+        $_REQUEST['t_h'] = ['information_schema.files' => 1];
+        $_REQUEST['t_x'] = ['information_schema.files' => 0];
+        $_REQUEST['t_y'] = ['information_schema.files' => 0];
 
         $GLOBALS['server'] = 1;
         $GLOBALS['db'] = 'information_schema';
         $GLOBALS['cfg']['Server']['table_coords'] = "table_name";
 
         //_SESSION
-        $_SESSION['relation'][$GLOBALS['server']] = array(
+        $_SESSION['relation'][$GLOBALS['server']] = [
             'PMA_VERSION' => PMA_VERSION,
             'table_coords' => "table_name",
             'displaywork' => 'displaywork',
@@ -55,7 +55,7 @@ class SvgRelationSchemaTest extends PmaTestCase
             'table_info' => 'table_info',
             'relwork' => 'relwork',
             'relation' => 'relation'
-        );
+        ];
         $relation = new Relation();
         $relation->getRelationsParam();
 
@@ -75,15 +75,15 @@ class SvgRelationSchemaTest extends PmaTestCase
             ->method('tryQuery')
             ->will($this->returnValue("executed_1"));
 
-        $fetchArrayReturn = array(
+        $fetchArrayReturn = [
             //table name in information_schema_relations
             'table_name' => 'CHARACTER_SETS'
-        );
+        ];
 
-        $fetchArrayReturn2 = array(
+        $fetchArrayReturn2 = [
             //table name in information_schema_relations
             'table_name' => 'COLLATIONS'
-        );
+        ];
 
         $dbi->expects($this->at(2))
             ->method('fetchAssoc')
@@ -95,15 +95,15 @@ class SvgRelationSchemaTest extends PmaTestCase
             ->method('fetchAssoc')
             ->will($this->returnValue(false));
 
-        $getIndexesResult = array(
-            array(
+        $getIndexesResult = [
+            [
                 'Table' => 'pma_tbl',
                 'Field' => 'field1',
                 'Key' => 'PRIMARY',
                 'Key_name' => "Key_name",
                 'Column_name' => "Column_name"
-            )
-        );
+            ]
+        ];
         $dbi->expects($this->any())->method('getTableIndexes')
             ->will($this->returnValue($getIndexesResult));
 
diff --git a/test/classes/Plugins/Transformations/TransformationPluginsTest.php b/test/classes/Plugins/Transformations/TransformationPluginsTest.php
index db74f226dd..951f3e2b0c 100644
--- a/test/classes/Plugins/Transformations/TransformationPluginsTest.php
+++ b/test/classes/Plugins/Transformations/TransformationPluginsTest.php
@@ -47,8 +47,8 @@ class TransformationPluginsTest extends PmaTestCase
     {
         // For Application Octetstream Download plugin
         global $row, $fields_meta;
-        $fields_meta = array();
-        $row = array("pma"=>"aaa", "pca"=>"bbb");
+        $fields_meta = [];
+        $row = ["pma"=>"aaa", "pca"=>"bbb"];
 
         // For Image_*_Inline plugin
         $GLOBALS['PMA_Config'] = new Config();
@@ -76,54 +76,54 @@ class TransformationPluginsTest extends PmaTestCase
      */
     public function multiDataProvider()
     {
-        return array(
+        return [
             // Test data for PhpMyAdmin\Plugins\Transformations\Input\Image_JPEG_Upload plugin
-            array(
+            [
                 new Image_JPEG_Upload(),
                 'getName',
                 'Image upload'
-            ),
-            array(
+            ],
+            [
                 new Image_JPEG_Upload(),
                 'getInfo',
                 'Image upload functionality which also displays a thumbnail.'
                 . ' The options are the width and height of the thumbnail'
                 . ' in pixels. Defaults to 100 X 100.'
-            ),
-            array(
+            ],
+            [
                 new Image_JPEG_Upload(),
                 'getMIMEType',
                 'Image'
-            ),
-            array(
+            ],
+            [
                 new Image_JPEG_Upload(),
                 'getMIMESubtype',
                 'JPEG'
-            ),
-            array(
+            ],
+            [
                 new Image_JPEG_Upload(),
                 'getScripts',
-                array('transformations/image_upload.js')
-            ),
-            array(
+                ['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"/>',
-                array(
-                    array(),
+                [
+                    [],
                     0,
                     'test',
-                    array('150'),
+                    ['150'],
                     '',
                     'ltr',
                     0,
                     0,
                     0
-                )
-            ),
-            array(
+                ]
+            ],
+            [
                 new Image_JPEG_Upload(),
                 'getInputHtml',
                 '<input type="hidden" name="fields_prev2ndtest" '
@@ -133,120 +133,120 @@ class TransformationPluginsTest extends PmaTestCase
                 . 'height="100" alt="Image preview here"/><br/><input type="file" '
                 . 'name="fields_upload2ndtest" accept="image/*" '
                 . 'class="image-upload"/>',
-                array(
-                    array(),
+                [
+                    [],
                     0,
                     '2ndtest',
-                    array(
+                    [
                         'wrapper_link' => '?table=a'
-                    ),
+                    ],
                     'something',
                     'ltr',
                     0,
                     0,
                     0
-                )
-            ),
+                ]
+            ],
             // Test data for TextPlainFileupload plugin
-            array(
+            [
                 new Text_Plain_FileUpload(),
                 'getName',
                 'Text file upload'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_FileUpload(),
                 'getInfo',
                 'File upload functionality for TEXT columns. '
                 . 'It does not have a textarea for input.'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_FileUpload(),
                 'getMIMEType',
                 'Text'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_FileUpload(),
                 'getMIMESubtype',
                 'Plain'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_FileUpload(),
                 'getScripts',
-                array()
-            ),
-            array(
+                []
+            ],
+            [
                 new Text_Plain_FileUpload(),
                 'getInputHtml',
                 '<input type="file" name="fields_uploadtest"/>',
-                array(
-                    array(),
+                [
+                    [],
                     0,
                     'test',
-                    array(),
+                    [],
                     '',
                     'ltr',
                     0,
                     0,
                     0
-                )
-            ),
-            array(
+                ]
+            ],
+            [
                 new Text_Plain_FileUpload(),
                 'getInputHtml',
                 '<input type="hidden" name="fields_prev2ndtest" '
                 . 'value="something"/><input type="hidden" name="fields2ndtest" '
                 . 'value="something"/><input type="file" '
                 . 'name="fields_upload2ndtest"/>',
-                array(
-                    array(),
+                [
+                    [],
                     0,
                     '2ndtest',
-                    array(),
+                    [],
                     'something',
                     'ltr',
                     0,
                     0,
                     0
-                )
-            ),
+                ]
+            ],
             // Test data for Text_Plain_Regexvalidation plugin
-            array(
+            [
                 new Text_Plain_RegexValidation(),
                 'getName',
                 'Regex Validation'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_RegexValidation(),
                 'getInfo',
                 'Validates the string using regular expression '
                 . 'and performs insert only if string matches it. '
                 . 'The first option is the Regular Expression.'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_RegexValidation(),
                 'getMIMEType',
                 'Text'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_RegexValidation(),
                 'getMIMESubtype',
                 'Plain'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_RegexValidation(),
                 'getInputHtml',
                 '',
-                array(
-                    array(), 0, '', array(), '', 'ltr', 0, 0, 0
-                )
-            ),
+                [
+                    [], 0, '', [], '', 'ltr', 0, 0, 0
+                ]
+            ],
             // Test data for PhpMyAdmin\Plugins\Transformations\Output\Application_Octetstream_Download plugin
-            array(
+            [
                 new Application_Octetstream_Download(),
                 'getName',
                 'Download'
-            ),
-            array(
+            ],
+            [
                 new Application_Octetstream_Download(),
                 'getInfo',
                 'Displays a link to download the binary data of the column. You can'
@@ -254,117 +254,117 @@ class TransformationPluginsTest extends PmaTestCase
                 . ' option as the name of a column which contains the filename. If'
                 . ' you use the second option, you need to set the first option to'
                 . ' the empty string.'
-            ),
-            array(
+            ],
+            [
                 new Application_Octetstream_Download(),
                 'getMIMEType',
                 'Application'
-            ),
-            array(
+            ],
+            [
                 new Application_Octetstream_Download(),
                 'getMIMESubtype',
                 'OctetStream'
-            ),
+            ],
             // Test data for PhpMyAdmin\Plugins\Transformations\Output\Application_Octetstream_Hex plugin
-            array(
+            [
                 new Application_Octetstream_Hex(),
                 'getName',
                 'Hex'
-            ),
-            array(
+            ],
+            [
                 new Application_Octetstream_Hex(),
                 'getInfo',
                 'Displays hexadecimal representation of data. Optional first'
                 . ' parameter specifies how often space will be added (defaults'
                 . ' to 2 nibbles).'
-            ),
-            array(
+            ],
+            [
                 new Application_Octetstream_Hex(),
                 'getMIMEType',
                 'Application'
-            ),
-            array(
+            ],
+            [
                 new Application_Octetstream_Hex(),
                 'getMIMESubtype',
                 'OctetStream'
-            ),
+            ],
             // Test data for PhpMyAdmin\Plugins\Transformations\Output\Image_JPEG_Inline plugin
-            array(
+            [
                 new Image_JPEG_Inline(),
                 'getName',
                 'Inline'
-            ),
-            array(
+            ],
+            [
                 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.'
-            ),
-            array(
+            ],
+            [
                 new Image_JPEG_Inline(),
                 'getMIMEType',
                 'Image'
-            ),
-            array(
+            ],
+            [
                 new Image_JPEG_Inline(),
                 'getMIMESubtype',
                 'JPEG'
-            ),
+            ],
             // Test data for PhpMyAdmin\Plugins\Transformations\Output\Image_JPEG_Link plugin
-            array(
+            [
                 new Image_JPEG_Link(),
                 'getName',
                 'ImageLink'
-            ),
-            array(
+            ],
+            [
                 new Image_JPEG_Link(),
                 'getInfo',
                 'Displays a link to download this image.'
-            ),
-            array(
+            ],
+            [
                 new Image_JPEG_Link(),
                 'getMIMEType',
                 'Image'
-            ),
-            array(
+            ],
+            [
                 new Image_JPEG_Link(),
                 'getMIMESubtype',
                 'JPEG'
-            ),
-            array(
+            ],
+            [
                 new Image_JPEG_Link(),
                 'applyTransformationNoWrap',
                 null
-            ),
+            ],
             // Test data for PhpMyAdmin\Plugins\Transformations\Output\Image_PNG_Inline plugin
-            array(
+            [
                 new Image_PNG_Inline(),
                 'getName',
                 'Inline'
-            ),
-            array(
+            ],
+            [
                 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.'
-            ),
-            array(
+            ],
+            [
                 new Image_PNG_Inline(),
                 'getMIMEType',
                 'Image'
-            ),
-            array(
+            ],
+            [
                 new Image_PNG_Inline(),
                 'getMIMESubtype',
                 'PNG'
-            ),
+            ],
             // Test data for PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Dateformat plugin
-            array(
+            [
                 new Text_Plain_Dateformat(),
                 'getName',
                 'Date Format'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Dateformat(),
                 'getInfo',
                 'Displays a TIME, TIMESTAMP, DATETIME or numeric unix timestamp'
@@ -376,24 +376,24 @@ class TransformationPluginsTest extends PmaTestCase
                 . ' that, date format has different value - for "local" see the'
                 . ' documentation for PHP\'s strftime() function and for "utc" it'
                 . ' is done using gmdate() function.'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Dateformat(),
                 'getMIMEType',
                 'Text'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Dateformat(),
                 'getMIMESubtype',
                 'Plain'
-            ),
+            ],
             // Test data for PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_External plugin
-            array(
+            [
                 new Text_Plain_External(),
                 'getName',
                 'External'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_External(),
                 'getInfo',
                 'LINUX ONLY:'
@@ -409,92 +409,92 @@ class TransformationPluginsTest extends PmaTestCase
                 . ' htmlspecialchars() (Default 1). The fourth option, if set to 1,'
                 . ' will prevent wrapping and ensure that the output appears all on'
                 . ' one line (Default 1).'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_External(),
                 'getMIMEType',
                 'Text'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_External(),
                 'getMIMESubtype',
                 'Plain'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_External(),
                 'applyTransformationNoWrap',
                 true,
-                array(
-                    array("/dev/null -i -wrap -q", "/dev/null -i -wrap -q")
-                )
-            ),
-            array(
+                [
+                    ["/dev/null -i -wrap -q", "/dev/null -i -wrap -q"]
+                ]
+            ],
+            [
                 new Text_Plain_External(),
                 'applyTransformationNoWrap',
                 true,
-                array(
-                    array(
+                [
+                    [
                         "/dev/null -i -wrap -q",
                         "/dev/null -i -wrap -q",
                         "/dev/null -i -wrap -q", 1
-                    )
-                )
-            ),
-            array(
+                    ]
+                ]
+            ],
+            [
                 new Text_Plain_External(),
                 'applyTransformationNoWrap',
                 true,
-                array(
-                    array(
+                [
+                    [
                         "/dev/null -i -wrap -q",
                         "/dev/null -i -wrap -q",
                         "/dev/null -i -wrap -q", "1"
-                    )
-                )
-            ),
-            array(
+                    ]
+                ]
+            ],
+            [
                 new Text_Plain_External(),
                 'applyTransformationNoWrap',
                 false,
-                array(
-                    array(
+                [
+                    [
                         "/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
-            array(
+            [
                 new Text_Plain_Formatted(),
                 'getName',
                 'Formatted'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Formatted(),
                 'getInfo',
                 'Displays the contents of the column as-is, without running it'
                 . ' through htmlspecialchars(). That is, the column is assumed'
                 . ' to contain valid HTML.'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Formatted(),
                 'getMIMEType',
                 'Text'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Formatted(),
                 'getMIMESubtype',
                 'Plain'
-            ),
+            ],
             // Test data for PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Imagelink plugin
-            array(
+            [
                 new Text_Plain_Imagelink(),
                 'getName',
                 'Image Link'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Imagelink(),
                 'getInfo',
                 'Displays an image and a link; '
@@ -502,113 +502,113 @@ class TransformationPluginsTest extends PmaTestCase
                 . ' is a URL prefix like "https://www.example.com/". '
                 . 'The second and third options'
                 . ' are the width and the height in pixels.'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Imagelink(),
                 'getMIMEType',
                 'Text'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Imagelink(),
                 'getMIMESubtype',
                 'Plain'
-            ),
+            ],
             // Test data for PhpMyAdmin\Plugins\Transformations\Output\Text_Plain_Sql plugin
-            array(
+            [
                 new Text_Plain_Sql(),
                 'getName',
                 'SQL'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Sql(),
                 'getInfo',
                 'Formats text as SQL query with syntax highlighting.'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Sql(),
                 'getMIMEType',
                 'Text'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Sql(),
                 'getMIMESubtype',
                 'Plain'
-            ),
+            ],
             // Test data for PhpMyAdmin\Plugins\Transformations\Text_Plain_Link plugin
-            array(
+            [
                 new Text_Plain_Link(),
                 'getName',
                 'TextLink'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Link(),
                 'getInfo',
                 'Displays a link; the column contains the filename. The first option'
                 . ' is a URL prefix like "https://www.example.com/".'
                 . ' The second option is a title for the link.'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Link(),
                 'getMIMEType',
                 'Text'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Link(),
                 'getMIMESubtype',
                 'Plain'
-            ),
+            ],
             // Test data for PhpMyAdmin\Plugins\Transformations\Text_Plain_Longtoipv4 plugin
-            array(
+            [
                 new Text_Plain_Longtoipv4(),
                 'getName',
                 'Long To IPv4'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Longtoipv4(),
                 'getInfo',
                 'Converts an (IPv4) Internet network address stored as a BIGINT'
                 . ' into a string in Internet standard dotted format.'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Longtoipv4(),
                 'getMIMEType',
                 'Text'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Longtoipv4(),
                 'getMIMESubtype',
                 'Plain'
-            ),
+            ],
             // Test data for Text_Plain_PreApPend plugin
-            array(
+            [
                 new Text_Plain_PreApPend(),
                 'getName',
                 'PreApPend'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_PreApPend(),
                 'getInfo',
                 'Prepends and/or Appends text to a string. First option is text'
                 . ' to be prepended, second is appended (enclosed in single'
                 . ' quotes, default empty string).'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_PreApPend(),
                 'getMIMEType',
                 'Text'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_PreApPend(),
                 'getMIMESubtype',
                 'Plain'
-            ),
+            ],
             // Test data for PhpMyAdmin\Plugins\Transformations\Text_Plain_Substring plugin
-            array(
+            [
                 new Text_Plain_Substring(),
                 'getName',
                 'Substring'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Substring(),
                 'getInfo',
                 'Displays a part of a string. The first option is the number '
@@ -617,45 +617,45 @@ class TransformationPluginsTest extends PmaTestCase
                 . 'to return (Default: until end of string). The third option is '
                 . 'the string to append and/or prepend when truncation occurs '
                 . '(Default: "…").'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Substring(),
                 'getMIMEType',
                 'Text'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Substring(),
                 'getMIMESubtype',
                 'Plain'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Substring(),
                 'getOptions',
-                array('foo', 'bar', 'baz'),
-                array(
-                    array(),
-                    array('foo', 'bar', 'baz')
-                )
-            ),
-            array(
+                ['foo', 'bar', 'baz'],
+                [
+                    [],
+                    ['foo', 'bar', 'baz']
+                ]
+            ],
+            [
                 new Text_Plain_Substring(),
                 'getOptions',
-                array('foo', 'bar', 'baz'),
-                array(
-                    array('foo', 'bar', 'baz'),
-                    array('foo', 'bar', 'baz')
-                )
-            ),
-            array(
+                ['foo', 'bar', 'baz'],
+                [
+                    ['foo', 'bar', 'baz'],
+                    ['foo', 'bar', 'baz']
+                ]
+            ],
+            [
                 new Text_Plain_Substring(),
                 'getOptions',
-                array('foo', 'bar', 'baz'),
-                array(
-                    array('foo', 'bar', 'baz'),
-                    array(1, 2, 3)
-                )
-            ),
-        );
+                ['foo', 'bar', 'baz'],
+                [
+                    ['foo', 'bar', 'baz'],
+                    [1, 2, 3]
+                ]
+            ],
+        ];
     }
 
     /**
@@ -672,7 +672,7 @@ class TransformationPluginsTest extends PmaTestCase
      * @dataProvider multiDataProvider
      * @group medium
      */
-    public function testGetMulti($object, $method, $expected, $args = array())
+    public function testGetMulti($object, $method, $expected, $args = [])
     {
         if (method_exists($object, $method)) {
             $reflectionMethod = new ReflectionMethod($object, $method);
@@ -690,288 +690,288 @@ class TransformationPluginsTest extends PmaTestCase
      */
     public function transformationDataProvider()
     {
-        $result = array(
-            array(
+        $result = [
+            [
                 new Image_JPEG_Upload(),
-                array(
+                [
                     'test',
-                    array(150, 100)
-                ),
+                    [150, 100]
+                ],
                 'test'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_FileUpload(),
-                array(
+                [
                     'test',
-                    array()
-                ),
+                    []
+                ],
                 'test'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_RegexValidation(),
-                array(
+                [
                     'phpMyAdmin',
-                    array('/php/i')
-                ),
+                    ['/php/i']
+                ],
                 'phpMyAdmin',
                 true,
                 ''
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_RegexValidation(),
-                array(
+                [
                     'qwerty',
-                    array('/^a/')
-                ),
+                    ['/^a/']
+                ],
                 'qwerty',
                 false,
                 'Validation failed for the input string qwerty.'
-            ),
-            array(
+            ],
+            [
                 new Application_Octetstream_Download(),
-                array(
+                [
                     'PMA_BUFFER',
-                    array("filename", 'wrapper_link'=>'PMA_wrapper_link')
-                ),
+                    ["filename", 'wrapper_link'=>'PMA_wrapper_link']
+                ],
                 '<a href="transformation_wrapper.phpPMA_wrapper_link'
                 . '&amp;ct=application/octet-stream&amp;cn=filename" '
                 . 'title="filename" class="disableAjax">filename</a>'
-            ),
-            array(
+            ],
+            [
                 new Application_Octetstream_Download(),
-                array(
+                [
                     'PMA_BUFFER',
-                    array("", 'cloumn', 'wrapper_link'=>'PMA_wrapper_link')
-                ),
+                    ["", 'cloumn', 'wrapper_link'=>'PMA_wrapper_link']
+                ],
                 '<a href="transformation_wrapper.phpPMA_wrapper_link&amp;'
                 . 'ct=application/octet-stream&amp;cn=binary_file.dat" '
                 . 'title="binary_file.dat" class="disableAjax">binary_file.dat</a>'
-            ),
-            array(
+            ],
+            [
                 new Application_Octetstream_Hex(),
-                array(
+                [
                     '11111001',
-                    array(3)
-                ),
+                    [3]
+                ],
                 '313 131 313 130 303 1 '
-            ),
-            array(
+            ],
+            [
                 new Application_Octetstream_Hex(),
-                array(
+                [
                     '11111001',
-                    array(0)
-                ),
+                    [0]
+                ],
                 '3131313131303031'
-            ),
-            array(
+            ],
+            [
                 new Application_Octetstream_Hex(),
-                array(
+                [
                     '11111001',
-                    array()
-                ),
+                    []
+                ],
                 '31 31 31 31 31 30 30 31 '
-            ),
-            array(
+            ],
+            [
                 new Image_JPEG_Link(),
-                array(
+                [
                     'PMA_IMAGE_LINK',
-                    array("./image/", "200", "wrapper_link"=>"PMA_wrapper_link")
-                ),
+                    ["./image/", "200", "wrapper_link"=>"PMA_wrapper_link"]
+                ],
                 '<a class="disableAjax" target="_blank" rel="noopener noreferrer"'
                 . ' href="transformation_wrapper.phpPMA_wrapper_link"'
                 . ' alt="[PMA_IMAGE_LINK]">[BLOB]</a>'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Dateformat(),
-                array(
+                [
                     12345,
-                    array(0),
-                    (object) array(
+                    [0],
+                    (object) [
                         'type' => 'int'
-                    )
-                ),
+                    ]
+                ],
                 '<dfn onclick="alert(\'12345\');" title="12345">'
                 . 'Jan 01, 1970 at 03:25 AM</dfn>'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Dateformat(),
-                array(
+                [
                     12345678,
-                    array(0),
-                    (object) array(
+                    [0],
+                    (object) [
                         'type' => 'string'
-                    )
-                ),
+                    ]
+                ],
                 '<dfn onclick="alert(\'12345678\');" title="12345678">'
                 . 'May 23, 1970 at 09:21 PM</dfn>'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Dateformat(),
-                array(
+                [
                     123456789,
-                    array(0),
-                    (object) array(
+                    [0],
+                    (object) [
                         'type' => null
-                    )
-                ),
+                    ]
+                ],
                 '<dfn onclick="alert(\'123456789\');" title="123456789">'
                 . 'Nov 29, 1973 at 09:33 PM</dfn>'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Dateformat(),
-                array(
+                [
                     '20100201',
-                    array(0),
-                    (object) array(
+                    [0],
+                    (object) [
                         'type' => null
-                    )
-                ),
+                    ]
+                ],
                 '<dfn onclick="alert(\'20100201\');" title="20100201">'
                 . 'Feb 01, 2010 at 12:00 AM</dfn>'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_External(),
-                array(
+                [
                     'PMA_BUFFER',
-                    array("/dev/null -i -wrap -q", "/dev/null -i -wrap -q")
-                ),
+                    ["/dev/null -i -wrap -q", "/dev/null -i -wrap -q"]
+                ],
                 'PMA_BUFFER'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Formatted(),
-                array(
+                [
                     "<a ref='https://www.example.com/'>PMA_BUFFER</a>",
-                    array("option1", "option2")
-                ),
+                    ["option1", "option2"]
+                ],
                 "<iframe srcdoc=\"<a ref='https://www.example.com/'>PMA_BUFFER</a>\" sandbox=\"\"></iframe>"
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Formatted(),
-                array(
+                [
                     "<a ref=\"https://www.example.com/\">PMA_BUFFER</a>",
-                    array("option1", "option2")
-                ),
+                    ["option1", "option2"]
+                ],
                 "<iframe srcdoc=\"<a ref='https://www.example.com/'>PMA_BUFFER</a>\" sandbox=\"\"></iframe>"
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Imagelink(),
-                array(
+                [
                     'PMA_IMAGE',
-                    array("http://image/", "200")
-                ),
+                    ["http://image/", "200"]
+                ],
                 '<a href="http://image/PMA_IMAGE" rel="noopener noreferrer" target="_blank">'
                 . '<img src="http://image/PMA_IMAGE" border="0" width="200" '
                 . 'height="50" />PMA_IMAGE</a>'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Imagelink(),
-                array(
+                [
                     'PMA_IMAGE',
-                    array("./image/", "200")
-                ),
+                    ["./image/", "200"]
+                ],
                 './image/PMA_IMAGE'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Sql(),
-                array(
+                [
                     'select *',
-                    array("option1", "option2")
-                ),
+                    ["option1", "option2"]
+                ],
                 '<code class="sql"><pre>' . "\n"
                 . 'select *' . "\n"
                 . '</pre></code>'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Link(),
-                array(
+                [
                     'PMA_TXT_LINK',
-                    array("./php/", "text_name")
-                ),
+                    ["./php/", "text_name"]
+                ],
                 './php/PMA_TXT_LINK'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Link(),
-                array(
+                [
                     'PMA_TXT_LINK',
-                    array(),
-                ),
+                    [],
+                ],
                 'PMA_TXT_LINK'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Link(),
-                array(
+                [
                     'https://example.com/PMA_TXT_LINK',
-                    array(),
-                ),
+                    [],
+                ],
                 '<a href="https://example.com/PMA_TXT_LINK" title=""'
                 . ' target="_blank" rel="noopener noreferrer">https://example.com/PMA_TXT_LINK</a>'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Link(),
-                array(
+                [
                     'PMA_TXT_LINK',
-                    array("./php/", "text_name")
-                ),
+                    ["./php/", "text_name"]
+                ],
                 './php/PMA_TXT_LINK'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Longtoipv4(),
-                array(
+                [
                     42949672,
-                    array("option1", "option2")
-                ),
+                    ["option1", "option2"]
+                ],
                 '2.143.92.40'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Longtoipv4(),
-                array(
+                [
                     4294967295,
-                    array("option1", "option2")
-                ),
+                    ["option1", "option2"]
+                ],
                 '255.255.255.255'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_PreApPend(),
-                array(
+                [
                     'My',
-                    array('php', 'Admin')
-                ),
+                    ['php', 'Admin']
+                ],
                 'phpMyAdmin'
-            ),
-            array(
+            ],
+            [
                 new Text_Plain_Substring(),
-                array(
+                [
                     'PMA_BUFFER',
-                    array(1, 3, 'suffix')
-                ),
+                    [1, 3, 'suffix']
+                ],
                 'suffixMA_suffix'
-            ),
-        );
+            ],
+        ];
 
         if (function_exists('imagecreatetruecolor')) {
-            $result[] = array(
+            $result[] = [
                 new Image_JPEG_Inline(),
-                array(
+                [
                     'PMA_JPEG_Inline',
-                    array("./image/", "200", "wrapper_link"=>"PMA_wrapper_link")
-                ),
+                    ["./image/", "200", "wrapper_link"=>"PMA_wrapper_link"]
+                ],
                 '<a href="transformation_wrapper.phpPMA_wrapper_link" '
                 . 'rel="noopener noreferrer" target="_blank"><img src="transformation_wrapper.php'
                 . 'PMA_wrapper_link&amp;resize=jpeg&amp;newWidth=0&amp;'
                 . 'newHeight=200" alt="[PMA_JPEG_Inline]" border="0" /></a>'
-            );
-            $result[] = array(
+            ];
+            $result[] = [
                 new Image_PNG_Inline(),
-                array(
+                [
                     'PMA_PNG_Inline',
-                    array("./image/", "200", "wrapper_link"=>"PMA_wrapper_link")
-                ),
+                    ["./image/", "200", "wrapper_link"=>"PMA_wrapper_link"]
+                ],
                 '<a href="transformation_wrapper.phpPMA_wrapper_link"'
                 . ' rel="noopener noreferrer" target="_blank"><img src="transformation_wrapper.php'
                 . 'PMA_wrapper_link&amp;'
                 . 'resize=jpeg&amp;newWidth=0&amp;newHeight=200" '
                 . 'alt="[PMA_PNG_Inline]" border="0" /></a>'
-            );
+            ];
         }
         return $result;
     }
diff --git a/test/classes/PmaTestCase.php b/test/classes/PmaTestCase.php
index a146274649..de92c87fea 100644
--- a/test/classes/PmaTestCase.php
+++ b/test/classes/PmaTestCase.php
@@ -53,11 +53,11 @@ class PmaTestCase extends TestCase
 
         $mockResponse = $this->getMockBuilder('PhpMyAdmin\Response')
             ->disableOriginalConstructor()
-            ->setMethods(array(
+            ->setMethods([
                 'header', 'headersSent', 'disable', 'isAjax',
                 'setRequestStatus', 'addJSON', 'addHTML',
                 'getFooter', 'getHeader','httpResponseCode',
-            ))
+            ])
             ->getMock();
 
         $mockResponse->expects($this->any())
@@ -81,7 +81,7 @@ class PmaTestCase extends TestCase
                 $header_method = $mockResponse->expects($this->exactly(count($param)))
                     ->method('header');
 
-                call_user_func_array(array($header_method, 'withConsecutive'), $param);
+                call_user_func_array([$header_method, 'withConsecutive'], $param);
 
             } else {
                 $mockResponse->expects($this->once())
diff --git a/test/classes/Properties/Options/OptionsPropertyGroupTest.php b/test/classes/Properties/Options/OptionsPropertyGroupTest.php
index e76d995ef5..fb530d6258 100644
--- a/test/classes/Properties/Options/OptionsPropertyGroupTest.php
+++ b/test/classes/Properties/Options/OptionsPropertyGroupTest.php
@@ -51,7 +51,7 @@ class OptionsPropertyGroupTest extends TestCase
         $properties = new ReflectionProperty('PhpMyAdmin\Properties\Options\OptionsPropertyGroup', '_properties');
         $properties->setAccessible(true);
 
-        $properties->setValue($this->stub, array(1, 2, 3));
+        $properties->setValue($this->stub, [1, 2, 3]);
 
         $this->assertNull(
             $this->stub->addProperty(2)
@@ -60,7 +60,7 @@ class OptionsPropertyGroupTest extends TestCase
         $this->stub->addProperty('2');
 
         $this->assertEquals(
-            array(1, 2, 3, '2'),
+            [1, 2, 3, '2'],
             $properties->getValue($this->stub)
         );
     }
@@ -75,15 +75,15 @@ class OptionsPropertyGroupTest extends TestCase
         $properties = new ReflectionProperty('PhpMyAdmin\Properties\Options\OptionsPropertyGroup', '_properties');
         $properties->setAccessible(true);
 
-        $properties->setValue($this->stub, array(1, 2, 'test', 3));
+        $properties->setValue($this->stub, [1, 2, 'test', 3]);
         $this->stub->removeProperty('test');
 
         $this->assertEquals(
-            array(
+            [
                 0 => 1,
                 1 => 2,
                 3 => 3
-            ),
+            ],
             $properties->getValue($this->stub)
         );
     }
@@ -110,10 +110,10 @@ class OptionsPropertyGroupTest extends TestCase
     {
         $properties = new ReflectionProperty('PhpMyAdmin\Properties\Options\OptionsPropertyGroup', '_properties');
         $properties->setAccessible(true);
-        $properties->setValue($this->stub, array(1, 2, 3));
+        $properties->setValue($this->stub, [1, 2, 3]);
 
         $this->assertEquals(
-            array(1, 2, 3),
+            [1, 2, 3],
             $this->stub->getProperties()
         );
     }
@@ -127,7 +127,7 @@ class OptionsPropertyGroupTest extends TestCase
     {
         $properties = new ReflectionProperty('PhpMyAdmin\Properties\Options\OptionsPropertyGroup', '_properties');
         $properties->setAccessible(true);
-        $properties->setValue($this->stub, array(1, 2, 3));
+        $properties->setValue($this->stub, [1, 2, 3]);
 
         $this->assertEquals(
             3,
diff --git a/test/classes/Properties/Options/OptionsPropertyOneItemTest.php b/test/classes/Properties/Options/OptionsPropertyOneItemTest.php
index fc83262eb7..80ff8a15ee 100644
--- a/test/classes/Properties/Options/OptionsPropertyOneItemTest.php
+++ b/test/classes/Properties/Options/OptionsPropertyOneItemTest.php
@@ -49,10 +49,10 @@ class OptionsPropertyOneItemTest extends TestCase
      */
     public function testGetSetValues()
     {
-        $this->stub->setValues(array(1, 2));
+        $this->stub->setValues([1, 2]);
 
         $this->assertEquals(
-            array(1, 2),
+            [1, 2],
             $this->stub->getValues()
         );
     }
diff --git a/test/classes/RelationCleanupDbiMock.php b/test/classes/RelationCleanupDbiMock.php
index ddeaa16ba3..3d6f9e04f6 100644
--- a/test/classes/RelationCleanupDbiMock.php
+++ b/test/classes/RelationCleanupDbiMock.php
@@ -23,8 +23,8 @@ class RelationCleanupDbiMock extends DatabaseInterface
     var $index;
     var $assocIndex;
     var $totalNum;
-    var $values = array();
-    var $indexs = array();
+    var $values = [];
+    var $indexs = [];
 
     /**
      * Constructor
@@ -35,7 +35,7 @@ class RelationCleanupDbiMock extends DatabaseInterface
          $this->index = 0;
          $this->assocIndex = 0;
          $this->totalNum = 2;
-         $this->values = array(
+         $this->values = [
              'bookmark',
              'relation',
              'table_info',
@@ -50,8 +50,8 @@ class RelationCleanupDbiMock extends DatabaseInterface
              'users',
              'usergroups',
              'navigationhiding',
-         );
-         $this->indexs = array(
+         ];
+         $this->indexs = [
              'bookmark' => 0,
              'relation' => 1,
              'table_info' => 2,
@@ -66,7 +66,7 @@ class RelationCleanupDbiMock extends DatabaseInterface
              'users' => 11,
              'usergroups' => 12,
              'navigationhiding' => 13,
-         );
+         ];
     }
 
     /**
@@ -78,7 +78,7 @@ class RelationCleanupDbiMock extends DatabaseInterface
      */
     public function fetchRow($result)
     {
-        $curr_table = array();
+        $curr_table = [];
         if ($this->index < count($this->values)) {
             $curr_table[0] = $this->values[$this->index];
             $this->index++;
@@ -200,9 +200,9 @@ class RelationCleanupDbiMock extends DatabaseInterface
         string $type = 'ASSOC',
         $link = null
     ) {
-        return array(
+        return [
             'display_field' => "PMA_display_field"
-        );
+        ];
     }
 
     /**
@@ -214,7 +214,7 @@ class RelationCleanupDbiMock extends DatabaseInterface
      */
     public function fetchAssoc($result)
     {
-        $assocResult = array();
+        $assocResult = [];
         if ($this->assocIndex < $this->totalNum) {
             $assocResult['db_name'] = "db_name" . $this->assocIndex;
             $assocResult['comment'] = "comment" . $this->assocIndex;
diff --git a/test/classes/RelationCleanupTest.php b/test/classes/RelationCleanupTest.php
index c744ef0919..d9d80ea896 100644
--- a/test/classes/RelationCleanupTest.php
+++ b/test/classes/RelationCleanupTest.php
@@ -36,7 +36,7 @@ class RelationCleanupTest extends TestCase
      */
     public function setUp()
     {
-        $_SESSION['relation'] = array();
+        $_SESSION['relation'] = [];
         $GLOBALS['server'] = 1;
         $GLOBALS['cfg']['Server']['user'] = "user";
         $GLOBALS['cfg']['Server']['pmadb'] = "pmadb";
@@ -98,7 +98,7 @@ class RelationCleanupTest extends TestCase
         //validate Relation::getDbComments when commwork = true
         $db_comments = $this->relation->getDbComments();
         $this->assertEquals(
-            array('db_name0' => 'comment0','db_name1' => 'comment1'),
+            ['db_name0' => 'comment0','db_name1' => 'comment1'],
             $db_comments
         );
 
diff --git a/test/classes/RelationTest.php b/test/classes/RelationTest.php
index f59fbebc1e..df17071e0c 100644
--- a/test/classes/RelationTest.php
+++ b/test/classes/RelationTest.php
@@ -42,7 +42,7 @@ class RelationTest extends TestCase
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
         $GLOBALS['cfg']['ZeroConf'] = true;
         $_SESSION['relation'][$GLOBALS['server']] = "PMA_relation";
-        $_SESSION['relation'] = array();
+        $_SESSION['relation'] = [];
 
         $GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
         $GLOBALS['cfg']['ServerDefault'] = 0;
@@ -211,24 +211,24 @@ class RelationTest extends TestCase
     public function testPMAGetComments()
     {
         $GLOBALS['cfg']['ServerDefault'] = 0;
-        $_SESSION['relation'] = array();
+        $_SESSION['relation'] = [];
 
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
             ->disableOriginalConstructor()
             ->getMock();
 
-        $getColumnsResult = array(
-                array(
+        $getColumnsResult = [
+                [
                         'Field' => 'field1',
                         'Type' => 'int(11)',
                         'Comment' => 'Comment1'
-                ),
-                array(
+                ],
+                [
                         'Field' => 'field2',
                         'Type' => 'text',
                         'Comment' => 'Comment1'
-                )
-        );
+                ]
+        ];
         $dbi->expects($this->any())->method('getColumns')
             ->will($this->returnValue($getColumnsResult));
 
@@ -236,17 +236,17 @@ class RelationTest extends TestCase
 
         $db = 'information_schema';
         $this->assertEquals(
-            array(''),
+            [''],
             $this->relation->getComments($db)
         );
 
         $db = 'information_schema';
         $table = 'TABLES';
         $this->assertEquals(
-            array(
+            [
                 'field1' => 'Comment1',
                 'field2' => 'Comment1'
-            ),
+            ],
             $this->relation->getComments($db, $table)
         );
     }
@@ -297,28 +297,28 @@ class RelationTest extends TestCase
      */
     public function testPMASearchColumnInForeigners()
     {
-        $foreigners = array(
-            'value' => array(
+        $foreigners = [
+            'value' => [
                   'master_field' => 'value',
                   'foreign_db' => 'GSoC14',
                   'foreign_table' => 'test',
                   'foreign_field' => 'value'
-            ),
-            'foreign_keys_data' => array(
-                0 => array(
+            ],
+            'foreign_keys_data' => [
+                0 => [
                     'constraint' => 'ad',
-                    'index_list' => array('id', 'value'),
+                    'index_list' => ['id', 'value'],
                     'ref_db_name' => 'GSoC14',
                     'ref_table_name' => 'table_1',
-                    'ref_index_list' => array('id', 'value'),
+                    'ref_index_list' => ['id', 'value'],
                     'on_delete' => 'CASCADE',
                     'on_update' => 'CASCADE'
-                )
-            )
-        );
+                ]
+            ]
+        ];
 
         $foreigner = $this->relation->searchColumnInForeigners($foreigners, 'id');
-        $expected = array();
+        $expected = [];
         $expected['foreign_field'] = 'id';
         $expected['foreign_db'] = 'GSoC14';
         $expected['foreign_table'] = 'table_1';
diff --git a/test/classes/ReplicationGuiTest.php b/test/classes/ReplicationGuiTest.php
index bacac3ca93..804defe2f0 100644
--- a/test/classes/ReplicationGuiTest.php
+++ b/test/classes/ReplicationGuiTest.php
@@ -44,7 +44,7 @@ class ReplicationGuiTest extends TestCase
         $GLOBALS['cfg']['MaxRows'] = 10;
         $GLOBALS['cfg']['ServerDefault'] = "server";
         $GLOBALS['cfg']['RememberSorting'] = true;
-        $GLOBALS['cfg']['SQP'] = array();
+        $GLOBALS['cfg']['SQP'] = [];
         $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
         $GLOBALS['cfg']['ShowSQL'] = true;
         $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
@@ -53,7 +53,7 @@ class ReplicationGuiTest extends TestCase
         $GLOBALS['cfg']['ShowHint'] = true;
 
         $GLOBALS['table'] = "table";
-        $GLOBALS['url_params'] = array();
+        $GLOBALS['url_params'] = [];
 
         $this->replicationGui = new ReplicationGui();
 
@@ -61,21 +61,21 @@ class ReplicationGuiTest extends TestCase
 
         //Mock DBI
 
-        $slave_host = array(
-            array('Server_id'=>'Server_id1', 'Host'=>'Host1'),
-            array('Server_id'=>'Server_id2', 'Host'=>'Host2'),
-        );
+        $slave_host = [
+            ['Server_id'=>'Server_id1', 'Host'=>'Host1'],
+            ['Server_id'=>'Server_id2', 'Host'=>'Host2'],
+        ];
 
-        $fetchResult = array(
-            array(
+        $fetchResult = [
+            [
                 "SHOW SLAVE HOSTS",
                 null,
                 null,
                 DatabaseInterface::CONNECT_USER,
                 0,
                 $slave_host
-            ),
-        );
+            ],
+        ];
 
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
             ->disableOriginalConstructor()
@@ -84,13 +84,13 @@ class ReplicationGuiTest extends TestCase
         $dbi->expects($this->any())->method('fetchResult')
             ->will($this->returnValueMap($fetchResult));
 
-        $fields_info = array(
-            "Host" => array(
+        $fields_info = [
+            "Host" => [
                 "Field" => "host",
                 "Type" => "char(60)",
                 "Null" => "NO",
-            )
-        );
+            ]
+        ];
         $dbi->expects($this->any())->method('getColumns')
             ->will($this->returnValue($fields_info));
 
diff --git a/test/classes/Rte/EventsTest.php b/test/classes/Rte/EventsTest.php
index 831dd417b1..17dfa63f5d 100644
--- a/test/classes/Rte/EventsTest.php
+++ b/test/classes/Rte/EventsTest.php
@@ -95,9 +95,9 @@ class EventsTest extends TestCase
      */
     public function providerGetDataFromRequest()
     {
-        return array(
-            array(
-                array(
+        return [
+            [
+                [
                     'item_name'           => '',
                     'item_type'           => '',
                     'item_original_name'  => '',
@@ -111,8 +111,8 @@ class EventsTest extends TestCase
                     'item_preserve'       => '',
                     'item_comment'        => '',
                     'item_definer'        => ''
-                ),
-                array(
+                ],
+                [
                     'item_name'           => '',
                     'item_type'           => 'ONE TIME',
                     'item_type_toggle'    => 'RECURRING',
@@ -127,10 +127,10 @@ class EventsTest extends TestCase
                     'item_preserve'       => '',
                     'item_comment'        => '',
                     'item_definer'        => ''
-                )
-            ),
-            array(
-                array(
+                ]
+            ],
+            [
+                [
                     'item_name'           => 'foo',
                     'item_type'           => 'RECURRING',
                     'item_original_name'  => 'foo',
@@ -144,8 +144,8 @@ class EventsTest extends TestCase
                     'item_preserve'       => 'foo',
                     'item_comment'        => 'foo',
                     'item_definer'        => 'foo'
-                ),
-                array(
+                ],
+                [
                     'item_name'           => 'foo',
                     'item_type'           => 'RECURRING',
                     'item_type_toggle'    => 'ONE TIME',
@@ -160,9 +160,9 @@ class EventsTest extends TestCase
                     'item_preserve'       => 'foo',
                     'item_comment'        => 'foo',
                     'item_definer'        => 'foo'
-                )
-            ),
-        );
+                ]
+            ],
+        ];
     }
 
     /**
@@ -191,7 +191,7 @@ class EventsTest extends TestCase
      */
     public function providerGetEditorFormAdd()
     {
-        $data = array(
+        $data = [
             'item_name'           => '',
             'item_type'           => 'ONE TIME',
             'item_type_toggle'    => 'RECURRING',
@@ -206,50 +206,50 @@ class EventsTest extends TestCase
             'item_preserve'       => '',
             'item_comment'        => '',
             'item_definer'        => ''
-        );
+        ];
 
-        return array(
-            array(
+        return [
+            [
                 $data,
                 "<input name='add_item'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<input type='text' name='item_name'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<select name='item_status'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<input name='item_type'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<input type='text' name='item_execute_at'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<input type='text' name='item_ends'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<textarea name='item_definition'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<input type='text' name='item_definer'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<input type='text' name='item_comment'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<input type='submit' name='editor_process_add'"
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -278,7 +278,7 @@ class EventsTest extends TestCase
      */
     public function providerGetEditorFormEdit()
     {
-        $data = array(
+        $data = [
             'item_name'           => 'foo',
             'item_type'           => 'RECURRING',
             'item_type_toggle'    => 'ONE TIME',
@@ -293,50 +293,50 @@ class EventsTest extends TestCase
             'item_preserve'       => '',
             'item_comment'        => '',
             'item_definer'        => ''
-        );
+        ];
 
-        return array(
-            array(
+        return [
+            [
                 $data,
                 "<input name='edit_item'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<input type='text' name='item_name'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<select name='item_status'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<input name='item_type'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<input type='text' name='item_execute_at'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<input type='text' name='item_ends'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<textarea name='item_definition'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<input type='text' name='item_definer'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<input type='text' name='item_comment'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<input type='submit' name='editor_process_edit'"
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -367,7 +367,7 @@ class EventsTest extends TestCase
      */
     public function providerGetEditorFormAjax()
     {
-        $data = array(
+        $data = [
             'item_name'           => '',
             'item_type'           => 'RECURRING',
             'item_type_toggle'    => 'ONE TIME',
@@ -382,22 +382,22 @@ class EventsTest extends TestCase
             'item_preserve'       => '',
             'item_comment'        => '',
             'item_definer'        => ''
-        );
+        ];
 
-        return array(
-            array(
+        return [
+            [
                 $data,
                 "<select name='item_type'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<input type='hidden' name='editor_process_edit'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<input type='hidden' name='ajax_request'"
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -415,7 +415,7 @@ class EventsTest extends TestCase
     {
         global $_REQUEST, $errors;
 
-        $errors = array();
+        $errors = [];
         $this->events->setGlobals();
 
         unset($_REQUEST);
@@ -440,21 +440,21 @@ class EventsTest extends TestCase
      */
     public function providerGetQueryFromRequest()
     {
-        return array(
+        return [
             // Testing success
-            array(
-                array( // simple once-off event
+            [
+                [ // simple once-off event
                     'item_name'       => 's o m e e v e n t\\',
                     'item_type'       => 'ONE TIME',
                     'item_execute_at' => '2050-01-01 00:00:00',
                     'item_definition' => 'SET @A=0;'
-                ),
+                ],
                 'CREATE EVENT `s o m e e v e n t\` ON SCHEDULE AT \'2050-01-01 ' .
                 '00:00:00\' ON COMPLETION NOT PRESERVE DO SET @A=0;',
                 0
-            ),
-            array(
-                array( // full once-off event
+            ],
+            [
+                [ // full once-off event
                     'item_name'       => 'evn',
                     'item_definer'    => 'me@home',
                     'item_type'       => 'ONE TIME',
@@ -462,26 +462,26 @@ class EventsTest extends TestCase
                     'item_preserve'   => 'ON',
                     'item_status'     => 'ENABLED',
                     'item_definition' => 'SET @A=0;'
-                ),
+                ],
                 'CREATE DEFINER=`me`@`home` EVENT `evn` ON SCHEDULE AT ' .
                 '\'2050-01-01 00:00:00\' ON COMPLETION PRESERVE ENABLE DO SET @A=0;',
                 0
-            ),
-            array(
-                array( // simple recurring event
+            ],
+            [
+                [ // simple recurring event
                     'item_name'           => 'rec_``evn',
                     'item_type'           => 'RECURRING',
                     'item_interval_value' => '365',
                     'item_interval_field' => 'DAY',
                     'item_status'         => 'DISABLED',
                     'item_definition'     => 'SET @A=0;'
-                ),
+                ],
                 'CREATE EVENT `rec_````evn` ON SCHEDULE EVERY 365 DAY ON ' .
                 'COMPLETION NOT PRESERVE DISABLE DO SET @A=0;',
                 0
-            ),
-            array(
-                array( // full recurring event
+            ],
+            [
+                [ // full recurring event
                     'item_name'           => 'rec_evn2',
                     'item_definer'        => 'evil``user><\\@work\\',
                     'item_type'           => 'RECURRING',
@@ -492,57 +492,57 @@ class EventsTest extends TestCase
                     'item_preserve'       => 'ON',
                     'item_status'         => 'SLAVESIDE_DISABLED',
                     'item_definition'     => 'SET @A=0;'
-                ),
+                ],
                 'CREATE DEFINER=`evil````user><\`@`work\` EVENT `rec_evn2` ON ' .
                 'SCHEDULE EVERY 365 DAY STARTS \'1900-01-01\' ENDS \'2050-01-01\' ' .
                 'ON COMPLETION PRESERVE DISABLE ON SLAVE DO SET @A=0;',
                 0
-            ),
+            ],
             // Testing failures
-            array(
-                array( // empty request
-                ),
+            [
+                [ // empty request
+                ],
                 'CREATE EVENT ON SCHEDULE ON COMPLETION NOT PRESERVE DO ',
                 3
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'item_name'       => 's o m e e v e n t\\',
                     'item_definer'    => 'someuser', // invalid definer format
                     'item_type'       => 'ONE TIME',
                     'item_execute_at' => '', // no execution time
                     'item_definition' => 'SET @A=0;'
-                ),
+                ],
                 'CREATE EVENT `s o m e e v e n t\` ON SCHEDULE ON COMPLETION NOT ' .
                 'PRESERVE DO SET @A=0;',
                 2
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'item_name'           => 'rec_``evn',
                     'item_type'           => 'RECURRING',
                     'item_interval_value' => '', // no interval value
                     'item_interval_field' => 'DAY',
                     'item_status'         => 'DISABLED',
                     'item_definition'     => 'SET @A=0;'
-                ),
+                ],
                 'CREATE EVENT `rec_````evn` ON SCHEDULE ON COMPLETION NOT ' .
                 'PRESERVE DISABLE DO SET @A=0;',
                 1
-            ),
-            array(
-                array( // simple recurring event
+            ],
+            [
+                [ // simple recurring event
                     'item_name'           => 'rec_``evn',
                     'item_type'           => 'RECURRING',
                     'item_interval_value' => '365',
                     'item_interval_field' => 'CENTURIES', // invalid interval field
                     'item_status'         => 'DISABLED',
                     'item_definition'     => 'SET @A=0;'
-                ),
+                ],
                 'CREATE EVENT `rec_````evn` ON SCHEDULE ON COMPLETION NOT ' .
                 'PRESERVE DISABLE DO SET @A=0;',
                 1
-            ),
-        );
+            ],
+        ];
     }
 }
diff --git a/test/classes/Rte/RoutinesTest.php b/test/classes/Rte/RoutinesTest.php
index 6ffacde19b..0e5705baa8 100644
--- a/test/classes/Rte/RoutinesTest.php
+++ b/test/classes/Rte/RoutinesTest.php
@@ -90,9 +90,9 @@ class RoutinesTest extends TestCase
      */
     public function providerGetDataFromRequest()
     {
-        return array(
-            array(
-                array(
+        return [
+            [
+                [
                     'item_name'                 => '',
                     'item_original_name'        => '',
                     'item_returnlength'         => '',
@@ -114,8 +114,8 @@ class RoutinesTest extends TestCase
                     'item_isdeterministic'      => '',
                     'item_securitytype'         => '',
                     'item_sqldataaccess'        => ''
-                ),
-                array(
+                ],
+                [
                     'item_name'                 => '',
                     'item_original_name'        => '',
                     'item_returnlength'         => '',
@@ -128,21 +128,21 @@ class RoutinesTest extends TestCase
                     'item_type_toggle'          => 'FUNCTION',
                     'item_original_type'        => 'PROCEDURE',
                     'item_num_params'           => 0,
-                    'item_param_dir'            => array(),
-                    'item_param_name'           => array(),
-                    'item_param_type'           => array(),
-                    'item_param_length'         => array(),
-                    'item_param_opts_num'       => array(),
-                    'item_param_opts_text'      => array(),
+                    'item_param_dir'            => [],
+                    'item_param_name'           => [],
+                    'item_param_type'           => [],
+                    'item_param_length'         => [],
+                    'item_param_opts_num'       => [],
+                    'item_param_opts_text'      => [],
                     'item_returntype'           => '',
                     'item_isdeterministic'      => '',
                     'item_securitytype_definer' => '',
                     'item_securitytype_invoker' => '',
                     'item_sqldataaccess'        => ''
-                )
-            ),
-            array(
-                array(
+                ]
+            ],
+            [
+                [
                     'item_name'                 => 'proc2',
                     'item_original_name'        => 'proc',
                     'item_returnlength'         => '',
@@ -154,18 +154,18 @@ class RoutinesTest extends TestCase
                     'item_type'                 => 'PROCEDURE',
                     'item_type_toggle'          => 'FUNCTION',
                     'item_original_type'        => 'PROCEDURE',
-                    'item_param_dir'            => array(0 => 'IN', 1 => 'FAIL'),
-                    'item_param_name'           => array(0 => 'bar', 1 => 'baz'),
-                    'item_param_type'           => array(0 => 'INT', 1 => 'FAIL'),
-                    'item_param_length'         => array(0 => '20', 1 => ''),
-                    'item_param_opts_num'       => array(0 => 'UNSIGNED', 1 => ''),
-                    'item_param_opts_text'      => array(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',
                     'item_sqldataaccess'        => 'NO SQL'
-                ),
-                array(
+                ],
+                [
                     'item_name'                 => 'proc2',
                     'item_original_name'        => 'proc',
                     'item_returnlength'         => '',
@@ -178,21 +178,21 @@ class RoutinesTest extends TestCase
                     'item_type_toggle'          => 'FUNCTION',
                     'item_original_type'        => 'PROCEDURE',
                     'item_num_params'           => 2,
-                    'item_param_dir'            => array(0 => 'IN', 1 => ''),
-                    'item_param_name'           => array(0 => 'bar', 1 => 'baz'),
-                    'item_param_type'           => array(0 => 'INT', 1 => ''),
-                    'item_param_length'         => array(0 => '20', 1 => ''),
-                    'item_param_opts_num'       => array(0 => 'UNSIGNED', 1 => ''),
-                    'item_param_opts_text'      => array(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' => '',
                     'item_securitytype_invoker' => ' selected=\'selected\'',
                     'item_sqldataaccess'        => 'NO SQL'
-                )
-            ),
-            array(
-                array(
+                ]
+            ],
+            [
+                [
                     'item_name'                 => 'func2',
                     'item_original_name'        => 'func',
                     'item_returnlength'         => '20',
@@ -204,21 +204,21 @@ class RoutinesTest extends TestCase
                     'item_type'                 => 'FUNCTION',
                     'item_type_toggle'          => 'PROCEDURE',
                     'item_original_type'        => 'FUNCTION',
-                    'item_param_dir'            => array(0 => '', 1 => ''),
-                    'item_param_name'           => array(0 => 'bar', 1 => 'baz'),
-                    'item_param_type'           => array(
+                    'item_param_dir'            => [0 => '', 1 => ''],
+                    'item_param_name'           => [0 => 'bar', 1 => 'baz'],
+                    'item_param_type'           => [
                         0 => '<s>XSS</s>',
                         1 => 'TEXT'
-                    ),
-                    'item_param_length'         => array(0 => '10,10', 1 => ''),
-                    'item_param_opts_num'       => array(0 => 'UNSIGNED', 1 => ''),
-                    'item_param_opts_text'      => array(0 => '', 1 => 'utf8'),
+                    ],
+                    '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',
                     'item_sqldataaccess'        => ''
-                ),
-                array(
+                ],
+                [
                     'item_name'                 => 'func2',
                     'item_original_name'        => 'func',
                     'item_returnlength'         => '20',
@@ -231,20 +231,20 @@ class RoutinesTest extends TestCase
                     'item_type_toggle'          => 'PROCEDURE',
                     'item_original_type'        => 'FUNCTION',
                     'item_num_params'           => '2',
-                    'item_param_dir'            => array(),
-                    'item_param_name'           => array(0 => 'bar', 1 => 'baz'),
-                    'item_param_type'           => array(0 => '', 1 => 'TEXT'),
-                    'item_param_length'         => array(0 => '10,10', 1 => ''),
-                    'item_param_opts_num'       => array(0 => 'UNSIGNED', 1 => ''),
-                    'item_param_opts_text'      => array(0 => '', 1 => 'utf8'),
+                    '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_returntype'           => 'VARCHAR',
                     'item_isdeterministic'      => '',
                     'item_securitytype_definer' => ' selected=\'selected\'',
                     'item_securitytype_invoker' => '',
                     'item_sqldataaccess'        => ''
-                )
-            ),
-        );
+                ]
+            ],
+        ];
     }
 
     /**
@@ -255,7 +255,7 @@ class RoutinesTest extends TestCase
     public function testGetParameterRowEmpty()
     {
         $this->routines->setGlobals();
-        $this->assertEquals('', $this->routines->getParameterRow(array(), 0));
+        $this->assertEquals('', $this->routines->getParameterRow([], 0));
     }
 
     /**
@@ -286,7 +286,7 @@ class RoutinesTest extends TestCase
      */
     public function providerGetParameterRow()
     {
-        $data = array(
+        $data = [
             'item_name'                 => '',
             'item_original_name'        => '',
             'item_returnlength'         => '',
@@ -299,46 +299,46 @@ class RoutinesTest extends TestCase
             'item_type_toggle'          => 'FUNCTION',
             'item_original_type'        => 'PROCEDURE',
             'item_num_params'           => 1,
-            'item_param_dir'            => array(0 => 'IN'),
-            'item_param_name'           => array(0 => 'foo'),
-            'item_param_type'           => array(0 => 'INT'),
-            'item_param_length'         => array(0 => ''),
-            'item_param_opts_num'       => array(0 => 'UNSIGNED'),
-            'item_param_opts_text'      => array(0 => ''),
+            'item_param_dir'            => [0 => 'IN'],
+            'item_param_name'           => [0 => 'foo'],
+            'item_param_type'           => [0 => 'INT'],
+            'item_param_length'         => [0 => ''],
+            'item_param_opts_num'       => [0 => 'UNSIGNED'],
+            'item_param_opts_text'      => [0 => ''],
             'item_returntype'           => '',
             'item_isdeterministic'      => '',
             'item_securitytype_definer' => '',
             'item_securitytype_invoker' => '',
             'item_sqldataaccess'        => ''
-        );
+        ];
 
-        return array(
-            array(
+        return [
+            [
                 $data,
                 0,
                 "<select name='item_param_dir[0]'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 0,
                 "<input name='item_param_name[0]'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 0,
                 "<select name='item_param_type[0]'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 0,
                 "<select name='item_param_opts_num[0]'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 0,
                 "<a href='#' class='routine_param_remove_anchor'"
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -370,7 +370,7 @@ class RoutinesTest extends TestCase
      */
     public function providerGetParameterRowAjax()
     {
-        $data = array(
+        $data = [
             'item_name'                 => '',
             'item_original_name'        => '',
             'item_returnlength'         => '',
@@ -383,41 +383,41 @@ class RoutinesTest extends TestCase
             'item_type_toggle'          => 'FUNCTION',
             'item_original_type'        => 'PROCEDURE',
             'item_num_params'           => 1,
-            'item_param_dir'            => array(0 => 'IN'),
-            'item_param_name'           => array(0 => 'foo'),
-            'item_param_type'           => array(0 => 'INT'),
-            'item_param_length'         => array(0 => ''),
-            'item_param_opts_num'       => array(0 => 'UNSIGNED'),
-            'item_param_opts_text'      => array(0 => ''),
+            'item_param_dir'            => [0 => 'IN'],
+            'item_param_name'           => [0 => 'foo'],
+            'item_param_type'           => [0 => 'INT'],
+            'item_param_length'         => [0 => ''],
+            'item_param_opts_num'       => [0 => 'UNSIGNED'],
+            'item_param_opts_text'      => [0 => ''],
             'item_returntype'           => '',
             'item_isdeterministic'      => '',
             'item_securitytype_definer' => '',
             'item_securitytype_invoker' => '',
             'item_sqldataaccess'        => ''
-        );
+        ];
 
-        return array(
-            array(
+        return [
+            [
                 $data,
                 "<select name='item_param_dir[%s]'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<input name='item_param_name[%s]'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<select name='item_param_dir[%s]'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<select name='item_param_opts_num[%s]'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<a href='#' class='routine_param_remove_anchor'"
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -447,7 +447,7 @@ class RoutinesTest extends TestCase
      */
     public function providerGetEditorForm1()
     {
-        $data = array(
+        $data = [
             'item_name'                 => '',
             'item_original_name'        => '',
             'item_returnlength'         => '',
@@ -460,85 +460,85 @@ class RoutinesTest extends TestCase
             'item_type_toggle'          => 'FUNCTION',
             'item_original_type'        => 'PROCEDURE',
             'item_num_params'           => 0,
-            'item_param_dir'            => array(),
-            'item_param_name'           => array(),
-            'item_param_type'           => array(),
-            'item_param_length'         => array(),
-            'item_param_opts_num'       => array(),
-            'item_param_opts_text'      => array(),
+            'item_param_dir'            => [],
+            'item_param_name'           => [],
+            'item_param_type'           => [],
+            'item_param_length'         => [],
+            'item_param_opts_num'       => [],
+            'item_param_opts_text'      => [],
             'item_returntype'           => '',
             'item_isdeterministic'      => '',
             'item_securitytype_definer' => '',
             'item_securitytype_invoker' => '',
             'item_sqldataaccess'        => ''
-        );
+        ];
 
-        return array(
-            array(
+        return [
+            [
                 $data,
                 "<input name='add_item'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<input type='text' name='item_name'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<input name='item_type'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='routine_changetype'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='routine_addparameter'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='routine_removeparameter'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "select name='item_returntype'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_returnlength'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "select name='item_returnopts_num'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<textarea name='item_definition'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_isdeterministic'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_definer'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "select name='item_securitytype'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "select name='item_sqldataaccess'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_comment'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='editor_process_add'"
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -568,7 +568,7 @@ class RoutinesTest extends TestCase
      */
     public function providerGetEditorForm2()
     {
-        $data = array(
+        $data = [
             'item_name'                 => 'foo',
             'item_original_name'        => 'bar',
             'item_returnlength'         => '',
@@ -581,85 +581,85 @@ class RoutinesTest extends TestCase
             'item_type_toggle'          => 'FUNCTION',
             'item_original_type'        => 'PROCEDURE',
             'item_num_params'           => 1,
-            'item_param_dir'            => array(0 => 'IN'),
-            'item_param_name'           => array(0 => 'baz'),
-            'item_param_type'           => array(0 => 'INT'),
-            'item_param_length'         => array(0 => '20'),
-            'item_param_opts_num'       => array(0 => 'UNSIGNED'),
-            'item_param_opts_text'      => array(0 => ''),
+            'item_param_dir'            => [0 => 'IN'],
+            'item_param_name'           => [0 => 'baz'],
+            'item_param_type'           => [0 => 'INT'],
+            'item_param_length'         => [0 => '20'],
+            'item_param_opts_num'       => [0 => 'UNSIGNED'],
+            'item_param_opts_text'      => [0 => ''],
             'item_returntype'           => '',
             'item_isdeterministic'      => '',
             'item_securitytype_definer' => '',
             'item_securitytype_invoker' => '',
             'item_sqldataaccess'        => 'NO SQL'
-        );
+        ];
 
-        return array(
-            array(
+        return [
+            [
                 $data,
                 "name='edit_item'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_name'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<input name='item_type' type='hidden' value='FUNCTION'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='routine_changetype'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='routine_addparameter'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='routine_removeparameter'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_returntype'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_returnlength'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_returnopts_num'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<textarea name='item_definition'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_isdeterministic'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_definer'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<select name='item_securitytype'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<select name='item_sqldataaccess'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_comment'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='editor_process_edit'"
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -691,7 +691,7 @@ class RoutinesTest extends TestCase
      */
     public function providerGetEditorForm3()
     {
-        $data = array(
+        $data = [
             'item_name'                 => 'foo',
             'item_original_name'        => 'bar',
             'item_returnlength'         => '',
@@ -704,85 +704,85 @@ class RoutinesTest extends TestCase
             'item_type_toggle'          => 'PROCEDURE',
             'item_original_type'        => 'FUNCTION',
             'item_num_params'           => 1,
-            'item_param_dir'            => array(0 => ''),
-            'item_param_name'           => array(0 => 'baz'),
-            'item_param_type'           => array(0 => 'INT'),
-            'item_param_length'         => array(0 => '20'),
-            'item_param_opts_num'       => array(0 => 'UNSIGNED'),
-            'item_param_opts_text'      => array(0 => ''),
+            'item_param_dir'            => [0 => ''],
+            'item_param_name'           => [0 => 'baz'],
+            'item_param_type'           => [0 => 'INT'],
+            'item_param_length'         => [0 => '20'],
+            'item_param_opts_num'       => [0 => 'UNSIGNED'],
+            'item_param_opts_text'      => [0 => ''],
             'item_returntype'           => 'INT',
             'item_isdeterministic'      => '',
             'item_securitytype_definer' => '',
             'item_securitytype_invoker' => '',
             'item_sqldataaccess'        => 'NO SQL'
-        );
+        ];
 
-        return array(
-            array(
+        return [
+            [
                 $data,
                 "name='edit_item'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_name'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<select name='item_type'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='routine_addparameter'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='routine_removeparameter'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<select name='item_returntype'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_returnlength'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<select name='item_returnopts_num'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<textarea name='item_definition'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_isdeterministic'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_definer'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<select name='item_securitytype'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<select name='item_sqldataaccess'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_comment'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='ajax_request'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='editor_process_edit'"
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -812,7 +812,7 @@ class RoutinesTest extends TestCase
      */
     public function providerGetEditorForm4()
     {
-        $data = array(
+        $data = [
             'item_name'                 => 'foo',
             'item_original_name'        => 'bar',
             'item_returnlength'         => '',
@@ -825,25 +825,25 @@ class RoutinesTest extends TestCase
             'item_type_toggle'          => 'PROCEDURE',
             'item_original_type'        => 'PROCEDURE',
             'item_num_params'           => 1,
-            'item_param_dir'            => array(0 => 'IN'),
-            'item_param_name'           => array(0 => 'baz'),
-            'item_param_type'           => array(0 => 'INT'),
-            'item_param_length'         => array(0 => '20'),
-            'item_param_opts_num'       => array(0 => 'UNSIGNED'),
-            'item_param_opts_text'      => array(0 => ''),
+            'item_param_dir'            => [0 => 'IN'],
+            'item_param_name'           => [0 => 'baz'],
+            'item_param_type'           => [0 => 'INT'],
+            'item_param_length'         => [0 => '20'],
+            'item_param_opts_num'       => [0 => 'UNSIGNED'],
+            'item_param_opts_text'      => [0 => ''],
             'item_returntype'           => '',
             'item_isdeterministic'      => '',
             'item_securitytype_definer' => '',
             'item_securitytype_invoker' => '',
             'item_sqldataaccess'        => 'NO SQL'
-        );
+        ];
 
-        return array(
-            array(
+        return [
+            [
                 $data,
                 "<input name='item_type' type='hidden' value='PROCEDURE'"
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -874,7 +874,7 @@ class RoutinesTest extends TestCase
      */
     public function providerGetExecuteForm1()
     {
-        $data = array(
+        $data = [
             'item_name'                 => 'foo',
             'item_returnlength'         => '',
             'item_returnopts_num'       => '',
@@ -884,103 +884,103 @@ class RoutinesTest extends TestCase
             'item_definer'              => '',
             'item_type'                 => 'PROCEDURE',
             'item_num_params'           => 6,
-            'item_param_dir'            => array(
+            'item_param_dir'            => [
                 0 => 'IN',
                 1 => 'OUT',
                 2 => 'IN',
                 3 => 'IN',
                 4 => 'IN',
                 5 => 'IN'
-            ),
-            'item_param_name'           => array(
+            ],
+            'item_param_name'           => [
                 0 => 'foo',
                 1 => 'foa',
                 2 => 'fob',
                 3 => 'foc',
                 4 => 'fod',
                 5 => 'foe'
-            ),
-            'item_param_type'           => array(
+            ],
+            'item_param_type'           => [
                 0 => 'DATE',
                 1 => 'VARCHAR',
                 2 => 'DATETIME',
                 3 => 'GEOMETRY',
                 4 => 'ENUM',
                 5 => 'SET'
-            ),
-            'item_param_length'         => array(
+            ],
+            'item_param_length'         => [
                 0 => '',
                 1 => '22',
                 2 => '',
                 3 => '',
                 4 => "'a','b'",
                 5 => "'a','b'"
-            ),
-            'item_param_length_arr'     => array(
-                0 => array(),
-                1 => array('22'),
-                2 => array(),
-                3 => array(),
-                4 => array("'a'", "'b'"),
-                5 => array("'a'", "'b'")
-            ),
-            'item_param_opts_num'       => array(
+            ],
+            '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'      => array(
+            ],
+            'item_param_opts_text'      => [
                 0 => '',
                 1 => 'utf8',
                 2 => '',
                 3 => '',
                 4 => '',
                 5 => ''
-            ),
+            ],
             'item_returntype'           => '',
             'item_isdeterministic'      => '',
             'item_securitytype_definer' => '',
             'item_securitytype_invoker' => '',
             'item_sqldataaccess'        => ''
-        );
+        ];
 
-        return array(
-            array(
+        return [
+            [
                 $data,
                 "name='item_name'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='funcs[foo]'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<input class='datefield' type='text' name='params[foo]' />"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='funcs[fob]'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "<input class='datetimefield' type='text' name='params[fob]'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='params[fod][]'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='params[foe][]'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='execute_routine'"
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -1011,7 +1011,7 @@ class RoutinesTest extends TestCase
      */
     public function providerGetExecuteForm2()
     {
-        $data = array(
+        $data = [
             'item_name'                 => 'foo',
             'item_returnlength'         => '',
             'item_returnopts_num'       => '',
@@ -1021,79 +1021,79 @@ class RoutinesTest extends TestCase
             'item_definer'              => '',
             'item_type'                 => 'PROCEDURE',
             'item_num_params'           => 6,
-            'item_param_dir'            => array(
+            'item_param_dir'            => [
                 0 => 'IN',
                 1 => 'OUT',
                 2 => 'IN',
                 3 => 'IN',
                 4 => 'IN',
                 5 => 'IN'
-            ),
-            'item_param_name'           => array(
+            ],
+            'item_param_name'           => [
                 0 => 'foo',
                 1 => 'foa',
                 2 => 'fob',
                 3 => 'foc',
                 4 => 'fod',
                 5 => 'foe'
-            ),
-            'item_param_type'           => array(
+            ],
+            'item_param_type'           => [
                 0 => 'DATE',
                 1 => 'VARCHAR',
                 2 => 'DATETIME',
                 3 => 'GEOMETRY',
                 4 => 'ENUM',
                 5 => 'SET'
-            ),
-            'item_param_length'         => array(
+            ],
+            'item_param_length'         => [
                 0 => '',
                 1 => '22',
                 2 => '',
                 3 => '',
                 4 => "'a','b'",
                 5 => "'a','b'"
-            ),
-            'item_param_length_arr'     => array(
-                0 => array(),
-                1 => array('22'),
-                2 => array(),
-                3 => array(),
-                4 => array("'a'", "'b'"),
-                5 => array("'a'", "'b'")
-            ),
-            'item_param_opts_num'       => array(
+            ],
+            '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'      => array(
+            ],
+            'item_param_opts_text'      => [
                 0 => '',
                 1 => 'utf8',
                 2 => '',
                 3 => '',
                 4 => '',
                 5 => ''
-            ),
+            ],
             'item_returntype'           => '',
             'item_isdeterministic'      => '',
             'item_securitytype_definer' => '',
             'item_securitytype_invoker' => '',
             'item_sqldataaccess'        => ''
-        );
+        ];
 
-        return array(
-            array(
+        return [
+            [
                 $data,
                 "name='execute_routine'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='ajax_request'"
-            ),
-        );
+            ],
+        ];
     }
 
     /**
@@ -1113,7 +1113,7 @@ class RoutinesTest extends TestCase
 
         $cfg['ShowFunctionFields'] = false;
 
-        $errors = array();
+        $errors = [];
         $this->routines->setGlobals();
 
         $old_dbi = isset($GLOBALS['dbi']) ? $GLOBALS['dbi'] : null;
@@ -1125,11 +1125,11 @@ class RoutinesTest extends TestCase
             ->method('escapeString')
             ->will(
                 $this->returnValueMap(
-                    array(
-                        array('foo', DatabaseInterface::CONNECT_USER, 'foo'),
-                        array("foo's bar", DatabaseInterface::CONNECT_USER, "foo\'s bar"),
-                        array('', DatabaseInterface::CONNECT_USER, '')
-                    )
+                    [
+                        ['foo', DatabaseInterface::CONNECT_USER, 'foo'],
+                        ["foo's bar", DatabaseInterface::CONNECT_USER, "foo\'s bar"],
+                        ['', DatabaseInterface::CONNECT_USER, '']
+                    ]
                 )
             );
         $GLOBALS['dbi'] = $dbi;
@@ -1150,10 +1150,10 @@ class RoutinesTest extends TestCase
      */
     public function providerGetQueryFromRequest()
     {
-        return array(
+        return [
             // Testing success
-            array(
-                array(
+            [
+                [
                     'item_name'                 => 'p r o c',
                     'item_returnlength'         => '',
                     'item_returnopts_num'       => '',
@@ -1173,13 +1173,13 @@ class RoutinesTest extends TestCase
                     'item_isdeterministic'      => '',
                     'item_securitytype'         => 'INVOKER',
                     'item_sqldataaccess'        => 'NO SQL'
-                ),
+                ],
                 'CREATE DEFINER=`me`@`home` PROCEDURE `p r o c`() COMMENT \'foo\' '
                 . 'DETERMINISTIC NO SQL SQL SECURITY INVOKER SELECT 0;',
                 0
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'item_name'                 => 'pr``oc',
                     'item_returnlength'         => '',
                     'item_returnopts_num'       => '',
@@ -1189,24 +1189,24 @@ class RoutinesTest extends TestCase
                     'item_definer'              => 'someuser@somehost',
                     'item_type'                 => 'PROCEDURE',
                     'item_num_params'           => '2',
-                    'item_param_dir'            => array('IN', 'INOUT'),
-                    'item_param_name'           => array('pa`ram', 'par 2'),
-                    'item_param_type'           => array('INT', 'ENUM'),
-                    'item_param_length'         => array('10', '\'a\', \'b\''),
-                    'item_param_opts_num'       => array('ZEROFILL', ''),
-                    'item_param_opts_text'      => array('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'
-                ),
+                ],
                 'CREATE DEFINER=`someuser`@`somehost` PROCEDURE `pr````oc`'
                 . '(IN `pa``ram` INT(10) ZEROFILL, INOUT `par 2` ENUM(\'a\', \'b\')'
                 . ' CHARSET latin1) NOT DETERMINISTIC SQL SECURITY DEFINER SELECT '
                 . '\'foobar\';',
                 0
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'item_name'                 => 'func\\',
                     'item_returnlength'         => '5,5',
                     'item_returnopts_num'       => 'UNSIGNED ZEROFILL',
@@ -1217,23 +1217,23 @@ class RoutinesTest extends TestCase
                     'item_type'                 => 'FUNCTION',
                     'item_num_params'           => '1',
                     'item_param_dir'            => '',
-                    'item_param_name'           => array('pa`ram'),
-                    'item_param_type'           => array('VARCHAR'),
-                    'item_param_length'         => array('45'),
-                    'item_param_opts_num'       => array(''),
-                    'item_param_opts_text'      => array('latin1'),
+                    'item_param_name'           => ['pa`ram'],
+                    'item_param_type'           => ['VARCHAR'],
+                    'item_param_length'         => ['45'],
+                    'item_param_opts_num'       => [''],
+                    'item_param_opts_text'      => ['latin1'],
                     'item_returntype'           => 'DECIMAL',
                     'item_isdeterministic'      => 'ON',
                     'item_securitytype'         => 'DEFINER',
                     'item_sqldataaccess'        => 'READ SQL DATA'
-                ),
+                ],
                 'CREATE FUNCTION `func\\`(`pa``ram` VARCHAR(45) CHARSET latin1) '
                 . 'RETURNS DECIMAL(5,5) UNSIGNED ZEROFILL COMMENT \'foo\\\'s bar\' '
                 . 'DETERMINISTIC SQL SECURITY DEFINER SELECT \'foobar\';',
                 0
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'item_name'                 => 'func',
                     'item_returnlength'         => '20',
                     'item_returnopts_num'       => '',
@@ -1246,20 +1246,20 @@ class RoutinesTest extends TestCase
                     'item_returntype'           => 'VARCHAR',
                     'item_securitytype'         => 'DEFINER',
                     'item_sqldataaccess'        => 'READ SQL DATA'
-                ),
+                ],
                 'CREATE FUNCTION `func`() RETURNS VARCHAR(20) CHARSET utf8 NOT '
                 . 'DETERMINISTIC SQL SECURITY DEFINER SELECT 0;',
                 0
-            ),
+            ],
             // Testing failures
-            array(
-                array(
-                ),
+            [
+                [
+                ],
                 'CREATE () NOT DETERMINISTIC ', // invalid query
                 3
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'item_name'                 => 'proc',
                     'item_returnlength'         => '',
                     'item_returnopts_num'       => '',
@@ -1279,13 +1279,13 @@ class RoutinesTest extends TestCase
                     'item_isdeterministic'      => '',
                     'item_securitytype'         => 'INVOKER',
                     'item_sqldataaccess'        => 'NO SQL'
-                ),
+                ],
                 'CREATE PROCEDURE `proc`() COMMENT \'foo\' DETERMINISTIC '
                 . 'NO SQL SQL SECURITY INVOKER SELECT 0;', // valid query
                 1
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'item_name'                 => 'proc',
                     'item_returnlength'         => '',
                     'item_returnopts_num'       => '',
@@ -1295,23 +1295,23 @@ class RoutinesTest extends TestCase
                     'item_definer'              => '',
                     'item_type'                 => 'PROCEDURE',
                     'item_num_params'           => '2',
-                    'item_param_dir'            => array('FAIL', 'INOUT'), // invalid direction
-                    'item_param_name'           => array('pa`ram', 'goo'),
-                    'item_param_type'           => array('INT', 'ENUM'),
-                    'item_param_length'         => array('10', ''), // missing ENUM values
-                    'item_param_opts_num'       => array('ZEROFILL', ''),
-                    'item_param_opts_text'      => array('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
-                ),
+                ],
                 'CREATE PROCEDURE `proc`((10) ZEROFILL, '
                 . 'INOUT `goo` ENUM CHARSET latin1) NOT DETERMINISTIC '
                 . 'SQL SECURITY DEFINER SELECT 0;', // invalid query
                 2
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'item_name'                 => 'func',
                     'item_returnlength'         => '', // missing length for VARCHAR
                     'item_returnopts_num'       => '',
@@ -1321,22 +1321,22 @@ class RoutinesTest extends TestCase
                     'item_definer'              => '',
                     'item_type'                 => 'FUNCTION',
                     'item_num_params'           => '2',
-                    'item_param_dir'            => array('IN'),
-                    'item_param_name'           => array(''), // missing name
-                    'item_param_type'           => array('INT'),
-                    'item_param_length'         => array('10'),
-                    'item_param_opts_num'       => array('ZEROFILL'),
-                    'item_param_opts_text'      => array('latin1'),
+                    'item_param_dir'            => ['IN'],
+                    'item_param_name'           => [''], // missing name
+                    'item_param_type'           => ['INT'],
+                    'item_param_length'         => ['10'],
+                    'item_param_opts_num'       => ['ZEROFILL'],
+                    'item_param_opts_text'      => ['latin1'],
                     'item_returntype'           => 'VARCHAR',
                     'item_securitytype'         => 'DEFINER',
                     'item_sqldataaccess'        => ''
-                ),
+                ],
                 'CREATE FUNCTION `func`() RETURNS VARCHAR CHARSET utf8 NOT '
                 . 'DETERMINISTIC SQL SECURITY DEFINER SELECT 0;', // invalid query
                 2
-            ),
-            array(
-                array(
+            ],
+            [
+                [
                     'item_name'                 => 'func',
                     'item_returnlength'         => '',
                     'item_returnopts_num'       => '',
@@ -1349,11 +1349,11 @@ class RoutinesTest extends TestCase
                     'item_returntype'           => 'FAIL', // invalid return type
                     'item_securitytype'         => 'DEFINER',
                     'item_sqldataaccess'        => ''
-                ),
+                ],
                 'CREATE FUNCTION `func`()  NOT DETERMINISTIC SQL '
                 . 'SECURITY DEFINER SELECT 0;', // invalid query
                 1
-            ),
-        );
+            ],
+        ];
     }
 }
diff --git a/test/classes/Rte/TriggersTest.php b/test/classes/Rte/TriggersTest.php
index a2119dd584..12048edf98 100644
--- a/test/classes/Rte/TriggersTest.php
+++ b/test/classes/Rte/TriggersTest.php
@@ -81,9 +81,9 @@ class TriggersTest extends TestCase
      */
     public function providerGetDataFromRequestEmpty()
     {
-        return array(
-            array(
-                array(
+        return [
+            [
+                [
                     'item_name'               => '',
                     'item_table'              => '',
                     'item_original_name'      => '',
@@ -91,8 +91,8 @@ class TriggersTest extends TestCase
                     'item_event_manipulation' => '',
                     'item_definition'         => '',
                     'item_definer'            => ''
-                ),
-                array(
+                ],
+                [
                     'item_name'               => '',
                     'item_table'              => '',
                     'item_original_name'      => '',
@@ -100,10 +100,10 @@ class TriggersTest extends TestCase
                     'item_event_manipulation' => '',
                     'item_definition'         => '',
                     'item_definer'            => ''
-                )
-            ),
-            array(
-                array(
+                ]
+            ],
+            [
+                [
                     'item_name'               => 'foo',
                     'item_table'              => 'foo',
                     'item_original_name'      => 'foo',
@@ -111,8 +111,8 @@ class TriggersTest extends TestCase
                     'item_event_manipulation' => 'foo',
                     'item_definition'         => 'foo',
                     'item_definer'            => 'foo'
-                ),
-                array(
+                ],
+                [
                     'item_name'               => 'foo',
                     'item_table'              => 'foo',
                     'item_original_name'      => 'foo',
@@ -120,9 +120,9 @@ class TriggersTest extends TestCase
                     'item_event_manipulation' => 'foo',
                     'item_definition'         => 'foo',
                     'item_definer'            => 'foo'
-                )
-            )
-        );
+                ]
+            ]
+        ];
     }
 
     /**
@@ -153,7 +153,7 @@ class TriggersTest extends TestCase
      */
     public function providerGetEditorFormAdd()
     {
-        $data = array(
+        $data = [
             'item_name'               => '',
             'item_table'              => 'table1',
             'item_original_name'      => '',
@@ -161,42 +161,42 @@ class TriggersTest extends TestCase
             'item_event_manipulation' => '',
             'item_definition'         => '',
             'item_definer'            => ''
-        );
+        ];
 
-        return array(
-            array(
+        return [
+            [
                 $data,
                 "name='add_item'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_name'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_table'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_timing'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_event'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_definition'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_definer'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='editor_process_add'"
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -227,7 +227,7 @@ class TriggersTest extends TestCase
      */
     public function providerGetEditorFormEdit()
     {
-        $data = array(
+        $data = [
             'item_name'               => 'foo',
             'item_table'              => 'table1',
             'item_original_name'      => 'bar',
@@ -235,42 +235,42 @@ class TriggersTest extends TestCase
             'item_event_manipulation' => 'INSERT',
             'item_definition'         => 'SET @A=1;',
             'item_definer'            => ''
-        );
+        ];
 
-        return array(
-            array(
+        return [
+            [
                 $data,
                 "name='edit_item'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_name'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_table'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_timing'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_event'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_definition'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='item_definer'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='editor_process_edit'"
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -302,7 +302,7 @@ class TriggersTest extends TestCase
      */
     public function providerGetEditorFormAjax()
     {
-        $data = array(
+        $data = [
             'item_name'               => 'foo',
             'item_table'              => 'table1',
             'item_original_name'      => 'bar',
@@ -310,18 +310,18 @@ class TriggersTest extends TestCase
             'item_event_manipulation' => 'INSERT',
             'item_definition'         => 'SET @A=1;',
             'item_definer'            => ''
-        );
+        ];
 
-        return array(
-            array(
+        return [
+            [
                 $data,
                 "name='editor_process_edit'"
-            ),
-            array(
+            ],
+            [
                 $data,
                 "name='ajax_request'"
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -345,7 +345,7 @@ class TriggersTest extends TestCase
     ) {
         global $_REQUEST, $errors;
 
-        $errors = array();
+        $errors = [];
         $this->triggers->setGlobals();
 
         $_REQUEST['item_definer']    = $definer;
@@ -367,8 +367,8 @@ class TriggersTest extends TestCase
      */
     public function providerGetQueryFromRequest()
     {
-        return array(
-            array('',
+        return [
+            ['',
                 '',
                 '',
                 '',
@@ -376,8 +376,8 @@ class TriggersTest extends TestCase
                 '',
                 'CREATE TRIGGER ON  FOR EACH ROW ',
                 5
-            ),
-            array(
+            ],
+            [
                 'root',
                 'trigger',
                 'BEFORE',
@@ -386,8 +386,8 @@ class TriggersTest extends TestCase
                 'SET @A=NULL',
                 'CREATE TRIGGER `trigger` BEFORE INSERT ON  FOR EACH ROW SET @A=NULL',
                 2
-            ),
-            array(
+            ],
+            [
                 'foo`s@host',
                 'trigger`s test',
                 'AFTER',
@@ -396,8 +396,8 @@ class TriggersTest extends TestCase
                 'BEGIN SET @A=1; SET @B=2; END',
                 'CREATE DEFINER=`foo``s`@`host` TRIGGER `trigger``s test` AFTER ON  FOR EACH ROW BEGIN SET @A=1; SET @B=2; END',
                 2
-            ),
-            array(
+            ],
+            [
                 'root@localhost',
                 'trigger',
                 'BEFORE',
@@ -406,7 +406,7 @@ class TriggersTest extends TestCase
                 'SET @A=NULL',
                 'CREATE DEFINER=`root`@`localhost` TRIGGER `trigger` BEFORE INSERT ON `table1` FOR EACH ROW SET @A=NULL',
                 0
-            ),
-        );
+            ],
+        ];
     }
 }
diff --git a/test/classes/SanitizeTest.php b/test/classes/SanitizeTest.php
index b263df53b1..8373bffa31 100644
--- a/test/classes/SanitizeTest.php
+++ b/test/classes/SanitizeTest.php
@@ -76,12 +76,12 @@ class SanitizeTest extends TestCase
      */
     public function docLinks()
     {
-        return array(
-            array('foo', 'setup.html%23foo'),
-            array('cfg_TitleTable', 'config.html%23cfg_TitleTable'),
-            array('faq3-11', 'faq.html%23faq3-11'),
-            array('bookmarks@', 'bookmarks.html'),
-        );
+        return [
+            ['foo', 'setup.html%23foo'],
+            ['cfg_TitleTable', 'config.html%23cfg_TitleTable'],
+            ['faq3-11', 'faq.html%23faq3-11'],
+            ['bookmarks@', 'bookmarks.html'],
+        ];
     }
 
     /**
@@ -190,7 +190,7 @@ class SanitizeTest extends TestCase
     {
         $this->assertEquals($expected, Sanitize::getJsValue($key, $value));
         $this->assertEquals('foo = 100', Sanitize::getJsValue('foo', '100', false));
-        $array = array('1','2','3');
+        $array = ['1','2','3'];
         $this->assertEquals(
             "foo = [\"1\",\"2\",\"3\",];\n",
             Sanitize::getJsValue('foo', $array)
@@ -218,15 +218,15 @@ class SanitizeTest extends TestCase
      */
     public function variables()
     {
-        return array(
-            array('foo', true, "foo = true;\n"),
-            array('foo', false, "foo = false;\n"),
-            array('foo', 100, "foo = 100;\n"),
-            array('foo', 0, "foo = 0;\n"),
-            array('foo', 'text', "foo = \"text\";\n"),
-            array('foo', 'quote"', "foo = \"quote\\\"\";\n"),
-            array('foo', 'apostroph\'', "foo = \"apostroph\\'\";\n"),
-        );
+        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"],
+        ];
     }
 
     /**
@@ -251,17 +251,17 @@ class SanitizeTest extends TestCase
      */
     public function escapeDataProvider()
     {
-        return array(
-            array('\\\';', '\';'),
-            array('\r\n\\\'<scrIpt></\' + \'script>', "\r\n'<scrIpt></sCRIPT>"),
-            array('\\\';[XSS]', '\';[XSS]'),
-            array(
+        return [
+            ['\\\';', '\';'],
+            ['\r\n\\\'<scrIpt></\' + \'script>', "\r\n'<scrIpt></sCRIPT>"],
+            ['\\\';[XSS]', '\';[XSS]'],
+            [
                     '</\' + \'script></head><body>[HTML]',
                     '</SCRIPT></head><body>[HTML]'
-            ),
-            array('\"\\\'\\\\\\\'\"', '"\'\\\'"'),
-            array("\\\\\'\'\'\'\'\'\'\'\'\'\'\'\\\\", "\\''''''''''''\\")
-        );
+            ],
+            ['\"\\\'\\\\\\\'\"', '"\'\\\'"'],
+            ["\\\\\'\'\'\'\'\'\'\'\'\'\'\'\\\\", "\\''''''''''''\\"]
+        ];
     }
 
     /**
@@ -274,7 +274,7 @@ class SanitizeTest extends TestCase
         $_REQUEST['foo'] = 'bar';
         $_REQUEST['allow'] = 'all';
         $_REQUEST['second'] = 1;
-        $allow_list = array('allow', 'second');
+        $allow_list = ['allow', 'second'];
         Sanitize::removeRequestVars($allow_list);
         $this->assertArrayNotHasKey('foo', $_REQUEST);
         $this->assertArrayNotHasKey('second', $_REQUEST);
diff --git a/test/classes/ScriptsTest.php b/test/classes/ScriptsTest.php
index a7cca57b80..751245d277 100644
--- a/test/classes/ScriptsTest.php
+++ b/test/classes/ScriptsTest.php
@@ -82,14 +82,14 @@ class ScriptsTest extends PmaTestCase
             . 'src="js/common.js?v=' . PMA_VERSION . '"></script>' . "\n",
             $this->_callPrivateFunction(
                 '_includeFiles',
-                array(
-                    array(
-                        array(
+                [
+                    [
+                        [
                             'has_onload' => false,
                             'filename' => 'common.js'
-                        )
-                    )
-                )
+                        ]
+                    ]
+                ]
             )
         );
     }
@@ -150,10 +150,10 @@ $(function() {});
 
         $this->object->addFile('common.js');
         $this->assertEquals(
-            array(
-                array('name' => 'vendor/codemirror/lib/codemirror.js', 'fire' => 0),
-                array('name' => 'common.js', 'fire' => 1)
-            ),
+            [
+                ['name' => 'vendor/codemirror/lib/codemirror.js', 'fire' => 0],
+                ['name' => 'common.js', 'fire' => 1]
+            ],
             $this->object->getFiles()
         );
     }
@@ -168,7 +168,7 @@ $(function() {});
         // Assert empty _files property of
         // Scripts
         $this->assertAttributeEquals(
-            array(),
+            [],
             '_files',
             $this->object
         );
@@ -176,13 +176,13 @@ $(function() {});
         // Add one script file
         $file = 'common.js';
         $hash = 'd7716810d825f4b55d18727c3ccb24e6';
-        $_files = array(
-            $hash => array(
+        $_files = [
+            $hash => [
                 'has_onload' => 1,
                 'filename' => 'common.js',
-                'params' => array(),
-            )
-        );
+                'params' => [],
+            ]
+        ];
         $this->object->addFile($file);
         $this->assertAttributeEquals(
             $_files,
@@ -199,23 +199,23 @@ $(function() {});
      */
     public function testAddFiles()
     {
-        $filenames = array(
+        $filenames = [
             'common.js',
             'sql.js',
             'common.js',
-        );
-        $_files = array(
-            'd7716810d825f4b55d18727c3ccb24e6' => array(
+        ];
+        $_files = [
+            'd7716810d825f4b55d18727c3ccb24e6' => [
                 'has_onload' => 1,
                 'filename' => 'common.js',
-                'params' => array(),
-            ),
-            '347a57484fcd6ea6d8a125e6e1d31f78' => array(
+                'params' => [],
+            ],
+            '347a57484fcd6ea6d8a125e6e1d31f78' => [
                 'has_onload' => 1,
                 'filename' => 'sql.js',
-                'params' => array(),
-            ),
-        );
+                'params' => [],
+            ],
+        ];
         $this->object->addFiles($filenames);
         $this->assertAttributeEquals(
             $_files,
diff --git a/test/classes/Server/PrivilegesTest.php b/test/classes/Server/PrivilegesTest.php
index 0bd603fbb2..52808b38f7 100644
--- a/test/classes/Server/PrivilegesTest.php
+++ b/test/classes/Server/PrivilegesTest.php
@@ -53,7 +53,7 @@ class PrivilegesTest extends TestCase
         $GLOBALS['cfg']['SendErrorReports'] = "never";
         $GLOBALS['cfg']['ServerDefault'] = "server";
         $GLOBALS['cfg']['RememberSorting'] = true;
-        $GLOBALS['cfg']['SQP'] = array();
+        $GLOBALS['cfg']['SQP'] = [];
         $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
         $GLOBALS['cfg']['ShowSQL'] = true;
         $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
@@ -69,7 +69,7 @@ class PrivilegesTest extends TestCase
         $GLOBALS['cfg']['ShowDatabasesNavigationAsTree'] = true;
         $GLOBALS['cfg']['LoginCookieValidity'] = 1440;
 
-        $GLOBALS['cfgRelation'] = array();
+        $GLOBALS['cfgRelation'] = [];
         $GLOBALS['cfgRelation']['menuswork'] = false;
         $GLOBALS['table'] = "table";
         $GLOBALS['PMA_PHP_SELF'] = Core::getenv('PHP_SELF');
@@ -86,13 +86,13 @@ class PrivilegesTest extends TestCase
         //$_POST
         $_POST['pred_password'] = 'none';
         //$_SESSION
-        $_SESSION['relation'][$GLOBALS['server']] = array(
+        $_SESSION['relation'][$GLOBALS['server']] = [
             'PMA_VERSION' => PMA_VERSION,
             'db' => 'pmadb',
             'users' => 'users',
             'usergroups' => 'usergroups',
             'menuswork' => true
-        );
+        ];
 
         $pmaconfig = $this->getMockBuilder('PhpMyAdmin\Config')
             ->disableOriginalConstructor()
@@ -109,23 +109,23 @@ class PrivilegesTest extends TestCase
             ->method('fetchResult')
             ->will(
                 $this->returnValue(
-                    array(
+                    [
                         'grant user1 select',
                         'grant user2 delete'
-                    )
+                    ]
                 )
             );
 
-        $fetchSingleRow = array(
+        $fetchSingleRow = [
             'password' => 'pma_password',
             'Table_priv' => 'pri1, pri2',
             'Type' => 'Type',
             '@@old_passwords' => 0,
-        );
+        ];
         $dbi->expects($this->any())->method('fetchSingleRow')
             ->will($this->returnValue($fetchSingleRow));
 
-        $fetchValue = array('key1' => 'value1');
+        $fetchValue = ['key1' => 'value1'];
         $dbi->expects($this->any())->method('fetchValue')
             ->will($this->returnValue($fetchValue));
 
@@ -183,7 +183,7 @@ class PrivilegesTest extends TestCase
 
         //pre variable have been defined
         $_REQUEST['pred_tablename'] = "PMA_pred__tablename";
-        $_REQUEST['pred_dbname'] = array("PMA_pred_dbname");
+        $_REQUEST['pred_dbname'] = ["PMA_pred_dbname"];
         list(
             ,, $dbname, $tablename, $routinename,
             $db_and_table, $dbname_is_wildcard
@@ -277,19 +277,19 @@ class PrivilegesTest extends TestCase
 
         $ret = $this->serverPrivileges->getTableGrantsArray();
         $this->assertEquals(
-            array(
+            [
                 'Delete',
                 'DELETE',
                 $GLOBALS['strPrivDescDelete']
-            ),
+            ],
             $ret[0]
         );
         $this->assertEquals(
-            array(
+            [
                 'Create',
                 'CREATE',
                 $GLOBALS['strPrivDescCreateTbl']
-            ),
+            ],
             $ret[1]
         );
     }
@@ -303,19 +303,19 @@ class PrivilegesTest extends TestCase
     {
         $ret = $this->serverPrivileges->getGrantsArray();
         $this->assertEquals(
-            array(
+            [
                 'Select_priv',
                 'SELECT',
                 __('Allows reading data.')
-            ),
+            ],
             $ret[0]
         );
         $this->assertEquals(
-            array(
+            [
                 'Insert_priv',
                 'INSERT',
                 __('Allows inserting and replacing data.')
-            ),
+            ],
             $ret[1]
         );
     }
@@ -327,12 +327,12 @@ class PrivilegesTest extends TestCase
      */
     public function testGetHtmlForColumnPrivileges()
     {
-        $columns = array(
+        $columns = [
             'row1' => 'name1'
-        );
-        $row = array(
+        ];
+        $row = [
             'name_for_select' => 'Y'
-        );
+        ];
         $name_for_select = 'name_for_select';
         $priv_for_header = 'priv_for_header';
         $name = 'name';
@@ -383,10 +383,10 @@ class PrivilegesTest extends TestCase
     public function testGetHtmlForRequires()
     {
         /* Assertion 1 */
-        $row = array(
+        $row = [
             'ssl_type'   => '',
             'ssh_cipher' => ''
-        );
+        ];
 
         $html = $this->serverPrivileges->getHtmlForRequires(
             $row
@@ -414,10 +414,10 @@ class PrivilegesTest extends TestCase
         );
 
         /* Assertion 2 */
-        $row = array(
+        $row = [
             'ssl_type'   => 'ANY',
             'ssh_cipher' => ''
-        );
+        ];
 
         $html = $this->serverPrivileges->getHtmlForRequires(
             $row
@@ -445,10 +445,10 @@ class PrivilegesTest extends TestCase
         );
 
         /* Assertion 3 */
-        $row = array(
+        $row = [
             'ssl_type'   => 'X509',
             'ssh_cipher' => ''
-        );
+        ];
 
         $html = $this->serverPrivileges->getHtmlForRequires(
             $row
@@ -476,10 +476,10 @@ class PrivilegesTest extends TestCase
         );
 
         /* Assertion 4 */
-        $row = array(
+        $row = [
             'ssl_type'   => 'SPECIFIED',
             'ssh_cipher' => ''
-        );
+        ];
 
         $html = $this->serverPrivileges->getHtmlForRequires(
             $row
@@ -525,7 +525,7 @@ class PrivilegesTest extends TestCase
             $html
         );
         //Url::getHiddenInputs
-        $params = array('username' => $username);
+        $params = ['username' => $username];
         $html_output = Url::getHiddenInputs($params);
         $this->assertContains(
             $html_output,
@@ -552,7 +552,7 @@ class PrivilegesTest extends TestCase
             ->will($this->returnValue(true));
         $dbi->expects($this->any())
             ->method('fetchRow')
-            ->willReturnOnConsecutiveCalls(array('userG'), null);
+            ->willReturnOnConsecutiveCalls(['userG'], null);
         $dbi->expects($this->any())->method('escapeString')
             ->will($this->returnArgument(0));
 
@@ -564,7 +564,7 @@ class PrivilegesTest extends TestCase
             $actualHtml
         );
         //Url::getHiddenInputs
-        $params = array('username' => $username);
+        $params = ['username' => $username];
         $html_output = Url::getHiddenInputs($params);
         $this->assertContains(
             $html_output,
@@ -607,7 +607,7 @@ class PrivilegesTest extends TestCase
             $html
         );
         //Url::getHiddenInputs
-        $params = array('username' => $username);
+        $params = ['username' => $username];
         $html_output = Url::getHiddenInputs($params);
         $this->assertContains(
             $html_output,
@@ -627,12 +627,12 @@ class PrivilegesTest extends TestCase
      */
     public function testGetHtmlForResourceLimits()
     {
-        $row = array(
+        $row = [
             'max_questions' => 'max_questions',
             'max_updates' => 'max_updates',
             'max_connections' => 'max_connections',
             'max_user_connections' => 'max_user_connections',
-        );
+        ];
 
         $html = $this->serverPrivileges->getHtmlForResourceLimits($row);
         $this->assertContains(
@@ -773,7 +773,7 @@ class PrivilegesTest extends TestCase
             $password
         );
         $this->assertEquals(
-            array(),
+            [],
             $queries
         );
         unset($_REQUEST['change_copy']);
@@ -1021,7 +1021,7 @@ class PrivilegesTest extends TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $fetchSingleRow = array(
+        $fetchSingleRow = [
             'password' => 'pma_password',
             'max_questions' => 'max_questions',
             'max_updates' => 'max_updates',
@@ -1038,14 +1038,14 @@ class PrivilegesTest extends TestCase
                 . "'Show_view','Create_routine','"
                 . "Repl_client','Lock_tables','References','Alter_routine','"
                 . "Create_user','Repl_slave','Repl_client','Execute','Grant','ddd",
-        );
+        ];
         $dbi->expects($this->any())->method('fetchSingleRow')
             ->will($this->returnValue($fetchSingleRow));
 
         $dbi->expects($this->any())->method('tryQuery')
             ->will($this->returnValue(true));
 
-        $columns = array('val1', 'replace1', 5);
+        $columns = ['val1', 'replace1', 5];
         $dbi->expects($this->at(0))
             ->method('fetchRow')
             ->will($this->returnValue($columns));
@@ -1221,17 +1221,17 @@ class PrivilegesTest extends TestCase
         $hostname = "PMA_hostname";
         $db = "PMA_db";
         $table = "PMA_table";
-        $columns = array(
+        $columns = [
             'row1' => 'name1'
-        );
-        $row = array(
+        ];
+        $row = [
             'Select_priv' => 'Y',
             'Insert_priv' => 'Y',
             'Update_priv' => 'Y',
             'References_priv' => 'Y',
             'Create_view_priv' => 'Y',
             'ShowView_priv' => 'Y',
-        );
+        ];
 
         $html = $this->serverPrivileges->getHtmlForTableSpecificPrivileges(
             $username, $hostname, $db, $table, $columns, $row
@@ -1293,10 +1293,10 @@ class PrivilegesTest extends TestCase
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
             ->disableOriginalConstructor()
             ->getMock();
-        $fields_info = array(
-            array('COLUMN_NAME' => 'Host', 'CHARACTER_MAXIMUM_LENGTH' => 80),
-            array('COLUMN_NAME' => 'User', 'CHARACTER_MAXIMUM_LENGTH' => 40),
-        );
+        $fields_info = [
+            ['COLUMN_NAME' => 'Host', 'CHARACTER_MAXIMUM_LENGTH' => 80],
+            ['COLUMN_NAME' => 'User', 'CHARACTER_MAXIMUM_LENGTH' => 40],
+        ];
         $dbi->expects($this->any())->method('fetchResult')
             ->will($this->returnValue($fields_info));
         $dbi->expects($this->any())
@@ -1401,10 +1401,10 @@ class PrivilegesTest extends TestCase
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
             ->disableOriginalConstructor()
             ->getMock();
-        $fields_info = array(
-            array('COLUMN_NAME' => 'Host', 'CHARACTER_MAXIMUM_LENGTH' => 80),
-            array('COLUMN_NAME' => 'User', 'CHARACTER_MAXIMUM_LENGTH' => 40),
-        );
+        $fields_info = [
+            ['COLUMN_NAME' => 'Host', 'CHARACTER_MAXIMUM_LENGTH' => 80],
+            ['COLUMN_NAME' => 'User', 'CHARACTER_MAXIMUM_LENGTH' => 40],
+        ];
         $dbi->expects($this->any())->method('fetchResult')
             ->will($this->returnValue($fields_info));
         $dbi->expects($this->any())
@@ -1437,13 +1437,13 @@ class PrivilegesTest extends TestCase
 
         $item = Template::get('checkbox')
             ->render(
-                array(
+                [
                     'html_field_name'   => 'createdb-2',
                     'label'             => __('Grant all privileges on wildcard name (username\\_%).'),
                     'checked'           => false,
                     'onclick'           => false,
                     'html_field_id'     => 'createdb-2',
-                )
+                ]
             );
         $this->assertContains(
             $item,
@@ -1476,10 +1476,10 @@ class PrivilegesTest extends TestCase
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
             ->disableOriginalConstructor()
             ->getMock();
-        $fields_info = array(
-            array('COLUMN_NAME' => 'Host', 'CHARACTER_MAXIMUM_LENGTH' => 80),
-            array('COLUMN_NAME' => 'User', 'CHARACTER_MAXIMUM_LENGTH' => 40),
-        );
+        $fields_info = [
+            ['COLUMN_NAME' => 'Host', 'CHARACTER_MAXIMUM_LENGTH' => 80],
+            ['COLUMN_NAME' => 'User', 'CHARACTER_MAXIMUM_LENGTH' => 40],
+        ];
         $dbi->expects($this->any())->method('isSuperuser')
             ->will($this->returnValue(true));
         $dbi->expects($this->any())->method('fetchResult')
@@ -1496,7 +1496,7 @@ class PrivilegesTest extends TestCase
 
         //validate 1: Url::getCommon
         $this->assertContains(
-            Url::getCommon(array('db' => $db)),
+            Url::getCommon(['db' => $db]),
             $html
         );
 
@@ -1538,7 +1538,7 @@ class PrivilegesTest extends TestCase
             $html
         );
         $this->assertContains(
-            Url::getCommon(array('checkprivsdb' => $db)),
+            Url::getCommon(['checkprivsdb' => $db]),
             $html
         );
 
@@ -1556,10 +1556,10 @@ class PrivilegesTest extends TestCase
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
             ->disableOriginalConstructor()
             ->getMock();
-        $fields_info = array(
-            array('COLUMN_NAME' => 'Host', 'CHARACTER_MAXIMUM_LENGTH' => 80),
-            array('COLUMN_NAME' => 'User', 'CHARACTER_MAXIMUM_LENGTH' => 40),
-        );
+        $fields_info = [
+            ['COLUMN_NAME' => 'Host', 'CHARACTER_MAXIMUM_LENGTH' => 80],
+            ['COLUMN_NAME' => 'User', 'CHARACTER_MAXIMUM_LENGTH' => 40],
+        ];
         $dbi->expects($this->any())->method('fetchResult')
             ->will($this->returnValue($fields_info));
         $dbi->expects($this->any())
@@ -1583,10 +1583,10 @@ class PrivilegesTest extends TestCase
 
         //validate 2: Url::getCommon
         $item = Url::getCommon(
-            array(
+            [
                 'db' => $db,
                 'table' => $table,
-            )
+            ]
         );
         $this->assertContains(
             $item,
@@ -1626,7 +1626,7 @@ class PrivilegesTest extends TestCase
         );
         $this->assertContains(
             Url::getCommon(
-                array('checkprivsdb' => $db, 'checkprivstable' => $table)
+                ['checkprivsdb' => $db, 'checkprivstable' => $table]
             ),
             $html
         );
@@ -1652,15 +1652,15 @@ class PrivilegesTest extends TestCase
         );
 
         //$privMap != null
-        $privMap = array(
-            "user1" => array(
-                "hostname1" => array(
-                    array('Type'=>'g', 'Grant_priv'=>'Y'),
-                    array('Type'=>'d', 'Db'=>"dbname", 'Grant_priv'=>'Y'),
-                    array('Type'=>'t', 'Grant_priv'=>'N'),
-                )
-            )
-        );
+        $privMap = [
+            "user1" => [
+                "hostname1" => [
+                    ['Type'=>'g', 'Grant_priv'=>'Y'],
+                    ['Type'=>'d', 'Db'=>"dbname", 'Grant_priv'=>'Y'],
+                    ['Type'=>'t', 'Grant_priv'=>'N'],
+                ]
+            ]
+        ];
 
         $html = $this->serverPrivileges->getHtmlTableBodyForSpecificDbOrTablePrivs($privMap, $db);
 
@@ -1722,13 +1722,13 @@ class PrivilegesTest extends TestCase
         );
 
         $url_html = Url::getCommon(
-            array(
+            [
                 'username' => $username,
                 'hostname' => $hostname,
                 'dbname' => $dbname,
                 'tablename' => $tablename,
                 'routinename' => '',
-            )
+            ]
         );
         $this->assertContains(
             $url_html,
@@ -1744,14 +1744,14 @@ class PrivilegesTest extends TestCase
         );
 
         $url_html = Url::getCommon(
-            array(
+            [
                 'username' => $username,
                 'hostname' => $hostname,
                 'dbname' => $dbname,
                 'tablename' => $tablename,
                 'routinename' => '',
                 'revokeall' => 1,
-            )
+            ]
         );
         $this->assertContains(
             $url_html,
@@ -1765,12 +1765,12 @@ class PrivilegesTest extends TestCase
         $html = $this->serverPrivileges->getUserLink('export', $username, $hostname);
 
         $url_html = Url::getCommon(
-            array(
+            [
                 'username' => $username,
                 'hostname' => $hostname,
                 'initial' => "",
                 'export' => 1,
-            )
+            ]
         );
         $this->assertContains(
             $url_html,
@@ -1866,10 +1866,10 @@ class PrivilegesTest extends TestCase
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
             ->disableOriginalConstructor()
             ->getMock();
-        $fields_info = array(
-            array('COLUMN_NAME' => 'Host', 'CHARACTER_MAXIMUM_LENGTH' => 80),
-            array('COLUMN_NAME' => 'User', 'CHARACTER_MAXIMUM_LENGTH' => 40),
-        );
+        $fields_info = [
+            ['COLUMN_NAME' => 'Host', 'CHARACTER_MAXIMUM_LENGTH' => 80],
+            ['COLUMN_NAME' => 'User', 'CHARACTER_MAXIMUM_LENGTH' => 40],
+        ];
         $dbi->expects($this->any())->method('fetchResult')
             ->will($this->returnValue($fields_info));
 
@@ -1981,10 +1981,10 @@ class PrivilegesTest extends TestCase
             $html
         );
         $item = Url::getCommon(
-            array(
+            [
                 'db' => $url_dbname,
                 'reload' => 1
-            )
+            ]
         );
         $this->assertContains(
             $item,
@@ -2007,11 +2007,11 @@ class PrivilegesTest extends TestCase
             $html
         );
         $item = Url::getCommon(
-            array(
+            [
                 'db' => $url_dbname,
                 'table' => $tablename,
                 'reload' => 1,
-            )
+            ]
         );
         $this->assertContains(
             $item,
@@ -2037,8 +2037,8 @@ class PrivilegesTest extends TestCase
      */
     public function testGetUsersOverview()
     {
-        $result = array();
-        $db_rights = array();
+        $result = [];
+        $db_rights = [];
         $pmaThemeImage = "pmaThemeImage";
         $text_dir = "text_dir";
         $GLOBALS['cfgRelation']['menuswork'] = true;
@@ -2118,8 +2118,8 @@ class PrivilegesTest extends TestCase
      */
     public function testGetFieldsetForAddDeleteUser()
     {
-        $result = array();
-        $db_rights = array();
+        $result = [];
+        $db_rights = [];
         $pmaThemeImage = "pmaThemeImage";
         $text_dir = "text_dir";
         $GLOBALS['cfgRelation']['menuswork'] = true;
@@ -2130,7 +2130,7 @@ class PrivilegesTest extends TestCase
 
         //Url::getCommon
         $this->assertContains(
-            Url::getCommon(array('adduser' => 1)),
+            Url::getCommon(['adduser' => 1]),
             $html
         );
 
@@ -2163,7 +2163,7 @@ class PrivilegesTest extends TestCase
         $_REQUEST['change_copy'] = "change_copy";
         $_REQUEST['old_hostname'] = "old_hostname";
         $_REQUEST['old_username'] = "old_username";
-        $_SESSION['relation'][1] = array(
+        $_SESSION['relation'][1] = [
             'PMA_VERSION' => PMA_VERSION,
             'bookmarkwork' => false,
             'historywork' => false,
@@ -2175,16 +2175,16 @@ class PrivilegesTest extends TestCase
             'navwork' => false,
             'savedsearcheswork' => false,
             'designersettingswork' => false,
-        );
+        ];
 
-        $queries = array();
+        $queries = [];
 
         $ret = $this->serverPrivileges->getDataForDeleteUsers($queries);
 
-        $item = array(
+        $item = [
             "# Deleting 'old_username'@'old_hostname' ...",
             "DROP USER 'old_username'@'old_hostname';",
-        );
+        ];
         $this->assertEquals(
             $item,
             $ret
@@ -2201,7 +2201,7 @@ class PrivilegesTest extends TestCase
         $html = $this->serverPrivileges->getAddUserHtmlFieldset();
 
         $this->assertContains(
-            Url::getCommon(array('adduser' => 1)),
+            Url::getCommon(['adduser' => 1]),
             $html
         );
         $this->assertContains(
@@ -2246,12 +2246,12 @@ class PrivilegesTest extends TestCase
 
         //Url::getCommon
         $item = Url::getCommon(
-            array(
+            [
                 'username' => $username,
                 'hostname' => $hostname,
                 'dbname' => '',
                 'tablename' => '',
-            )
+            ]
         );
         $this->assertContains(
             $item,
@@ -2282,12 +2282,12 @@ class PrivilegesTest extends TestCase
 
         //Url::getCommon
         $item = Url::getCommon(
-            array(
+            [
                 'username' => $username,
                 'hostname' => $hostname,
                 'dbname' => $url_dbname,
                 'tablename' => '',
-            )
+            ]
         );
         $this->assertContains(
             $item,
@@ -2381,7 +2381,7 @@ class PrivilegesTest extends TestCase
 
         // Test case 2
         $GLOBALS['dblist'] = new \stdClass();
-        $GLOBALS['dblist']->databases = array('x', 'y', 'z');
+        $GLOBALS['dblist']->databases = ['x', 'y', 'z'];
         $actual = $this->serverPrivileges->getHtmlForAllTableSpecificRights('pma2', 'host2', 'database', '');
         $this->assertContains(
             '<legend data-submenu-label="Database">',
@@ -2402,8 +2402,8 @@ class PrivilegesTest extends TestCase
     {
         // Setup for the test
         $GLOBALS['dbi']->expects($this->any())->method('fetchRow')
-            ->will($this->onConsecutiveCalls(array('-')));
-        $actual = $this->serverPrivileges->getHtmlForInitials(array('"' => true));
+            ->will($this->onConsecutiveCalls(['-']));
+        $actual = $this->serverPrivileges->getHtmlForInitials(['"' => true]);
         $this->assertContains('<td>A</td>', $actual);
         $this->assertContains('<td>Z</td>', $actual);
         $this->assertContains(
@@ -2432,15 +2432,15 @@ class PrivilegesTest extends TestCase
             ->getMock();
         $dbi->expects($this->any())
             ->method('fetchResult')
-            ->will($this->returnValue(array('db', 'columns_priv')));
+            ->will($this->returnValue(['db', 'columns_priv']));
         $dbi->expects($this->any())
             ->method('fetchAssoc')
             ->will(
                 $this->onConsecutiveCalls(
-                    array(
+                    [
                         'User' => 'pmauser',
                         'Host' => 'local'
-                    )
+                    ]
                 )
             );
         $dbi->expects($this->any())
@@ -2450,17 +2450,17 @@ class PrivilegesTest extends TestCase
         $_GET['initial'] = 'A';
         $GLOBALS['dbi'] = $dbi;
 
-        $expected = array(
-            'pmauser' => array(
-                'local' => array(
+        $expected = [
+            'pmauser' => [
+                'local' => [
                     'User' => 'pmauser',
                     'Host' => 'local',
                     'Password' => '?',
                     'Grant_priv' => 'N',
-                    'privs' => array('USAGE')
-                )
-            )
-        );
+                    'privs' => ['USAGE']
+                ]
+            ]
+        ];
         $actual = $this->serverPrivileges->getDbRightsForUserOverview();
         $this->assertEquals($expected, $actual);
     }
@@ -2482,16 +2482,16 @@ class PrivilegesTest extends TestCase
             ->method('query')
             ->will($this->onConsecutiveCalls(true, true));
 
-        $plugins = array(
-            array(
+        $plugins = [
+            [
                 'PLUGIN_NAME'=>'mysql_native_password',
                 'PLUGIN_DESCRIPTION' => 'Native MySQL authentication'
-            ),
-            array(
+            ],
+            [
                 'PLUGIN_NAME' => 'sha256_password',
                 'PLUGIN_DESCRIPTION' => 'SHA256 password authentication'
-            )
-        );
+            ]
+        ];
         $dbi->expects($this->any())
             ->method('fetchAssoc')
             ->will(
@@ -2599,7 +2599,7 @@ class PrivilegesTest extends TestCase
         $GLOBALS['dbi'] = $dbi;
 
         // Test case 1 : empty queries
-        $queries = array();
+        $queries = [];
         $actual = $this->serverPrivileges->deleteUser($queries);
         $this->assertArrayHasKey(0, $actual);
         $this->assertArrayHasKey(1, $actual);
@@ -2610,7 +2610,7 @@ class PrivilegesTest extends TestCase
 
         // Test case 2 : all successful queries
         $_REQUEST['mode'] = 3;
-        $queries = array('foo');
+        $queries = ['foo'];
         $actual = $this->serverPrivileges->deleteUser($queries);
         $this->assertArrayHasKey(0, $actual);
         $this->assertArrayHasKey(1, $actual);
@@ -2625,7 +2625,7 @@ class PrivilegesTest extends TestCase
 
         // Test case 3 : failing queries
         $_REQUEST['mode'] = 1;
-        $queries = array('bar');
+        $queries = ['bar'];
         $actual = $this->serverPrivileges->deleteUser($queries);
         $this->assertArrayHasKey(0, $actual);
         $this->assertArrayHasKey(1, $actual);
diff --git a/test/classes/Server/SelectTest.php b/test/classes/Server/SelectTest.php
index fe45a42160..b3723d9406 100644
--- a/test/classes/Server/SelectTest.php
+++ b/test/classes/Server/SelectTest.php
@@ -39,7 +39,7 @@ class SelectTest extends TestCase
         $GLOBALS['server'] = 1;
         $GLOBALS['cfg']['ServerDefault'] = "server";
         $GLOBALS['cfg']['RememberSorting'] = true;
-        $GLOBALS['cfg']['SQP'] = array();
+        $GLOBALS['cfg']['SQP'] = [];
         $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
         $GLOBALS['cfg']['ShowSQL'] = true;
         $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
@@ -62,22 +62,22 @@ class SelectTest extends TestCase
 
         $GLOBALS['cfg']['DefaultTabServer'] = "welcome";
 
-        $GLOBALS['cfg']['Servers'] = array(
-            '0' => array(
+        $GLOBALS['cfg']['Servers'] = [
+            '0' => [
                 'host'=>'host0',
                 'port'=>'port0',
                 'only_db'=>'only_db0',
                 'user'=>'user0',
                 'auth_type'=>'config',
-            ),
-            '1' => array(
+            ],
+            '1' => [
                 'host'=>'host1',
                 'port'=>'port1',
                 'only_db'=>'only_db1',
                 'user'=>'user1',
                 'auth_type'=>'config',
-            ),
-        );
+            ],
+        ];
 
         //$not_only_options=false & $omit_fieldset=false
         $html = Select::render($not_only_options, $omit_fieldset);
diff --git a/test/classes/Server/Status/AdvisorTest.php b/test/classes/Server/Status/AdvisorTest.php
index 0f22acda3d..d54bc3a478 100644
--- a/test/classes/Server/Status/AdvisorTest.php
+++ b/test/classes/Server/Status/AdvisorTest.php
@@ -47,7 +47,7 @@ class AdvisorTest extends TestCase
         $GLOBALS['cfg']['MaxRows'] = 10;
         $GLOBALS['cfg']['ServerDefault'] = "server";
         $GLOBALS['cfg']['RememberSorting'] = true;
-        $GLOBALS['cfg']['SQP'] = array();
+        $GLOBALS['cfg']['SQP'] = [];
         $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
         $GLOBALS['cfg']['ShowSQL'] = true;
         $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
@@ -70,40 +70,40 @@ class AdvisorTest extends TestCase
             ->getMock();
 
         //this data is needed when PhpMyAdmin\Server\Status\Data constructs
-        $server_status = array(
+        $server_status = [
             "Aborted_clients" => "0",
             "Aborted_connects" => "0",
             "Com_delete_multi" => "0",
             "Com_create_function" => "0",
             "Com_empty_query" => "0",
-        );
+        ];
 
-        $server_variables= array(
+        $server_variables= [
             "auto_increment_increment" => "1",
             "auto_increment_offset" => "1",
             "automatic_sp_privileges" => "ON",
             "back_log" => "50",
             "big_tables" => "OFF",
-        );
+        ];
 
-        $fetchResult = array(
-            array(
+        $fetchResult = [
+            [
                 "SHOW GLOBAL STATUS",
                 0,
                 1,
                 DatabaseInterface::CONNECT_USER,
                 0,
                 $server_status
-            ),
-            array(
+            ],
+            [
                 "SHOW GLOBAL VARIABLES",
                 0,
                 1,
                 DatabaseInterface::CONNECT_USER,
                 0,
                 $server_variables
-            ),
-            array(
+            ],
+            [
                 "SELECT concat('Com_', variable_name), variable_value "
                     . "FROM data_dictionary.GLOBAL_STATEMENTS",
                 0,
@@ -111,8 +111,8 @@ class AdvisorTest extends TestCase
                 DatabaseInterface::CONNECT_USER,
                 0,
                 $server_status
-            ),
-        );
+            ],
+        ];
 
         $dbi->expects($this->any())->method('fetchResult')
             ->will($this->returnValueMap($fetchResult));
diff --git a/test/classes/Server/Status/DataTest.php b/test/classes/Server/Status/DataTest.php
index c005b7ec27..f35c31a928 100644
--- a/test/classes/Server/Status/DataTest.php
+++ b/test/classes/Server/Status/DataTest.php
@@ -37,7 +37,7 @@ class DataTest extends PmaTestCase
         $GLOBALS['cfg']['Server']['host'] = "::1";
         $GLOBALS['replication_info']['master']['status'] = true;
         $GLOBALS['replication_info']['slave']['status'] = true;
-        $GLOBALS['replication_types'] = array();
+        $GLOBALS['replication_types'] = [];
 
         //Mock DBI
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
@@ -45,7 +45,7 @@ class DataTest extends PmaTestCase
             ->getMock();
 
         //this data is needed when PhpMyAdmin\Server\Status\Data constructs
-        $server_status = array(
+        $server_status = [
             "Aborted_clients" => "0",
             "Aborted_connects" => "0",
             "Com_delete_multi" => "0",
@@ -58,35 +58,35 @@ class DataTest extends PmaTestCase
             "Key_read_requests" => 1,
             "Threads_created" => true,
             "Connections" => 2,
-        );
+        ];
 
-        $server_variables= array(
+        $server_variables= [
             "auto_increment_increment" => "1",
             "auto_increment_offset" => "1",
             "automatic_sp_privileges" => "ON",
             "back_log" => "50",
             "big_tables" => "OFF",
             "key_buffer_size" => 10,
-        );
+        ];
 
-        $fetchResult = array(
-            array(
+        $fetchResult = [
+            [
                 "SHOW GLOBAL STATUS",
                 0,
                 1,
                 DatabaseInterface::CONNECT_USER,
                 0,
                 $server_status
-            ),
-            array(
+            ],
+            [
                 "SHOW GLOBAL VARIABLES",
                 0,
                 1,
                 DatabaseInterface::CONNECT_USER,
                 0,
                 $server_variables
-            ),
-            array(
+            ],
+            [
                 "SELECT concat('Com_', variable_name), variable_value "
                     . "FROM data_dictionary.GLOBAL_STATEMENTS",
                 0,
@@ -94,8 +94,8 @@ class DataTest extends PmaTestCase
                 DatabaseInterface::CONNECT_USER,
                 0,
                 $server_status
-            ),
-        );
+            ],
+        ];
 
         $dbi->expects($this->any())->method('fetchResult')
             ->will($this->returnValueMap($fetchResult));
diff --git a/test/classes/Server/Status/MonitorTest.php b/test/classes/Server/Status/MonitorTest.php
index 6ca0444ee4..097b9d10a2 100644
--- a/test/classes/Server/Status/MonitorTest.php
+++ b/test/classes/Server/Status/MonitorTest.php
@@ -48,7 +48,7 @@ class MonitorTest extends TestCase
         $GLOBALS['cfg']['MaxRows'] = 10;
         $GLOBALS['cfg']['ServerDefault'] = "server";
         $GLOBALS['cfg']['RememberSorting'] = true;
-        $GLOBALS['cfg']['SQP'] = array();
+        $GLOBALS['cfg']['SQP'] = [];
         $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
         $GLOBALS['cfg']['ShowSQL'] = true;
         $GLOBALS['cfg']['Server']['host'] = "localhost";
@@ -68,40 +68,40 @@ class MonitorTest extends TestCase
             ->getMock();
 
         //this data is needed when PhpMyAdmin\Server\Status\Data constructs
-        $server_status = array(
+        $server_status = [
             "Aborted_clients" => "0",
             "Aborted_connects" => "0",
             "Com_delete_multi" => "0",
             "Com_create_function" => "0",
             "Com_empty_query" => "0",
-        );
+        ];
 
-        $server_variables = array(
+        $server_variables = [
             "auto_increment_increment" => "1",
             "auto_increment_offset" => "1",
             "automatic_sp_privileges" => "ON",
             "back_log" => "50",
             "big_tables" => "OFF",
-        );
+        ];
 
-        $fetchResult = array(
-            array(
+        $fetchResult = [
+            [
                 "SHOW GLOBAL STATUS",
                 0,
                 1,
                 DatabaseInterface::CONNECT_USER,
                 0,
                 $server_status
-            ),
-            array(
+            ],
+            [
                 "SHOW GLOBAL VARIABLES",
                 0,
                 1,
                 DatabaseInterface::CONNECT_USER,
                 0,
                 $server_variables
-            ),
-            array(
+            ],
+            [
                 "SELECT concat('Com_', variable_name), variable_value "
                     . "FROM data_dictionary.GLOBAL_STATEMENTS",
                 0,
@@ -109,8 +109,8 @@ class MonitorTest extends TestCase
                 DatabaseInterface::CONNECT_USER,
                 0,
                 $server_status
-            ),
-        );
+            ],
+        ];
 
         $dbi->expects($this->any())->method('fetchResult')
             ->will($this->returnValueMap($fetchResult));
@@ -238,15 +238,15 @@ class MonitorTest extends TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $value = array(
+        $value = [
             'sql_text' => 'insert sql_text',
             '#' => 11,
-        );
+        ];
 
-        $value2 = array(
+        $value2 = [
             'sql_text' => 'update sql_text',
             '#' => 10,
-        );
+        ];
 
         $dbi->expects($this->at(1))->method('fetchAssoc')
             ->will($this->returnValue($value));
@@ -262,11 +262,11 @@ class MonitorTest extends TestCase
         $end = 10;
         $ret = $this->statusMonitor->getJsonForLogDataTypeSlow($start, $end);
 
-        $result_rows = array(
-            array('sql_text' => 'insert sql_text', '#' => 11),
-            array('sql_text' => 'update sql_text', '#' => 10)
-        );
-        $result_sum = array('insert' =>11, 'TOTAL' =>21, 'update' => 10);
+        $result_rows = [
+            ['sql_text' => 'insert sql_text', '#' => 11],
+            ['sql_text' => 'update sql_text', '#' => 10]
+        ];
+        $result_sum = ['insert' =>11, 'TOTAL' =>21, 'update' => 10];
         $this->assertEquals(
             2,
             $ret['numRows']
@@ -295,17 +295,17 @@ class MonitorTest extends TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $value = array(
+        $value = [
             'sql_text' => 'insert sql_text',
             '#' => 10,
             'argument' => 'argument argument2',
-        );
+        ];
 
-        $value2 = array(
+        $value2 = [
             'sql_text' => 'update sql_text',
             '#' => 11,
             'argument' => 'argument3 argument4',
-        );
+        ];
 
         $dbi->expects($this->at(1))->method('fetchAssoc')
             ->will($this->returnValue($value));
@@ -321,11 +321,11 @@ class MonitorTest extends TestCase
         $end = 10;
         $ret = $this->statusMonitor->getJsonForLogDataTypeGeneral($start, $end);
 
-        $result_rows = array(
+        $result_rows = [
             $value,
             $value2,
-        );
-        $result_sum = array('argument' =>10, 'TOTAL' =>21, 'argument3' => 11);
+        ];
+        $result_sum = ['argument' =>10, 'TOTAL' =>21, 'argument3' => 11];
 
         $this->assertEquals(
             2,
@@ -355,11 +355,11 @@ class MonitorTest extends TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $value = array(
+        $value = [
             'sql_text' => 'insert sql_text',
             '#' => 22,
             'argument' => 'argument argument2',
-        );
+        ];
 
         $dbi->expects($this->any())->method('fetchResult')
             ->will($this->returnValue($value));
@@ -394,11 +394,11 @@ class MonitorTest extends TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $value = array(
+        $value = [
             'sql_text' => 'insert sql_text',
             '#' => 33,
             'argument' => 'argument argument2',
-        );
+        ];
 
         $dbi->expects($this->at(4))->method('fetchAssoc')
             ->will($this->returnValue($value));
@@ -415,11 +415,11 @@ class MonitorTest extends TestCase
             $ret['affectedRows']
         );
         $this->assertEquals(
-            array(),
+            [],
             $ret['profiling']
         );
         $this->assertEquals(
-            array($value),
+            [$value],
             $ret['explain']
         );
     }
diff --git a/test/classes/Server/Status/ProcessesTest.php b/test/classes/Server/Status/ProcessesTest.php
index 065bf9b806..ba65bbc4ca 100644
--- a/test/classes/Server/Status/ProcessesTest.php
+++ b/test/classes/Server/Status/ProcessesTest.php
@@ -35,7 +35,7 @@ class ProcessesTest extends TestCase
         $GLOBALS['PMA_PHP_SELF'] = Core::getenv('PHP_SELF');
         $GLOBALS['replication_info']['master']['status'] = true;
         $GLOBALS['replication_info']['slave']['status'] = false;
-        $GLOBALS['replication_types'] = array();
+        $GLOBALS['replication_types'] = [];
 
         $GLOBALS['pmaThemeImage'] = 'image';
 
@@ -100,7 +100,7 @@ class ProcessesTest extends TestCase
      */
     public function testPMAGetHtmlForServerProcessList()
     {
-        $process = array(
+        $process = [
             "User" => "User1",
             "Host" => "Host1",
             "Id" => "Id1",
@@ -109,7 +109,7 @@ class ProcessesTest extends TestCase
             "Info" => "Info1",
             "State" => "State1",
             "Time" => "Time1"
-        );
+        ];
         $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 12;
         $GLOBALS['dbi']->expects($this->any())->method('fetchAssoc')
             ->will($this->onConsecutiveCalls($process));
@@ -177,7 +177,7 @@ class ProcessesTest extends TestCase
     public function testPMAGetHtmlForServerProcessItem()
     {
         //parameters
-        $process = array(
+        $process = [
             "user" => "User1",
             "host" => "Host1",
             "id" => "Id1",
@@ -186,7 +186,7 @@ class ProcessesTest extends TestCase
             "info" => "Info1",
             "state" => "State1",
             "time" => "Time1",
-        );
+        ];
         $show_full_sql = true;
 
         $_REQUEST['sort_order'] = "desc";
@@ -197,10 +197,10 @@ class ProcessesTest extends TestCase
         $html = Processes::getHtmlForServerProcessItem($process, $show_full_sql);
 
         //validate 1: $kill_process
-        $url_params = array(
+        $url_params = [
             'kill' => $process['id'],
             'ajax_request' => true
-        );
+        ];
         $kill_process = 'server_status_processes.php'
             . Url::getCommon($url_params);
         $this->assertContains(
diff --git a/test/classes/Server/Status/QueriesTest.php b/test/classes/Server/Status/QueriesTest.php
index 41f47117ed..9068023a3c 100644
--- a/test/classes/Server/Status/QueriesTest.php
+++ b/test/classes/Server/Status/QueriesTest.php
@@ -44,7 +44,7 @@ class QueriesTest extends TestCase
         $GLOBALS['cfg']['MaxRows'] = 10;
         $GLOBALS['cfg']['ServerDefault'] = "server";
         $GLOBALS['cfg']['RememberSorting'] = true;
-        $GLOBALS['cfg']['SQP'] = array();
+        $GLOBALS['cfg']['SQP'] = [];
         $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
         $GLOBALS['cfg']['ShowSQL'] = true;
         $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
@@ -65,40 +65,40 @@ class QueriesTest extends TestCase
             ->getMock();
 
         //this data is needed when PhpMyAdmin\Server\Status\Data constructs
-        $server_status = array(
+        $server_status = [
             "Aborted_clients" => "0",
             "Aborted_connects" => "0",
             "Com_delete_multi" => "0",
             "Com_create_function" => "0",
             "Com_empty_query" => "0",
-        );
+        ];
 
-        $server_variables= array(
+        $server_variables= [
             "auto_increment_increment" => "1",
             "auto_increment_offset" => "1",
             "automatic_sp_privileges" => "ON",
             "back_log" => "50",
             "big_tables" => "OFF",
-        );
+        ];
 
-        $fetchResult = array(
-            array(
+        $fetchResult = [
+            [
                 "SHOW GLOBAL STATUS",
                 0,
                 1,
                 DatabaseInterface::CONNECT_USER,
                 0,
                 $server_status
-            ),
-            array(
+            ],
+            [
                 "SHOW GLOBAL VARIABLES",
                 0,
                 1,
                 DatabaseInterface::CONNECT_USER,
                 0,
                 $server_variables
-            )
-        );
+            ]
+        ];
 
         $dbi->expects($this->any())->method('fetchResult')
             ->will($this->returnValueMap($fetchResult));
@@ -106,14 +106,14 @@ class QueriesTest extends TestCase
         $GLOBALS['dbi'] = $dbi;
         $this->serverStatusData = new Data();
         $this->serverStatusData->status['Uptime'] = 36000;
-        $this->serverStatusData->used_queries = array(
+        $this->serverStatusData->used_queries = [
             "Com_change_db" => "15",
             "Com_select" => "12",
             "Com_set_option" => "54",
             "Com_show_databases" => "16",
             "Com_show_status" => "14",
             "Com_show_tables" => "13",
-        );
+        ];
     }
 
     /**
diff --git a/test/classes/Server/Status/VariablesTest.php b/test/classes/Server/Status/VariablesTest.php
index 29080f0793..bedb7984f5 100644
--- a/test/classes/Server/Status/VariablesTest.php
+++ b/test/classes/Server/Status/VariablesTest.php
@@ -45,7 +45,7 @@ class VariablesTest extends TestCase
         $GLOBALS['cfg']['MaxRows'] = 10;
         $GLOBALS['cfg']['ServerDefault'] = "server";
         $GLOBALS['cfg']['RememberSorting'] = true;
-        $GLOBALS['cfg']['SQP'] = array();
+        $GLOBALS['cfg']['SQP'] = [];
         $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
         $GLOBALS['cfg']['ShowSQL'] = true;
         $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
@@ -66,40 +66,40 @@ class VariablesTest extends TestCase
             ->getMock();
 
         //this data is needed when PhpMyAdmin\Server\Status\Data constructs
-        $server_status = array(
+        $server_status = [
             "Aborted_clients" => "0",
             "Aborted_connects" => "0",
             "Com_delete_multi" => "0",
             "Com_create_function" => "0",
             "Com_empty_query" => "0",
-        );
+        ];
 
-        $server_variables= array(
+        $server_variables= [
             "auto_increment_increment" => "1",
             "auto_increment_offset" => "1",
             "automatic_sp_privileges" => "ON",
             "back_log" => "50",
             "big_tables" => "OFF",
-        );
+        ];
 
-        $fetchResult = array(
-            array(
+        $fetchResult = [
+            [
                 "SHOW GLOBAL STATUS",
                 0,
                 1,
                 DatabaseInterface::CONNECT_USER,
                 0,
                 $server_status
-            ),
-            array(
+            ],
+            [
                 "SHOW GLOBAL VARIABLES",
                 0,
                 1,
                 DatabaseInterface::CONNECT_USER,
                 0,
                 $server_variables
-            ),
-            array(
+            ],
+            [
                 "SELECT concat('Com_', variable_name), variable_value "
                     . "FROM data_dictionary.GLOBAL_STATEMENTS",
                 0,
@@ -107,8 +107,8 @@ class VariablesTest extends TestCase
                 DatabaseInterface::CONNECT_USER,
                 0,
                 $server_status
-            ),
-        );
+            ],
+        ];
 
         $dbi->expects($this->at(0))
             ->method('tryQuery')
@@ -117,19 +117,19 @@ class VariablesTest extends TestCase
 
         $dbi->expects($this->at(1))
             ->method('fetchRow')
-            ->will($this->returnValue(array("Aborted_clients", "0")));
+            ->will($this->returnValue(["Aborted_clients", "0"]));
         $dbi->expects($this->at(2))
             ->method('fetchRow')
-            ->will($this->returnValue(array("Aborted_connects", "0")));
+            ->will($this->returnValue(["Aborted_connects", "0"]));
         $dbi->expects($this->at(3))
             ->method('fetchRow')
-            ->will($this->returnValue(array("Com_delete_multi", "0")));
+            ->will($this->returnValue(["Com_delete_multi", "0"]));
         $dbi->expects($this->at(4))
             ->method('fetchRow')
-            ->will($this->returnValue(array("Com_create_function", "0")));
+            ->will($this->returnValue(["Com_create_function", "0"]));
         $dbi->expects($this->at(5))
             ->method('fetchRow')
-            ->will($this->returnValue(array("Com_empty_query", "0")));
+            ->will($this->returnValue(["Com_empty_query", "0"]));
         $dbi->expects($this->at(6))
             ->method('fetchRow')
             ->will($this->returnValue(false));
diff --git a/test/classes/Server/StatusTest.php b/test/classes/Server/StatusTest.php
index 743dbc6186..2ecaa6d511 100644
--- a/test/classes/Server/StatusTest.php
+++ b/test/classes/Server/StatusTest.php
@@ -45,7 +45,7 @@ class StatusTest extends TestCase
         $GLOBALS['PMA_PHP_SELF'] = Core::getenv('PHP_SELF');
         $GLOBALS['replication_info']['master']['status'] = true;
         $GLOBALS['replication_info']['slave']['status'] = false;
-        $GLOBALS['replication_types'] = array();
+        $GLOBALS['replication_types'] = [];
 
         $GLOBALS['table'] = "table";
 
@@ -57,7 +57,7 @@ class StatusTest extends TestCase
             ->getMock();
 
         //this data is needed when PhpMyAdmin\Server\Status\Data constructs
-        $server_status = array(
+        $server_status = [
             "Aborted_clients" => "0",
             "Aborted_connects" => "0",
             "Com_delete_multi" => "0",
@@ -65,34 +65,34 @@ class StatusTest extends TestCase
             "Com_empty_query" => "0",
             "Com_execute_sql" => 2,
             "Com_stmt_execute" => 2,
-        );
+        ];
 
-        $server_variables= array(
+        $server_variables= [
             "auto_increment_increment" => "1",
             "auto_increment_offset" => "1",
             "automatic_sp_privileges" => "ON",
             "back_log" => "50",
             "big_tables" => "OFF",
-        );
+        ];
 
-        $fetchResult = array(
-            array(
+        $fetchResult = [
+            [
                 "SHOW GLOBAL STATUS",
                 0,
                 1,
                 DatabaseInterface::CONNECT_USER,
                 0,
                 $server_status
-            ),
-            array(
+            ],
+            [
                 "SHOW GLOBAL VARIABLES",
                 0,
                 1,
                 DatabaseInterface::CONNECT_USER,
                 0,
                 $server_variables
-            ),
-            array(
+            ],
+            [
                 "SELECT concat('Com_', variable_name), variable_value "
                     . "FROM data_dictionary.GLOBAL_STATEMENTS",
                 0,
@@ -100,8 +100,8 @@ class StatusTest extends TestCase
                 DatabaseInterface::CONNECT_USER,
                 0,
                 $server_status
-            ),
-        );
+            ],
+        ];
 
         $dbi->expects($this->at(0))
             ->method('tryQuery')
@@ -110,19 +110,19 @@ class StatusTest extends TestCase
 
         $dbi->expects($this->at(1))
             ->method('fetchRow')
-            ->will($this->returnValue(array("Aborted_clients", "0")));
+            ->will($this->returnValue(["Aborted_clients", "0"]));
         $dbi->expects($this->at(2))
             ->method('fetchRow')
-            ->will($this->returnValue(array("Aborted_connects", "0")));
+            ->will($this->returnValue(["Aborted_connects", "0"]));
         $dbi->expects($this->at(3))
             ->method('fetchRow')
-            ->will($this->returnValue(array("Com_delete_multi", "0")));
+            ->will($this->returnValue(["Com_delete_multi", "0"]));
         $dbi->expects($this->at(4))
             ->method('fetchRow')
-            ->will($this->returnValue(array("Com_create_function", "0")));
+            ->will($this->returnValue(["Com_create_function", "0"]));
         $dbi->expects($this->at(5))
             ->method('fetchRow')
-            ->will($this->returnValue(array("Com_empty_query", "0")));
+            ->will($this->returnValue(["Com_empty_query", "0"]));
         $dbi->expects($this->at(6))
             ->method('fetchRow')
             ->will($this->returnValue(false));
diff --git a/test/classes/Server/UserGroupsTest.php b/test/classes/Server/UserGroupsTest.php
index 9e2501b720..f161d8233e 100644
--- a/test/classes/Server/UserGroupsTest.php
+++ b/test/classes/Server/UserGroupsTest.php
@@ -32,12 +32,12 @@ class UserGroupsTest extends TestCase
         $GLOBALS['cfg']['ActionLinksMode'] = 'both';
 
         $GLOBALS['server'] = 1;
-        $_SESSION['relation'][$GLOBALS['server']] = array(
+        $_SESSION['relation'][$GLOBALS['server']] = [
             'PMA_VERSION' => PMA_VERSION,
             'db' => 'pmadb',
             'users' => 'users',
             'usergroups' => 'usergroups'
-        );
+        ];
 
     }
 
@@ -73,7 +73,7 @@ class UserGroupsTest extends TestCase
             $html
         );
         $url_tag = '<a href="server_user_groups.php'
-            . Url::getCommon(array('addUserGroup' => 1));
+            . Url::getCommon(['addUserGroup' => 1]);
         $this->assertContains(
             $url_tag,
             $html
@@ -106,11 +106,11 @@ class UserGroupsTest extends TestCase
             ->withAnyParameters()
             ->will(
                 $this->returnValue(
-                    array(
+                    [
                         'usergroup' => 'usergroup',
                         'tab' => 'server_sql',
                         'allowed' => 'Y'
-                    )
+                    ]
                 )
             );
         $dbi->expects($this->at(3))
@@ -128,9 +128,9 @@ class UserGroupsTest extends TestCase
         );
         $url_tag = '<a class="" href="server_user_groups.php'
             . Url::getCommon(
-                array(
+                [
                     'viewUsers'=>1, 'userGroup'=>htmlspecialchars('usergroup')
-                )
+                ]
             );
         $this->assertContains(
             $url_tag,
@@ -138,10 +138,10 @@ class UserGroupsTest extends TestCase
         );
         $url_tag = '<a class="" href="server_user_groups.php'
             . Url::getCommon(
-                array(
+                [
                     'editUserGroup'=>1,
                     'userGroup'=>htmlspecialchars('usergroup')
-                )
+                ]
             );
         $this->assertContains(
             $url_tag,
@@ -149,10 +149,10 @@ class UserGroupsTest extends TestCase
         );
         $url_tag = '<a class="deleteUserGroup ajax" href="server_user_groups.php'
             . Url::getCommon(
-                array(
+                [
                     'deleteUserGroup'=> 1,
                     'userGroup'=>htmlspecialchars('usergroup')
-                )
+                ]
             );
         $this->assertContains(
             $url_tag,
@@ -220,11 +220,11 @@ class UserGroupsTest extends TestCase
         $dbi->expects($this->exactly(2))
             ->method('fetchAssoc')
             ->willReturnOnConsecutiveCalls(
-                array(
+                [
                     'usergroup' => 'ug',
                     'tab' => 'server_sql',
                     'allowed' => 'Y'
-                ),
+                ],
                 false
             );
         $dbi->expects($this->once())
diff --git a/test/classes/Setup/ConfigGeneratorTest.php b/test/classes/Setup/ConfigGeneratorTest.php
index 89f146ffa1..4d093795a9 100644
--- a/test/classes/Setup/ConfigGeneratorTest.php
+++ b/test/classes/Setup/ConfigGeneratorTest.php
@@ -35,12 +35,12 @@ class ConfigGeneratorTest extends PmaTestCase
 
         $GLOBALS['server'] = 0;
         $cf = new ConfigFile();
-        $_SESSION['ConfigFile0'] = array('a', 'b', 'c');
-        $_SESSION['ConfigFile0']['Servers'] = array(
-            array(1, 2, 3)
-        );
+        $_SESSION['ConfigFile0'] = ['a', 'b', 'c'];
+        $_SESSION['ConfigFile0']['Servers'] = [
+            [1, 2, 3]
+        ];
 
-        $cf->setPersistKeys(array("1/", 2));
+        $cf->setPersistKeys(["1/", 2]);
 
         $result = ConfigGenerator::getConfigFile($cf);
 
@@ -90,7 +90,7 @@ class ConfigGeneratorTest extends PmaTestCase
         $this->assertEquals(
             '$cfg[\'var_name\'] = array (' .
             "\n);\n",
-            $method->invoke(null, 'var_name', array(), "\n")
+            $method->invoke(null, 'var_name', [], "\n")
         );
 
         $this->assertEquals(
@@ -98,7 +98,7 @@ class ConfigGeneratorTest extends PmaTestCase
             $method->invoke(
                 null,
                 'var_name',
-                array(1, 2, 3),
+                [1, 2, 3],
                 "\n"
             )
         );
@@ -109,10 +109,10 @@ class ConfigGeneratorTest extends PmaTestCase
             $method->invoke(
                 null,
                 'var_name',
-                array(
+                [
                     '1a' => 'foo',
                     'b' => 'bar'
-                ),
+                ],
                 "\n"
             )
         );
@@ -132,35 +132,35 @@ class ConfigGeneratorTest extends PmaTestCase
         $this->assertFalse(
             $method->invoke(
                 null,
-                array(
+                [
                     'a' => 1,
                     'b' => 2
-                )
+                ]
             )
         );
 
         $this->assertFalse(
             $method->invoke(
                 null,
-                array(
+                [
                     0 => 1,
                     1 => 2,
                     3 => 3,
-                )
+                ]
             )
         );
 
         $this->assertTrue(
             $method->invoke(
                 null,
-                array()
+                []
             )
         );
 
         $this->assertTrue(
             $method->invoke(
                 null,
-                array(1, 2, 3)
+                [1, 2, 3]
             )
         );
     }
@@ -176,7 +176,7 @@ class ConfigGeneratorTest extends PmaTestCase
         $method = $reflection->getMethod('_exportZeroBasedArray');
         $method->setAccessible(true);
 
-        $arr = array(1, 2, 3, 4);
+        $arr = [1, 2, 3, 4];
 
         $result = $method->invoke(null, $arr, "\n");
 
@@ -185,7 +185,7 @@ class ConfigGeneratorTest extends PmaTestCase
             $result
         );
 
-        $arr = array(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 f174571c40..1bded929bd 100644
--- a/test/classes/Setup/FormProcessingTest.php
+++ b/test/classes/Setup/FormProcessingTest.php
@@ -41,17 +41,17 @@ class FormProcessingTest extends PmaTestCase
     public function testProcessFormSet()
     {
         $this->mockResponse(
-            array(
-                array('status: 303 See Other'),
-                array('Location: index.php?lang=en'),
+            [
+                ['status: 303 See Other'],
+                ['Location: index.php?lang=en'],
                 303
-                )
+                ]
             );
 
         // case 1
         $formDisplay = $this->getMockBuilder('PhpMyAdmin\Config\FormDisplay')
             ->disableOriginalConstructor()
-            ->setMethods(array('process', 'getDisplay'))
+            ->setMethods(['process', 'getDisplay'])
             ->getMock();
 
         $formDisplay->expects($this->once())
@@ -68,7 +68,7 @@ class FormProcessingTest extends PmaTestCase
         // case 2
         $formDisplay = $this->getMockBuilder('PhpMyAdmin\Config\FormDisplay')
             ->disableOriginalConstructor()
-            ->setMethods(array('process', 'hasErrors', 'displayErrors'))
+            ->setMethods(['process', 'hasErrors', 'displayErrors'])
             ->getMock();
 
         $formDisplay->expects($this->once())
@@ -108,7 +108,7 @@ class FormProcessingTest extends PmaTestCase
         // case 3
         $formDisplay = $this->getMockBuilder('PhpMyAdmin\Config\FormDisplay')
             ->disableOriginalConstructor()
-            ->setMethods(array('process', 'hasErrors'))
+            ->setMethods(['process', 'hasErrors'])
             ->getMock();
 
         $formDisplay->expects($this->once())
diff --git a/test/classes/Setup/IndexTest.php b/test/classes/Setup/IndexTest.php
index 44f2182a59..e51089a39b 100644
--- a/test/classes/Setup/IndexTest.php
+++ b/test/classes/Setup/IndexTest.php
@@ -36,30 +36,30 @@ class IndexTest extends TestCase
      */
     public function testPMAmessagesBegin()
     {
-        $_SESSION['messages'] = array(
-            array(
-                array('foo'),
-                array('bar')
-            )
-        );
+        $_SESSION['messages'] = [
+            [
+                ['foo'],
+                ['bar']
+            ]
+        ];
 
         SetupIndex::messagesBegin();
 
         $this->assertEquals(
-            array(
-                array(
-                    array(
+            [
+                [
+                    [
                         0 => 'foo',
                         'fresh' => false,
                         'active' => false
-                    ),
-                    array(
+                    ],
+                    [
                         0 => 'bar',
                         'fresh' => false,
                         'active' => false
-                    )
-                )
-            ),
+                    ]
+                ]
+            ],
             $_SESSION['messages']
         );
 
@@ -68,10 +68,10 @@ class IndexTest extends TestCase
         unset($_SESSION['messages']);
         SetupIndex::messagesBegin();
         $this->assertEquals(
-            array(
-                'error' => array(),
-                'notice' => array()
-            ),
+            [
+                'error' => [],
+                'notice' => []
+            ],
             $_SESSION['messages']
         );
     }
@@ -86,12 +86,12 @@ class IndexTest extends TestCase
         SetupIndex::messagesSet('type', '123', 'testTitle', 'msg');
 
         $this->assertEquals(
-            array(
+            [
                 'fresh' => true,
                 'active' => true,
                 'title' => 'testTitle',
                 'message' => 'msg'
-            ),
+            ],
             $_SESSION['messages']['type']['123']
         );
     }
@@ -103,24 +103,24 @@ class IndexTest extends TestCase
      */
     public function testPMAmessagesEnd()
     {
-        $_SESSION['messages'] = array(
-            array(
-                array('msg' => 'foo', 'active' => false),
-                array('msg' => 'bar', 'active' => true),
-            )
-        );
+        $_SESSION['messages'] = [
+            [
+                ['msg' => 'foo', 'active' => false],
+                ['msg' => 'bar', 'active' => true],
+            ]
+        ];
 
         SetupIndex::messagesEnd();
 
         $this->assertEquals(
-            array(
-                array(
-                    '1' => array(
+            [
+                [
+                    '1' => [
                         'msg' => 'bar',
                         'active' => 1
-                    )
-                )
-            ),
+                    ]
+                ]
+            ],
             $_SESSION['messages']
         );
     }
@@ -132,12 +132,12 @@ class IndexTest extends TestCase
      */
     public function testPMAMessagesShowHTML()
     {
-        $_SESSION['messages'] = array(
-            'type' => array(
-                array('title' => 'foo', 'message' => '123', 'fresh' => false),
-                array('title' => 'bar', 'message' => '321', 'fresh' => true),
-            )
-        );
+        $_SESSION['messages'] = [
+            'type' => [
+                ['title' => 'foo', 'message' => '123', 'fresh' => false],
+                ['title' => 'bar', 'message' => '321', 'fresh' => true],
+            ]
+        ];
 
         ob_start();
         SetupIndex::messagesShowHtml();
diff --git a/test/classes/SqlQueryFormTest.php b/test/classes/SqlQueryFormTest.php
index 27d57c20fa..9867d434c7 100644
--- a/test/classes/SqlQueryFormTest.php
+++ b/test/classes/SqlQueryFormTest.php
@@ -65,7 +65,7 @@ class SqlQueryFormTest extends TestCase
         $GLOBALS['cfg']['DefaultForeignKeyChecks'] = 'default';
 
         //_SESSION
-        $_SESSION['relation'][0] = array(
+        $_SESSION['relation'][0] = [
             'PMA_VERSION' => PMA_VERSION,
             'table_coords' => "table_name",
             'displaywork' => 'displaywork',
@@ -74,7 +74,7 @@ class SqlQueryFormTest extends TestCase
             'relwork' => 'relwork',
             'relation' => 'relation',
             'bookmarkwork' => false,
-        );
+        ];
         //$GLOBALS
         $GLOBALS['cfg']['Server']['user'] = "user";
         $GLOBALS['cfg']['Server']['pmadb'] = "pmadb";
@@ -87,17 +87,17 @@ class SqlQueryFormTest extends TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $fetchResult = array("index1"=>"table1", "index2"=>"table2");
+        $fetchResult = ["index1"=>"table1", "index2"=>"table2"];
         $dbi->expects($this->any())
             ->method('fetchResult')
             ->will($this->returnValue($fetchResult));
 
-        $getColumns = array(
-            array(
+        $getColumns = [
+            [
                 "Field" => "field1",
                 "Comment" => "Comment1"
-            )
-        );
+            ]
+        ];
         $dbi->expects($this->any())
             ->method('getColumns')
             ->will($this->returnValue($getColumns));
diff --git a/test/classes/SqlTest.php b/test/classes/SqlTest.php
index 72c3865603..a971b35afa 100644
--- a/test/classes/SqlTest.php
+++ b/test/classes/SqlTest.php
@@ -258,18 +258,18 @@ class SqlTest extends TestCase
         $col3 = new stdClass;
         $col3->table = 'table3';
 
-        $fields_meta = array($col1, $col2, $col3);
+        $fields_meta = [$col1, $col2, $col3];
         $this->assertFalse(
             $this->callProtectedMethod('resultSetHasJustOneTable', [$fields_meta])
         );
 
         // should not matter on where the odd column occurs
-        $fields_meta = array($col2, $col3, $col1);
+        $fields_meta = [$col2, $col3, $col1];
         $this->assertFalse(
             $this->callProtectedMethod('resultSetHasJustOneTable', [$fields_meta])
         );
 
-        $fields_meta = array($col3, $col1, $col2);
+        $fields_meta = [$col3, $col1, $col2];
         $this->assertFalse(
             $this->callProtectedMethod('resultSetHasJustOneTable', [$fields_meta])
         );
@@ -288,7 +288,7 @@ class SqlTest extends TestCase
         $col2->table = 'table1';
         $col3 = new stdClass;
         $col3->table = 'table1';
-        $fields_meta = array($col1, $col2, $col3);
+        $fields_meta = [$col1, $col2, $col3];
 
         $this->assertTrue(
             $this->callProtectedMethod('resultSetHasJustOneTable', [$fields_meta])
@@ -310,18 +310,18 @@ class SqlTest extends TestCase
         $col3 = new stdClass;
         $col3->table = 'table1';
 
-        $fields_meta = array($col1, $col2, $col3);
+        $fields_meta = [$col1, $col2, $col3];
         $this->assertTrue(
             $this->callProtectedMethod('resultSetHasJustOneTable', [$fields_meta])
         );
 
         // should not matter on where the function column occurs
-        $fields_meta = array($col2, $col3, $col1);
+        $fields_meta = [$col2, $col3, $col1];
         $this->assertTrue(
             $this->callProtectedMethod('resultSetHasJustOneTable', [$fields_meta])
         );
 
-        $fields_meta = array($col3, $col1, $col2);
+        $fields_meta = [$col3, $col1, $col2];
         $this->assertTrue(
             $this->callProtectedMethod('resultSetHasJustOneTable', [$fields_meta])
         );
@@ -341,7 +341,7 @@ class SqlTest extends TestCase
         $col2->table = '';
         $col3 = new stdClass;
         $col3->table = '';
-        $fields_meta = array($col1, $col2, $col3);
+        $fields_meta = [$col1, $col2, $col3];
 
         $this->assertFalse(
             $this->callProtectedMethod('resultSetHasJustOneTable', [$fields_meta])
diff --git a/test/classes/StorageEngineTest.php b/test/classes/StorageEngineTest.php
index 21420a2310..5afa44f1f1 100644
--- a/test/classes/StorageEngineTest.php
+++ b/test/classes/StorageEngineTest.php
@@ -34,7 +34,7 @@ class StorageEngineTest extends PmaTestCase
     {
         $GLOBALS['server'] = 1;
         $this->object = $this->getMockForAbstractClass(
-            'PhpMyAdmin\StorageEngine', array('dummy')
+            'PhpMyAdmin\StorageEngine', ['dummy']
         );
     }
 
@@ -59,23 +59,23 @@ class StorageEngineTest extends PmaTestCase
     {
 
         $this->assertEquals(
-            array(
-                'dummy' => array(
+            [
+                'dummy' => [
                     'Engine' => 'dummy',
                     'Support' => 'YES',
                     'Comment' => 'dummy comment',
-                ),
-                'dummy2' => array(
+                ],
+                'dummy2' => [
                     'Engine' => 'dummy2',
                     'Support' => 'NO',
                     'Comment' => 'dummy2 comment',
-                ),
-                'FEDERATED' => array(
+                ],
+                'FEDERATED' => [
                     'Engine' => 'FEDERATED',
                     'Support' => 'NO',
                     'Comment' => 'Federated MySQL storage engine'
-                ),
-            ),
+                ],
+            ],
             $this->object->getStorageEngines()
         );
     }
@@ -121,21 +121,21 @@ class StorageEngineTest extends PmaTestCase
      */
     public function providerGetEngine()
     {
-        return array(
-            array('PhpMyAdmin\StorageEngine', 'unknown engine'),
-            array('PhpMyAdmin\Engines\Bdb', 'Bdb'),
-            array('PhpMyAdmin\Engines\Berkeleydb', 'Berkeleydb'),
-            array('PhpMyAdmin\Engines\Binlog', 'Binlog'),
-            array('PhpMyAdmin\Engines\Innobase', 'Innobase'),
-            array('PhpMyAdmin\Engines\Innodb', 'Innodb'),
-            array('PhpMyAdmin\Engines\Memory', 'Memory'),
-            array('PhpMyAdmin\Engines\Merge', 'Merge'),
-            array('PhpMyAdmin\Engines\MrgMyisam', 'Mrg_Myisam'),
-            array('PhpMyAdmin\Engines\Myisam', 'Myisam'),
-            array('PhpMyAdmin\Engines\Ndbcluster', 'Ndbcluster'),
-            array('PhpMyAdmin\Engines\Pbxt', 'Pbxt'),
-            array('PhpMyAdmin\Engines\PerformanceSchema', 'Performance_Schema'),
-        );
+        return [
+            ['PhpMyAdmin\StorageEngine', 'unknown engine'],
+            ['PhpMyAdmin\Engines\Bdb', 'Bdb'],
+            ['PhpMyAdmin\Engines\Berkeleydb', 'Berkeleydb'],
+            ['PhpMyAdmin\Engines\Binlog', 'Binlog'],
+            ['PhpMyAdmin\Engines\Innobase', 'Innobase'],
+            ['PhpMyAdmin\Engines\Innodb', 'Innodb'],
+            ['PhpMyAdmin\Engines\Memory', 'Memory'],
+            ['PhpMyAdmin\Engines\Merge', 'Merge'],
+            ['PhpMyAdmin\Engines\MrgMyisam', 'Mrg_Myisam'],
+            ['PhpMyAdmin\Engines\Myisam', 'Myisam'],
+            ['PhpMyAdmin\Engines\Ndbcluster', 'Ndbcluster'],
+            ['PhpMyAdmin\Engines\Pbxt', 'Pbxt'],
+            ['PhpMyAdmin\Engines\PerformanceSchema', 'Performance_Schema'],
+        ];
     }
 
     /**
@@ -183,7 +183,7 @@ class StorageEngineTest extends PmaTestCase
     {
 
         $this->assertEquals(
-            array(),
+            [],
             $this->object->getInfoPages()
         );
     }
@@ -225,7 +225,7 @@ class StorageEngineTest extends PmaTestCase
     {
 
         $this->assertEquals(
-            array(),
+            [],
             $this->object->getVariables()
         );
     }
@@ -298,10 +298,10 @@ class StorageEngineTest extends PmaTestCase
     {
 
         $this->assertEquals(
-            array(
+            [
                 0 => 12,
                 1 => 'B'
-            ),
+            ],
             $this->object->resolveTypeSize(12)
         );
     }
diff --git a/test/classes/Stubs/Response.php b/test/classes/Stubs/Response.php
index 82eff4906c..c1a51276e9 100644
--- a/test/classes/Stubs/Response.php
+++ b/test/classes/Stubs/Response.php
@@ -73,7 +73,7 @@ class Response
     {
         $this->_isSuccess = true;
         $this->htmlString = '';
-        $this->json = array();
+        $this->json = [];
         $this->_isAjax = false;
 
         $GLOBALS['lang'] = 'en';
@@ -189,7 +189,7 @@ class Response
     public function clear()
     {
         $this->_isSuccess = true;
-        $this->json = array();
+        $this->json = [];
         $this->htmlString = '';
     }
 
diff --git a/test/classes/SysInfoTest.php b/test/classes/SysInfoTest.php
index 7a60931a38..c7ddfb6e4c 100644
--- a/test/classes/SysInfoTest.php
+++ b/test/classes/SysInfoTest.php
@@ -44,12 +44,12 @@ class SysInfoTest extends TestCase
      */
     public function sysInfoOsProvider()
     {
-        return array(
-            array('FreeBSD', 'Linux'),
-            array('Linux', 'Linux'),
-            array('Winnt', 'Winnt'),
-            array('SunOS', 'SunOS'),
-        );
+        return [
+            ['FreeBSD', 'Linux'],
+            ['Linux', 'Linux'],
+            ['Winnt', 'Winnt'],
+            ['SunOS', 'SunOS'],
+        ];
     }
 
     /**
diff --git a/test/classes/SystemDatabaseTest.php b/test/classes/SystemDatabaseTest.php
index 082a9ee8fd..6c5d52244f 100644
--- a/test/classes/SystemDatabaseTest.php
+++ b/test/classes/SystemDatabaseTest.php
@@ -42,7 +42,7 @@ class SystemDatabaseTest extends PmaTestCase
             ->will($this->returnValue('executeResult2'));
 
         //_SESSION
-        $_SESSION['relation'][$GLOBALS['server']] = array(
+        $_SESSION['relation'][$GLOBALS['server']] = [
             'PMA_VERSION' => PMA_VERSION,
             'table_coords' => "table_name",
             'displaywork' => 'displaywork',
@@ -53,20 +53,20 @@ class SystemDatabaseTest extends PmaTestCase
             'pdfwork' => 'pdfwork',
             'column_info' => 'column_info',
             'relation' => 'relation',
-        );
+        ];
 
         $dbi->expects($this->any())
             ->method('fetchAssoc')
             ->will(
                 $this->returnValue(
-                    array(
+                    [
                         'table_name' => "table_name",
                         'column_name' => "column_name",
                         'comment' => "comment",
                         'mimetype' => "mimetype",
                         'transformation' => "transformation",
                         'transformation_options' => "transformation_options",
-                    )
+                    ]
                 )
             );
 
@@ -100,13 +100,13 @@ class SystemDatabaseTest extends PmaTestCase
     public function testPMAGetNewTransformationDataSql()
     {
         $db = "PMA_db";
-        $pma_transformation_data = array();
-        $column_map = array(
-            array(
+        $pma_transformation_data = [];
+        $column_map = [
+            [
                 "table_name" => "table_name",
                 "refering_column" => "column_name"
-            )
-        );
+            ]
+        ];
         $view_name = "view_name";
 
         $ret = $this->sysDb->getNewTransformationDataSql(
diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php
index 58de980559..90b1d567df 100644
--- a/test/classes/TableTest.php
+++ b/test/classes/TableTest.php
@@ -93,125 +93,125 @@ class TableTest extends PmaTestCase
 
         $getUniqueColumns_sql = "select unique column";
 
-        $fetchResult = array(
-            array(
+        $fetchResult = [
+            [
                 $sql_isView_true,
                 null,
                 null,
                 DatabaseInterface::CONNECT_USER,
                 0,
                 true
-            ),
-            array(
+            ],
+            [
                 $sql_copy_data,
                 null,
                 null,
                 DatabaseInterface::CONNECT_USER,
                 0,
                 false
-            ),
-            array(
+            ],
+            [
                 $sql_isView_false,
                 null,
                 null,
                 DatabaseInterface::CONNECT_USER,
                 0,
                 false
-            ),
-            array(
+            ],
+            [
                 $sql_isUpdatableView_true,
                 null,
                 null,
                 DatabaseInterface::CONNECT_USER,
                 0,
                 true
-            ),
-            array(
+            ],
+            [
                 $sql_isUpdatableView_false,
                 null,
                 null,
                 DatabaseInterface::CONNECT_USER,
                 0,
                 false
-            ),
-            array(
+            ],
+            [
                 $sql_analyzeStructure_true,
                 null,
                 null,
                 DatabaseInterface::CONNECT_USER,
                 0,
-                array(
-                    array('COLUMN_NAME'=>'COLUMN_NAME', 'DATA_TYPE'=>'DATA_TYPE')
-                )
-            ),
-            array(
+                [
+                    ['COLUMN_NAME'=>'COLUMN_NAME', 'DATA_TYPE'=>'DATA_TYPE']
+                ]
+            ],
+            [
                 $getUniqueColumns_sql,
-                array('Key_name', null),
+                ['Key_name', null],
                 'Column_name',
                 DatabaseInterface::CONNECT_USER,
                 0,
-                array(
-                    array('index1'),
-                    array('index3'),
-                    array('index5'),
-                )
-            ),
-            array(
+                [
+                    ['index1'],
+                    ['index3'],
+                    ['index5'],
+                ]
+            ],
+            [
                 $getUniqueColumns_sql,
                 'Column_name',
                 'Column_name',
                 DatabaseInterface::CONNECT_USER,
                 0,
-                array(
+                [
                     'column1',
                     'column3',
                     'column5',
                     'ACCESSIBLE',
                     'ADD',
                     'ALL'
-                )
-            ),
-            array(
+                ]
+            ],
+            [
                 'SHOW COLUMNS FROM `PMA`.`PMA_BookMark`',
                 'Field',
                 'Field',
                 DatabaseInterface::CONNECT_USER,
                 0,
-                array(
+                [
                     'column1',
                     'column3',
                     'column5',
                     'ACCESSIBLE',
                     'ADD',
                     'ALL'
-                )
-            ),
-            array(
+                ]
+            ],
+            [
                 'SHOW COLUMNS FROM `PMA`.`PMA_BookMark`',
                 null,
                 null,
                 DatabaseInterface::CONNECT_USER,
                 0,
-                array(
-                    array(
+                [
+                    [
                         'Field'=>'COLUMN_NAME1',
                         'Type'=> 'INT(10)',
                         'Null'=> 'NO',
                         'Key'=> '',
                         'Default'=> NULL,
                         'Extra'=>''
-                    ),
-                    array(
+                    ],
+                    [
                         'Field'=>'COLUMN_NAME2',
                         'Type'=> 'INT(10)',
                         'Null'=> 'YES',
                         'Key'=> '',
                         'Default'=> NULL,
                         'Extra'=>'STORED GENERATED'
-                    )
-                )
-            ),
-        );
+                    ]
+                ]
+            ],
+        ];
 
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
             ->disableOriginalConstructor()
@@ -230,14 +230,14 @@ class TableTest extends PmaTestCase
                 )
             );
 
-        $dbi->_table_cache["PMA"]["PMA_BookMark"] = array(
+        $dbi->_table_cache["PMA"]["PMA_BookMark"] = [
             'ENGINE' => true,
             'Create_time' => true,
             'TABLE_TYPE' => true,
             'Comment' => true,
-        );
+        ];
 
-        $databases = array();
+        $databases = [];
         $database_name = 'PMA';
         $databases[$database_name]['SCHEMA_TABLES'] = 1;
         $databases[$database_name]['SCHEMA_TABLE_ROWS'] = 3;
@@ -258,11 +258,11 @@ class TableTest extends PmaTestCase
         $dbi->expects($this->any())->method('tryQuery')
             ->will($this->returnValue(10));
 
-        $triggers = array(
-            array("name" => "name1", "create"=>"crate1"),
-            array("name" => "name2", "create"=>"crate2"),
-            array("name" => "name3", "create"=>"crate3"),
-        );
+        $triggers = [
+            ["name" => "name1", "create"=>"crate1"],
+            ["name" => "name2", "create"=>"crate2"],
+            ["name" => "name3", "create"=>"crate3"],
+        ];
 
         $dbi->expects($this->any())->method('getTriggers')
             ->will($this->returnValue($triggers));
@@ -282,7 +282,7 @@ class TableTest extends PmaTestCase
         $dbi->expects($this->any())->method('fetchAssoc')
             ->will($this->returnValue(false));
 
-        $value = array("Auto_increment" => "Auto_increment");
+        $value = ["Auto_increment" => "Auto_increment"];
         $dbi->expects($this->any())->method('fetchSingleRow')
             ->will($this->returnValue($value));
 
@@ -410,18 +410,18 @@ class TableTest extends PmaTestCase
      */
     public function dataValidateName()
     {
-        return array(
-            array('test', true),
-            array('te/st', false),
-            array('te.st', false),
-            array('te\\st', false),
-            array('te st', false),
-            array('  te st', true, true),
-            array('test ', false),
-            array('te.st', false),
-            array('test ', false, true),
-            array('te.st ', false, true),
-        );
+        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],
+        ];
     }
 
     /**
@@ -592,9 +592,9 @@ class TableTest extends PmaTestCase
     {
         $work = "PMA_work";
         $pma_table = "pma_table";
-        $get_fields =  array("filed0", "field6");
-        $where_fields = array("field2", "filed5");
-        $new_fields = array("field3", "filed4");
+        $get_fields =  ["filed0", "field6"];
+        $where_fields = ["field2", "filed5"];
+        $new_fields = ["field3", "filed4"];
         $GLOBALS['cfgRelation'][$work] = true;
         $GLOBALS['cfgRelation']['db'] = "PMA_db";
         $GLOBALS['cfgRelation'][$pma_table] = "pma_table";
@@ -649,7 +649,7 @@ class TableTest extends PmaTestCase
 
         $GLOBALS['dbi']->expects($this->any())
             ->method('getCachedTableContent')
-            ->will($this->returnValue(array('table_name' => "PMA_BookMark")));
+            ->will($this->returnValue(['table_name' => "PMA_BookMark"]));
         $tableObj = new Table('PMA_BookMark', 'PMA');
         $this->assertEquals(
             false,
@@ -664,10 +664,10 @@ class TableTest extends PmaTestCase
      */
     public function testIsMergeCase2()
     {
-        $map = array(
-            array(array('PMA', 'PMA_BookMark'), null, array('ENGINE' => "MERGE")),
-            array(array('PMA', 'PMA_BookMark', 'ENGINE'), null, "MERGE")
-        );
+        $map = [
+            [['PMA', 'PMA_BookMark'], null, ['ENGINE' => "MERGE"]],
+            [['PMA', 'PMA_BookMark', 'ENGINE'], null, "MERGE"]
+        ];
         $GLOBALS['dbi']->expects($this->any())
             ->method('getCachedTableContent')
             ->will($this->returnValueMap($map));
@@ -686,10 +686,10 @@ class TableTest extends PmaTestCase
      */
     public function testIsMergeCase3()
     {
-        $map = array(
-            array(array('PMA', 'PMA_BookMark'), null, array('ENGINE' => "MRG_MYISAM")),
-            array(array('PMA', 'PMA_BookMark', 'ENGINE'), null, "MRG_MYISAM")
-        );
+        $map = [
+            [['PMA', 'PMA_BookMark'], null, ['ENGINE' => "MRG_MYISAM"]],
+            [['PMA', 'PMA_BookMark', 'ENGINE'], null, "MRG_MYISAM"]
+        ];
         $GLOBALS['dbi']->expects($this->any())
             ->method('getCachedTableContent')
             ->will($this->returnValueMap($map));
@@ -708,10 +708,10 @@ class TableTest extends PmaTestCase
      */
     public function testIsMergeCase4()
     {
-        $map = array(
-            array(array('PMA', 'PMA_BookMark'), null, array('ENGINE' => "ISDB")),
-            array(array('PMA', 'PMA_BookMark', 'ENGINE'), null, "ISDB")
-        );
+        $map = [
+            [['PMA', 'PMA_BookMark'], null, ['ENGINE' => "ISDB"]],
+            [['PMA', 'PMA_BookMark', 'ENGINE'], null, "ISDB"]
+        ];
         $GLOBALS['dbi']->expects($this->any())
             ->method('getCachedTableContent')
             ->will($this->returnValueMap($map));
@@ -838,11 +838,11 @@ class TableTest extends PmaTestCase
 
         $table = new Table($table, $db);
         $return = $table->getUniqueColumns();
-        $expect = array(
+        $expect = [
             '`PMA`.`PMA_BookMark`.`index1`',
             '`PMA`.`PMA_BookMark`.`index3`',
             '`PMA`.`PMA_BookMark`.`index5`'
-        );
+        ];
         $this->assertEquals(
             $expect,
             $return
@@ -861,14 +861,14 @@ class TableTest extends PmaTestCase
 
         $table = new Table($table, $db);
         $return = $table->getIndexedColumns();
-        $expect = array(
+        $expect = [
             '`PMA`.`PMA_BookMark`.`column1`',
             '`PMA`.`PMA_BookMark`.`column3`',
             '`PMA`.`PMA_BookMark`.`column5`',
             '`PMA`.`PMA_BookMark`.`ACCESSIBLE`',
             '`PMA`.`PMA_BookMark`.`ADD`',
             '`PMA`.`PMA_BookMark`.`ALL`',
-        );
+        ];
         $this->assertEquals(
             $expect,
             $return
@@ -915,10 +915,10 @@ class TableTest extends PmaTestCase
     public function testGetSQLToCreateForeignKey()
     {
         $table = "PMA_table";
-        $field = array("PMA_field1", "PMA_field2");
+        $field = ["PMA_field1", "PMA_field2"];
         $foreignDb = "foreignDb";
         $foreignTable = "foreignTable";
-        $foreignField = array("foreignField1", "foreignField2");
+        $foreignField = ["foreignField1", "foreignField2"];
 
         $class = new ReflectionClass(Table::class);
         $method = $class->getMethod('_getSQLToCreateForeignKey');
@@ -926,13 +926,13 @@ class TableTest extends PmaTestCase
         $tableObj = new Table('PMA_table', 'db');
 
         $sql = $method->invokeArgs(
-            $tableObj, array(
+            $tableObj, [
                 $table,
                 $field,
                 $foreignDb,
                 $foreignTable,
                 $foreignField
-            )
+            ]
         );
         $sql_excepted = 'ALTER TABLE `PMA_table` ADD  '
             . 'FOREIGN KEY (`PMA_field1`, `PMA_field2`) REFERENCES '
@@ -944,13 +944,13 @@ class TableTest extends PmaTestCase
 
         // Exclude db name when relations are made between table in the same db
         $sql = $method->invokeArgs(
-            $tableObj, array(
+            $tableObj, [
                 $table,
                 $field,
                 'db',
                 $foreignTable,
                 $foreignField
-            )
+            ]
         );
         $sql_excepted = 'ALTER TABLE `PMA_table` ADD  '
             . 'FOREIGN KEY (`PMA_field1`, `PMA_field2`) REFERENCES '
@@ -997,25 +997,25 @@ class TableTest extends PmaTestCase
 
         $table = new Table($table, $db);
         $return = $table->getColumns();
-        $expect = array(
+        $expect = [
             '`PMA`.`PMA_BookMark`.`column1`',
             '`PMA`.`PMA_BookMark`.`column3`',
             '`PMA`.`PMA_BookMark`.`column5`',
             '`PMA`.`PMA_BookMark`.`ACCESSIBLE`',
             '`PMA`.`PMA_BookMark`.`ADD`',
             '`PMA`.`PMA_BookMark`.`ALL`',
-        );
+        ];
         $this->assertEquals(
             $expect,
             $return
         );
 
         $return = $table->getReservedColumnNames();
-        $expect = array(
+        $expect = [
             'ACCESSIBLE',
             'ADD',
             'ALL',
-        );
+        ];
         $this->assertEquals(
             $expect,
             $return
@@ -1046,13 +1046,13 @@ class TableTest extends PmaTestCase
         $dbi->expects($this->any())
             ->method('fetchResult')
             ->willReturnOnConsecutiveCalls(
-                array(array('`one_pk`')),
+                [['`one_pk`']],
 
-                array(), // No Uniques found
-                array('`one_ind`', '`sec_ind`'),
+                [], // No Uniques found
+                ['`one_ind`', '`sec_ind`'],
 
-                array(), // No Uniques found
-                array()  // No Indexed found
+                [], // No Uniques found
+                []  // No Indexed found
             );
 
         $GLOBALS['dbi'] = $dbi;
@@ -1095,14 +1095,14 @@ class TableTest extends PmaTestCase
      */
     public function testCountRecords()
     {
-        $map = array(
-            array(
-                array('PMA', 'PMA_BookMark'),
+        $map = [
+            [
+                ['PMA', 'PMA_BookMark'],
                 null,
-                array('Comment' => "Comment222", 'TABLE_TYPE' => "VIEW"),
-            ),
-            array(array('PMA', 'PMA_BookMark', 'TABLE_TYPE'), null, 'VIEW'),
-        );
+                ['Comment' => "Comment222", 'TABLE_TYPE' => "VIEW"],
+            ],
+            [['PMA', 'PMA_BookMark', 'TABLE_TYPE'], null, 'VIEW'],
+        ];
         $GLOBALS['dbi']->expects($this->any())
             ->method('getCachedTableContent')
             ->will($this->returnValueMap($map));
@@ -1354,7 +1354,7 @@ class TableTest extends PmaTestCase
         $tbl_object->getStatusInfo(null, true);
         $extension = new DbiDummy();
         $dbi = new DatabaseInterface($extension);
-        $expect = array('pack_keys' => 'DEFAULT');
+        $expect = ['pack_keys' => 'DEFAULT'];
         $create_options = $dbi->getTable(
             $target_db,
             $target_table
diff --git a/test/classes/TemplateTest.php b/test/classes/TemplateTest.php
index 3543eb211e..f63402ff78 100644
--- a/test/classes/TemplateTest.php
+++ b/test/classes/TemplateTest.php
@@ -33,10 +33,10 @@ class TemplateTest extends PmaTestCase
     {
         $template = Template::get($data);
         $result = $template->render(
-            array(
+            [
                 'variable1' => 'value1',
                 'variable2' => 'value2',
-            )
+            ]
         );
         $this->assertContains('value1', $result);
         $this->assertContains('value2', $result);
diff --git a/test/classes/ThemeTest.php b/test/classes/ThemeTest.php
index f0019f248f..18a9413460 100644
--- a/test/classes/ThemeTest.php
+++ b/test/classes/ThemeTest.php
@@ -159,10 +159,10 @@ class ThemeTest extends PmaTestCase
      */
     public function listThemes()
     {
-        return array(
-            array('./themes/original'),
-            array('./themes/pmahomme/'),
-        );
+        return [
+            ['./themes/original'],
+            ['./themes/pmahomme/'],
+        ];
     }
 
     /**
@@ -351,27 +351,27 @@ class ThemeTest extends PmaTestCase
      */
     public function providerForGetImgPath()
     {
-        return array(
-            array(
+        return [
+            [
                 null,
                 null,
                 ''
-            ),
-            array(
+            ],
+            [
                 'screen.png',
                 null,
                 './themes/pmahomme/img/screen.png'
-            ),
-            array(
+            ],
+            [
                 'arrow_ltr.png',
                 null,
                 './themes/pmahomme/img/arrow_ltr.png'
-            ),
-            array(
+            ],
+            [
                 'logo_right.png',
                 'pma_logo.png',
                 './themes/pmahomme/img/pma_logo.png'
-            ),
-        );
+            ],
+        ];
     }
 }
diff --git a/test/classes/TrackerTest.php b/test/classes/TrackerTest.php
index 30a7064a1f..dd12fe7128 100644
--- a/test/classes/TrackerTest.php
+++ b/test/classes/TrackerTest.php
@@ -42,11 +42,11 @@ class TrackerTest extends PmaTestCase
         $GLOBALS['cfg']['Server']['tracking_version_auto_create'] = '';
         $GLOBALS['cfg']['Server']['DisableIS'] = false;
 
-        $_SESSION['relation'][$GLOBALS['server']] = array(
+        $_SESSION['relation'][$GLOBALS['server']] = [
             'PMA_VERSION' => PMA_VERSION,
             'db' => 'pmadb',
             'tracking' => 'tracking'
-        );
+        ];
 
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
             ->disableOriginalConstructor()
@@ -88,21 +88,21 @@ class TrackerTest extends PmaTestCase
 
         Tracker::enable();
 
-        $_SESSION['relation'][$GLOBALS['server']] = array(
+        $_SESSION['relation'][$GLOBALS['server']] = [
             'PMA_VERSION' => PMA_VERSION,
             'trackingwork' => false
-        );
+        ];
 
         $this->assertFalse(
             Tracker::isActive()
         );
 
-        $_SESSION['relation'][$GLOBALS['server']] = array(
+        $_SESSION['relation'][$GLOBALS['server']] = [
             'PMA_VERSION' => PMA_VERSION,
             'trackingwork' => true,
             'db' => 'pmadb',
             'tracking' => 'tracking'
-        );
+        ];
 
         $this->assertTrue(
             Tracker::isActive()
@@ -127,7 +127,7 @@ class TrackerTest extends PmaTestCase
 
         $this->assertEquals(
             $expected,
-            $method->invokeArgs(null, array($string))
+            $method->invokeArgs(null, [$string])
         );
     }
 
@@ -139,11 +139,11 @@ class TrackerTest extends PmaTestCase
      */
     public function getTableNameData()
     {
-        return array(
-            array("`tbl`;", "tbl"),
-            array(" `pma.table` ", "table"),
-            array(" `pma.table\nfoobar` ", "table")
-        );
+        return [
+            ["`tbl`;", "tbl"],
+            [" `pma.table` ", "table"],
+            [" `pma.table\nfoobar` ", "table"]
+        ];
     }
 
     /**
@@ -221,46 +221,46 @@ class TrackerTest extends PmaTestCase
          * to passing $this->anything()
          */
 
-        $getColumnsResult = array(
-            array(
+        $getColumnsResult = [
+            [
                 'Field' => 'field1',
                 'Type' => 'int(11)',
                 'Key' => 'PRI'
-            ),
-            array(
+            ],
+            [
                 'Field' => 'field2',
                 'Type' => 'text',
                 'Key' => ''
-            )
-        );
+            ]
+        ];
         $dbi->expects($this->once())->method('getColumns')
             ->with('pma_test', 'pma_tbl')
             ->will($this->returnValue($getColumnsResult));
 
-        $getIndexesResult = array(
-            array(
+        $getIndexesResult = [
+            [
                 'Table' => 'pma_tbl',
                 'Field' => 'field1',
                 'Key' => 'PRIMARY'
-            )
-        );
+            ]
+        ];
         $dbi->expects($this->once())->method('getTableIndexes')
             ->with('pma_test', 'pma_tbl')
             ->will($this->returnValue($getIndexesResult));
 
-        $tableStatusArray = array(
-            array(
+        $tableStatusArray = [
+            [
                 'Name' => 'pma_tbl',
                 'Rows' => '1',
                 'Create_time' => '2013-02-22 02:04:04',
                 'Update_time' => '2013-02-22 21:46:48'
-            )
-        );
+            ]
+        ];
         $dbi->expects($this->exactly(2))
             ->method('tryQuery')
             ->withConsecutive(
-                array("SHOW TABLE STATUS FROM `pma_test` WHERE Name = 'pma_tbl'"),
-                array('SHOW CREATE TABLE `pma_test`.`pma_tbl`')
+                ["SHOW TABLE STATUS FROM `pma_test` WHERE Name = 'pma_tbl'"],
+                ['SHOW CREATE TABLE `pma_test`.`pma_tbl`']
             )
             ->willReturnOnConsecutiveCalls(
                 'res',
@@ -294,15 +294,15 @@ class TrackerTest extends PmaTestCase
         "\n',
         '11' )";
 
-        $queryResults = array(
-            array(
+        $queryResults = [
+            [
                 $expectedMainQuery,
                 DatabaseInterface::CONNECT_CONTROL,
                 0,
                 false,
                 'executed'
-            )
-        );
+            ]
+        ];
 
         $dbi->expects($this->any())->method('query')
             ->will($this->returnValueMap($queryResults));
@@ -310,7 +310,7 @@ class TrackerTest extends PmaTestCase
         $dbi->expects($this->any())->method('escapeString')
             ->will($this->returnArgument(0));
         $dbi->expects($this->any())->method('getCompatibilities')
-            ->will($this->returnValue(array()));
+            ->will($this->returnValue([]));
 
         $GLOBALS['dbi'] = $dbi;
         $this->assertEquals(
@@ -482,16 +482,16 @@ class TrackerTest extends PmaTestCase
 
         $date  = Util::date('Y-m-d H:i:s');
 
-        $new_data = array(
-            array(
+        $new_data = [
+            [
                 'username' => 'user1',
                 'statement' => 'test_statement1'
-            ),
-            array(
+            ],
+            [
                 'username' => 'user2',
                 'statement' => 'test_statement2'
-            )
-        );
+            ]
+        ];
 
         $sql_query_2 = " UPDATE `pmadb`.`tracking`" .
         " SET `data_sql` = '# log $date user1test_statement1\n" .
@@ -503,10 +503,10 @@ class TrackerTest extends PmaTestCase
         $dbi->method('query')
             ->will(
                 $this->returnValueMap(
-                    array(
-                        array($sql_query_1, DatabaseInterface::CONNECT_CONTROL, 0, false, "executed_1"),
-                        array($sql_query_2, DatabaseInterface::CONNECT_CONTROL, 0, false, "executed_2")
-                    )
+                    [
+                        [$sql_query_1, DatabaseInterface::CONNECT_CONTROL, 0, false, "executed_1"],
+                        [$sql_query_2, DatabaseInterface::CONNECT_CONTROL, 0, false, "executed_2"]
+                    ]
                 )
             );
 
@@ -589,11 +589,11 @@ class TrackerTest extends PmaTestCase
             ->method('escapeString')
             ->will(
                 $this->returnValueMap(
-                    array(
-                        array("pma'db", "pma\'db"),
-                        array("pma'table", "pma\'table"),
-                        array("1.0", "1.0"),
-                    )
+                    [
+                        ["pma'db", "pma\'db"],
+                        ["pma'table", "pma\'table"],
+                        ["1.0", "1.0"],
+                    ]
                 )
             );
 
@@ -613,81 +613,81 @@ class TrackerTest extends PmaTestCase
      */
     public function getTrackedDataProvider()
     {
-        $fetchArrayReturn = array(
-            array(
+        $fetchArrayReturn = [
+            [
                 "schema_sql" => "# log 20-03-2013 23:33:58 user1\nstat1" .
                 "# log 20-03-2013 23:39:58 user2\n",
                 "data_sql" => "# log ",
                 "schema_snapshot" => "dataschema",
                 "tracking" => "SELECT, DELETE"
-            )
-        );
+            ]
+        ];
 
-        $data = array(
-            array(
+        $data = [
+            [
                 'date_from' => '20-03-2013 23:33:58',
                 'date_to' => '20-03-2013 23:39:58',
-                'ddlog' => array(
-                                array(
+                'ddlog' => [
+                                [
                                     'date' => '20-03-2013 23:33:58',
                                     'username' => 'user1',
                                     'statement' => "\nstat1"
-                                ),
-                                array(
+                                ],
+                                [
                                     'date' => '20-03-2013 23:39:58',
                                     'username' => 'user2',
                                     'statement' => ""
-                                )
-                            ),
-                'dmlog' => array(),
+                                ]
+                            ],
+                'dmlog' => [],
                 "schema_snapshot" => "dataschema",
                 "tracking" => "SELECT, DELETE"
-            )
-        );
+            ]
+        ];
 
-        $fetchArrayReturn[1] = array(
+        $fetchArrayReturn[1] = [
             "schema_sql" => "# log 20-03-2012 23:33:58 user1\n" .
             "# log 20-03-2012 23:39:58 user2\n",
             "data_sql" => "# log 20-03-2013 23:33:58 user3\n" .
             "# log 20-03-2013 23:39:58 user4\n",
             "schema_snapshot" => "dataschema",
             "tracking" => "SELECT, DELETE"
-        );
+        ];
 
-        $data[1] = array(
+        $data[1] = [
             'date_from' => '20-03-2012 23:33:58',
             'date_to' => '20-03-2013 23:39:58',
-            'ddlog' => array(
-                            array(
+            'ddlog' => [
+                            [
                                 'date' => '20-03-2012 23:33:58',
                                 'username' => 'user1',
                                 'statement' => ""
-                            ),
-                            array(
+                            ],
+                            [
                                 'date' => '20-03-2012 23:39:58',
                                 'username' => 'user2',
                                 'statement' => ""
-                            )
-                        ),
-            'dmlog' => array(
-                            array(
+                            ]
+                        ],
+            'dmlog' => [
+                            [
                                 'date' => '20-03-2013 23:33:58',
                                 'username' => 'user3',
                                 'statement' => ""
-                            ),
-                            array(
+                            ],
+                            [
                                 'date' => '20-03-2013 23:39:58',
                                 'username' => 'user4',
                                 'statement' => ""
-                            )
-                        ),
+                            ]
+                        ],
             "schema_snapshot" => "dataschema",
             "tracking" => "SELECT, DELETE"
-        );
-        return array(
-            array($fetchArrayReturn[0], $data[0]),
-            array($fetchArrayReturn[1], $data[1])
-        );
+        ];
+        return [
+            [$fetchArrayReturn[0], $data[0]],
+            [$fetchArrayReturn[1], $data[1]]
+        ];
     }
 
     /**
@@ -747,7 +747,7 @@ class TrackerTest extends PmaTestCase
      */
     public function parseQueryData()
     {
-        $query = array();
+        $query = [];
         /** TODO: Should test fail when USE is in conjunction with * identifiers?
         $query[] = array(
             " - USE db1;\n- CREATE VIEW db1.v AS SELECT * FROM t;",
@@ -757,130 +757,130 @@ class TrackerTest extends PmaTestCase
             "db1"
         );
         */
-        $query[] = array(
+        $query[] = [
             "CREATE VIEW v AS SELECT * FROM t;",
             "DDL",
             "CREATE VIEW",
             "v",
-        );
-        $query[] = array(
+        ];
+        $query[] = [
             "ALTER VIEW db1.v AS SELECT col1, col2, col3, col4 FROM t",
             "DDL",
             "ALTER VIEW",
             "v"
-        );
-        $query[] = array(
+        ];
+        $query[] = [
             "DROP VIEW db1.v;",
             "DDL",
             "DROP VIEW",
             "v"
-        );
-        $query[] = array(
+        ];
+        $query[] = [
             "DROP VIEW IF EXISTS db1.v;",
             "DDL",
             "DROP VIEW",
             "v"
-        );
-        $query[] = array(
+        ];
+        $query[] = [
             "CREATE DATABASE db1;",
             "DDL",
             "CREATE DATABASE",
             "",
             "db1"
-        );
-        $query[] = array(
+        ];
+        $query[] = [
             "ALTER DATABASE db1;",
             "DDL",
             "ALTER DATABASE",
             ""
-        );
-        $query[] = array(
+        ];
+        $query[] = [
             "DROP DATABASE db1;",
             "DDL",
             "DROP DATABASE",
             "",
             "db1"
-        );
-        $query[] = array(
+        ];
+        $query[] = [
             "CREATE TABLE db1.t1 (c1 INT);",
             "DDL",
             "CREATE TABLE",
             "t1"
-        );
-        $query[] =  array(
+        ];
+        $query[] =  [
             "ALTER TABLE db1.t1 ADD c2 TEXT;",
             "DDL",
             "ALTER TABLE",
             "t1"
-        );
-        $query[] =  array(
+        ];
+        $query[] =  [
             "DROP TABLE db1.t1",
             "DDL",
             "DROP TABLE",
             "t1"
-        );
-        $query[] =  array(
+        ];
+        $query[] =  [
             "DROP TABLE IF EXISTS db1.t1",
             "DDL",
             "DROP TABLE",
             "t1"
-        );
-        $query[] =  array(
+        ];
+        $query[] =  [
             "CREATE INDEX ind ON db1.t1 (c2(10));",
             "DDL",
             "CREATE INDEX",
             "t1"
-        );
-        $query[] =  array(
+        ];
+        $query[] =  [
             "CREATE UNIQUE INDEX ind ON db1.t1 (c2(10));",
             "DDL",
             "CREATE INDEX",
             "t1"
-        );
-        $query[] =  array(
+        ];
+        $query[] =  [
             "CREATE SPATIAL INDEX ind ON db1.t1 (c2(10));",
             "DDL",
             "CREATE INDEX",
             "t1"
-        );
-        $query[] =  array(
+        ];
+        $query[] =  [
             "DROP INDEX ind ON db1.t1;",
             "DDL",
             "DROP INDEX",
             "t1"
-        );
-        $query[] =  array(
+        ];
+        $query[] =  [
             "RENAME TABLE db1.t1 TO db1.t2",
             "DDL",
             "RENAME TABLE",
             "t1",
             "",
             "t2"
-        );
-        $query[] =  array(
+        ];
+        $query[] =  [
             "UPDATE db1.t1 SET a = 2",
             "DML",
             "UPDATE",
             "t1"
-        );
-        $query[] =  array(
+        ];
+        $query[] =  [
             "INSERT INTO db1.t1 (a, b, c) VALUES(1, 2, 3)",
             "DML",
             "INSERT",
             "t1"
-        );
-        $query[] =  array(
+        ];
+        $query[] =  [
             "DELETE FROM db1.t1",
             "DML",
             "DELETE",
             "t1"
-        );
-        $query[] =  array(
+        ];
+        $query[] =  [
             "TRUNCATE db1.t1",
             "DML",
             "TRUNCATE",
             "t1"
-        );
+        ];
 
         return $query;
     }
diff --git a/test/classes/TrackingTest.php b/test/classes/TrackingTest.php
index 4741318bd7..00716a8d0b 100644
--- a/test/classes/TrackingTest.php
+++ b/test/classes/TrackingTest.php
@@ -49,12 +49,12 @@ class TrackingTest extends TestCase
 
         $this->tracking = new Tracking();
 
-        $_SESSION['relation'][$GLOBALS['server']] = array(
+        $_SESSION['relation'][$GLOBALS['server']] = [
             'PMA_VERSION' => PMA_VERSION,
             'db' => 'pmadb',
             'tracking' => 'tracking',
             'trackingwork' => true
-        );
+        ];
 
         $GLOBALS['cfg']['Server']['tracking_default_statements'] = 'DELETE';
 
@@ -62,7 +62,7 @@ class TrackingTest extends TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $fetchArray = array('version' => "10");
+        $fetchArray = ['version' => "10"];
         $dbi->expects($this->any())
             ->method('fetchArray')
             ->will($this->returnValue($fetchArray));
@@ -84,21 +84,21 @@ class TrackingTest extends TestCase
      */
     public function testFilter()
     {
-        $data = array(
-            array(
+        $data = [
+            [
                 "date" => "20120102",
                 "username"=> "username1",
                 "statement"=>"statement1"
-            ),
-            array(
+            ],
+            [
                 "date" => "20130102",
                 "username"=> "username2",
                 "statement"=>"statement2"
-            ),
-        );
+            ],
+        ];
         $filter_ts_from = 0;
         $filter_ts_to = 999999999999;
-        $filter_users = array("username1");
+        $filter_users = ["username1"];
 
         $ret = $this->tracking->filter(
             $data, $filter_ts_from, $filter_ts_to, $filter_users
@@ -122,23 +122,23 @@ class TrackingTest extends TestCase
      */
     public function testExtractTableNames()
     {
-        $table_list = array(
-            "hello_"=>array(
+        $table_list = [
+            "hello_"=>[
                 "is_group"=>1,
-                "lovely_"=>array(
+                "lovely_"=>[
                     "is_group"=>1,
-                    "hello_lovely_world"=>array(
+                    "hello_lovely_world"=>[
                         "Name"=>"hello_lovely_world"
-                    ),
-                    "hello_lovely_world2"=>array(
+                    ],
+                    "hello_lovely_world2"=>[
                         "Name"=>"hello_lovely_world2"
-                    )
-                ),
-                "hello_world"=>array(
+                    ]
+                ],
+                "hello_world"=>[
                     "Name"=>"hello_world"
-                )
-            )
-        );
+                ]
+            ]
+        ];
         $untracked_tables = $this->tracking->extractTableNames($table_list, 'db', true);
         $this->assertContains(
             "hello_world",
@@ -165,7 +165,7 @@ class TrackingTest extends TestCase
         $url_query = "url_query";
         $last_version = 10;
         $html = $this->tracking->getHtmlForDataDefinitionAndManipulationStatements(
-            $url_query, $last_version, $GLOBALS['db'], array($GLOBALS['table'])
+            $url_query, $last_version, $GLOBALS['db'], [$GLOBALS['table']]
         );
 
         $this->assertContains(
@@ -314,8 +314,8 @@ class TrackingTest extends TestCase
      */
     public function testGetHtmlForColumns()
     {
-        $columns = array(
-            array(
+        $columns = [
+            [
                 'Field'=>'Field1',
                 'Type'=>'Type1',
                 'Collation'=>'Collation1',
@@ -323,8 +323,8 @@ class TrackingTest extends TestCase
                 'Extra'=>'Extra1',
                 'Key'=>'PRI',
                 'Comment'=>'Comment1'
-            ),
-            array(
+            ],
+            [
                 'Field'=>'Field2',
                 'Type'=>'Type2',
                 'Collation'=>'Collation2',
@@ -332,8 +332,8 @@ class TrackingTest extends TestCase
                 'Extra'=>'Extra2',
                 'Key'=>'Key2',
                 'Comment'=>'Comment2'
-            ),
-        );
+            ],
+        ];
 
         $html = $this->tracking->getHtmlForColumns($columns);
 
@@ -431,7 +431,7 @@ class TrackingTest extends TestCase
     {
         $sql_result = true;
         $last_version = "10";
-        $url_params = array();
+        $url_params = [];
         $url_query = "select * from PMA";
         $pmaThemeImage = "themePath/img";
         $text_dir = "ltr";
@@ -441,14 +441,14 @@ class TrackingTest extends TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $fetchArray = array(
+        $fetchArray = [
                 'tracking_active' => 1,
                 'version' => "10",
                 'db_name' => 'db_name',
                 'table_name' => 'table_name',
                 'date_created' => 'date_created',
                 'date_updated' => 'date_updated'
-        );
+        ];
         $dbi->expects($this->at(0))
             ->method('fetchArray')
             ->will($this->returnValue($fetchArray));
@@ -539,14 +539,14 @@ class TrackingTest extends TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $fetchArray = array(
+        $fetchArray = [
                 'tracking_active' => 1,
                 'version' => "10",
                 'db_name' => 'db_name',
                 'table_name' => 'table_name',
                 'date_created' => 'date_created',
                 'date_updated' => 'date_updated'
-        );
+        ];
         $dbi->expects($this->at(0))
             ->method('fetchArray')
             ->will($this->returnValue($fetchArray));
@@ -590,18 +590,18 @@ class TrackingTest extends TestCase
         $_REQUEST['users'] = "users";
         $_REQUEST['logtype'] = 'logtype';
         $url_query = "select * from PMA";
-        $data = array(
+        $data = [
             'tracking'=>'tracking',
-            'ddlog' => array('ddlog'),
-            'dmlog' => array('dmlog')
-        );
-        $url_params = array();
-        $selection_schema = array();
-        $selection_data = array();
-        $selection_both = array();
-        $filter_ts_to = array();
-        $filter_ts_from = array();
-        $filter_users = array();
+            'ddlog' => ['ddlog'],
+            'dmlog' => ['dmlog']
+        ];
+        $url_params = [];
+        $selection_schema = [];
+        $selection_data = [];
+        $selection_both = [];
+        $filter_ts_to = [];
+        $filter_ts_from = [];
+        $filter_users = [];
 
         $html = $this->tracking->getHtmlForTrackingReport(
             $url_query, $data, $url_params,
@@ -632,9 +632,9 @@ class TrackingTest extends TestCase
 
         $version = '<form method="post" action="tbl_tracking.php'
             . Url::getCommon(
-                $url_params + array(
+                $url_params + [
                     'report' => 'true', 'version' => $_REQUEST['version']
-                )
+                ]
             );
 
         $this->assertContains(
@@ -687,23 +687,23 @@ class TrackingTest extends TestCase
     public function testGetHtmlForDataManipulationStatements()
     {
         $_REQUEST['version'] = "10";
-        $data = array(
+        $data = [
             'tracking'=>'tracking',
-            'dmlog' => array(
-                array(
+            'dmlog' => [
+                [
                     'statement' => 'statement',
                     'date' => 'date',
                     'username' => 'username',
-                )
-            ),
-            'ddlog' => array('ddlog')
-        );
-        $url_params = array();
+                ]
+            ],
+            'ddlog' => ['ddlog']
+        ];
+        $url_params = [];
         $ddlog_count = 10;
         $drop_image_or_text = "text";
         $filter_ts_to = 9999999999;
         $filter_ts_from = 0;
-        $filter_users = array("*");
+        $filter_users = ["*"];
 
         $html = $this->tracking->getHtmlForDataManipulationStatements(
             $data, $filter_users,
@@ -747,21 +747,21 @@ class TrackingTest extends TestCase
     {
         $_REQUEST['version'] = "10";
 
-        $data = array(
+        $data = [
             'tracking'=>'tracking',
-            'ddlog' => array(
-                array(
+            'ddlog' => [
+                [
                     'statement' => 'statement',
                     'date' => 'date',
                     'username' => 'username',
-                )
-            ),
-            'dmlog' => array('dmlog')
-        );
-        $filter_users = array("*");
+                ]
+            ],
+            'dmlog' => ['dmlog']
+        ];
+        $filter_users = ["*"];
         $filter_ts_to = 9999999999;
         $filter_ts_from = 0;
-        $url_params = array();
+        $url_params = [];
         $drop_image_or_text = "text";
 
         list($html, $count) = $this->tracking->getHtmlForDataDefinitionStatements(
@@ -810,8 +810,8 @@ class TrackingTest extends TestCase
      */
     public function testGetHtmlForIndexes()
     {
-        $indexs = array(
-            array(
+        $indexs = [
+            [
                 'Non_unique' => 0,
                 'Packed' => '',
                 'Key_name' => 'Key_name1',
@@ -821,8 +821,8 @@ class TrackingTest extends TestCase
                 'Collation' => 'Collation',
                 'Null' => 'Null',
                 'Comment' => 'Comment',
-            ),
-        );
+            ],
+        ];
 
         $html = $this->tracking->getHtmlForIndexes($indexs);
 
@@ -931,24 +931,24 @@ class TrackingTest extends TestCase
     public function testGetEntries()
     {
         $_REQUEST['logtype'] = 'schema';
-        $data = array(
+        $data = [
             'tracking'=>'tracking',
-            'ddlog' => array(
-                array(
+            'ddlog' => [
+                [
                     'statement' => 'statement1',
                     'date' => 'date2',
                     'username' => 'username3',
-                )
-            ),
-            'dmlog' =>  array(
-                array(
+                ]
+            ],
+            'dmlog' =>  [
+                [
                     'statement' => 'statement1',
                     'date' => 'date2',
                     'username' => 'username3',
-                )
-            ),
-        );
-        $filter_users = array("*");
+                ]
+            ],
+        ];
+        $filter_users = ["*"];
         $filter_ts_to = 9999999999;
         $filter_ts_from = 0;
 
diff --git a/test/classes/TransformationsTest.php b/test/classes/TransformationsTest.php
index d37f926a2b..14480e2467 100644
--- a/test/classes/TransformationsTest.php
+++ b/test/classes/TransformationsTest.php
@@ -34,10 +34,10 @@ class TransformationsTest extends TestCase
     {
         $GLOBALS['table'] = 'table';
         $GLOBALS['db'] = 'db';
-        $GLOBALS['cfg'] = array(
+        $GLOBALS['cfg'] = [
             'ServerDefault' => 1,
             'ActionLinksMode' => 'icons',
-        );
+        ];
         $GLOBALS['server'] = 1;
         $GLOBALS['cfg']['Server']['pmadb'] = 'pmadb';
         $GLOBALS['cfg']['Server']['user'] = 'user';
@@ -78,13 +78,13 @@ class TransformationsTest extends TestCase
      */
     public function getOptionsData()
     {
-        return array(
-            array("option1 , option2 ", array('option1 ', ' option2 ')),
-            array("'option1' ,' option2' ", array('option1', ' option2')),
-            array("'2,3' ,' ,, option ,,' ", array('2,3', ' ,, option ,,')),
-            array("'',,", array('', '', '')),
-            array('', array()),
-        );
+        return [
+            ["option1 , option2 ", ['option1 ', ' option2 ']],
+            ["'option1' ,' option2' ", ['option1', ' option2']],
+            ["'2,3' ,' ,, option ,,' ", ['2,3', ' ,, option ,,']],
+            ["'',,", ['', '', '']],
+            ['', []],
+        ];
     }
 
     /**
@@ -95,15 +95,15 @@ class TransformationsTest extends TestCase
     public function testGetTypes()
     {
         $this->assertEquals(
-            array (
-                'mimetype' => array (
+             [
+                'mimetype' =>  [
                     'Application/Octetstream' => 'Application/Octetstream',
                     'Image/JPEG' => 'Image/JPEG',
                     'Image/PNG' => 'Image/PNG',
                     'Text/Plain' => 'Text/Plain',
                     'Text/Octetstream' => 'Text/Octetstream'
-                ),
-                'transformation' => array (
+                ],
+                'transformation' =>  [
                     0 => 'Application/Octetstream: Download',
                     1 => 'Application/Octetstream: Hex',
                     2 => 'Image/JPEG: Inline',
@@ -123,8 +123,8 @@ class TransformationsTest extends TestCase
                     16 => 'Text/Plain: Longtoipv4',
                     17 => 'Text/Plain: PreApPend',
                     18 => 'Text/Plain: Substring',
-                    ),
-                'transformation_file' => array (
+                    ],
+                'transformation_file' =>  [
                     0 => 'Output/Application_Octetstream_Download.php',
                     1 => 'Output/Application_Octetstream_Hex.php',
                     2 => 'Output/Image_JPEG_Inline.php',
@@ -144,8 +144,8 @@ class TransformationsTest extends TestCase
                     16 => 'Text_Plain_Longtoipv4.php',
                     17 => 'Text_Plain_PreApPend.php',
                     18 => 'Text_Plain_Substring.php',
-                ),
-                'input_transformation' => array(
+                ],
+                'input_transformation' => [
                     'Image/JPEG: Upload',
                     'Text/Plain: FileUpload',
                     'Text/Plain: Iptobinary',
@@ -157,8 +157,8 @@ class TransformationsTest extends TestCase
                     'Text/Plain: Longtoipv4',
                     'Text/Plain: PreApPend',
                     'Text/Plain: Substring',
-                ),
-                'input_transformation_file' => array(
+                ],
+                'input_transformation_file' => [
                     'Input/Image_JPEG_Upload.php',
                     'Input/Text_Plain_FileUpload.php',
                     'Input/Text_Plain_Iptobinary.php',
@@ -170,8 +170,8 @@ class TransformationsTest extends TestCase
                     'Text_Plain_Longtoipv4.php',
                     'Text_Plain_PreApPend.php',
                     'Text_Plain_Substring.php',
-                ),
-            ),
+                ],
+            ],
             $this->transformations->getAvailableMimeTypes()
         );
     }
@@ -189,24 +189,24 @@ class TransformationsTest extends TestCase
         $_SESSION['relation'][$GLOBALS['server']]['column_info'] = "column_info";
         $_SESSION['relation'][$GLOBALS['server']]['trackingwork'] = false;
         $this->assertEquals(
-            array(
-                'o' => array(
+            [
+                'o' => [
                     'column_name' => 'o',
                     'mimetype' => 'Text/plain',
                     'transformation' => 'Sql',
                     'transformation_options' => '',
                     'input_transformation' => 'regex',
                     'input_transformation_options' => '/pma/i',
-                ),
-                'col' => array(
+                ],
+                'col' => [
                     'column_name' => 'col',
                     'mimetype' => 'T',
                     'transformation' => 'O/P',
                     'transformation_options' => '',
                     'input_transformation' => 'i/p',
                     'input_transformation_options' => '',
-                ),
-            ),
+                ],
+            ],
             $this->transformations->getMime('pma_test', 'table1')
         );
     }
@@ -281,27 +281,27 @@ class TransformationsTest extends TestCase
      */
     public function fixupData()
     {
-        return array(
-            array(
+        return [
+            [
                 'text_plain_bool2text.php',
                 'Text_Plain_Bool2Text.php'
-            ),
-            array(
+            ],
+            [
                 'application_octetstream_download.php',
                 'Application_Octetstream_Download.php'
-            ),
-            array(
+            ],
+            [
                 'text_plain_json.php',
                 'Text_Plain_Json.php'
-            ),
-            array(
+            ],
+            [
                 'image_jpeg_link.php',
                 'Image_JPEG_Link.php'
-            ),
-            array(
+            ],
+            [
                 'text_plain_dateformat.php',
                 'Text_Plain_Dateformat.php'
-            ),
-        );
+            ],
+        ];
     }
 }
diff --git a/test/classes/TypesTest.php b/test/classes/TypesTest.php
index 66ab31c571..13978900ed 100644
--- a/test/classes/TypesTest.php
+++ b/test/classes/TypesTest.php
@@ -53,12 +53,12 @@ class TypesTest extends PmaTestCase
     public function testGetUnaryOperators()
     {
         $this->assertEquals(
-            array(
+            [
                 'IS NULL',
                 'IS NOT NULL',
                 "= ''",
                 "!= ''",
-            ),
+            ],
             $this->object->getUnaryOperators()
         );
     }
@@ -71,10 +71,10 @@ class TypesTest extends PmaTestCase
     public function testGetNullOperators()
     {
         $this->assertEquals(
-            array(
+            [
                 'IS NULL',
                 'IS NOT NULL',
-            ),
+            ],
             $this->object->getNullOperators()
         );
     }
@@ -87,10 +87,10 @@ class TypesTest extends PmaTestCase
     public function testGetEnumOperators()
     {
         $this->assertEquals(
-            array(
+            [
                 '=',
                 '!=',
-            ),
+            ],
             $this->object->getEnumOperators()
         );
     }
@@ -103,7 +103,7 @@ class TypesTest extends PmaTestCase
     public function testgetTextOperators()
     {
         $this->assertEquals(
-            array(
+            [
                 'LIKE',
                 'LIKE %...%',
                 'NOT LIKE',
@@ -118,7 +118,7 @@ class TypesTest extends PmaTestCase
                 'NOT IN (...)',
                 'BETWEEN',
                 'NOT BETWEEN',
-            ),
+            ],
             $this->object->getTextOperators()
         );
     }
@@ -131,7 +131,7 @@ class TypesTest extends PmaTestCase
     public function testGetNumberOperators()
     {
         $this->assertEquals(
-            array(
+            [
                 '=',
                 '>',
                 '>=',
@@ -145,7 +145,7 @@ class TypesTest extends PmaTestCase
                 'NOT IN (...)',
                 'BETWEEN',
                 'NOT BETWEEN',
-            ),
+            ],
             $this->object->getNumberOperators()
         );
     }
@@ -176,19 +176,19 @@ class TypesTest extends PmaTestCase
      */
     public function providerForGetTypeOperators()
     {
-        return array(
-            array(
+        return [
+            [
                 'enum',
                 false,
-                array(
+                [
                     '=',
                     '!=',
-                )
-            ),
-            array(
+                ]
+            ],
+            [
                 'CHAR',
                 true,
-                array(
+                [
                     'LIKE',
                     'LIKE %...%',
                     'NOT LIKE',
@@ -205,17 +205,17 @@ class TypesTest extends PmaTestCase
                     'NOT BETWEEN',
                     'IS NULL',
                     'IS NOT NULL',
-                ),
-                array(
+                ],
+                [
                     'int',
                     false,
-                    array(
+                    [
                         '=',
                         '!=',
-                    )
-                ),
-            )
-        );
+                    ]
+                ],
+            ]
+        ];
     }
 
     /**
@@ -246,15 +246,15 @@ class TypesTest extends PmaTestCase
      */
     public function providerForTestGetTypeOperatorsHtml()
     {
-        return array(
-            array(
+        return [
+            [
                 'enum',
                 false,
                 '=',
                 '<option value="=" selected="selected">=</option>'
                 . '<option value="!=">!=</option>'
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -294,47 +294,47 @@ class TypesTest extends PmaTestCase
      */
     public function providerForTestGetTypeDescription()
     {
-        return array(
-            array('TINYINT'),
-            array('SMALLINT'),
-            array('MEDIUMINT'),
-            array('INT'),
-            array('BIGINT'),
-            array('DECIMAL'),
-            array('FLOAT'),
-            array('DOUBLE'),
-            array('REAL'),
-            array('BIT'),
-            array('BOOLEAN'),
-            array('SERIAL'),
-            array('DATE'),
-            array('DATETIME'),
-            array('TIMESTAMP'),
-            array('TIME'),
-            array('YEAR'),
-            array('CHAR'),
-            array('VARCHAR'),
-            array('TINYTEXT'),
-            array('TEXT'),
-            array('MEDIUMTEXT'),
-            array('LONGTEXT'),
-            array('BINARY'),
-            array('VARBINARY'),
-            array('TINYBLOB'),
-            array('MEDIUMBLOB'),
-            array('BLOB'),
-            array('LONGBLOB'),
-            array('ENUM'),
-            array('SET'),
-            array('GEOMETRY'),
-            array('POINT'),
-            array('LINESTRING'),
-            array('POLYGON'),
-            array('MULTIPOINT'),
-            array('MULTILINESTRING'),
-            array('MULTIPOLYGON'),
-            array('GEOMETRYCOLLECTION'),
-        );
+        return [
+            ['TINYINT'],
+            ['SMALLINT'],
+            ['MEDIUMINT'],
+            ['INT'],
+            ['BIGINT'],
+            ['DECIMAL'],
+            ['FLOAT'],
+            ['DOUBLE'],
+            ['REAL'],
+            ['BIT'],
+            ['BOOLEAN'],
+            ['SERIAL'],
+            ['DATE'],
+            ['DATETIME'],
+            ['TIMESTAMP'],
+            ['TIME'],
+            ['YEAR'],
+            ['CHAR'],
+            ['VARCHAR'],
+            ['TINYTEXT'],
+            ['TEXT'],
+            ['MEDIUMTEXT'],
+            ['LONGTEXT'],
+            ['BINARY'],
+            ['VARBINARY'],
+            ['TINYBLOB'],
+            ['MEDIUMBLOB'],
+            ['BLOB'],
+            ['LONGBLOB'],
+            ['ENUM'],
+            ['SET'],
+            ['GEOMETRY'],
+            ['POINT'],
+            ['LINESTRING'],
+            ['POLYGON'],
+            ['MULTIPOINT'],
+            ['MULTILINESTRING'],
+            ['MULTIPOLYGON'],
+            ['GEOMETRYCOLLECTION'],
+        ];
     }
 
     /**
@@ -362,10 +362,10 @@ class TypesTest extends PmaTestCase
      */
     public function providerFortTestGetFunctionsClass()
     {
-        return array(
-            array(
+        return [
+            [
                 'CHAR',
-                array(
+                [
                     'AES_DECRYPT',
                     'AES_ENCRYPT',
                     'BIN',
@@ -400,11 +400,11 @@ class TypesTest extends PmaTestCase
                     'USER',
                     'UUID',
                     'VERSION',
-                )
-            ),
-            array(
+                ]
+            ],
+            [
                 'DATE',
-                array(
+                [
                     'CURRENT_DATE',
                     'CURRENT_TIME',
                     'DATE',
@@ -420,11 +420,11 @@ class TypesTest extends PmaTestCase
                     'UTC_TIME',
                     'UTC_TIMESTAMP',
                     'YEAR',
-                )
-            ),
-            array(
+                ]
+            ],
+            [
                 'SPATIAL',
-                array(
+                [
                     'GeomFromText',
                     'GeomFromWKB',
 
@@ -443,11 +443,11 @@ class TypesTest extends PmaTestCase
                     'MPointFromWKB',
                     'PolyFromWKB',
                     'MPolyFromWKB',
-                )
-            ),
-            array(
+                ]
+            ],
+            [
                 'NUMBER',
-                array(
+                [
                     '0' => 'ABS',
                     '1' => 'ACOS',
                     '2' => 'ASCII',
@@ -500,13 +500,13 @@ class TypesTest extends PmaTestCase
                     '49' => 'WEEKDAY',
                     '50' => 'WEEKOFYEAR',
                     '51' => 'YEARWEEK'
-                )
-            ),
-            array(
+                ]
+            ],
+            [
                 'UNKNOWN',
-                array()
-            )
-        );
+                []
+            ]
+        ];
     }
 
     /**
@@ -517,7 +517,7 @@ class TypesTest extends PmaTestCase
     public function testGetFunctions()
     {
         $this->assertEquals(
-            array(
+            [
                 'AES_DECRYPT',
                 'AES_ENCRYPT',
                 'BIN',
@@ -552,7 +552,7 @@ class TypesTest extends PmaTestCase
                 'USER',
                 'UUID',
                 'VERSION',
-            ),
+            ],
             $this->object->getFunctions('enum')
         );
     }
@@ -565,7 +565,7 @@ class TypesTest extends PmaTestCase
     public function testGetAllFunctions()
     {
         $this->assertEquals(
-            array(
+            [
                 'ABS',
                 'ACOS',
                 'AES_DECRYPT',
@@ -667,7 +667,7 @@ class TypesTest extends PmaTestCase
                 'WEEKOFYEAR',
                 'YEAR',
                 'YEARWEEK',
-            ),
+            ],
             $this->object->getAllFunctions()
         );
     }
@@ -680,13 +680,13 @@ class TypesTest extends PmaTestCase
     public function testGetAttributes()
     {
         $this->assertEquals(
-            array(
+            [
                 '',
                 'BINARY',
                 'UNSIGNED',
                 'UNSIGNED ZEROFILL',
                 'on update CURRENT_TIMESTAMP',
-            ),
+            ],
             $this->object->getAttributes()
         );
     }
@@ -699,12 +699,12 @@ class TypesTest extends PmaTestCase
     public function testGetColumns()
     {
         $this->assertEquals(
-            array(
+            [
                 0 => 'INT',
                 1 => 'VARCHAR',
                 2 => 'TEXT',
                 3 => 'DATE',
-                'Numeric' => array (
+                'Numeric' =>  [
                     'TINYINT',
                     'SMALLINT',
                     'MEDIUMINT',
@@ -719,15 +719,15 @@ class TypesTest extends PmaTestCase
                     'BIT',
                     'BOOLEAN',
                     'SERIAL',
-                ),
-                'Date and time' => array (
+                ],
+                'Date and time' =>  [
                     'DATE',
                     'DATETIME',
                     'TIMESTAMP',
                     'TIME',
                     'YEAR',
-                ),
-                'String' => array (
+                ],
+                'String' =>  [
                     'CHAR',
                 'VARCHAR',
                     '-',
@@ -746,8 +746,8 @@ class TypesTest extends PmaTestCase
                     '-',
                     'ENUM',
                     'SET',
-                ),
-                'Spatial' => array (
+                ],
+                'Spatial' =>  [
                     'GEOMETRY',
                     'POINT',
                     'LINESTRING',
@@ -756,11 +756,11 @@ class TypesTest extends PmaTestCase
                     'MULTILINESTRING',
                     'MULTIPOLYGON',
                     'GEOMETRYCOLLECTION',
-                ),
-                'JSON' => array(
+                ],
+                'JSON' => [
                     'JSON'
-                )
-            ),
+                ]
+            ],
             $this->object->getColumns()
         );
     }
@@ -790,27 +790,27 @@ class TypesTest extends PmaTestCase
      */
     public function providerFortTestGetTypeClass()
     {
-        return array(
-            array(
+        return [
+            [
                 'SERIAL',
                 'NUMBER'
-            ),
-            array(
+            ],
+            [
                 'YEAR',
                 'DATE'
-            ),
-            array(
+            ],
+            [
                 'GEOMETRYCOLLECTION',
                 'SPATIAL'
-            ),
-            array(
+            ],
+            [
                 'SET',
                 'CHAR'
-            ),
-            array(
+            ],
+            [
                 'UNKNOWN',
                 ''
-            )
-        );
+            ]
+        ];
     }
 }
diff --git a/test/classes/UrlTest.php b/test/classes/UrlTest.php
index 92ec62c21f..e7100de86d 100644
--- a/test/classes/UrlTest.php
+++ b/test/classes/UrlTest.php
@@ -47,7 +47,7 @@ class UrlTest extends TestCase
         $expected = '?db=db'
             . htmlentities($separator) . $expected;
 
-        $this->assertEquals($expected, Url::getCommon(array('db' => 'db')));
+        $this->assertEquals($expected, Url::getCommon(['db' => 'db']));
     }
 
     /**
@@ -66,7 +66,7 @@ class UrlTest extends TestCase
         $expected = '?db=db'
             . htmlentities($separator) . 'table=table'
             . htmlentities($separator) . $expected;
-        $params = array('db' => 'db', 'table' => 'table');
+        $params = ['db' => 'db', 'table' => 'table'];
         $this->assertEquals($expected, Url::getCommon($params));
     }
 
@@ -88,7 +88,7 @@ class UrlTest extends TestCase
         $this->assertEquals(
             $expected,
             Url::getCommonRaw(
-                array('db' => 'db', 'table' => 'table'), '#ABC#'
+                ['db' => 'db', 'table' => 'table'], '#ABC#'
             )
         );
     }
diff --git a/test/classes/UserPreferencesTest.php b/test/classes/UserPreferencesTest.php
index e9ffa8f921..a817e23739 100644
--- a/test/classes/UserPreferencesTest.php
+++ b/test/classes/UserPreferencesTest.php
@@ -48,23 +48,23 @@ class UserPreferencesTest extends PmaTestCase
      */
     public function testPageInit()
     {
-        $GLOBALS['cfg'] = array(
+        $GLOBALS['cfg'] = [
             'Server/hide_db' => 'testval123',
             'Server/port' => '213'
-        );
-        $GLOBALS['cfg']['AvailableCharsets'] = array();
+        ];
+        $GLOBALS['cfg']['AvailableCharsets'] = [];
         $GLOBALS['cfg']['UserprefsDeveloperTab'] = null;
 
         $this->userPreferences->pageInit(new ConfigFile());
 
         $this->assertEquals(
-            array(
-                'Servers' => array(
-                    1 => array(
+            [
+                'Servers' => [
+                    1 => [
                         'hide_db' => 'testval123'
-                    )
-                )
-            ),
+                    ]
+                ]
+            ],
             $_SESSION['ConfigFile' . $GLOBALS['server']]
         );
     }
@@ -89,7 +89,7 @@ class UserPreferencesTest extends PmaTestCase
         );
 
         $this->assertEquals(
-            array(),
+            [],
             $result['config_data']
         );
 
@@ -123,10 +123,10 @@ class UserPreferencesTest extends PmaTestCase
             ->with($query, 'ASSOC', DatabaseInterface::CONNECT_CONTROL)
             ->will(
                 $this->returnValue(
-                    array(
+                    [
                         'ts' => '123',
-                        'config_data' => json_encode(array(1, 2))
-                    )
+                        'config_data' => json_encode([1, 2])
+                    ]
                 )
             );
         $dbi->expects($this->any())
@@ -138,11 +138,11 @@ class UserPreferencesTest extends PmaTestCase
         $result = $this->userPreferences->load();
 
         $this->assertEquals(
-            array(
-                'config_data' => array(1, 2),
+            [
+                'config_data' => [1, 2],
                 'mtime' => 123,
                 'type' => 'db'
-            ),
+            ],
             $result
         );
     }
@@ -159,7 +159,7 @@ class UserPreferencesTest extends PmaTestCase
         $_SESSION['relation'][2]['userconfigwork'] = null;
         unset($_SESSION['userconfig']);
 
-        $result = $this->userPreferences->save(array(1));
+        $result = $this->userPreferences->save([1]);
 
         $this->assertTrue(
             $result
@@ -171,7 +171,7 @@ class UserPreferencesTest extends PmaTestCase
         );
 
         $this->assertEquals(
-            array(1),
+            [1],
             $_SESSION['userconfig']['db']
         );
 
@@ -203,7 +203,7 @@ class UserPreferencesTest extends PmaTestCase
             . 'WHERE `username` = \'user\'';
 
         $query2 = 'UPDATE `pmadb`.`testconf` SET `timevalue` = NOW(), `config_data` = \''
-            . json_encode(array(1)) . '\' WHERE `username` = \'user\'';
+            . json_encode([1]) . '\' WHERE `username` = \'user\'';
 
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
             ->disableOriginalConstructor()
@@ -225,7 +225,7 @@ class UserPreferencesTest extends PmaTestCase
 
         $GLOBALS['dbi'] = $dbi;
         $this->assertTrue(
-            $this->userPreferences->save(array(1))
+            $this->userPreferences->save([1])
         );
 
         // case 3
@@ -234,7 +234,7 @@ class UserPreferencesTest extends PmaTestCase
             . 'WHERE `username` = \'user\'';
 
         $query2 = 'INSERT INTO `pmadb`.`testconf` (`username`, `timevalue`,`config_data`) '
-            . 'VALUES (\'user\', NOW(), \'' . json_encode(array(1)) . '\')';
+            . 'VALUES (\'user\', NOW(), \'' . json_encode([1]) . '\')';
 
         $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface')
             ->disableOriginalConstructor()
@@ -260,7 +260,7 @@ class UserPreferencesTest extends PmaTestCase
 
         $GLOBALS['dbi'] = $dbi;
 
-        $result = $this->userPreferences->save(array(1));
+        $result = $this->userPreferences->save([1]);
 
         $this->assertEquals(
             'Could not save configuration<br /><br />err1',
@@ -275,27 +275,27 @@ class UserPreferencesTest extends PmaTestCase
      */
     public function testApply()
     {
-        $GLOBALS['cfg']['UserprefsDisallow'] = array(
+        $GLOBALS['cfg']['UserprefsDisallow'] = [
             'test' => 'val',
             'foo' => 'bar'
-        );
+        ];
         $GLOBALS['cfg']['UserprefsDeveloperTab'] = null;
         $result = $this->userPreferences->apply(
-            array(
+            [
                 'DBG/sql' => true,
                 'ErrorHandler/display' => true,
                 'ErrorHandler/gather' => false,
                 'Servers/foobar' => '123',
                 'Server/hide_db' => true
-            )
+            ]
         );
 
         $this->assertEquals(
-            array(
-                'Server' => array(
+            [
+                'Server' => [
                     'hide_db' => 1
-                )
-            ),
+                ]
+            ],
             $result
         );
     }
@@ -309,15 +309,15 @@ class UserPreferencesTest extends PmaTestCase
     {
         $GLOBALS['cfg']['UserprefsDeveloperTab'] = true;
         $result = $this->userPreferences->apply(
-            array(
+            [
                 'DBG/sql' => true,
-            )
+            ]
         );
 
         $this->assertEquals(
-            array(
-                'DBG' => array('sql' => true),
-            ),
+            [
+                'DBG' => ['sql' => true],
+            ],
             $result
         );
     }
@@ -331,12 +331,12 @@ class UserPreferencesTest extends PmaTestCase
     {
         $_SESSION['relation'][$GLOBALS['server']]['PMA_VERSION'] = PMA_VERSION;
         $_SESSION['relation'][$GLOBALS['server']]['userconfigwork'] = null;
-        $_SESSION['userconfig'] = array();
+        $_SESSION['userconfig'] = [];
         $_SESSION['userconfig']['ts'] = "123";
-        $_SESSION['userconfig']['db'] = array(
+        $_SESSION['userconfig']['db'] = [
             'Server/hide_db' => true,
             'Server/only_db' => true,
-        );
+        ];
 
         $GLOBALS['server'] = 2;
         $_SESSION['relation'][2]['userconfigwork'] = null;
@@ -372,7 +372,7 @@ class UserPreferencesTest extends PmaTestCase
 
         $this->userPreferences->redirect(
             'file.html',
-            array('a' => 'b'),
+            ['a' => 'b'],
             'h ash'
         );
     }
diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php
index 4f91c5ea99..08d3e806a0 100644
--- a/test/classes/UtilTest.php
+++ b/test/classes/UtilTest.php
@@ -129,11 +129,11 @@ class UtilTest extends PmaTestCase
      */
     public function charsetQueryData()
     {
-        return array(
-            array("a_b_c_d", " CHARSET=a COLLATE a_b_c_d"),
-            array("a_", " CHARSET=a COLLATE a_"),
-            array("a", " CHARSET=a"),
-        );
+        return [
+            ["a_b_c_d", " CHARSET=a COLLATE a_b_c_d"],
+            ["a_", " CHARSET=a COLLATE a_"],
+            ["a", " CHARSET=a"],
+        ];
     }
 
     /**
@@ -182,15 +182,15 @@ class UtilTest extends PmaTestCase
      */
     public function providerGetBrowseUploadFileBlock()
     {
-        return array(
-            array(10, __('B'), "10"),
-            array(100, __('B'), "100"),
-            array(1024, __('B'), "1,024"),
-            array(102400, __('KiB'), "100"),
-            array(10240000, __('MiB'), "10"),
-            array(2147483648, __('MiB'), "2,048"),
-            array(21474836480, __('GiB'), "20")
-        );
+        return [
+            [10, __('B'), "10"],
+            [100, __('B'), "100"],
+            [1024, __('B'), "1,024"],
+            [102400, __('KiB'), "100"],
+            [10240000, __('MiB'), "10"],
+            [2147483648, __('MiB'), "2,048"],
+            [21474836480, __('GiB'), "20"]
+        ];
     }
 
     /**
@@ -202,9 +202,9 @@ class UtilTest extends PmaTestCase
      */
     function testBuildActionTitles()
     {
-        $GLOBALS['cfg'] = array('ActionLinksMode' => 'both');
+        $GLOBALS['cfg'] = ['ActionLinksMode' => 'both'];
 
-        $titles = array();
+        $titles = [];
         $titles['Browse']     = Util::getIcon('b_browse', __('Browse'));
         $titles['NoBrowse']   = Util::getIcon('bd_browse', __('Browse'));
         $titles['Search']     = Util::getIcon('b_select', __('Search'));
@@ -352,7 +352,7 @@ class UtilTest extends PmaTestCase
         $this->expectOutputRegex("/Missing parameter: field/");
 
         Util::checkParameters(
-            array('db', 'table', 'field')
+            ['db', 'table', 'field']
         );
     }
 
@@ -366,7 +366,7 @@ class UtilTest extends PmaTestCase
     function testCheckParameter()
     {
         $GLOBALS['PMA_Config'] = new Config();
-        $GLOBALS['cfg'] = array('ServerDefault' => 1);
+        $GLOBALS['cfg'] = ['ServerDefault' => 1];
         $GLOBALS['text_dir'] = 'ltr';
         $GLOBALS['PMA_PHP_SELF'] = Core::getenv('PHP_SELF');
         $GLOBALS['pmaThemePath'] = $GLOBALS['PMA_Theme']->getPath();
@@ -377,7 +377,7 @@ class UtilTest extends PmaTestCase
 
         $this->expectOutputString("");
         Util::checkParameters(
-            array('db', 'table', 'field', 'sql_query')
+            ['db', 'table', 'field', 'sql_query']
         );
     }
 
@@ -406,13 +406,13 @@ class UtilTest extends PmaTestCase
      */
     public function providerContainsNonPrintableAscii()
     {
-        return array(
-            array("normal string", 0),
-            array("new\nline", 1),
-            array("tab\tspace", 1),
-            array("escape" . chr(27) . "char", 1),
-            array("chars%$\r\n", 1),
-        );
+        return [
+            ["normal string", 0],
+            ["new\nline", 1],
+            ["tab\tspace", 1],
+            ["escape" . chr(27) . "char", 1],
+            ["chars%$\r\n", 1],
+        ];
     }
 
     /**
@@ -440,11 +440,11 @@ class UtilTest extends PmaTestCase
      */
     public function providerConvertBitDefaultValue()
     {
-        return array(
-            array("b'",""),
-            array("b'01'","01"),
-            array("b'010111010'","010111010")
-        );
+        return [
+            ["b'",""],
+            ["b'01'","01"],
+            ["b'010111010'","010111010"]
+        ];
     }
 
     /**
@@ -454,16 +454,16 @@ class UtilTest extends PmaTestCase
      */
     public function providerUnEscapeMysqlWildcards()
     {
-        return array(
-            array('\_test', '_test'),
-            array('\_\\', '_\\'),
-            array('\\_\%', '_%'),
-            array('\\\_', '\_'),
-            array('\\\_\\\%', '\_\%'),
-            array('\_\\%\_\_\%', '_%__%'),
-            array('\%\_', '%_'),
-            array('\\\%\\\_', '\%\_')
-        );
+        return [
+            ['\_test', '_test'],
+            ['\_\\', '_\\'],
+            ['\\_\%', '_%'],
+            ['\\\_', '\_'],
+            ['\\\_\\\%', '\_\%'],
+            ['\_\\%\_\_\%', '_%__%'],
+            ['\%\_', '%_'],
+            ['\\\%\\\_', '\%\_']
+        ];
     }
 
     /**
@@ -517,12 +517,12 @@ class UtilTest extends PmaTestCase
     {
         $GLOBALS['PMA_Config'] = new Config();
         $GLOBALS['PMA_Config']->enableBc();
-        $GLOBALS['cfg'] = array(
-            'Server' => array(
+        $GLOBALS['cfg'] = [
+            'Server' => [
                 'host' => 'host&',
                 'verbose' => 'verbose',
-            )
-        );
+            ]
+        ];
         $GLOBALS['db'] = 'database';
         $GLOBALS['table'] = 'table';
 
@@ -547,14 +547,14 @@ class UtilTest extends PmaTestCase
      */
     public function providerExpandUserString()
     {
-        return array(
-            array('@SERVER@', 'host&'),
-            array('@VSERVER@', 'verbose'),
-            array('@DATABASE@', 'database'),
-            array('@TABLE@', 'table'),
-            array('@IGNORE@', '@IGNORE@'),
-            array('@PHPMYADMIN@', 'phpMyAdmin PMA_VERSION'),
-        );
+        return [
+            ['@SERVER@', 'host&'],
+            ['@VSERVER@', 'verbose'],
+            ['@DATABASE@', 'database'],
+            ['@TABLE@', 'table'],
+            ['@IGNORE@', '@IGNORE@'],
+            ['@PHPMYADMIN@', 'phpMyAdmin PMA_VERSION'],
+        ];
     }
 
     /**
@@ -584,113 +584,113 @@ class UtilTest extends PmaTestCase
      */
     public function providerExtractColumnSpec()
     {
-        return array(
-            array(
+        return [
+            [
                 "SET('a','b')",
-                array(
+                [
                     'type' => 'set',
                     'print_type' => "set('a', 'b')",
                     'binary' => false,
                     'unsigned' => false,
                     'zerofill' => false,
                     'spec_in_brackets' => "'a','b'",
-                    'enum_set_values' => array('a', 'b'),
+                    'enum_set_values' => ['a', 'b'],
                     'attribute' => ' ',
                     'can_contain_collation' => true,
                     'displayed_type' => "set('a', 'b')"
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 "SET('\'a','b')",
-                array(
+                [
                     'type' => 'set',
                     'print_type' => "set('\'a', 'b')",
                     'binary' => false,
                     'unsigned' => false,
                     'zerofill' => false,
                     'spec_in_brackets' => "'\'a','b'",
-                    'enum_set_values' => array("'a", 'b'),
+                    'enum_set_values' => ["'a", 'b'],
                     'attribute' => ' ',
                     'can_contain_collation' => true,
                     'displayed_type' => "set('\'a', 'b')"
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 "SET('''a','b')",
-                array(
+                [
                     'type' => 'set',
                     'print_type' => "set('''a', 'b')",
                     'binary' => false,
                     'unsigned' => false,
                     'zerofill' => false,
                     'spec_in_brackets' => "'''a','b'",
-                    'enum_set_values' => array("'a", 'b'),
+                    'enum_set_values' => ["'a", 'b'],
                     'attribute' => ' ',
                     'can_contain_collation' => true,
                     'displayed_type' => "set('''a', 'b')"
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 "ENUM('a&b', 'b''c\\'d', 'e\\\\f')",
-                array(
+                [
                     'type' => 'enum',
                     'print_type' => "enum('a&b', 'b''c\\'d', 'e\\\\f')",
                     'binary' => false,
                     'unsigned' => false,
                     'zerofill' => false,
                     'spec_in_brackets' => "'a&b', 'b''c\\'d', 'e\\\\f'",
-                    'enum_set_values' => array('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')"
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 "INT UNSIGNED zerofill",
-                array(
+                [
                     'type' => 'int',
                     'print_type' => 'int',
                     'binary' => false,
                     'unsigned' => true,
                     'zerofill' => true,
                     'spec_in_brackets' => '',
-                    'enum_set_values' => array(),
+                    'enum_set_values' => [],
                     'attribute' => 'UNSIGNED ZEROFILL',
                     'can_contain_collation' => false,
                     'displayed_type' => "int"
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 "VARCHAR(255)",
-                array(
+                [
                     'type' => 'varchar',
                     'print_type' => 'varchar(255)',
                     'binary' => false,
                     'unsigned' => false,
                     'zerofill' => false,
                     'spec_in_brackets' => '255',
-                    'enum_set_values' => array(),
+                    'enum_set_values' => [],
                     'attribute' => ' ',
                     'can_contain_collation' => true,
                     'displayed_type' => "varchar(255)"
-                ),
-            ),
-            array(
+                ],
+            ],
+            [
                 "VARBINARY(255)",
-                array(
+                [
                     'type' => 'varbinary',
                     'print_type' => 'varbinary(255)',
                     'binary' => false,
                     'unsigned' => false,
                     'zerofill' => false,
                     'spec_in_brackets' => '255',
-                    'enum_set_values' => array(),
+                    'enum_set_values' => [],
                     'attribute' => ' ',
                     'can_contain_collation' => false,
                     'displayed_type' => "varbinary(255)"
-                ),
-            ),
-        );
+                ],
+            ],
+        ];
     }
 
     /**
@@ -719,12 +719,12 @@ class UtilTest extends PmaTestCase
      */
     public function providerExtractValueFromFormattedSize()
     {
-        return array(
-            array(100, -1),
-            array("10GB", 10737418240),
-            array("15MB", 15728640),
-            array("256K", 262144)
-        );
+        return [
+            [100, -1],
+            ["10GB", 10737418240],
+            ["15MB", 15728640],
+            ["256K", 262144]
+        ];
     }
 
     /**
@@ -754,12 +754,12 @@ class UtilTest extends PmaTestCase
      */
     public function providerIsForeignKeySupported()
     {
-        return array(
-            array('MyISAM', false),
-            array('innodb', true),
-            array('pBxT', true),
-            array('ndb', true)
-        );
+        return [
+            ['MyISAM', false],
+            ['innodb', true],
+            ['pBxT', true],
+            ['ndb', true]
+        ];
     }
 
     /**
@@ -815,17 +815,17 @@ class UtilTest extends PmaTestCase
      */
     public function providerFormatByteDown()
     {
-        return array(
-            array(10, 2, 2, array('10', __('B'))),
-            array(100, 2, 0, array('0', __('KiB'))),
-            array(100, 3, 0, array('100', __('B'))),
-            array(100, 2, 2, array('0.10', __('KiB'))),
-            array(1034, 3, 2, array('1.01', __('KiB'))),
-            array(100233, 3, 3, array('97.884', __('KiB'))),
-            array(2206451, 1, 2, array('2.10', __('MiB'))),
-            array(21474836480, 4, 0, array('20', __('GiB'))),
-            array(doubleval(52) + doubleval(2048), 3, 1, array('2.1', 'KiB')),
-        );
+        return [
+            [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')]],
+            [2206451, 1, 2, ['2.10', __('MiB')]],
+            [21474836480, 4, 0, ['20', __('GiB')]],
+            [doubleval(52) + doubleval(2048), 3, 1, ['2.1', 'KiB']],
+        ];
     }
 
     /**
@@ -911,23 +911,23 @@ class UtilTest extends PmaTestCase
      */
     public function providerFormatNumber()
     {
-        return array(
-            array(10, 2, 2, '10  '),
-            array(100, 2, 0, '100  '),
-            array(100, 2, 2, '100  '),
-            array(-1000.454, 4, 2, '-1,000.45  '),
-            array(0.00003, 3, 2, '30 &micro;'),
-            array(0.003, 3, 3, '3 m'),
-            array(-0.003, 6, 0, '-3,000 &micro;'),
-            array(100.98, 0, 2, '100.98'),
-            array(21010101, 0, 2, '21,010,101.00'),
-            array(1100000000, 5, 0, '1,100 M'),
-            array(20000, 2, 2, '20 k'),
-            array(20011, 2, 2, '20.01 k'),
-            array(123456789, 6, 0, '123,457 k'),
-            array(-123456789, 4, 2, '-123.46 M'),
-            array(0, 6, 0, '0')
-        );
+        return [
+            [10, 2, 2, '10  '],
+            [100, 2, 0, '100  '],
+            [100, 2, 2, '100  '],
+            [-1000.454, 4, 2, '-1,000.45  '],
+            [0.00003, 3, 2, '30 &micro;'],
+            [0.003, 3, 3, '3 m'],
+            [-0.003, 6, 0, '-3,000 &micro;'],
+            [100.98, 0, 2, '100.98'],
+            [21010101, 0, 2, '21,010,101.00'],
+            [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']
+        ];
     }
 
     /**
@@ -955,14 +955,14 @@ class UtilTest extends PmaTestCase
      */
     public function providerGenerateHiddenMaxFileSize()
     {
-        return array(
-            array(10),
-            array("100"),
-            array(1024),
-            array("1024Mb"),
-            array(2147483648),
-            array("some_string")
-        );
+        return [
+            [10],
+            ["100"],
+            [1024],
+            ["1024Mb"],
+            [2147483648],
+            ["some_string"]
+        ];
     }
 
     /**
@@ -1133,7 +1133,7 @@ class UtilTest extends PmaTestCase
     public function testGetDropdownEmpty()
     {
         $name = "test_dropdown_name";
-        $choices = array();
+        $choices = [];
         $active_choice = null;
         $id = "test_&lt;dropdown&gt;_name";
 
@@ -1158,7 +1158,7 @@ class UtilTest extends PmaTestCase
     public function testGetDropdown()
     {
         $name = "&test_dropdown_name";
-        $choices = array("value_1" => "label_1", "value&_2\"" => "label_2");
+        $choices = ["value_1" => "label_1", "value&_2\"" => "label_2"];
         $active_choice = null;
         $id = "test_&lt;dropdown&gt;_name";
 
@@ -1191,7 +1191,7 @@ class UtilTest extends PmaTestCase
     public function testGetDropdownWithActive()
     {
         $name = "&test_dropdown_name";
-        $choices = array("value_1" => "label_1", "value&_2\"" => "label_2");
+        $choices = ["value_1" => "label_1", "value&_2\"" => "label_2"];
         $active_choice = "value&_2\"";
         $id = "test_&lt;dropdown&gt;_name";
 
@@ -1243,15 +1243,15 @@ class UtilTest extends PmaTestCase
      */
     public function providerGetFormattedMaximumUploadSize()
     {
-        return array(
-            array(10, __('B'), "10"),
-            array(100, __('B'), "100"),
-            array(1024, __('B'), "1,024"),
-            array(102400, __('KiB'), "100"),
-            array(10240000, __('MiB'), "10"),
-            array(2147483648, __('MiB'), "2,048"),
-            array(21474836480, __('GiB'), "20")
-        );
+        return [
+            [10, __('B'), "10"],
+            [100, __('B'), "100"],
+            [1024, __('B'), "1,024"],
+            [102400, __('KiB'), "100"],
+            [10240000, __('MiB'), "10"],
+            [2147483648, __('MiB'), "2,048"],
+            [21474836480, __('GiB'), "20"]
+        ];
     }
 
     /**
@@ -1340,7 +1340,7 @@ class UtilTest extends PmaTestCase
     public function testGetRadioFieldsEmpty()
     {
         $name = "test_display_radio";
-        $choices = array();
+        $choices = [];
 
         $this->assertEquals(
             Util::getRadioFields($name, $choices),
@@ -1358,7 +1358,7 @@ class UtilTest extends PmaTestCase
     public function testGetRadioFields()
     {
         $name = "test_display_radio";
-        $choices = array('value_1'=>'choice_1', 'value_2'=>'choice_2');
+        $choices = ['value_1'=>'choice_1', 'value_2'=>'choice_2'];
 
         $out = "";
         foreach ($choices as $choice_value => $choice_label) {
@@ -1389,7 +1389,7 @@ class UtilTest extends PmaTestCase
     public function testGetRadioFieldsWithChecked()
     {
         $name = "test_display_radio";
-        $choices = array('value_1'=>'choice_1', 'value_2'=>'choice_2');
+        $choices = ['value_1'=>'choice_1', 'value_2'=>'choice_2'];
         $checked_choice = "value_2";
 
         $out = "";
@@ -1426,7 +1426,7 @@ class UtilTest extends PmaTestCase
     public function testGetRadioFieldsWithCheckedWithClass()
     {
         $name = "test_display_radio";
-        $choices = array('value_1'=>'choice_1', 'value_2'=>'choice_2');
+        $choices = ['value_1'=>'choice_1', 'value_2'=>'choice_2'];
         $checked_choice = "value_2";
         $class = "test_class";
 
@@ -1468,7 +1468,7 @@ class UtilTest extends PmaTestCase
     public function testGetRadioFieldsWithoutBR()
     {
         $name = "test_display_radio";
-        $choices = array('value_1'=>'choice_1', 'value&_&lt;2&gt;'=>'choice_2');
+        $choices = ['value_1'=>'choice_1', 'value&_&lt;2&gt;'=>'choice_2'];
         $checked_choice = "choice_2";
 
         $out = "";
@@ -1503,7 +1503,7 @@ class UtilTest extends PmaTestCase
     public function testGetRadioFieldsEscapeLabelEscapeLabel()
     {
         $name = "test_display_radio";
-        $choices = array('value_1'=>'choice_1', 'value_&2'=>'choice&_&lt;2&gt;');
+        $choices = ['value_1'=>'choice_1', 'value_&2'=>'choice&_&lt;2&gt;'];
         $checked_choice = "value_2";
 
         $out = "";
@@ -1540,7 +1540,7 @@ class UtilTest extends PmaTestCase
     public function testGetRadioFieldsEscapeLabelNotEscapeLabel()
     {
         $name = "test_display_radio";
-        $choices = array('value_1'=>'choice_1', 'value_&2'=>'choice&_&lt;2&gt;');
+        $choices = ['value_1'=>'choice_1', 'value_&2'=>'choice&_&lt;2&gt;'];
         $checked_choice = "value_2";
 
         $out = "";
@@ -1577,7 +1577,7 @@ class UtilTest extends PmaTestCase
     public function testGetRadioFieldsEscapeLabelEscapeLabelWithClass()
     {
         $name = "test_display_radio";
-        $choices = array('value_1'=>'choice_1', 'value_&2'=>'choice&_&lt;2&gt;');
+        $choices = ['value_1'=>'choice_1', 'value_&2'=>'choice&_&lt;2&gt;'];
         $checked_choice = "value_2";
         $class = "test_class";
 
@@ -1634,17 +1634,17 @@ class UtilTest extends PmaTestCase
      */
     public function providerGetTitleForTarget()
     {
-        return array(
-            array('tbl_structure.php', __('Structure')),
-            array('tbl_sql.php', __('SQL'),),
-            array('tbl_select.php', __('Search'),),
-            array('tbl_change.php', __('Insert')),
-            array('sql.php', __('Browse')),
-            array('db_structure.php', __('Structure')),
-            array('db_sql.php', __('SQL')),
-            array('db_search.php', __('Search')),
-            array('db_operations.php', __('Operations')),
-        );
+        return [
+            ['tbl_structure.php', __('Structure')],
+            ['tbl_sql.php', __('SQL'),],
+            ['tbl_select.php', __('Search'),],
+            ['tbl_change.php', __('Insert')],
+            ['sql.php', __('Browse')],
+            ['db_structure.php', __('Structure')],
+            ['db_sql.php', __('SQL')],
+            ['db_search.php', __('Search')],
+            ['db_operations.php', __('Operations')],
+        ];
     }
 
     /**
@@ -1678,10 +1678,10 @@ class UtilTest extends PmaTestCase
      */
     public function providerLocalisedDate()
     {
-        return array(
-            array(1227455558, '', 'Nov 23, 2008 at 03:52 PM'),
-            array(1227455558, '%Y-%m-%d %H:%M:%S %a', '2008-11-23 15:52:38 Sun')
-        );
+        return [
+            [1227455558, '', 'Nov 23, 2008 at 03:52 PM'],
+            [1227455558, '%Y-%m-%d %H:%M:%S %a', '2008-11-23 15:52:38 Sun']
+        ];
     }
 
     /**
@@ -1715,10 +1715,10 @@ class UtilTest extends PmaTestCase
      */
     public function providerTimespanFormat()
     {
-        return array(
-            array(1258, '0 days, 0 hours, 20 minutes and 58 seconds'),
-            array(821958, '9 days, 12 hours, 19 minutes and 18 seconds')
-        );
+        return [
+            [1258, '0 days, 0 hours, 20 minutes and 58 seconds'],
+            [821958, '9 days, 12 hours, 19 minutes and 18 seconds']
+        ];
     }
 
     /**
@@ -1747,14 +1747,14 @@ class UtilTest extends PmaTestCase
      */
     public function providerPrintableBitValue()
     {
-        return array(
-            array(
+        return [
+            [
                 '20131009',
                 64,
                 '0000000000000000000000000000000000000001001100110010110011000001'
-            ),
-            array('5', 32, '00000000000000000000000000000101')
-        );
+            ],
+            ['5', 32, '00000000000000000000000000000101']
+        ];
     }
 
     /**
@@ -1782,12 +1782,12 @@ class UtilTest extends PmaTestCase
      */
     public function providerUnQuote()
     {
-        return array(
-            array('"test\'"', "test'"),
-            array("'test''", "test'"),
-            array("`test'`", "test'"),
-            array("'test'test", "'test'test")
-        );
+        return [
+            ['"test\'"', "test'"],
+            ["'test''", "test'"],
+            ["`test'`", "test'"],
+            ["'test'test", "'test'test"]
+        ];
     }
 
     /**
@@ -1815,12 +1815,12 @@ class UtilTest extends PmaTestCase
      */
     public function providerUnQuoteSelectedChar()
     {
-        return array(
-            array('"test\'"', "test'"),
-            array("'test''", "'test''"),
-            array("`test'`", "`test'`"),
-            array("'test'test", "'test'test")
-        );
+        return [
+            ['"test\'"', "test'"],
+            ["'test''", "'test''"],
+            ["`test'`", "`test'`"],
+            ["'test'test", "'test'test"]
+        ];
     }
 
     /**
@@ -1850,15 +1850,15 @@ class UtilTest extends PmaTestCase
      */
     public function providerBackquote()
     {
-        return array(
-            array('0', '`0`'),
-            array('test', '`test`'),
-            array('te`st', '`te``st`'),
-            array(
-                array('test', 'te`st', '', '*'),
-                array('`test`', '`te``st`', '', '*')
-            )
-        );
+        return [
+            ['0', '`0`'],
+            ['test', '`test`'],
+            ['te`st', '`te``st`'],
+            [
+                ['test', 'te`st', '', '*'],
+                ['`test`', '`te``st`', '', '*']
+            ]
+        ];
     }
 
     /**
@@ -1892,15 +1892,15 @@ class UtilTest extends PmaTestCase
      */
     public function providerBackquoteCompat()
     {
-        return array(
-            array('0', '"0"'),
-            array('test', '"test"'),
-            array('te`st', '"te`st"'),
-            array(
-                array('test', 'te`st', '', '*'),
-                array('"test"', '"te`st"', '', '*')
-            )
-        );
+        return [
+            ['0', '"0"'],
+            ['test', '"test"'],
+            ['te`st', '"te`st"'],
+            [
+                ['test', 'te`st', '', '*'],
+                ['"test"', '"te`st"', '', '*']
+            ]
+        ];
     }
 
     /**
@@ -1994,10 +1994,10 @@ class UtilTest extends PmaTestCase
      */
     public function providerUserDir()
     {
-        return array(
-            array('/var/pma_tmp/%u/', "/var/pma_tmp/root/"),
-            array('/home/%u/pma', "/home/root/pma/")
-        );
+        return [
+            ['/var/pma_tmp/%u/', "/var/pma_tmp/root/"],
+            ['/home/%u/pma', "/home/root/pma/"]
+        ];
     }
 
     /**
@@ -2025,12 +2025,12 @@ class UtilTest extends PmaTestCase
      */
     public function providerDuplicateFirstNewline()
     {
-        return array(
-            array('test', 'test'),
-            array("\r\ntest", "\n\r\ntest"),
-            array("\ntest", "\ntest"),
-            array("\n\r\ntest", "\n\r\ntest")
-        );
+        return [
+            ['test', 'test'],
+            ["\r\ntest", "\n\r\ntest"],
+            ["\ntest", "\ntest"],
+            ["\n\r\ntest", "\n\r\ntest"]
+        ];
     }
 
     /**
@@ -2042,7 +2042,7 @@ class UtilTest extends PmaTestCase
      */
     function testUnsupportedDatatypes()
     {
-        $no_support_types = array();
+        $no_support_types = [];
         $this->assertEquals(
             $no_support_types, Util::unsupportedDatatypes()
         );
@@ -2065,7 +2065,7 @@ class UtilTest extends PmaTestCase
         $GLOBALS['cfg']['LinkLengthLimit'] = $limit;
         try {
             $result = call_user_func_array(
-                array('PhpMyAdmin\Util', 'linkOrButton'),
+                ['PhpMyAdmin\Util', 'linkOrButton'],
                 $params
             );
             $this->assertEquals($match, $result);
diff --git a/test/classes/Utils/HttpRequestTest.php b/test/classes/Utils/HttpRequestTest.php
index 1623d8e8b7..e114a2be4e 100644
--- a/test/classes/Utils/HttpRequestTest.php
+++ b/test/classes/Utils/HttpRequestTest.php
@@ -241,12 +241,12 @@ class HttpRequestTest extends PmaTestCase
      */
     public function httpRequests()
     {
-        return array(
-            array("https://www.phpmyadmin.net/test/data", "GET", true, true),
-            array("https://www.phpmyadmin.net/test/data", "POST", true, null),
-            array("https://nonexisting.phpmyadmin.net/test/data", "GET", true, null),
-            array("https://www.phpmyadmin.net/test/data","GET", false, "TEST DATA"),
-            array("https://www.phpmyadmin.net/test/nothing","GET", true, false),
-        );
+        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],
+        ];
     }
 }
diff --git a/test/classes/VersionInformationTest.php b/test/classes/VersionInformationTest.php
index e807f51697..aea6c86615 100644
--- a/test/classes/VersionInformationTest.php
+++ b/test/classes/VersionInformationTest.php
@@ -30,7 +30,7 @@ class VersionInformationTest extends PmaTestCase
      */
     protected function setUp()
     {
-        $this->_releases = array();
+        $this->_releases = [];
 
         $release = new stdClass();
         $release->date = "2015-09-08";
@@ -101,27 +101,27 @@ class VersionInformationTest extends PmaTestCase
      */
     public function dataVersions()
     {
-        return array(
-            array('1.0.0', 1000050),
-            array('2.0.0.2-dev', 2000002),
-            array('3.4.2.1', 3040251),
-            array('3.4.2-dev3', 3040203),
-            array('3.4.2-dev', 3040200),
-            array('3.4.2-pl', 3040260),
-            array('3.4.2-pl3', 3040263),
-            array('4.4.2-rc22', 4040252),
-            array('4.4.2-rc', 4040230),
-            array('4.4.22-beta22', 4042242),
-            array('4.4.22-beta', 4042220),
-            array('4.4.21-alpha22', 4042132),
-            array('4.4.20-alpha', 4042010),
-            array('4.40.20-alpha-dev', 4402010),
-            array('4.4a', 4000050),
-            array('4.4.4-test', 4040400),
-            array('4.1.0', 4010050),
-            array('4.0.1.3', 4000153),
-            array('4.1-dev', 4010000),
-        );
+        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],
+        ];
     }
 
     /**
@@ -131,12 +131,12 @@ class VersionInformationTest extends PmaTestCase
      */
     public function testGetLatestCompatibleVersionWithSingleServer()
     {
-        $GLOBALS['cfg']['Servers'] = array(
-            array()
-        );
+        $GLOBALS['cfg']['Servers'] = [
+            []
+        ];
 
         $mockVersionInfo = $this->getMockBuilder('PhpMyAdmin\VersionInformation')
-            ->setMethods(array('evaluateVersionCondition'))
+            ->setMethods(['evaluateVersionCondition'])
             ->getMock();
 
         $mockVersionInfo->expects($this->at(0))
@@ -167,13 +167,13 @@ class VersionInformationTest extends PmaTestCase
      */
     public function testGetLaestCompatibleVersionWithMultipleServers()
     {
-        $GLOBALS['cfg']['Servers'] = array(
-            array(),
-            array()
-        );
+        $GLOBALS['cfg']['Servers'] = [
+            [],
+            []
+        ];
 
         $mockVersionInfo = $this->getMockBuilder('PhpMyAdmin\VersionInformation')
-            ->setMethods(array('evaluateVersionCondition'))
+            ->setMethods(['evaluateVersionCondition'])
             ->getMock();
 
         $mockVersionInfo->expects($this->at(0))
@@ -198,13 +198,13 @@ class VersionInformationTest extends PmaTestCase
      */
     public function testGetLaestCompatibleVersionWithOldPHPVersion()
     {
-        $GLOBALS['cfg']['Servers'] = array(
-            array(),
-            array()
-        );
+        $GLOBALS['cfg']['Servers'] = [
+            [],
+            []
+        ];
 
         $mockVersionInfo = $this->getMockBuilder('PhpMyAdmin\VersionInformation')
-            ->setMethods(array('evaluateVersionCondition'))
+            ->setMethods(['evaluateVersionCondition'])
             ->getMock();
 
         $mockVersionInfo->expects($this->at(0))
@@ -240,7 +240,7 @@ class VersionInformationTest extends PmaTestCase
     public function testEvaluateVersionCondition()
     {
         $mockVersionInfo = $this->getMockBuilder('PhpMyAdmin\VersionInformation')
-            ->setMethods(array('getPHPVersion'))
+            ->setMethods(['getPHPVersion'])
             ->getMock();
 
         $mockVersionInfo->expects($this->any())
diff --git a/test/classes/ZipExtensionTest.php b/test/classes/ZipExtensionTest.php
index afc6d47c8d..2b10188561 100644
--- a/test/classes/ZipExtensionTest.php
+++ b/test/classes/ZipExtensionTest.php
@@ -57,24 +57,24 @@ class ZipExtensionTest extends PmaTestCase
      */
     public function provideTestGetContents()
     {
-        return array(
-            array(
+        return [
+            [
                 './test/test_data/test.zip',
                 null,
-                array(
+                [
                     'error' => '',
                     'data' => 'TEST FILE' . "\n"
-                )
-            ),
-            array(
+                ]
+            ],
+            [
                 './test/test_data/test.zip',
                 'test',
-                array(
+                [
                     'error' => 'Error in ZIP archive: Could not find "test"',
                     'data' => ''
-                )
-            )
-        );
+                ]
+            ]
+        ];
     }
 
     /**
@@ -102,13 +102,13 @@ class ZipExtensionTest extends PmaTestCase
      */
     public function provideTestFindFile()
     {
-        return array(
-            array(
+        return [
+            [
                 './test/test_data/test.zip',
                 '/test/',
                 'test.file'
-            )
-        );
+            ]
+        ];
     }
 
     /**
@@ -195,7 +195,7 @@ class ZipExtensionTest extends PmaTestCase
             false,
             $this->zipExtension->createFile(
                 "Content",
-                array("name1.txt", "name2.txt")
+                ["name1.txt", "name2.txt"]
             )
         );
     }
@@ -208,8 +208,8 @@ class ZipExtensionTest extends PmaTestCase
     public function testCreateMultiFile()
     {
         $file = $this->zipExtension->createFile(
-            array("Content", 'Content2'),
-            array("name1.txt", "name2.txt")
+            ["Content", 'Content2'],
+            ["name1.txt", "name2.txt"]
         );
         $this->assertNotEmpty($file);
         $zip = $this->getZip($file);
diff --git a/test/libraries/FilesTest.php b/test/libraries/FilesTest.php
index bf08ef21da..71fdab648f 100644
--- a/test/libraries/FilesTest.php
+++ b/test/libraries/FilesTest.php
@@ -31,14 +31,14 @@ class FilesTest extends TestCase
     public function testDynamicJs($name, $expected)
     {
         $GLOBALS['pmaThemeImage'] = '';
-        $GLOBALS['goto_whitelist'] = array('x');
+        $GLOBALS['goto_whitelist'] = ['x'];
         $_GET['scripts'] = '["ajax.js"]';
-        $cfg = array(
+        $cfg = [
             'AllowUserDropDatabase' => true,
             'GridEditing' => 'click',
             'OBGzip' => false,
             'ServerDefault' => 1,
-        );
+        ];
         $GLOBALS['cfg'] = $cfg;
         require $name;
         $buffer->stop();
@@ -53,9 +53,9 @@ class FilesTest extends TestCase
      */
     public function listScripts()
     {
-        return array(
-            array('js/whitelist.php', 'var PMA_gotoWhitelist'),
-            array('js/messages.php', 'var PMA_messages = new Array();'),
-        );
+        return [
+            ['js/whitelist.php', 'var PMA_gotoWhitelist'],
+            ['js/messages.php', 'var PMA_messages = new Array();'],
+        ];
     }
 }
diff --git a/test/libraries/common/GetCheckboxTest.php b/test/libraries/common/GetCheckboxTest.php
index 5e67f6ad5b..669584ac3d 100644
--- a/test/libraries/common/GetCheckboxTest.php
+++ b/test/libraries/common/GetCheckboxTest.php
@@ -36,13 +36,13 @@ class GetCheckboxTest extends TestCase
         $this->assertXmlStringEqualsXmlString(
             '<root> ' . Template::get('checkbox')
             ->render(
-                array(
+                [
                     'html_field_name'   => $name,
                     'label'             => $label,
                     'checked'           => false,
                     'onclick'           => false,
                     'html_field_id'     => $name,
-                )
+                ]
             ) . ' </root>',
             '<root> <input type="checkbox" name="' . $name . '" id="' . $name
             . '" /><label for="' . $name . '">' . $label
@@ -63,13 +63,13 @@ class GetCheckboxTest extends TestCase
         $this->assertXmlStringEqualsXmlString(
             '<root>' . Template::get('checkbox')
             ->render(
-                array(
+                [
                     'html_field_name'   => $name,
                     'label'             => $label,
                     'checked'           => true,
                     'onclick'           => false,
                     'html_field_id'     => $name,
-                )
+                ]
             ) . '</root>',
             '<root> <input type="checkbox" name="' . $name . '" id="' . $name
             . '" checked="checked" /><label for="' . $name . '">' . $label
@@ -90,13 +90,13 @@ class GetCheckboxTest extends TestCase
         $this->assertXmlStringEqualsXmlString(
             '<root>' . Template::get('checkbox')
             ->render(
-                array(
+                [
                     'html_field_name'   => $name,
                     'label'             => $label,
                     'checked'           => false,
                     'onclick'           => true,
                     'html_field_id'     => $name,
-                )
+                ]
             ) . '</root>',
             '<root> <input type="checkbox" name="' . $name . '" id="' . $name
             . '" class="autosubmit" /><label for="' . $name . '">' . $label
@@ -117,13 +117,13 @@ class GetCheckboxTest extends TestCase
         $this->assertXmlStringEqualsXmlString(
             '<root>' . Template::get('checkbox')
             ->render(
-                array(
+                [
                     'html_field_name'   => $name,
                     'label'             => $label,
                     'checked'           => true,
                     'onclick'           => true,
                     'html_field_id'     => $name,
-                )
+                ]
             ) . '</root>',
             '<root> <input type="checkbox" name="' . $name . '" id="' . $name
             . '" checked="checked" class="autosubmit" /><label for="' . $name
diff --git a/test/selenium/ExportTest.php b/test/selenium/ExportTest.php
index 31e64578a4..1bfc8ea1d0 100644
--- a/test/selenium/ExportTest.php
+++ b/test/selenium/ExportTest.php
@@ -125,24 +125,24 @@ class ExportTest extends TestBase
      */
     public function exportDataProvider()
     {
-        return array(
-            array(
+        return [
+            [
                 'CSV',
-                array('"1","2"')
-            ),
-            array(
+                ['"1","2"']
+            ],
+            [
                 'SQL',
-                array(
+                [
                     "CREATE TABLE IF NOT EXISTS `test_table`",
                     "INSERT INTO `test_table` (`id`, `val`) VALUES",
                     "(1, 2)",
-                )
-            ),
-            array(
+                ]
+            ],
+            [
                 'JSON',
-                array('{"id":"1","val":"2"}')
-            )
-        );
+                ['{"id":"1","val":"2"}']
+            ]
+        ];
     }
 
     /**
diff --git a/test/selenium/TableCreateTest.php b/test/selenium/TableCreateTest.php
index 33587bbed5..2e947ddb90 100644
--- a/test/selenium/TableCreateTest.php
+++ b/test/selenium/TableCreateTest.php
@@ -66,25 +66,25 @@ class TableCreateTest extends TestBase
         $this->waitForElement('byXPath', '//button[contains(text(), \'Go\')]')->click();
 
         // column details
-        $column_text_details = array(
+        $column_text_details = [
             "field_0_1" => "test_id",
             "field_0_3" => "14",
             "field_0_10" => "comm1",
             "field_1_1" => "test_column",
             "field_1_3" => "10",
             "field_1_10" => "comm2",
-        );
+        ];
 
         foreach ($column_text_details as $field => $val) {
             $this->byId($field)->value($val);
         }
 
-        $column_dropdown_details = array(
+        $column_dropdown_details = [
             "field_0_6" => "UNSIGNED",
             "field_1_2" => "VARCHAR",
             "field_1_5" => "utf8_general_ci",
             "field_1_4" => "As defined:"
-        );
+        ];
 
         foreach ($column_dropdown_details as $selector => $value) {
             $this->waitForElement(
diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php
index 9fc95db956..feb194ef6a 100644
--- a/test/selenium/TestBase.php
+++ b/test/selenium/TestBase.php
@@ -80,13 +80,13 @@ abstract class TestBase extends Selenium2TestCase
                 $project_name = 'phpMyAdmin (Travis)';
             }
 
-            $capabilities = array(
+            $capabilities = [
                 'browserstack.user' => $GLOBALS['TESTSUITE_BROWSERSTACK_USER'],
                 'browserstack.key' => $GLOBALS['TESTSUITE_BROWSERSTACK_KEY'],
                 'browserstack.debug' => false,
                 'project' => $project_name,
                 'build' => $build_id,
-            );
+            ];
 
             if ($build_local) {
                 $capabilities['browserstack.local'] = $build_local;
@@ -94,8 +94,8 @@ abstract class TestBase extends Selenium2TestCase
                 $capabilities['browserstack.debug'] = true;
             }
 
-            $result = array();
-            $result[] = array(
+            $result = [];
+            $result[] = [
                 'browserName' => 'chrome',
                 'host' => 'hub.browserstack.com',
                 'port' => 80,
@@ -103,11 +103,11 @@ abstract class TestBase extends Selenium2TestCase
                 'sessionStrategy' => $strategy,
                 'desiredCapabilities' => array_merge(
                     $capabilities,
-                    array(
+                    [
                         'os' => 'Windows',
-                    )
+                    ]
                 )
-            );
+            ];
 
             /* Only one browser for continuous integration for speed */
             if (empty($GLOBALS['TESTSUITE_FULL'])) {
@@ -130,14 +130,14 @@ abstract class TestBase extends Selenium2TestCase
                 )
             );
             */
-            $result[] = array(
+            $result[] = [
                 'browserName' => 'firefox',
                 'host' => 'hub.browserstack.com',
                 'port' => 80,
                 'timeout' => 30000,
                 'sessionStrategy' => $strategy,
                 'desiredCapabilities' => $capabilities,
-            );
+            ];
             /* TODO: testing is MSIE is currently broken, so disabled
             $result[] = array(
                 'browserName' => 'internet explorer',
@@ -157,15 +157,15 @@ abstract class TestBase extends Selenium2TestCase
             return $result;
         } elseif (! empty($GLOBALS['TESTSUITE_SELENIUM_HOST'])) {
             self::$_selenium_enabled = true;
-            return array(
-                array(
+            return [
+                [
                     'browserName' => $GLOBALS['TESTSUITE_SELENIUM_BROWSER'],
                     'host' => $GLOBALS['TESTSUITE_SELENIUM_HOST'],
                     'port' => intval($GLOBALS['TESTSUITE_SELENIUM_PORT']),
-                )
-            );
+                ]
+            ];
         } else {
-            return array();
+            return [];
         }
     }
 
@@ -186,7 +186,7 @@ abstract class TestBase extends Selenium2TestCase
         $this->setDesiredCapabilities(
             array_merge(
                 $caps,
-                array('name' => get_class($this) . '__' . $this->getName())
+                ['name' => get_class($this) . '__' . $this->getName()]
             )
         );
 
@@ -392,14 +392,14 @@ abstract class TestBase extends Selenium2TestCase
     {
         try {
             return call_user_func_array(
-                array($this, $func), array($arg)
+                [$this, $func], [$arg]
             );
         } catch(\Exception $e) {
             // Element not present, fall back to waiting
         }
         $this->timeouts()->implicitWait(10000);
         $element = call_user_func_array(
-            array($this, $func), array($arg)
+            [$this, $func], [$arg]
         );
         $this->timeouts()->implicitWait(0);
         return $element;
@@ -435,7 +435,7 @@ abstract class TestBase extends Selenium2TestCase
     {
         try {
             $element = call_user_func_array(
-                array($this, $func), array($arg)
+                [$this, $func], [$arg]
             );
         } catch (WebDriverException $e) {
             // Element not present
@@ -560,10 +560,10 @@ abstract class TestBase extends Selenium2TestCase
     {
         $this->waitForElement('byCssSelector', 'div.cm-s-default');
         $this->execute(
-            array(
+            [
                 'script' => "$('.cm-s-default')[$index].CodeMirror.setValue('" . $text . "');",
-                'args' => array()
-            )
+                'args' => []
+            ]
         );
     }
 
@@ -661,12 +661,12 @@ abstract class TestBase extends Selenium2TestCase
     {
         // 70pt offset by-default so that the topmenu does not cover the element
         $this->execute(
-            array(
+            [
                 'script' => 'var position = document.getElementById("'
                             . $element_id . '").getBoundingClientRect();'
                             . 'window.scrollBy(0, position.top-(' . $offset . '));',
-                'args'   => array()
-            )
+                'args'   => []
+            ]
         );
     }
 
@@ -678,10 +678,10 @@ abstract class TestBase extends Selenium2TestCase
     public function scrollToBottom()
     {
         $this->execute(
-            array(
+            [
                 'script' => 'window.scrollTo(0,document.body.scrollHeight);',
-                'args' => array()
-            )
+                'args' => []
+            ]
         );
     }
 
@@ -693,7 +693,7 @@ abstract class TestBase extends Selenium2TestCase
     public function waitAjax()
     {
         /* Wait while code is loading */
-        while ($this->execute(array('script' => 'return AJAX.active;', 'args' => array()))) {
+        while ($this->execute(['script' => 'return AJAX.active;', 'args' => []])) {
             usleep(5000);
         }
     }
@@ -707,10 +707,10 @@ abstract class TestBase extends Selenium2TestCase
     {
         /* Get current message count */
         $ajax_message_count = $this->execute(
-            array(
+            [
                 'script' => 'return ajax_message_count;',
-                'args' => array()
-            )
+                'args' => []
+            ]
         );
         /* Ensure the popup is gone */
         $this->waitForElementNotPresent(
@@ -738,10 +738,10 @@ abstract class TestBase extends Selenium2TestCase
             $SESSION_REST_URL = 'https://www.browserstack.com/automate/sessions/';
             $sessionId = $this->getSessionId();
             $payload = json_encode(
-                array(
+                [
                     'status' => 'failed',
                     'reason' => $e->getMessage()
-                )
+                ]
             );
 
             $ch = curl_init();
@@ -760,7 +760,7 @@ abstract class TestBase extends Selenium2TestCase
                     . ":" . $GLOBALS['TESTSUITE_BROWSERSTACK_KEY']
             );
 
-            $headers = array();
+            $headers = [];
             $headers[] = "Content-Type: application/json";
             curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
 
diff --git a/themes/svg_gradient.php b/themes/svg_gradient.php
index 7541b35216..e4ef33d946 100644
--- a/themes/svg_gradient.php
+++ b/themes/svg_gradient.php
@@ -20,7 +20,7 @@ header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT');
 function PMA_gradientGetColor($get_name, $default)
 {
     // get color from GET args, only alphanumeric characters
-    $opts = array('options' => array('regexp' => '/^[a-z0-9]+$/i'));
+    $opts = ['options' => ['regexp' => '/^[a-z0-9]+$/i']];
     $color = filter_input(INPUT_GET, $get_name, FILTER_VALIDATE_REGEXP, $opts);
     if (preg_match('/^[a-f0-9]{6}$/', $color)) {
         return '#' . $color;
diff --git a/transformation_overview.php b/transformation_overview.php
index 708bb628c9..72aee01a41 100644
--- a/transformation_overview.php
+++ b/transformation_overview.php
@@ -35,17 +35,17 @@ foreach ($types['mimetype'] as $key => $mimetype) {
     }
 
 }
-$transformation_types = array(
+$transformation_types = [
     'transformation', 'input_transformation'
-);
-$label = array(
+];
+$label = [
     'transformation' => __('Available browser display transformations'),
     'input_transformation' => __('Available input transformations')
-);
-$th = array(
+];
+$th = [
     'transformation' => __('Browser display transformation'),
     'input_transformation' => __('Input transformation')
-);
+];
 ?>
 <br />
 <?php foreach ($transformation_types as $ttype) { ?>
diff --git a/transformation_wrapper.php b/transformation_wrapper.php
index 7939c633a0..9f4a53366c 100644
--- a/transformation_wrapper.php
+++ b/transformation_wrapper.php
@@ -35,17 +35,17 @@ require_once './libraries/db_table_exists.inc.php';
 /**
  * Sets globals from $_REQUEST
  */
-$request_params = array(
+$request_params = [
     'cn',
     'ct',
     'sql_query',
     'transform_key',
     'where_clause'
-);
-$size_params = array(
+];
+$size_params = [
     'newHeight',
     'newWidth',
-);
+];
 foreach ($request_params as $one_request_param) {
     if (isset($_REQUEST[$one_request_param])) {
         if (in_array($one_request_param, $size_params)) {
diff --git a/version_check.php b/version_check.php
index d62d1b143d..2e4a08ac0c 100644
--- a/version_check.php
+++ b/version_check.php
@@ -25,7 +25,7 @@ $versionInformation = new VersionInformation();
 $versionDetails = $versionInformation->getLatestVersion();
 
 if (empty($versionDetails)) {
-    echo json_encode(array());
+    echo json_encode([]);
 } else {
     $latestCompatible = $versionInformation->getLatestCompatibleVersion(
         $versionDetails->releases
@@ -37,9 +37,9 @@ if (empty($versionDetails)) {
         $date = $latestCompatible['date'];
     }
     echo json_encode(
-        array(
+        [
             'version' => (! empty($version) ? $version : ''),
             'date' => (! empty($date) ? $date : ''),
-        )
+        ]
     );
 }
diff --git a/view_create.php b/view_create.php
index 841bec6c9b..2e947355c6 100644
--- a/view_create.php
+++ b/view_create.php
@@ -25,21 +25,21 @@ $url_params['back'] = 'view_create.php';
 
 $response = Response::getInstance();
 
-$view_algorithm_options = array(
+$view_algorithm_options = [
     'UNDEFINED',
     'MERGE',
     'TEMPTABLE',
-);
+];
 
-$view_with_options = array(
+$view_with_options = [
     'CASCADED',
     'LOCAL'
-);
+];
 
-$view_security_options = array(
+$view_security_options = [
     'DEFINER',
     'INVOKER'
-);
+];
 
 if (empty($sql_query)) {
     $sql_query = '';
@@ -129,7 +129,7 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
     }
 
     // If different column names defined for VIEW
-    $view_columns = array();
+    $view_columns = [];
     if (isset($_REQUEST['view']['column_names'])) {
         $view_columns = explode(',', $_REQUEST['view']['column_names']);
     }
@@ -177,7 +177,7 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
 }
 
 // prefill values if not already filled from former submission
-$view = array(
+$view = [
     'operation' => 'create',
     'or_replace' => '',
     'algorithm' => '',
@@ -187,7 +187,7 @@ $view = array(
     'column_names' => '',
     'as' => $sql_query,
     'with' => '',
-);
+];
 
 if (Core::isValid($_REQUEST['view'], 'array')) {
     $view = array_merge($view, $_REQUEST['view']);
diff --git a/view_operations.php b/view_operations.php
index d6bae3caa9..663ad5a9d4 100644
--- a/view_operations.php
+++ b/view_operations.php
@@ -121,7 +121,7 @@ $url_params['back'] = 'view_operations.php';
 <?php
 $drop_view_url_params = array_merge(
     $url_params,
-    array(
+    [
         'sql_query' => 'DROP VIEW ' . Util::backquote(
             $GLOBALS['table']
         ),
@@ -133,7 +133,7 @@ $drop_view_url_params = array_merge(
             htmlspecialchars($GLOBALS['table'])
         ),
         'table' => $GLOBALS['table']
-    )
+    ]
 );
 echo '<div>';
 echo '<fieldset class="caution">';