improved bytes conversion method

jfsimon · jfsimon · commit 21291cabe733 · 2013-03-23T19:46:38.000+01:00
diff --git a/src/Symfony/Component/Form/Extension/Validator/Util/ServerParams.php b/src/Symfony/Component/Form/Extension/Validator/Util/ServerParams.php
@@ -29,12 +29,14 @@ public function getPostMaxSize()
             return null;
         }
 
-        if (preg_match('#^(\d+)([bkmgt])#i', $iniMax, $match)) {
-            $shift = array('b' => 0, 'k' => 10, 'm' => 20, 'g' => 30, 't' => 40);
-            $iniMax = ($match[1] * (1 << $shift[strtolower($match[2])]));
+        if (preg_match('#^\+?(0x?)?([^kmg]*)([KMG]?)#', $iniMax, $match)) {
+            $shifts = array('' => 0, 'K' => 10, 'M' => 20, 'G' => 30);
+            $bases = array('' => 10, '0' => 8, '0x' => 16);
+
+            return (intval($match[2], $bases[$match[1]]) * (1 << $shifts[$match[3]]));
         }
 
-        return (int) $iniMax;
+        return 0;
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
@@ -229,17 +229,19 @@ public function move($directory, $name = null)
      */
     public static function getMaxFilesize()
     {
-        $max = trim(ini_get('upload_max_filesize'));
+        $max = strtolower(ini_get('upload_max_filesize'));
 
         if ('' === $max) {
             return PHP_INT_MAX;
         }
 
-        if (preg_match('#^(\d+)([bkmgt])#i', $max, $match)) {
-            $shift = array('b' => 0, 'k' => 10, 'm' => 20, 'g' => 30, 't' => 40);
-            $max = ($match[1] * (1 << $shift[strtolower($match[2])]));
+        if (preg_match('#^\+?(0x?)?([^kmg]*)([kmg]?)#', $max, $match)) {
+            $shifts = array('' => 0, 'k' => 10, 'm' => 20, 'g' => 30);
+            $bases = array('' => 10, '0' => 8, '0x' => 16);
+
+            return (intval($match[2], $bases[$match[1]]) * (1 << $shifts[$match[3]]));
         }
 
-        return (integer) $max;
+        return 0;
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
@@ -25,7 +25,7 @@ public function __construct()
     {
         $this->data = array(
             'memory'       => 0,
-            'memory_limit' => $this->convertToBytes(ini_get('memory_limit')),
+            'memory_limit' => $this->convertToBytes(strtolower(ini_get('memory_limit'))),
         );
     }
 
@@ -75,11 +75,17 @@ public function getName()
 
     private function convertToBytes($memoryLimit)
     {
-        if (preg_match('#^(\d+)([bkmgt])#i', $memoryLimit, $match)) {
-            $shift = array('b' => 0, 'k' => 10, 'm' => 20, 'g' => 30, 't' => 40);
-            $memoryLimit = ($match[1] * (1 << $shift[strtolower($match[2])]));
+        if ('-1' === $memoryLimit) {
+            return -1;
         }
 
-        return (int) $memoryLimit;
+        if (preg_match('#^\+?(0x?)?([^kmg]*)([kmg]?)#', $memoryLimit, $match)) {
+            $shifts = array('' => 0, 'k' => 10, 'm' => 20, 'g' => 30);
+            $bases = array('' => 10, '0' => 8, '0x' => 16);
+
+            return (intval($match[2], $bases[$match[1]]) * (1 << $shifts[$match[3]]));
+        }
+
+        return 0;
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/MemoryDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/MemoryDataCollectorTest.php
@@ -46,9 +46,14 @@ public function testBytesConversion($limit, $bytes)
     public function getBytesConversionTestData()
     {
         return array(
-            array('-1', -1),
             array('2k', 2048),
-            array('2K', 2048),
+            array('2 k', 2048),
+            array('+2 k', 2048),
+            array('+2???k', 2048),
+            array('0x10', 16),
+            array('0xf', 15),
+            array('010', 8),
+            array('+0x10 k', 16 * 1024),
             array('1g', 1024 * 1024 * 1024),
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,14 @@ public function getPostMaxSize()`
`29`	`29`	`return null;`
`30`	`30`	`}`
`31`	`31`
`32`		`- if (preg_match('#^(\d+)([bkmgt])#i', $iniMax, $match)) {`
`33`		`- $shift = array('b' => 0, 'k' => 10, 'm' => 20, 'g' => 30, 't' => 40);`
`34`		`- $iniMax = ($match[1] * (1 << $shift[strtolower($match[2])]));`
	`32`	`+ if (preg_match('#^\+?(0x?)?([^kmg]*)([KMG]?)#', $iniMax, $match)) {`
	`33`	`+ $shifts = array('' => 0, 'K' => 10, 'M' => 20, 'G' => 30);`
	`34`	`+ $bases = array('' => 10, '0' => 8, '0x' => 16);`
	`35`	`+`
	`36`	`+ return (intval($match[2], $bases[$match[1]]) * (1 << $shifts[$match[3]]));`
`35`	`37`	`}`
`36`	`38`
`37`		`- return (int) $iniMax;`
	`39`	`+ return 0;`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -229,17 +229,19 @@ public function move($directory, $name = null)`
`229`	`229`	`*/`
`230`	`230`	`public static function getMaxFilesize()`
`231`	`231`	`{`
`232`		`- $max = trim(ini_get('upload_max_filesize'));`
	`232`	`+ $max = strtolower(ini_get('upload_max_filesize'));`
`233`	`233`
`234`	`234`	`if ('' === $max) {`
`235`	`235`	`return PHP_INT_MAX;`
`236`	`236`	`}`
`237`	`237`
`238`		`- if (preg_match('#^(\d+)([bkmgt])#i', $max, $match)) {`
`239`		`- $shift = array('b' => 0, 'k' => 10, 'm' => 20, 'g' => 30, 't' => 40);`
`240`		`- $max = ($match[1] * (1 << $shift[strtolower($match[2])]));`
	`238`	`+ if (preg_match('#^\+?(0x?)?([^kmg]*)([kmg]?)#', $max, $match)) {`
	`239`	`+ $shifts = array('' => 0, 'k' => 10, 'm' => 20, 'g' => 30);`
	`240`	`+ $bases = array('' => 10, '0' => 8, '0x' => 16);`
	`241`	`+`
	`242`	`+ return (intval($match[2], $bases[$match[1]]) * (1 << $shifts[$match[3]]));`
`241`	`243`	`}`
`242`	`244`
`243`		`- return (integer) $max;`
	`245`	`+ return 0;`
`244`	`246`	`}`
`245`	`247`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public function __construct()`
`25`	`25`	`{`
`26`	`26`	`$this->data = array(`
`27`	`27`	`'memory' => 0,`
`28`		`- 'memory_limit' => $this->convertToBytes(ini_get('memory_limit')),`
	`28`	`+ 'memory_limit' => $this->convertToBytes(strtolower(ini_get('memory_limit'))),`
`29`	`29`	`);`
`30`	`30`	`}`
`31`	`31`
`@@ -75,11 +75,17 @@ public function getName()`
`75`	`75`
`76`	`76`	`private function convertToBytes($memoryLimit)`
`77`	`77`	`{`
`78`		`- if (preg_match('#^(\d+)([bkmgt])#i', $memoryLimit, $match)) {`
`79`		`- $shift = array('b' => 0, 'k' => 10, 'm' => 20, 'g' => 30, 't' => 40);`
`80`		`- $memoryLimit = ($match[1] * (1 << $shift[strtolower($match[2])]));`
	`78`	`+ if ('-1' === $memoryLimit) {`
	`79`	`+ return -1;`
`81`	`80`	`}`
`82`	`81`
`83`		`- return (int) $memoryLimit;`
	`82`	`+ if (preg_match('#^\+?(0x?)?([^kmg]*)([kmg]?)#', $memoryLimit, $match)) {`
	`83`	`+ $shifts = array('' => 0, 'k' => 10, 'm' => 20, 'g' => 30);`
	`84`	`+ $bases = array('' => 10, '0' => 8, '0x' => 16);`
	`85`	`+`
	`86`	`+ return (intval($match[2], $bases[$match[1]]) * (1 << $shifts[$match[3]]));`
	`87`	`+ }`
	`88`	`+`
	`89`	`+ return 0;`
`84`	`90`	`}`
`85`	`91`	`}`