Merge pull request phpmyadmin#18812 from kamyweb/role_based_auth

Add role based auth for MySQL 8.x and compatibles
liviuconcioiu · Mar 3, 2024 · 856d316 · 856d316
2 parents a82c7fc + 4571921
commit 856d316
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -6755,11 +6755,6 @@ parameters:
 			count: 1
 			path: src/DatabaseInterface.php
 
-		-
-			message: "#^Only booleans are allowed in an if condition, PhpMyAdmin\\\\Dbal\\\\ResultInterface\\|false given\\.$#"
-			count: 2
-			path: src/DatabaseInterface.php
-
 		-
 			message: "#^Only booleans are allowed in an if condition, int\\|false given\\.$#"
 			count: 2

diff --git a/src/DatabaseInterface.php b/src/DatabaseInterface.php
@@ -1517,11 +1517,7 @@ public function isGrantUser(): bool
         if (! $hasGrantPrivilege) {
             foreach ($this->getCurrentRolesAndHost() as [$role, $roleHost]) {
                 $query = QueryGenerator::getInformationSchemaDataForGranteeRequest($role, $roleHost ?? '');
-                $result = $this->tryQuery($query);
-
-                if ($result) {
-                    $hasGrantPrivilege = (bool) $result->numRows();
-                }
+                $hasGrantPrivilege = (bool) $this->fetchValue($query);
 
                 if ($hasGrantPrivilege) {
                     break;
@@ -1568,11 +1564,7 @@ public function isCreateUser(): bool
         if (! $hasCreatePrivilege) {
             foreach ($this->getCurrentRolesAndHost() as [$role, $roleHost]) {
                 $query = QueryGenerator::getInformationSchemaDataForCreateRequest($role, $roleHost ?? '');
-                $result = $this->tryQuery($query);
-
-                if ($result) {
-                    $hasCreatePrivilege = (bool) $result->numRows();
-                }
+                $hasCreatePrivilege = (bool) $this->fetchValue($query);
 
                 if ($hasCreatePrivilege) {
                     break;