Merge branch 'QA_5_0'

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Feb 14, 2020 · 8f0d7d3 · 8f0d7d3
2 parents 573f3d5 + efcd4be
commit 8f0d7d3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -61,6 +61,7 @@ phpMyAdmin - ChangeLog
 - issue #15795 Fix broken link on "MySQL said" error message
 - issue #15781 Fix illegal string offset error on structure page of 'information_schema' database
 - issue #15745 Fix version 5.0.1 suggests 4.9.4 as latest stable version
+- issue #15958 Fix uncaught TypeError when sorting database tables by size or by rows
 
 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/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php
@@ -715,14 +715,14 @@ function ($a, $b) {
                     if ($sort_by == 'Data_length') {
                         foreach ($each_tables as $table_name => $table_data) {
                             ${$sort_by}[$table_name] = strtolower(
-                                $table_data['Data_length']
-                                + $table_data['Index_length']
+                                (string) ($table_data['Data_length']
+                                + $table_data['Index_length'])
                             );
                         }
                     } else {
                         foreach ($each_tables as $table_name => $table_data) {
                             ${$sort_by}[$table_name]
-                                = strtolower($table_data[$sort_by]);
+                                = strtolower($table_data[$sort_by] ?? '');
                         }
                     }
 

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -727,11 +727,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Database/Qbe.php
 
-		-
-			message: "#^Parameter \\#1 \\$str of function strtolower expects string, \\(array\\|float\\|int\\) given\\.$#"
-			count: 1
-			path: libraries/classes/DatabaseInterface.php
-
 		-
 			message: "#^Parameter \\#2 \\$table of method PhpMyAdmin\\\\DatabaseInterface\\:\\:_cacheTableData\\(\\) expects bool\\|string, array\\|string given\\.$#"
 			count: 1