Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit e515ecd108bf · 2025-10-17T10:55:19.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@mfauth.net&gt;
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -5394,12 +5394,6 @@ parameters:
 			count: 1
 			path: src/Dbal/DatabaseInterface.php
 
-		-
-			message: '#^Variable \$roleHost on left side of \?\? always exists and is not nullable\.$#'
-			identifier: nullCoalesce.variable
-			count: 2
-			path: src/Dbal/DatabaseInterface.php
-
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -3607,10 +3607,6 @@
     <DeprecatedProperty>
       <code><![CDATA[Routing::$route]]></code>
     </DeprecatedProperty>
-    <DocblockTypeContradiction>
-      <code><![CDATA['']]></code>
-      <code><![CDATA['']]></code>
-    </DocblockTypeContradiction>
     <InvalidOperand>
       <code><![CDATA[$row['Data_free']]]></code>
       <code><![CDATA[$row['Data_length']]]></code>
@@ -3724,10 +3720,6 @@
     <PossiblyUnusedReturnValue>
       <code><![CDATA[bool]]></code>
     </PossiblyUnusedReturnValue>
-    <RedundantConditionGivenDocblockType>
-      <code><![CDATA[$roleHost]]></code>
-      <code><![CDATA[$roleHost]]></code>
-    </RedundantConditionGivenDocblockType>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[$index->isUnique()]]></code>
       <code><![CDATA[$limitCount]]></code>
diff --git a/src/Dbal/DatabaseInterface.php b/src/Dbal/DatabaseInterface.php
@@ -1453,7 +1453,7 @@ public function isGrantUser(): bool
 
         if (! $hasGrantPrivilege) {
             foreach ($this->getCurrentRolesAndHost() as [$role, $roleHost]) {
-                $query = QueryGenerator::getInformationSchemaDataForGranteeRequest($role, $roleHost ?? '', $collation);
+                $query = QueryGenerator::getInformationSchemaDataForGranteeRequest($role, $roleHost, $collation);
                 $hasGrantPrivilege = (bool) $this->fetchValue($query);
 
                 if ($hasGrantPrivilege) {
@@ -1502,7 +1502,7 @@ public function isCreateUser(): bool
 
         if (! $hasCreatePrivilege) {
             foreach ($this->getCurrentRolesAndHost() as [$role, $roleHost]) {
-                $query = QueryGenerator::getInformationSchemaDataForCreateRequest($role, $roleHost ?? '', $collation);
+                $query = QueryGenerator::getInformationSchemaDataForCreateRequest($role, $roleHost, $collation);
                 $hasCreatePrivilege = (bool) $this->fetchValue($query);
 
                 if ($hasCreatePrivilege) {
@@ -1556,7 +1556,7 @@ public function getCurrentRolesAndHost(): array
             $roles = $this->getCurrentRoles();
 
             $this->currentRoleAndHost = array_map(static function (string $role) {
-                return explode('@', $role);
+                return str_contains($role, '@') ? explode('@', $role) : [$role, ''];
             }, $roles);
         }
 
diff --git a/tests/unit/Dbal/DatabaseInterfaceTest.php b/tests/unit/Dbal/DatabaseInterfaceTest.php
@@ -158,6 +158,7 @@ public static function currentRolesData(): array
             ],
             ['8.0.0 - MySQL Community Server - GPL', true, [['@`localhost`']], ['@localhost'], [['', 'localhost']]],
             ['10.5.0-MariaDB', true, [['`role`@`localhost`']], ['role@localhost'], [['role', 'localhost']]],
+            ['10.5.0-MariaDB', true, [['`role`']], ['role'], [['role', '']]],
             [
                 '10.5.0-MariaDB',
                 true,

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,7 @@ public static function currentRolesData(): array`
`158`	`158`	`],`
`159`	`159`	['8.0.0 - MySQL Community Server - GPL', true, [['@`localhost`']], ['@localhost'], [['', 'localhost']]],
`160`	`160`	['10.5.0-MariaDB', true, [['`role`@`localhost`']], ['role@localhost'], [['role', 'localhost']]],
	`161`	+ ['10.5.0-MariaDB', true, [['`role`']], ['role'], [['role', '']]],
`161`	`162`	`[`
`162`	`163`	`'10.5.0-MariaDB',`
`163`	`164`	`true,`