Merge branch 'QA_5_2'

williamdes · williamdes · commit db2f6e636d06 · 2022-02-03T14:00:15.000+01:00
Signed-off-by: William Desportes &lt;williamdes@wdes.fr&gt;
diff --git a/ChangeLog b/ChangeLog
@@ -32,6 +32,8 @@ phpMyAdmin - ChangeLog
 
 5.1.3 (not yet released)
 - issue #17308 Fix broken pagination links in the navigation sidebar
+- issue #17331 Fix MariaDB has no support for system variable "disabled_storage_engines"
+- issue #17315 Fix unsupported operand types in Results.php when running "SHOW PROCESSLIST" SQL query
 
 5.1.2 (2022-01-20)
 - issue        Replaced MySQL documentation redirected links
diff --git a/composer.json b/composer.json
@@ -93,7 +93,7 @@
         "php-webdriver/webdriver": "^1.11",
         "phpmyadmin/coding-standard": "^3.0.0",
         "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^1.3",
+        "phpstan/phpstan": "^1.4.5",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-webmozart-assert": "^1.0",
         "phpunit/phpunit": "^8.5 || ^9.5",
@@ -102,7 +102,7 @@
         "roave/security-advisories": "dev-latest",
         "symfony/console": "^5.2.3",
         "tecnickcom/tcpdf": "^6.4.4",
-        "vimeo/psalm": "^4.17"
+        "vimeo/psalm": "^4.19"
     },
     "extra": {
         "branch-alias": {
diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php
@@ -2242,7 +2242,7 @@ private function getTableBody(
             $copyUrl = null;
             $copyString = null;
             $editUrl = null;
-            $editCopyUrlParams = null;
+            $editCopyUrlParams = [];
             $delUrlParams = null;
 
             // 1.2 Defines the URLs for the modify/delete link(s)
@@ -2937,6 +2937,12 @@ private function getRepeatingHeaders(
      * @param string $urlSqlQuery    the analyzed sql query
      *
      * @return array<int,string|array<string, bool|string>>
+     * @phpstan-return array{string, string, string, string,
+     *  array{
+     *    db: string, table: string, where_clause: string,
+     *    clause_is_unique: bool, sql_query: string, goto: string
+     *  }
+     * }
      */
     private function getModifiedLinks(
         $whereClause,
diff --git a/libraries/classes/StorageEngine.php b/libraries/classes/StorageEngine.php
@@ -109,7 +109,7 @@ public static function getStorageEngines()
 
         if ($storage_engines == null) {
             $storage_engines = $dbi->fetchResult('SHOW STORAGE ENGINES', 'Engine');
-            if ($dbi->getVersion() >= 50708) {
+            if (! $dbi->isMariaDB() && $dbi->getVersion() >= 50708) {
                 $disabled = (string) SessionCache::get(
                     'disabled_storage_engines',
                     /** @return mixed|false */
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -2865,16 +2865,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Display/Results.php
 
-		-
-			message: "#^Binary operation \"\\+\" between array\\<string, bool\\|string\\>\\|string\\|null and array\\{default_action\\: 'insert'\\} results in an error\\.$#"
-			count: 3
-			path: libraries/classes/Display/Results.php
-
-		-
-			message: "#^Binary operation \"\\+\" between array\\<string, bool\\|string\\>\\|string\\|null and array\\{default_action\\: 'update'\\} results in an error\\.$#"
-			count: 3
-			path: libraries/classes/Display/Results.php
-
 		-
 			message: "#^Cannot access offset int\\<0, max\\> on mixed\\.$#"
 			count: 2
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -5990,28 +5990,14 @@
       <code>$this-&gt;properties['num_rows'] &gt; 0 ? $this-&gt;properties['num_rows'] - 1 : 0</code>
       <code>$this-&gt;properties['num_rows'] &gt; 0 ? $this-&gt;properties['num_rows'] - 1 : 0</code>
     </PossiblyInvalidArgument>
-    <PossiblyInvalidOperand occurrences="6">
-      <code>$editCopyUrlParams</code>
-      <code>$editCopyUrlParams</code>
-      <code>$editCopyUrlParams</code>
-      <code>$editCopyUrlParams</code>
-      <code>$editCopyUrlParams</code>
-      <code>$editCopyUrlParams</code>
-    </PossiblyInvalidOperand>
     <PossiblyNullArgument occurrences="1">
       <code>$colVisibCurrent</code>
     </PossiblyNullArgument>
     <PossiblyNullArrayAccess occurrences="1">
       <code>$firstStatement-&gt;order[$key]</code>
     </PossiblyNullArrayAccess>
-    <PossiblyNullOperand occurrences="8">
+    <PossiblyNullOperand occurrences="2">
       <code>$dispval</code>
-      <code>$editCopyUrlParams</code>
-      <code>$editCopyUrlParams</code>
-      <code>$editCopyUrlParams</code>
-      <code>$editCopyUrlParams</code>
-      <code>$editCopyUrlParams</code>
-      <code>$editCopyUrlParams</code>
       <code>$this-&gt;getSortedColumnMessage($dtResult, $sortExpressionNoDirection[$i])</code>
     </PossiblyNullOperand>
     <RedundantCast occurrences="3">
