Merge #15928 - Fix #15926 PhpMyAdmin\Core::getRealSize('8000M') returns a float instead of an int

Pull-request: #15928
Fixes: #15926
Closes: #15932

Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2020-02-10 08:37:35 +01:00
commit b25b3fbc9f
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
2 changed files with 9 additions and 1 deletions

View File

@ -438,7 +438,7 @@ class Core
];
if (preg_match('/^([0-9]+)([KMGT])/i', $size, $matches)) {
return $matches[1] * $binaryprefixes[$matches[2]];
return (int) ($matches[1] * $binaryprefixes[$matches[2]]);
}
return (int) $size;

View File

@ -567,6 +567,14 @@ class CoreTest extends PmaTestCase
'1024',
1024,
],
[
'8000m',
8 * 1000 * 1024 * 1024,
],
[
'8G',
8 * 1024 * 1024 * 1024,
],
];
}