tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix: Make File::ini2bytes() compliant with binary prefixes (fixes #7145)

This commit is contained in:
Loz Calver 2017-07-10 09:41:36 +01:00
parent 5f17c7fb58
commit 960a0f8343
No known key found for this signature in database
GPG Key ID: F91FFC2D7E0CAEDB
2 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
filesystem/File.php
View File

@ -887,24 +887,21 @@ class File extends DataObject {
* @return int
*/
public static function ini2bytes($iniValue) {
$iniValues = str_split(trim($iniValue));
$unit = strtolower(array_pop($iniValues));
$quantity = (int) implode($iniValues);
switch ($unit) {
case 'g':
$quantity *= 1024;
// deliberate no break
case 'm':
$quantity *= 1024;
// deliberate no break
case 'k':
$quantity *= 1024;
// deliberate no break
default:
// no-op: pre-existing behaviour
break;
// Remove non-unit characters from the size
$unit = preg_replace('/[^bkmgtpezy]/i', '', $iniValue);
// Remove non-numeric characters from the size
$size = preg_replace('/[^0-9\.]/', '', $iniValue);
if ($unit) {
// Find the position of the unit in the ordered string which is the power
// of magnitude to multiply a kilobyte by
$size = round($size * pow(1024, stripos('bkmgtpezy', $unit[0])));
} else {
$size = round($size);
}
return $quantity;
// Cast to int - round() returns a float
return (int)$size;
}
/**

27
tests/filesystem/FileTest.php
View File

@ -413,6 +413,33 @@ class FileTest extends SapphireTest {
$this->assertTrue($file->canEdit(), "Admins can edit files");
}
/**
* Test that ini2bytes returns the number of bytes for a PHP ini style size declaration
*
* @param string $iniValue
* @param int $expected
* @dataProvider ini2BytesProvider
*/
public function testIni2Bytes($iniValue, $expected) {
$this->assertSame($expected, File::ini2bytes($iniValue));
}
/**
* @return array
*/
public function ini2BytesProvider() {
return array(
array('2048', 2 * 1024),
array('2k', 2 * 1024),
array('512M', 512 * 1024 * 1024),
array('512MiB', 512 * 1024 * 1024),
array('512 mbytes', 512 * 1024 * 1024),
array('512 megabytes', 512 * 1024 * 1024),
array('1024g', 1024 * 1024 * 1024 * 1024),
array('1024G', 1024 * 1024 * 1024 * 1024)
);
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
public function setUp() {