From 50bcfc8ed6e158869e87ea7fd8ae7d7c15b03297 Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Wed, 8 May 2019 00:14:17 +0200
Subject: [PATCH 1/8] Remove useless attribute

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 libraries/classes/Header.php |  1 -
 libraries/classes/Menu.php   | 15 +++------------
 test/classes/MenuTest.php    | 10 +++++-----
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php
index 7329545d00..ec27062cc4 100644
--- a/libraries/classes/Header.php
+++ b/libraries/classes/Header.php
@@ -134,7 +134,6 @@ class Header
         $db = strlen($GLOBALS['db']) ? $GLOBALS['db'] : '';
         $table = strlen($GLOBALS['table']) ? $GLOBALS['table'] : '';
         $this->_menu = new Menu(
-            $GLOBALS['server'],
             $db,
             $table
         );
diff --git a/libraries/classes/Menu.php b/libraries/classes/Menu.php
index 384f2eab2d..f69c31822d 100644
--- a/libraries/classes/Menu.php
+++ b/libraries/classes/Menu.php
@@ -16,13 +16,6 @@ namespace PhpMyAdmin;
  */
 class Menu
 {
-    /**
-     * Server id
-     *
-     * @access private
-     * @var int
-     */
-    private $_server;
     /**
      * Database name
      *
@@ -46,13 +39,11 @@ class Menu
     /**
      * Creates a new instance of Menu
      *
-     * @param int    $server Server id
-     * @param string $db     Database name
-     * @param string $table  Table name
+     * @param string $db    Database name
+     * @param string $table Table name
      */
-    public function __construct($server, $db, $table)
+    public function __construct($db, $table)
     {
-        $this->_server = $server;
         $this->_db = $db;
         $this->_table = $table;
         $this->relation = new Relation($GLOBALS['dbi']);
diff --git a/test/classes/MenuTest.php b/test/classes/MenuTest.php
index 9a23912934..3f903a9812 100644
--- a/test/classes/MenuTest.php
+++ b/test/classes/MenuTest.php
@@ -47,7 +47,7 @@ class MenuTest extends PmaTestCase
      */
     public function testServer()
     {
-        $menu = new Menu('server', '', '');
+        $menu = new Menu('', '');
         $this->assertStringContainsString(
             'floating_menubar',
             $menu->getDisplay()
@@ -61,7 +61,7 @@ class MenuTest extends PmaTestCase
      */
     public function testDatabase()
     {
-        $menu = new Menu('server', 'pma_test', '');
+        $menu = new Menu('pma_test', '');
         $this->assertStringContainsString(
             'floating_menubar',
             $menu->getDisplay()
@@ -75,7 +75,7 @@ class MenuTest extends PmaTestCase
      */
     public function testTable()
     {
-        $menu = new Menu('server', 'pma_test', 'table1');
+        $menu = new Menu('pma_test', 'table1');
         $this->assertStringContainsString(
             'floating_menubar',
             $menu->getDisplay()
@@ -89,7 +89,7 @@ class MenuTest extends PmaTestCase
      */
     public function testTableDisplay()
     {
-        $menu = new Menu('server', 'pma_test', '');
+        $menu = new Menu('pma_test', '');
         $this->expectOutputString(
             $menu->getDisplay()
         );
@@ -104,7 +104,7 @@ class MenuTest extends PmaTestCase
      */
     public function testSetTable()
     {
-        $menu = new Menu('server', 'pma_test', '');
+        $menu = new Menu('pma_test', '');
         $menu->setTable('table1');
         $this->assertStringContainsString(
             'table1',

From 158a13828f23f600a8f143c5163935ff9820f219 Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Wed, 8 May 2019 00:16:57 +0200
Subject: [PATCH 2/8] Remove useless unset

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 libraries/classes/Display/Results.php                | 2 --
 libraries/classes/Import.php                         | 2 --
 libraries/classes/InsertEdit.php                     | 1 -
 libraries/classes/Plugins/Import/ImportMediawiki.php | 3 ---
 libraries/classes/Sql.php                            | 1 -
 5 files changed, 9 deletions(-)

diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php
index d747966eb4..012fced2aa 100644
--- a/libraries/classes/Display/Results.php
+++ b/libraries/classes/Display/Results.php
@@ -1877,8 +1877,6 @@ class Results
             }
             // Separate columns by a comma
             $sort_order .= ", ";
-
-            unset($name_to_use_in_sort);
         }
         // remove the comma from the last column name in the newly
         // constructed clause
diff --git a/libraries/classes/Import.php b/libraries/classes/Import.php
index ebbb29d08b..266c9289ff 100644
--- a/libraries/classes/Import.php
+++ b/libraries/classes/Import.php
@@ -1330,8 +1330,6 @@ class Import
 
         global $import_notice;
         $import_notice = $message;
-
-        unset($tables);
     }
 
 
diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php
index 105b0e2971..dcf706d771 100644
--- a/libraries/classes/InsertEdit.php
+++ b/libraries/classes/InsertEdit.php
@@ -2310,7 +2310,6 @@ class InsertEdit
             . ' (' . implode(', ', $query_fields) . ') VALUES ('
             . implode('), (', $value_sets) . ')'
         ];
-        unset($insert_command, $query_fields);
         return $query;
     }
 
diff --git a/libraries/classes/Plugins/Import/ImportMediawiki.php b/libraries/classes/Plugins/Import/ImportMediawiki.php
index a6de49e78b..b5678b93c6 100644
--- a/libraries/classes/Plugins/Import/ImportMediawiki.php
+++ b/libraries/classes/Plugins/Import/ImportMediawiki.php
@@ -402,9 +402,6 @@ class ImportMediawiki extends ImportPlugin
 
         // Create and execute necessary SQL statements from data
         $this->import->buildSql($db_name, $tables, $analyses, $create, $options, $sql_data);
-
-        unset($tables);
-        unset($analyses);
     }
 
     /**
diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php
index 4b80506730..a5a6e0a8ef 100644
--- a/libraries/classes/Sql.php
+++ b/libraries/classes/Sql.php
@@ -1618,7 +1618,6 @@ class Sql
                 }
 
                 $GLOBALS['dbi']->freeResult($result);
-                unset($result);
             } while ($GLOBALS['dbi']->moreResults() && $GLOBALS['dbi']->nextResult());
         } else {
             $fields_meta = [];

From 59d720d7ddda2e854660ef4fcb9f6993ed66bfea Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Wed, 8 May 2019 00:17:11 +0200
Subject: [PATCH 3/8] Remove useless method parameter

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 libraries/classes/Display/Results.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php
index 012fced2aa..cd050de516 100644
--- a/libraries/classes/Display/Results.php
+++ b/libraries/classes/Display/Results.php
@@ -1691,8 +1691,7 @@ class Results
                 $sort_tbl,
                 $name_to_use_in_sort,
                 $sort_direction,
-                $fields_meta,
-                $column_index
+                $fields_meta
             );
 
         if (preg_match(
@@ -1760,7 +1759,6 @@ class Results
      *                                              consideration
      * @param array    $sort_direction              sort direction
      * @param stdClass $fields_meta                 set of field properties
-     * @param integer  $column_index                The index number to current column
      *
      * @return  array   3 element array - $single_sort_order, $sort_order, $order_img
      *
@@ -1774,8 +1772,7 @@ class Results
         $sort_tbl,
         $name_to_use_in_sort,
         array $sort_direction,
-        $fields_meta,
-        $column_index
+        $fields_meta
     ) {
         $sort_order = "";
         // Check if the current column is in the order by clause

From 91e9acb2638f5509e8ed07a7c6b55b19806a868e Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Wed, 8 May 2019 00:31:08 +0200
Subject: [PATCH 4/8] Update PHPDoc

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 libraries/classes/Config/Validator.php                 |  2 +-
 .../classes/Controllers/Table/SearchController.php     |  2 +-
 libraries/classes/Dbi/DbiDummy.php                     |  2 +-
 libraries/classes/Gis/GisPolygon.php                   |  2 +-
 libraries/classes/InsertEdit.php                       |  2 +-
 libraries/classes/Normalization.php                    | 10 +++++-----
 .../Options/Groups/OptionsPropertySubgroup.php         |  2 +-
 libraries/classes/Relation.php                         |  2 +-
 libraries/classes/Rte/Events.php                       |  2 +-
 libraries/classes/Rte/Routines.php                     |  2 +-
 libraries/classes/Rte/Triggers.php                     |  2 +-
 libraries/classes/Template.php                         |  6 +++---
 libraries/classes/Transformations.php                  |  2 +-
 13 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/libraries/classes/Config/Validator.php b/libraries/classes/Config/Validator.php
index b755fc2139..5f8761bf5f 100644
--- a/libraries/classes/Config/Validator.php
+++ b/libraries/classes/Config/Validator.php
@@ -557,7 +557,7 @@ class Validator
      * @param array  $values config values
      * @param string $regex  regular expression to match
      *
-     * @return array
+     * @return array|string
      */
     public static function validateByRegex($path, array $values, $regex)
     {
diff --git a/libraries/classes/Controllers/Table/SearchController.php b/libraries/classes/Controllers/Table/SearchController.php
index 32109d173d..d2f405a2f3 100644
--- a/libraries/classes/Controllers/Table/SearchController.php
+++ b/libraries/classes/Controllers/Table/SearchController.php
@@ -696,7 +696,7 @@ class SearchController extends AbstractController
      * @param string $replaceWith string to replace with
      * @param string $charSet     character set of the connection
      *
-     * @return array Array containing original values, replaced values and count
+     * @return array|bool Array containing original values, replaced values and count
      */
     private function _getRegexReplaceRows(
         $columnIndex,
diff --git a/libraries/classes/Dbi/DbiDummy.php b/libraries/classes/Dbi/DbiDummy.php
index 41c18035c6..042f482b0e 100644
--- a/libraries/classes/Dbi/DbiDummy.php
+++ b/libraries/classes/Dbi/DbiDummy.php
@@ -135,7 +135,7 @@ class DbiDummy implements DbiExtension
      *
      * @param object $result MySQL result
      *
-     * @return array
+     * @return array|bool
      */
     public function fetchAny($result)
     {
diff --git a/libraries/classes/Gis/GisPolygon.php b/libraries/classes/Gis/GisPolygon.php
index c292f2f2c4..4642136360 100644
--- a/libraries/classes/Gis/GisPolygon.php
+++ b/libraries/classes/Gis/GisPolygon.php
@@ -506,7 +506,7 @@ class GisPolygon extends GisGeometry
      *
      * @param array $ring array of points forming the ring
      *
-     * @return array|void a point on the surface of the ring
+     * @return array|bool a point on the surface of the ring
      * @access public
      * @static
      */
diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php
index dcf706d771..f7edea0c54 100644
--- a/libraries/classes/InsertEdit.php
+++ b/libraries/classes/InsertEdit.php
@@ -2570,7 +2570,7 @@ class InsertEdit
      * @param array  $func_no_param           array of set of string
      * @param string $key                     an md5 of the column name
      *
-     * @return array
+     * @return string
      */
     public function getCurrentValueAsAnArrayForMultipleEdit(
         $multi_edit_funcs,
diff --git a/libraries/classes/Normalization.php b/libraries/classes/Normalization.php
index 89f4876e3b..9b7e2c1d33 100644
--- a/libraries/classes/Normalization.php
+++ b/libraries/classes/Normalization.php
@@ -234,7 +234,7 @@ class Normalization
      * @param string $db    current database
      * @param string $table current table
      *
-     * @return string HTML contents for step 1.2
+     * @return string[] HTML contents for step 1.2
      */
     public function getHtmlContentsFor1NFStep2($db, $table)
     {
@@ -284,7 +284,7 @@ class Normalization
      * @param string $db    current database
      * @param string $table current table
      *
-     * @return string HTML contents for step 1.4
+     * @return string[] HTML contents for step 1.4
      */
     public function getHtmlContentsFor1NFStep4($db, $table)
     {
@@ -320,7 +320,7 @@ class Normalization
      * @param string $db    current database
      * @param string $table current table
      *
-     * @return string HTML contents for step 1.3
+     * @return string[] HTML contents for step 1.3
      */
     public function getHtmlContentsFor1NFStep3($db, $table)
     {
@@ -365,7 +365,7 @@ class Normalization
      * @param string $db    current database
      * @param string $table current table
      *
-     * @return string HTML contents for 2NF step 2.1
+     * @return string[] HTML contents for 2NF step 2.1
      */
     public function getHtmlFor2NFstep1($db, $table)
     {
@@ -798,7 +798,7 @@ class Normalization
      * @param string $db     current database
      * @param array  $tables tables formed after 2NF and need to process for 3NF
      *
-     * @return string
+     * @return string[]
      */
     public function getHtmlFor3NFstep1($db, array $tables)
     {
diff --git a/libraries/classes/Properties/Options/Groups/OptionsPropertySubgroup.php b/libraries/classes/Properties/Options/Groups/OptionsPropertySubgroup.php
index 1475e4dc84..8143b8fa3a 100644
--- a/libraries/classes/Properties/Options/Groups/OptionsPropertySubgroup.php
+++ b/libraries/classes/Properties/Options/Groups/OptionsPropertySubgroup.php
@@ -21,7 +21,7 @@ class OptionsPropertySubgroup extends OptionsPropertyGroup
     /**
      * Subgroup Header
      *
-     * @var string
+     * @var \PhpMyAdmin\Properties\PropertyItem
      */
     private $_subgroupHeader;
     /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
diff --git a/libraries/classes/Relation.php b/libraries/classes/Relation.php
index 1ce9e722be..e47049af71 100644
--- a/libraries/classes/Relation.php
+++ b/libraries/classes/Relation.php
@@ -1141,7 +1141,7 @@ class Relation
      *
      * @param string $username the username
      *
-     * @return array    list of history items
+     * @return array|bool list of history items
      *
      * @access  public
      */
diff --git a/libraries/classes/Rte/Events.php b/libraries/classes/Rte/Events.php
index 13947380c7..bb0d52bff4 100644
--- a/libraries/classes/Rte/Events.php
+++ b/libraries/classes/Rte/Events.php
@@ -344,7 +344,7 @@ class Events
      *
      * @param string $name The name of the event.
      *
-     * @return array Data necessary to create the editor.
+     * @return array|bool Data necessary to create the editor.
      */
     public function getDataFromName($name)
     {
diff --git a/libraries/classes/Rte/Routines.php b/libraries/classes/Rte/Routines.php
index 6bb50c7bd7..2cbe65f9ca 100644
--- a/libraries/classes/Rte/Routines.php
+++ b/libraries/classes/Rte/Routines.php
@@ -642,7 +642,7 @@ class Routines
      * @param string $type Type of routine (ROUTINE|PROCEDURE)
      * @param bool   $all  Whether to return all data or just the info about parameters.
      *
-     * @return array    Data necessary to create the routine editor.
+     * @return array|bool    Data necessary to create the routine editor.
      */
     public function getDataFromName($name, $type, $all = true)
     {
diff --git a/libraries/classes/Rte/Triggers.php b/libraries/classes/Rte/Triggers.php
index 866eb38486..45ce02f948 100644
--- a/libraries/classes/Rte/Triggers.php
+++ b/libraries/classes/Rte/Triggers.php
@@ -311,7 +311,7 @@ class Triggers
      *
      * @param string $name The name of the trigger.
      *
-     * @return array Data necessary to create the editor.
+     * @return array|bool Data necessary to create the editor.
      */
     public function getDataFromName($name)
     {
diff --git a/libraries/classes/Template.php b/libraries/classes/Template.php
index 02d722bfc7..48334fc362 100644
--- a/libraries/classes/Template.php
+++ b/libraries/classes/Template.php
@@ -89,9 +89,9 @@ class Template
      * @param string $templateName Template path name
      *
      * @return \Twig_TemplateWrapper
-     * @throws \Twig_Error_Loader
-     * @throws \Twig_Error_Runtime
-     * @throws \Twig_Error_Syntax
+     * @throws \Twig\Error\LoaderError
+     * @throws \Twig\Error\RuntimeError
+     * @throws \Twig\Error\SyntaxError
      */
     public function load(string $templateName): \Twig_TemplateWrapper
     {
diff --git a/libraries/classes/Transformations.php b/libraries/classes/Transformations.php
index f150f6d96b..41488b6513 100644
--- a/libraries/classes/Transformations.php
+++ b/libraries/classes/Transformations.php
@@ -258,7 +258,7 @@ class Transformations
      *
      * @access public
      *
-     * @return array [field_name][field_key] = field_value
+     * @return array|bool [field_name][field_key] = field_value
      */
     public function getMime($db, $table, $strict = false, $fullName = false)
     {

From ff3325870fd2d81e10597bc8d1095d5afce6647b Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Wed, 8 May 2019 00:58:11 +0200
Subject: [PATCH 5/8] Remove unused variables

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 libraries/classes/Controllers/Table/SearchController.php | 2 --
 libraries/classes/Database/MultiTableQuery.php           | 1 -
 libraries/classes/Header.php                             | 8 --------
 libraries/classes/Import.php                             | 5 ++---
 libraries/classes/Plugins/Export/Helpers/Pdf.php         | 9 +--------
 libraries/classes/Transformations.php                    | 2 --
 libraries/classes/Url.php                                | 4 ----
 libraries/classes/Util.php                               | 7 -------
 8 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/libraries/classes/Controllers/Table/SearchController.php b/libraries/classes/Controllers/Table/SearchController.php
index d2f405a2f3..02c3c268c6 100644
--- a/libraries/classes/Controllers/Table/SearchController.php
+++ b/libraries/classes/Controllers/Table/SearchController.php
@@ -477,8 +477,6 @@ class SearchController extends AbstractController
         /**
          * Add this to ensure following procedures included running correctly.
          */
-        $db = $this->db;
-
         $sql = new Sql();
         $sql->executeQueryAndSendQueryResponse(
             null, // analyzed_sql_results
diff --git a/libraries/classes/Database/MultiTableQuery.php b/libraries/classes/Database/MultiTableQuery.php
index 4e1c648dcd..d7f896d35e 100644
--- a/libraries/classes/Database/MultiTableQuery.php
+++ b/libraries/classes/Database/MultiTableQuery.php
@@ -114,7 +114,6 @@ class MultiTableQuery
         list(
             $analyzedSqlResults,
             $db,
-            $tableFromSql
         ) = ParseAnalyze::sqlQuery($sqlQuery, $db);
 
         extract($analyzedSqlResults);
diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php
index ec27062cc4..b10e93f5d1 100644
--- a/libraries/classes/Header.php
+++ b/libraries/classes/Header.php
@@ -201,14 +201,6 @@ class Header
         // the user preferences have not been merged at this point
 
         $this->_scripts->addFile('messages.php', ['l' => $GLOBALS['lang']]);
-        // Append the theme id to this url to invalidate
-        // the cache on a theme change. Though this might be
-        // unavailable for fatal errors.
-        if (isset($GLOBALS['PMA_Theme'])) {
-            $theme_id = urlencode($GLOBALS['PMA_Theme']->getId());
-        } else {
-            $theme_id = 'default';
-        }
         $this->_scripts->addFile('config.js');
         $this->_scripts->addFile('doclinks.js');
         $this->_scripts->addFile('functions.js');
diff --git a/libraries/classes/Import.php b/libraries/classes/Import.php
index 266c9289ff..3e23adec19 100644
--- a/libraries/classes/Import.php
+++ b/libraries/classes/Import.php
@@ -95,8 +95,7 @@ class Import
      */
     public function executeQuery(string $sql, string $full, array &$sql_data): void
     {
-        global $go_sql,
-            $sql_query, $my_die, $error, $reload,
+        global $sql_query, $my_die, $error, $reload,
             $result, $msg,
             $cfg, $sql_query_disabled, $db;
 
@@ -365,7 +364,7 @@ class Import
      */
     public function getNextChunk(int $size = 32768)
     {
-        global $compression, $import_handle, $charset_conversion, $charset_of_file,
+        global $import_handle, $charset_conversion, $charset_of_file,
             $read_multiply;
 
         // Add some progression while reading large amount of data
diff --git a/libraries/classes/Plugins/Export/Helpers/Pdf.php b/libraries/classes/Plugins/Export/Helpers/Pdf.php
index 7cca55f6a8..e4c28b5414 100644
--- a/libraries/classes/Plugins/Export/Helpers/Pdf.php
+++ b/libraries/classes/Plugins/Export/Helpers/Pdf.php
@@ -351,13 +351,8 @@ class Pdf extends PdfLib
      */
     public function getTriggers($db, $table)
     {
-        $i = 0;
         $triggers = $GLOBALS['dbi']->getTriggers($db, $table);
-        foreach ($triggers as $trigger) {
-            $i++;
-            break;
-        }
-        if ($i == 0) {
+        if ([] === $triggers) {
             return; //prevents printing blank trigger list for any table
         }
 
@@ -407,8 +402,6 @@ class Pdf extends PdfLib
         $maxpage = $this->page;
         $data = [];
 
-        $triggers = $GLOBALS['dbi']->getTriggers($db, $table);
-
         foreach ($triggers as $trigger) {
             $data[] = $trigger['name'];
             $data[] = $trigger['action_timing'];
diff --git a/libraries/classes/Transformations.php b/libraries/classes/Transformations.php
index 41488b6513..1eb0dc53d7 100644
--- a/libraries/classes/Transformations.php
+++ b/libraries/classes/Transformations.php
@@ -300,8 +300,6 @@ class Transformations
 
         foreach ($result as $column => $values) {
             // convert mimetype to new format (f.e. Text_Plain, etc)
-            $delimiter_space = '- ';
-            $delimiter = "_";
             $values['mimetype'] = $this->fixUpMime($values['mimetype']);
 
             // For transformation of form
diff --git a/libraries/classes/Url.php b/libraries/classes/Url.php
index ca1dd6c47c..64668b6e06 100644
--- a/libraries/classes/Url.php
+++ b/libraries/classes/Url.php
@@ -40,10 +40,6 @@ class Url
     ) {
         if (is_array($db)) {
             $params  =& $db;
-            $_indent = empty($table) ? $indent : $table;
-            $_skip   = empty($indent) ? $skip : $indent;
-            $indent  =& $_indent;
-            $skip    =& $_skip;
         } else {
             $params = [];
             if (strlen((string) $db) > 0) {
diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index 9c0045cee5..52978f5b7d 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -121,13 +121,6 @@ class Util
     {
         $alternate = htmlspecialchars($alternate);
 
-        // Set $url accordingly
-        if (isset($GLOBALS['pmaThemeImage'])) {
-            $url = $GLOBALS['pmaThemeImage'] . $image;
-        } else {
-            $url = './themes/pmahomme/' . $image;
-        }
-
         if (isset($attributes['class'])) {
             $attributes['class'] = "icon ic_$image " . $attributes['class'];
         } else {

From 7b00f5d35a538b043b676d45629b86b70e957508 Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Wed, 8 May 2019 00:58:31 +0200
Subject: [PATCH 6/8] Update PHPDoc

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 libraries/classes/DatabaseInterface.php | 2 +-
 libraries/classes/Operations.php        | 4 ++--
 libraries/classes/Sanitize.php          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php
index 19eb344485..9bf2e43ac7 100644
--- a/libraries/classes/DatabaseInterface.php
+++ b/libraries/classes/DatabaseInterface.php
@@ -2162,7 +2162,7 @@ class DatabaseInterface
      * @param string $table     table name
      * @param string $delimiter the delimiter to use (may be empty)
      *
-     * @return mixed information about triggers (may be empty)
+     * @return array information about triggers (may be empty)
      */
     public function getTriggers(string $db, string $table = '', $delimiter = '//')
     {
diff --git a/libraries/classes/Operations.php b/libraries/classes/Operations.php
index d56b6543a4..e3242946dd 100644
--- a/libraries/classes/Operations.php
+++ b/libraries/classes/Operations.php
@@ -931,7 +931,7 @@ class Operations
      *
      * @param Table  $pma_table          Table object
      * @param string $comment            Comment
-     * @param array  $tbl_collation      table collation
+     * @param string $tbl_collation      table collation
      * @param string $tbl_storage_engine table storage engine
      * @param string $pack_keys          pack keys
      * @param string $auto_increment     value of auto increment
@@ -1083,7 +1083,7 @@ class Operations
      *
      * @param Table  $pma_table          Table object
      * @param string $comment            Comment
-     * @param array  $tbl_collation      table collation
+     * @param string $tbl_collation      table collation
      * @param string $tbl_storage_engine table storage engine
      * @param string $pack_keys          pack keys
      * @param string $delay_key_write    delay key write
diff --git a/libraries/classes/Sanitize.php b/libraries/classes/Sanitize.php
index 6be07332cb..16031bc0d7 100644
--- a/libraries/classes/Sanitize.php
+++ b/libraries/classes/Sanitize.php
@@ -418,7 +418,7 @@ class Sanitize
     /**
      * Removes all variables from request except whitelisted ones.
      *
-     * @param string $whitelist list of variables to allow
+     * @param string[] $whitelist list of variables to allow
      *
      * @return void
      * @access public

From d4699ac8a56eb83e92b00e915bc676701807ac40 Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Wed, 8 May 2019 00:58:43 +0200
Subject: [PATCH 7/8] Remove unused private method

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 libraries/classes/InsertEdit.php | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php
index f7edea0c54..66dab9289f 100644
--- a/libraries/classes/InsertEdit.php
+++ b/libraries/classes/InsertEdit.php
@@ -3518,19 +3518,4 @@ class InsertEdit
 
         return $html_output;
     }
-
-    /**
-     * Returns whether the user has necessary insert/update privileges for the column
-     *
-     * @param array $table_column array of column details
-     * @param bool  $insert_mode  whether on insert mode
-     *
-     * @return boolean whether user has necessary privileges
-     */
-    private function userHasColumnPrivileges(array $table_column, $insert_mode)
-    {
-        $privileges = $table_column['Privileges'];
-        return ($insert_mode && false !== strpos($privileges, 'insert'))
-            || (! $insert_mode && false !== strpos($privileges, 'update'));
-    }
 }

From b68ae133ca6b91c18c642ec177df67586fd754cb Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Wed, 8 May 2019 00:58:55 +0200
Subject: [PATCH 8/8] Add return type hint

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 libraries/classes/Sanitize.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/classes/Sanitize.php b/libraries/classes/Sanitize.php
index 16031bc0d7..c5324c16f3 100644
--- a/libraries/classes/Sanitize.php
+++ b/libraries/classes/Sanitize.php
@@ -423,7 +423,7 @@ class Sanitize
      * @return void
      * @access public
      */
-    public static function removeRequestVars(&$whitelist)
+    public static function removeRequestVars(&$whitelist): void
     {
         // do not check only $_REQUEST because it could have been overwritten
         // and use type casting because the variables could have become