Merge branch 'QA_5_0'

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Feb 11, 2020 · 55fcbe1 · 55fcbe1
2 parents 0032dff + 48926bc
commit 55fcbe1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 22 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -56,6 +56,7 @@ phpMyAdmin - ChangeLog
 - issue #15926 Fixed PhpMyAdmin\Core::getRealSize('8000M') returns a float instead of an int
 - issue #15410 Fixed auto increment reset issue where the last value of AI was saved an could destroy the "good" value
 - issue #15187 Fixed editing a row and using 'insert as new row' uses primary key 0 instead of NULL
+- issue #15877 Fixed php error "preg_match() expects parameter 2 to be string, null given" on some specific tables
 
 5.0.1 (2020-01-07)
 - issue #15719 Fixed error 500 when browsing a table when $cfg['LimitChars'] used a string and not an int value

diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php
@@ -1816,7 +1816,7 @@ private function _getSingleAndMultiSortUrls(
                 );
             $sort_direction[$special_index] = preg_match(
                 '@time|date@i',
-                $fields_meta->type
+                $fields_meta->type ?? ''
             ) ? self::DESCENDING_SORT_DIR : self::ASCENDING_SORT_DIR;
         }
 
@@ -5070,13 +5070,14 @@ private function _handleNonPrintableContents(
         $is_truncated = false;
         $result = '[' . $category;
 
-        if (isset($content)) {
+        if ($content !== null) {
             $size = strlen($content);
             $display_size = Util::formatByteDown($size, 3, 1);
             $result .= ' - ' . $display_size[0] . ' ' . $display_size[1];
         } else {
             $result .= ' - NULL';
             $size = 0;
+            $content = '';
         }
 
         $result .= ']';

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -912,31 +912,11 @@ parameters:
 			count: 1
 			path: libraries/classes/Display/Results.php
 
-		-
-			message: "#^Parameter \\#1 \\$data of function bin2hex expects string, string\\|null given\\.$#"
-			count: 2
-			path: libraries/classes/Display/Results.php
-
 		-
 			message: "#^Trying to invoke string but it might not be a callable\\.$#"
 			count: 5
 			path: libraries/classes/Display/Results.php
 
-		-
-			message: "#^Parameter \\#1 \\$var of function mb_check_encoding expects string, string\\|null given\\.$#"
-			count: 1
-			path: libraries/classes/Display/Results.php
-
-		-
-			message: "#^Parameter \\#2 \\$subject of function preg_match expects string, string\\|null given\\.$#"
-			count: 1
-			path: libraries/classes/Display/Results.php
-
-		-
-			message: "#^Parameter \\#1 \\$string of function htmlspecialchars expects string, string\\|null given\\.$#"
-			count: 1
-			path: libraries/classes/Display/Results.php
-
 		-
 			message: "#^Parameter \\#1 \\$string of function htmlspecialchars expects string, string\\|false given\\.$#"
 			count: 1