Remove db and table globals from DbTableExists class

MauricioFauth · MauricioFauth · commit a8d514a35097 · 2022-01-28T16:43:48.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/libraries/classes/Controllers/Database/RoutinesController.php b/libraries/classes/Controllers/Database/RoutinesController.php
@@ -62,7 +62,7 @@ public function __invoke(): void
                 $errorUrl = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');
                 $errorUrl .= Url::getCommon($urlParams, '&');
 
-                DbTableExists::check();
+                DbTableExists::check($db, $table);
             } else {
                 $table = '';
 
diff --git a/libraries/classes/Controllers/Database/TriggersController.php b/libraries/classes/Controllers/Database/TriggersController.php
@@ -48,7 +48,7 @@ public function __invoke(): void
                 $errorUrl = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');
                 $errorUrl .= Url::getCommon($urlParams, '&');
 
-                DbTableExists::check();
+                DbTableExists::check($db, $table);
             } else {
                 $table = '';
 
diff --git a/libraries/classes/Controllers/Table/AddFieldController.php b/libraries/classes/Controllers/Table/AddFieldController.php
@@ -173,7 +173,7 @@ public function __invoke(): void
         $errorUrl = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');
         $errorUrl .= Url::getCommon($url_params, '&');
 
-        DbTableExists::check();
+        DbTableExists::check($db, $table);
 
         $active_page = Url::getFromRoute('/table/structure');
         /**
diff --git a/libraries/classes/Controllers/Table/ChangeController.php b/libraries/classes/Controllers/Table/ChangeController.php
@@ -58,7 +58,7 @@ public function __invoke(): void
         $this->response->addHTML($pageSettings->getErrorHTML());
         $this->response->addHTML($pageSettings->getHTML());
 
-        DbTableExists::check();
+        DbTableExists::check($db, $table);
 
         /**
          * Determine whether Insert or Edit and set global variables
diff --git a/libraries/classes/Controllers/Table/ChartController.php b/libraries/classes/Controllers/Table/ChartController.php
@@ -90,7 +90,7 @@ public function __invoke(): void
             $errorUrl = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');
             $errorUrl .= Url::getCommon($url_params, '&');
 
-            DbTableExists::check();
+            DbTableExists::check($db, $table);
 
             $url_params['goto'] = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');
             $url_params['back'] = Url::getFromRoute('/table/sql');
@@ -179,7 +179,7 @@ public function ajax(): void
             $errorUrl = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');
             $errorUrl .= Url::getCommon($urlParams, '&');
 
-            DbTableExists::check();
+            DbTableExists::check($db, $table);
         }
 
         $parser = new Parser($sql_query);
diff --git a/libraries/classes/Controllers/Table/DeleteConfirmController.php b/libraries/classes/Controllers/Table/DeleteConfirmController.php
@@ -33,7 +33,7 @@ public function __invoke(): void
         $errorUrl = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');
         $errorUrl .= Url::getCommon($urlParams, '&');
 
-        DbTableExists::check();
+        DbTableExists::check($db, $table);
 
         $this->render('table/delete/confirm', [
             'db' => $db,
diff --git a/libraries/classes/Controllers/Table/DropColumnConfirmationController.php b/libraries/classes/Controllers/Table/DropColumnConfirmationController.php
@@ -14,7 +14,7 @@ final class DropColumnConfirmationController extends AbstractController
 {
     public function __invoke(): void
     {
-        global $urlParams, $errorUrl, $cfg;
+        global $db, $table, $urlParams, $errorUrl, $cfg;
 
         $selected = $_POST['selected_fld'] ?? null;
 
@@ -31,7 +31,7 @@ public function __invoke(): void
         $errorUrl = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');
         $errorUrl .= Url::getCommon($urlParams, '&');
 
-        DbTableExists::check();
+        DbTableExists::check($db, $table);
 
         $this->render('table/structure/drop_confirm', [
             'db' => $this->db,
diff --git a/libraries/classes/Controllers/Table/FindReplaceController.php b/libraries/classes/Controllers/Table/FindReplaceController.php
@@ -69,7 +69,7 @@ public function __invoke(): void
         $errorUrl = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');
         $errorUrl .= Url::getCommon($urlParams, '&');
 
-        DbTableExists::check();
+        DbTableExists::check($db, $table);
 
         if (isset($_POST['find'])) {
             $this->findAction();
diff --git a/libraries/classes/Controllers/Table/ImportController.php b/libraries/classes/Controllers/Table/ImportController.php
@@ -55,7 +55,7 @@ public function __invoke(): void
         $errorUrl = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');
         $errorUrl .= Url::getCommon($urlParams, '&');
 
-        DbTableExists::check();
+        DbTableExists::check($db, $table);
 
         $urlParams['goto'] = Url::getFromRoute('/table/import');
         $urlParams['back'] = Url::getFromRoute('/table/import');
diff --git a/libraries/classes/Controllers/Table/IndexRenameController.php b/libraries/classes/Controllers/Table/IndexRenameController.php
@@ -47,7 +47,7 @@ public function __invoke(): void
             $errorUrl = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');
             $errorUrl .= Url::getCommon($urlParams, '&');
 
-            DbTableExists::check();
+            DbTableExists::check($db, $table);
         }
 
         if (isset($_POST['index'])) {
diff --git a/libraries/classes/Controllers/Table/IndexesController.php b/libraries/classes/Controllers/Table/IndexesController.php
@@ -52,7 +52,7 @@ public function __invoke(): void
             $errorUrl = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');
             $errorUrl .= Url::getCommon($urlParams, '&');
 
-            DbTableExists::check();
+            DbTableExists::check($db, $table);
         }
 
         if (isset($_POST['index'])) {
diff --git a/libraries/classes/Controllers/Table/OperationsController.php b/libraries/classes/Controllers/Table/OperationsController.php
@@ -91,7 +91,7 @@ public function __invoke(): void
         $errorUrl = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');
         $errorUrl .= Url::getCommon($urlParams, '&');
 
-        DbTableExists::check();
+        DbTableExists::check($db, $table);
 
         $urlParams['goto'] = $urlParams['back'] = Url::getFromRoute('/table/operations');
 
diff --git a/libraries/classes/Controllers/Table/SearchController.php b/libraries/classes/Controllers/Table/SearchController.php
@@ -180,7 +180,7 @@ public function __invoke(): void
         $errorUrl = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');
         $errorUrl .= Url::getCommon($urlParams, '&');
 
-        DbTableExists::check();
+        DbTableExists::check($db, $table);
 
         $this->addScriptFiles([
             'makegrid.js',
diff --git a/libraries/classes/Controllers/Table/SqlController.php b/libraries/classes/Controllers/Table/SqlController.php
@@ -54,7 +54,7 @@ public function __invoke(): void
         $errorUrl = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');
         $errorUrl .= Url::getCommon($url_params, '&');
 
-        DbTableExists::check();
+        DbTableExists::check($db, $table);
 
         /**
          * After a syntax error, we return to this script
diff --git a/libraries/classes/Controllers/Table/Structure/PrimaryController.php b/libraries/classes/Controllers/Table/Structure/PrimaryController.php
@@ -68,7 +68,7 @@ public function __invoke(): void
             $errorUrl = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');
             $errorUrl .= Url::getCommon($urlParams, '&');
 
-            DbTableExists::check();
+            DbTableExists::check($db, $table);
 
             $this->render('table/structure/primary', [
                 'db' => $db,
diff --git a/libraries/classes/Controllers/Table/StructureController.php b/libraries/classes/Controllers/Table/StructureController.php
@@ -124,7 +124,7 @@ public function __invoke(): void
         $errorUrl = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');
         $errorUrl .= Url::getCommon($url_params, '&');
 
-        DbTableExists::check();
+        DbTableExists::check($db, $table);
 
         $primary = Index::getPrimary($this->table, $this->db);
         $columns_with_index = $this->dbi
diff --git a/libraries/classes/Controllers/Table/TrackingController.php b/libraries/classes/Controllers/Table/TrackingController.php
@@ -53,7 +53,7 @@ public function __invoke(): void
         $errorUrl = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');
         $errorUrl .= Url::getCommon($urlParams, '&');
 
-        DbTableExists::check();
+        DbTableExists::check($db, $table);
 
         $activeMessage = '';
         if (
diff --git a/libraries/classes/Controllers/Table/TriggersController.php b/libraries/classes/Controllers/Table/TriggersController.php
@@ -53,7 +53,7 @@ public function __invoke(): void
                 $errorUrl = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');
                 $errorUrl .= Url::getCommon($urlParams, '&');
 
-                DbTableExists::check();
+                DbTableExists::check($db, $table);
             } else {
                 $table = '';
 
diff --git a/libraries/classes/Controllers/Table/ZoomSearchController.php b/libraries/classes/Controllers/Table/ZoomSearchController.php
@@ -103,7 +103,7 @@ public function __invoke(): void
         $errorUrl = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');
         $errorUrl .= Url::getCommon($urlParams, '&');
 
-        DbTableExists::check();
+        DbTableExists::check($db, $table);
 
         $this->addScriptFiles([
             'vendor/stickyfill.min.js',
diff --git a/libraries/classes/Controllers/Transformation/WrapperController.php b/libraries/classes/Controllers/Transformation/WrapperController.php
@@ -62,7 +62,7 @@ public function __invoke(): void
 
         $relationParameters = $this->relation->getRelationParameters();
 
-        DbTableExists::check();
+        DbTableExists::check($db, $table);
 
         /**
          * Sets globals from $_REQUEST
diff --git a/libraries/classes/Controllers/View/OperationsController.php b/libraries/classes/Controllers/View/OperationsController.php
@@ -54,7 +54,7 @@ public function __invoke(): void
         $errorUrl = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');
         $errorUrl .= Url::getCommon($urlParams, '&');
 
-        DbTableExists::check();
+        DbTableExists::check($db, $table);
 
         $urlParams['goto'] = $urlParams['back'] = Url::getFromRoute('/view/operations');
 
diff --git a/libraries/classes/DbTableExists.php b/libraries/classes/DbTableExists.php
@@ -8,30 +8,28 @@
 
 use function __;
 use function defined;
-use function strlen;
 
 final class DbTableExists
 {
     /**
-     * Ensure the database and the table exist (else move to the "parent" script)
-     * and display headers
+     * Ensure the database and the table exist (else move to the "parent" script) and display headers.
      */
-    public static function check(): void
+    public static function check(string $db, string $table): void
     {
-        self::checkDatabase();
-        self::checkTable();
+        self::checkDatabase($db);
+        self::checkTable($db, $table);
     }
 
-    private static function checkDatabase(): void
+    private static function checkDatabase(string $db): void
     {
-        global $db, $dbi, $is_db, $message, $show_as_php, $sql_query;
+        global $dbi, $is_db, $message, $show_as_php, $sql_query;
 
         if (! empty($is_db)) {
             return;
         }
 
         $is_db = false;
-        if (strlen($db) > 0) {
+        if ($db !== '') {
             $is_db = @$dbi->selectDb($db);
         }
 
@@ -69,16 +67,16 @@ private static function checkDatabase(): void
         exit;
     }
 
-    private static function checkTable(): void
+    private static function checkTable(string $db, string $table): void
     {
-        global $containerBuilder, $db, $table, $dbi, $is_table;
+        global $containerBuilder, $dbi, $is_table;
 
         if (! empty($is_table) || defined('PMA_SUBMIT_MULT') || defined('TABLE_MAY_BE_ABSENT')) {
             return;
         }
 
         $is_table = false;
-        if (strlen($table) > 0) {
+        if ($table !== '') {
             $is_table = $dbi->getCache()->getCachedTableContent([$db, $table], false);
             if ($is_table) {
                 return;
@@ -96,7 +94,7 @@ private static function checkTable(): void
             exit;
         }
 
-        if (strlen($table) > 0) {
+        if ($table !== '') {
             /**
              * SHOW TABLES doesn't show temporary tables, so try select
              * (as it can happen just in case temporary table, it should be fast):
diff --git a/psalm-baseline.xml b/psalm-baseline.xml

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ final class DropColumnConfirmationController extends AbstractController`
`14`	`14`	`{`
`15`	`15`	`public function __invoke(): void`
`16`	`16`	`{`
`17`		`- global $urlParams, $errorUrl, $cfg;`
	`17`	`+ global $db, $table, $urlParams, $errorUrl, $cfg;`
`18`	`18`
`19`	`19`	`$selected = $_POST['selected_fld'] ?? null;`
`20`	`20`
`@@ -31,7 +31,7 @@ public function __invoke(): void`
`31`	`31`	`$errorUrl = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');`
`32`	`32`	`$errorUrl .= Url::getCommon($urlParams, '&');`
`33`	`33`
`34`		`- DbTableExists::check();`
	`34`	`+ DbTableExists::check($db, $table);`
`35`	`35`
`36`	`36`	`$this->render('table/structure/drop_confirm', [`
`37`	`37`	`'db' => $this->db,`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function __invoke(): void`
`47`	`47`	`$errorUrl = Util::getScriptNameForOption($cfg['DefaultTabTable'], 'table');`
`48`	`48`	`$errorUrl .= Url::getCommon($urlParams, '&');`
`49`	`49`
`50`		`- DbTableExists::check();`
	`50`	`+ DbTableExists::check($db, $table);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`if (isset($_POST['index'])) {`