From ca3c5e17b041690d585794d4595f2e7250cdd589 Mon Sep 17 00:00:00 2001
From: charliewindred <charliewindred@gmail.com>
Date: Tue, 2 Jun 2020 16:05:12 +0100
Subject: [PATCH 1/8] Remove underscore prefix from method names

Removed underscore from method names for PSR-12 compliance.
Signed-off-by: charliewindred <charliewindred@gmail.com>
---
 libraries/classes/Config.php                  |  14 +-
 libraries/classes/Config/FormDisplay.php      |  42 ++--
 libraries/classes/Config/PageSettings.php     |  12 +-
 libraries/classes/Database/Qbe.php            | 146 +++++------
 libraries/classes/Footer.php                  |  18 +-
 .../classes/Gis/GisGeometryCollection.php     |  14 +-
 libraries/classes/Gis/GisMultiPolygon.php     |   8 +-
 libraries/classes/Gis/GisPolygon.php          |   8 +-
 libraries/classes/Gis/GisVisualization.php    |  56 ++---
 libraries/classes/Header.php                  |   8 +-
 libraries/classes/Html/Generator.php          |   4 +-
 libraries/classes/Index.php                   |   8 +-
 libraries/classes/Menu.php                    |  26 +-
 libraries/classes/OutputBuffering.php         |   4 +-
 .../Plugins/Auth/AuthenticationCookie.php     |  14 +-
 .../classes/Plugins/Export/ExportCodegen.php  |   8 +-
 .../Plugins/Export/ExportMediawiki.php        |  66 ++---
 .../classes/Plugins/Export/ExportPdf.php      |  24 +-
 .../classes/Plugins/Export/ExportSql.php      | 232 +++++++++---------
 .../classes/Plugins/Export/ExportXml.php      |  22 +-
 .../classes/Plugins/Import/ImportCsv.php      |  14 +-
 .../Plugins/Import/ImportMediawiki.php        |  46 ++--
 .../classes/Plugins/Import/ImportSql.php      |   4 +-
 .../Plugins/Schema/Dia/DiaRelationSchema.php  |  14 +-
 .../Plugins/Schema/Dia/RelationStatsDia.php   |   6 +-
 .../Plugins/Schema/Eps/EpsRelationSchema.php  |  14 +-
 .../Plugins/Schema/Eps/TableStatsEps.php      |   8 +-
 .../Plugins/Schema/Pdf/PdfRelationSchema.php  |  28 +--
 .../Plugins/Schema/Pdf/TableStatsPdf.php      |   8 +-
 .../classes/Plugins/Schema/RelationStats.php  |   6 +-
 .../Plugins/Schema/Svg/SvgRelationSchema.php  |  24 +-
 .../Plugins/Schema/Svg/TableStatsSvg.php      |   8 +-
 libraries/classes/RecentFavoriteTable.php     |  12 +-
 libraries/classes/Response.php                |  10 +-
 libraries/classes/Scripts.php                 |   4 +-
 libraries/classes/Server/Status/Data.php      |  20 +-
 libraries/classes/Server/SysInfo/SunOs.php    |  18 +-
 .../classes/Server/SysInfo/WindowsNt.php      |   8 +-
 libraries/classes/Setup/ConfigGenerator.php   |  18 +-
 libraries/classes/Table.php                   |  12 +-
 libraries/classes/ThemeManager.php            |   4 +-
 libraries/classes/Tracker.php                 |  28 +--
 libraries/classes/Util.php                    |   4 +-
 test/classes/Database/DesignerTest.php        |   8 +-
 test/classes/Gis/GisMultiPolygonTest.php      |   8 +-
 test/classes/Gis/GisPolygonTest.php           |   8 +-
 test/selenium/CreateDropDatabaseTest.php      |   4 +-
 test/selenium/Database/EventsTest.php         |   6 +-
 test/selenium/Database/OperationsTest.php     |   8 +-
 test/selenium/Database/ProceduresTest.php     |  12 +-
 test/selenium/Database/TriggersTest.php       |   6 +-
 test/selenium/ExportTest.php                  |   8 +-
 test/selenium/ImportTest.php                  |   8 +-
 test/selenium/NormalizationTest.php           |   4 +-
 test/selenium/ServerSettingsTest.php          |  10 +-
 test/selenium/SqlQueryTest.php                |   8 +-
 test/selenium/Table/CreateTest.php            |   4 +-
 test/selenium/Table/InsertTest.php            |   4 +-
 test/selenium/TrackingTest.php                |   6 +-
 59 files changed, 582 insertions(+), 582 deletions(-)

diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php
index 39ec3b422481..4ce67e5ff57a 100644
--- a/libraries/classes/Config.php
+++ b/libraries/classes/Config.php
@@ -171,7 +171,7 @@ public function checkOutputCompression(): void
      *
      * @param string $user_agent the user agent
      */
