From e1f9ae00cd2f88196963ed4256a3208bfd47ac97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Fri, 14 Jun 2019 14:09:26 -0300 Subject: [PATCH] Add a trailing comma in multi-line arrays MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- changelog.php | 2 +- import.php | 2 +- libraries/classes/Config.php | 10 +- libraries/classes/Config/FormDisplay.php | 4 +- .../Config/Forms/Setup/FeaturesForm.php | 2 +- .../Config/Forms/Setup/ServersForm.php | 2 +- .../classes/Config/Forms/User/ExportForm.php | 6 +- .../Config/Forms/User/FeaturesForm.php | 2 +- .../classes/Config/Forms/User/MainForm.php | 2 +- .../classes/Config/SpecialSchemaLinks.php | 38 ++++---- libraries/classes/Config/Validator.php | 2 +- .../Database/StructureController.php | 4 +- .../Server/Status/VariablesController.php | 4 +- .../Controllers/Setup/HomeController.php | 2 +- .../Table/GisVisualizationController.php | 2 +- .../Controllers/Table/SearchController.php | 4 +- libraries/classes/Database/Qbe.php | 2 +- libraries/classes/DatabaseInterface.php | 2 +- libraries/classes/Display/Results.php | 12 +-- libraries/classes/ErrorReport.php | 4 +- libraries/classes/Gis/GisGeometry.php | 2 +- libraries/classes/Header.php | 2 +- libraries/classes/InsertEdit.php | 2 +- libraries/classes/InternalRelations.php | 20 ++-- libraries/classes/ListDatabase.php | 2 +- .../Navigation/Nodes/NodeDatabaseChild.php | 2 +- libraries/classes/Normalization.php | 18 ++-- libraries/classes/Operations.php | 10 +- .../classes/Plugins/Export/ExportJson.php | 2 +- .../classes/Plugins/Export/ExportPdf.php | 2 +- libraries/classes/Sanitize.php | 2 +- libraries/classes/SavedSearches.php | 2 +- libraries/classes/Server/Privileges.php | 6 +- libraries/classes/Server/Status/Data.php | 2 +- libraries/classes/Server/Status/Monitor.php | 4 +- libraries/classes/Server/UserGroups.php | 4 +- libraries/classes/Tracking.php | 2 +- libraries/classes/Transformations.php | 2 +- libraries/classes/Twig/SanitizeExtension.php | 2 +- libraries/classes/Types.php | 2 +- libraries/classes/UserPassword.php | 2 +- libraries/classes/UserPreferences.php | 4 +- libraries/classes/Util.php | 94 +++++++++---------- libraries/config.default.php | 2 +- libraries/tbl_columns_definition_form.inc.php | 4 +- prefs_manage.php | 2 +- tbl_chart.php | 2 +- tbl_find_replace.php | 2 +- tbl_select.php | 2 +- tbl_structure.php | 2 +- tbl_zoom_select.php | 2 +- test/bootstrap-dist.php | 2 +- test/classes/AdvisorTest.php | 8 +- test/classes/CentralColumnsTest.php | 2 +- test/classes/Config/ConfigFileTest.php | 10 +- test/classes/Config/FormDisplayTest.php | 4 +- test/classes/Config/FormTest.php | 12 +-- test/classes/ConfigTest.php | 6 +- .../Database/StructureControllerTest.php | 6 +- .../Server/EnginesControllerTest.php | 2 +- .../Server/Status/MonitorControllerTest.php | 4 +- .../Server/Status/ProcessesControllerTest.php | 2 +- .../Server/VariablesControllerTest.php | 2 +- .../Table/RelationControllerTest.php | 4 +- test/classes/CoreTest.php | 6 +- test/classes/Database/DesignerTest.php | 2 +- test/classes/Database/QbeTest.php | 4 +- test/classes/Database/SearchTest.php | 2 +- test/classes/DatabaseInterfaceTest.php | 4 +- test/classes/Display/ResultsTest.php | 14 +-- test/classes/Engines/InnodbTest.php | 2 +- test/classes/ErrorReportTest.php | 8 +- test/classes/ErrorTest.php | 10 +- test/classes/FooterTest.php | 6 +- .../classes/Gis/GisGeometryCollectionTest.php | 6 +- test/classes/Gis/GisLineStringTest.php | 6 +- test/classes/Gis/GisMultiLineStringTest.php | 10 +- test/classes/Gis/GisMultiPointTest.php | 8 +- test/classes/Gis/GisMultiPolygonTest.php | 8 +- test/classes/Gis/GisPointTest.php | 2 +- test/classes/Gis/GisPolygonTest.php | 8 +- test/classes/IndexTest.php | 6 +- test/classes/InsertEditTest.php | 22 ++--- test/classes/NormalizationTest.php | 6 +- .../Plugins/Auth/AuthenticationCookieTest.php | 6 +- .../Plugins/Auth/AuthenticationHttpTest.php | 6 +- .../Plugins/Export/ExportHtmlwordTest.php | 12 +-- .../Plugins/Export/ExportLatexTest.php | 6 +- .../Plugins/Export/ExportMediawikiTest.php | 4 +- test/classes/Plugins/Export/ExportOdtTest.php | 8 +- test/classes/Plugins/Export/ExportPdfTest.php | 2 +- test/classes/Plugins/Export/ExportSqlTest.php | 8 +- .../Plugins/Export/ExportTexytextTest.php | 10 +- test/classes/Plugins/Export/ExportXmlTest.php | 6 +- .../Plugins/Schema/DiaRelationSchemaTest.php | 2 +- .../Plugins/Schema/EpsRelationSchemaTest.php | 2 +- .../Plugins/Schema/PdfRelationSchemaTest.php | 2 +- .../Plugins/Schema/SvgRelationSchemaTest.php | 2 +- test/classes/RelationTest.php | 2 +- test/classes/ReplicationGuiTest.php | 4 +- test/classes/Rte/RoutinesTest.php | 22 ++--- test/classes/Server/PrivilegesTest.php | 4 +- test/classes/Server/UserGroupsTest.php | 10 +- test/classes/Setup/ConfigGeneratorTest.php | 2 +- test/classes/Setup/IndexTest.php | 4 +- test/classes/SqlTest.php | 20 ++-- test/classes/TableTest.php | 6 +- test/classes/TrackerTest.php | 18 ++-- test/classes/TrackingTest.php | 12 +-- test/classes/TransformationsTest.php | 2 +- test/classes/TwoFactorTest.php | 4 +- test/classes/TypesTest.php | 4 +- test/classes/UserPreferencesTest.php | 8 +- test/classes/UtilTest.php | 14 +-- test/classes/ZipExtensionTest.php | 4 +- view_operations.php | 2 +- 116 files changed, 369 insertions(+), 369 deletions(-) diff --git a/changelog.php b/changelog.php index 1d7a1c4bf5..c706dd5128 100644 --- a/changelog.php +++ b/changelog.php @@ -101,7 +101,7 @@ $replaces = [ => '\\1\\2', // Links target and rel - '/a href="/' => 'a target="_blank" rel="noopener noreferrer" href="' + '/a href="/' => 'a target="_blank" rel="noopener noreferrer" href="', ]; diff --git a/import.php b/import.php index f64ce91c9c..b5633e8cd8 100644 --- a/import.php +++ b/import.php @@ -77,7 +77,7 @@ if (isset($_POST['console_bookmark_add'])) { 'bkm_database' => $_POST['db'], 'bkm_user' => $cfgBookmark['user'], 'bkm_sql_query' => $_POST['bookmark_query'], - 'bkm_label' => $_POST['label'] + 'bkm_label' => $_POST['label'], ]; $isShared = ($_POST['shared'] == 'true' ? true : false); $bookmark = Bookmark::createBookmark( diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php index 9490877e4c..711284ca4f 100644 --- a/libraries/classes/Config.php +++ b/libraries/classes/Config.php @@ -713,12 +713,12 @@ class Config $author = [ 'name' => '', 'email' => '', - 'date' => '' + 'date' => '', ]; $committer = [ 'name' => '', 'email' => '', - 'date' => '' + 'date' => '', ]; do { @@ -731,7 +731,7 @@ class Config $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]; @@ -744,12 +744,12 @@ class Config $author = [ 'name' => $commit_json->author->name, 'email' => $commit_json->author->email, - 'date' => $commit_json->author->date + '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 { diff --git a/libraries/classes/Config/FormDisplay.php b/libraries/classes/Config/FormDisplay.php index ceea4e528b..24072df7fa 100644 --- a/libraries/classes/Config/FormDisplay.php +++ b/libraries/classes/Config/FormDisplay.php @@ -103,7 +103,7 @@ class FormDisplay '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 less than or equal to %s!') + 'error_value_lte' => __('Value must be less than or equal to %s!'), ]; $this->_configFile = $cf; // initialize validators @@ -406,7 +406,7 @@ class FormDisplay 'doc' => $this->getDocLink($systemPath), 'show_restore_default' => $showRestoreDefault, 'userprefs_allow' => $userPrefsAllow, - 'userprefs_comment' => Descriptions::get($systemPath, 'cmt') + 'userprefs_comment' => Descriptions::get($systemPath, 'cmt'), ]; if (isset($form->default[$systemPath])) { $opts['setvalue'] = (string) $form->default[$systemPath]; diff --git a/libraries/classes/Config/Forms/Setup/FeaturesForm.php b/libraries/classes/Config/Forms/Setup/FeaturesForm.php index b0a6175830..54f6cf25f5 100644 --- a/libraries/classes/Config/Forms/Setup/FeaturesForm.php +++ b/libraries/classes/Config/Forms/Setup/FeaturesForm.php @@ -40,7 +40,7 @@ class FeaturesForm extends \PhpMyAdmin\Config\Forms\User\FeaturesForm 'ZipDump', 'GZipDump', 'BZipDump', - 'CompressOnFly' + 'CompressOnFly', ]; $result['Security'] = [ 'blowfish_secret', diff --git a/libraries/classes/Config/Forms/Setup/ServersForm.php b/libraries/classes/Config/Forms/Setup/ServersForm.php index 74fd26ae4e..553447f500 100644 --- a/libraries/classes/Config/Forms/Setup/ServersForm.php +++ b/libraries/classes/Config/Forms/Setup/ServersForm.php @@ -95,7 +95,7 @@ class ServersForm extends BaseForm 'central_columns' => 'pma__central_columns', 'designer_settings' => 'pma__designer_settings', 'export_templates' => 'pma__export_templates', - 'MaxTableUiprefs' => 100 + 'MaxTableUiprefs' => 100, ], ], ], diff --git a/libraries/classes/Config/Forms/User/ExportForm.php b/libraries/classes/Config/Forms/User/ExportForm.php index 246b919c60..f2f853c4d6 100644 --- a/libraries/classes/Config/Forms/User/ExportForm.php +++ b/libraries/classes/Config/Forms/User/ExportForm.php @@ -42,7 +42,7 @@ class ExportForm extends BaseForm ':group:end', 'Export/file_template_table', 'Export/file_template_database', - 'Export/file_template_server' + 'Export/file_template_server', ], 'Sql' => [ 'Export/sql_include_comments' => ':group', @@ -79,10 +79,10 @@ class ExportForm extends BaseForm 'Export/sql_insert_syntax', 'Export/sql_max_query_size', 'Export/sql_hex_for_binary', - 'Export/sql_utc_time' + 'Export/sql_utc_time', ], 'CodeGen' => [ - 'Export/codegen_format' + 'Export/codegen_format', ], 'Csv' => [ ':group:' . __('CSV'), diff --git a/libraries/classes/Config/Forms/User/FeaturesForm.php b/libraries/classes/Config/Forms/User/FeaturesForm.php index ce5c074272..58d3c24118 100644 --- a/libraries/classes/Config/Forms/User/FeaturesForm.php +++ b/libraries/classes/Config/Forms/User/FeaturesForm.php @@ -79,7 +79,7 @@ class FeaturesForm extends BaseForm // skip Developer form if no setting is available if ($GLOBALS['cfg']['UserprefsDeveloperTab']) { $result['Developer'] = [ - 'DBG/sql' + 'DBG/sql', ]; } return $result; diff --git a/libraries/classes/Config/Forms/User/MainForm.php b/libraries/classes/Config/Forms/User/MainForm.php index cc323ac325..907bbaa4c9 100644 --- a/libraries/classes/Config/Forms/User/MainForm.php +++ b/libraries/classes/Config/Forms/User/MainForm.php @@ -83,7 +83,7 @@ class MainForm extends BaseForm 'DefaultTabTable', ], 'DisplayRelationalSchema' => [ - 'PDFDefaultPageSize' + 'PDFDefaultPageSize', ], ]; } diff --git a/libraries/classes/Config/SpecialSchemaLinks.php b/libraries/classes/Config/SpecialSchemaLinks.php index 51609ac548..e0af136c07 100644 --- a/libraries/classes/Config/SpecialSchemaLinks.php +++ b/libraries/classes/Config/SpecialSchemaLinks.php @@ -72,7 +72,7 @@ class SpecialSchemaLinks 'column_name' => 'host', ], ], - 'default_page' => './server_privileges.php' + 'default_page' => './server_privileges.php', ], 'table_name' => [ 'link_param' => 'table', @@ -96,7 +96,7 @@ class SpecialSchemaLinks 'column_name' => 'Table_name', ], ], - 'default_page' => './tbl_structure.php?change_column=1' + 'default_page' => './tbl_structure.php?change_column=1', ], ], 'db' => [ @@ -108,7 +108,7 @@ class SpecialSchemaLinks 'column_name' => 'host', ], ], - 'default_page' => './server_privileges.php' + 'default_page' => './server_privileges.php', ], ], 'event' => [ @@ -120,7 +120,7 @@ class SpecialSchemaLinks 'column_name' => 'db', ], ], - 'default_page' => './db_events.php?edit_item=1' + 'default_page' => './db_events.php?edit_item=1', ], ], @@ -147,7 +147,7 @@ class SpecialSchemaLinks 'column_name' => 'table_name', ], ], - 'default_page' => './tbl_structure.php' + 'default_page' => './tbl_structure.php', ], ], 'innodb_table_stats' => [ @@ -175,7 +175,7 @@ class SpecialSchemaLinks 'column_name' => 'type', ], ], - 'default_page' => './db_routines.php?edit_item=1' + 'default_page' => './db_routines.php?edit_item=1', ], 'specific_name' => [ 'link_param' => 'item_name', @@ -189,7 +189,7 @@ class SpecialSchemaLinks 'column_name' => 'type', ], ], - 'default_page' => './db_routines.php?edit_item=1' + 'default_page' => './db_routines.php?edit_item=1', ], ], 'proc_priv' => [ @@ -201,7 +201,7 @@ class SpecialSchemaLinks 'column_name' => 'Host', ], ], - 'default_page' => './server_privileges.php' + 'default_page' => './server_privileges.php', ], 'routine_name' => [ 'link_param' => 'item_name', @@ -215,7 +215,7 @@ class SpecialSchemaLinks 'column_name' => 'Routine_type', ], ], - 'default_page' => './db_routines.php?edit_item=1' + 'default_page' => './db_routines.php?edit_item=1', ], ], 'proxies_priv' => [ @@ -227,7 +227,7 @@ class SpecialSchemaLinks 'column_name' => 'Host', ], ], - 'default_page' => './server_privileges.php' + 'default_page' => './server_privileges.php', ], ], 'tables_priv' => [ @@ -239,7 +239,7 @@ class SpecialSchemaLinks 'column_name' => 'Host', ], ], - 'default_page' => './server_privileges.php' + 'default_page' => './server_privileges.php', ], 'table_name' => [ 'link_param' => 'table', @@ -261,9 +261,9 @@ class SpecialSchemaLinks 'column_name' => 'host', ], ], - 'default_page' => './server_privileges.php' + 'default_page' => './server_privileges.php', ], - ] + ], ], 'information_schema' => [ 'columns' => [ @@ -289,7 +289,7 @@ class SpecialSchemaLinks 'column_name' => 'table_name', ], ], - 'default_page' => './tbl_structure.php?change_column=1' + 'default_page' => './tbl_structure.php?change_column=1', ], ], 'key_column_usage' => [ @@ -315,7 +315,7 @@ class SpecialSchemaLinks 'column_name' => 'table_name', ], ], - 'default_page' => './tbl_structure.php?change_column=1' + 'default_page' => './tbl_structure.php?change_column=1', ], 'referenced_table_name' => [ 'link_param' => 'table', @@ -339,7 +339,7 @@ class SpecialSchemaLinks 'column_name' => 'referenced_table_name', ], ], - 'default_page' => './tbl_structure.php?change_column=1' + 'default_page' => './tbl_structure.php?change_column=1', ], ], 'partitions' => [ @@ -363,7 +363,7 @@ class SpecialSchemaLinks 'column_name' => 'host', ], ], - 'default_page' => './server_privileges.php' + 'default_page' => './server_privileges.php', ], ], 'referential_constraints' => [ @@ -401,7 +401,7 @@ class SpecialSchemaLinks 'column_name' => 'routine_type', ], ], - 'default_page' => './db_routines.php' + 'default_page' => './db_routines.php', ], ], 'schemata' => [ @@ -433,7 +433,7 @@ class SpecialSchemaLinks 'column_name' => 'table_name', ], ], - 'default_page' => './tbl_structure.php?change_column=1' + 'default_page' => './tbl_structure.php?change_column=1', ], ], 'tables' => [ diff --git a/libraries/classes/Config/Validator.php b/libraries/classes/Config/Validator.php index f6b203a3c5..4baf4d2666 100644 --- a/libraries/classes/Config/Validator.php +++ b/libraries/classes/Config/Validator.php @@ -251,7 +251,7 @@ class Validator 'Server' => '', 'Servers/1/user' => '', 'Servers/1/SignonSession' => '', - 'Servers/1/SignonURL' => '' + 'Servers/1/SignonURL' => '', ]; $error = false; if (empty($values['Servers/1/auth_type'])) { diff --git a/libraries/classes/Controllers/Database/StructureController.php b/libraries/classes/Controllers/Database/StructureController.php index 29b471d2f2..8e7cf6c1d2 100644 --- a/libraries/classes/Controllers/Database/StructureController.php +++ b/libraries/classes/Controllers/Database/StructureController.php @@ -641,7 +641,7 @@ class StructureController extends AbstractController 'hidden_fields' => $hidden_fields, 'disable_multi_table' => $GLOBALS['cfg']['DisableMultiTableMaintenance'], 'central_columns_work' => $GLOBALS['cfgRelation']['centralcolumnswork'], - ] + ], ]); return $html; @@ -809,7 +809,7 @@ class StructureController extends AbstractController $json = [ 'favoriteTables' => json_encode($favoriteTables), - 'list' => $favoriteInstance->getHtmlList() + 'list' => $favoriteInstance->getHtmlList(), ]; $serverId = $GLOBALS['server']; // Set flag when localStorage and pmadb(if present) are in sync. diff --git a/libraries/classes/Controllers/Server/Status/VariablesController.php b/libraries/classes/Controllers/Server/Status/VariablesController.php index 52ab967e51..a17f15fc46 100644 --- a/libraries/classes/Controllers/Server/Status/VariablesController.php +++ b/libraries/classes/Controllers/Server/Status/VariablesController.php @@ -181,7 +181,7 @@ class VariablesController extends AbstractController // alert if more than 95% of thread cache is in use 'Threads_cached' => isset($this->data->variables['thread_cache_size']) - ? 0.95 * $this->data->variables['thread_cache_size'] : 0 + ? 0.95 * $this->data->variables['thread_cache_size'] : 0, // higher is better // variable => min value @@ -633,7 +633,7 @@ class VariablesController extends AbstractController ), 'Threads_running' => __( 'The number of threads that are not sleeping.' - ) + ), ]; } } diff --git a/libraries/classes/Controllers/Setup/HomeController.php b/libraries/classes/Controllers/Setup/HomeController.php index 4e3ce66b8a..4680dad4c8 100644 --- a/libraries/classes/Controllers/Setup/HomeController.php +++ b/libraries/classes/Controllers/Setup/HomeController.php @@ -194,7 +194,7 @@ class HomeController extends AbstractController $eolOptions = [ 'values' => [ 'unix' => 'UNIX / Linux (\n)', - 'win' => 'Windows (\r\n)' + 'win' => 'Windows (\r\n)', ], 'values_escaped' => true, ]; diff --git a/libraries/classes/Controllers/Table/GisVisualizationController.php b/libraries/classes/Controllers/Table/GisVisualizationController.php index 290a363463..ad09ca0d4b 100644 --- a/libraries/classes/Controllers/Table/GisVisualizationController.php +++ b/libraries/classes/Controllers/Table/GisVisualizationController.php @@ -206,7 +206,7 @@ class GisVisualizationController extends AbstractController [ 'saveToFile' => true, 'session_max_rows' => $rows, - 'pos' => $pos + 'pos' => $pos, ] ) ); diff --git a/libraries/classes/Controllers/Table/SearchController.php b/libraries/classes/Controllers/Table/SearchController.php index e25c9475b1..3f2ceae35c 100644 --- a/libraries/classes/Controllers/Table/SearchController.php +++ b/libraries/classes/Controllers/Table/SearchController.php @@ -366,7 +366,7 @@ class SearchController extends AbstractController $row[$_POST['criteriaColumnNames'][0]], $_POST['criteriaColumnNames'][1] => $row[$_POST['criteriaColumnNames'][1]], - 'where_clause' => $uniqueCondition[0] + 'where_clause' => $uniqueCondition[0], ]; $tmpData[$dataLabel] = $dataLabel ? $row[$dataLabel] : ''; $data[] = $tmpData; @@ -974,7 +974,7 @@ class SearchController extends AbstractController 'type' => $type, 'collation' => $collation, 'func' => $func, - 'value' => $value + 'value' => $value, ]; } diff --git a/libraries/classes/Database/Qbe.php b/libraries/classes/Database/Qbe.php index eebc01bbda..7927f1dd98 100644 --- a/libraries/classes/Database/Qbe.php +++ b/libraries/classes/Database/Qbe.php @@ -1284,7 +1284,7 @@ class Qbe return [ 'unique' => $unique_columns, - 'index' => $index_columns + 'index' => $index_columns, ]; } diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php index b27097c90a..b2553eb117 100644 --- a/libraries/classes/DatabaseInterface.php +++ b/libraries/classes/DatabaseInterface.php @@ -2280,7 +2280,7 @@ class DatabaseInterface Url::getCommon( [ 'engine' => 'InnoDB', - 'page' => 'Status' + 'page' => 'Status', ] ) . '">' . __('Details…') . ')'; } diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php index ccdcca87e2..c377b9dfe0 100644 --- a/libraries/classes/Display/Results.php +++ b/libraries/classes/Display/Results.php @@ -300,7 +300,7 @@ class Results ], 'views' => [ 'view_definition' => $sql_highlighting_data, - ] + ], ], 'mysql' => [ 'event' => [ @@ -315,18 +315,18 @@ class Results ], 'help_topic' => [ 'example' => $sql_highlighting_data, - 'url' => $link_data + 'url' => $link_data, ], 'proc' => [ 'param_list' => $blob_sql_highlighting_data, 'returns' => $blob_sql_highlighting_data, 'body' => $blob_sql_highlighting_data, - 'body_utf8' => $blob_sql_highlighting_data + 'body_utf8' => $blob_sql_highlighting_data, ], 'slow_log' => [ 'sql_text' => $sql_highlighting_data, - ] - ] + ], + ], ]; $cfgRelation = $this->relation->getRelationsParam(); @@ -346,7 +346,7 @@ class Results if (! empty($cfgRelation['tracking'])) { $relDb[$cfgRelation['tracking']] = [ 'schema_sql' => $sql_highlighting_data, - 'data_sql' => $sql_highlighting_data + 'data_sql' => $sql_highlighting_data, ]; } if (! empty($cfgRelation['favorite'])) { diff --git a/libraries/classes/ErrorReport.php b/libraries/classes/ErrorReport.php index f4427ed945..92d0aa99e6 100644 --- a/libraries/classes/ErrorReport.php +++ b/libraries/classes/ErrorReport.php @@ -102,7 +102,7 @@ class ErrorReport "locale" => $_COOKIE['pma_lang'], "configuration_storage" => $relParams['db'] === null ? "disabled" : "enabled", - "php_version" => PHP_VERSION + "php_version" => PHP_VERSION, ]; if ($exceptionType == 'js') { @@ -156,7 +156,7 @@ class ErrorReport "type" => $errorObj->getType(), "msg" => $errorObj->getOnlyMessage(), "stackTrace" => $errorObj->getBacktrace(5), - "stackhash" => $errorObj->getHash() + "stackhash" => $errorObj->getHash(), ]; } } diff --git a/libraries/classes/Gis/GisGeometry.php b/libraries/classes/Gis/GisGeometry.php index 89005b27e7..a1ce83e8ac 100644 --- a/libraries/classes/Gis/GisGeometry.php +++ b/libraries/classes/Gis/GisGeometry.php @@ -201,7 +201,7 @@ abstract class GisGeometry return [ 'srid' => $srid, - 'wkt' => $wkt + 'wkt' => $wkt, ]; } diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php index 7327ca5e87..31d5a7cd03 100644 --- a/libraries/classes/Header.php +++ b/libraries/classes/Header.php @@ -261,7 +261,7 @@ class Header 'is_https' => $GLOBALS['PMA_Config']->isHttps(), 'rootPath' => $GLOBALS['PMA_Config']->getRootPath(), 'arg_separator' => Url::getArgSeparator(), - 'PMA_VERSION' => PMA_VERSION + 'PMA_VERSION' => PMA_VERSION, ]; if (isset($GLOBALS['cfg']['Server']) && isset($GLOBALS['cfg']['Server']['auth_type']) diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php index 39c341aaff..3942df1a9a 100644 --- a/libraries/classes/InsertEdit.php +++ b/libraries/classes/InsertEdit.php @@ -2308,7 +2308,7 @@ class InsertEdit $insert_command . 'INTO ' . Util::backquote($GLOBALS['table']) . ' (' . implode(', ', $query_fields) . ') VALUES (' - . implode('), (', $value_sets) . ')' + . implode('), (', $value_sets) . ')', ]; return $query; } diff --git a/libraries/classes/InternalRelations.php b/libraries/classes/InternalRelations.php index b5ba36f0f3..771ccc9cb1 100644 --- a/libraries/classes/InternalRelations.php +++ b/libraries/classes/InternalRelations.php @@ -42,7 +42,7 @@ class InternalRelations 'foreign_db' => 'information_schema', 'foreign_table' => 'COLLATIONS', 'foreign_field' => 'COLLATION_NAME', - ] + ], ], 'COLUMNS' => [ 'TABLE_SCHEMA' => [ @@ -59,7 +59,7 @@ class InternalRelations 'foreign_db' => 'information_schema', 'foreign_table' => 'COLLATIONS', 'foreign_field' => 'COLLATION_NAME', - ] + ], ], 'COLUMN_PRIVILEGES' => [ 'TABLE_SCHEMA' => [ @@ -88,7 +88,7 @@ class InternalRelations 'foreign_db' => 'information_schema', 'foreign_table' => 'COLLATIONS', 'foreign_field' => 'COLLATION_NAME', - ] + ], ], 'FILES' => [ 'TABLESPACE_NAME' => [ @@ -110,7 +110,7 @@ class InternalRelations 'foreign_db' => 'information_schema', 'foreign_table' => 'ENGINES', 'foreign_field' => 'ENGINE', - ] + ], ], 'KEY_COLUMN_USAGE' => [ 'CONSTRAINT_SCHEMA' => [ @@ -144,7 +144,7 @@ class InternalRelations 'foreign_db' => 'information_schema', 'foreign_table' => 'COLLATIONS', 'foreign_field' => 'COLLATION_NAME', - ] + ], ], 'PARTITIONS' => [ 'TABLE_SCHEMA' => [ @@ -207,7 +207,7 @@ class InternalRelations 'foreign_db' => 'information_schema', 'foreign_table' => 'COLLATIONS', 'foreign_field' => 'COLLATION_NAME', - ] + ], ], 'SCHEMATA' => [ 'DEFAULT_CHARACTER_SET_NAME' => [ @@ -219,7 +219,7 @@ class InternalRelations 'foreign_db' => 'information_schema', 'foreign_table' => 'COLLATIONS', 'foreign_field' => 'COLLATION_NAME', - ] + ], ], 'SCHEMA_PRIVILEGES' => [ 'TABLE_SCHEMA' => [ @@ -274,7 +274,7 @@ class InternalRelations 'foreign_db' => 'information_schema', 'foreign_table' => 'SCHEMATA', 'foreign_field' => 'SCHEMA_NAME', - ] + ], ], 'TABLE_PRIVILEGES' => [ 'TABLE_SCHEMA' => [ @@ -308,7 +308,7 @@ class InternalRelations 'foreign_db' => 'information_schema', 'foreign_table' => 'COLLATIONS', 'foreign_field' => 'COLLATION_NAME', - ] + ], ], 'VIEWS' => [ 'TABLE_SCHEMA' => [ @@ -326,7 +326,7 @@ class InternalRelations 'foreign_table' => 'COLLATIONS', 'foreign_field' => 'COLLATION_NAME', ], - ] + ], ]; /** diff --git a/libraries/classes/ListDatabase.php b/libraries/classes/ListDatabase.php index 0d83fa0b76..e65120e55f 100644 --- a/libraries/classes/ListDatabase.php +++ b/libraries/classes/ListDatabase.php @@ -134,7 +134,7 @@ class ListDatabase extends ListAbstract && strlen($GLOBALS['cfg']['Server']['only_db']) > 0 ) { $GLOBALS['cfg']['Server']['only_db'] = [ - $GLOBALS['cfg']['Server']['only_db'] + $GLOBALS['cfg']['Server']['only_db'], ]; } diff --git a/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php b/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php index e0d5aa96bc..0005915ade 100644 --- a/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php @@ -46,7 +46,7 @@ abstract class NodeDatabaseChild extends Node 'hideNavItem' => true, 'itemType' => $this->getItemType(), 'itemName' => $item, - 'dbName' => $db + 'dbName' => $db, ]; $ret = '' diff --git a/libraries/classes/Normalization.php b/libraries/classes/Normalization.php index 12578db914..bdbcea40c5 100644 --- a/libraries/classes/Normalization.php +++ b/libraries/classes/Normalization.php @@ -153,7 +153,7 @@ class Normalization 'move_columns' => [], 'cfg_relation' => $cfgRelation, 'available_mime' => $availableMime, - 'mime_map' => $mimeMap + 'mime_map' => $mimeMap, ]; } @@ -277,7 +277,7 @@ class Normalization 'headText' => $headText, 'subText' => $subText, 'hasPrimaryKey' => $hasPrimaryKey, - 'extra' => $extra + 'extra' => $extra, ]; } @@ -313,7 +313,7 @@ class Normalization 'legendText' => $legendText, 'headText' => $headText, 'subText' => $subText, - 'extra' => $extra + 'extra' => $extra, ]; } @@ -562,7 +562,7 @@ class Normalization 'legendText' => __('End of step'), 'headText' => $headText, 'queryError' => $error, - 'extra' => $message + 'extra' => $message, ]; } @@ -628,7 +628,7 @@ class Normalization return [ 'html' => $html, 'newTables' => $newTables, - 'success' => true + 'success' => true, ]; } @@ -718,7 +718,7 @@ class Normalization 'legendText' => __('End of step'), 'headText' => $headText, 'queryError' => $error, - 'extra' => $message + 'extra' => $message, ]; } @@ -791,7 +791,7 @@ class Normalization } return [ 'queryError' => $error, - 'message' => $message + 'message' => $message, ]; } @@ -871,7 +871,7 @@ class Normalization 'legendText' => $legendText, 'headText' => $headText, 'subText' => $subText, - 'extra' => $extra + 'extra' => $extra, ]; } @@ -896,7 +896,7 @@ class Normalization $choices = [ '1nf' => __('First step of normalization (1NF)'), '2nf' => __('Second step of normalization (1NF+2NF)'), - '3nf' => __('Third step of normalization (1NF+2NF+3NF)') + '3nf' => __('Third step of normalization (1NF+2NF+3NF)'), ]; $htmlOutput .= Util::getRadioFields( diff --git a/libraries/classes/Operations.php b/libraries/classes/Operations.php index 9e4f3154fc..1fa4a045b5 100644 --- a/libraries/classes/Operations.php +++ b/libraries/classes/Operations.php @@ -1261,25 +1261,25 @@ class Operations 'ARIA' => [ 'FIXED' => 'FIXED', 'DYNAMIC' => 'DYNAMIC', - 'PAGE' => 'PAGE' + 'PAGE' => 'PAGE', ], 'MARIA' => [ 'FIXED' => 'FIXED', 'DYNAMIC' => 'DYNAMIC', - 'PAGE' => 'PAGE' + 'PAGE' => 'PAGE', ], 'MYISAM' => [ 'FIXED' => 'FIXED', - 'DYNAMIC' => 'DYNAMIC' + 'DYNAMIC' => 'DYNAMIC', ], 'PBXT' => [ 'FIXED' => 'FIXED', - 'DYNAMIC' => 'DYNAMIC' + 'DYNAMIC' => 'DYNAMIC', ], 'INNODB' => [ 'COMPACT' => 'COMPACT', 'REDUNDANT' => 'REDUNDANT', - ] + ], ]; /** @var Innodb $innodbEnginePlugin */ diff --git a/libraries/classes/Plugins/Export/ExportJson.php b/libraries/classes/Plugins/Export/ExportJson.php index 0d038739e0..4ebfbbe88e 100644 --- a/libraries/classes/Plugins/Export/ExportJson.php +++ b/libraries/classes/Plugins/Export/ExportJson.php @@ -228,7 +228,7 @@ class ExportJson extends ExportPlugin 'type' => 'table', 'name' => $table_alias, 'database' => $db_alias, - 'data' => "@@DATA@@" + 'data' => "@@DATA@@", ] ); list($header, $footer) = explode('"@@DATA@@"', $buffer); diff --git a/libraries/classes/Plugins/Export/ExportPdf.php b/libraries/classes/Plugins/Export/ExportPdf.php index 7a1d0d1be0..49e74b3d88 100644 --- a/libraries/classes/Plugins/Export/ExportPdf.php +++ b/libraries/classes/Plugins/Export/ExportPdf.php @@ -142,7 +142,7 @@ class ExportPdf extends ExportPlugin $attr = [ 'titleFontSize' => 18, - 'titleText' => $pdf_report_title + 'titleText' => $pdf_report_title, ]; $pdf->setAttributes($attr); $pdf->setTopMargin(30); diff --git a/libraries/classes/Sanitize.php b/libraries/classes/Sanitize.php index d6406fe760..bbb58c4871 100644 --- a/libraries/classes/Sanitize.php +++ b/libraries/classes/Sanitize.php @@ -300,7 +300,7 @@ class Sanitize '\'' => '\\\'', '"' => '\"', "\n" => '\n', - "\r" => '\r' + "\r" => '\r', ] ) ); diff --git a/libraries/classes/SavedSearches.php b/libraries/classes/SavedSearches.php index 2a2b59f67a..a89d661ce3 100644 --- a/libraries/classes/SavedSearches.php +++ b/libraries/classes/SavedSearches.php @@ -293,7 +293,7 @@ class SavedSearches if (null === $this->getId()) { $wheres = [ "search_name = '" . $GLOBALS['dbi']->escapeString($this->getSearchName()) - . "'" + . "'", ]; $existingSearches = $this->getList($wheres); diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php index 7f2dbe5803..bb3cdeb275 100644 --- a/libraries/classes/Server/Privileges.php +++ b/libraries/classes/Server/Privileges.php @@ -271,7 +271,7 @@ class Privileges if ($enableHTML) { $privs = ['ALL PRIVILEGES' + . '">ALL PRIVILEGES', ]; } else { $privs = ['ALL PRIVILEGES']; @@ -610,7 +610,7 @@ class Privileges return $this->template->render('server/privileges/choose_user_group', [ 'all_user_groups' => $allUserGroups, 'user_group' => $userGroup, - 'params' => ['username' => $username] + 'params' => ['username' => $username], ]); } @@ -4206,7 +4206,7 @@ class Privileges { if (isset($_POST['change_copy'])) { $selected_usr = [ - $_POST['old_username'] . '&#27;' . $_POST['old_hostname'] + $_POST['old_username'] . '&#27;' . $_POST['old_hostname'], ]; } else { $selected_usr = $_POST['selected_usr']; diff --git a/libraries/classes/Server/Status/Data.php b/libraries/classes/Server/Status/Data.php index a37fc20dbf..7d352f7138 100644 --- a/libraries/classes/Server/Status/Data.php +++ b/libraries/classes/Server/Status/Data.php @@ -131,7 +131,7 @@ class Data 'tc' => __('Transaction coordinator'), 'files' => __('Files'), 'ssl' => 'SSL', - 'other' => __('Other') + 'other' => __('Other'), ]; } diff --git a/libraries/classes/Server/Status/Monitor.php b/libraries/classes/Server/Status/Monitor.php index 7a61dfb227..efa9e40573 100644 --- a/libraries/classes/Server/Status/Monitor.php +++ b/libraries/classes/Server/Status/Monitor.php @@ -276,7 +276,7 @@ class Monitor $return = [ 'rows' => [], - 'sum' => [] + 'sum' => [], ]; while ($row = $this->dbi->fetchAssoc($result)) { @@ -356,7 +356,7 @@ class Monitor $return = [ 'rows' => [], - 'sum' => [] + 'sum' => [], ]; $insertTables = []; $insertTablesFirst = -1; diff --git a/libraries/classes/Server/UserGroups.php b/libraries/classes/Server/UserGroups.php index bcf41de364..89bc1a32eb 100644 --- a/libraries/classes/Server/UserGroups.php +++ b/libraries/classes/Server/UserGroups.php @@ -128,7 +128,7 @@ class UserGroups . Url::getCommon( [ 'editUserGroup' => 1, - 'userGroup' => $groupName + 'userGroup' => $groupName, ], '' ) @@ -140,7 +140,7 @@ class UserGroups . Url::getCommon( [ 'deleteUserGroup' => 1, - 'userGroup' => $groupName + 'userGroup' => $groupName, ], '' ) diff --git a/libraries/classes/Tracking.php b/libraries/classes/Tracking.php index 8a402df18f..613d16160f 100644 --- a/libraries/classes/Tracking.php +++ b/libraries/classes/Tracking.php @@ -209,7 +209,7 @@ class Tracking 'type' => $type, 'default_statements' => $GLOBALS['cfg']['Server']['tracking_default_statements'], 'pmaThemeImage' => $pmaThemeImage, - 'text_dir' => $textDir + 'text_dir' => $textDir, ]); } diff --git a/libraries/classes/Transformations.php b/libraries/classes/Transformations.php index c5512db8d6..adc226592b 100644 --- a/libraries/classes/Transformations.php +++ b/libraries/classes/Transformations.php @@ -107,7 +107,7 @@ class Transformations $sub_dirs = [ 'Input/' => 'input_', 'Output/' => '', - '' => '' + '' => '', ]; foreach ($sub_dirs as $sd => $prefix) { diff --git a/libraries/classes/Twig/SanitizeExtension.php b/libraries/classes/Twig/SanitizeExtension.php index 749a0bd1ec..02561093c6 100644 --- a/libraries/classes/Twig/SanitizeExtension.php +++ b/libraries/classes/Twig/SanitizeExtension.php @@ -58,7 +58,7 @@ class SanitizeExtension extends AbstractExtension 'get_js_value', 'PhpMyAdmin\Sanitize::getJsValue', ['is_safe' => ['html']] - ) + ), ]; } } diff --git a/libraries/classes/Types.php b/libraries/classes/Types.php index f623bd8fc0..40bc15fc1e 100644 --- a/libraries/classes/Types.php +++ b/libraries/classes/Types.php @@ -862,7 +862,7 @@ class Types '-9223372036854775808', '9223372036854775807', ], - ] + ], ]; $relevantArray = $signed ? $min_max_data['signed'] diff --git a/libraries/classes/UserPassword.php b/libraries/classes/UserPassword.php index 7c57844089..f9ee4fbe51 100644 --- a/libraries/classes/UserPassword.php +++ b/libraries/classes/UserPassword.php @@ -94,7 +94,7 @@ class UserPassword } return [ 'error' => $error, - 'msg' => $message + 'msg' => $message, ]; } diff --git a/libraries/classes/UserPreferences.php b/libraries/classes/UserPreferences.php index 9321ff0d81..3f737ac956 100644 --- a/libraries/classes/UserPreferences.php +++ b/libraries/classes/UserPreferences.php @@ -89,7 +89,7 @@ class UserPreferences return [ 'config_data' => $_SESSION['userconfig']['db'], 'mtime' => $_SESSION['userconfig']['ts'], - 'type' => 'session' + 'type' => 'session', ]; } // load configuration from pmadb @@ -105,7 +105,7 @@ class UserPreferences return [ 'config_data' => $row ? json_decode($row['config_data'], true) : [], 'mtime' => $row ? $row['ts'] : time(), - 'type' => 'db' + 'type' => 'db', ]; } diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php index a09dd47a24..7608d1706c 100644 --- a/libraries/classes/Util.php +++ b/libraries/classes/Util.php @@ -1431,7 +1431,7 @@ class Util 5 => 'P', 6 => 'E', 7 => 'Z', - 8 => 'Y' + 8 => 'Y', ]; /* l10n: Decimal separator */ $decimal_sep = __('.'); @@ -2721,7 +2721,7 @@ class Util 'toggle_on' => $options[1]['label'], 'toggle_off' => $options[0]['label'], 'callback' => $callback, - 'state' => $state + 'state' => $state, ]); } @@ -2987,7 +2987,7 @@ class Util 'zerofill' => $zerofill, 'attribute' => $attribute, 'can_contain_collation' => $can_contain_collation, - 'displayed_type' => $displayed_type + 'displayed_type' => $displayed_type, ]; } @@ -3628,27 +3628,27 @@ class Util // Unary functions common to all geometry types $funcs['Dimension'] = [ 'params' => 1, - 'type' => 'int' + 'type' => 'int', ]; $funcs['Envelope'] = [ 'params' => 1, - 'type' => 'Polygon' + 'type' => 'Polygon', ]; $funcs['GeometryType'] = [ 'params' => 1, - 'type' => 'text' + 'type' => 'text', ]; $funcs['SRID'] = [ 'params' => 1, - 'type' => 'int' + 'type' => 'int', ]; $funcs['IsEmpty'] = [ 'params' => 1, - 'type' => 'int' + 'type' => 'int', ]; $funcs['IsSimple'] = [ 'params' => 1, - 'type' => 'int' + 'type' => 'int', ]; $geom_type = trim(mb_strtolower((string) $geom_type)); @@ -3660,70 +3660,70 @@ class Util if ($geom_type == 'point') { $funcs['X'] = [ 'params' => 1, - 'type' => 'float' + 'type' => 'float', ]; $funcs['Y'] = [ 'params' => 1, - 'type' => 'float' + 'type' => 'float', ]; } elseif ($geom_type == 'linestring') { $funcs['EndPoint'] = [ 'params' => 1, - 'type' => 'point' + 'type' => 'point', ]; $funcs['GLength'] = [ 'params' => 1, - 'type' => 'float' + 'type' => 'float', ]; $funcs['NumPoints'] = [ 'params' => 1, - 'type' => 'int' + 'type' => 'int', ]; $funcs['StartPoint'] = [ 'params' => 1, - 'type' => 'point' + 'type' => 'point', ]; $funcs['IsRing'] = [ 'params' => 1, - 'type' => 'int' + 'type' => 'int', ]; } elseif ($geom_type == 'multilinestring') { $funcs['GLength'] = [ 'params' => 1, - 'type' => 'float' + 'type' => 'float', ]; $funcs['IsClosed'] = [ 'params' => 1, - 'type' => 'int' + 'type' => 'int', ]; } elseif ($geom_type == 'polygon') { $funcs['Area'] = [ 'params' => 1, - 'type' => 'float' + 'type' => 'float', ]; $funcs['ExteriorRing'] = [ 'params' => 1, - 'type' => 'linestring' + 'type' => 'linestring', ]; $funcs['NumInteriorRings'] = [ 'params' => 1, - 'type' => 'int' + 'type' => 'int', ]; } elseif ($geom_type == 'multipolygon') { $funcs['Area'] = [ 'params' => 1, - 'type' => 'float' + 'type' => 'float', ]; $funcs['Centroid'] = [ 'params' => 1, - 'type' => 'point' + 'type' => 'point', ]; // Not yet implemented in MySQL //$funcs['PointOnSurface'] = array('params' => 1, 'type' => 'point'); } elseif ($geom_type == 'geometrycollection') { $funcs['NumGeometries'] = [ 'params' => 1, - 'type' => 'int' + 'type' => 'int', ]; } @@ -3737,70 +3737,70 @@ class Util if ($GLOBALS['dbi']->getVersion() < 50601) { $funcs['Crosses'] = [ 'params' => 2, - 'type' => 'int' + 'type' => 'int', ]; $funcs['Contains'] = [ 'params' => 2, - 'type' => 'int' + 'type' => 'int', ]; $funcs['Disjoint'] = [ 'params' => 2, - 'type' => 'int' + 'type' => 'int', ]; $funcs['Equals'] = [ 'params' => 2, - 'type' => 'int' + 'type' => 'int', ]; $funcs['Intersects'] = [ 'params' => 2, - 'type' => 'int' + 'type' => 'int', ]; $funcs['Overlaps'] = [ 'params' => 2, - 'type' => 'int' + 'type' => 'int', ]; $funcs['Touches'] = [ 'params' => 2, - 'type' => 'int' + 'type' => 'int', ]; $funcs['Within'] = [ 'params' => 2, - 'type' => 'int' + 'type' => 'int', ]; } else { // If MySQl version is greater than or equal 5.6.1, // use the ST_ prefix. $funcs['ST_Crosses'] = [ 'params' => 2, - 'type' => 'int' + 'type' => 'int', ]; $funcs['ST_Contains'] = [ 'params' => 2, - 'type' => 'int' + 'type' => 'int', ]; $funcs['ST_Disjoint'] = [ 'params' => 2, - 'type' => 'int' + 'type' => 'int', ]; $funcs['ST_Equals'] = [ 'params' => 2, - 'type' => 'int' + 'type' => 'int', ]; $funcs['ST_Intersects'] = [ 'params' => 2, - 'type' => 'int' + 'type' => 'int', ]; $funcs['ST_Overlaps'] = [ 'params' => 2, - 'type' => 'int' + 'type' => 'int', ]; $funcs['ST_Touches'] = [ 'params' => 2, - 'type' => 'int' + 'type' => 'int', ]; $funcs['ST_Within'] = [ 'params' => 2, - 'type' => 'int' + 'type' => 'int', ]; } @@ -3810,31 +3810,31 @@ class Util // Minimum bounding rectangle functions $funcs['MBRContains'] = [ 'params' => 2, - 'type' => 'int' + 'type' => 'int', ]; $funcs['MBRDisjoint'] = [ 'params' => 2, - 'type' => 'int' + 'type' => 'int', ]; $funcs['MBREquals'] = [ 'params' => 2, - 'type' => 'int' + 'type' => 'int', ]; $funcs['MBRIntersects'] = [ 'params' => 2, - 'type' => 'int' + 'type' => 'int', ]; $funcs['MBROverlaps'] = [ 'params' => 2, - 'type' => 'int' + 'type' => 'int', ]; $funcs['MBRTouches'] = [ 'params' => 2, - 'type' => 'int' + 'type' => 'int', ]; $funcs['MBRWithin'] = [ 'params' => 2, - 'type' => 'int' + 'type' => 'int', ]; } return $funcs; diff --git a/libraries/config.default.php b/libraries/config.default.php index 1e5ac38e94..12357583f6 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -3148,7 +3148,7 @@ $cfg['ShowGitRevision'] = true; */ $cfg['MysqlMinVersion'] = [ 'internal' => 50500, - 'human' => '5.5.0' + 'human' => '5.5.0', ]; /** diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index 51360c4f62..5565c60d7c 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -228,7 +228,7 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) { 'index' => 'MUL', 'unique' => 'UNI', 'fulltext' => 'FULLTEXT', - 'spatial' => 'SPATIAL' + 'spatial' => 'SPATIAL', ], $parts[0], '' @@ -474,7 +474,7 @@ 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 : [] + 'mime_map' => isset($mime_map) ? $mime_map : [], ]; } // end for diff --git a/prefs_manage.php b/prefs_manage.php index 9e6b4ca07b..ca7573846d 100644 --- a/prefs_manage.php +++ b/prefs_manage.php @@ -133,7 +133,7 @@ if (isset($_POST['submit_export']) 'form_errors' => $form_display->displayErrors(), 'json' => $json, 'import_merge' => isset($_POST['import_merge']) ? $_POST['import_merge'] : null, - 'return_url' => $return_url + 'return_url' => $return_url, ]); exit; } diff --git a/tbl_chart.php b/tbl_chart.php index 6558fa4717..eb21a4b4be 100644 --- a/tbl_chart.php +++ b/tbl_chart.php @@ -28,7 +28,7 @@ $dependency_definitions = [ 'table' => $container->get('table'), 'sql_query' => &$GLOBALS['sql_query'], 'url_query' => &$GLOBALS['url_query'], - 'cfg' => &$GLOBALS['cfg'] + 'cfg' => &$GLOBALS['cfg'], ]; /** @var Definition $definition */ diff --git a/tbl_find_replace.php b/tbl_find_replace.php index c461a613d9..56ca32d2f0 100644 --- a/tbl_find_replace.php +++ b/tbl_find_replace.php @@ -32,7 +32,7 @@ $dependency_definitions = [ 'db' => $container->get('db'), 'table' => $container->get('table'), 'searchType' => 'replace', - 'url_query' => &$url_query + 'url_query' => &$url_query, ]; /** @var Definition $definition */ diff --git a/tbl_select.php b/tbl_select.php index 6fe1e02e9b..be56cd57dc 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -33,7 +33,7 @@ $dependency_definitions = [ 'db' => $container->get('db'), 'table' => $container->get('table'), 'searchType' => 'normal', - 'url_query' => &$url_query + 'url_query' => &$url_query, ]; /** @var Definition $definition */ diff --git a/tbl_structure.php b/tbl_structure.php index f0e504e8cb..650353c72f 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -55,7 +55,7 @@ $dependency_definitions = [ 'tbl_storage_engine' => $tbl_storage_engine, 'table_info_num_rows' => $table_info_num_rows, 'tbl_collation' => $tbl_collation, - 'showtable' => $GLOBALS['showtable'] + 'showtable' => $GLOBALS['showtable'], ]; /** @var Definition $definition */ diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index 0e19738c24..60894aa36f 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -32,7 +32,7 @@ $dependency_definitions = [ 'db' => $container->get('db'), 'table' => $container->get('table'), 'searchType' => 'zoom', - 'url_query' => &$url_query + 'url_query' => &$url_query, ]; /** @var Definition $definition */ diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php index bfee49e952..e8e64e53ca 100644 --- a/test/bootstrap-dist.php +++ b/test/bootstrap-dist.php @@ -54,7 +54,7 @@ $test_defaults = [ 'TESTSUITE_BROWSERSTACK_USER' => '', 'TESTSUITE_BROWSERSTACK_KEY' => '', 'TESTSUITE_FULL' => '', - 'CI_MODE' => '' + 'CI_MODE' => '', ]; if (PHP_SAPI == 'cli') { foreach ($test_defaults as $varname => $defvalue) { diff --git a/test/classes/AdvisorTest.php b/test/classes/AdvisorTest.php index a1d80d49a6..d06bfbcadd 100644 --- a/test/classes/AdvisorTest.php +++ b/test/classes/AdvisorTest.php @@ -305,7 +305,7 @@ class AdvisorTest extends PmaTestCase 'issue' => 'official MySQL binaries.', 'recommendation' => 'See web', - 'id' => 'Distribution' + 'id' => 'Distribution', ], null, ], @@ -322,7 +322,7 @@ class AdvisorTest extends PmaTestCase 'issue' => 'official MySQL binaries.', 'recommendation' => 'See web', - 'id' => 'Distribution' + 'id' => 'Distribution', ], null, ], @@ -339,7 +339,7 @@ class AdvisorTest extends PmaTestCase 'issue' => 'official MySQL binaries.', 'recommendation' => 'See web', - 'id' => 'Distribution' + 'id' => 'Distribution', ], null, ], @@ -356,7 +356,7 @@ class AdvisorTest extends PmaTestCase 'issue' => 'official MySQL binaries.', 'recommendation' => 'See web', - 'id' => 'Distribution' + 'id' => 'Distribution', ], null, ], diff --git a/test/classes/CentralColumnsTest.php b/test/classes/CentralColumnsTest.php index 093f57f9af..52b7acc5fb 100644 --- a/test/classes/CentralColumnsTest.php +++ b/test/classes/CentralColumnsTest.php @@ -118,7 +118,7 @@ class CentralColumnsTest extends TestCase 'relwork' => 1, 'db' => 'phpmyadmin', 'relation' => 'relation', - 'central_columns' => 'pma_central_columns' + 'central_columns' => 'pma_central_columns', ]; // mock DBI diff --git a/test/classes/Config/ConfigFileTest.php b/test/classes/Config/ConfigFileTest.php index 57c32b4ca8..0b32fe24a2 100644 --- a/test/classes/Config/ConfigFileTest.php +++ b/test/classes/Config/ConfigFileTest.php @@ -97,7 +97,7 @@ class ConfigFileTest extends PmaTestCase $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, ]; /** @@ -198,7 +198,7 @@ class ConfigFileTest extends PmaTestCase 1 => [ 'passthrough1' => 1, 'passthrough2' => 2, - 'value1' => 3 + 'value1' => 3, ], ], ], @@ -522,7 +522,7 @@ class ConfigFileTest extends PmaTestCase "auth_type" => "config", "user" => "testUser", "host" => "example.com", - "port" => "21" + "port" => "21", ], ], ] @@ -559,7 +559,7 @@ class ConfigFileTest extends PmaTestCase "user" => "testUser", "host" => "example.com", "port" => "21", - "password" => "testPass" + "password" => "testPass", ], ], ] @@ -616,7 +616,7 @@ class ConfigFileTest extends PmaTestCase 'Array/test' => [ 'x', 'y', - ] + ], ], $this->object->getConfigArray() ); diff --git a/test/classes/Config/FormDisplayTest.php b/test/classes/Config/FormDisplayTest.php index d34a07a413..5db78a9a88 100644 --- a/test/classes/Config/FormDisplayTest.php +++ b/test/classes/Config/FormDisplayTest.php @@ -86,7 +86,7 @@ class FormDisplayTest extends PmaTestCase "Servers" => [ "1" => [ 'test' => 1, - 1 => ':group:end' + 1 => ':group:end', ], ], ]; @@ -184,7 +184,7 @@ class FormDisplayTest extends PmaTestCase "foobar" => [ 'e2', 'e3', - ] + ], ]; $sysArr = [ diff --git a/test/classes/Config/FormTest.php b/test/classes/Config/FormTest.php index ddd53c3563..66850688dc 100644 --- a/test/classes/Config/FormTest.php +++ b/test/classes/Config/FormTest.php @@ -124,7 +124,7 @@ class FormTest extends PmaTestCase [ 'auto' => 'auto', '1' => 1, - '0' => 0 + '0' => 0, ], $this->object->getOptionValueList("OBGzip") ); @@ -134,7 +134,7 @@ class FormTest extends PmaTestCase 'none' => 'Nowhere', 'left' => 'Left', 'right' => 'Right', - 'both' => "Both" + 'both' => "Both", ], $this->object->getOptionValueList("RowActionLinks") ); @@ -155,7 +155,7 @@ class FormTest extends PmaTestCase "foo" => [ "bar" => [ 'test' => 1, - 1 => ':group:end' + 1 => ':group:end', ], ], ]; @@ -207,7 +207,7 @@ class FormTest extends PmaTestCase "foo" => [ "bar" => [ 'test' => 1, - 1 => ':group:end' + 1 => ':group:end', ], ], ]; @@ -262,7 +262,7 @@ class FormTest extends PmaTestCase "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" + "1" => "preffoo/foo/bar/:group:end:0", ]; $attrFieldsTypes = $reflection->getProperty('_fieldsTypes'); @@ -275,7 +275,7 @@ class FormTest extends PmaTestCase "pma_form1" => "integer", "pma_form2" => "select", ":group:end:0" => "group", - "1" => "NULL" + "1" => "NULL", ], $attrFieldsTypes->getValue($this->object) ); diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php index a5ee816f2e..c3b39817ee 100644 --- a/test/classes/ConfigTest.php +++ b/test/classes/ConfigTest.php @@ -1383,7 +1383,7 @@ class ConfigTest extends PmaTestCase [1 => ['host' => '']], [ 'verbose' => 'Server 1', - 'host' => '' + 'host' => '', ], ], 'invalid' => [ @@ -1441,7 +1441,7 @@ class ConfigTest extends PmaTestCase [ 1 => [ 'verbose' => 'Server 1', - 'host' => '' + 'host' => '', ], ], 'Server 1', @@ -1451,7 +1451,7 @@ class ConfigTest extends PmaTestCase [ 66 => [ 'verbose' => 'Server 1', - 'host' => '' + 'host' => '', ], ], '753f173bd4ac8a45eae0fe9a4fbe0fc0', diff --git a/test/classes/Controllers/Database/StructureControllerTest.php b/test/classes/Controllers/Database/StructureControllerTest.php index b5bce34372..a62d4561b0 100644 --- a/test/classes/Controllers/Database/StructureControllerTest.php +++ b/test/classes/Controllers/Database/StructureControllerTest.php @@ -133,7 +133,7 @@ class StructureControllerTest extends PmaTestCase 'TABLE_ROWS' => 5, 'Data_length' => 16384, 'Index_length' => 0, - 'TABLE_NAME' => 'table' + 'TABLE_NAME' => 'table', ]; list($currentTable,,, $sumSize) = $method->invokeArgs( $controller, @@ -359,7 +359,7 @@ class StructureControllerTest extends PmaTestCase // Correct parameter $tables = [ - 'db.table' + 'db.table', ]; $this->assertEquals( true, @@ -368,7 +368,7 @@ class StructureControllerTest extends PmaTestCase // Table not in database $tables = [ - 'db.tab1e' + 'db.tab1e', ]; $this->assertEquals( false, diff --git a/test/classes/Controllers/Server/EnginesControllerTest.php b/test/classes/Controllers/Server/EnginesControllerTest.php index 3341a87511..75e4436909 100644 --- a/test/classes/Controllers/Server/EnginesControllerTest.php +++ b/test/classes/Controllers/Server/EnginesControllerTest.php @@ -137,7 +137,7 @@ class EnginesControllerTest extends TestCase $this->assertStringContainsString( Url::getCommon([ 'engine' => 'Pbxt', - 'page' => 'Documentation' + 'page' => 'Documentation', ]), $actual ); diff --git a/test/classes/Controllers/Server/Status/MonitorControllerTest.php b/test/classes/Controllers/Server/Status/MonitorControllerTest.php index 89dcaf59c6..b755f6d0d4 100644 --- a/test/classes/Controllers/Server/Status/MonitorControllerTest.php +++ b/test/classes/Controllers/Server/Status/MonitorControllerTest.php @@ -247,11 +247,11 @@ class MonitorControllerTest extends TestCase $resultRows = [ [ 'sql_text' => 'insert sql_text', - '#' => 11 + '#' => 11, ], [ 'sql_text' => 'update sql_text', - '#' => 10 + '#' => 10, ], ]; $resultSum = [ diff --git a/test/classes/Controllers/Server/Status/ProcessesControllerTest.php b/test/classes/Controllers/Server/Status/ProcessesControllerTest.php index 7a3a4ea876..47d8da4826 100644 --- a/test/classes/Controllers/Server/Status/ProcessesControllerTest.php +++ b/test/classes/Controllers/Server/Status/ProcessesControllerTest.php @@ -228,7 +228,7 @@ class ProcessesControllerTest extends TestCase 'Command' => 'Command1', 'Info' => 'Info1', 'State' => 'State1', - 'Time' => 'Time1' + 'Time' => 'Time1', ]; $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 12; $GLOBALS['dbi']->expects($this->any())->method('fetchAssoc') diff --git a/test/classes/Controllers/Server/VariablesControllerTest.php b/test/classes/Controllers/Server/VariablesControllerTest.php index 4e12708d87..656768dceb 100644 --- a/test/classes/Controllers/Server/VariablesControllerTest.php +++ b/test/classes/Controllers/Server/VariablesControllerTest.php @@ -58,7 +58,7 @@ class VariablesControllerTest extends TestCase $serverGlobalVariables = [ 'auto_increment_increment' => '0', - 'auto_increment_offset' => '12' + 'auto_increment_offset' => '12', ]; $fetchResult = [ diff --git a/test/classes/Controllers/Table/RelationControllerTest.php b/test/classes/Controllers/Table/RelationControllerTest.php index 36a37f1a41..60403b5ca2 100644 --- a/test/classes/Controllers/Table/RelationControllerTest.php +++ b/test/classes/Controllers/Table/RelationControllerTest.php @@ -151,7 +151,7 @@ class RelationControllerTest extends PmaTestCase public function testGetDropdownValueForTableActionNotView() { $indexedColumns = [ - 'primaryTableCol' + 'primaryTableCol', ]; $tableMock = $this->getMockBuilder('PhpMyAdmin\Table') ->disableOriginalConstructor() @@ -198,7 +198,7 @@ class RelationControllerTest extends PmaTestCase $count++; return [ 'Engine' => 'InnoDB', - 'Name' => 'table' + 'Name' => 'table', ]; } return null; diff --git a/test/classes/CoreTest.php b/test/classes/CoreTest.php index 56b4866103..fee8506452 100644 --- a/test/classes/CoreTest.php +++ b/test/classes/CoreTest.php @@ -82,7 +82,7 @@ class CoreTest extends PmaTestCase 'b', 'c', ], 4, - ] + ], ], ]; @@ -185,7 +185,7 @@ class CoreTest extends PmaTestCase 'b', 'c', ], 4, - ] + ], ], ]; @@ -254,7 +254,7 @@ class CoreTest extends PmaTestCase 'b', 'c', ], 4, - ] + ], ], ]; diff --git a/test/classes/Database/DesignerTest.php b/test/classes/Database/DesignerTest.php index 795bb3850a..78e3526f96 100644 --- a/test/classes/Database/DesignerTest.php +++ b/test/classes/Database/DesignerTest.php @@ -50,7 +50,7 @@ class DesignerTest extends TestCase 'PMA_VERSION' => PMA_VERSION, 'db' => 'pmadb', 'pdf_pages' => 'pdf_pages', - 'pdfwork' => true + 'pdfwork' => true, ], ], ' PMA_token ' => 'token', diff --git a/test/classes/Database/QbeTest.php b/test/classes/Database/QbeTest.php index 471fc2f0e2..80c26be0e7 100644 --- a/test/classes/Database/QbeTest.php +++ b/test/classes/Database/QbeTest.php @@ -342,7 +342,7 @@ class QbeTest extends PmaTestCase 3, [ 'and' => '', - 'or' => ' checked="checked"' + 'or' => ' checked="checked"', ], ] ) @@ -461,7 +461,7 @@ class QbeTest extends PmaTestCase $this->assertEquals( [ 'unique' => [], - 'index' => [] + 'index' => [], ], $this->_callProtectedFunction( '_getIndexes', diff --git a/test/classes/Database/SearchTest.php b/test/classes/Database/SearchTest.php index f8326f3cbb..fed45f33d2 100644 --- a/test/classes/Database/SearchTest.php +++ b/test/classes/Database/SearchTest.php @@ -155,7 +155,7 @@ class SearchTest extends PmaTestCase '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' + 'delete' => 'DELETE FROM `pma`.`table1` WHERE FALSE', ], $this->callProtectedFunction( 'getSearchSqls', diff --git a/test/classes/DatabaseInterfaceTest.php b/test/classes/DatabaseInterfaceTest.php index b3a6ec21bf..dad91ef690 100644 --- a/test/classes/DatabaseInterfaceTest.php +++ b/test/classes/DatabaseInterfaceTest.php @@ -157,7 +157,7 @@ class DatabaseInterfaceTest extends PmaTestCase [ 'table_name' => 'meta1_table', 'refering_column' => 'meta1_name', - 'real_column' => 'view_columns1' + 'real_column' => 'view_columns1', ], $column_map[0] ); @@ -165,7 +165,7 @@ class DatabaseInterfaceTest extends PmaTestCase [ 'table_name' => 'meta2_table', 'refering_column' => 'meta2_name', - 'real_column' => 'view_columns2' + 'real_column' => 'view_columns2', ], $column_map[1] ); diff --git a/test/classes/Display/ResultsTest.php b/test/classes/Display/ResultsTest.php index 5ea5be7e69..d854f88c27 100644 --- a/test/classes/Display/ResultsTest.php +++ b/test/classes/Display/ResultsTest.php @@ -1028,7 +1028,7 @@ class ResultsTest extends PmaTestCase [ 'routine_name' => 'circumference', 'routine_schema' => 'data', - 'routine_type' => 'FUNCTION' + 'routine_type' => 'FUNCTION', ], 'routine_name', 'db_routines.php?item_name=circumference&db=data' @@ -1041,7 +1041,7 @@ class ResultsTest extends PmaTestCase [ 'routine_name' => 'area', 'routine_schema' => 'data', - 'routine_type' => 'PROCEDURE' + 'routine_type' => 'PROCEDURE', ], 'routine_name', 'db_routines.php?item_name=area&db=data' @@ -1053,7 +1053,7 @@ class ResultsTest extends PmaTestCase 'CHARACTER_SET_NAME', [ 'table_schema' => 'information_schema', - 'table_name' => 'CHARACTER_SETS' + 'table_name' => 'CHARACTER_SETS', ], 'column_name', 'index.php?sql_query=SELECT+%60CHARACTER_SET_NAME%60+FROM+%60info' @@ -1101,7 +1101,7 @@ class ResultsTest extends PmaTestCase 'column_name' => 'routine_type', ], ], - 'default_page' => 'db_routines.php' + 'default_page' => 'db_routines.php', ], ], 'columns' => [ @@ -1123,9 +1123,9 @@ class ResultsTest extends PmaTestCase ], ], ], - 'default_page' => 'index.php' + 'default_page' => 'index.php', ], - ] + ], ], ]; @@ -1188,7 +1188,7 @@ class ResultsTest extends PmaTestCase 'host' => 'localhost', 'select_privilages' => 'Y', 'db' => 'phpmyadmin', - 'user' => 'pmauser' + 'user' => 'pmauser', ], ], ]; diff --git a/test/classes/Engines/InnodbTest.php b/test/classes/Engines/InnodbTest.php index b38530bd93..10e72bd2bd 100644 --- a/test/classes/Engines/InnodbTest.php +++ b/test/classes/Engines/InnodbTest.php @@ -167,7 +167,7 @@ class InnodbTest extends PmaTestCase $this->assertEquals( [ 'Bufferpool' => 'Buffer Pool', - 'Status' => 'InnoDB Status' + 'Status' => 'InnoDB Status', ], $this->object->getInfoPages() ); diff --git a/test/classes/ErrorReportTest.php b/test/classes/ErrorReportTest.php index af5d11a10e..1b504ef115 100644 --- a/test/classes/ErrorReportTest.php +++ b/test/classes/ErrorReportTest.php @@ -99,7 +99,7 @@ class ErrorReportTest extends TestCase 'type' => $_SESSION['prev_errors'][0]->getType(), 'msg' => $_SESSION['prev_errors'][0]->getOnlyMessage(), 'stackTrace' => $_SESSION['prev_errors'][0]->getBacktrace(5), - 'stackhash' => $_SESSION['prev_errors'][0]->getHash() + 'stackhash' => $_SESSION['prev_errors'][0]->getHash(), ], 1 => [ 'lineNum' => $_SESSION['prev_errors'][1]->getLine(), @@ -107,7 +107,7 @@ class ErrorReportTest extends TestCase 'type' => $_SESSION['prev_errors'][1]->getType(), 'msg' => $_SESSION['prev_errors'][1]->getOnlyMessage(), 'stackTrace' => $_SESSION['prev_errors'][1]->getBacktrace(5), - 'stackhash' => $_SESSION['prev_errors'][1]->getHash() + 'stackhash' => $_SESSION['prev_errors'][1]->getHash(), ], ], ]; @@ -182,7 +182,7 @@ class ErrorReportTest extends TestCase 'context' => $context, ], ], - 'url' => 'http://pma.7.3.local/tbl_sql.php?db=aaaaa&table=a&server=14' + 'url' => 'http://pma.7.3.local/tbl_sql.php?db=aaaaa&table=a&server=14', ]; $_POST['microhistory'] = ''; $_POST['description'] = 'description'; @@ -213,7 +213,7 @@ class ErrorReportTest extends TestCase 'scriptname' => 'js/vendor/codemirror/addon/hint/show-hint.js', ], ], - 'uri' => 'tbl_sql.php?' + 'uri' => 'tbl_sql.php?', ], 'microhistory' => $_POST['microhistory'], 'steps' => $_POST['description'], diff --git a/test/classes/ErrorTest.php b/test/classes/ErrorTest.php index a74cb342e7..27d06dd75a 100644 --- a/test/classes/ErrorTest.php +++ b/test/classes/ErrorTest.php @@ -62,7 +62,7 @@ class ErrorTest extends PmaTestCase 'file' => 'bt1', 'line' => 2, 'function' => 'bar', - 'args' => ['foo' => $this] + 'args' => ['foo' => $this], ], ]; $this->object->setBacktrace($bt); @@ -191,25 +191,25 @@ class ErrorTest extends PmaTestCase 'file' => 'bt1', 'line' => 2, 'function' => 'bar', - 'args' => ['foo' => 1] + 'args' => ['foo' => 1], ], [ 'file' => 'bt2', 'line' => 2, 'function' => 'bar', - 'args' => ['foo' => 2] + 'args' => ['foo' => 2], ], [ 'file' => 'bt3', 'line' => 2, 'function' => 'bar', - 'args' => ['foo' => 3] + 'args' => ['foo' => 3], ], [ 'file' => 'bt4', 'line' => 2, 'function' => 'bar', - 'args' => ['foo' => 4] + 'args' => ['foo' => 4], ], ]; diff --git a/test/classes/FooterTest.php b/test/classes/FooterTest.php index a34e151a0e..13c7018b04 100644 --- a/test/classes/FooterTest.php +++ b/test/classes/FooterTest.php @@ -133,7 +133,7 @@ class FooterTest extends PmaTestCase $this->_callPrivateFunction( '_removeRecursion', [ - &$object + &$object, ] ); @@ -162,7 +162,7 @@ class FooterTest extends PmaTestCase $this->_callPrivateFunction( '_getSelfLink', [ - $this->object->getSelfUrl() + $this->object->getSelfUrl(), ] ) ); @@ -189,7 +189,7 @@ class FooterTest extends PmaTestCase $this->_callPrivateFunction( '_getSelfLink', [ - $this->object->getSelfUrl() + $this->object->getSelfUrl(), ] ) ); diff --git a/test/classes/Gis/GisGeometryCollectionTest.php b/test/classes/Gis/GisGeometryCollectionTest.php index 2bd6f3b570..6e248152d3 100644 --- a/test/classes/Gis/GisGeometryCollectionTest.php +++ b/test/classes/Gis/GisGeometryCollectionTest.php @@ -124,7 +124,7 @@ class GisGeometryCollectionTest extends TestCase 1 => [ 'x' => 6.14, 'y' => 0.15, - ] + ], ], ], ]; @@ -178,9 +178,9 @@ class GisGeometryCollectionTest extends TestCase '1' => [ 'x' => 6.14, 'y' => 0.15, - ] + ], ], - ] + ], ], ], ]; diff --git a/test/classes/Gis/GisLineStringTest.php b/test/classes/Gis/GisLineStringTest.php index af01a456b8..ab2d7b1553 100644 --- a/test/classes/Gis/GisLineStringTest.php +++ b/test/classes/Gis/GisLineStringTest.php @@ -68,7 +68,7 @@ class GisLineStringTest extends GisGeomTestCase 1 => [ 'x' => 6.14, 'y' => 0.15, - ] + ], ], ], ]; @@ -132,7 +132,7 @@ class GisLineStringTest extends GisGeomTestCase 1 => [ 'x' => '6.14', 'y' => '0.15', - ] + ], ], ]; $temp1 = $temp; @@ -144,7 +144,7 @@ class GisLineStringTest extends GisGeomTestCase null, [ 'srid' => '124', - 0 => $temp + 0 => $temp, ], ], [ diff --git a/test/classes/Gis/GisMultiLineStringTest.php b/test/classes/Gis/GisMultiLineStringTest.php index f4be2a6e7d..0bb42180e4 100644 --- a/test/classes/Gis/GisMultiLineStringTest.php +++ b/test/classes/Gis/GisMultiLineStringTest.php @@ -70,7 +70,7 @@ class GisMultiLineStringTest extends GisGeomTestCase 1 => [ 'x' => 6.14, 'y' => 0.15, - ] + ], ], 1 => [ 'no_of_points' => 2, @@ -81,8 +81,8 @@ class GisMultiLineStringTest extends GisGeomTestCase 1 => [ 'x' => 9.15, 'y' => 0.47, - ] - ] + ], + ], ], ], ]; @@ -215,7 +215,7 @@ class GisMultiLineStringTest extends GisGeomTestCase 'x' => 9.15, 'y' => 0.47, ], - ] + ], ], ]; @@ -228,7 +228,7 @@ class GisMultiLineStringTest extends GisGeomTestCase null, [ 'srid' => '124', - 0 => $temp + 0 => $temp, ], ], [ diff --git a/test/classes/Gis/GisMultiPointTest.php b/test/classes/Gis/GisMultiPointTest.php index b46e40060a..3d964a061e 100644 --- a/test/classes/Gis/GisMultiPointTest.php +++ b/test/classes/Gis/GisMultiPointTest.php @@ -68,7 +68,7 @@ class GisMultiPointTest extends GisGeomTestCase 1 => [ 'x' => 1.56, 'y' => 4.36, - ] + ], ], ], ]; @@ -110,7 +110,7 @@ class GisMultiPointTest extends GisGeomTestCase 'x' => 6.14, 'y' => 0.15, ], - ] + ], ]; $this->assertEquals( @@ -136,7 +136,7 @@ class GisMultiPointTest extends GisGeomTestCase 1 => [ 'x' => '6.14', 'y' => '0.15', - ] + ], ], ]; $temp2 = $temp1; @@ -148,7 +148,7 @@ class GisMultiPointTest extends GisGeomTestCase null, [ 'srid' => '124', - 0 => $temp1 + 0 => $temp1, ], ], [ diff --git a/test/classes/Gis/GisMultiPolygonTest.php b/test/classes/Gis/GisMultiPolygonTest.php index 12a5296681..c799c8c141 100644 --- a/test/classes/Gis/GisMultiPolygonTest.php +++ b/test/classes/Gis/GisMultiPolygonTest.php @@ -103,7 +103,7 @@ class GisMultiPolygonTest extends GisGeomTestCase 'x' => 20, 'y' => 30, ], - ] + ], ], 1 => [ 'no_of_lines' => 1, @@ -125,8 +125,8 @@ class GisMultiPolygonTest extends GisGeomTestCase 'x' => 123, 'y' => 0, ], - ] - ] + ], + ], ], ]; } @@ -205,7 +205,7 @@ class GisMultiPolygonTest extends GisGeomTestCase null, [ 'srid' => '124', - 0 => $temp + 0 => $temp, ], ], [ diff --git a/test/classes/Gis/GisPointTest.php b/test/classes/Gis/GisPointTest.php index 5439ef14cc..c1c47876b8 100644 --- a/test/classes/Gis/GisPointTest.php +++ b/test/classes/Gis/GisPointTest.php @@ -154,7 +154,7 @@ class GisPointTest extends GisGeomTestCase 'POINT' => [ 'x' => '5.02', 'y' => '8.45', - ] + ], ], ], ], diff --git a/test/classes/Gis/GisPolygonTest.php b/test/classes/Gis/GisPolygonTest.php index 241dd409cc..596d902f35 100644 --- a/test/classes/Gis/GisPolygonTest.php +++ b/test/classes/Gis/GisPolygonTest.php @@ -101,7 +101,7 @@ class GisPolygonTest extends GisGeomTestCase 'x' => 20, 'y' => 30, ], - ] + ], ], ]; } @@ -190,7 +190,7 @@ class GisPolygonTest extends GisGeomTestCase null, [ 'srid' => '124', - 0 => $temp + 0 => $temp, ], ], [ @@ -401,10 +401,10 @@ class GisPolygonTest extends GisGeomTestCase return [ [ - $temp['POLYGON'][0] + $temp['POLYGON'][0], ], [ - $temp['POLYGON'][1] + $temp['POLYGON'][1], ], ]; } diff --git a/test/classes/IndexTest.php b/test/classes/IndexTest.php index 62371026b7..2c01a79873 100644 --- a/test/classes/IndexTest.php +++ b/test/classes/IndexTest.php @@ -43,21 +43,21 @@ class IndexTest extends PmaTestCase "Seq_in_index" => "index1", "Collation" => "Collation1", "Cardinality" => "Cardinality1", - "Null" => "null1" + "Null" => "null1", ]; $column2 = [ "Column_name" => "column2", "Seq_in_index" => "index2", "Collation" => "Collation2", "Cardinality" => "Cardinality2", - "Null" => "null2" + "Null" => "null2", ]; $column3 = [ "Column_name" => "column3", "Seq_in_index" => "index3", "Collation" => "Collation3", "Cardinality" => "Cardinality3", - "Null" => "null3" + "Null" => "null3", ]; $this->_params['columns'][] = $column1; $this->_params['columns'][] = $column2; diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php index f6a885e631..087f3cee32 100644 --- a/test/classes/InsertEditTest.php +++ b/test/classes/InsertEditTest.php @@ -100,7 +100,7 @@ class InsertEditTest extends TestCase { $where_clause = [ 'foo' => 'bar ', - '1' => ' test' + '1' => ' test', ]; $_POST['clause_is_unique'] = false; $_POST['sql_query'] = 'SELECT a'; @@ -123,7 +123,7 @@ class InsertEditTest extends TestCase 'sql_query' => 'SELECT a', 'where_clause[foo]' => 'bar', 'where_clause[1]' => 'test', - 'clause_is_unique' => false + 'clause_is_unique' => false, ], $result ); @@ -341,7 +341,7 @@ class InsertEditTest extends TestCase [ '0' => 1, 'where_clause' => 'bar=2', - 'sql_query' => 'SELECT 1' + 'sql_query' => 'SELECT 1', ], $result ); @@ -408,7 +408,7 @@ class InsertEditTest extends TestCase $column = [ 'Field' => '1<2', 'Field_md5' => 'pswd', - 'Type' => 'float(10, 1)' + 'Type' => 'float(10, 1)', ]; $result = $this->callProtectedMethod('analyzeTableColumnsArray', [ @@ -1229,11 +1229,11 @@ class InsertEditTest extends TestCase [ [ 'plain' => '', - 'html' => '<abc>' + 'html' => '<abc>', ], [ 'plain' => '"foo"', - 'html' => '"foo"' + 'html' => '"foo"', ], ], $result @@ -1468,11 +1468,11 @@ class InsertEditTest extends TestCase [ [ 'plain' => 'a', - 'html' => 'a' + 'html' => 'a', ], [ 'plain' => '<', - 'html' => '<' + 'html' => '<', ], ], 2, @@ -2175,7 +2175,7 @@ class InsertEditTest extends TestCase $url_params = ['ShowFunctionFields' => 2]; $result = $this->callProtectedMethod('getHeadAndFootOfInsertRowTable', [ - $url_params + $url_params, ]); $this->assertStringContainsString( @@ -3681,7 +3681,7 @@ class InsertEditTest extends TestCase [ [ 'Comment' => 'b', - 'Field' => 'd' + 'Field' => 'd', ], ] ) @@ -3725,7 +3725,7 @@ class InsertEditTest extends TestCase [ 'db' => 'foo', 'sql_query' => 'SELECT', - 'table' => 'bar' + 'table' => 'bar', ], $this->insertEdit->getUrlParameters('foo', 'bar') ); diff --git a/test/classes/NormalizationTest.php b/test/classes/NormalizationTest.php index 3b8d8544f1..b29e1ec813 100644 --- a/test/classes/NormalizationTest.php +++ b/test/classes/NormalizationTest.php @@ -421,7 +421,7 @@ class NormalizationTest extends TestCase 'table2' => [ 'pk' => 'id', 'nonpk' => 'col4, col5', - ] + ], ], ], $result1['newTables'] @@ -445,7 +445,7 @@ class NormalizationTest extends TestCase $newTables = [ 'PMA_table' => [ 'PMA_table' => $cols, - 'table1' => $cols1 + 'table1' => $cols1, ], ]; $result = $this->normalization->createNewTablesFor3NF( @@ -547,7 +547,7 @@ class NormalizationTest extends TestCase $choices = [ '1nf' => __('First step of normalization (1NF)'), '2nf' => __('Second step of normalization (1NF+2NF)'), - '3nf' => __('Third step of normalization (1NF+2NF+3NF)') + '3nf' => __('Third step of normalization (1NF+2NF+3NF)'), ]; $htmlTmp = Util::getRadioFields( diff --git a/test/classes/Plugins/Auth/AuthenticationCookieTest.php b/test/classes/Plugins/Auth/AuthenticationCookieTest.php index af282e6c50..d9659db39d 100644 --- a/test/classes/Plugins/Auth/AuthenticationCookieTest.php +++ b/test/classes/Plugins/Auth/AuthenticationCookieTest.php @@ -679,7 +679,7 @@ class AuthenticationCookieTest extends PmaTestCase 'port' => 1, 'socket' => true, 'ssl' => true, - 'user' => 'pmaUser2' + 'user' => 'pmaUser2', ]; $GLOBALS['cfg']['Server'] = $arr; @@ -728,7 +728,7 @@ class AuthenticationCookieTest extends PmaTestCase 'port' => 1, 'socket' => true, 'ssl' => true, - 'user' => 'pmaUser2' + 'user' => 'pmaUser2', ]; $GLOBALS['cfg']['Server'] = $arr; @@ -1109,7 +1109,7 @@ class AuthenticationCookieTest extends PmaTestCase $payload = [ 'password' => $newPassword, - 'server' => 'b 2' + 'server' => 'b 2', ]; $method = new ReflectionMethod( 'PhpMyAdmin\Plugins\Auth\AuthenticationCookie', diff --git a/test/classes/Plugins/Auth/AuthenticationHttpTest.php b/test/classes/Plugins/Auth/AuthenticationHttpTest.php index 8b1e2ed307..a5d9911318 100644 --- a/test/classes/Plugins/Auth/AuthenticationHttpTest.php +++ b/test/classes/Plugins/Auth/AuthenticationHttpTest.php @@ -352,7 +352,7 @@ class AuthenticationHttpTest extends PmaTestCase $GLOBALS['cfg']['Servers'][1] = [ 'host' => 'a', 'user' => 'testUser', - 'foo' => 'bar' + 'foo' => 'bar', ]; $GLOBALS['cfg']['Server'] = [ @@ -385,7 +385,7 @@ class AuthenticationHttpTest extends PmaTestCase $GLOBALS['cfg']['Servers'][1] = [ 'host' => 'a', 'user' => 'testUsers', - 'foo' => 'bar' + 'foo' => 'bar', ]; $GLOBALS['cfg']['Server'] = [ @@ -401,7 +401,7 @@ class AuthenticationHttpTest extends PmaTestCase [ 'user' => 'testUser', 'password' => 'testPass', - 'host' => 'a' + 'host' => 'a', ], $GLOBALS['cfg']['Server'] ); diff --git a/test/classes/Plugins/Export/ExportHtmlwordTest.php b/test/classes/Plugins/Export/ExportHtmlwordTest.php index 8635fb27bd..acf712421f 100644 --- a/test/classes/Plugins/Export/ExportHtmlwordTest.php +++ b/test/classes/Plugins/Export/ExportHtmlwordTest.php @@ -493,7 +493,7 @@ class ExportHtmlwordTest extends PmaTestCase 'fieldname' => [ 'values' => 'test-', 'transformation' => 'testfoo', - 'mimetype' => 'test<' + 'mimetype' => 'test<', ], ] ); @@ -589,7 +589,7 @@ class ExportHtmlwordTest extends PmaTestCase 'field' => [ 'values' => 'test-', 'transformation' => 'testfoo', - 'mimetype' => 'test<' + 'mimetype' => 'test<', ], ] ); @@ -747,7 +747,7 @@ class ExportHtmlwordTest extends PmaTestCase 'name' => 'tna"me', 'action_timing' => 'ac>t', 'event_manipulation' => 'manip&', - 'definition' => 'def' + 'definition' => 'def', ], ]; @@ -904,11 +904,11 @@ class ExportHtmlwordTest extends PmaTestCase 'Null' => 'Yes', 'Field' => 'field', 'Key' => 'PRI', - 'Type' => 'set(abc)enum123' + 'Type' => 'set(abc)enum123', ]; $unique_keys = [ - 'field' + 'field', ]; $this->assertEquals( @@ -927,7 +927,7 @@ class ExportHtmlwordTest extends PmaTestCase ]; $unique_keys = [ - 'field' + 'field', ]; $this->assertEquals( diff --git a/test/classes/Plugins/Export/ExportLatexTest.php b/test/classes/Plugins/Export/ExportLatexTest.php index 41bad6ceb7..6579c89af8 100644 --- a/test/classes/Plugins/Export/ExportLatexTest.php +++ b/test/classes/Plugins/Export/ExportLatexTest.php @@ -700,7 +700,7 @@ class ExportLatexTest extends PmaTestCase 'name1' => [ 'values' => 'test-', 'transformation' => 'testfoo', - 'mimetype' => 'testmimetype_' + 'mimetype' => 'testmimetype_', ], ] ); @@ -710,7 +710,7 @@ class ExportLatexTest extends PmaTestCase 'Null' => 'Yes', 'Field' => 'name1', 'Key' => 'PRI', - 'Type' => 'set(abc)enum123' + 'Type' => 'set(abc)enum123', ], [ 'Null' => 'NO', @@ -820,7 +820,7 @@ class ExportLatexTest extends PmaTestCase 'field' => [ 'values' => 'test-', 'transformation' => 'testfoo', - 'mimetype' => 'test<' + 'mimetype' => 'test<', ], ] ); diff --git a/test/classes/Plugins/Export/ExportMediawikiTest.php b/test/classes/Plugins/Export/ExportMediawikiTest.php index 7a5256aa88..d8595034bc 100644 --- a/test/classes/Plugins/Export/ExportMediawikiTest.php +++ b/test/classes/Plugins/Export/ExportMediawikiTest.php @@ -274,7 +274,7 @@ class ExportMediawikiTest extends PmaTestCase 'Key' => 'PRI', 'Type' => 'set(abc)enum123', 'Default' => '', - 'Extra' => '' + 'Extra' => '', ], [ 'Null' => 'NO', @@ -282,7 +282,7 @@ class ExportMediawikiTest extends PmaTestCase 'Key' => 'COMP', 'Type' => '', 'Default' => 'def', - 'Extra' => 'ext' + 'Extra' => 'ext', ], ]; diff --git a/test/classes/Plugins/Export/ExportOdtTest.php b/test/classes/Plugins/Export/ExportOdtTest.php index 99af1d6d3e..40163b088a 100644 --- a/test/classes/Plugins/Export/ExportOdtTest.php +++ b/test/classes/Plugins/Export/ExportOdtTest.php @@ -716,7 +716,7 @@ class ExportOdtTest extends PmaTestCase 'fieldname' => [ 'values' => 'test-', 'transformation' => 'testfoo', - 'mimetype' => 'test<' + 'mimetype' => 'test<', ], ] ); @@ -822,7 +822,7 @@ class ExportOdtTest extends PmaTestCase 'field' => [ 'values' => 'test-', 'transformation' => 'testfoo', - 'mimetype' => 'test<' + 'mimetype' => 'test<', ], ] ); @@ -902,7 +902,7 @@ class ExportOdtTest extends PmaTestCase 'name' => 'tna"me', 'action_timing' => 'ac>t', 'event_manipulation' => 'manip&', - 'definition' => 'def' + 'definition' => 'def', ], ]; @@ -1096,7 +1096,7 @@ class ExportOdtTest extends PmaTestCase 'Null' => 'Yes', 'Field' => 'field', 'Key' => 'PRI', - 'Type' => 'set(abc)enum123' + 'Type' => 'set(abc)enum123', ]; $col_alias = 'alias'; diff --git a/test/classes/Plugins/Export/ExportPdfTest.php b/test/classes/Plugins/Export/ExportPdfTest.php index 38f13cecf4..f741065790 100644 --- a/test/classes/Plugins/Export/ExportPdfTest.php +++ b/test/classes/Plugins/Export/ExportPdfTest.php @@ -284,7 +284,7 @@ class ExportPdfTest extends PmaTestCase 'dbAlias' => 'db', 'tableAlias' => 'table', 'aliases' => [], - 'purpose' => __('Dumping data') + 'purpose' => __('Dumping data'), ] ); diff --git a/test/classes/Plugins/Export/ExportSqlTest.php b/test/classes/Plugins/Export/ExportSqlTest.php index 6547f113f4..cb924e31e4 100644 --- a/test/classes/Plugins/Export/ExportSqlTest.php +++ b/test/classes/Plugins/Export/ExportSqlTest.php @@ -873,7 +873,7 @@ class ExportSqlTest extends PmaTestCase 'Null' => 'NO', 'Default' => 'a', 'Comment' => 'cmt', - 'Field' => 'fname' + 'Field' => 'fname', ], ] ) @@ -918,7 +918,7 @@ class ExportSqlTest extends PmaTestCase 'Collation' => 'utf-8', 'Null' => 'YES', 'Comment' => 'cmt', - 'Field' => 'fname' + 'Field' => 'fname', ], ] ) @@ -1264,7 +1264,7 @@ class ExportSqlTest extends PmaTestCase 'fieldname' => [ 'values' => 'test-', 'transformation' => 'testfoo', - 'mimetype' => 'test<' + 'mimetype' => 'test<', ], ] ); @@ -1321,7 +1321,7 @@ class ExportSqlTest extends PmaTestCase [ [ 'create' => 'bar', - 'drop' => 'foo' + 'drop' => 'foo', ], ] ) diff --git a/test/classes/Plugins/Export/ExportTexytextTest.php b/test/classes/Plugins/Export/ExportTexytextTest.php index 65ed9bda64..e39b0959bb 100644 --- a/test/classes/Plugins/Export/ExportTexytextTest.php +++ b/test/classes/Plugins/Export/ExportTexytextTest.php @@ -405,7 +405,7 @@ class ExportTexytextTest extends PmaTestCase 'fname' => [ 'values' => 'test-', 'transformation' => 'testfoo', - 'mimetype' => 'test<' + 'mimetype' => 'test<', ], ] ); @@ -479,7 +479,7 @@ class ExportTexytextTest extends PmaTestCase 'name' => 'tna"me', 'action_timing' => 'ac>t', 'event_manipulation' => 'manip&', - 'definition' => 'def' + 'definition' => 'def', ], ]; @@ -645,11 +645,11 @@ class ExportTexytextTest extends PmaTestCase 'Null' => 'Yes', 'Field' => 'field', 'Key' => 'PRI', - 'Type' => 'set(abc)enum123' + 'Type' => 'set(abc)enum123', ]; $unique_keys = [ - 'field' + 'field', ]; $this->assertEquals( @@ -666,7 +666,7 @@ class ExportTexytextTest extends PmaTestCase ]; $unique_keys = [ - 'field' + 'field', ]; $this->assertEquals( diff --git a/test/classes/Plugins/Export/ExportXmlTest.php b/test/classes/Plugins/Export/ExportXmlTest.php index 8405327921..15bcefde52 100644 --- a/test/classes/Plugins/Export/ExportXmlTest.php +++ b/test/classes/Plugins/Export/ExportXmlTest.php @@ -251,7 +251,7 @@ class ExportXmlTest extends PmaTestCase [ [ 'create' => 'crt', - 'name' => 'trname' + 'name' => 'trname', ], ] ) @@ -261,10 +261,10 @@ class ExportXmlTest extends PmaTestCase ->method('getProceduresOrFunctions') ->willReturnOnConsecutiveCalls( [ - 'fn' + 'fn', ], [ - 'pr' + 'pr', ] ); diff --git a/test/classes/Plugins/Schema/DiaRelationSchemaTest.php b/test/classes/Plugins/Schema/DiaRelationSchemaTest.php index 5e48eb8b74..c1454a7780 100644 --- a/test/classes/Plugins/Schema/DiaRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/DiaRelationSchemaTest.php @@ -54,7 +54,7 @@ class DiaRelationSchemaTest extends PmaTestCase 'db' => "information_schema", 'table_info' => 'table_info', 'relwork' => 'relwork', - 'relation' => 'relation' + 'relation' => 'relation', ]; $relation = new Relation($GLOBALS['dbi']); $relation->getRelationsParam(); diff --git a/test/classes/Plugins/Schema/EpsRelationSchemaTest.php b/test/classes/Plugins/Schema/EpsRelationSchemaTest.php index 6ab0c25964..c856eae2a2 100644 --- a/test/classes/Plugins/Schema/EpsRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/EpsRelationSchemaTest.php @@ -55,7 +55,7 @@ class EpsRelationSchemaTest extends PmaTestCase 'db' => "information_schema", 'table_info' => 'table_info', 'relwork' => 'relwork', - 'relation' => 'relation' + 'relation' => 'relation', ]; $relation = new Relation($GLOBALS['dbi']); $relation->getRelationsParam(); diff --git a/test/classes/Plugins/Schema/PdfRelationSchemaTest.php b/test/classes/Plugins/Schema/PdfRelationSchemaTest.php index 09b730ccb0..676af6a01a 100644 --- a/test/classes/Plugins/Schema/PdfRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/PdfRelationSchemaTest.php @@ -67,7 +67,7 @@ class PdfRelationSchemaTest extends PmaTestCase 'mimework' => 'mimework', 'commwork' => 'commwork', 'column_info' => 'column_info', - 'pdf_pages' => 'pdf_pages' + 'pdf_pages' => 'pdf_pages', ]; $relation = new Relation($GLOBALS['dbi']); $relation->getRelationsParam(); diff --git a/test/classes/Plugins/Schema/SvgRelationSchemaTest.php b/test/classes/Plugins/Schema/SvgRelationSchemaTest.php index 647ccd97d9..6eff4811cd 100644 --- a/test/classes/Plugins/Schema/SvgRelationSchemaTest.php +++ b/test/classes/Plugins/Schema/SvgRelationSchemaTest.php @@ -54,7 +54,7 @@ class SvgRelationSchemaTest extends PmaTestCase 'db' => "information_schema", 'table_info' => 'table_info', 'relwork' => 'relwork', - 'relation' => 'relation' + 'relation' => 'relation', ]; $relation = new Relation($GLOBALS['dbi']); $relation->getRelationsParam(); diff --git a/test/classes/RelationTest.php b/test/classes/RelationTest.php index 096a222348..ab7cd010c1 100644 --- a/test/classes/RelationTest.php +++ b/test/classes/RelationTest.php @@ -320,7 +320,7 @@ class RelationTest extends TestCase 'value', ], 'on_delete' => 'CASCADE', - 'on_update' => 'CASCADE' + 'on_update' => 'CASCADE', ], ], ]; diff --git a/test/classes/ReplicationGuiTest.php b/test/classes/ReplicationGuiTest.php index fa45beaa75..6f9c558aa7 100644 --- a/test/classes/ReplicationGuiTest.php +++ b/test/classes/ReplicationGuiTest.php @@ -72,11 +72,11 @@ class ReplicationGuiTest extends TestCase $slave_host = [ [ 'Server_id' => 'Server_id1', - 'Host' => 'Host1' + 'Host' => 'Host1', ], [ 'Server_id' => 'Server_id2', - 'Host' => 'Host2' + 'Host' => 'Host2', ], ]; diff --git a/test/classes/Rte/RoutinesTest.php b/test/classes/Rte/RoutinesTest.php index ef691c49ce..f6050b5b00 100644 --- a/test/classes/Rte/RoutinesTest.php +++ b/test/classes/Rte/RoutinesTest.php @@ -113,7 +113,7 @@ class RoutinesTest extends TestCase 'item_returntype' => '', 'item_isdeterministic' => '', 'item_securitytype' => '', - 'item_sqldataaccess' => '' + 'item_sqldataaccess' => '', ], [ 'item_name' => '', @@ -181,7 +181,7 @@ class RoutinesTest extends TestCase 'item_returntype' => '', 'item_isdeterministic' => 'ON', 'item_securitytype' => 'INVOKER', - 'item_sqldataaccess' => 'NO SQL' + 'item_sqldataaccess' => 'NO SQL', ], [ 'item_name' => 'proc2', @@ -267,7 +267,7 @@ class RoutinesTest extends TestCase 'item_returntype' => 'VARCHAR', 'item_isdeterministic' => '', 'item_securitytype' => 'DEFINER', - 'item_sqldataaccess' => '' + 'item_sqldataaccess' => '', ], [ 'item_name' => 'func2', @@ -1264,7 +1264,7 @@ class RoutinesTest extends TestCase 'item_returntype' => '', 'item_isdeterministic' => '', 'item_securitytype' => 'INVOKER', - 'item_sqldataaccess' => 'NO SQL' + 'item_sqldataaccess' => 'NO SQL', ], 'CREATE DEFINER=`me`@`home` PROCEDURE `p r o c`() COMMENT \'foo\' ' . 'DETERMINISTIC NO SQL SQL SECURITY INVOKER SELECT 0;', @@ -1307,7 +1307,7 @@ class RoutinesTest extends TestCase ], 'item_returntype' => '', 'item_securitytype' => 'DEFINER', - 'item_sqldataaccess' => 'foobar' + 'item_sqldataaccess' => 'foobar', ], 'CREATE DEFINER=`someuser`@`somehost` PROCEDURE `pr````oc`' . '(IN `pa``ram` INT(10) ZEROFILL, INOUT `par 2` ENUM(\'a\', \'b\')' @@ -1335,7 +1335,7 @@ class RoutinesTest extends TestCase 'item_returntype' => 'DECIMAL', 'item_isdeterministic' => 'ON', 'item_securitytype' => 'DEFINER', - 'item_sqldataaccess' => 'READ SQL DATA' + 'item_sqldataaccess' => 'READ SQL DATA', ], 'CREATE FUNCTION `func\\`(`pa``ram` VARCHAR(45) CHARSET latin1) ' . 'RETURNS DECIMAL(5,5) UNSIGNED ZEROFILL COMMENT \'foo\\\'s bar\' ' @@ -1355,7 +1355,7 @@ class RoutinesTest extends TestCase 'item_num_params' => '1', 'item_returntype' => 'VARCHAR', 'item_securitytype' => 'DEFINER', - 'item_sqldataaccess' => 'READ SQL DATA' + 'item_sqldataaccess' => 'READ SQL DATA', ], 'CREATE FUNCTION `func`() RETURNS VARCHAR(20) CHARSET utf8 NOT ' . 'DETERMINISTIC SQL SECURITY DEFINER SELECT 0;', @@ -1387,7 +1387,7 @@ class RoutinesTest extends TestCase 'item_returntype' => '', 'item_isdeterministic' => '', 'item_securitytype' => 'INVOKER', - 'item_sqldataaccess' => 'NO SQL' + 'item_sqldataaccess' => 'NO SQL', ], 'CREATE PROCEDURE `proc`() COMMENT \'foo\' DETERMINISTIC ' . 'NO SQL SQL SECURITY INVOKER SELECT 0;', // valid query @@ -1430,7 +1430,7 @@ class RoutinesTest extends TestCase ], 'item_returntype' => '', 'item_securitytype' => 'DEFINER', - 'item_sqldataaccess' => 'foobar' // invalid, will just be ignored without throwing errors + 'item_sqldataaccess' => 'foobar', // invalid, will just be ignored without throwing errors ], 'CREATE PROCEDURE `proc`((10) ZEROFILL, ' . 'INOUT `goo` ENUM CHARSET latin1) NOT DETERMINISTIC ' @@ -1456,7 +1456,7 @@ class RoutinesTest extends TestCase 'item_param_opts_text' => ['latin1'], 'item_returntype' => 'VARCHAR', 'item_securitytype' => 'DEFINER', - 'item_sqldataaccess' => '' + 'item_sqldataaccess' => '', ], 'CREATE FUNCTION `func`() RETURNS VARCHAR CHARSET utf8 NOT ' . 'DETERMINISTIC SQL SECURITY DEFINER SELECT 0;', // invalid query @@ -1475,7 +1475,7 @@ class RoutinesTest extends TestCase 'item_num_params' => '0', 'item_returntype' => 'FAIL', // invalid return type 'item_securitytype' => 'DEFINER', - 'item_sqldataaccess' => '' + 'item_sqldataaccess' => '', ], 'CREATE FUNCTION `func`() NOT DETERMINISTIC SQL ' . 'SECURITY DEFINER SELECT 0;', // invalid query diff --git a/test/classes/Server/PrivilegesTest.php b/test/classes/Server/PrivilegesTest.php index b1e75cb734..4c44a899cf 100644 --- a/test/classes/Server/PrivilegesTest.php +++ b/test/classes/Server/PrivilegesTest.php @@ -101,7 +101,7 @@ class PrivilegesTest extends TestCase 'db' => 'pmadb', 'users' => 'users', 'usergroups' => 'usergroups', - 'menuswork' => true + 'menuswork' => true, ]; $pmaconfig = $this->getMockBuilder('PhpMyAdmin\Config') @@ -2632,7 +2632,7 @@ class PrivilegesTest extends TestCase 'Host' => 'local', 'Password' => '?', 'Grant_priv' => 'N', - 'privs' => ['USAGE'] + 'privs' => ['USAGE'], ], ], ]; diff --git a/test/classes/Server/UserGroupsTest.php b/test/classes/Server/UserGroupsTest.php index 81a28c6160..d0bc43c4c3 100644 --- a/test/classes/Server/UserGroupsTest.php +++ b/test/classes/Server/UserGroupsTest.php @@ -36,7 +36,7 @@ class UserGroupsTest extends TestCase 'PMA_VERSION' => PMA_VERSION, 'db' => 'pmadb', 'users' => 'users', - 'usergroups' => 'usergroups' + 'usergroups' => 'usergroups', ]; } @@ -108,7 +108,7 @@ class UserGroupsTest extends TestCase [ 'usergroup' => 'usergroup', 'tab' => 'server_sql', - 'allowed' => 'Y' + 'allowed' => 'Y', ] ) ); @@ -141,7 +141,7 @@ class UserGroupsTest extends TestCase . Url::getCommon( [ 'editUserGroup' => 1, - 'userGroup' => htmlspecialchars('usergroup') + 'userGroup' => htmlspecialchars('usergroup'), ], '' ); @@ -153,7 +153,7 @@ class UserGroupsTest extends TestCase . Url::getCommon( [ 'deleteUserGroup' => 1, - 'userGroup' => htmlspecialchars('usergroup') + 'userGroup' => htmlspecialchars('usergroup'), ], '' ); @@ -226,7 +226,7 @@ class UserGroupsTest extends TestCase [ 'usergroup' => 'ug', 'tab' => 'server_sql', - 'allowed' => 'Y' + 'allowed' => 'Y', ], false ); diff --git a/test/classes/Setup/ConfigGeneratorTest.php b/test/classes/Setup/ConfigGeneratorTest.php index aa1cb68c34..11ac5cee8e 100644 --- a/test/classes/Setup/ConfigGeneratorTest.php +++ b/test/classes/Setup/ConfigGeneratorTest.php @@ -124,7 +124,7 @@ class ConfigGeneratorTest extends PmaTestCase 'var_name', [ '1a' => 'foo', - 'b' => 'bar' + 'b' => 'bar', ], "\n" ) diff --git a/test/classes/Setup/IndexTest.php b/test/classes/Setup/IndexTest.php index 229a3ef17e..5a2aeab308 100644 --- a/test/classes/Setup/IndexTest.php +++ b/test/classes/Setup/IndexTest.php @@ -143,12 +143,12 @@ class IndexTest extends TestCase [ 'title' => 'foo', 'message' => '123', - 'fresh' => false + 'fresh' => false, ], [ 'title' => 'bar', 'message' => '321', - 'fresh' => true + 'fresh' => true, ], ], ]; diff --git a/test/classes/SqlTest.php b/test/classes/SqlTest.php index 2fdb829095..f1d7c30be9 100644 --- a/test/classes/SqlTest.php +++ b/test/classes/SqlTest.php @@ -100,31 +100,31 @@ class SqlTest extends TestCase $this->assertTrue( $this->callProtectedMethod('isRememberSortingOrder', [ - $this->sql->parseAndAnalyze('SELECT * FROM tbl') + $this->sql->parseAndAnalyze('SELECT * FROM tbl'), ]) ); $this->assertFalse( $this->callProtectedMethod('isRememberSortingOrder', [ - $this->sql->parseAndAnalyze('SELECT col FROM tbl') + $this->sql->parseAndAnalyze('SELECT col FROM tbl'), ]) ); $this->assertFalse( $this->callProtectedMethod('isRememberSortingOrder', [ - $this->sql->parseAndAnalyze('SELECT 1') + $this->sql->parseAndAnalyze('SELECT 1'), ]) ); $this->assertFalse( $this->callProtectedMethod('isRememberSortingOrder', [ - $this->sql->parseAndAnalyze('SELECT col1, col2 FROM tbl') + $this->sql->parseAndAnalyze('SELECT col1, col2 FROM tbl'), ]) ); $this->assertFalse( $this->callProtectedMethod('isRememberSortingOrder', [ - $this->sql->parseAndAnalyze('SELECT COUNT(*) from tbl') + $this->sql->parseAndAnalyze('SELECT COUNT(*) from tbl'), ]) ); } @@ -141,13 +141,13 @@ class SqlTest extends TestCase $this->assertTrue( $this->callProtectedMethod('isAppendLimitClause', [ - $this->sql->parseAndAnalyze('SELECT * FROM tbl') + $this->sql->parseAndAnalyze('SELECT * FROM tbl'), ]) ); $this->assertFalse( $this->callProtectedMethod('isAppendLimitClause', [ - $this->sql->parseAndAnalyze('SELECT * from tbl LIMIT 0, 10') + $this->sql->parseAndAnalyze('SELECT * from tbl LIMIT 0, 10'), ]) ); } @@ -193,19 +193,19 @@ class SqlTest extends TestCase { $this->assertTrue( $this->callProtectedMethod('isDeleteTransformationInfo', [ - $this->sql->parseAndAnalyze('ALTER TABLE tbl DROP COLUMN col') + $this->sql->parseAndAnalyze('ALTER TABLE tbl DROP COLUMN col'), ]) ); $this->assertTrue( $this->callProtectedMethod('isDeleteTransformationInfo', [ - $this->sql->parseAndAnalyze('DROP TABLE tbl') + $this->sql->parseAndAnalyze('DROP TABLE tbl'), ]) ); $this->assertFalse( $this->callProtectedMethod('isDeleteTransformationInfo', [ - $this->sql->parseAndAnalyze('SELECT * from tbl') + $this->sql->parseAndAnalyze('SELECT * from tbl'), ]) ); } diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php index e39c03df42..85419b334a 100644 --- a/test/classes/TableTest.php +++ b/test/classes/TableTest.php @@ -144,7 +144,7 @@ class TableTest extends PmaTestCase [ [ 'COLUMN_NAME' => 'COLUMN_NAME', - 'DATA_TYPE' => 'DATA_TYPE' + 'DATA_TYPE' => 'DATA_TYPE', ], ], ], @@ -206,7 +206,7 @@ class TableTest extends PmaTestCase 'Null' => 'NO', 'Key' => '', 'Default' => null, - 'Extra' => '' + 'Extra' => '', ], [ 'Field' => 'COLUMN_NAME2', @@ -214,7 +214,7 @@ class TableTest extends PmaTestCase 'Null' => 'YES', 'Key' => '', 'Default' => null, - 'Extra' => 'STORED GENERATED' + 'Extra' => 'STORED GENERATED', ], ], ], diff --git a/test/classes/TrackerTest.php b/test/classes/TrackerTest.php index 0ec2608836..19bc8a2b3c 100644 --- a/test/classes/TrackerTest.php +++ b/test/classes/TrackerTest.php @@ -47,7 +47,7 @@ class TrackerTest extends PmaTestCase $_SESSION['relation'][$GLOBALS['server']] = [ 'PMA_VERSION' => PMA_VERSION, 'db' => 'pmadb', - 'tracking' => 'tracking' + 'tracking' => 'tracking', ]; $dbi = $this->getMockBuilder('PhpMyAdmin\DatabaseInterface') @@ -106,7 +106,7 @@ class TrackerTest extends PmaTestCase 'PMA_VERSION' => PMA_VERSION, 'trackingwork' => true, 'db' => 'pmadb', - 'tracking' => 'tracking' + 'tracking' => 'tracking', ]; $this->assertTrue( @@ -239,12 +239,12 @@ class TrackerTest extends PmaTestCase [ 'Field' => 'field1', 'Type' => 'int(11)', - 'Key' => 'PRI' + 'Key' => 'PRI', ], [ 'Field' => 'field2', 'Type' => 'text', - 'Key' => '' + 'Key' => '', ], ]; $dbi->expects($this->once())->method('getColumns') @@ -255,7 +255,7 @@ class TrackerTest extends PmaTestCase [ 'Table' => 'pma_tbl', 'Field' => 'field1', - 'Key' => 'PRIMARY' + 'Key' => 'PRIMARY', ], ]; $dbi->expects($this->once())->method('getTableIndexes') @@ -654,7 +654,7 @@ class TrackerTest extends PmaTestCase "# log 20-03-2013 23:39:58 user2\n", "data_sql" => "# log ", "schema_snapshot" => "dataschema", - "tracking" => "SELECT, DELETE" + "tracking" => "SELECT, DELETE", ], ]; @@ -676,7 +676,7 @@ class TrackerTest extends PmaTestCase ], 'dmlog' => [], "schema_snapshot" => "dataschema", - "tracking" => "SELECT, DELETE" + "tracking" => "SELECT, DELETE", ], ]; @@ -686,7 +686,7 @@ class TrackerTest extends PmaTestCase "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" + "tracking" => "SELECT, DELETE", ]; $data[1] = [ @@ -717,7 +717,7 @@ class TrackerTest extends PmaTestCase ], ], "schema_snapshot" => "dataschema", - "tracking" => "SELECT, DELETE" + "tracking" => "SELECT, DELETE", ]; return [ [ diff --git a/test/classes/TrackingTest.php b/test/classes/TrackingTest.php index d2db4b556a..f25ea5861d 100644 --- a/test/classes/TrackingTest.php +++ b/test/classes/TrackingTest.php @@ -184,7 +184,7 @@ class TrackingTest extends TestCase 'db_name' => 'PMA_db', 'table_name' => 'PMA_table', 'date_created' => 'date_created', - 'date_updated' => 'date_updated' + 'date_updated' => 'date_updated', ]; // return fetchArray for selectable entries for ($i = 2; $i < 6; $i++) { @@ -359,7 +359,7 @@ class TrackingTest extends TestCase "Null" => 'YES', 'Extra' => 'Extra1', 'Key' => 'PRI', - 'Comment' => 'Comment1' + 'Comment' => 'Comment1', ], [ 'Field' => 'Field2', @@ -368,7 +368,7 @@ class TrackingTest extends TestCase "Null" => 'No', 'Extra' => 'Extra2', 'Key' => 'Key2', - 'Comment' => 'Comment2' + 'Comment' => 'Comment2', ], ]; @@ -475,7 +475,7 @@ class TrackingTest extends TestCase $data = [ 'tracking' => 'tracking', 'ddlog' => ['ddlog'], - 'dmlog' => ['dmlog'] + 'dmlog' => ['dmlog'], ]; $url_params = []; $selection_schema = []; @@ -581,7 +581,7 @@ class TrackingTest extends TestCase 'username' => 'username', ], ], - 'ddlog' => ['ddlog'] + 'ddlog' => ['ddlog'], ]; $url_params = []; $ddlog_count = 10; @@ -645,7 +645,7 @@ class TrackingTest extends TestCase 'username' => 'username', ], ], - 'dmlog' => ['dmlog'] + 'dmlog' => ['dmlog'], ]; $filter_users = ["*"]; $filter_ts_to = 9999999999; diff --git a/test/classes/TransformationsTest.php b/test/classes/TransformationsTest.php index 9bd0f4ce9d..82714b602f 100644 --- a/test/classes/TransformationsTest.php +++ b/test/classes/TransformationsTest.php @@ -129,7 +129,7 @@ class TransformationsTest extends TestCase 'Image/JPEG' => 'Image/JPEG', 'Image/PNG' => 'Image/PNG', 'Text/Plain' => 'Text/Plain', - 'Text/Octetstream' => 'Text/Octetstream' + 'Text/Octetstream' => 'Text/Octetstream', ], 'transformation' => [ 0 => 'Application/Octetstream: Download', diff --git a/test/classes/TwoFactorTest.php b/test/classes/TwoFactorTest.php index bc0d8a2b32..42f581b989 100644 --- a/test/classes/TwoFactorTest.php +++ b/test/classes/TwoFactorTest.php @@ -262,8 +262,8 @@ class TwoFactorTest extends PmaTestCase $_SESSION['authenticationRequest'] = [new SignRequest([ 'challenge' => 'fEnc9oV79EaBgK5BoNERU5gPKM2XGYWrz4fUjgc0Q7g', 'keyHandle' => 'CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w', - 'appId' => 'http://demo.example.com' - ]) + 'appId' => 'http://demo.example.com', + ]), ]; $this->assertFalse($object->check(true)); $_POST['u2f_authentication_response'] = '{ "signatureData": "AQAAAAQwRQIhAI6FSrMD3KUUtkpiP0jpIEakql-HNhwWFngyw553pS1CAiAKLjACPOhxzZXuZsVO8im-HStEcYGC50PKhsGp_SUAng==", "clientData": "eyAiY2hhbGxlbmdlIjogImZFbmM5b1Y3OUVhQmdLNUJvTkVSVTVnUEtNMlhHWVdyejRmVWpnYzBRN2ciLCAib3JpZ2luIjogImh0dHA6XC9cL2RlbW8uZXhhbXBsZS5jb20iLCAidHlwIjogIm5hdmlnYXRvci5pZC5nZXRBc3NlcnRpb24iIH0=", "keyHandle": "CTUayZo8hCBeC-sGQJChC0wW-bBg99bmOlGCgw8XGq4dLsxO3yWh9mRYArZxocP5hBB1pEGB3bbJYiM-5acc5w", "errorCode": 0 }'; diff --git a/test/classes/TypesTest.php b/test/classes/TypesTest.php index 5aa42d9e0a..884c7d69cb 100644 --- a/test/classes/TypesTest.php +++ b/test/classes/TypesTest.php @@ -761,8 +761,8 @@ class TypesTest extends PmaTestCase 'GEOMETRYCOLLECTION', ], 'JSON' => [ - 'JSON' - ] + 'JSON', + ], ], $this->object->getColumns() ); diff --git a/test/classes/UserPreferencesTest.php b/test/classes/UserPreferencesTest.php index 8baa2363e4..64bce4a902 100644 --- a/test/classes/UserPreferencesTest.php +++ b/test/classes/UserPreferencesTest.php @@ -50,7 +50,7 @@ class UserPreferencesTest extends PmaTestCase { $GLOBALS['cfg'] = [ 'Server/hide_db' => 'testval123', - 'Server/port' => '213' + 'Server/port' => '213', ]; $GLOBALS['cfg']['AvailableCharsets'] = []; $GLOBALS['cfg']['UserprefsDeveloperTab'] = null; @@ -144,7 +144,7 @@ class UserPreferencesTest extends PmaTestCase 2, ], 'mtime' => 123, - 'type' => 'db' + 'type' => 'db', ], $result ); @@ -280,7 +280,7 @@ class UserPreferencesTest extends PmaTestCase { $GLOBALS['cfg']['UserprefsDisallow'] = [ 'test' => 'val', - 'foo' => 'bar' + 'foo' => 'bar', ]; $GLOBALS['cfg']['UserprefsDeveloperTab'] = null; $result = $this->userPreferences->apply( @@ -289,7 +289,7 @@ class UserPreferencesTest extends PmaTestCase 'ErrorHandler/display' => true, 'ErrorHandler/gather' => false, 'Servers/foobar' => '123', - 'Server/hide_db' => true + 'Server/hide_db' => true, ] ); diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php index a486945946..5f3ce05cbd 100644 --- a/test/classes/UtilTest.php +++ b/test/classes/UtilTest.php @@ -686,7 +686,7 @@ class UtilTest extends PmaTestCase ], 'attribute' => ' ', 'can_contain_collation' => true, - 'displayed_type' => "set('a', 'b')" + 'displayed_type' => "set('a', 'b')", ], ], [ @@ -704,7 +704,7 @@ class UtilTest extends PmaTestCase ], 'attribute' => ' ', 'can_contain_collation' => true, - 'displayed_type' => "set('\'a', 'b')" + 'displayed_type' => "set('\'a', 'b')", ], ], [ @@ -722,7 +722,7 @@ class UtilTest extends PmaTestCase ], 'attribute' => ' ', 'can_contain_collation' => true, - 'displayed_type' => "set('''a', 'b')" + 'displayed_type' => "set('''a', 'b')", ], ], [ @@ -741,7 +741,7 @@ class UtilTest extends PmaTestCase ], 'attribute' => ' ', 'can_contain_collation' => true, - 'displayed_type' => "enum('a&b', 'b''c\\'d', 'e\\\\f')" + 'displayed_type' => "enum('a&b', 'b''c\\'d', 'e\\\\f')", ], ], [ @@ -756,7 +756,7 @@ class UtilTest extends PmaTestCase 'enum_set_values' => [], 'attribute' => 'UNSIGNED ZEROFILL', 'can_contain_collation' => false, - 'displayed_type' => "int" + 'displayed_type' => "int", ], ], [ @@ -771,7 +771,7 @@ class UtilTest extends PmaTestCase 'enum_set_values' => [], 'attribute' => ' ', 'can_contain_collation' => true, - 'displayed_type' => "varchar(255)" + 'displayed_type' => "varchar(255)", ], ], [ @@ -786,7 +786,7 @@ class UtilTest extends PmaTestCase 'enum_set_values' => [], 'attribute' => ' ', 'can_contain_collation' => false, - 'displayed_type' => "varbinary(255)" + 'displayed_type' => "varbinary(255)", ], ], ]; diff --git a/test/classes/ZipExtensionTest.php b/test/classes/ZipExtensionTest.php index ba69b5e29d..ab4f698179 100644 --- a/test/classes/ZipExtensionTest.php +++ b/test/classes/ZipExtensionTest.php @@ -63,7 +63,7 @@ class ZipExtensionTest extends PmaTestCase null, [ 'error' => '', - 'data' => 'TEST FILE' . "\n" + 'data' => 'TEST FILE' . "\n", ], ], [ @@ -71,7 +71,7 @@ class ZipExtensionTest extends PmaTestCase 'test', [ 'error' => 'Error in ZIP archive: Could not find "test"', - 'data' => '' + 'data' => '', ], ], ]; diff --git a/view_operations.php b/view_operations.php index 0f9766ee7f..719d8540d6 100644 --- a/view_operations.php +++ b/view_operations.php @@ -118,7 +118,7 @@ $drop_view_url_params = array_merge( __('View %s has been dropped.'), $GLOBALS['table'] ), - 'table' => $GLOBALS['table'] + 'table' => $GLOBALS['table'], ] );