Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit 8cf3e5acc36e · 2024-04-30T15:42:44.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -11252,7 +11252,7 @@ parameters:
 
 		-
 			message: "#^Method PhpMyAdmin\\\\Plugins\\\\Import\\\\ImportSql\\:\\:doImport\\(\\) should return array\\<string\\> but returns mixed\\.$#"
-			count: 1
+			count: 2
 			path: src/Plugins/Import/ImportSql.php
 
 		-
diff --git a/src/Controllers/HomeController.php b/src/Controllers/HomeController.php
@@ -108,9 +108,13 @@ public function __invoke(ServerRequest $request): Response|null
         $hasServer = Current::$server > 0 || count($config->settings['Servers']) > 1;
         if ($hasServer) {
             $hasServerSelection = $config->settings['ServerDefault'] == 0
-                || (! $config->settings['NavigationDisplayServers']
-                && (count($config->settings['Servers']) > 1
-                || (Current::$server === 0 && count($config->settings['Servers']) === 1)));
+                || (
+                    $config->settings['NavigationDisplayServers']
+                    && (
+                        count($config->settings['Servers']) > 1
+                        || (Current::$server === 0 && count($config->settings['Servers']) === 1)
+                    )
+                );
             if ($hasServerSelection) {
                 $serverSelection = Select::render(true);
             }
diff --git a/src/Import/Import.php b/src/Import/Import.php
@@ -219,10 +219,15 @@ public function runQuery(string $sql, array &$sqlData): void
 
                 foreach ($queries as $query) {
                     $this->executeQuery($query, $sqlData);
+                    if ($GLOBALS['error']) {
+                        break;
+                    }
                 }
             }
 
-            $this->executeQuery($this->importRunBuffer, $sqlData);
+            if (! $GLOBALS['error']) {
+                $this->executeQuery($this->importRunBuffer, $sqlData);
+            }
         }
 
         // check length of query unless we decided to pass it to /sql
diff --git a/src/Plugins/Import/ImportSql.php b/src/Plugins/Import/ImportSql.php
@@ -157,6 +157,10 @@ public function doImport(File|null $importHandle = null): array
             $this->import->runQuery($statement, $sqlStatements);
         }
 
+        if ($GLOBALS['error']) {
+            return $sqlStatements;
+        }
+
         // Finishing.
         $this->import->runQuery('', $sqlStatements);
 

Original file line number	Diff line number	Diff line change
`@@ -11252,7 +11252,7 @@ parameters:`
`11252`	`11252`
`11253`	`11253`	`-`
`11254`	`11254`	`message: "#^Method PhpMyAdmin\\\\Plugins\\\\Import\\\\ImportSql\\:\\:doImport\\(\\) should return array\\<string\\> but returns mixed\\.$#"`
`11255`		`- count: 1`
	`11255`	`+ count: 2`
`11256`	`11256`	`path: src/Plugins/Import/ImportSql.php`
`11257`	`11257`
`11258`	`11258`	`-`
Original file line number	Diff line number	Diff line change
`@@ -219,10 +219,15 @@ public function runQuery(string $sql, array &$sqlData): void`
`219`	`219`
`220`	`220`	`foreach ($queries as $query) {`
`221`	`221`	`$this->executeQuery($query, $sqlData);`
	`222`	`+ if ($GLOBALS['error']) {`
	`223`	`+ break;`
	`224`	`+ }`
`222`	`225`	`}`
`223`	`226`	`}`
`224`	`227`
`225`		`- $this->executeQuery($this->importRunBuffer, $sqlData);`
	`228`	`+ if (! $GLOBALS['error']) {`
	`229`	`+ $this->executeQuery($this->importRunBuffer, $sqlData);`
	`230`	`+ }`
`226`	`231`	`}`
`227`	`232`
`228`	`233`	`// check length of query unless we decided to pass it to /sql`
Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,10 @@ public function doImport(File\|null $importHandle = null): array`
`157`	`157`	`$this->import->runQuery($statement, $sqlStatements);`
`158`	`158`	`}`
`159`	`159`
	`160`	`+ if ($GLOBALS['error']) {`
	`161`	`+ return $sqlStatements;`
	`162`	`+ }`
	`163`	`+`
`160`	`164`	`// Finishing.`
`161`	`165`	`$this->import->runQuery('', $sqlStatements);`
`162`	`166`