-    private function _setClientPlatform(string $user_agent): void
+    private function setClientPlatform(string $user_agent): void
     {
         if (mb_strstr($user_agent, 'Win')) {
             $this->set('PMA_USR_OS', 'Win');
@@ -203,7 +203,7 @@ public function checkClient(): void
         }
 
         // 1. Platform
-        $this->_setClientPlatform($HTTP_USER_AGENT);
+        $this->setClientPlatform($HTTP_USER_AGENT);
 
         // 2. browser and version
         // (must check everything else before Mozilla)
@@ -500,7 +500,7 @@ static function ($key) {
     /**
      * Sets the connection collation
      */
-    private function _setConnectionCollation(): void
+    private function setConnectionCollation(): void
     {
         $collation_connection = $this->get('DefaultConnectionCollation');
         if (empty($collation_connection)
@@ -617,7 +617,7 @@ public function loadUserPreferences(): void
         }
 
         // set connection collation
-        $this->_setConnectionCollation();
+        $this->setConnectionCollation();
     }
 
     /**
@@ -1205,7 +1205,7 @@ public static function fatalErrorHandler(): void
      * @param string $filename File to check and render
      * @param string $id       Div ID
      */
-    private static function _renderCustom(string $filename, string $id): string
+    private static function renderCustom(string $filename, string $id): string
     {
         $retval = '';
         if (@file_exists($filename)) {
@@ -1224,7 +1224,7 @@ private static function _renderCustom(string $filename, string $id): string
      */
     public static function renderFooter(): string
     {
-        return self::_renderCustom(CUSTOM_FOOTER_FILE, 'pma_footer');
+        return self::renderCustom(CUSTOM_FOOTER_FILE, 'pma_footer');
     }
 
     /**
@@ -1232,7 +1232,7 @@ public static function renderFooter(): string
      */
     public static function renderHeader(): string
     {
-        return self::_renderCustom(CUSTOM_HEADER_FILE, 'pma_header');
+        return self::renderCustom(CUSTOM_HEADER_FILE, 'pma_header');
     }
 
     /**
diff --git a/libraries/classes/Config/FormDisplay.php b/libraries/classes/Config/FormDisplay.php
index bc754d44ef13..dd5e20a0a991 100644
--- a/libraries/classes/Config/FormDisplay.php
+++ b/libraries/classes/Config/FormDisplay.php
@@ -196,7 +196,7 @@ public function process($allowPartialSave = true, $checkFormSubmit = true)
      *
      * @return void
      */
-    private function _validate()
+    private function validate()
     {
         if ($this->_isValidated) {
             return;
@@ -251,7 +251,7 @@ private function _validate()
      *
      * @return string
      */
-    private function _displayForms(
+    private function displayForms(
         $showRestoreDefault,
         array &$jsDefault,
         array &$js,
@@ -279,7 +279,7 @@ private function _displayForms(
                     ? ! isset($this->_userprefsDisallow[$path])
                     : null;
                 // display input
-                $htmlOutput .= $this->_displayFieldInput(
+                $htmlOutput .= $this->displayFieldInput(
                     $form,
                     $field,
                     $path,
@@ -349,14 +349,14 @@ public function getDisplay(
             }
         }
         if (! $isNewServer) {
-            $this->_validate();
+            $this->validate();
         }
 
         // user preferences
-        $this->_loadUserprefsInfo();
+        $this->loadUserprefsInfo();
 
         // display forms
-        $htmlOutput .= $this->_displayForms(
+        $htmlOutput .= $this->displayForms(
             $showRestoreDefault,
             $jsDefault,
             $js,
@@ -404,7 +404,7 @@ public function getDisplay(
      *
      * @return string|null HTML for input field
      */
-    private function _displayFieldInput(
+    private function displayFieldInput(
         Form $form,
         $field,
         $systemPath,
@@ -500,7 +500,7 @@ private function _displayFieldInput(
                 $v = $ip . ': ' . $v;
             }
         }
-        $this->_setComments($systemPath, $opts);
+        $this->setComments($systemPath, $opts);
 
         // send default value to form's JS
         $jsLine = '\'' . $translatedPath . '\': ';
@@ -549,7 +549,7 @@ private function _displayFieldInput(
      */
     public function displayErrors()
     {
-        $this->_validate();
+        $this->validate();
         if (count($this->_errors) === 0) {
             return null;
         }
@@ -575,7 +575,7 @@ public function displayErrors()
      */
     public function fixErrors()
     {
-        $this->_validate();
+        $this->validate();
         if (count($this->_errors) === 0) {
             return;
         }
@@ -598,7 +598,7 @@ public function fixErrors()
      *
      * @return bool
      */
-    private function _validateSelect(&$value, array $allowed): bool
+    private function validateSelect(&$value, array $allowed): bool
     {
         $valueCmp = is_bool($value)
             ? (int) $value
@@ -643,7 +643,7 @@ public function save($forms, $allowPartialSave = true)
         $toSave = [];
         $isSetupScript = $GLOBALS['PMA_Config']->get('is_setup');
         if ($isSetupScript) {
-            $this->_loadUserprefsInfo();
+            $this->loadUserprefsInfo();
         }
 
         $this->_errors = [];
@@ -712,7 +712,7 @@ public function save($forms, $allowPartialSave = true)
                         }
                         break;
                     case 'select':
-                        $successfullyValidated = $this->_validateSelect(
+                        $successfullyValidated = $this->validateSelect(
                             $_POST[$key],
                             $form->getOptionValueList($systemPath)
                         );
@@ -733,7 +733,7 @@ public function save($forms, $allowPartialSave = true)
                         ? $_POST[$key]
                         : explode("\n", $_POST[$key]);
                         $_POST[$key] = [];
-                        $this->_fillPostArrayParameters($postValues, $key);
+                        $this->fillPostArrayParameters($postValues, $key);
                         break;
                 }
 
@@ -753,7 +753,7 @@ public function save($forms, $allowPartialSave = true)
         // save forms
         if (! $allowPartialSave && ! empty($this->_errors)) {
             // don't look for non-critical errors
-            $this->_validate();
+            $this->validate();
 
             return $result;
         }
@@ -792,7 +792,7 @@ public function save($forms, $allowPartialSave = true)
         }
 
         // don't look for non-critical errors
-        $this->_validate();
+        $this->validate();
 
         return $result;
     }
@@ -823,7 +823,7 @@ public function getDocLink($path)
 
         return MySQLDocumentation::getDocumentationLink(
             'config',
-            'cfg_' . $this->_getOptName($path),
+            'cfg_' . $this->getOptName($path),
             Sanitize::isSetup() ? '../' : './'
         );
     }
@@ -835,7 +835,7 @@ public function getDocLink($path)
      *
      * @return string
      */
-    private function _getOptName($path)
+    private function getOptName($path)
     {
         return str_replace(['Servers/1/', '/'], ['Servers/', '_'], $path);
     }
@@ -845,7 +845,7 @@ private function _getOptName($path)
      *
      * @return void
      */
-    private function _loadUserprefsInfo()
+    private function loadUserprefsInfo()
     {
         if ($this->_userprefsKeys !== null) {
             return;
@@ -867,7 +867,7 @@ private function _loadUserprefsInfo()
      *
      * @return void
      */
-    private function _setComments($systemPath, array &$opts)
+    private function setComments($systemPath, array &$opts)
     {
         // RecodingEngine - mark unavailable types
         if ($systemPath == 'RecodingEngine') {
@@ -955,7 +955,7 @@ private function _setComments($systemPath, array &$opts)
      *
      * @return void
      */
-    private function _fillPostArrayParameters(array $postValues, $key)
+    private function fillPostArrayParameters(array $postValues, $key)
     {
         foreach ($postValues as $v) {
             $v = Util::requestString($v);
diff --git a/libraries/classes/Config/PageSettings.php b/libraries/classes/Config/PageSettings.php
index e8af7c3ea58e..c67dd96dcf43 100644
--- a/libraries/classes/Config/PageSettings.php
+++ b/libraries/classes/Config/PageSettings.php
@@ -81,11 +81,11 @@ public function __construct($formGroupName, $elemId = null)
         if (isset($_POST['submit_save'])
             && $_POST['submit_save'] == $formGroupName
         ) {
-            $this->_processPageSettings($formDisplay, $cf, $error);
+            $this->processPageSettings($formDisplay, $cf, $error);
         }
 
         // Display forms
-        $this->_HTML = $this->_getPageSettingsDisplay($formDisplay, $error);
+        $this->_HTML = $this->getPageSettingsDisplay($formDisplay, $error);
     }
 
     /**
@@ -97,7 +97,7 @@ public function __construct($formGroupName, $elemId = null)
      *
      * @return void
      */
-    private function _processPageSettings(&$formDisplay, &$cf, &$error)
+    private function processPageSettings(&$formDisplay, &$cf, &$error)
     {
         if (! $formDisplay->process(false) || $formDisplay->hasErrors()) {
             return;
@@ -125,7 +125,7 @@ private function _processPageSettings(&$formDisplay, &$cf, &$error)
      *
      * @return void
      */
-    private function _storeError(&$formDisplay, &$error)
+    private function storeError(&$formDisplay, &$error)
     {
         $retval = '';
         if ($error) {
@@ -152,13 +152,13 @@ private function _storeError(&$formDisplay, &$error)
      *
      * @return string
      */
-    private function _getPageSettingsDisplay(&$formDisplay, &$error)
+    private function getPageSettingsDisplay(&$formDisplay, &$error)
     {
         $response = Response::getInstance();
 
         $retval = '';
 
-        $this->_storeError($formDisplay, $error);
+        $this->storeError($formDisplay, $error);
 
         $retval .= '<div id="' . $this->_elemId . '">';
         $retval .= '<div class="page_settings">';
diff --git a/libraries/classes/Database/Qbe.php b/libraries/classes/Database/Qbe.php
index 6fd889fae42d..4286dd00f672 100644
--- a/libraries/classes/Database/Qbe.php
+++ b/libraries/classes/Database/Qbe.php
@@ -264,10 +264,10 @@ public function __construct(
         $this->relation = $relation;
         $this->template = $template;
 
-        $this->_loadCriterias();
+        $this->loadCriterias();
         // Sets criteria parameters
-        $this->_setSearchParams();
-        $this->_setCriteriaTablesAndColumns();
+        $this->setSearchParams();
+        $this->setCriteriaTablesAndColumns();
     }
 
     /**
@@ -275,7 +275,7 @@ public function __construct(
      *
      * @return static
      */
-    private function _loadCriterias()
+    private function loadCriterias()
     {
         if ($this->_currentSearch === null
             || $this->_currentSearch->getCriterias() === null
@@ -294,7 +294,7 @@ private function _loadCriterias()
      *
      * @return SavedSearches
      */
-    private function _getCurrentSearch()
+    private function getCurrentSearch()
     {
         return $this->_currentSearch;
     }
@@ -304,9 +304,9 @@ private function _getCurrentSearch()
      *
      * @return void
      */
-    private function _setSearchParams()
+    private function setSearchParams()
     {
-        $criteriaColumnCount = $this->_initializeCriteriasCount();
+        $criteriaColumnCount = $this->initializeCriteriasCount();
 
         $this->_criteriaColumnInsert = Core::ifSetOr(
             $_POST['criteriaColumnInsert'],
@@ -341,7 +341,7 @@ private function _setSearchParams()
      *
      * @return void
      */
-    private function _setCriteriaTablesAndColumns()
+    private function setCriteriaTablesAndColumns()
     {
         // The tables list sent by a previously submitted form
         if (Core::isValid($_POST['TableList'], 'array')) {
@@ -401,7 +401,7 @@ private function _setCriteriaTablesAndColumns()
      *
      * @return string HTML for select options
      */
-    private function _showColumnSelectCell($column_number, $selected = '')
+    private function showColumnSelectCell($column_number, $selected = '')
     {
         return $this->template->render('database/qbe/column_select_cell', [
             'column_number' => $column_number,
@@ -418,7 +418,7 @@ private function _showColumnSelectCell($column_number, $selected = '')
      *
      * @return string HTML for select options
      */
-    private function _getSortSelectCell(
+    private function getSortSelectCell(
         $columnNumber,
         $selected = ''
     ) {
@@ -437,9 +437,9 @@ private function _getSortSelectCell(
      *
      * @return string HTML for select options
      */
-    private function _getSortOrderSelectCell($columnNumber, $sortOrder)
+    private function getSortOrderSelectCell($columnNumber, $sortOrder)
     {
-        $totalColumnCount = $this->_getNewColumnCount();
+        $totalColumnCount = $this->getNewColumnCount();
 
         return $this->template->render('database/qbe/sort_order_select_cell', [
             'total_column_count' => $totalColumnCount,
@@ -453,7 +453,7 @@ private function _getSortOrderSelectCell($columnNumber, $sortOrder)
      *
      * @return int new column count
      */
-    private function _getNewColumnCount()
+    private function getNewColumnCount()
     {
         $totalColumnCount = $this->_criteria_column_count;
         if (! empty($this->_criteriaColumnInsert)) {
@@ -471,7 +471,7 @@ private function _getNewColumnCount()
      *
      * @return string HTML for search table's row
      */
-    private function _getColumnNamesRow()
+    private function getColumnNamesRow()
     {
         $html_output = '';
 
@@ -480,7 +480,7 @@ private function _getColumnNamesRow()
             if (isset($this->_criteriaColumnInsert[$column_index])
                 && $this->_criteriaColumnInsert[$column_index] == 'on'
             ) {
-                $html_output .= $this->_showColumnSelectCell(
+                $html_output .= $this->showColumnSelectCell(
                     $new_column_count
                 );
                 $new_column_count++;
@@ -497,7 +497,7 @@ private function _getColumnNamesRow()
                 $this->_formColumns[$new_column_count]
                     = $_POST['criteriaColumn'][$column_index];
             }
-            $html_output .= $this->_showColumnSelectCell(
+            $html_output .= $this->showColumnSelectCell(
                 $new_column_count,
                 $selected
             );
@@ -513,7 +513,7 @@ private function _getColumnNamesRow()
      *
      * @return string HTML for search table's row
      */
-    private function _getColumnAliasRow()
+    private function getColumnAliasRow()
     {
         $html_output = '';
 
@@ -561,7 +561,7 @@ private function _getColumnAliasRow()
      *
      * @return string HTML for search table's row
      */
-    private function _getSortRow()
+    private function getSortRow()
     {
         $html_output = '';
 
@@ -572,7 +572,7 @@ private function _getSortRow()
                 && isset($this->_criteriaColumnInsert[$colInd])
                 && $this->_criteriaColumnInsert[$colInd] == 'on'
             ) {
-                $html_output .= $this->_getSortSelectCell($new_column_count);
+                $html_output .= $this->getSortSelectCell($new_column_count);
                 $new_column_count++;
             } // end if
 
@@ -604,7 +604,7 @@ private function _getSortRow()
                 $this->_formSorts[$new_column_count] = '';
             }
 
-            $html_output .= $this->_getSortSelectCell(
+            $html_output .= $this->getSortSelectCell(
                 $new_column_count,
                 $selected
             );
@@ -619,7 +619,7 @@ private function _getSortRow()
      *
      * @return string HTML for search table's row
      */
-    private function _getSortOrder()
+    private function getSortOrder()
     {
         $html_output = '';
 
@@ -630,7 +630,7 @@ private function _getSortOrder()
                 && isset($this->_criteriaColumnInsert[$colInd])
                 && $this->_criteriaColumnInsert[$colInd] == 'on'
             ) {
-                $html_output .= $this->_getSortOrderSelectCell(
+                $html_output .= $this->getSortOrderSelectCell(
                     $new_column_count,
                     null
                 );
@@ -651,7 +651,7 @@ private function _getSortOrder()
                         = $_POST['criteriaSortOrder'][$colInd];
             }
 
-            $html_output .= $this->_getSortOrderSelectCell(
+            $html_output .= $this->getSortOrderSelectCell(
                 $new_column_count,
                 $sortOrder
             );
@@ -666,7 +666,7 @@ private function _getSortOrder()
      *
      * @return string HTML for search table's row
      */
-    private function _getShowRow()
+    private function getShowRow()
     {
         $html_output = '';
 
@@ -711,7 +711,7 @@ private function _getShowRow()
      *
      * @return string HTML for search table's row
      */
-    private function _getCriteriaInputboxRow()
+    private function getCriteriaInputboxRow()
     {
         $html_output = '';
 
@@ -778,7 +778,7 @@ private function _getCriteriaInputboxRow()
      *
      * @return string HTML for modification cell
      */
-    private function _getAndOrColCell(
+    private function getAndOrColCell(
         $column_number,
         $selected = null,
         $last_column = false
@@ -811,7 +811,7 @@ private function _getAndOrColCell(
      *
      * @return string HTML for search table's row
      */
-    private function _getModifyColumnsRow()
+    private function getModifyColumnsRow()
     {
         $html_output = '';
 
@@ -821,7 +821,7 @@ private function _getModifyColumnsRow()
                 && isset($this->_criteriaColumnInsert[$column_index])
                 && $this->_criteriaColumnInsert[$column_index] == 'on'
             ) {
-                $html_output .= $this->_getAndOrColCell($new_column_count);
+                $html_output .= $this->getAndOrColCell($new_column_count);
                 $new_column_count++;
             } // end if
 
@@ -846,7 +846,7 @@ private function _getModifyColumnsRow()
                 $checked_options['and'] = ' checked="checked"';
                 $checked_options['or']  = '';
             }
-            $html_output .= $this->_getAndOrColCell(
+            $html_output .= $this->getAndOrColCell(
                 $new_column_count,
                 $checked_options,
                 $column_index + 1 == $this->_criteria_column_count
@@ -865,7 +865,7 @@ private function _getModifyColumnsRow()
      *
      * @return string HTML table rows
      */
-    private function _getInputboxRow($new_row_index)
+    private function getInputboxRow($new_row_index)
     {
         $html_output = '';
         $new_column_count = 0;
@@ -916,7 +916,7 @@ private function _getInputboxRow($new_row_index)
      *
      * @return string HTML table rows
      */
-    private function _getInsDelAndOrCriteriaRows()
+    private function getInsDelAndOrCriteriaRows()
     {
         $html_output = '';
         $new_row_count = 0;
@@ -932,7 +932,7 @@ private function _getInsDelAndOrCriteriaRows()
                     'row_index' => $new_row_count,
                     'checked_options' => $checked_options,
                 ]);
-                $html_output .= $this->_getInputboxRow(
+                $html_output .= $this->getInputboxRow(
                     $new_row_count
                 );
                 $new_row_count++;
@@ -961,7 +961,7 @@ private function _getInsDelAndOrCriteriaRows()
                 'row_index' => $new_row_count,
                 'checked_options' => $checked_options,
             ]);
-            $html_output .= $this->_getInputboxRow(
+            $html_output .= $this->getInputboxRow(
                 $new_row_count
             );
             $new_row_count++;
@@ -977,7 +977,7 @@ private function _getInsDelAndOrCriteriaRows()
      *
      * @return string Select clause
      */
-    private function _getSelectClause()
+    private function getSelectClause()
     {
         $select_clause = '';
         $select_clauses = [];
@@ -1009,7 +1009,7 @@ private function _getSelectClause()
      *
      * @return string Where clause
      */
-    private function _getWhereClause()
+    private function getWhereClause()
     {
         $where_clause = '';
         $criteria_cnt = 0;
@@ -1095,7 +1095,7 @@ private function _getWhereClause()
      *
      * @return string Order By clause
      */
-    private function _getOrderByClause()
+    private function getOrderByClause()
     {
         $orderby_clause = '';
         $orderby_clauses = [];
@@ -1150,7 +1150,7 @@ private function _getOrderByClause()
      *
      * @return array having UNIQUE and INDEX columns
      */
-    private function _getIndexes(
+    private function getIndexes(
         array $search_tables,
         array $search_columns,
         array $where_clause_columns
@@ -1197,7 +1197,7 @@ private function _getIndexes(
      *
      * @return array having UNIQUE and INDEX columns
      */
-    private function _getLeftJoinColumnCandidates(
+    private function getLeftJoinColumnCandidates(
         array $search_tables,
         array $search_columns,
         array $where_clause_columns
@@ -1205,7 +1205,7 @@ private function _getLeftJoinColumnCandidates(
         $this->dbi->selectDb($this->_db);
 
         // Get unique columns and index columns
-        $indexes = $this->_getIndexes(
+        $indexes = $this->getIndexes(
             $search_tables,
             $search_columns,
             $where_clause_columns
@@ -1214,7 +1214,7 @@ private function _getLeftJoinColumnCandidates(
         $index_columns = $indexes['index'];
 
         [$candidate_columns, $needsort]
-            = $this->_getLeftJoinColumnCandidatesBest(
+            = $this->getLeftJoinColumnCandidatesBest(
                 $search_tables,
                 $where_clause_columns,
                 $unique_columns,
@@ -1261,7 +1261,7 @@ private function _getLeftJoinColumnCandidates(
      *
      * @return string table name
      */
-    private function _getMasterTable(
+    private function getMasterTable(
         array $search_tables,
         array $search_columns,
         array $where_clause_columns,
@@ -1277,7 +1277,7 @@ private function _getMasterTable(
         // (When the control user is the same as the normal user
         // because they are using one of their databases as pmadb,
         // the last db selected is not always the one where we need to work)
-        $candidate_columns = $this->_getLeftJoinColumnCandidates(
+        $candidate_columns = $this->getLeftJoinColumnCandidates(
             $search_tables,
             $search_columns,
             $where_clause_columns
@@ -1349,7 +1349,7 @@ private function _getMasterTable(
      *
      * @return array
      */
-    private function _getWhereClauseTablesAndColumns()
+    private function getWhereClauseTablesAndColumns()
     {
         $where_clause_columns = [];
         $where_clause_tables = [];
@@ -1388,7 +1388,7 @@ private function _getWhereClauseTablesAndColumns()
      *
      * @return string FROM clause
      */
-    private function _getFromClause(array $formColumns)
+    private function getFromClause(array $formColumns)
     {
         $from_clause = '';
         if (empty($formColumns)) {
@@ -1415,7 +1415,7 @@ private function _getFromClause(array $formColumns)
         } // end while
 
         // Create LEFT JOINS out of Relations
-        $from_clause = $this->_getJoinForFromClause(
+        $from_clause = $this->getJoinForFromClause(
             $search_tables,
             $search_columns
         );
@@ -1441,23 +1441,23 @@ private function _getFromClause(array $formColumns)
      *
      * @return string table name
      */
-    private function _getJoinForFromClause(array $searchTables, array $searchColumns)
+    private function getJoinForFromClause(array $searchTables, array $searchColumns)
     {
         // $relations[master_table][foreign_table] => clause
         $relations = [];
 
         // Fill $relations with inter table relationship data
         foreach ($searchTables as $oneTable) {
-            $this->_loadRelationsForTable($relations, $oneTable);
+            $this->loadRelationsForTable($relations, $oneTable);
         }
 
         // Get tables and columns with valid where clauses
-        $validWhereClauses = $this->_getWhereClauseTablesAndColumns();
+        $validWhereClauses = $this->getWhereClauseTablesAndColumns();
         $whereClauseTables = $validWhereClauses['where_clause_tables'];
         $whereClauseColumns = $validWhereClauses['where_clause_columns'];
 
         // Get master table
-        $master = $this->_getMasterTable(
+        $master = $this->getMasterTable(
             $searchTables,
             $searchColumns,
             $whereClauseColumns,
@@ -1472,7 +1472,7 @@ private function _getJoinForFromClause(array $searchTables, array $searchColumns
             $finalized[$master] = '';
         }
         // Fill the $finalized array with JOIN clauses for each table
-        $this->_fillJoinClauses($finalized, $relations, $searchTables);
+        $this->fillJoinClauses($finalized, $relations, $searchTables);
 
         // JOIN clause
         $join = '';
@@ -1495,7 +1495,7 @@ private function _getJoinForFromClause(array $searchTables, array $searchColumns
 
                         $table = $reference['table_name'];
 
-                        $this->_loadRelationsForTable($relations, $table);
+                        $this->loadRelationsForTable($relations, $table);
 
                         // Make copies
                         $tempFinalized = $finalized;
@@ -1503,7 +1503,7 @@ private function _getJoinForFromClause(array $searchTables, array $searchColumns
                         $tempSearchTables[] = $table;
 
                         // Try joining with the added table
-                        $this->_fillJoinClauses(
+                        $this->fillJoinClauses(
                             $tempFinalized,
                             $relations,
                             $tempSearchTables
@@ -1567,7 +1567,7 @@ private function _getJoinForFromClause(array $searchTables, array $searchColumns
      *
      * @return void
      */
-    private function _loadRelationsForTable(array &$relations, $oneTable)
+    private function loadRelationsForTable(array &$relations, $oneTable)
     {
         $relations[$oneTable] = [];
 
@@ -1608,7 +1608,7 @@ private function _loadRelationsForTable(array &$relations, $oneTable)
      *
      * @return void
      */
-    private function _fillJoinClauses(array &$finalized, array $relations, array $searchTables)
+    private function fillJoinClauses(array &$finalized, array $relations, array $searchTables)
     {
         while (true) {
             $added = false;
@@ -1651,20 +1651,20 @@ private function _fillJoinClauses(array &$finalized, array $relations, array $se
      *
      * @return string SQL query
      */
-    private function _getSQLQuery(array $formColumns)
+    private function getSQLQuery(array $formColumns)
     {
         $sql_query = '';
         // get SELECT clause
-        $sql_query .= $this->_getSelectClause();
+        $sql_query .= $this->getSelectClause();
         // get FROM clause
-        $from_clause = $this->_getFromClause($formColumns);
+        $from_clause = $this->getFromClause($formColumns);
         if (! empty($from_clause)) {
             $sql_query .= 'FROM ' . htmlspecialchars($from_clause) . "\n";
         }
         // get WHERE clause
-        $sql_query .= $this->_getWhereClause();
+        $sql_query .= $this->getWhereClause();
         // get ORDER BY clause
-        $sql_query .= $this->_getOrderByClause();
+        $sql_query .= $this->getOrderByClause();
 
         return $sql_query;
     }
@@ -1673,16 +1673,16 @@ public function getSelectionForm(): string
     {
         global $cfgRelation;
 
-        $savedSearchesField = $cfgRelation['savedsearcheswork'] ? $this->_getSavedSearchesField() : '';
+        $savedSearchesField = $cfgRelation['savedsearcheswork'] ? $this->getSavedSearchesField() : '';
 
-        $columnNamesRow = $this->_getColumnNamesRow();
-        $columnAliasRow = $this->_getColumnAliasRow();
-        $showRow = $this->_getShowRow();
-        $sortRow = $this->_getSortRow();
-        $sortOrder = $this->_getSortOrder();
-        $criteriaInputBoxRow = $this->_getCriteriaInputboxRow();
-        $insDelAndOrCriteriaRows = $this->_getInsDelAndOrCriteriaRows();
-        $modifyColumnsRow = $this->_getModifyColumnsRow();
+        $columnNamesRow = $this->getColumnNamesRow();
+        $columnAliasRow = $this->getColumnAliasRow();
+        $showRow = $this->getShowRow();
+        $sortRow = $this->getSortRow();
+        $sortOrder = $this->getSortOrder();
+        $criteriaInputBoxRow = $this->getCriteriaInputboxRow();
+        $insDelAndOrCriteriaRows = $this->getInsDelAndOrCriteriaRows();
+        $modifyColumnsRow = $this->getModifyColumnsRow();
 
         $this->_new_row_count--;
         $url_params = [];
@@ -1693,7 +1693,7 @@ public function getSelectionForm(): string
         if (empty($this->_formColumns)) {
             $this->_formColumns = [];
         }
-        $sqlQuery = $this->_getSQLQuery($this->_formColumns);
+        $sqlQuery = $this->getSQLQuery($this->_formColumns);
 
         return $this->template->render('database/qbe/selection_form', [
             'db' => $this->_db,
@@ -1718,13 +1718,13 @@ public function getSelectionForm(): string
      *
      * @return string
      */
-    private function _getSavedSearchesField()
+    private function getSavedSearchesField()
     {
         $html_output = __('Saved bookmarked search:');
         $html_output .= ' <select name="searchId" id="searchId">';
         $html_output .= '<option value="">' . __('New bookmark') . '</option>';
 
-        $currentSearch = $this->_getCurrentSearch();
+        $currentSearch = $this->getCurrentSearch();
         $currentSearchId = null;
         $currentSearchName = null;
         if ($currentSearch != null) {
@@ -1764,7 +1764,7 @@ private function _getSavedSearchesField()
      *
      * @return int Previous number of columns
      */
-    private function _initializeCriteriasCount(): int
+    private function initializeCriteriasCount(): int
     {
         // sets column count
         $criteriaColumnCount = Core::ifSetOr(
@@ -1803,7 +1803,7 @@ private function _initializeCriteriasCount(): int
      *
      * @return array
      */
-    private function _getLeftJoinColumnCandidatesBest(
+    private function getLeftJoinColumnCandidatesBest(
         array $search_tables,
         ?array $where_clause_columns,
         ?array $unique_columns,
diff --git a/libraries/classes/Footer.php b/libraries/classes/Footer.php
index 5f9d8f53f51f..18f1a0c29e69 100644
--- a/libraries/classes/Footer.php
+++ b/libraries/classes/Footer.php
@@ -75,7 +75,7 @@ public function __construct()
     /**
      * Returns the message for demo server to error messages
      */
-    private function _getDemoMessage(): string
+    private function getDemoMessage(): string
     {
         $message = '<a href="/">' . __('phpMyAdmin Demo Server') . '</a>: ';
         if (@file_exists(ROOT_PATH . 'revision-info.php')) {
@@ -110,7 +110,7 @@ private function _getDemoMessage(): string
      *
      * @return object Reference passed object
      */
-    private static function _removeRecursion(&$object, array $stack = [])
+    private static function removeRecursion(&$object, array $stack = [])
     {
         if ((is_object($object) || is_array($object)) && $object) {
             if ($object instanceof Traversable) {
@@ -118,7 +118,7 @@ private static function _removeRecursion(&$object, array $stack = [])
             } elseif (! in_array($object, $stack, true)) {
                 $stack[] = $object;
                 foreach ($object as &$subobject) {
-                    self::_removeRecursion($subobject, $stack);
+                    self::removeRecursion($subobject, $stack);
                 }
             } else {
                 $object = '***RECURSION***';
@@ -139,7 +139,7 @@ public function getDebugMessage(): string
             && ! empty($_SESSION['debug'])
         ) {
             // Remove recursions and iterators from $_SESSION['debug']
-            self::_removeRecursion($_SESSION['debug']);
+            self::removeRecursion($_SESSION['debug']);
 
             $retval = json_encode($_SESSION['debug']);
             $_SESSION['debug'] = [];
@@ -208,7 +208,7 @@ public function getSelfUrl(): string
      *
      * @param string $url The url of the page
      */
-    private function _getSelfLink(string $url): string
+    private function getSelfLink(string $url): string
     {
         $retval  = '';
         $retval .= '<div id="selflink" class="print_ignore">';
@@ -249,7 +249,7 @@ public function getErrorMessages(): string
     /**
      * Saves query in history
      */
-    private function _setHistory(): void
+    private function setHistory(): void
     {
         if (Core::isValid($_REQUEST['no_history'])
             || ! empty($GLOBALS['error_message'])
@@ -310,7 +310,7 @@ public function getScripts(): Scripts
      */
     public function getDisplay(): string
     {
-        $this->_setHistory();
+        $this->setHistory();
         if ($this->_isEnabled) {
             if (! $this->_isAjax && ! $this->_isMinimal) {
                 if (Core::getenv('SCRIPT_NAME')
@@ -340,7 +340,7 @@ public function getDisplay(): string
                     && ! $this->_isAjax
                 ) {
                     $url = $this->getSelfUrl();
-                    $selfLink = $this->_getSelfLink($url);
+                    $selfLink = $this->getSelfLink($url);
                 }
                 $this->_scripts->addCode(
                     'var debugSQLInfo = ' . $this->getDebugMessage() . ';'
@@ -350,7 +350,7 @@ public function getDisplay(): string
                 $scripts = $this->_scripts->getDisplay();
 
                 if ($GLOBALS['cfg']['DBG']['demo']) {
-                    $demoMessage = $this->_getDemoMessage();
+                    $demoMessage = $this->getDemoMessage();
                 }
 
                 $footer = Config::renderFooter();
diff --git a/libraries/classes/Gis/GisGeometryCollection.php b/libraries/classes/Gis/GisGeometryCollection.php
index 2ad2d59a9f3c..945099980318 100644
--- a/libraries/classes/Gis/GisGeometryCollection.php
+++ b/libraries/classes/Gis/GisGeometryCollection.php
@@ -70,7 +70,7 @@ public function scaleRow($spatial)
             );
 
         // Split the geometry collection object to get its constituents.
-        $sub_parts = $this->_explodeGeomCol($goem_col);
+        $sub_parts = $this->explodeGeomCol($goem_col);
 
         foreach ($sub_parts as $sub_part) {
             $type_pos = mb_strpos($sub_part, '(');
@@ -135,7 +135,7 @@ public function prepareRowAsPng($spatial, ?string $label, $color, array $scale_d
                 mb_strlen($spatial) - 20
             );
         // Split the geometry collection object to get its constituents.
-        $sub_parts = $this->_explodeGeomCol($goem_col);
+        $sub_parts = $this->explodeGeomCol($goem_col);
 
         foreach ($sub_parts as $sub_part) {
             $type_pos = mb_strpos($sub_part, '(');
@@ -183,7 +183,7 @@ public function prepareRowAsPdf($spatial, ?string $label, $color, array $scale_d
                 mb_strlen($spatial) - 20
             );
         // Split the geometry collection object to get its constituents.
-        $sub_parts = $this->_explodeGeomCol($goem_col);
+        $sub_parts = $this->explodeGeomCol($goem_col);
 
         foreach ($sub_parts as $sub_part) {
             $type_pos = mb_strpos($sub_part, '(');
@@ -232,7 +232,7 @@ public function prepareRowAsSvg($spatial, $label, $color, array $scale_data)
                 mb_strlen($spatial) - 20
             );
         // Split the geometry collection object to get its constituents.
-        $sub_parts = $this->_explodeGeomCol($goem_col);
+        $sub_parts = $this->explodeGeomCol($goem_col);
 
         foreach ($sub_parts as $sub_part) {
             $type_pos = mb_strpos($sub_part, '(');
@@ -282,7 +282,7 @@ public function prepareRowAsOl($spatial, $srid, $label, $color, array $scale_dat
                 mb_strlen($spatial) - 20
             );
         // Split the geometry collection object to get its constituents.
-        $sub_parts = $this->_explodeGeomCol($goem_col);
+        $sub_parts = $this->explodeGeomCol($goem_col);
 
         foreach ($sub_parts as $sub_part) {
             $type_pos = mb_strpos($sub_part, '(');
@@ -316,7 +316,7 @@ public function prepareRowAsOl($spatial, $srid, $label, $color, array $scale_dat
      *
      * @access private
      */
-    private function _explodeGeomCol($geom_col)
+    private function explodeGeomCol($geom_col)
     {
         $sub_parts = [];
         $br_count = 0;
@@ -406,7 +406,7 @@ public function generateParams($value)
                 mb_strlen($wkt) - 20
             );
         // Split the geometry collection object to get its constituents.
-        $sub_parts = $this->_explodeGeomCol($goem_col);
+        $sub_parts = $this->explodeGeomCol($goem_col);
         $params['GEOMETRYCOLLECTION']['geom_count'] = count($sub_parts);
 
         $i = 0;
diff --git a/libraries/classes/Gis/GisMultiPolygon.php b/libraries/classes/Gis/GisMultiPolygon.php
index 0d9244e45910..1f7bac96bb65 100644
--- a/libraries/classes/Gis/GisMultiPolygon.php
+++ b/libraries/classes/Gis/GisMultiPolygon.php
@@ -295,17 +295,17 @@ public function prepareRowAsSvg($spatial, $label, $fill_color, array $scale_data
 
             // If the polygon doesn't have an inner polygon
             if (mb_strpos($polygon, '),(') === false) {
-                $row .= $this->_drawPath($polygon, $scale_data);
+                $row .= $this->drawPath($polygon, $scale_data);
             } else {
                 // Separate outer and inner polygons
                 $parts = explode('),(', $polygon);
                 $outer = $parts[0];
                 $inner = array_slice($parts, 1);
 
-                $row .= $this->_drawPath($outer, $scale_data);
+                $row .= $this->drawPath($outer, $scale_data);
 
                 foreach ($inner as $inner_poly) {
-                    $row .= $this->_drawPath($inner_poly, $scale_data);
+                    $row .= $this->drawPath($inner_poly, $scale_data);
                 }
             }
             $polygon_options['id'] = $label . $this->getRandomId();
@@ -374,7 +374,7 @@ public function prepareRowAsOl($spatial, $srid, $label, $fill_color, array $scal
      *
      * @access private
      */
-    private function _drawPath($polygon, array $scale_data)
+    private function drawPath($polygon, array $scale_data)
     {
         $points_arr = $this->extractPoints($polygon, $scale_data);
 
diff --git a/libraries/classes/Gis/GisPolygon.php b/libraries/classes/Gis/GisPolygon.php
index 8ad41b8d165f..6cef96948ceb 100644
--- a/libraries/classes/Gis/GisPolygon.php
+++ b/libraries/classes/Gis/GisPolygon.php
@@ -259,17 +259,17 @@ public function prepareRowAsSvg($spatial, $label, $fill_color, array $scale_data
 
         // If the polygon doesn't have an inner polygon
         if (mb_strpos($polygon, '),(') === false) {
-            $row .= $this->_drawPath($polygon, $scale_data);
+            $row .= $this->drawPath($polygon, $scale_data);
         } else {
             // Separate outer and inner polygons
             $parts = explode('),(', $polygon);
             $outer = $parts[0];
             $inner = array_slice($parts, 1);
 
-            $row .= $this->_drawPath($outer, $scale_data);
+            $row .= $this->drawPath($outer, $scale_data);
 
             foreach ($inner as $inner_poly) {
-                $row .= $this->_drawPath($inner_poly, $scale_data);
+                $row .= $this->drawPath($inner_poly, $scale_data);
             }
         }
 
@@ -338,7 +338,7 @@ public function prepareRowAsOl($spatial, $srid, $label, $fill_color, array $scal
      *
      * @access private
      */
-    private function _drawPath($polygon, array $scale_data)
+    private function drawPath($polygon, array $scale_data)
     {
         $points_arr = $this->extractPoints($polygon, $scale_data);
 
diff --git a/libraries/classes/Gis/GisVisualization.php b/libraries/classes/Gis/GisVisualization.php
index bcd070f0e4af..29065a6af4a8 100644
--- a/libraries/classes/Gis/GisVisualization.php
+++ b/libraries/classes/Gis/GisVisualization.php
@@ -144,8 +144,8 @@ private function __construct($sql_query, array $options, $row, $pos, $data = nul
         if (isset($data)) {
             $this->_data = $data;
         } else {
-            $this->_modified_sql = $this->_modifySqlQuery($sql_query, $row, $pos);
-            $this->_data = $this->_fetchRawData();
+            $this->_modified_sql = $this->modifySqlQuery($sql_query, $row, $pos);
+            $this->_data = $this->fetchRawData();
         }
     }
 
@@ -158,7 +158,7 @@ private function __construct($sql_query, array $options, $row, $pos, $data = nul
      */
     protected function init()
     {
-        $this->_handleOptions();
+        $this->handleOptions();
     }
 
     /**
@@ -170,7 +170,7 @@ protected function init()
      *
      * @return string the modified sql query.
      */
-    private function _modifySqlQuery($sql_query, $rows, $pos)
+    private function modifySqlQuery($sql_query, $rows, $pos)
     {
         $modified_query = 'SELECT ';
         $spatialAsText = 'ASTEXT';
@@ -229,7 +229,7 @@ private function _modifySqlQuery($sql_query, $rows, $pos)
      *
      * @return array the raw data.
      */
-    private function _fetchRawData()
+    private function fetchRawData()
     {
         $modified_result = $GLOBALS['dbi']->tryQuery($this->_modified_sql);
 
@@ -253,7 +253,7 @@ private function _fetchRawData()
      *
      * @access private
      */
-    private function _handleOptions()
+    private function handleOptions()
     {
         if ($this->_userSpecifiedSettings === null) {
             return;
@@ -275,7 +275,7 @@ private function _handleOptions()
      *
      * @access private
      */
-    private function _sanitizeName($file_name, $ext)
+    private function sanitizeName($file_name, $ext)
     {
         $file_name = Sanitize::sanitizeFilename($file_name);
 
@@ -307,9 +307,9 @@ private function _sanitizeName($file_name, $ext)
      *
      * @access private
      */
-    private function _toFile($file_name, $type, $ext)
+    private function writeToFile($file_name, $type, $ext)
     {
-        $file_name = $this->_sanitizeName($file_name, $ext);
+        $file_name = $this->sanitizeName($file_name, $ext);
         Core::downloadHeader($file_name, $type);
     }
 
@@ -320,7 +320,7 @@ private function _toFile($file_name, $type, $ext)
      *
      * @access private
      */
-    private function _svg()
+    private function svg()
     {
         $this->init();
 
@@ -332,8 +332,8 @@ private function _svg()
             . ' height="' . intval($this->_settings['height']) . '">'
             . '<g id="groupPanel">';
 
-        $scale_data = $this->_scaleDataSet($this->_data);
-        $output .= $this->_prepareDataSet($this->_data, $scale_data, 'svg', '');
+        $scale_data = $this->scaleDataSet($this->_data);
+        $output .= $this->prepareDataSet($this->_data, $scale_data, 'svg', '');
 
         $output .= '</g></svg>';
 
@@ -349,7 +349,7 @@ private function _svg()
      */
     public function asSVG()
     {
-        return $this->_svg();
+        return $this->svg();
     }
 
     /**
@@ -363,8 +363,8 @@ public function asSVG()
      */
     public function toFileAsSvg($file_name)
     {
-        $img = $this->_svg();
-        $this->_toFile($file_name, 'image/svg+xml', 'svg');
+        $img = $this->svg();
+        $this->writeToFile($file_name, 'image/svg+xml', 'svg');
         echo $img;
     }
 
@@ -375,7 +375,7 @@ public function toFileAsSvg($file_name)
      *
      * @access private
      */
-    private function _png()
+    private function png()
     {
         $this->init();
 
@@ -396,8 +396,8 @@ private function _png()
             $bg
         );
 
-        $scale_data = $this->_scaleDataSet($this->_data);
-        $image = $this->_prepareDataSet($this->_data, $scale_data, 'png', $image);
+        $scale_data = $this->scaleDataSet($this->_data);
+        $image = $this->prepareDataSet($this->_data, $scale_data, 'png', $image);
 
         return $image;
     }
@@ -411,7 +411,7 @@ private function _png()
      */
     public function asPng()
     {
-        $img = $this->_png();
+        $img = $this->png();
 
         // render and save it to variable
         ob_start();
@@ -436,8 +436,8 @@ public function asPng()
      */
     public function toFileAsPng($file_name)
     {
-        $img = $this->_png();
-        $this->_toFile($file_name, 'image/png', 'png');
+        $img = $this->png();
+        $this->writeToFile($file_name, 'image/png', 'png');
         imagepng($img, null, 9, PNG_ALL_FILTERS);
         imagedestroy($img);
     }
@@ -453,7 +453,7 @@ public function toFileAsPng($file_name)
     public function asOl()
     {
         $this->init();
-        $scale_data = $this->_scaleDataSet($this->_data);
+        $scale_data = $this->scaleDataSet($this->_data);
         $output
             = 'if (typeof OpenLayers !== "undefined") {'
             . 'var options = {'
@@ -479,7 +479,7 @@ public function asOl()
             . 'map.addLayers([layerOSM,layerNone]);'
             . 'var vectorLayer = new OpenLayers.Layer.Vector("Data");'
             . 'var bound;';
-        $output .= $this->_prepareDataSet($this->_data, $scale_data, 'ol', '');
+        $output .= $this->prepareDataSet($this->_data, $scale_data, 'ol', '');
         $output .= 'map.addLayer(vectorLayer);'
             . 'map.zoomToExtent(bound);'
             . 'if (map.getZoom() < 2) {'
@@ -525,11 +525,11 @@ public function toFileAsPdf($file_name)
         // add a page
         $pdf->AddPage();
 
-        $scale_data = $this->_scaleDataSet($this->_data);
-        $pdf = $this->_prepareDataSet($this->_data, $scale_data, 'pdf', $pdf);
+        $scale_data = $this->scaleDataSet($this->_data);
+        $pdf = $this->prepareDataSet($this->_data, $scale_data, 'pdf', $pdf);
 
         // sanitize file name
-        $file_name = $this->_sanitizeName($file_name, 'pdf');
+        $file_name = $this->sanitizeName($file_name, 'pdf');
         $pdf->Output($file_name, 'D');
     }
 
@@ -585,7 +585,7 @@ public function toFile($filename, $format)
      *
      * @access private
      */
-    private function _scaleDataSet(array $data)
+    private function scaleDataSet(array $data)
     {
         $min_max = [
             'maxX' => 0.0,
@@ -683,7 +683,7 @@ private function _scaleDataSet(array $data)
      *
      * @access private
      */
-    private function _prepareDataSet(array $data, array $scale_data, $format, $results)
+    private function prepareDataSet(array $data, array $scale_data, $format, $results)
     {
         $color_number = 0;
 
diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php
index da99842b08f8..926ce4e2f899 100644
--- a/libraries/classes/Header.php
+++ b/libraries/classes/Header.php
@@ -139,7 +139,7 @@ public function __construct()
         $this->_warningsEnabled = true;
         $this->_isPrintView = false;
         $this->_scripts = new Scripts();
-        $this->_addDefaultScripts();
+        $this->addDefaultScripts();
         $this->_headerIsSent = false;
         // if database storage for user preferences is transient,
         // offer to load exported settings from localStorage
@@ -157,7 +157,7 @@ public function __construct()
     /**
      * Loads common scripts
      */
-    private function _addDefaultScripts(): void
+    private function addDefaultScripts(): void
     {
         // Localised strings
         $this->_scripts->addFile('vendor/jquery/jquery.min.js');
@@ -384,7 +384,7 @@ public function getDisplay(): string
 
         $recentTable = '';
         if (empty($_REQUEST['recent_table'])) {
-            $recentTable = $this->_addRecentTable($db, $table);
+            $recentTable = $this->addRecentTable($db, $table);
         }
 
         if ($this->_isAjax) {
@@ -649,7 +649,7 @@ public function getPageTitle(): string
      * @param string $db    Database name where the table is located.
      * @param string $table The table name
      */
-    private function _addRecentTable(string $db, string $table): string
+    private function addRecentTable(string $db, string $table): string
     {
         $retval = '';
         if ($this->_menuEnabled
diff --git a/libraries/classes/Html/Generator.php b/libraries/classes/Html/Generator.php
index 5f4c6b07a7e3..834cd21f7fc6 100644
--- a/libraries/classes/Html/Generator.php
+++ b/libraries/classes/Html/Generator.php
@@ -571,7 +571,7 @@ public static function getStartAndNumberOfRowsPanel($sql_query): string
      *
      * @return string query resuls
      */
-    private static function _generateRowQueryOutput($sqlQuery): string
+    private static function generateRowQueryOutput($sqlQuery): string
     {
         $ret = '';
         $result = $GLOBALS['dbi']->query($sqlQuery);
@@ -758,7 +758,7 @@ public static function getMessage(
                         ) . ']';
                     $url = 'https://mariadb.org/explain_analyzer/analyze/'
                         . '?client=phpMyAdmin&raw_explain='
-                        . urlencode(self::_generateRowQueryOutput($sql_query));
+                        . urlencode(self::generateRowQueryOutput($sql_query));
                     $explain_link .= ' ['
                         . self::linkOrButton(
                             htmlspecialchars('url.php?url=' . urlencode($url)),
diff --git a/libraries/classes/Index.php b/libraries/classes/Index.php
index dd0f2406fa7b..35278b519ef2 100644
--- a/libraries/classes/Index.php
+++ b/libraries/classes/Index.php
@@ -118,7 +118,7 @@ public function __construct(array $params = [])
      */
     public static function singleton($schema, $table, $index_name = '')
     {
-        self::_loadIndexes($table, $schema);
+        self::loadIndexes($table, $schema);
         if (! isset(self::$_registry[$schema][$table][$index_name])) {
             $index = new Index();
             if (strlen($index_name) > 0) {
@@ -142,7 +142,7 @@ public static function singleton($schema, $table, $index_name = '')
      */
     public static function getFromTable($table, $schema)
     {
-        self::_loadIndexes($table, $schema);
+        self::loadIndexes($table, $schema);
 
         if (isset(self::$_registry[$schema][$table])) {
             return self::$_registry[$schema][$table];
@@ -206,7 +206,7 @@ public static function getFromTableByChoice($table, $schema, $choices = 31)
      */
     public static function getPrimary($table, $schema)
     {
-        self::_loadIndexes($table, $schema);
+        self::loadIndexes($table, $schema);
 
         if (isset(self::$_registry[$schema][$table]['PRIMARY'])) {
             return self::$_registry[$schema][$table]['PRIMARY'];
@@ -223,7 +223,7 @@ public static function getPrimary($table, $schema)
      *
      * @return bool whether loading was successful
      */
-    private static function _loadIndexes($table, $schema)
+    private static function loadIndexes($table, $schema)
     {
         if (isset(self::$_registry[$schema][$table])) {
             return true;
diff --git a/libraries/classes/Menu.php b/libraries/classes/Menu.php
index e0339ea3f523..1403ad355a09 100644
--- a/libraries/classes/Menu.php
+++ b/libraries/classes/Menu.php
@@ -76,8 +76,8 @@ public function display()
      */
     public function getDisplay()
     {
-        $retval  = $this->_getBreadcrumbs();
-        $retval .= $this->_getMenu();
+        $retval  = $this->getBreadcrumbs();
+        $retval .= $this->getMenu();
 
         return $retval;
     }
@@ -90,7 +90,7 @@ public function getDisplay()
     public function getHash()
     {
         return substr(
-            md5($this->_getMenu() . $this->_getBreadcrumbs()),
+            md5($this->getMenu() . $this->getBreadcrumbs()),
             0,
             8
         );
@@ -101,25 +101,25 @@ public function getHash()
      *
      * @return string HTML formatted menubar
      */
-    private function _getMenu(): string
+    private function getMenu(): string
     {
         $url_params = [];
 
         if (strlen((string) $this->_table) > 0) {
-            $tabs = $this->_getTableTabs();
+            $tabs = $this->getTableTabs();
             $url_params['db'] = $this->_db;
             $url_params['table'] = $this->_table;
             $level = 'table';
         } elseif (strlen($this->_db) > 0) {
-            $tabs = $this->_getDbTabs();
+            $tabs = $this->getDbTabs();
             $url_params['db'] = $this->_db;
             $level = 'db';
         } else {
-            $tabs = $this->_getServerTabs();
+            $tabs = $this->getServerTabs();
             $level = 'server';
         }
 
-        $allowedTabs = $this->_getAllowedTabs($level);
+        $allowedTabs = $this->getAllowedTabs($level);
         foreach ($tabs as $key => $value) {
             if (array_key_exists($key, $allowedTabs)) {
                 continue;
@@ -141,7 +141,7 @@ private function _getMenu(): string
      *
      * @return array list of allowed tabs
      */
-    private function _getAllowedTabs($level)
+    private function getAllowedTabs($level)
     {
         /** @var DatabaseInterface $dbi */
         global $dbi;
@@ -187,7 +187,7 @@ private function _getAllowedTabs($level)
      *
      * @return string HTML formatted breadcrumbs
      */
-    private function _getBreadcrumbs(): string
+    private function getBreadcrumbs(): string
     {
         global $cfg, $dbi;
 
@@ -257,7 +257,7 @@ private function _getBreadcrumbs(): string
      *
      * @return array Data for generating table tabs
      */
-    private function _getTableTabs()
+    private function getTableTabs()
     {
         /** @var DatabaseInterface $dbi */
         global $route, $dbi;
@@ -385,7 +385,7 @@ private function _getTableTabs()
      *
      * @return array Data for generating db tabs
      */
-    private function _getDbTabs()
+    private function getDbTabs()
     {
         /** @var DatabaseInterface $dbi */
         global $route, $dbi;
@@ -509,7 +509,7 @@ private function _getDbTabs()
      *
      * @return array Data for generating server tabs
      */
-    private function _getServerTabs()
+    private function getServerTabs()
     {
         /** @var DatabaseInterface $dbi */
         global $route, $dbi;
diff --git a/libraries/classes/OutputBuffering.php b/libraries/classes/OutputBuffering.php
index 4ef7eac8ab67..9dfe55617ee4 100644
--- a/libraries/classes/OutputBuffering.php
+++ b/libraries/classes/OutputBuffering.php
@@ -38,7 +38,7 @@ class OutputBuffering
      */
     private function __construct()
     {
-        $this->_mode = $this->_getMode();
+        $this->_mode = $this->getMode();
         $this->_on = false;
     }
 
@@ -47,7 +47,7 @@ private function __construct()
      *
      * @return int the output buffer mode
      */
-    private function _getMode()
+    private function getMode()
     {
         $mode = 0;
         if ($GLOBALS['cfg']['OBGzip'] && function_exists('ob_start')) {
diff --git a/libraries/classes/Plugins/Auth/AuthenticationCookie.php b/libraries/classes/Plugins/Auth/AuthenticationCookie.php
index c0fa0e0fa592..7f37d695a2e1 100644
--- a/libraries/classes/Plugins/Auth/AuthenticationCookie.php
+++ b/libraries/classes/Plugins/Auth/AuthenticationCookie.php
@@ -370,7 +370,7 @@ public function readCredentials()
 
         $value = $this->cookieDecrypt(
             $serverCookie,
-            $this->_getEncryptionSecret()
+            $this->getEncryptionSecret()
         );
 
         if ($value === false) {
@@ -420,7 +420,7 @@ public function readCredentials()
         }
         $value = $this->cookieDecrypt(
             $serverCookie,
-            $this->_getSessionEncryptionSecret()
+            $this->getSessionEncryptionSecret()
         );
         if ($value === false) {
             return false;
@@ -569,7 +569,7 @@ public function storeUsernameCookie($username)
             'pmaUser-' . $GLOBALS['server'],
             $this->cookieEncrypt(
                 $username,
-                $this->_getEncryptionSecret()
+                $this->getEncryptionSecret()
             )
         );
     }
@@ -592,7 +592,7 @@ public function storePasswordCookie($password)
             'pmaAuth-' . $GLOBALS['server'],
             $this->cookieEncrypt(
                 json_encode($payload),
-                $this->_getSessionEncryptionSecret()
+                $this->getSessionEncryptionSecret()
             ),
             null,
             (int) $GLOBALS['cfg']['LoginCookieStore']
@@ -637,10 +637,10 @@ public function showFailure($failure)
      *
      * @return string
      */
-    private function _getEncryptionSecret()
+    private function getEncryptionSecret()
     {
         if (empty($GLOBALS['cfg']['blowfish_secret'])) {
-            return $this->_getSessionEncryptionSecret();
+            return $this->getSessionEncryptionSecret();
         }
 
         return $GLOBALS['cfg']['blowfish_secret'];
@@ -651,7 +651,7 @@ private function _getEncryptionSecret()
      *
      * @return string
      */
-    private function _getSessionEncryptionSecret()
+    private function getSessionEncryptionSecret()
     {
         if (empty($_SESSION['encryption_key'])) {
             if ($this->_use_openssl) {
diff --git a/libraries/classes/Plugins/Export/ExportCodegen.php b/libraries/classes/Plugins/Export/ExportCodegen.php
index 826a0ab6b379..368258f3e53e 100644
--- a/libraries/classes/Plugins/Export/ExportCodegen.php
+++ b/libraries/classes/Plugins/Export/ExportCodegen.php
@@ -51,7 +51,7 @@ public function __construct()
      */
     protected function initSpecificVariables()
     {
-        $this->_setCgFormats([
+        $this->setCgFormats([
             self::HANDLER_NHIBERNATE_CS => 'NHibernate C# DO',
             self::HANDLER_NHIBERNATE_XML => 'NHibernate XML',
         ]);
@@ -86,7 +86,7 @@ protected function setProperties()
             'format',
             __('Format:')
         );
-        $leaf->setValues($this->_getCgFormats());
+        $leaf->setValues($this->getCgFormats());
         $generalOptions->addProperty($leaf);
         // add the main group to the root group
         $exportSpecificOptions->addProperty($generalOptions);
@@ -388,7 +388,7 @@ private function handleNHibernateXMLBody(
      *
      * @return array
      */
-    private function _getCgFormats()
+    private function getCgFormats()
     {
         return $this->_cgFormats;
     }
@@ -400,7 +400,7 @@ private function _getCgFormats()
      *
      * @return void
      */
-    private function _setCgFormats(array $CG_FORMATS)
+    private function setCgFormats(array $CG_FORMATS)
     {
         $this->_cgFormats = $CG_FORMATS;
     }
diff --git a/libraries/classes/Plugins/Export/ExportMediawiki.php b/libraries/classes/Plugins/Export/ExportMediawiki.php
index ee4872a2ef72..4ab147bbe233 100644
--- a/libraries/classes/Plugins/Export/ExportMediawiki.php
+++ b/libraries/classes/Plugins/Export/ExportMediawiki.php
@@ -202,25 +202,25 @@ public function exportStructure(
                 $row_cnt = count($columns);
 
                 // Print structure comment
-                $output = $this->_exportComment(
+                $output = $this->exportComment(
                     'Table structure for '
                     . Util::backquote($table_alias)
                 );
 
                 // Begin the table construction
                 $output .= '{| class="wikitable" style="text-align:center;"'
-                    . $this->_exportCRLF();
+                    . $this->exportCRLF();
 
                 // Add the table name
                 if (isset($GLOBALS['mediawiki_caption'])) {
-                    $output .= "|+'''" . $table_alias . "'''" . $this->_exportCRLF();
+                    $output .= "|+'''" . $table_alias . "'''" . $this->exportCRLF();
                 }
 
                 // Add the table headers
                 if (isset($GLOBALS['mediawiki_headers'])) {
-                    $output .= '|- style="background:#ffdead;"' . $this->_exportCRLF();
+                    $output .= '|- style="background:#ffdead;"' . $this->exportCRLF();
                     $output .= '! style="background:#ffffff" | '
-                    . $this->_exportCRLF();
+                    . $this->exportCRLF();
                     for ($i = 0; $i < $row_cnt; ++$i) {
                         $col_as = $columns[$i]['Field'];
                         if (! empty($aliases[$db]['tables'][$table]['columns'][$col_as])
@@ -228,36 +228,36 @@ public function exportStructure(
                             $col_as
                                 = $aliases[$db]['tables'][$table]['columns'][$col_as];
                         }
-                        $output .= ' | ' . $col_as . $this->_exportCRLF();
+                        $output .= ' | ' . $col_as . $this->exportCRLF();
                     }
                 }
 
                 // Add the table structure
-                $output .= '|-' . $this->_exportCRLF();
-                $output .= '! Type' . $this->_exportCRLF();
+                $output .= '|-' . $this->exportCRLF();
+                $output .= '! Type' . $this->exportCRLF();
                 for ($i = 0; $i < $row_cnt; ++$i) {
-                    $output .= ' | ' . $columns[$i]['Type'] . $this->_exportCRLF();
+                    $output .= ' | ' . $columns[$i]['Type'] . $this->exportCRLF();
                 }
 
-                $output .= '|-' . $this->_exportCRLF();
-                $output .= '! Null' . $this->_exportCRLF();
+                $output .= '|-' . $this->exportCRLF();
+                $output .= '! Null' . $this->exportCRLF();
                 for ($i = 0; $i < $row_cnt; ++$i) {
-                    $output .= ' | ' . $columns[$i]['Null'] . $this->_exportCRLF();
+                    $output .= ' | ' . $columns[$i]['Null'] . $this->exportCRLF();
                 }
 
-                $output .= '|-' . $this->_exportCRLF();
-                $output .= '! Default' . $this->_exportCRLF();
+                $output .= '|-' . $this->exportCRLF();
+                $output .= '! Default' . $this->exportCRLF();
                 for ($i = 0; $i < $row_cnt; ++$i) {
-                    $output .= ' | ' . $columns[$i]['Default'] . $this->_exportCRLF();
+                    $output .= ' | ' . $columns[$i]['Default'] . $this->exportCRLF();
                 }
 
-                $output .= '|-' . $this->_exportCRLF();
-                $output .= '! Extra' . $this->_exportCRLF();
+                $output .= '|-' . $this->exportCRLF();
+                $output .= '! Extra' . $this->exportCRLF();
                 for ($i = 0; $i < $row_cnt; ++$i) {
-                    $output .= ' | ' . $columns[$i]['Extra'] . $this->_exportCRLF();
+                    $output .= ' | ' . $columns[$i]['Extra'] . $this->exportCRLF();
                 }
 
-                $output .= '|}' . str_repeat($this->_exportCRLF(), 2);
+                $output .= '|}' . str_repeat($this->exportCRLF(), 2);
                 break;
         } // end switch
 
@@ -289,7 +289,7 @@ public function exportData(
         $this->initAlias($aliases, $db_alias, $table_alias);
 
         // Print data comment
-        $output = $this->_exportComment(
+        $output = $this->exportComment(
             $table_alias != ''
                 ? 'Table data for ' . Util::backquote($table_alias)
                 : 'Query results'
@@ -299,11 +299,11 @@ public function exportData(
         // Use the "wikitable" class for style
         // Use the "sortable"  class for allowing tables to be sorted by column
         $output .= '{| class="wikitable sortable" style="text-align:center;"'
-            . $this->_exportCRLF();
+            . $this->exportCRLF();
 
         // Add the table name
         if (isset($GLOBALS['mediawiki_caption'])) {
-            $output .= "|+'''" . $table_alias . "'''" . $this->_exportCRLF();
+            $output .= "|+'''" . $table_alias . "'''" . $this->exportCRLF();
         }
 
         // Add the table headers
@@ -314,7 +314,7 @@ public function exportData(
             // Add column names as table headers
             if ($column_names !== null) {
                 // Use '|-' for separating rows
-                $output .= '|-' . $this->_exportCRLF();
+                $output .= '|-' . $this->exportCRLF();
 
                 // Use '!' for separating table headers
                 foreach ($column_names as $column) {
@@ -323,7 +323,7 @@ public function exportData(
                         $column
                             = $aliases[$db]['tables'][$table]['columns'][$column];
                     }
-                    $output .= ' ! ' . $column . '' . $this->_exportCRLF();
+                    $output .= ' ! ' . $column . '' . $this->exportCRLF();
                 }
             }
         }
@@ -337,16 +337,16 @@ public function exportData(
         $fields_cnt = $GLOBALS['dbi']->numFields($result);
 
         while ($row = $GLOBALS['dbi']->fetchRow($result)) {
-            $output .= '|-' . $this->_exportCRLF();
+            $output .= '|-' . $this->exportCRLF();
 
             // Use '|' for separating table columns
             for ($i = 0; $i < $fields_cnt; ++$i) {
-                $output .= ' | ' . $row[$i] . '' . $this->_exportCRLF();
+                $output .= ' | ' . $row[$i] . '' . $this->exportCRLF();
             }
         }
 
         // End table construction
-        $output .= '|}' . str_repeat($this->_exportCRLF(), 2);
+        $output .= '|}' . str_repeat($this->exportCRLF(), 2);
 
         return $this->export->outputHandler($output);
     }
@@ -372,13 +372,13 @@ public function exportRawQuery(string $err_url, string $sql_query, string $crlf)
      *
      * @return string The formatted comment
      */
-    private function _exportComment($text = '')
+    private function exportComment($text = '')
     {
         // see https://www.mediawiki.org/wiki/Help:Formatting
-        $comment = $this->_exportCRLF();
-        $comment .= '<!--' . $this->_exportCRLF();
-        $comment .= htmlspecialchars($text) . $this->_exportCRLF();
-        $comment .= '-->' . str_repeat($this->_exportCRLF(), 2);
+        $comment = $this->exportCRLF();
+        $comment .= '<!--' . $this->exportCRLF();
+        $comment .= htmlspecialchars($text) . $this->exportCRLF();
+        $comment .= '-->' . str_repeat($this->exportCRLF(), 2);
 
         return $comment;
     }
@@ -388,7 +388,7 @@ private function _exportComment($text = '')
      *
      * @return string CRLF
      */
-    private function _exportCRLF()
+    private function exportCRLF()
     {
         // The CRLF expected by the mediawiki format is "\n"
         return "\n";
diff --git a/libraries/classes/Plugins/Export/ExportPdf.php b/libraries/classes/Plugins/Export/ExportPdf.php
index ea71f47aa6e4..aa5eb585dfad 100644
--- a/libraries/classes/Plugins/Export/ExportPdf.php
+++ b/libraries/classes/Plugins/Export/ExportPdf.php
@@ -64,9 +64,9 @@ public function __construct()
     protected function initSpecificVariables()
     {
         if (! empty($_POST['pdf_report_title'])) {
-            $this->_setPdfReportTitle($_POST['pdf_report_title']);
+            $this->setPdfReportTitle($_POST['pdf_report_title']);
         }
-        $this->_setPdf(new Pdf('L', 'pt', 'A3'));
+        $this->setPdf(new Pdf('L', 'pt', 'A3'));
     }
 
     /**
@@ -130,8 +130,8 @@ protected function setProperties()
      */
     public function exportHeader()
     {
-        $pdf_report_title = $this->_getPdfReportTitle();
-        $pdf = $this->_getPdf();
+        $pdf_report_title = $this->getPdfReportTitle();
+        $pdf = $this->getPdf();
         $pdf->Open();
 
         $attr = [
@@ -151,7 +151,7 @@ public function exportHeader()
      */
     public function exportFooter()
     {
-        $pdf = $this->_getPdf();
+        $pdf = $this->getPdf();
 
         // instead of $pdf->Output():
         return $this->export->outputHandler($pdf->getPDFData());
@@ -219,7 +219,7 @@ public function exportData(
         $db_alias = $db;
         $table_alias = $table;
         $this->initAlias($aliases, $db_alias, $table_alias);
-        $pdf = $this->_getPdf();
+        $pdf = $this->getPdf();
         $attr = [
             'currentDb'    => $db,
             'currentTable' => $table,
@@ -245,7 +245,7 @@ public function exportData(
      */
     public function exportRawQuery(string $err_url, string $sql_query, string $crlf): bool
     {
-        $pdf = $this->_getPdf();
+        $pdf = $this->getPdf();
         $attr = [
             'dbAlias'      => '----',
             'tableAlias'   => '----',
@@ -297,7 +297,7 @@ public function exportStructure(
         $table_alias = $table;
         $purpose = null;
         $this->initAlias($aliases, $db_alias, $table_alias);
-        $pdf = $this->_getPdf();
+        $pdf = $this->getPdf();
         // getting purpose to show at top
         switch ($export_mode) {
             case 'create_table':
@@ -370,7 +370,7 @@ public function exportStructure(
      *
      * @return Pdf
      */
-    private function _getPdf()
+    private function getPdf()
     {
         return $this->_pdf;
     }
@@ -382,7 +382,7 @@ private function _getPdf()
      *
      * @return void
      */
-    private function _setPdf($pdf)
+    private function setPdf($pdf)
     {
         $this->_pdf = $pdf;
     }
@@ -392,7 +392,7 @@ private function _setPdf($pdf)
      *
      * @return string
      */
-    private function _getPdfReportTitle()
+    private function getPdfReportTitle()
     {
         return $this->_pdfReportTitle;
     }
@@ -404,7 +404,7 @@ private function _getPdfReportTitle()
      *
      * @return void
      */
-    private function _setPdfReportTitle($pdfReportTitle)
+    private function setPdfReportTitle($pdfReportTitle)
     {
         $this->_pdfReportTitle = $pdfReportTitle;
     }
diff --git a/libraries/classes/Plugins/Export/ExportSql.php b/libraries/classes/Plugins/Export/ExportSql.php
index 58fd7106cef2..e4c86b5e2f62 100644
--- a/libraries/classes/Plugins/Export/ExportSql.php
+++ b/libraries/classes/Plugins/Export/ExportSql.php
@@ -533,7 +533,7 @@ protected function setProperties()
      *
      * @return string SQL query
      */
-    protected function _exportRoutineSQL(
+    protected function exportRoutineSQL(
         $db,
         array $aliases,
         $type,
@@ -543,9 +543,9 @@ protected function _exportRoutineSQL(
     ) {
         global $crlf;
 
-        $text = $this->_exportComment()
-            . $this->_exportComment($name)
-            . $this->_exportComment();
+        $text = $this->exportComment()
+            . $this->exportComment($name)
+            . $this->exportComment();
 
         $used_alias = false;
         $proc_query = '';
@@ -570,13 +570,13 @@ protected function _exportRoutineSQL(
             $proc_query .= $create_query . $delimiter . $crlf . $crlf;
         }
         if ($used_alias) {
-            $text .= $this->_exportComment(
+            $text .= $this->exportComment(
                 __('It appears your database uses routines;')
             )
-            . $this->_exportComment(
+            . $this->exportComment(
                 __('alias export may not work reliably in all cases.')
             )
-            . $this->_exportComment();
+            . $this->exportComment();
         }
         $text .= $proc_query;
 
@@ -610,7 +610,7 @@ public function exportRoutines($db, array $aliases = [])
                 . 'DELIMITER ' . $delimiter . $crlf;
 
             if ($procedure_names) {
-                $text .= $this->_exportRoutineSQL(
+                $text .= $this->exportRoutineSQL(
                     $db,
                     $aliases,
                     'PROCEDURE',
@@ -621,7 +621,7 @@ public function exportRoutines($db, array $aliases = [])
             }
 
             if ($function_names) {
-                $text .= $this->_exportRoutineSQL(
+                $text .= $this->exportRoutineSQL(
                     $db,
                     $aliases,
                     'FUNCTION',
@@ -648,7 +648,7 @@ public function exportRoutines($db, array $aliases = [])
      *
      * @return string The formatted comment
      */
-    private function _exportComment($text = '')
+    private function exportComment($text = '')
     {
         if (isset($GLOBALS['sql_include_comments'])
             && $GLOBALS['sql_include_comments']
@@ -675,7 +675,7 @@ private function _exportComment($text = '')
      *
      * @return string crlf or nothing
      */
-    private function _possibleCRLF()
+    private function possibleCRLF()
     {
         if (isset($GLOBALS['sql_include_comments'])
             && $GLOBALS['sql_include_comments']
@@ -743,24 +743,24 @@ public function exportHeader()
             $GLOBALS['dbi']->tryQuery('SET SQL_MODE="' . $tmp_compat . '"');
             unset($tmp_compat);
         }
-        $head = $this->_exportComment('phpMyAdmin SQL Dump')
-            . $this->_exportComment('version ' . PMA_VERSION)
-            . $this->_exportComment('https://www.phpmyadmin.net/')
-            . $this->_exportComment();
+        $head = $this->exportComment('phpMyAdmin SQL Dump')
+            . $this->exportComment('version ' . PMA_VERSION)
+            . $this->exportComment('https://www.phpmyadmin.net/')
+            . $this->exportComment();
         $host_string = __('Host:') . ' ' . $cfg['Server']['host'];
         if (! empty($cfg['Server']['port'])) {
             $host_string .= ':' . $cfg['Server']['port'];
         }
-        $head .= $this->_exportComment($host_string);
-        $head .= $this->_exportComment(
+        $head .= $this->exportComment($host_string);
+        $head .= $this->exportComment(
             __('Generation Time:') . ' '
             . Util::localisedDate()
         )
-        . $this->_exportComment(
+        . $this->exportComment(
             __('Server version:') . ' ' . $GLOBALS['dbi']->getVersionString()
         )
-        . $this->_exportComment(__('PHP Version:') . ' ' . PHP_VERSION)
-        . $this->_possibleCRLF();
+        . $this->exportComment(__('PHP Version:') . ' ' . PHP_VERSION)
+        . $this->possibleCRLF();
 
         if (isset($GLOBALS['sql_header_comment'])
             && ! empty($GLOBALS['sql_header_comment'])
@@ -768,11 +768,11 @@ public function exportHeader()
             // '\n' is not a newline (like "\n" would be), it's the characters
             // backslash and n, as explained on the export interface
             $lines = explode('\n', $GLOBALS['sql_header_comment']);
-            $head .= $this->_exportComment();
+            $head .= $this->exportComment();
             foreach ($lines as $one_line) {
-                $head .= $this->_exportComment($one_line);
+                $head .= $this->exportComment($one_line);
             }
-            $head .= $this->_exportComment();
+            $head .= $this->exportComment();
         }
 
         if (isset($GLOBALS['sql_disable_fk'])) {
@@ -799,7 +799,7 @@ public function exportHeader()
             $GLOBALS['dbi']->query('SET time_zone = "+00:00"');
         }
 
-        $head .= $this->_possibleCRLF();
+        $head .= $this->possibleCRLF();
 
         if (! empty($GLOBALS['asfile'])) {
             // we are saving as file, therefore we provide charset information
@@ -891,7 +891,7 @@ public function exportDBCreate($db, $export_type, $db_alias = '')
             return false;
         }
 
-        return $this->_exportUseStatement($db_alias, $compat);
+        return $this->exportUseStatement($db_alias, $compat);
     }
 
     /**
@@ -902,7 +902,7 @@ public function exportDBCreate($db, $export_type, $db_alias = '')
      *
      * @return bool Whether it succeeded
      */
-    private function _exportUseStatement($db, $compat)
+    private function exportUseStatement($db, $compat)
     {
         global $crlf;
 
@@ -943,8 +943,8 @@ public function exportDBHeader($db, $db_alias = '')
         } else {
             $compat = 'NONE';
         }
-        $head = $this->_exportComment()
-            . $this->_exportComment(
+        $head = $this->exportComment()
+            . $this->exportComment(
                 __('Database:') . ' '
                 . Util::backquoteCompat(
                     $db_alias,
@@ -952,7 +952,7 @@ public function exportDBHeader($db, $db_alias = '')
                     isset($GLOBALS['sql_backquotes'])
                 )
             )
-            . $this->_exportComment();
+            . $this->exportComment();
 
         return $this->export->outputHandler($head);
     }
@@ -1013,9 +1013,9 @@ public function exportEvents($db)
             $text .= $crlf
                 . 'DELIMITER ' . $delimiter . $crlf;
 
-            $text .= $this->_exportComment()
-                . $this->_exportComment(__('Events'))
-                . $this->_exportComment();
+            $text .= $this->exportComment()
+                . $this->exportComment(__('Events'))
+                . $this->exportComment();
 
             foreach ($event_names as $event_name) {
                 if (! empty($GLOBALS['sql_drop_table'])) {
@@ -1056,16 +1056,16 @@ public function exportMetadata(
             return true;
         }
 
-        $comment = $this->_possibleCRLF()
-            . $this->_possibleCRLF()
-            . $this->_exportComment()
-            . $this->_exportComment(__('Metadata'))
-            . $this->_exportComment();
+        $comment = $this->possibleCRLF()
+            . $this->possibleCRLF()
+            . $this->exportComment()
+            . $this->exportComment(__('Metadata'))
+            . $this->exportComment();
         if (! $this->export->outputHandler($comment)) {
             return false;
         }
 
-        if (! $this->_exportUseStatement(
+        if (! $this->exportUseStatement(
             $cfgRelation['db'],
             $GLOBALS['sql_compatibility']
         )
@@ -1123,18 +1123,18 @@ private function _exportMetadata(
 
         $aliases = [];
 
-        $comment = $this->_possibleCRLF()
-            . $this->_exportComment();
+        $comment = $this->possibleCRLF()
+            . $this->exportComment();
 
         if (isset($table)) {
-            $comment .= $this->_exportComment(
+            $comment .= $this->exportComment(
                 sprintf(
                     __('Metadata for table %s'),
                     $table
                 )
             );
         } else {
-            $comment .= $this->_exportComment(
+            $comment .= $this->exportComment(
                 sprintf(
                     __('Metadata for database %s'),
                     $db
@@ -1142,7 +1142,7 @@ private function _exportMetadata(
             );
         }
 
-        $comment .= $this->_exportComment();
+        $comment .= $this->exportComment();
 
         if (! $this->export->outputHandler($comment)) {
             return false;
@@ -1321,7 +1321,7 @@ public function getTableDefStandIn($db, $view, $crlf, $aliases = [])
      *
      * @return string resulting schema
      */
-    private function _getTableDefForView(
+    private function getTableDefForView(
         $db,
         $view,
         $crlf,
@@ -1384,7 +1384,7 @@ private function _getTableDefForView(
             $compat = 'NONE';
         }
         if ($compat == 'MSSQL') {
-            $create_query = $this->_makeCreateTableMSSQLCompatible(
+            $create_query = $this->makeCreateTableMSSQLCompatible(
                 $create_query
             );
         }
@@ -1466,39 +1466,39 @@ public function getTableDef(
                     && isset($tmpres['Create_time'])
                     && ! empty($tmpres['Create_time'])
                 ) {
-                    $schema_create .= $this->_exportComment(
+                    $schema_create .= $this->exportComment(
                         __('Creation:') . ' '
                         . Util::localisedDate(
                             strtotime($tmpres['Create_time'])
                         )
                     );
-                    $new_crlf = $this->_exportComment() . $crlf;
+                    $new_crlf = $this->exportComment() . $crlf;
                 }
 
                 if ($show_dates
                     && isset($tmpres['Update_time'])
                     && ! empty($tmpres['Update_time'])
                 ) {
-                    $schema_create .= $this->_exportComment(
+                    $schema_create .= $this->exportComment(
                         __('Last update:') . ' '
                         . Util::localisedDate(
                             strtotime($tmpres['Update_time'])
                         )
                     );
-                    $new_crlf = $this->_exportComment() . $crlf;
+                    $new_crlf = $this->exportComment() . $crlf;
                 }
 
                 if ($show_dates
                     && isset($tmpres['Check_time'])
                     && ! empty($tmpres['Check_time'])
                 ) {
-                    $schema_create .= $this->_exportComment(
+                    $schema_create .= $this->exportComment(
                         __('Last check:') . ' '
                         . Util::localisedDate(
                             strtotime($tmpres['Check_time'])
                         )
                     );
-                    $new_crlf = $this->_exportComment() . $crlf;
+                    $new_crlf = $this->exportComment() . $crlf;
                 }
             }
             $GLOBALS['dbi']->freeResult($result);
@@ -1555,7 +1555,7 @@ public function getTableDef(
                 trigger_error($message, E_USER_ERROR);
             }
 
-            return $this->_exportComment($message);
+            return $this->exportComment($message);
         }
 
         // Old mode is stored so it can be restored once exporting is done.
@@ -1638,14 +1638,14 @@ public function getTableDef(
 
             // One warning per view.
             if ($flag && $view) {
-                $warning = $this->_exportComment()
-                    . $this->_exportComment(
+                $warning = $this->exportComment()
+                    . $this->exportComment(
                         __('It appears your database uses views;')
                     )
-                    . $this->_exportComment(
+                    . $this->exportComment(
                         __('alias export may not work reliably in all cases.')
                     )
-                    . $this->_exportComment();
+                    . $this->exportComment();
             }
 
             // Adding IF NOT EXISTS, if required.
@@ -1659,7 +1659,7 @@ public function getTableDef(
 
             // Making the query MSSQL compatible.
             if ($compat == 'MSSQL') {
-                $create_query = $this->_makeCreateTableMSSQLCompatible(
+                $create_query = $this->makeCreateTableMSSQLCompatible(
                     $create_query
                 );
             }
@@ -1928,7 +1928,7 @@ public function getTableDef(
      *
      * @return string resulting comments
      */
-    private function _getTableComments(
+    private function getTableComments(
         $db,
         $table,
         $crlf,
@@ -1959,18 +1959,18 @@ private function _getTableComments(
         }
 
         if (isset($mime_map) && count($mime_map) > 0) {
-            $schema_create .= $this->_possibleCRLF()
-                . $this->_exportComment()
-                . $this->_exportComment(
+            $schema_create .= $this->possibleCRLF()
+                . $this->exportComment()
+                . $this->exportComment(
                     __('MEDIA TYPES FOR TABLE') . ' '
                     . Util::backquote($table, $sql_backquotes) . ':'
                 );
             foreach ($mime_map as $mime_field => $mime) {
-                $schema_create .= $this->_exportComment(
+                $schema_create .= $this->exportComment(
                     '  '
                     . Util::backquote($mime_field, $sql_backquotes)
                 )
-                . $this->_exportComment(
+                . $this->exportComment(
                     '      '
                     . Util::backquote(
                         $mime['mimetype'],
@@ -1978,13 +1978,13 @@ private function _getTableComments(
                     )
                 );
             }
-            $schema_create .= $this->_exportComment();
+            $schema_create .= $this->exportComment();
         }
 
         if ($have_rel) {
-            $schema_create .= $this->_possibleCRLF()
-                . $this->_exportComment()
-                . $this->_exportComment(
+            $schema_create .= $this->possibleCRLF()
+                . $this->exportComment()
+                . $this->exportComment(
                     __('RELATIONSHIPS FOR TABLE') . ' '
                     . Util::backquote($table_alias, $sql_backquotes)
                     . ':'
@@ -1996,14 +1996,14 @@ private function _getTableComments(
                         $aliases[$db]['tables'][$table]['columns'][$rel_field]
                     ) ? $aliases[$db]['tables'][$table]['columns'][$rel_field]
                         : $rel_field;
-                    $schema_create .= $this->_exportComment(
+                    $schema_create .= $this->exportComment(
                         '  '
                         . Util::backquote(
                             $rel_field_alias,
                             $sql_backquotes
                         )
                     )
-                    . $this->_exportComment(
+                    . $this->exportComment(
                         '      '
                         . Util::backquote(
                             $rel['foreign_table'],
@@ -2022,14 +2022,14 @@ private function _getTableComments(
                                 $aliases[$db]['tables'][$table]['columns'][$field]
                             ) ? $aliases[$db]['tables'][$table]['columns'][$field]
                                 : $field;
-                            $schema_create .= $this->_exportComment(
+                            $schema_create .= $this->exportComment(
                                 '  '
                                 . Util::backquote(
                                     $rel_field_alias,
                                     $sql_backquotes
                                 )
                             )
-                            . $this->_exportComment(
+                            . $this->exportComment(
                                 '      '
                                 . Util::backquote(
                                     $one_key['ref_table_name'],
@@ -2045,7 +2045,7 @@ private function _getTableComments(
                     }
                 }
             }
-            $schema_create .= $this->_exportComment();
+            $schema_create .= $this->exportComment();
         }
 
         return $schema_create;
@@ -2115,17 +2115,17 @@ public function exportStructure(
             $compat,
             isset($GLOBALS['sql_backquotes'])
         );
-        $dump = $this->_possibleCRLF()
-            . $this->_exportComment(str_repeat('-', 56))
-            . $this->_possibleCRLF()
-            . $this->_exportComment();
+        $dump = $this->possibleCRLF()
+            . $this->exportComment(str_repeat('-', 56))
+            . $this->possibleCRLF()
+            . $this->exportComment();
 
         switch ($export_mode) {
             case 'create_table':
-                $dump .= $this->_exportComment(
+                $dump .= $this->exportComment(
                     __('Table structure for table') . ' ' . $formatted_table_name
                 );
-                $dump .= $this->_exportComment();
+                $dump .= $this->exportComment();
                 $dump .= $this->getTableDef(
                     $db,
                     $table,
@@ -2137,7 +2137,7 @@ public function exportStructure(
                     true,
                     $aliases
                 );
-                $dump .= $this->_getTableComments(
+                $dump .= $this->getTableComments(
                     $db,
                     $table,
                     $crlf,
@@ -2151,12 +2151,12 @@ public function exportStructure(
                 $delimiter = '$$';
                 $triggers = $GLOBALS['dbi']->getTriggers($db, $table, $delimiter);
                 if ($triggers) {
-                    $dump .= $this->_possibleCRLF()
-                    . $this->_exportComment()
-                    . $this->_exportComment(
+                    $dump .= $this->possibleCRLF()
+                    . $this->exportComment()
+                    . $this->exportComment(
                         __('Triggers') . ' ' . $formatted_table_name
                     )
-                        . $this->_exportComment();
+                        . $this->exportComment();
                     $used_alias = false;
                     $trigger_query = '';
                     foreach ($triggers as $trigger) {
@@ -2179,25 +2179,25 @@ public function exportStructure(
                     }
                     // One warning per table.
                     if ($used_alias) {
-                        $dump .= $this->_exportComment(
+                        $dump .= $this->exportComment(
                             __('It appears your table uses triggers;')
                         )
-                        . $this->_exportComment(
+                        . $this->exportComment(
                             __('alias export may not work reliably in all cases.')
                         )
-                        . $this->_exportComment();
+                        . $this->exportComment();
                     }
                     $dump .= $trigger_query;
                 }
                 break;
             case 'create_view':
                 if (empty($GLOBALS['sql_views_as_tables'])) {
-                    $dump .= $this->_exportComment(
+                    $dump .= $this->exportComment(
                         __('Structure for view')
                         . ' '
                         . $formatted_table_name
                     )
-                    . $this->_exportComment();
+                    . $this->exportComment();
                     // delete the stand-in table previously created (if any)
                     if ($export_type != 'table') {
                         $dump .= 'DROP TABLE IF EXISTS '
@@ -2215,19 +2215,19 @@ public function exportStructure(
                         $aliases
                     );
                 } else {
-                    $dump .= $this->_exportComment(
+                    $dump .= $this->exportComment(
                         sprintf(
                             __('Structure for view %s exported as a table'),
                             $formatted_table_name
                         )
                     )
-                    . $this->_exportComment();
+                    . $this->exportComment();
                     // delete the stand-in table previously created (if any)
                     if ($export_type != 'table') {
                         $dump .= 'DROP TABLE IF EXISTS '
                         . Util::backquote($table_alias) . ';' . $crlf;
                     }
-                    $dump .= $this->_getTableDefForView(
+                    $dump .= $this->getTableDefForView(
                         $db,
                         $table,
                         $crlf,
@@ -2237,13 +2237,13 @@ public function exportStructure(
                 }
                 break;
             case 'stand_in':
-                $dump .= $this->_exportComment(
+                $dump .= $this->exportComment(
                     __('Stand-in structure for view') . ' ' . $formatted_table_name
                 )
-                    . $this->_exportComment(
+                    . $this->exportComment(
                         __('(See below for the actual view)')
                     )
-                    . $this->_exportComment();
+                    . $this->exportComment();
                 // export a stand-in definition to resolve view dependencies
                 $dump .= $this->getTableDefStandIn($db, $table, $crlf, $aliases);
         } // end switch
@@ -2303,12 +2303,12 @@ public function exportData(
         if ($GLOBALS['dbi']->getTable($db, $table)->isView()
             && empty($GLOBALS['sql_views_as_tables'])
         ) {
-            $head = $this->_possibleCRLF()
-                . $this->_exportComment()
-                . $this->_exportComment('VIEW ' . $formatted_table_name)
-                . $this->_exportComment(__('Data:') . ' ' . __('None'))
-                . $this->_exportComment()
-                . $this->_possibleCRLF();
+            $head = $this->possibleCRLF()
+                . $this->exportComment()
+                . $this->exportComment('VIEW ' . $formatted_table_name)
+                . $this->exportComment(__('Data:') . ' ' . __('None'))
+                . $this->exportComment()
+                . $this->possibleCRLF();
 
             return $this->export->outputHandler($head);
         }
@@ -2328,7 +2328,7 @@ public function exportData(
             }
 
             return $this->export->outputHandler(
-                $this->_exportComment($message)
+                $this->exportComment($message)
             );
         }
 
@@ -2406,13 +2406,13 @@ public function exportData(
                         $compat,
                         $sql_backquotes
                     ) . ';';
-                $truncatehead = $this->_possibleCRLF()
-                    . $this->_exportComment()
-                    . $this->_exportComment(
+                $truncatehead = $this->possibleCRLF()
+                    . $this->exportComment()
+                    . $this->exportComment(
                         __('Truncate table before insert') . ' '
                         . $formatted_table_name
                     )
-                    . $this->_exportComment()
+                    . $this->exportComment()
                     . $crlf;
                 $this->export->outputHandler($truncatehead);
                 $this->export->outputHandler($truncate);
@@ -2458,13 +2458,13 @@ public function exportData(
 
         while ($row = $GLOBALS['dbi']->fetchRow($result)) {
             if ($current_row == 0) {
-                $head = $this->_possibleCRLF()
-                    . $this->_exportComment()
-                    . $this->_exportComment(
+                $head = $this->possibleCRLF()
+                    . $this->exportComment()
+                    . $this->exportComment(
                         __('Dumping data for table') . ' '
                         . $formatted_table_name
                     )
-                    . $this->_exportComment()
+                    . $this->exportComment()
                     . $crlf;
                 if (! $this->export->outputHandler($head)) {
                     return false;
@@ -2650,7 +2650,7 @@ public function exportData(
      *
      * @return string MSSQL compatible create table statement
      */
-    private function _makeCreateTableMSSQLCompatible($create_query)
+    private function makeCreateTableMSSQLCompatible($create_query)
     {
         // In MSSQL
         // 1. No 'IF NOT EXISTS' in CREATE TABLE
@@ -2972,24 +2972,24 @@ protected function generateComment(
                 $sql_statement = '';
             } else {
                 $sql_statement = $crlf
-                    . $this->_exportComment()
-                    . $this->_exportComment($comment1)
-                    . $this->_exportComment();
+                    . $this->exportComment()
+                    . $this->exportComment($comment1)
+                    . $this->exportComment();
             }
         }
 
         // comments for current table
         if (! isset($GLOBALS['no_constraints_comments'])) {
             $sql_statement .= $crlf
-                . $this->_exportComment()
-                . $this->_exportComment(
+                . $this->exportComment()
+                . $this->exportComment(
                     $comment2 . ' ' . Util::backquoteCompat(
                         $table_alias,
                         $compat,
                         isset($GLOBALS['sql_backquotes'])
                     )
                 )
-                . $this->_exportComment();
+                . $this->exportComment();
         }
 
         return $sql_statement;
diff --git a/libraries/classes/Plugins/Export/ExportXml.php b/libraries/classes/Plugins/Export/ExportXml.php
index 1dabfa2d3aab..8eaa03ea98ff 100644
--- a/libraries/classes/Plugins/Export/ExportXml.php
+++ b/libraries/classes/Plugins/Export/ExportXml.php
@@ -66,12 +66,12 @@ public function __construct()
     protected function initSpecificVariables()
     {
         global $table, $tables;
-        $this->_setTable($table);
+        $this->setTable($table);
         if (! is_array($tables)) {
             return;
         }
 
-        $this->_setTables($tables);
+        $this->setTables($tables);
     }
 
     /**
@@ -177,7 +177,7 @@ private function _exportRoutines($db, $type, $dbitype)
             $dbitype
         );
 
-        return $this->_exportDefinitions($db, $type, $dbitype, $routines);
+        return $this->exportDefinitions($db, $type, $dbitype, $routines);
     }
 
     /**
@@ -190,7 +190,7 @@ private function _exportRoutines($db, $type, $dbitype)
      *
      * @return string XML with definitions
      */
-    private function _exportDefinitions($db, $type, $dbitype, array $names)
+    private function exportDefinitions($db, $type, $dbitype, array $names)
     {
         global $crlf;
 
@@ -224,8 +224,8 @@ public function exportHeader()
     {
         $this->initSpecificVariables();
         global $crlf, $cfg, $db;
-        $table = $this->_getTable();
-        $tables = $this->_getTables();
+        $table = $this->getTable();
+        $tables = $this->getTables();
 
         $export_struct = isset($GLOBALS['xml_export_functions'])
             || isset($GLOBALS['xml_export_procedures'])
@@ -373,7 +373,7 @@ public function exportHeader()
                     . "WHERE EVENT_SCHEMA='" . $GLOBALS['dbi']->escapeString($db)
                     . "'"
                 );
-                $head .= $this->_exportDefinitions(
+                $head .= $this->exportDefinitions(
                     $db,
                     'event',
                     'EVENT',
@@ -559,7 +559,7 @@ public function exportData(
      *
      * @return string
      */
-    private function _getTable()
+    private function getTable()
     {
         return $this->_table;
     }
@@ -571,7 +571,7 @@ private function _getTable()
      *
      * @return void
      */
-    private function _setTable($table)
+    private function setTable($table)
     {
         $this->_table = $table;
     }
@@ -581,7 +581,7 @@ private function _setTable($table)
      *
      * @return array
      */
-    private function _getTables()
+    private function getTables()
     {
         return $this->_tables;
     }
@@ -593,7 +593,7 @@ private function _getTables()
      *
      * @return void
      */
-    private function _setTables(array $tables)
+    private function setTables(array $tables)
     {
         $this->_tables = $tables;
     }
diff --git a/libraries/classes/Plugins/Import/ImportCsv.php b/libraries/classes/Plugins/Import/ImportCsv.php
index 9db6e3bcf396..4e620f316b4b 100644
--- a/libraries/classes/Plugins/Import/ImportCsv.php
+++ b/libraries/classes/Plugins/Import/ImportCsv.php
@@ -57,10 +57,10 @@ public function __construct()
      */
     protected function setProperties()
     {
-        $this->_setAnalyze(false);
+        $this->setAnalyze(false);
 
         if ($GLOBALS['plugin_param'] !== 'table') {
-            $this->_setAnalyze(true);
+            $this->setAnalyze(true);
         }
 
         $generalOptions = parent::setProperties();
@@ -521,7 +521,7 @@ public function doImport(array &$sql_data = [])
                     $values[] = '';
                 }
 
-                if ($this->_getAnalyze()) {
+                if ($this->getAnalyze()) {
                     foreach ($values as $val) {
                         $tempRow[] = $val;
                         ++$col_count;
@@ -608,7 +608,7 @@ public function doImport(array &$sql_data = [])
             }
         } // End of import loop
 
-        if ($this->_getAnalyze()) {
+        if ($this->getAnalyze()) {
             /* Fill out all rows */
             $num_rows = count($rows);
             for ($i = 0; $i < $num_rows; ++$i) {
@@ -752,7 +752,7 @@ private function getSqlTemplateAndRequiredFields(
         $requiredFields = 0;
         $sqlTemplate = '';
         $fields = [];
-        if (! $this->_getAnalyze() && $db !== null && $table !== null) {
+        if (! $this->getAnalyze() && $db !== null && $table !== null) {
             $sqlTemplate = 'INSERT';
             if (isset($_POST['csv_ignore'])) {
                 $sqlTemplate .= ' IGNORE';
@@ -841,7 +841,7 @@ public function readCsvTerminatedString($buffer, $ch, $i, $csv_terminated_len)
      *
      * @return bool
      */
-    private function _getAnalyze()
+    private function getAnalyze()
     {
         return $this->_analyze;
     }
@@ -853,7 +853,7 @@ private function _getAnalyze()
      *
      * @return void
      */
-    private function _setAnalyze($analyze)
+    private function setAnalyze($analyze)
     {
         $this->_analyze = $analyze;
     }
diff --git a/libraries/classes/Plugins/Import/ImportMediawiki.php b/libraries/classes/Plugins/Import/ImportMediawiki.php
index 07536da5c6c0..0fbcbf148860 100644
--- a/libraries/classes/Plugins/Import/ImportMediawiki.php
+++ b/libraries/classes/Plugins/Import/ImportMediawiki.php
@@ -47,9 +47,9 @@ public function __construct()
      */
     protected function setProperties()
     {
-        $this->_setAnalyze(false);
+        $this->setAnalyze(false);
         if ($GLOBALS['plugin_param'] !== 'table') {
-            $this->_setAnalyze(true);
+            $this->setAnalyze(true);
         }
 
         $importPluginProperties = new ImportPluginProperties();
@@ -181,7 +181,7 @@ public function doImport(array &$sql_data = [])
                             $inside_data_comment = true;
 
                             $inside_structure_comment
-                                = $this->_mngInsideStructComm(
+                                = $this->mngInsideStructComm(
                                     $inside_structure_comment
                                 );
                         } elseif (preg_match(
@@ -246,7 +246,7 @@ public function doImport(array &$sql_data = [])
                         ];
 
                         // Import the current table data into the database
-                        $this->_importDataOneTable($current_table, $sql_data);
+                        $this->importDataOneTable($current_table, $sql_data);
 
                         // Reset table name
                         $cur_table_name = '';
@@ -266,9 +266,9 @@ public function doImport(array &$sql_data = [])
                     }
 
                     // Loop through each table cell
-                    $cells = $this->_explodeMarkup($cur_buffer_line);
+                    $cells = $this->explodeMarkup($cur_buffer_line);
                     foreach ($cells as $cell) {
-                        $cell = $this->_getCellData($cell);
+                        $cell = $this->getCellData($cell);
 
                         // Delete the beginning of the column, if there is one
                         $cell = trim($cell);
@@ -277,7 +277,7 @@ public function doImport(array &$sql_data = [])
                             '!',
                         ];
                         foreach ($col_start_chars as $col_start_char) {
-                            $cell = $this->_getCellContent($cell, $col_start_char);
+                            $cell = $this->getCellContent($cell, $col_start_char);
                         }
 
                         // Add the cell to the row
@@ -312,15 +312,15 @@ public function doImport(array &$sql_data = [])
      *
      * @global bool $analyze whether to scan for column types
      */
-    private function _importDataOneTable(array $table, array &$sql_data)
+    private function importDataOneTable(array $table, array &$sql_data)
     {
-        $analyze = $this->_getAnalyze();
+        $analyze = $this->getAnalyze();
         if ($analyze) {
             // Set the table name
-            $this->_setTableName($table[0]);
+            $this->setTableName($table[0]);
 
             // Set generic names for table headers if they don't exist
-            $this->_setTableHeaders($table[1], $table[2][0]);
+            $this->setTableHeaders($table[1], $table[2][0]);
 
             // Create the tables array to be used in Import::buildSql()
             $tables = [];
@@ -334,7 +334,7 @@ private function _importDataOneTable(array $table, array &$sql_data)
             $analyses = [];
             $analyses[] = $this->import->analyzeTable($tables[0]);
 
-            $this->_executeImportTables($tables, $analyses, $sql_data);
+            $this->executeImportTables($tables, $analyses, $sql_data);
         }
 
         // Commit any possible data in buffers
@@ -348,7 +348,7 @@ private function _importDataOneTable(array $table, array &$sql_data)
      *
      * @return void
      */
-    private function _setTableName(&$table_name)
+    private function setTableName(&$table_name)
     {
         if (! empty($table_name)) {
             return;
@@ -368,7 +368,7 @@ private function _setTableName(&$table_name)
      *
      * @return void
      */
-    private function _setTableHeaders(array &$table_headers, array $table_row)
+    private function setTableHeaders(array &$table_headers, array $table_row)
     {
         if (! empty($table_headers)) {
             return;
@@ -401,7 +401,7 @@ private function _setTableHeaders(array &$table_headers, array $table_row)
      *
      * @global string $db      name of the database to import in
      */
-    private function _executeImportTables(array &$tables, array &$analyses, array &$sql_data)
+    private function executeImportTables(array &$tables, array &$analyses, array &$sql_data)
     {
         global $db;
 
@@ -427,7 +427,7 @@ private function _executeImportTables(array &$tables, array &$analyses, array &$
      *
      * @return string with replacements
      */
-    private function _delimiterReplace($replace, $subject)
+    private function delimiterReplace($replace, $subject)
     {
         // String that will be returned
         $cleaned = '';
@@ -512,7 +512,7 @@ private function _delimiterReplace($replace, $subject)
      *
      * @return array
      */
-    private function _explodeMarkup($text)
+    private function explodeMarkup($text)
     {
         $separator = '||';
         $placeholder = "\x00";
@@ -522,7 +522,7 @@ private function _explodeMarkup($text)
 
         // Replace instances of the separator inside HTML-like
         // tags with the placeholder
-        $cleaned = $this->_delimiterReplace($placeholder, $text);
+        $cleaned = $this->delimiterReplace($placeholder, $text);
         // Explode, then put the replaced separators back in
         $items = explode($separator, $cleaned);
         foreach ($items as $i => $str) {
@@ -539,7 +539,7 @@ private function _explodeMarkup($text)
      *
      * @return bool
      */
-    private function _getAnalyze()
+    private function getAnalyze()
     {
         return $this->_analyze;
     }
@@ -551,7 +551,7 @@ private function _getAnalyze()
      *
      * @return void
      */
-    private function _setAnalyze($analyze)
+    private function setAnalyze($analyze)
     {
         $this->_analyze = $analyze;
     }
@@ -563,7 +563,7 @@ private function _setAnalyze($analyze)
      *
      * @return mixed
      */
-    private function _getCellData($cell)
+    private function getCellData($cell)
     {
         // A cell could contain both parameters and data
         $cell_data = explode('|', $cell, 2);
@@ -588,7 +588,7 @@ private function _getCellData($cell)
      *
      * @return bool
      */
-    private function _mngInsideStructComm($inside_structure_comment)
+    private function mngInsideStructComm($inside_structure_comment)
     {
         // End ignoring structure rows
         if ($inside_structure_comment) {
@@ -606,7 +606,7 @@ private function _mngInsideStructComm($inside_structure_comment)
      *
      * @return string
      */
-    private function _getCellContent($cell, $col_start_char)
+    private function getCellContent($cell, $col_start_char)
     {
         if (mb_strpos($cell, $col_start_char) === 0) {
             $cell = trim(mb_substr($cell, 1));
diff --git a/libraries/classes/Plugins/Import/ImportSql.php b/libraries/classes/Plugins/Import/ImportSql.php
index 98c7dfdffcd4..4693718f102d 100644
--- a/libraries/classes/Plugins/Import/ImportSql.php
+++ b/libraries/classes/Plugins/Import/ImportSql.php
@@ -107,7 +107,7 @@ public function doImport(array &$sql_data = [])
         global $error, $timeout_passed;
 
         // Handle compatibility options.
-        $this->_setSQLMode($GLOBALS['dbi'], $_REQUEST);
+        $this->setSQLMode($GLOBALS['dbi'], $_REQUEST);
 
         $bq = new BufferedQuery();
         if (isset($_POST['sql_delimiter'])) {
@@ -176,7 +176,7 @@ public function doImport(array &$sql_data = [])
      *
      * @return void
      */
-    private function _setSQLMode($dbi, array $request)
+    private function setSQLMode($dbi, array $request)
     {
         $sql_modes = [];
         if (isset($request['sql_compatibility'])
diff --git a/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php b/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php
index 95289414baf9..5cde6c5dce1b 100644
--- a/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php
+++ b/libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php
@@ -98,7 +98,7 @@ public function __construct($db)
                  */
                 if ($master_field != 'foreign_keys_data') {
                     if (in_array($rel['foreign_table'], $alltables)) {
-                        $this->_addRelation(
+                        $this->addRelation(
                             $one_table,
                             $master_field,
                             $rel['foreign_table'],
@@ -115,7 +115,7 @@ public function __construct($db)
                     }
 
                     foreach ($one_key['index_list'] as $index => $one_field) {
-                        $this->_addRelation(
+                        $this->addRelation(
                             $one_table,
                             $one_field,
                             $one_key['ref_table_name'],
@@ -126,10 +126,10 @@ public function __construct($db)
                 }
             }
         }
-        $this->_drawTables();
+        $this->drawTables();
 
         if ($seen_a_relation) {
-            $this->_drawRelations();
+            $this->drawRelations();
         }
         $this->diagram->endDiaDoc();
     }
@@ -161,7 +161,7 @@ public function showOutput()
      *
      * @access private
      */
-    private function _addRelation(
+    private function addRelation(
         $masterTable,
         $masterField,
         $foreignTable,
@@ -208,7 +208,7 @@ private function _addRelation(
      *
      * @access private
      */
-    private function _drawRelations()
+    private function drawRelations()
     {
         foreach ($this->_relations as $relation) {
             $relation->relationDraw($this->showColor);
@@ -227,7 +227,7 @@ private function _drawRelations()
      *
      * @access private
      */
-    private function _drawTables()
+    private function drawTables()
     {
         foreach ($this->_tables as $table) {
             $table->tableDraw($this->showColor);
diff --git a/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php b/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php
index 2552f6bda94e..b6ca71f64f8e 100644
--- a/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php
+++ b/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php
@@ -55,8 +55,8 @@ public function __construct(
         $foreign_field
     ) {
         $this->diagram = $diagram;
-        $src_pos  = $this->_getXy($master_table, $master_field);
-        $dest_pos = $this->_getXy($foreign_table, $foreign_field);
+        $src_pos  = $this->getXy($master_table, $master_field);
+        $dest_pos = $this->getXy($foreign_table, $foreign_field);
         $this->srcConnPointsLeft = $src_pos[0];
         $this->srcConnPointsRight = $src_pos[1];
         $this->destConnPointsLeft = $dest_pos[0];
@@ -81,7 +81,7 @@ public function __construct(
      *
      * @access private
      */
-    private function _getXy($table, $column)
+    private function getXy($table, $column)
     {
         $pos = array_search($column, $table->fields);
         // left, right, position
diff --git a/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php b/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php
index b3d892a30bb8..23912c08f712 100644
--- a/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php
+++ b/libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php
@@ -109,7 +109,7 @@ public function __construct($db)
                 */
                 if ($master_field != 'foreign_keys_data') {
                     if (in_array($rel['foreign_table'], $alltables)) {
-                        $this->_addRelation(
+                        $this->addRelation(
                             $one_table,
                             $this->diagram->getFont(),
                             $this->diagram->getFontSize(),
@@ -128,7 +128,7 @@ public function __construct($db)
                     }
 
                     foreach ($one_key['index_list'] as $index => $one_field) {
-                        $this->_addRelation(
+                        $this->addRelation(
                             $one_table,
                             $this->diagram->getFont(),
                             $this->diagram->getFontSize(),
@@ -142,10 +142,10 @@ public function __construct($db)
             }
         }
         if ($seen_a_relation) {
-            $this->_drawRelations();
+            $this->drawRelations();
         }
 
-        $this->_drawTables();
+        $this->drawTables();
         $this->diagram->endEpsDoc();
     }
 
@@ -175,7 +175,7 @@ public function showOutput()
      *
      * @return void
      */
-    private function _addRelation(
+    private function addRelation(
         $masterTable,
         $font,
         $fontSize,
@@ -227,7 +227,7 @@ private function _addRelation(
      *
      * @return void
      */
-    private function _drawRelations()
+    private function drawRelations()
     {
         foreach ($this->_relations as $relation) {
             $relation->relationDraw();
@@ -241,7 +241,7 @@ private function _drawRelations()
      *
      * @return void
      */
-    private function _drawTables()
+    private function drawTables()
     {
         foreach ($this->_tables as $table) {
             $table->tableDraw($this->showColor);
diff --git a/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php b/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php
index 7080aaff0a2b..e841015e7ff9 100644
--- a/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php
+++ b/libraries/classes/Plugins/Schema/Eps/TableStatsEps.php
@@ -70,10 +70,10 @@ public function __construct(
         );
 
         // height and width
-        $this->_setHeightTable($fontSize);
+        $this->setHeightTable($fontSize);
         // setWidth must me after setHeight, because title
         // can include table height which changes table width
-        $this->_setWidthTable($font, $fontSize);
+        $this->setWidthTable($font, $fontSize);
         if ($same_wide_width >= $this->width) {
             return;
         }
@@ -105,7 +105,7 @@ protected function showMissingTableError()
      *
      * @return void
      */
-    private function _setWidthTable($font, $fontSize)
+    private function setWidthTable($font, $fontSize)
     {
         foreach ($this->fields as $field) {
             $this->width = max(
@@ -139,7 +139,7 @@ private function _setWidthTable($font, $fontSize)
      *
      * @return void
      */
-    private function _setHeightTable($fontSize)
+    private function setHeightTable($fontSize)
     {
         $this->heightCell = $fontSize + 4;
         $this->height = (count($this->fields) + 1) * $this->heightCell;
diff --git a/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php
index 48953c5aa485..b8ce0fbfc558 100644
--- a/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php
+++ b/libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php
@@ -167,7 +167,7 @@ public function __construct($db)
             if ($this->sameWide) {
                 $this->_tables[$table]->width = $this->_tablewidth;
             }
-            $this->_setMinMax($this->_tables[$table]);
+            $this->setMinMax($this->_tables[$table]);
         }
 
         // Defines the scale factor
@@ -194,7 +194,7 @@ public function __construct($db)
 
         if ($this->_showGrid) {
             $this->diagram->SetFontSize(10);
-            $this->_strokeGrid();
+            $this->strokeGrid();
         }
         $this->diagram->setFontSizeScale(14);
         // previous logic was checking master tables and foreign tables
@@ -215,7 +215,7 @@ public function __construct($db)
                 // to do a === false and this is not PHP3 compatible)
                 if ($master_field != 'foreign_keys_data') {
                     if (in_array($rel['foreign_table'], $alltables)) {
-                        $this->_addRelation(
+                        $this->addRelation(
                             $one_table,
                             $master_field,
                             $rel['foreign_table'],
@@ -231,7 +231,7 @@ public function __construct($db)
                     }
 
                     foreach ($one_key['index_list'] as $index => $one_field) {
-                        $this->_addRelation(
+                        $this->addRelation(
                             $one_table,
                             $one_field,
                             $one_key['ref_table_name'],
@@ -243,9 +243,9 @@ public function __construct($db)
         } // end while
 
         if ($seen_a_relation) {
-            $this->_drawRelations();
+            $this->drawRelations();
         }
-        $this->_drawTables();
+        $this->drawTables();
     }
 
     /**
@@ -331,7 +331,7 @@ public function showOutput()
      *
      * @return void
      */
-    private function _setMinMax($table)
+    private function setMinMax($table)
     {
         $this->_xMax = max($this->_xMax, $table->x + $table->width);
         $this->_yMax = max($this->_yMax, $table->y + $table->height);
@@ -342,7 +342,7 @@ private function _setMinMax($table)
     /**
      * Defines relation objects
      *
-     * @see _setMinMax
+     * @see setMinMax
      *
      * @param string $masterTable  The master table name
      * @param string $masterField  The relation field in the master table
@@ -351,7 +351,7 @@ private function _setMinMax($table)
      *
      * @return void
      */
-    private function _addRelation(
+    private function addRelation(
         $masterTable,
         $masterField,
         $foreignTable,
@@ -368,7 +368,7 @@ private function _addRelation(
                 $this->showKeys,
                 $this->tableDimension
             );
-            $this->_setMinMax($this->_tables[$masterTable]);
+            $this->setMinMax($this->_tables[$masterTable]);
         }
         if (! isset($this->_tables[$foreignTable])) {
             $this->_tables[$foreignTable] = new TableStatsPdf(
@@ -381,7 +381,7 @@ private function _addRelation(
                 $this->showKeys,
                 $this->tableDimension
             );
-            $this->_setMinMax($this->_tables[$foreignTable]);
+            $this->setMinMax($this->_tables[$foreignTable]);
         }
         $this->relations[] = new RelationStatsPdf(
             $this->diagram,
@@ -399,7 +399,7 @@ private function _addRelation(
      *
      * @return void
      */
-    private function _strokeGrid()
+    private function strokeGrid()
     {
         $gridSize = 10;
         $labelHeight = 4;
@@ -460,7 +460,7 @@ private function _strokeGrid()
      *
      * @return void
      */
-    private function _drawRelations()
+    private function drawRelations()
     {
         $i = 0;
         foreach ($this->relations as $relation) {
@@ -476,7 +476,7 @@ private function _drawRelations()
      *
      * @return void
      */
-    private function _drawTables()
+    private function drawTables()
     {
         foreach ($this->_tables as $table) {
             $table->tableDraw(null, $this->_withDoc, $this->showColor);
diff --git a/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php b/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php
index ec9b906146a2..0b9d89472541 100644
--- a/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php
+++ b/libraries/classes/Plugins/Schema/Pdf/TableStatsPdf.php
@@ -72,12 +72,12 @@ public function __construct(
         );
 
         $this->heightCell = 6;
-        $this->_setHeight();
+        $this->setHeight();
         /*
          * setWidth must me after setHeight, because title
         * can include table height which changes table width
         */
-        $this->_setWidth($fontSize);
+        $this->setWidth($fontSize);
         if ($sameWideWidth >= $this->width) {
             return;
         }
@@ -126,7 +126,7 @@ protected function getTitle()
      *
      * @access private
      */
-    private function _setWidth($fontSize)
+    private function setWidth($fontSize)
     {
         foreach ($this->fields as $field) {
             $this->width = max($this->width, $this->diagram->GetStringWidth($field));
@@ -150,7 +150,7 @@ private function _setWidth($fontSize)
      *
      * @access private
      */
-    private function _setHeight()
+    private function setHeight()
     {
         $this->height = (count($this->fields) + 1) * $this->heightCell;
     }
diff --git a/libraries/classes/Plugins/Schema/RelationStats.php b/libraries/classes/Plugins/Schema/RelationStats.php
index 67b999f848e3..417d1287b913 100644
--- a/libraries/classes/Plugins/Schema/RelationStats.php
+++ b/libraries/classes/Plugins/Schema/RelationStats.php
@@ -50,8 +50,8 @@ public function __construct(
     ) {
         $this->diagram = $diagram;
 
-        $src_pos = $this->_getXy($master_table, $master_field);
-        $dest_pos = $this->_getXy($foreign_table, $foreign_field);
+        $src_pos = $this->getXy($master_table, $master_field);
+        $dest_pos = $this->getXy($foreign_table, $foreign_field);
         /*
          * [0] is x-left
         * [1] is x-right
@@ -103,7 +103,7 @@ public function __construct(
      *
      * @access private
      */
-    private function _getXy($table, $column)
+    private function getXy($table, $column)
     {
         $pos = array_search($column, $table->fields);
 
diff --git a/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php b/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php
index c4392a9e1eee..e748d14e9b9b 100644
--- a/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php
+++ b/libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php
@@ -91,7 +91,7 @@ public function __construct($db)
             if ($this->sameWide) {
                 $this->_tables[$table]->width = &$this->_tablewidth;
             }
-            $this->_setMinMax($this->_tables[$table]);
+            $this->setMinMax($this->_tables[$table]);
         }
 
         $border = 15;
@@ -118,7 +118,7 @@ public function __construct($db)
                 */
                 if ($master_field != 'foreign_keys_data') {
                     if (in_array($rel['foreign_table'], $alltables)) {
-                        $this->_addRelation(
+                        $this->addRelation(
                             $one_table,
                             $this->diagram->getFont(),
                             $this->diagram->getFontSize(),
@@ -137,7 +137,7 @@ public function __construct($db)
                     }
 
                     foreach ($one_key['index_list'] as $index => $one_field) {
-                        $this->_addRelation(
+                        $this->addRelation(
                             $one_table,
                             $this->diagram->getFont(),
                             $this->diagram->getFontSize(),
@@ -151,10 +151,10 @@ public function __construct($db)
             }
         }
         if ($seen_a_relation) {
-            $this->_drawRelations();
+            $this->drawRelations();
         }
 
-        $this->_drawTables();
+        $this->drawTables();
         $this->diagram->endSvgDoc();
     }
 
@@ -175,7 +175,7 @@ public function showOutput()
      *
      * @return void
      */
-    private function _setMinMax($table)
+    private function setMinMax($table)
     {
         $this->_xMax = max($this->_xMax, $table->x + $table->width);
         $this->_yMax = max($this->_yMax, $table->y + $table->height);
@@ -186,7 +186,7 @@ private function _setMinMax($table)
     /**
      * Defines relation objects
      *
-     * @see _setMinMax,Table_Stats_Svg::__construct(),
+     * @see setMinMax,Table_Stats_Svg::__construct(),
      *       PhpMyAdmin\Plugins\Schema\Svg\RelationStatsSvg::__construct()
      *
      * @param string $masterTable    The master table name
@@ -199,7 +199,7 @@ private function _setMinMax($table)
      *
      * @return void
      */
-    private function _addRelation(
+    private function addRelation(
         $masterTable,
         $font,
         $fontSize,
@@ -220,7 +220,7 @@ private function _addRelation(
                 false,
                 $tableDimension
             );
-            $this->_setMinMax($this->_tables[$masterTable]);
+            $this->setMinMax($this->_tables[$masterTable]);
         }
         if (! isset($this->_tables[$foreignTable])) {
             $this->_tables[$foreignTable] = new TableStatsSvg(
@@ -234,7 +234,7 @@ private function _addRelation(
                 false,
                 $tableDimension
             );
-            $this->_setMinMax($this->_tables[$foreignTable]);
+            $this->setMinMax($this->_tables[$foreignTable]);
         }
         $this->_relations[] = new RelationStatsSvg(
             $this->diagram,
@@ -254,7 +254,7 @@ private function _addRelation(
      *
      * @return void
      */
-    private function _drawRelations()
+    private function drawRelations()
     {
         foreach ($this->_relations as $relation) {
             $relation->relationDraw($this->showColor);
@@ -268,7 +268,7 @@ private function _drawRelations()
      *
      * @return void
      */
-    private function _drawTables()
+    private function drawTables()
     {
         foreach ($this->_tables as $table) {
             $table->tableDraw($this->showColor);
diff --git a/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php b/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php
index e43116d1b889..0b7b6a8f7f98 100644
--- a/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php
+++ b/libraries/classes/Plugins/Schema/Svg/TableStatsSvg.php
@@ -70,10 +70,10 @@ public function __construct(
         );
 
         // height and width
-        $this->_setHeightTable($fontSize);
+        $this->setHeightTable($fontSize);
         // setWidth must me after setHeight, because title
         // can include table height which changes table width
-        $this->_setWidthTable($font, $fontSize);
+        $this->setWidthTable($font, $fontSize);
         if ($same_wide_width >= $this->width) {
             return;
         }
@@ -107,7 +107,7 @@ protected function showMissingTableError(): void
      *
      * @access private
      */
-    private function _setWidthTable($font, $fontSize): void
+    private function setWidthTable($font, $fontSize): void
     {
         foreach ($this->fields as $field) {
             $this->width = max(
@@ -135,7 +135,7 @@ private function _setWidthTable($font, $fontSize): void
      *
      * @return void
      */
-    private function _setHeightTable($fontSize): void
+    private function setHeightTable($fontSize): void
     {
         $this->heightCell = $fontSize + 4;
         $this->height = (count($this->fields) + 1) * $this->heightCell;
diff --git a/libraries/classes/RecentFavoriteTable.php b/libraries/classes/RecentFavoriteTable.php
index d3042e5baff3..5daff9b03844 100644
--- a/libraries/classes/RecentFavoriteTable.php
+++ b/libraries/classes/RecentFavoriteTable.php
@@ -72,7 +72,7 @@ private function __construct($type)
         if (! isset($_SESSION['tmpval'][$this->_tableType . 'Tables'][$server_id])
         ) {
             $_SESSION['tmpval'][$this->_tableType . 'Tables'][$server_id]
-                = $this->_getPmaTable() ? $this->getFromDb() : [];
+                = $this->getPmaTable() ? $this->getFromDb() : [];
         }
         $this->_tables
             =& $_SESSION['tmpval'][$this->_tableType . 'Tables'][$server_id];
@@ -113,7 +113,7 @@ public function getFromDb()
     {
         // Read from phpMyAdmin database, if recent tables is not in session
         $sql_query
-            = ' SELECT `tables` FROM ' . $this->_getPmaTable() .
+            = ' SELECT `tables` FROM ' . $this->getPmaTable() .
             " WHERE `username` = '" . $GLOBALS['dbi']->escapeString($GLOBALS['cfg']['Server']['user']) . "'";
 
         $return = [];
@@ -137,7 +137,7 @@ public function saveToDb()
     {
         $username = $GLOBALS['cfg']['Server']['user'];
         $sql_query
-            = ' REPLACE INTO ' . $this->_getPmaTable() . ' (`username`, `tables`)' .
+            = ' REPLACE INTO ' . $this->getPmaTable() . ' (`username`, `tables`)' .
                 " VALUES ('" . $GLOBALS['dbi']->escapeString($username) . "', '"
                 . $GLOBALS['dbi']->escapeString(
                     json_encode($this->_tables)
@@ -298,7 +298,7 @@ public function add($db, $table)
             array_unshift($this->_tables, $table_arr);
             $this->_tables = array_merge(array_unique($this->_tables, SORT_REGULAR));
             $this->trim();
-            if ($this->_getPmaTable()) {
+            if ($this->getPmaTable()) {
                 return $this->saveToDb();
             }
         }
@@ -348,7 +348,7 @@ public function remove($db, $table)
 
             unset($this->_tables[$key]);
         }
-        if ($this->_getPmaTable()) {
+        if ($this->getPmaTable()) {
             return $this->saveToDb();
         }
 
@@ -404,7 +404,7 @@ public static function getHtmlUpdateRecentTables()
      *
      * @return string|null pma table name
      */
-    private function _getPmaTable(): ?string
+    private function getPmaTable(): ?string
     {
         $cfgRelation = $this->relation->getRelationsParam();
         if (! $cfgRelation['recentwork']) {
diff --git a/libraries/classes/Response.php b/libraries/classes/Response.php
index c20952b3ee4e..d772f371827d 100644
--- a/libraries/classes/Response.php
+++ b/libraries/classes/Response.php
@@ -364,7 +364,7 @@ private function _getDisplay()
      */
     private function _htmlResponse()
     {
-        echo $this->_getDisplay();
+        echo $this->getDisplay();
     }
 
     /**
@@ -376,13 +376,13 @@ private function _ajaxResponse()
     {
         /* Avoid wrapping in case we're disabled */
         if ($this->_isDisabled) {
-            echo $this->_getDisplay();
+            echo $this->getDisplay();
 
             return;
         }
 
         if (! isset($this->_JSON['message'])) {
-            $this->_JSON['message'] = $this->_getDisplay();
+            $this->_JSON['message'] = $this->getDisplay();
         } elseif ($this->_JSON['message'] instanceof Message) {
             $this->_JSON['message'] = $this->_JSON['message']->getDisplay();
         }
@@ -521,9 +521,9 @@ public function response()
             $this->_HTML = $buffer->getContents();
         }
         if ($this->isAjax()) {
-            $this->_ajaxResponse();
+            $this->ajaxResponse();
         } else {
-            $this->_htmlResponse();
+            $this->htmlResponse();
         }
         $buffer->flush();
         exit;
diff --git a/libraries/classes/Scripts.php b/libraries/classes/Scripts.php
index 4969c27b2a34..3a3c9d6a2c37 100644
--- a/libraries/classes/Scripts.php
+++ b/libraries/classes/Scripts.php
@@ -63,7 +63,7 @@ public function addFile(
             return;
         }
 
-        $has_onload = $this->_eventBlacklist($filename);
+        $has_onload = $this->eventBlacklist($filename);
         $this->_files[$hash] = [
             'has_onload' => $has_onload,
             'filename' => $filename,
@@ -93,7 +93,7 @@ public function addFiles(array $filelist)
      *
      * @return int 1 to fire up the event, 0 not to
      */
-    private function _eventBlacklist($filename)
+    private function eventBlacklist($filename)
     {
         if (strpos($filename, 'jquery') !== false
             || strpos($filename, 'codemirror') !== false
diff --git a/libraries/classes/Server/Status/Data.php b/libraries/classes/Server/Status/Data.php
index 78374986e1ef..f914b4b9e83a 100644
--- a/libraries/classes/Server/Status/Data.php
+++ b/libraries/classes/Server/Status/Data.php
@@ -55,7 +55,7 @@ public function __set($a, $b)
      *
      * @return array
      */
-    private function _getAllocations()
+    private function getAllocations()
     {
         return [
             // variable name => section
@@ -109,7 +109,7 @@ private function _getAllocations()
      *
      * @return array
      */
-    private function _getSections()
+    private function getSections()
     {
         return [
             // section => section name (description)
@@ -140,7 +140,7 @@ private function _getSections()
      *
      * @return array
      */
-    private function _getLinks()
+    private function getLinks()
     {
         $links = [];
         // variable or section name => (name => url)
@@ -214,7 +214,7 @@ private function _getLinks()
      *
      * @return array
      */
-    private function _calculateValues(array $server_status, array $server_variables)
+    private function calculateValues(array $server_status, array $server_variables)
     {
         // Key_buffer_fraction
         if (isset($server_status['Key_blocks_unused'], $server_variables['key_cache_block_size'])
@@ -278,7 +278,7 @@ private function _calculateValues(array $server_status, array $server_variables)
      *
      * @return array ($allocationMap, $sectionUsed, $used_queries)
      */
-    private function _sortVariables(
+    private function sortVariables(
         array $server_status,
         array $allocations,
         array $allocationMap,
@@ -349,18 +349,18 @@ public function __construct()
         $server_status = self::cleanDeprecated($server_status);
 
         // calculate some values
-        $server_status = $this->_calculateValues(
+        $server_status = $this->calculateValues(
             $server_status,
             $server_variables
         );
 
         // split variables in sections
-        $allocations = $this->_getAllocations();
+        $allocations = $this->getAllocations();
 
-        $sections = $this->_getSections();
+        $sections = $this->getSections();
 
         // define some needful links/commands
-        $links = $this->_getLinks();
+        $links = $this->getLinks();
 
         // Variable to contain all com_ variables (query statistics)
         $used_queries = [];
@@ -377,7 +377,7 @@ public function __construct()
             $allocationMap,
             $sectionUsed,
             $used_queries,
-        ] = $this->_sortVariables(
+        ] = $this->sortVariables(
             $server_status,
             $allocations,
             $allocationMap,
diff --git a/libraries/classes/Server/SysInfo/SunOs.php b/libraries/classes/Server/SysInfo/SunOs.php
index 4fbbd2c81608..0851914d27c5 100644
--- a/libraries/classes/Server/SysInfo/SunOs.php
+++ b/libraries/classes/Server/SysInfo/SunOs.php
@@ -28,7 +28,7 @@ class SunOs extends Base
      *
      * @return string with value
      */
-    private function _kstat($key)
+    private function kstat($key)
     {
         $m = shell_exec('kstat -p d ' . $key);
 
@@ -48,7 +48,7 @@ private function _kstat($key)
      */
     public function loadavg()
     {
-        $load1 = $this->_kstat('unix:0:system_misc:avenrun_1min');
+        $load1 = $this->kstat('unix:0:system_misc:avenrun_1min');
 
         return ['loadavg' => $load1];
     }
@@ -70,14 +70,14 @@ public function supported()
      */
     public function memory()
     {
-        $pagesize = (int) $this->_kstat('unix:0:seg_cache:slab_size');
+        $pagesize = (int) $this->kstat('unix:0:seg_cache:slab_size');
         $mem = [];
-        $mem['MemTotal'] = (int) $this->_kstat('unix:0:system_pages:pagestotal') * $pagesize;
-        $mem['MemUsed'] = (int) $this->_kstat('unix:0:system_pages:pageslocked') * $pagesize;
-        $mem['MemFree'] = (int) $this->_kstat('unix:0:system_pages:pagesfree') * $pagesize;
-        $mem['SwapTotal'] = (int) $this->_kstat('unix:0:vminfo:swap_avail') / 1024;
-        $mem['SwapUsed'] = (int) $this->_kstat('unix:0:vminfo:swap_alloc') / 1024;
-        $mem['SwapFree'] = (int) $this->_kstat('unix:0:vminfo:swap_free') / 1024;
+        $mem['MemTotal'] = (int) $this->kstat('unix:0:system_pages:pagestotal') * $pagesize;
+        $mem['MemUsed'] = (int) $this->kstat('unix:0:system_pages:pageslocked') * $pagesize;
+        $mem['MemFree'] = (int) $this->kstat('unix:0:system_pages:pagesfree') * $pagesize;
+        $mem['SwapTotal'] = (int) $this->kstat('unix:0:vminfo:swap_avail') / 1024;
+        $mem['SwapUsed'] = (int) $this->kstat('unix:0:vminfo:swap_alloc') / 1024;
+        $mem['SwapFree'] = (int) $this->kstat('unix:0:vminfo:swap_free') / 1024;
 
         return $mem;
     }
diff --git a/libraries/classes/Server/SysInfo/WindowsNt.php b/libraries/classes/Server/SysInfo/WindowsNt.php
index 28a043fc7c45..0e187084bfbb 100644
--- a/libraries/classes/Server/SysInfo/WindowsNt.php
+++ b/libraries/classes/Server/SysInfo/WindowsNt.php
@@ -48,7 +48,7 @@ public function __construct()
     public function loadavg()
     {
         $sum = 0;
-        $buffer = $this->_getWMI('Win32_Processor', ['LoadPercentage']);
+        $buffer = $this->getWMI('Win32_Processor', ['LoadPercentage']);
 
         foreach ($buffer as $load) {
             $value = $load['LoadPercentage'];
@@ -76,7 +76,7 @@ public function supported()
      *
      * @return array with results
      */
-    private function _getWMI($strClass, array $strValue = [])
+    private function getWMI($strClass, array $strValue = [])
     {
         $arrData = [];
 
@@ -111,7 +111,7 @@ private function _getWMI($strClass, array $strValue = [])
      */
     public function memory()
     {
-        $buffer = $this->_getWMI(
+        $buffer = $this->getWMI(
             'Win32_OperatingSystem',
             [
                 'TotalVisibleMemorySize',
@@ -123,7 +123,7 @@ public function memory()
         $mem['MemFree'] = $buffer[0]['FreePhysicalMemory'];
         $mem['MemUsed'] = $mem['MemTotal'] - $mem['MemFree'];
 
-        $buffer = $this->_getWMI('Win32_PageFileUsage');
+        $buffer = $this->getWMI('Win32_PageFileUsage');
 
         $mem['SwapTotal'] = 0;
         $mem['SwapUsed'] = 0;
diff --git a/libraries/classes/Setup/ConfigGenerator.php b/libraries/classes/Setup/ConfigGenerator.php
index eb3b4044e088..52e0421dfd78 100644
--- a/libraries/classes/Setup/ConfigGenerator.php
+++ b/libraries/classes/Setup/ConfigGenerator.php
@@ -59,7 +59,7 @@ public static function getConfigFile(ConfigFile $cf)
 
         foreach ($conf as $k => $v) {
             $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
-            $ret .= self::_getVarExport($k, $v, $crlf);
+            $ret .= self::getVarExport($k, $v, $crlf);
             if (! isset($persistKeys[$k])) {
                 continue;
             }
@@ -73,7 +73,7 @@ public static function getConfigFile(ConfigFile $cf)
             }
 
             $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
-            $ret .= self::_getVarExport($k, $cf->getDefault($k), $crlf);
+            $ret .= self::getVarExport($k, $cf->getDefault($k), $crlf);
         }
 
         return $ret . '?>';
@@ -88,16 +88,16 @@ public static function getConfigFile(ConfigFile $cf)
      *
      * @return string
      */
-    private static function _getVarExport($var_name, $var_value, $crlf)
+    private static function getVarExport($var_name, $var_value, $crlf)
     {
         if (! is_array($var_value) || empty($var_value)) {
             return "\$cfg['" . $var_name . "'] = "
                 . var_export($var_value, true) . ';' . $crlf;
         }
         $ret = '';
-        if (self::_isZeroBasedArray($var_value)) {
+        if (self::isZeroBasedArray($var_value)) {
             $ret = "\$cfg['" . $var_name . "'] = "
-                . self::_exportZeroBasedArray($var_value, $crlf)
+                . self::exportZeroBasedArray($var_value, $crlf)
                 . ';' . $crlf;
         } else {
             // string keys: $cfg[key][subkey] = value
@@ -118,7 +118,7 @@ private static function _getVarExport($var_name, $var_value, $crlf)
      *
      * @return bool
      */
-    private static function _isZeroBasedArray(array $array)
+    private static function isZeroBasedArray(array $array)
     {
         for ($i = 0, $nb = count($array); $i < $nb; $i++) {
             if (! isset($array[$i])) {
@@ -137,7 +137,7 @@ private static function _isZeroBasedArray(array $array)
      *
      * @return string
      */
-    private static function _exportZeroBasedArray(array $array, $crlf)
+    private static function exportZeroBasedArray(array $array, $crlf)
     {
         $retv = [];
         foreach ($array as $v) {
@@ -182,8 +182,8 @@ protected static function getServerPart(ConfigFile $cf, $crlf, array $servers)
             foreach ($server as $k => $v) {
                 $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
                 $ret .= "\$cfg['Servers'][\$i]['" . $k . "'] = "
-                    . (is_array($v) && self::_isZeroBasedArray($v)
-                        ? self::_exportZeroBasedArray($v, $crlf)
+                    . (is_array($v) && self::isZeroBasedArray($v)
+                        ? self::exportZeroBasedArray($v, $crlf)
                         : var_export($v, true))
                     . ';' . $crlf;
             }
diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php
index 090d3589f477..8dfef87aa06f 100644
--- a/libraries/classes/Table.php
+++ b/libraries/classes/Table.php
@@ -1745,7 +1745,7 @@ public function getUniqueColumns($backquoted = true, $fullName = true)
      *
      * @return array
      */
-    private function _formatColumns(array $indexed, $backquoted, $fullName)
+    private function formatColumns(array $indexed, $backquoted, $fullName)
     {
         $return = [];
         foreach ($indexed as $column) {
@@ -1777,7 +1777,7 @@ public function getIndexedColumns($backquoted = true, $fullName = true)
         );
         $indexed = $this->_dbi->fetchResult($sql, 'Column_name', 'Column_name');
 
-        return $this->_formatColumns($indexed, $backquoted, $fullName);
+        return $this->formatColumns($indexed, $backquoted, $fullName);
     }
 
     /**
@@ -1795,7 +1795,7 @@ public function getColumns($backquoted = true, $fullName = true)
         $sql = 'SHOW COLUMNS FROM ' . $this->getFullName(true);
         $indexed = $this->_dbi->fetchResult($sql, 'Field', 'Field');
 
-        return $this->_formatColumns($indexed, $backquoted, $fullName);
+        return $this->formatColumns($indexed, $backquoted, $fullName);
     }
 
     /**
@@ -2581,7 +2581,7 @@ public function updateForeignKeys(
                 continue;
             }
 
-            $create_query = $this->_getSQLToCreateForeignKey(
+            $create_query = $this->getSQLToCreateForeignKey(
                 $table,
                 $master_field,
                 $foreign_db,
@@ -2635,7 +2635,7 @@ public function updateForeignKeys(
 
             // a rollback may be better here
             $sql_query_recreate = '# Restoring the dropped constraint...' . "\n";
-            $sql_query_recreate .= $this->_getSQLToCreateForeignKey(
+            $sql_query_recreate .= $this->getSQLToCreateForeignKey(
                 $table,
                 $master_field,
                 $existrel_foreign[$master_field_md5]['ref_db_name'],
@@ -2675,7 +2675,7 @@ public function updateForeignKeys(
      *
      * @return string SQL query for foreign key constraint creation
      */
-    private function _getSQLToCreateForeignKey(
+    private function getSQLToCreateForeignKey(
         $table,
         array $field,
         $foreignDb,
diff --git a/libraries/classes/ThemeManager.php b/libraries/classes/ThemeManager.php
index 080b1ebc530c..342910bcd159 100644
--- a/libraries/classes/ThemeManager.php
+++ b/libraries/classes/ThemeManager.php
@@ -134,7 +134,7 @@ public static function getInstance(): ThemeManager
      */
     public function setThemesPath($path)
     {
-        if (! $this->_checkThemeFolder($path)) {
+        if (! $this->checkThemeFolder($path)) {
             return false;
         }
 
@@ -255,7 +255,7 @@ public function setThemeCookie()
      *
      * @access private
      */
-    private function _checkThemeFolder($folder)
+    private function checkThemeFolder($folder)
     {
         if (! is_dir($folder)) {
             trigger_error(
diff --git a/libraries/classes/Tracker.php b/libraries/classes/Tracker.php
index 020a8584c996..67dd597e87b7 100644
--- a/libraries/classes/Tracker.php
+++ b/libraries/classes/Tracker.php
@@ -91,7 +91,7 @@ public static function isActive()
             return false;
         }
 
-        $pma_table = self::_getTrackingTable();
+        $pma_table = self::getTrackingTable();
 
         return $pma_table !== null;
     }
@@ -154,7 +154,7 @@ public static function isTracked($dbname, $tablename)
             return false;
         }
 
-        $sql_query = ' SELECT tracking_active FROM ' . self::_getTrackingTable() .
+        $sql_query = ' SELECT tracking_active FROM ' . self::getTrackingTable() .
         " WHERE db_name = '" . $GLOBALS['dbi']->escapeString($dbname) . "' " .
         " AND table_name = '" . $GLOBALS['dbi']->escapeString($tablename) . "' " .
         ' ORDER BY version DESC LIMIT 1';
@@ -271,7 +271,7 @@ public static function createVersion(
         // Save version
 
         $sql_query = "/*NOTRACK*/\n" .
-        'INSERT INTO ' . self::_getTrackingTable() . ' (' .
+        'INSERT INTO ' . self::getTrackingTable() . ' (' .
         'db_name, ' .
         'table_name, ' .
         'version, ' .
@@ -320,7 +320,7 @@ public static function deleteTracking($dbname, $tablename, $version = '')
         $relation = new Relation($GLOBALS['dbi']);
 
         $sql_query = "/*NOTRACK*/\n"
-            . 'DELETE FROM ' . self::_getTrackingTable()
+            . 'DELETE FROM ' . self::getTrackingTable()
             . " WHERE `db_name` = '"
             . $GLOBALS['dbi']->escapeString($dbname) . "'"
             . " AND `table_name` = '"
@@ -372,7 +372,7 @@ public static function createDatabaseVersion(
 
         // Save version
         $sql_query = "/*NOTRACK*/\n" .
-        'INSERT INTO ' . self::_getTrackingTable() . ' (' .
+        'INSERT INTO ' . self::getTrackingTable() . ' (' .
         'db_name, ' .
         'table_name, ' .
         'version, ' .
@@ -410,7 +410,7 @@ public static function createDatabaseVersion(
      *
      * @static
      */
-    private static function _changeTracking(
+    private static function changeTracking(
         $dbname,
         $tablename,
         $version,
@@ -418,7 +418,7 @@ private static function _changeTracking(
     ) {
         $relation = new Relation($GLOBALS['dbi']);
 
-        $sql_query = ' UPDATE ' . self::_getTrackingTable() .
+        $sql_query = ' UPDATE ' . self::getTrackingTable() .
         " SET `tracking_active` = '" . $new_state . "' " .
         " WHERE `db_name` = '" . $GLOBALS['dbi']->escapeString($dbname) . "' " .
         " AND `table_name` = '" . $GLOBALS['dbi']->escapeString($tablename) . "' " .
@@ -468,7 +468,7 @@ public static function changeTrackingData(
             $new_data_processed = $new_data;
         }
 
-        $sql_query = ' UPDATE ' . self::_getTrackingTable() .
+        $sql_query = ' UPDATE ' . self::getTrackingTable() .
         ' SET `' . $save_to . "` = '" . $new_data_processed . "' " .
         " WHERE `db_name` = '" . $GLOBALS['dbi']->escapeString($dbname) . "' " .
         " AND `table_name` = '" . $GLOBALS['dbi']->escapeString($tablename) . "' " .
@@ -492,7 +492,7 @@ public static function changeTrackingData(
      */
     public static function activateTracking($dbname, $tablename, $version)
     {
-        return self::_changeTracking($dbname, $tablename, $version, 1);
+        return self::changeTracking($dbname, $tablename, $version, 1);
     }
 
     /**
@@ -508,7 +508,7 @@ public static function activateTracking($dbname, $tablename, $version)
      */
     public static function deactivateTracking($dbname, $tablename, $version)
     {
-        return self::_changeTracking($dbname, $tablename, $version, 0);
+        return self::changeTracking($dbname, $tablename, $version, 0);
     }
 
     /**
@@ -527,7 +527,7 @@ public static function getVersion($dbname, $tablename, $statement = null)
     {
         $relation = new Relation($GLOBALS['dbi']);
 
-        $sql_query = ' SELECT MAX(version) FROM ' . self::_getTrackingTable() .
+        $sql_query = ' SELECT MAX(version) FROM ' . self::getTrackingTable() .
         " WHERE `db_name` = '" . $GLOBALS['dbi']->escapeString($dbname) . "' " .
         " AND `table_name` = '" . $GLOBALS['dbi']->escapeString($tablename) . "' ";
 
@@ -556,7 +556,7 @@ public static function getTrackedData($dbname, $tablename, $version)
     {
         $relation = new Relation($GLOBALS['dbi']);
 
-        $sql_query = ' SELECT * FROM ' . self::_getTrackingTable() .
+        $sql_query = ' SELECT * FROM ' . self::getTrackingTable() .
             " WHERE `db_name` = '" . $GLOBALS['dbi']->escapeString($dbname) . "' ";
         if (! empty($tablename)) {
             $sql_query .= " AND `table_name` = '"
@@ -908,7 +908,7 @@ public static function handleQuery($query)
 
         // Mark it as untouchable
         $sql_query = " /*NOTRACK*/\n"
-            . ' UPDATE ' . self::_getTrackingTable()
+            . ' UPDATE ' . self::getTrackingTable()
             . ' SET ' . Util::backquote($save_to)
             . ' = CONCAT( ' . Util::backquote($save_to) . ",'\n"
             . $GLOBALS['dbi']->escapeString($query) . "') ,"
@@ -942,7 +942,7 @@ public static function handleQuery($query)
      *
      * @return string tracking table
      */
-    private static function _getTrackingTable()
+    private static function getTrackingTable()
     {
         $relation = new Relation($GLOBALS['dbi']);
         $cfgRelation = $relation->getRelationsParam();
diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index 6df72cc8eaa5..0c2ba3b01309 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -278,7 +278,7 @@ public static function getDocuURL(bool $isMariaDB = false): string
      *
      * @return int the possibly modified row count
      */
-    private static function _checkRowCount($db, array $table)
+    private static function checkRowCount($db, array $table)
     {
         $rowCount = 0;
 
@@ -349,7 +349,7 @@ public static function getTableList(
         $table_groups = [];
 
         foreach ($tables as $table_name => $table) {
-            $table['Rows'] = self::_checkRowCount($db, $table);
+            $table['Rows'] = self::checkRowCount($db, $table);
 
             // in $group we save the reference to the place in $table_groups
             // where to store the table info
diff --git a/test/classes/Database/DesignerTest.php b/test/classes/Database/DesignerTest.php
index 6cf076dd1d54..bbdce28412fd 100644
--- a/test/classes/Database/DesignerTest.php
+++ b/test/classes/Database/DesignerTest.php
@@ -60,7 +60,7 @@ protected function setUp(): void
      *
      * @return void
      */
-    private function _mockDatabaseInteraction($db)
+    private function mockDatabaseInteraction($db)
     {
         $dbi = $this->getMockBuilder(DatabaseInterface::class)
             ->disableOriginalConstructor()
@@ -106,7 +106,7 @@ private function _mockDatabaseInteraction($db)
     public function testGetPageIdsAndNames()
     {
         $db = 'db';
-        $this->_mockDatabaseInteraction($db);
+        $this->mockDatabaseInteraction($db);
 
         $template = new Template();
         $this->designer = new Designer($GLOBALS['dbi'], new Relation($GLOBALS['dbi'], $template), $template);
@@ -133,7 +133,7 @@ public function testGetHtmlForEditOrDeletePages()
     {
         $db = 'db';
         $operation = 'edit';
-        $this->_mockDatabaseInteraction($db);
+        $this->mockDatabaseInteraction($db);
 
         $template = new Template();
         $this->designer = new Designer($GLOBALS['dbi'], new Relation($GLOBALS['dbi'], $template), $template);
@@ -162,7 +162,7 @@ public function testGetHtmlForEditOrDeletePages()
     public function testGetHtmlForPageSaveAs()
     {
         $db = 'db';
-        $this->_mockDatabaseInteraction($db);
+        $this->mockDatabaseInteraction($db);
 
         $template = new Template();
         $this->designer = new Designer($GLOBALS['dbi'], new Relation($GLOBALS['dbi'], $template), $template);
diff --git a/test/classes/Gis/GisMultiPolygonTest.php b/test/classes/Gis/GisMultiPolygonTest.php
index 1ab513ebd280..50e9ef4e5431 100644
--- a/test/classes/Gis/GisMultiPolygonTest.php
+++ b/test/classes/Gis/GisMultiPolygonTest.php
@@ -53,7 +53,7 @@ protected function tearDown(): void
      *
      * @return array common data for data providers
      */
-    private function _getData()
+    private function getData()
     {
         return [
             'MULTIPOLYGON' => [
@@ -137,7 +137,7 @@ private function _getData()
     public function providerForTestGenerateWkt()
     {
         $temp = [
-            0 => $this->_getData(),
+            0 => $this->getData(),
         ];
 
         $temp1 = $temp;
@@ -191,9 +191,9 @@ public function providerForTestGenerateWkt()
      */
     public function providerForTestGenerateParams()
     {
-        $temp = $this->_getData();
+        $temp = $this->getData();
 
-        $temp1 = $this->_getData();
+        $temp1 = $this->getData();
         $temp1['gis_type'] = 'MULTIPOLYGON';
 
         return [
diff --git a/test/classes/Gis/GisPolygonTest.php b/test/classes/Gis/GisPolygonTest.php
index ae19ed81d9c7..3b397490df06 100644
--- a/test/classes/Gis/GisPolygonTest.php
+++ b/test/classes/Gis/GisPolygonTest.php
@@ -53,7 +53,7 @@ protected function tearDown(): void
      *
      * @return array common data for data providers
      */
-    private function _getData()
+    private function getData()
     {
         return [
             'POLYGON' => [
@@ -112,7 +112,7 @@ private function _getData()
     public function providerForTestGenerateWkt()
     {
         $temp = [
-            0 => $this->_getData(),
+            0 => $this->getData(),
         ];
 
         $temp1 = $temp;
@@ -176,7 +176,7 @@ public function providerForTestGenerateWkt()
      */
     public function providerForTestGenerateParams()
     {
-        $temp = $this->_getData();
+        $temp = $this->getData();
 
         $temp1 = $temp;
         $temp1['gis_type'] = 'POLYGON';
@@ -388,7 +388,7 @@ public function testGetPointOnSurface($ring): void
      */
     public function providerForTestGetPointOnSurface()
     {
-        $temp = $this->_getData();
+        $temp = $this->getData();
         unset($temp['POLYGON'][0]['no_of_points']);
         unset($temp['POLYGON'][1]['no_of_points']);
 
diff --git a/test/selenium/CreateDropDatabaseTest.php b/test/selenium/CreateDropDatabaseTest.php
index f92108a42a4a..274f11574570 100644
--- a/test/selenium/CreateDropDatabaseTest.php
+++ b/test/selenium/CreateDropDatabaseTest.php
@@ -54,7 +54,7 @@ public function testCreateDropDatabase()
         );
         $this->assertEquals(1, $result->num_rows);
 
-        $this->_dropDatabase();
+        $this->dropDatabase();
     }
 
     /**
@@ -62,7 +62,7 @@ public function testCreateDropDatabase()
      *
      * @return void
      */
-    private function _dropDatabase()
+    private function dropDatabase()
     {
         $this->gotoHomepage();
 
diff --git a/test/selenium/Database/EventsTest.php b/test/selenium/Database/EventsTest.php
index fc4b2cbacbda..d352393d1b44 100644
--- a/test/selenium/Database/EventsTest.php
+++ b/test/selenium/Database/EventsTest.php
@@ -63,7 +63,7 @@ protected function tearDown(): void
      *
      * @return void
      */
-    private function _eventSQL()
+    private function eventSQL()
     {
         $start = date('Y-m-d H:i:s', strtotime('-1 day'));
         $end = date('Y-m-d H:i:s', strtotime('+1 day'));
@@ -164,7 +164,7 @@ public function testAddEvent()
      */
     public function testEditEvents()
     {
-        $this->_eventSQL();
+        $this->eventSQL();
         $this->waitForElement('partialLinkText', 'Events')->click();
         $this->waitAjax();
 
@@ -205,7 +205,7 @@ public function testEditEvents()
      */
     public function testDropEvent()
     {
-        $this->_eventSQL();
+        $this->eventSQL();
         $this->waitForElement('partialLinkText', 'Events')->click();
         $this->waitAjax();
 
diff --git a/test/selenium/Database/OperationsTest.php b/test/selenium/Database/OperationsTest.php
index ccba73a310f7..e8a1e689a6bd 100644
--- a/test/selenium/Database/OperationsTest.php
+++ b/test/selenium/Database/OperationsTest.php
@@ -28,7 +28,7 @@ protected function setUp(): void
     /**
      * @return void
      */
-    private function _getToDBOperations()
+    private function getToDBOperations()
     {
         $this->gotoHomepage();
 
@@ -52,7 +52,7 @@ public function testDbComment()
     {
         $this->skipIfNotPMADB();
 
-        $this->_getToDBOperations();
+        $this->getToDBOperations();
         $this->byName('comment')->sendKeys('comment_foobar');
         $this->byCssSelector(
             "form#formDatabaseComment input[type='submit']"
@@ -75,7 +75,7 @@ public function testDbComment()
      */
     public function testRenameDB()
     {
-        $this->_getToDBOperations();
+        $this->getToDBOperations();
 
         $new_db_name = $this->database_name . 'rename';
 
@@ -117,7 +117,7 @@ public function testRenameDB()
      */
     public function testCopyDb()
     {
-        $this->_getToDBOperations();
+        $this->getToDBOperations();
 
         $this->reloadPage();// Reload or scrolling will not work ..
         $new_db_name = $this->database_name . 'copy';
diff --git a/test/selenium/Database/ProceduresTest.php b/test/selenium/Database/ProceduresTest.php
index f58cc2309ae5..f93cbd787c71 100644
--- a/test/selenium/Database/ProceduresTest.php
+++ b/test/selenium/Database/ProceduresTest.php
@@ -80,7 +80,7 @@ protected function tearDown(): void
      *
      * @return void
      */
-    private function _procedureSQL()
+    private function procedureSQL()
     {
         $this->dbQuery(
             'CREATE PROCEDURE `test_procedure`(IN `inp` VARCHAR(20), OUT `outp` INT)'
@@ -144,7 +144,7 @@ public function testAddProcedure()
         );
 
         $this->assertEquals(1, $result->num_rows);
-        $this->_executeProcedure('test_procedure', 14);
+        $this->executeProcedure('test_procedure', 14);
     }
 
     /**
@@ -156,7 +156,7 @@ public function testAddProcedure()
      */
     public function testEditProcedure()
     {
-        $this->_procedureSQL();
+        $this->procedureSQL();
         $this->waitForElement('partialLinkText', 'Routines')->click();
         $this->waitAjax();
 
@@ -178,7 +178,7 @@ public function testEditProcedure()
             . "'Routine `test_procedure` has been modified')]"
         );
 
-        $this->_executeProcedure('test_procedure', 14);
+        $this->executeProcedure('test_procedure', 14);
     }
 
     /**
@@ -190,7 +190,7 @@ public function testEditProcedure()
      */
     public function testDropProcedure()
     {
-        $this->_procedureSQL();
+        $this->procedureSQL();
         $this->waitForElement('partialLinkText', 'Routines')->click();
         $this->waitAjax();
 
@@ -221,7 +221,7 @@ public function testDropProcedure()
      *
      * @return void
      */
-    private function _executeProcedure($text, $length)
+    private function executeProcedure($text, $length)
     {
         $this->waitAjax();
         $this->waitUntilElementIsVisible('partialLinkText', 'Execute', 30)->click();
diff --git a/test/selenium/Database/TriggersTest.php b/test/selenium/Database/TriggersTest.php
index b576751e4ef4..afbc1095b710 100644
--- a/test/selenium/Database/TriggersTest.php
+++ b/test/selenium/Database/TriggersTest.php
@@ -51,7 +51,7 @@ protected function setUp(): void
      *
      * @return void
      */
-    private function _triggerSQL()
+    private function triggerSQL()
     {
         $this->dbQuery(
             'CREATE TRIGGER `test_trigger` '
@@ -137,7 +137,7 @@ public function testEditTriggers()
     {
         $this->expandMore();
 
-        $this->_triggerSQL();
+        $this->triggerSQL();
         $this->waitForElement('partialLinkText', 'Triggers')->click();
         $this->waitAjax();
 
@@ -178,7 +178,7 @@ public function testDropTrigger()
     {
         $this->expandMore();
 
-        $this->_triggerSQL();
+        $this->triggerSQL();
         $ele = $this->waitForElement('partialLinkText', 'Triggers');
         $ele->click();
 
diff --git a/test/selenium/ExportTest.php b/test/selenium/ExportTest.php
index 2b8963cb03b4..ebe69485107a 100644
--- a/test/selenium/ExportTest.php
+++ b/test/selenium/ExportTest.php
@@ -45,7 +45,7 @@ protected function setUp(): void
      */
     public function testServerExport($plugin, $expected): void
     {
-        $text = $this->_doExport('server', $plugin);
+        $text = $this->doExport('server', $plugin);
 
         foreach ($expected as $str) {
             $this->assertStringContainsString($str, $text);
@@ -65,7 +65,7 @@ public function testDbExport($plugin, $expected): void
     {
         $this->navigateDatabase($this->database_name);
 
-        $text = $this->_doExport('db', $plugin);
+        $text = $this->doExport('db', $plugin);
 
         foreach ($expected as $str) {
             $this->assertStringContainsString($str, $text);
@@ -87,7 +87,7 @@ public function testTableExport($plugin, $expected): void
 
         $this->navigateTable('test_table');
 
-        $text = $this->_doExport('table', $plugin);
+        $text = $this->doExport('table', $plugin);
 
         foreach ($expected as $str) {
             $this->assertStringContainsString($str, $text);
@@ -129,7 +129,7 @@ public function exportDataProvider()
      *
      * @return string export string
      */
-    private function _doExport($type, $plugin)
+    private function doExport($type, $plugin)
     {
         $this->expandMore();
         $this->waitForElement('partialLinkText', 'Export')->click();
diff --git a/test/selenium/ImportTest.php b/test/selenium/ImportTest.php
index 4aaecebc6e1a..dfae32f597a8 100644
--- a/test/selenium/ImportTest.php
+++ b/test/selenium/ImportTest.php
@@ -32,7 +32,7 @@ protected function setUp(): void
      */
     public function testServerImport()
     {
-        $this->_doImport('server');
+        $this->doImport('server');
         $result = $this->dbQuery("SHOW DATABASES LIKE 'test_import%'");
         $this->assertGreaterThanOrEqual(2, $result->num_rows);
 
@@ -53,7 +53,7 @@ public function testDbImport()
         $this->dbQuery('CREATE DATABASE ' . $this->database_name);
         $this->navigateDatabase($this->database_name);
 
-        $this->_doImport('db');
+        $this->doImport('db');
 
         $this->dbQuery('USE ' . $this->database_name);
         $result = $this->dbQuery('SHOW TABLES');
@@ -78,7 +78,7 @@ public function testTableImport()
 
         $this->navigateTable('test_table');
 
-        $this->_doImport('table');
+        $this->doImport('table');
 
         $result = $this->dbQuery('SELECT * FROM test_table');
         $this->assertEquals(2, $result->num_rows);
@@ -91,7 +91,7 @@ public function testTableImport()
      *
      * @return void
      */
-    private function _doImport($type)
+    private function doImport($type)
     {
         $this->waitForElement('partialLinkText', 'Import')->click();
         $this->waitAjax();
diff --git a/test/selenium/NormalizationTest.php b/test/selenium/NormalizationTest.php
index 6b9756f604a1..00f922da5921 100644
--- a/test/selenium/NormalizationTest.php
+++ b/test/selenium/NormalizationTest.php
@@ -67,7 +67,7 @@ public function testNormalizationTo1NF()
         );
         $this->byCssSelector('input[name=submit_normalize]')->click();
         $this->waitForElement('id', 'mainContent');
-        $this->_test1NFSteps();
+        $this->test1NFSteps();
     }
 
     /**
@@ -75,7 +75,7 @@ public function testNormalizationTo1NF()
      *
      * @return void
      */
-    private function _test1NFSteps()
+    private function test1NFSteps()
     {
         $this->assertEquals(
             'First step of normalization (1NF)',
diff --git a/test/selenium/ServerSettingsTest.php b/test/selenium/ServerSettingsTest.php
index f50b4281090f..c0730504ae08 100644
--- a/test/selenium/ServerSettingsTest.php
+++ b/test/selenium/ServerSettingsTest.php
@@ -36,7 +36,7 @@ protected function setUp(): void
      *
      * @return void
      */
-    private function _saveConfig()
+    private function saveConfig()
     {
         // Submit the form
         $ele = $this->waitForElement(
@@ -73,13 +73,13 @@ public function testHideDatabase()
         $ele->clear();
         $ele->sendKeys($this->database_name);
 
-        $this->_saveConfig();
+        $this->saveConfig();
         $this->assertFalse(
             $this->isElementPresent('partialLinkText', $this->database_name)
         );
 
         $this->waitForElement('name', 'Servers-1-hide_db')->clear();
-        $this->_saveConfig();
+        $this->saveConfig();
         $this->assertTrue(
             $this->isElementPresent('partialLinkText', $this->database_name)
         );
@@ -130,13 +130,13 @@ public function testHideLogo()
 
         $this->waitForElement('name', 'NavigationDisplayLogo')
             ->click();
-        $this->_saveConfig();
+        $this->saveConfig();
         $this->assertFalse(
             $this->isElementPresent('id', 'imgpmalogo')
         );
 
         $this->byCssSelector("a[href='#NavigationDisplayLogo']")->click();
-        $this->_saveConfig();
+        $this->saveConfig();
         $this->assertTrue(
             $this->isElementPresent('id', 'imgpmalogo')
         );
diff --git a/test/selenium/SqlQueryTest.php b/test/selenium/SqlQueryTest.php
index 9b77395fcc25..3394e9b524a6 100644
--- a/test/selenium/SqlQueryTest.php
+++ b/test/selenium/SqlQueryTest.php
@@ -74,7 +74,7 @@ public function testServerSqlQuery()
         );
 
         // test inline edit button
-        $this->_testInlineEdit();
+        $this->testInlineEdit();
     }
 
     /**
@@ -108,7 +108,7 @@ public function testDatabaseSqlQuery()
         );
 
         // test inline edit button
-        $this->_testInlineEdit();
+        $this->testInlineEdit();
     }
 
     /**
@@ -147,13 +147,13 @@ public function testTableSqlQuery()
         );
 
         // test inline edit button
-        $this->_testInlineEdit();
+        $this->testInlineEdit();
     }
 
     /**
      * @return void
      */
-    private function _testInlineEdit()
+    private function testInlineEdit()
     {
         $this->waitForElement('cssSelector', 'a.inline_edit_sql')->click();
         // empty current query
diff --git a/test/selenium/Table/CreateTest.php b/test/selenium/Table/CreateTest.php
index 5d4af7bc4c36..6a1a29bb2512 100644
--- a/test/selenium/Table/CreateTest.php
+++ b/test/selenium/Table/CreateTest.php
@@ -98,7 +98,7 @@ public function testCreateTable()
 
         $this->waitForElement('partialLinkText', 'test_table');
 
-        $this->_tableStructureAssertions();
+        $this->tableStructureAssertions();
     }
 
     /**
@@ -106,7 +106,7 @@ public function testCreateTable()
      *
      * @return void
      */
-    private function _tableStructureAssertions()
+    private function tableStructureAssertions()
     {
         $this->gotoHomepage();
         $this->waitAjax();
diff --git a/test/selenium/Table/InsertTest.php b/test/selenium/Table/InsertTest.php
index 58a87ed54071..bdc4ef39be13 100644
--- a/test/selenium/Table/InsertTest.php
+++ b/test/selenium/Table/InsertTest.php
@@ -101,7 +101,7 @@ public function testAddData()
         );
         $this->assertStringContainsString('1 row inserted', $ele->getText());
 
-        $this->_assertDataPresent();
+        $this->assertDataPresent();
     }
 
     /**
@@ -109,7 +109,7 @@ public function testAddData()
      *
      * @return void
      */
-    private function _assertDataPresent()
+    private function assertDataPresent()
     {
         $this->byPartialLinkText('Browse')->click();
 
diff --git a/test/selenium/TrackingTest.php b/test/selenium/TrackingTest.php
index ef5c2cdbb0ba..984513f85cbf 100644
--- a/test/selenium/TrackingTest.php
+++ b/test/selenium/TrackingTest.php
@@ -65,7 +65,7 @@ protected function setUp(): void
      */
     public function testTrackingData()
     {
-        $this->_executeSqlAndReturnToTableTracking();
+        $this->executeSqlAndReturnToTableTracking();
 
         $this->byPartialLinkText('Tracking report')->click();
         $this->waitForElement(
@@ -156,7 +156,7 @@ public function testDeactivateTracking()
             'cssSelector',
             "input[value='Activate now']"
         );
-        $this->_executeSqlAndReturnToTableTracking();
+        $this->executeSqlAndReturnToTableTracking();
         $this->assertFalse(
             $this->isElementPresent('id', 'dml_versions')
         );
@@ -254,7 +254,7 @@ public function testStructureSnapshot()
      *
      * @return void
      */
-    private function _executeSqlAndReturnToTableTracking()
+    private function executeSqlAndReturnToTableTracking()
     {
         $this->byPartialLinkText('SQL')->click();
         $this->waitAjax();

From 195c11d928ae2066a769ba0f718dede7121f80fa Mon Sep 17 00:00:00 2001
From: charliewindred <charliewindred@gmail.com>
Date: Tue, 2 Jun 2020 17:41:51 +0100
Subject: [PATCH 2/8] Fixed unused private methods in Response.php

Removed missed underscores that caused unused private method errors.

Signed-off-by: charliewindred <charliewindred@gmail.com>
---
 libraries/classes/Response.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/classes/Response.php b/libraries/classes/Response.php
index d772f371827d..06088e1fd5fd 100644
--- a/libraries/classes/Response.php
+++ b/libraries/classes/Response.php
@@ -344,7 +344,7 @@ public function addJSON($json, $value = null)
      *
      * @return string
      */
-    private function _getDisplay()
+    private function getDisplay()
     {
         // The header may contain nothing at all,
         // if its content was already rendered
@@ -362,7 +362,7 @@ private function _getDisplay()
      *
      * @return void
      */
-    private function _htmlResponse()
+    private function htmlResponse()
     {
         echo $this->getDisplay();
     }
@@ -372,7 +372,7 @@ private function _htmlResponse()
      *
      * @return void
      */
-    private function _ajaxResponse()
+    private function ajaxResponse()
     {
         /* Avoid wrapping in case we're disabled */
         if ($this->_isDisabled) {

From cec8c6f9b3665ba0fdf7e8139cdd053d908e71f9 Mon Sep 17 00:00:00 2001
From: charliewindred <charliewindred@gmail.com>
Date: Tue, 2 Jun 2020 18:47:24 +0100
Subject: [PATCH 3/8] Updated baselines

Updated baselines after fixing previous errors.

Signed-off-by: charliewindred <charliewindred@gmail.com>
---
 phpstan-baseline.neon | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index c11aabe8ebea..bdc3a186d5d0 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -196,7 +196,7 @@ parameters:
 			path: libraries/classes/Config/FormDisplay.php
 
 		-
-			message: "#^Parameter \\#4 \\$workPath of method PhpMyAdmin\\\\Config\\\\FormDisplay\\:\\:_displayFieldInput\\(\\) expects string, int\\|string\\|false given\\.$#"
+			message: "#^Parameter \\#4 \\$workPath of method PhpMyAdmin\\\\Config\\\\FormDisplay\\:\\:displayFieldInput\\(\\) expects string, int\\|string\\|false given\\.$#"
 			count: 1
 			path: libraries/classes/Config/FormDisplay.php
 
@@ -861,12 +861,12 @@ parameters:
 			path: libraries/classes/Database/Qbe.php
 
 		-
-			message: "#^Parameter \\#2 \\$sortOrder of method PhpMyAdmin\\\\Database\\\\Qbe\\:\\:_getSortOrderSelectCell\\(\\) expects int, null given\\.$#"
+			message: "#^Parameter \\#2 \\$sortOrder of method PhpMyAdmin\\\\Database\\\\Qbe\\:\\:getSortOrderSelectCell\\(\\) expects int, null given\\.$#"
 			count: 1
 			path: libraries/classes/Database/Qbe.php
 
 		-
-			message: "#^Method PhpMyAdmin\\\\Database\\\\Qbe\\:\\:_getMasterTable\\(\\) should return string but returns int\\|string\\.$#"
+			message: "#^Method PhpMyAdmin\\\\Database\\\\Qbe\\:\\:getMasterTable\\(\\) should return string but returns int\\|string\\.$#"
 			count: 1
 			path: libraries/classes/Database/Qbe.php
 
@@ -1481,7 +1481,7 @@ parameters:
 			path: libraries/classes/Footer.php
 
 		-
-			message: "#^Method PhpMyAdmin\\\\Footer\\:\\:_removeRecursion\\(\\) should return object but returns array\\|object\\|string\\.$#"
+			message: "#^Method PhpMyAdmin\\\\Footer\\:\\:removeRecursion\\(\\) should return object but returns array\\|object\\|string\\.$#"
 			count: 1
 			path: libraries/classes/Footer.php
 
@@ -1916,7 +1916,7 @@ parameters:
 			path: libraries/classes/Linter.php
 
 		-
-			message: "#^Method PhpMyAdmin\\\\Menu\\:\\:_getAllowedTabs\\(\\) should return array but returns array\\|null\\.$#"
+			message: "#^Method PhpMyAdmin\\\\Menu\\:\\:getAllowedTabs\\(\\) should return array but returns array\\|null\\.$#"
 			count: 1
 			path: libraries/classes/Menu.php
 
@@ -2216,7 +2216,7 @@ parameters:
 			path: libraries/classes/Plugins/Export/ExportSql.php
 
 		-
-			message: "#^Parameter \\#1 \\$create_query of method PhpMyAdmin\\\\Plugins\\\\Export\\\\ExportSql\\:\\:_makeCreateTableMSSQLCompatible\\(\\) expects string, string\\|null given\\.$#"
+			message: "#^Parameter \\#1 \\$create_query of method PhpMyAdmin\\\\Plugins\\\\Export\\\\ExportSql\\:\\:makeCreateTableMSSQLCompatible\\(\\) expects string, string\\|null given\\.$#"
 			count: 1
 			path: libraries/classes/Plugins/Export/ExportSql.php
 
@@ -2256,7 +2256,7 @@ parameters:
 			path: libraries/classes/Plugins/Export/ExportSql.php
 
 		-
-			message: "#^Method PhpMyAdmin\\\\Plugins\\\\Export\\\\ExportSql\\:\\:_makeCreateTableMSSQLCompatible\\(\\) should return string but returns string\\|null\\.$#"
+			message: "#^Method PhpMyAdmin\\\\Plugins\\\\Export\\\\ExportSql\\:\\:makeCreateTableMSSQLCompatible\\(\\) should return string but returns string\\|null\\.$#"
 			count: 1
 			path: libraries/classes/Plugins/Export/ExportSql.php
 
@@ -2591,7 +2591,7 @@ parameters:
 			path: libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php
 
 		-
-			message: "#^Parameter \\#2 \\$masterField of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Dia\\\\DiaRelationSchema\\:\\:_addRelation\\(\\) expects string, int\\|string given\\.$#"
+			message: "#^Parameter \\#2 \\$masterField of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Dia\\\\DiaRelationSchema\\:\\:addRelation\\(\\) expects string, int\\|string given\\.$#"
 			count: 1
 			path: libraries/classes/Plugins/Schema/Dia/DiaRelationSchema.php
 
@@ -2691,7 +2691,7 @@ parameters:
 			path: libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php
 
 		-
-			message: "#^Parameter \\#4 \\$masterField of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Eps\\\\EpsRelationSchema\\:\\:_addRelation\\(\\) expects string, int\\|string given\\.$#"
+			message: "#^Parameter \\#4 \\$masterField of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Eps\\\\EpsRelationSchema\\:\\:addRelation\\(\\) expects string, int\\|string given\\.$#"
 			count: 1
 			path: libraries/classes/Plugins/Schema/Eps/EpsRelationSchema.php
 
@@ -2901,7 +2901,7 @@ parameters:
 			path: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php
 
 		-
-			message: "#^Parameter \\#2 \\$masterField of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Pdf\\\\PdfRelationSchema\\:\\:_addRelation\\(\\) expects string, int\\|string given\\.$#"
+			message: "#^Parameter \\#2 \\$masterField of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Pdf\\\\PdfRelationSchema\\:\\:addRelation\\(\\) expects string, int\\|string given\\.$#"
 			count: 1
 			path: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php
 
@@ -3006,7 +3006,7 @@ parameters:
 			path: libraries/classes/Plugins/Schema/RelationStats.php
 
 		-
-			message: "#^Parameter \\#1 \\$table of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\RelationStats\\:\\:_getXy\\(\\) expects PhpMyAdmin\\\\Plugins\\\\Schema\\\\TableStats, string given\\.$#"
+			message: "#^Parameter \\#1 \\$table of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\RelationStats\\:\\:getXy\\(\\) expects PhpMyAdmin\\\\Plugins\\\\Schema\\\\TableStats, string given\\.$#"
 			count: 2
 			path: libraries/classes/Plugins/Schema/RelationStats.php
 
@@ -3061,12 +3061,12 @@ parameters:
 			path: libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php
 
 		-
-			message: "#^Parameter \\#1 \\$table of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\SvgRelationSchema\\:\\:_setMinMax\\(\\) expects PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\TableStatsSvg, PhpMyAdmin\\\\Plugins\\\\Schema\\\\Dia\\\\TableStatsDia\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Eps\\\\TableStatsEps\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Pdf\\\\TableStatsPdf\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\TableStatsSvg given\\.$#"
+			message: "#^Parameter \\#1 \\$table of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\SvgRelationSchema\\:\\:setMinMax\\(\\) expects PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\TableStatsSvg, PhpMyAdmin\\\\Plugins\\\\Schema\\\\Dia\\\\TableStatsDia\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Eps\\\\TableStatsEps\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Pdf\\\\TableStatsPdf\\|PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\TableStatsSvg given\\.$#"
 			count: 3
 			path: libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php
 
 		-
-			message: "#^Parameter \\#4 \\$masterField of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\SvgRelationSchema\\:\\:_addRelation\\(\\) expects string, int\\|string given\\.$#"
+			message: "#^Parameter \\#4 \\$masterField of method PhpMyAdmin\\\\Plugins\\\\Schema\\\\Svg\\\\SvgRelationSchema\\:\\:addRelation\\(\\) expects string, int\\|string given\\.$#"
 			count: 1
 			path: libraries/classes/Plugins/Schema/Svg/SvgRelationSchema.php
 
@@ -3756,7 +3756,7 @@ parameters:
 			path: libraries/classes/Server/UserGroups.php
 
 		-
-			message: "#^Parameter \\#1 \\$var_name of static method PhpMyAdmin\\\\Setup\\\\ConfigGenerator\\:\\:_getVarExport\\(\\) expects string, string\\|null given\\.$#"
+			message: "#^Parameter \\#1 \\$var_name of static method PhpMyAdmin\\\\Setup\\\\ConfigGenerator\\:\\:getVarExport\\(\\) expects string, string\\|null given\\.$#"
 			count: 2
 			path: libraries/classes/Setup/ConfigGenerator.php
 
@@ -4091,7 +4091,7 @@ parameters:
 			path: libraries/classes/Tracker.php
 
 		-
-			message: "#^Method PhpMyAdmin\\\\Tracker\\:\\:_changeTracking\\(\\) should return int but returns bool\\|resource\\.$#"
+			message: "#^Method PhpMyAdmin\\\\Tracker\\:\\:changeTracking\\(\\) should return int but returns bool\\|resource\\.$#"
 			count: 1
 			path: libraries/classes/Tracker.php
 

From 7d792e88f67f685205c92cdd2e94abc9f9a53e2e Mon Sep 17 00:00:00 2001
From: charliewindred <charliewindred@gmail.com>
Date: Tue, 2 Jun 2020 22:20:09 +0100
Subject: [PATCH 4/8] Removed underscores from unit test methods

Removed underscore prefixes from unit test method calls.

Signed-off-by: charliewindred <charliewindred@gmail.com>
---
 test/classes/Config/FormDisplayTest.php       |  8 +-
 test/classes/Database/QbeTest.php             | 76 +++++++++----------
 test/classes/FooterTest.php                   | 14 ++--
 test/classes/Gis/GisVisualizationTest.php     |  6 +-
 .../Plugins/Auth/AuthenticationCookieTest.php |  6 +-
 .../Plugins/Export/ExportCodegenTest.php      |  8 +-
 test/classes/Plugins/Export/ExportSqlTest.php | 20 ++---
 test/classes/Setup/ConfigGeneratorTest.php    | 12 +--
 test/classes/TableTest.php                    |  6 +-
 test/classes/TrackerTest.php                  |  2 +-
 10 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/test/classes/Config/FormDisplayTest.php b/test/classes/Config/FormDisplayTest.php
index 8abc6682d546..ddcc63cc2cfc 100644
--- a/test/classes/Config/FormDisplayTest.php
+++ b/test/classes/Config/FormDisplayTest.php
@@ -262,7 +262,7 @@ public function testValidateSelect()
     {
         $attrValidateSelect = new ReflectionMethod(
             FormDisplay::class,
-            '_validateSelect'
+            'validateSelect'
         );
         $attrValidateSelect->setAccessible(true);
 
@@ -377,7 +377,7 @@ public function testGetDocLink()
      */
     public function testGetOptName()
     {
-        $method = new ReflectionMethod(FormDisplay::class, '_getOptName');
+        $method = new ReflectionMethod(FormDisplay::class, 'getOptName');
         $method->setAccessible(true);
 
         $this->assertEquals(
@@ -398,7 +398,7 @@ public function testGetOptName()
      */
     public function testLoadUserprefsInfo()
     {
-        $method = new ReflectionMethod(FormDisplay::class, '_loadUserprefsInfo');
+        $method = new ReflectionMethod(FormDisplay::class, 'loadUserprefsInfo');
         $method->setAccessible(true);
 
         $attrUserprefs = new ReflectionProperty(
@@ -421,7 +421,7 @@ public function testLoadUserprefsInfo()
      */
     public function testSetComments()
     {
-        $method = new ReflectionMethod(FormDisplay::class, '_setComments');
+        $method = new ReflectionMethod(FormDisplay::class, 'setComments');
         $method->setAccessible(true);
 
         // recoding
diff --git a/test/classes/Database/QbeTest.php b/test/classes/Database/QbeTest.php
index fcc6bf854281..267b9c59878e 100644
--- a/test/classes/Database/QbeTest.php
+++ b/test/classes/Database/QbeTest.php
@@ -72,7 +72,7 @@ protected function tearDown(): void
     }
 
     /**
-     * Test for _getSortSelectCell
+     * Test for getSortSelectCell
      *
      * @return void
      */
@@ -83,7 +83,7 @@ public function testGetSortSelectCell()
             $this->callFunction(
                 $this->object,
                 Qbe::class,
-                '_getSortSelectCell',
+                'getSortSelectCell',
                 [1]
             )
         );
@@ -92,7 +92,7 @@ public function testGetSortSelectCell()
             $this->callFunction(
                 $this->object,
                 Qbe::class,
-                '_getSortSelectCell',
+                'getSortSelectCell',
                 [1]
             )
         );
@@ -101,7 +101,7 @@ public function testGetSortSelectCell()
             $this->callFunction(
                 $this->object,
                 Qbe::class,
-                '_getSortSelectCell',
+                'getSortSelectCell',
                 [
                     1,
                     'ASC',
@@ -111,7 +111,7 @@ public function testGetSortSelectCell()
     }
 
     /**
-     * Test for _getSortRow
+     * Test for getSortRow
      *
      * @return void
      */
@@ -122,7 +122,7 @@ public function testGetSortRow()
             $this->callFunction(
                 $this->object,
                 Qbe::class,
-                '_getSortRow',
+                'getSortRow',
                 []
             )
         );
@@ -131,7 +131,7 @@ public function testGetSortRow()
             $this->callFunction(
                 $this->object,
                 Qbe::class,
-                '_getSortRow',
+                'getSortRow',
                 []
             )
         );
@@ -140,14 +140,14 @@ public function testGetSortRow()
             $this->callFunction(
                 $this->object,
                 Qbe::class,
-                '_getSortRow',
+                'getSortRow',
                 []
             )
         );
     }
 
     /**
-     * Test for _getShowRow
+     * Test for getShowRow
      *
      * @return void
      */
@@ -162,14 +162,14 @@ public function testGetShowRow()
             $this->callFunction(
                 $this->object,
                 Qbe::class,
-                '_getShowRow',
+                'getShowRow',
                 []
             )
         );
     }
 
     /**
-     * Test for _getCriteriaInputboxRow
+     * Test for getCriteriaInputboxRow
      *
      * @return void
      */
@@ -189,14 +189,14 @@ public function testGetCriteriaInputboxRow()
             $this->callFunction(
                 $this->object,
                 Qbe::class,
-                '_getCriteriaInputboxRow',
+                'getCriteriaInputboxRow',
                 []
             )
         );
     }
 
     /**
-     * Test for _getAndOrColCell
+     * Test for getAndOrColCell
      *
      * @return void
      */
@@ -212,14 +212,14 @@ public function testGetAndOrColCell()
             $this->callFunction(
                 $this->object,
                 Qbe::class,
-                '_getAndOrColCell',
+                'getAndOrColCell',
                 [1]
             )
         );
     }
 
     /**
-     * Test for _getModifyColumnsRow
+     * Test for getModifyColumnsRow
      *
      * @return void
      */
@@ -243,14 +243,14 @@ public function testGetModifyColumnsRow()
             $this->callFunction(
                 $this->object,
                 Qbe::class,
-                '_getModifyColumnsRow',
+                'getModifyColumnsRow',
                 []
             )
         );
     }
 
     /**
-     * Test for _getInputboxRow
+     * Test for getInputboxRow
      *
      * @return void
      */
@@ -266,14 +266,14 @@ public function testGetInputboxRow()
             $this->callFunction(
                 $this->object,
                 Qbe::class,
-                '_getInputboxRow',
+                'getInputboxRow',
                 [2]
             )
         );
     }
 
     /**
-     * Test for _getInsDelAndOrCriteriaRows
+     * Test for getInsDelAndOrCriteriaRows
      *
      * @return void
      */
@@ -282,7 +282,7 @@ public function testGetInsDelAndOrCriteriaRows()
         $actual = $this->callFunction(
             $this->object,
             Qbe::class,
-            '_getInsDelAndOrCriteriaRows',
+            'getInsDelAndOrCriteriaRows',
             [
                 2,
                 3,
@@ -302,7 +302,7 @@ public function testGetInsDelAndOrCriteriaRows()
     }
 
     /**
-     * Test for _getSelectClause
+     * Test for getSelectClause
      *
      * @return void
      */
@@ -313,14 +313,14 @@ public function testGetSelectClause()
             $this->callFunction(
                 $this->object,
                 Qbe::class,
-                '_getSelectClause',
+                'getSelectClause',
                 []
             )
         );
     }
 
     /**
-     * Test for _getWhereClause
+     * Test for getWhereClause
      *
      * @return void
      */
@@ -331,14 +331,14 @@ public function testGetWhereClause()
             $this->callFunction(
                 $this->object,
                 Qbe::class,
-                '_getWhereClause',
+                'getWhereClause',
                 []
             )
         );
     }
 
     /**
-     * Test for _getOrderByClause
+     * Test for getOrderByClause
      *
      * @return void
      */
@@ -349,14 +349,14 @@ public function testGetOrderByClause()
             $this->callFunction(
                 $this->object,
                 Qbe::class,
-                '_getOrderByClause',
+                'getOrderByClause',
                 []
             )
         );
     }
 
     /**
-     * Test for _getIndexes
+     * Test for getIndexes
      *
      * @return void
      */
@@ -370,7 +370,7 @@ public function testGetIndexes()
             $this->callFunction(
                 $this->object,
                 Qbe::class,
-                '_getIndexes',
+                'getIndexes',
                 [
                     [
                         '`table1`',
@@ -388,7 +388,7 @@ public function testGetIndexes()
     }
 
     /**
-     * Test for _getLeftJoinColumnCandidates
+     * Test for getLeftJoinColumnCandidates
      *
      * @return void
      */
@@ -399,7 +399,7 @@ public function testGetLeftJoinColumnCandidates()
             $this->callFunction(
                 $this->object,
                 Qbe::class,
-                '_getLeftJoinColumnCandidates',
+                'getLeftJoinColumnCandidates',
                 [
                     [
                         '`table1`',
@@ -417,7 +417,7 @@ public function testGetLeftJoinColumnCandidates()
     }
 
     /**
-     * Test for _getMasterTable
+     * Test for getMasterTable
      *
      * @return void
      */
@@ -428,7 +428,7 @@ public function testGetMasterTable()
             $this->callFunction(
                 $this->object,
                 Qbe::class,
-                '_getMasterTable',
+                'getMasterTable',
                 [
                     [
                         'table1',
@@ -447,7 +447,7 @@ public function testGetMasterTable()
     }
 
     /**
-     * Test for _getWhereClauseTablesAndColumns
+     * Test for getWhereClauseTablesAndColumns
      *
      * @return void
      */
@@ -467,14 +467,14 @@ public function testGetWhereClauseTablesAndColumns()
             $this->callFunction(
                 $this->object,
                 Qbe::class,
-                '_getWhereClauseTablesAndColumns',
+                'getWhereClauseTablesAndColumns',
                 []
             )
         );
     }
 
     /**
-     * Test for _getFromClause
+     * Test for getFromClause
      *
      * @return void
      */
@@ -491,14 +491,14 @@ public function testGetFromClause()
             $this->callFunction(
                 $this->object,
                 Qbe::class,
-                '_getFromClause',
+                'getFromClause',
                 [['`table1`.`id`']]
             )
         );
     }
 
     /**
-     * Test for _getSQLQuery
+     * Test for getSQLQuery
      *
      * @return void
      */
@@ -515,7 +515,7 @@ public function testGetSQLQuery()
             $this->callFunction(
                 $this->object,
                 Qbe::class,
-                '_getSQLQuery',
+                'getSQLQuery',
                 [['`table1`.`id`']]
             )
         );
diff --git a/test/classes/FooterTest.php b/test/classes/FooterTest.php
index 658a287dcb60..713fff5f9d78 100644
--- a/test/classes/FooterTest.php
+++ b/test/classes/FooterTest.php
@@ -94,7 +94,7 @@ public function testGetDebugMessage()
     }
 
     /**
-     * Test for _removeRecursion
+     * Test for removeRecursion
      *
      * @return void
      */
@@ -107,7 +107,7 @@ public function testRemoveRecursion()
         $this->callFunction(
             $this->object,
             Footer::class,
-            '_removeRecursion',
+            'removeRecursion',
             [
                 &$object,
             ]
@@ -139,7 +139,7 @@ public function testGetSelfLink()
             $this->callFunction(
                 $this->object,
                 Footer::class,
-                '_getSelfLink',
+                'getSelfLink',
                 [
                     $this->object->getSelfUrl(),
                 ]
@@ -148,7 +148,7 @@ public function testGetSelfLink()
     }
 
     /**
-     * Test for _getSelfLink
+     * Test for getSelfLink
      *
      * @return void
      */
@@ -166,7 +166,7 @@ public function testGetSelfLinkWithImage()
             $this->callFunction(
                 $this->object,
                 Footer::class,
-                '_getSelfLink',
+                'getSelfLink',
                 [
                     $this->object->getSelfUrl(),
                 ]
@@ -175,7 +175,7 @@ public function testGetSelfLinkWithImage()
     }
 
     /**
-     * Test for _getSelfLink
+     * Test for getSelfLink
      *
      * @return void
      */
@@ -193,7 +193,7 @@ public function testGetSelfLinkWithRoute()
             $this->callFunction(
                 $this->object,
                 Footer::class,
-                '_getSelfLink',
+                'getSelfLink',
                 [
                     $this->object->getSelfUrl(),
                 ]
diff --git a/test/classes/Gis/GisVisualizationTest.php b/test/classes/Gis/GisVisualizationTest.php
index d416b2258e85..ac274eddda4c 100644
--- a/test/classes/Gis/GisVisualizationTest.php
+++ b/test/classes/Gis/GisVisualizationTest.php
@@ -20,7 +20,7 @@ public function testModifyQueryOld(): void
                 'spatialColumn' => 'abc',
             ]),
             GisVisualization::class,
-            '_modifySqlQuery',
+            'modifySqlQuery',
             [
                 '',
                 0,
@@ -45,7 +45,7 @@ public function testModifyQuery(): void
                 'spatialColumn' => 'abc',
             ]),
             GisVisualization::class,
-            '_modifySqlQuery',
+            'modifySqlQuery',
             [
                 '',
                 0,
@@ -70,7 +70,7 @@ public function testModifyQueryVersion8(): void
                 'spatialColumn' => 'abc',
             ]),
             GisVisualization::class,
-            '_modifySqlQuery',
+            'modifySqlQuery',
             [
                 '',
                 0,
diff --git a/test/classes/Plugins/Auth/AuthenticationCookieTest.php b/test/classes/Plugins/Auth/AuthenticationCookieTest.php
index 97532b4b80fa..52b4fc2a9fed 100644
--- a/test/classes/Plugins/Auth/AuthenticationCookieTest.php
+++ b/test/classes/Plugins/Auth/AuthenticationCookieTest.php
@@ -914,7 +914,7 @@ public function testGetEncryptionSecretEmpty()
     {
         $method = new ReflectionMethod(
             AuthenticationCookie::class,
-            '_getEncryptionSecret'
+            'getEncryptionSecret'
         );
         $method->setAccessible(true);
 
@@ -943,7 +943,7 @@ public function testGetEncryptionSecretConfigured()
     {
         $method = new ReflectionMethod(
             AuthenticationCookie::class,
-            '_getEncryptionSecret'
+            'getEncryptionSecret'
         );
         $method->setAccessible(true);
 
@@ -1128,7 +1128,7 @@ public function testPasswordChange()
         ];
         $method = new ReflectionMethod(
             AuthenticationCookie::class,
-            '_getSessionEncryptionSecret'
+            'getSessionEncryptionSecret'
         );
         $method->setAccessible(true);
 
diff --git a/test/classes/Plugins/Export/ExportCodegenTest.php b/test/classes/Plugins/Export/ExportCodegenTest.php
index 23aa3b78772b..723123c9650b 100644
--- a/test/classes/Plugins/Export/ExportCodegenTest.php
+++ b/test/classes/Plugins/Export/ExportCodegenTest.php
@@ -435,8 +435,8 @@ public function testHandleNHibernateXMLBody()
 
     /**
      * Test for
-     *     - PhpMyAdmin\Plugins\Export\ExportCodegen::_getCgFormats
-     *     - PhpMyAdmin\Plugins\Export\ExportCodegen::_setCgFormats
+     *     - PhpMyAdmin\Plugins\Export\ExportCodegen::getCgFormats
+     *     - PhpMyAdmin\Plugins\Export\ExportCodegen::setCgFormats
      *
      * @return void
      */
@@ -444,8 +444,8 @@ public function testSetGetCgFormats()
     {
         $reflection = new ReflectionClass(ExportCodegen::class);
 
-        $getter = $reflection->getMethod('_getCgFormats');
-        $setter = $reflection->getMethod('_setCgFormats');
+        $getter = $reflection->getMethod('getCgFormats');
+        $setter = $reflection->getMethod('setCgFormats');
 
         $getter->setAccessible(true);
         $setter->setAccessible(true);
diff --git a/test/classes/Plugins/Export/ExportSqlTest.php b/test/classes/Plugins/Export/ExportSqlTest.php
index 91052ad389f7..ecd29bc48884 100644
--- a/test/classes/Plugins/Export/ExportSqlTest.php
+++ b/test/classes/Plugins/Export/ExportSqlTest.php
@@ -390,13 +390,13 @@ public function testExportRoutines()
     }
 
     /**
-     * Test for PhpMyAdmin\Plugins\Export\ExportSql::_exportComment
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::exportComment
      *
      * @return void
      */
     public function testExportComment()
     {
-        $method = new ReflectionMethod(ExportSql::class, '_exportComment');
+        $method = new ReflectionMethod(ExportSql::class, 'exportComment');
         $method->setAccessible(true);
 
         $GLOBALS['crlf'] = '##';
@@ -428,13 +428,13 @@ public function testExportComment()
     }
 
     /**
-     * Test for PhpMyAdmin\Plugins\Export\ExportSql::_possibleCRLF
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::possibleCRLF
      *
      * @return void
      */
     public function testPossibleCRLF()
     {
-        $method = new ReflectionMethod(ExportSql::class, '_possibleCRLF');
+        $method = new ReflectionMethod(ExportSql::class, 'possibleCRLF');
         $method->setAccessible(true);
 
         $GLOBALS['crlf'] = '##';
@@ -855,7 +855,7 @@ public function testGetTableDefStandIn()
     }
 
     /**
-     * Test for PhpMyAdmin\Plugins\Export\ExportSql::_getTableDefForView
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::getTableDefForView
      *
      * @return void
      */
@@ -891,7 +891,7 @@ public function testGetTableDefForView()
         $GLOBALS['dbi'] = $dbi;
         $GLOBALS['sql_compatibility'] = 'MSSQL';
 
-        $method = new ReflectionMethod(ExportSql::class, '_getTableDefForView');
+        $method = new ReflectionMethod(ExportSql::class, 'getTableDefForView');
         $method->setAccessible(true);
         $result = $method->invoke(
             $this->object,
@@ -1238,7 +1238,7 @@ public function testGetTableDefWithError()
     }
 
     /**
-     * Test for PhpMyAdmin\Plugins\Export\ExportSql::_getTableComments
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::getTableComments
      *
      * @return void
      */
@@ -1284,7 +1284,7 @@ public function testGetTableComments()
         $GLOBALS['dbi'] = $dbi;
         $this->object->relation = new Relation($dbi);
 
-        $method = new ReflectionMethod(ExportSql::class, '_getTableComments');
+        $method = new ReflectionMethod(ExportSql::class, 'getTableComments');
         $method->setAccessible(true);
         $result = $method->invoke(
             $this->object,
@@ -1894,7 +1894,7 @@ public function testExportDataWithError()
     }
 
     /**
-     * Test for PhpMyAdmin\Plugins\Export\ExportSql::_makeCreateTableMSSQLCompatible
+     * Test for PhpMyAdmin\Plugins\Export\ExportSql::makeCreateTableMSSQLCompatible
      *
      * @return void
      */
@@ -1919,7 +1919,7 @@ public function testMakeCreateTableMSSQLCompatible()
 
         $method = new ReflectionMethod(
             ExportSql::class,
-            '_makeCreateTableMSSQLCompatible'
+            'makeCreateTableMSSQLCompatible'
         );
         $method->setAccessible(true);
         $result = $method->invoke(
diff --git a/test/classes/Setup/ConfigGeneratorTest.php b/test/classes/Setup/ConfigGeneratorTest.php
index 60a18f861c3e..2463090ed90e 100644
--- a/test/classes/Setup/ConfigGeneratorTest.php
+++ b/test/classes/Setup/ConfigGeneratorTest.php
@@ -87,14 +87,14 @@ public function testGetConfigFile()
     }
 
     /**
-     * Test for ConfigGenerator::_getVarExport
+     * Test for ConfigGenerator::getVarExport
      *
      * @return void
      */
     public function testGetVarExport()
     {
         $reflection = new ReflectionClass(ConfigGenerator::class);
-        $method = $reflection->getMethod('_getVarExport');
+        $method = $reflection->getMethod('getVarExport');
         $method->setAccessible(true);
 
         $this->assertEquals(
@@ -138,14 +138,14 @@ public function testGetVarExport()
     }
 
     /**
-     * Test for ConfigGenerator::_isZeroBasedArray
+     * Test for ConfigGenerator::isZeroBasedArray
      *
      * @return void
      */
     public function testIsZeroBasedArray()
     {
         $reflection = new ReflectionClass(ConfigGenerator::class);
-        $method = $reflection->getMethod('_isZeroBasedArray');
+        $method = $reflection->getMethod('isZeroBasedArray');
         $method->setAccessible(true);
 
         $this->assertFalse(
@@ -189,14 +189,14 @@ public function testIsZeroBasedArray()
     }
 
     /**
-     * Test for ConfigGenerator::_exportZeroBasedArray
+     * Test for ConfigGenerator::exportZeroBasedArray
      *
      * @return void
      */
     public function testExportZeroBasedArray()
     {
         $reflection = new ReflectionClass(ConfigGenerator::class);
-        $method = $reflection->getMethod('_exportZeroBasedArray');
+        $method = $reflection->getMethod('exportZeroBasedArray');
         $method->setAccessible(true);
 
         $arr = [
diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php
index 2d6c5b83db3b..dfb04ba55a7d 100644
--- a/test/classes/TableTest.php
+++ b/test/classes/TableTest.php
@@ -1173,7 +1173,7 @@ public function testGetColumnsMeta()
     }
 
     /**
-     * Tests for _getSQLToCreateForeignKey() method.
+     * Tests for getSQLToCreateForeignKey() method.
      *
      * @return void
      *
@@ -1198,7 +1198,7 @@ public function testGetSQLToCreateForeignKey()
         $sql = $this->callFunction(
             $tableObj,
             Table::class,
-            '_getSQLToCreateForeignKey',
+            'getSQLToCreateForeignKey',
             [
                 $table,
                 $field,
@@ -1219,7 +1219,7 @@ public function testGetSQLToCreateForeignKey()
         $sql = $this->callFunction(
             $tableObj,
             Table::class,
-            '_getSQLToCreateForeignKey',
+            'getSQLToCreateForeignKey',
             [
                 $table,
                 $field,
diff --git a/test/classes/TrackerTest.php b/test/classes/TrackerTest.php
index ebc33d8e98ff..76f334755e98 100644
--- a/test/classes/TrackerTest.php
+++ b/test/classes/TrackerTest.php
@@ -444,7 +444,7 @@ public function testChangeTracking(
         $result = null;
 
         if ($type === null) {
-            $method = new ReflectionMethod(Tracker::class, '_changeTracking');
+            $method = new ReflectionMethod(Tracker::class, 'changeTracking');
             $method->setAccessible(true);
             $result = $method->invoke(
                 null,

From 707d2635318de1719c4ffe3c9ba03be4254f0b8d Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Tue, 2 Jun 2020 23:54:35 +0200
Subject: [PATCH 5/8] Fix testSetGetPdf and testSetGetPdfTitle

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 test/classes/Plugins/Export/ExportPdfTest.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/classes/Plugins/Export/ExportPdfTest.php b/test/classes/Plugins/Export/ExportPdfTest.php
index b18f6e2eb679..544bf4de10d0 100644
--- a/test/classes/Plugins/Export/ExportPdfTest.php
+++ b/test/classes/Plugins/Export/ExportPdfTest.php
@@ -311,18 +311,18 @@ public function testExportData()
 
     /**
      * Test for
-     *     - PhpMyAdmin\Plugins\Export\ExportPdf::_setPdf
-     *     - PhpMyAdmin\Plugins\Export\ExportPdf::_getPdf
+     *     - PhpMyAdmin\Plugins\Export\ExportPdf::setPdf
+     *     - PhpMyAdmin\Plugins\Export\ExportPdf::getPdf
      *
      * @return void
      */
     public function testSetGetPdf()
     {
-        $setter = new ReflectionMethod(ExportPdf::class, '_setPdf');
+        $setter = new ReflectionMethod(ExportPdf::class, 'setPdf');
         $setter->setAccessible(true);
         $setter->invoke($this->object, new Pdf());
 
-        $getter = new ReflectionMethod(ExportPdf::class, '_getPdf');
+        $getter = new ReflectionMethod(ExportPdf::class, 'getPdf');
         $getter->setAccessible(true);
         $this->assertInstanceOf(
             Pdf::class,
@@ -332,18 +332,18 @@ public function testSetGetPdf()
 
     /**
      * Test for
-     *     - PhpMyAdmin\Plugins\Export\ExportPdf::_setPdfReportTitle
-     *     - PhpMyAdmin\Plugins\Export\ExportPdf::_getPdfReportTitle
+     *     - PhpMyAdmin\Plugins\Export\ExportPdf::setPdfReportTitle
+     *     - PhpMyAdmin\Plugins\Export\ExportPdf::getPdfReportTitle
      *
      * @return void
      */
     public function testSetGetPdfTitle()
     {
-        $setter = new ReflectionMethod(ExportPdf::class, '_setPdfReportTitle');
+        $setter = new ReflectionMethod(ExportPdf::class, 'setPdfReportTitle');
         $setter->setAccessible(true);
         $setter->invoke($this->object, 'title');
 
-        $getter = new ReflectionMethod(ExportPdf::class, '_getPdfReportTitle');
+        $getter = new ReflectionMethod(ExportPdf::class, 'getPdfReportTitle');
         $getter->setAccessible(true);
         $this->assertEquals(
             'title',

From 3f0b7390e2aaa82d63b3318aa14ff44fdf27c5f5 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Tue, 2 Jun 2020 23:56:48 +0200
Subject: [PATCH 6/8] Fix documentation after removing _ from private methods

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php | 2 +-
 test/classes/Config/FormDisplayTest.php                   | 8 ++++----
 test/classes/Plugins/Auth/AuthenticationCookieTest.php    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php b/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php
index b6ca71f64f8e..811db40ed6fa 100644
--- a/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php
+++ b/libraries/classes/Plugins/Schema/Dia/RelationStatsDia.php
@@ -39,7 +39,7 @@ class RelationStatsDia
     public $referenceColor;
 
     /**
-     * @see Relation_Stats_Dia::_getXy
+     * @see Relation_Stats_Dia::getXy
      *
      * @param Dia           $diagram       The DIA diagram
      * @param TableStatsDia $master_table  The master table name
diff --git a/test/classes/Config/FormDisplayTest.php b/test/classes/Config/FormDisplayTest.php
index ddcc63cc2cfc..71e11b89dc7f 100644
--- a/test/classes/Config/FormDisplayTest.php
+++ b/test/classes/Config/FormDisplayTest.php
@@ -254,7 +254,7 @@ public function testFixErrors()
     }
 
     /**
-     * Test for FormDisplay::_validateSelect
+     * Test for FormDisplay::validateSelect
      *
      * @return void
      */
@@ -371,7 +371,7 @@ public function testGetDocLink()
     }
 
     /**
-     * Test for FormDisplay::_getOptName
+     * Test for FormDisplay::getOptName
      *
      * @return void
      */
@@ -392,7 +392,7 @@ public function testGetOptName()
     }
 
     /**
-     * Test for FormDisplay::_loadUserprefsInfo
+     * Test for FormDisplay::loadUserprefsInfo
      *
      * @return void
      */
@@ -415,7 +415,7 @@ public function testLoadUserprefsInfo()
     }
 
     /**
-     * Test for FormDisplay::_setComments
+     * Test for FormDisplay::setComments
      *
      * @return void
      */
diff --git a/test/classes/Plugins/Auth/AuthenticationCookieTest.php b/test/classes/Plugins/Auth/AuthenticationCookieTest.php
index 52b4fc2a9fed..cdbfd872c06d 100644
--- a/test/classes/Plugins/Auth/AuthenticationCookieTest.php
+++ b/test/classes/Plugins/Auth/AuthenticationCookieTest.php
@@ -906,7 +906,7 @@ public function testAuthFailsErrno()
     }
 
     /**
-     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::_getEncryptionSecret
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::getEncryptionSecret
      *
      * @return void
      */
@@ -935,7 +935,7 @@ public function testGetEncryptionSecretEmpty()
     }
 
     /**
-     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::_getEncryptionSecret
+     * Test for PhpMyAdmin\Plugins\Auth\AuthenticationConfig::getEncryptionSecret
      *
      * @return void
      */

From a13e5d1c16fb55ff82a6c6faedeb591d019e02c0 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Wed, 3 Jun 2020 00:01:57 +0200
Subject: [PATCH 7/8] Fix tests documentation after removing _ from private
 methods

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 test/classes/Database/SearchTest.php | 2 +-
 test/classes/FooterTest.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/classes/Database/SearchTest.php b/test/classes/Database/SearchTest.php
index fbdec809a3fd..af3699a0ce63 100644
--- a/test/classes/Database/SearchTest.php
+++ b/test/classes/Database/SearchTest.php
@@ -134,7 +134,7 @@ public function searchTypes()
     }
 
     /**
-     * Test for _getSearchSqls
+     * Test for getSearchSqls
      *
      * @return void
      */
diff --git a/test/classes/FooterTest.php b/test/classes/FooterTest.php
index 713fff5f9d78..8b30a9d0509b 100644
--- a/test/classes/FooterTest.php
+++ b/test/classes/FooterTest.php
@@ -120,7 +120,7 @@ public function testRemoveRecursion()
     }
 
     /**
-     * Test for _getSelfLink
+     * Test for getSelfLink
      *
      * @return void
      */

From 9668731fe6ce924788b21d958e33525e30f3173b Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Wed, 3 Jun 2020 00:07:03 +0200
Subject: [PATCH 8/8] Fix selenium tests warnings on private test methods after
 removing _

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 test/selenium/NormalizationTest.php | 6 ++----
 test/selenium/SqlQueryTest.php      | 7 ++-----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/test/selenium/NormalizationTest.php b/test/selenium/NormalizationTest.php
index 00f922da5921..363f23314af1 100644
--- a/test/selenium/NormalizationTest.php
+++ b/test/selenium/NormalizationTest.php
@@ -67,15 +67,13 @@ public function testNormalizationTo1NF()
         );
         $this->byCssSelector('input[name=submit_normalize]')->click();
         $this->waitForElement('id', 'mainContent');
-        $this->test1NFSteps();
+        $this->assert1NFSteps();
     }
 
     /**
      * assertions in 1NF steps 1.1, 1.2, 1.3
-     *
-     * @return void
      */
-    private function test1NFSteps()
+    private function assert1NFSteps(): void
     {
         $this->assertEquals(
             'First step of normalization (1NF)',
diff --git a/test/selenium/SqlQueryTest.php b/test/selenium/SqlQueryTest.php
index 3394e9b524a6..a1172700051b 100644
--- a/test/selenium/SqlQueryTest.php
+++ b/test/selenium/SqlQueryTest.php
@@ -147,13 +147,10 @@ public function testTableSqlQuery()
         );
 
         // test inline edit button
-        $this->testInlineEdit();
+        $this->assertInlineEdit();
     }
 
-    /**
-     * @return void
-     */
-    private function testInlineEdit()
+    private function assertInlineEdit(): void
     {
         $this->waitForElement('cssSelector', 'a.inline_edit_sql')->click();
         // empty current query