Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit 76d035ae5756 · 2023-07-26T16:58:15.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/libraries/classes/ConfigStorage/Relation.php b/libraries/classes/ConfigStorage/Relation.php
@@ -431,7 +431,7 @@ public function getForeigners(string $db, string $table, string $column = '', st
         if (($source === 'both' || $source === 'foreign') && strlen($table) > 0) {
             $tableObj = new Table($table, $db, $this->dbi);
             $showCreateTable = $tableObj->showCreate();
-            if ($showCreateTable) {
+            if ($showCreateTable !== '') {
                 $parser = new Parser($showCreateTable);
                 $stmt = $parser->statements[0];
                 $foreign['foreign_keys_data'] = [];
diff --git a/libraries/classes/Controllers/Table/Structure/PartitioningController.php b/libraries/classes/Controllers/Table/Structure/PartitioningController.php
@@ -84,7 +84,7 @@ public function __invoke(ServerRequest $request): void
     private function extractPartitionDetails(): array|null
     {
         $createTable = (new Table($GLOBALS['table'], $GLOBALS['db'], $this->dbi))->showCreate();
-        if (! $createTable) {
+        if ($createTable === '') {
             return null;
         }
 
diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php
@@ -2428,7 +2428,7 @@ public function getColumnGenerationExpression(string|null $column = null): array
         }
 
         $createTable = $this->showCreate();
-        if (! $createTable) {
+        if ($createTable === '') {
             return false;
         }
 
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1652,7 +1652,7 @@ parameters:
 
 		-
 			message: "#^Only booleans are allowed in an if condition, string given\\.$#"
-			count: 6
+			count: 5
 			path: libraries/classes/ConfigStorage/Relation.php
 
 		-
@@ -9205,11 +9205,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Controllers/Table/Structure/PartitioningController.php
 
-		-
-			message: "#^Only booleans are allowed in a negated boolean, string given\\.$#"
-			count: 1
-			path: libraries/classes/Controllers/Table/Structure/PartitioningController.php
-
 		-
 			message: "#^Parameter \\#1 \\$dbname of method PhpMyAdmin\\\\DatabaseInterface\\:\\:selectDb\\(\\) expects PhpMyAdmin\\\\Identifiers\\\\DatabaseName\\|string, mixed given\\.$#"
 			count: 1
@@ -25462,7 +25457,7 @@ parameters:
 
 		-
 			message: "#^Only booleans are allowed in a negated boolean, string given\\.$#"
-			count: 4
+			count: 3
 			path: libraries/classes/Table.php
 
 		-

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public function __invoke(ServerRequest $request): void`
`84`	`84`	`private function extractPartitionDetails(): array\|null`
`85`	`85`	`{`
`86`	`86`	`$createTable = (new Table($GLOBALS['table'], $GLOBALS['db'], $this->dbi))->showCreate();`
`87`		`- if (! $createTable) {`
	`87`	`+ if ($createTable === '') {`
`88`	`88`	`return null;`
`89`	`89`	`}`
`90`	`90`
Original file line number	Diff line number	Diff line change
`@@ -2428,7 +2428,7 @@ public function getColumnGenerationExpression(string\|null $column = null): array`
`2428`	`2428`	`}`
`2429`	`2429`
`2430`	`2430`	`$createTable = $this->showCreate();`
`2431`		`- if (! $createTable) {`
	`2431`	`+ if ($createTable === '') {`
`2432`	`2432`	`return false;`
`2433`	`2433`	`}`
`2434`	`2434`
Original file line number	Diff line number	Diff line change
`@@ -1652,7 +1652,7 @@ parameters:`
`1652`	`1652`
`1653`	`1653`	`-`
`1654`	`1654`	`message: "#^Only booleans are allowed in an if condition, string given\\.$#"`
`1655`		`- count: 6`
	`1655`	`+ count: 5`
`1656`	`1656`	`path: libraries/classes/ConfigStorage/Relation.php`
`1657`	`1657`
`1658`	`1658`	`-`
`@@ -9205,11 +9205,6 @@ parameters:`
`9205`	`9205`	`count: 1`
`9206`	`9206`	`path: libraries/classes/Controllers/Table/Structure/PartitioningController.php`
`9207`	`9207`
`9208`		`- -`
`9209`		`- message: "#^Only booleans are allowed in a negated boolean, string given\\.$#"`
`9210`		`- count: 1`
`9211`		`- path: libraries/classes/Controllers/Table/Structure/PartitioningController.php`
`9212`		`-`
`9213`	`9208`	`-`
`9214`	`9209`	`message: "#^Parameter \\#1 \\$dbname of method PhpMyAdmin\\\\DatabaseInterface\\:\\:selectDb\\(\\) expects PhpMyAdmin\\\\Identifiers\\\\DatabaseName\\\|string, mixed given\\.$#"`
`9215`	`9210`	`count: 1`
`@@ -25462,7 +25457,7 @@ parameters:`
`25462`	`25457`
`25463`	`25458`	`-`
`25464`	`25459`	`message: "#^Only booleans are allowed in a negated boolean, string given\\.$#"`
`25465`		`- count: 4`
	`25460`	`+ count: 3`
`25466`	`25461`	`path: libraries/classes/Table.php`
`25467`	`25462`
`25468`	`25463`	`-`