Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit dc24ffc6bed8 · 2024-03-29T16:09:13.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/ChangeLog b/ChangeLog
@@ -79,6 +79,7 @@ phpMyAdmin - ChangeLog
 - issue #15670 Fix case where the data is truncated after changing a longtext column's collation
 - issue #18865 Fix missing text-nowrap for timestamps columns
 - issue #19022 Fix case where tables from wrong database is loaded in navigation tree
+- issue #18593 Fix drop db line included in server export if exporting only data
 - issue #18049 Also check that curl_exec is enabled for the new version check
 
 5.2.1 (2023-02-07)
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -7396,9 +7396,6 @@
       <code><![CDATA[Config::getInstance()]]></code>
       <code><![CDATA[DatabaseInterface::getInstance()]]></code>
     </DeprecatedMethod>
-    <InvalidArrayOffset>
-      <code><![CDATA[$GLOBALS['allowDeny_forbidden']]]></code>
-    </InvalidArrayOffset>
   </file>
   <file src="src/Plugins/Auth/AuthenticationCookie.php">
     <DeprecatedMethod>
diff --git a/src/Plugins/Auth/AuthenticationConfig.php b/src/Plugins/Auth/AuthenticationConfig.php
@@ -95,7 +95,7 @@ public function showFailure(string $failure): never
         <tr>
             <td>';
         $config = Config::getInstance();
-        if (isset($GLOBALS['allowDeny_forbidden']) && $GLOBALS['allowDeny_forbidden']) {
+        if ($failure === 'allow-denied') {
             trigger_error(__('Access denied!'), E_USER_NOTICE);
         } else {
             // Check whether user has configured something
diff --git a/src/Plugins/Export/ExportSql.php b/src/Plugins/Export/ExportSql.php
@@ -802,7 +802,9 @@ public function exportDBCreate(string $db, string $exportType, string $dbAlias =
 
         $compat = $GLOBALS['sql_compatibility'] ?? 'NONE';
 
-        if (isset($GLOBALS['sql_drop_database'])) {
+        $exportStructure = ! isset($GLOBALS['sql_structure_or_data'])
+            || in_array($GLOBALS['sql_structure_or_data'], ['structure', 'structure_and_data'], true);
+        if ($exportStructure && isset($GLOBALS['sql_drop_database'])) {
             if (
                 ! $this->export->outputHandler(
                     'DROP DATABASE IF EXISTS '
diff --git a/tests/unit/Plugins/Auth/AuthenticationConfigTest.php b/tests/unit/Plugins/Auth/AuthenticationConfigTest.php
@@ -81,7 +81,6 @@ public function testAuthSetUser(): void
     public function testAuthFails(): void
     {
         Config::getInstance()->settings['Servers'] = [1];
-        $GLOBALS['allowDeny_forbidden'] = false;
 
         $dbi = $this->getMockBuilder(DatabaseInterface::class)
             ->disableOriginalConstructor()
diff --git a/tests/unit/Plugins/Auth/AuthenticationCookieTest.php b/tests/unit/Plugins/Auth/AuthenticationCookieTest.php
@@ -750,7 +750,6 @@ public function testAuthFailsActivity(): void
 
         $_COOKIE['pmaAuth-2'] = 'pass';
 
-        $GLOBALS['allowDeny_forbidden'] = '';
         Config::getInstance()->settings['LoginCookieValidity'] = 10;
 
         $responseStub = new ResponseRendererStub();

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,6 @@ public function testAuthSetUser(): void`
`81`	`81`	`public function testAuthFails(): void`
`82`	`82`	`{`
`83`	`83`	`Config::getInstance()->settings['Servers'] = [1];`
`84`		`- $GLOBALS['allowDeny_forbidden'] = false;`
`85`	`84`
`86`	`85`	`$dbi = $this->getMockBuilder(DatabaseInterface::class)`
`87`	`86`	`->disableOriginalConstructor()`