From c9bcda3212b85b197b9a0295995d1e91e30fc81c Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Sun, 21 Nov 2021 22:34:49 +0000 Subject: [PATCH 1/2] Simplify the if statement The value of MYSQLI_STORE_RESULT is 0, so the else block was redundant. Signed-off-by: Kamil Tekiela --- libraries/classes/Dbal/DbiMysqli.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libraries/classes/Dbal/DbiMysqli.php b/libraries/classes/Dbal/DbiMysqli.php index fb5dec51ab..fb53c95290 100644 --- a/libraries/classes/Dbal/DbiMysqli.php +++ b/libraries/classes/Dbal/DbiMysqli.php @@ -182,12 +182,9 @@ class DbiMysqli implements DbiExtension */ public function realQuery($query, $link, $options) { - if ($options == ($options | DatabaseInterface::QUERY_STORE)) { - $method = MYSQLI_STORE_RESULT; - } elseif ($options == ($options | DatabaseInterface::QUERY_UNBUFFERED)) { + $method = MYSQLI_STORE_RESULT; + if ($options == ($options | DatabaseInterface::QUERY_UNBUFFERED)) { $method = MYSQLI_USE_RESULT; - } else { - $method = 0; } return $link->query($query, $method); From 83e6d06d0994a772881b7e2dc85840d8b56a71b4 Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Sun, 21 Nov 2021 22:41:57 +0000 Subject: [PATCH 2/2] Remove redundant check This method never returns false. Signed-off-by: Kamil Tekiela --- libraries/classes/Dbal/DbiMysqli.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libraries/classes/Dbal/DbiMysqli.php b/libraries/classes/Dbal/DbiMysqli.php index fb53c95290..a3c4635e35 100644 --- a/libraries/classes/Dbal/DbiMysqli.php +++ b/libraries/classes/Dbal/DbiMysqli.php @@ -16,7 +16,6 @@ use PhpMyAdmin\Query\Utilities; use function __; use function defined; -use function is_array; use function is_bool; use function is_object; use function mysqli_connect_errno; @@ -413,9 +412,6 @@ class DbiMysqli implements DbiExtension } $fields = $result->fetch_fields(); - if (! is_array($fields)) { - return null; - } foreach ($fields as $k => $field) { $fields[$k] = new FieldMetadata($field->type, $field->flags, $field);