Skip to content
Browse files

improved bytes conversion method

  • Loading branch information...
1 parent 883bf90 commit 21291cabe73344b57c45ade93f461dd30b7cfca3 @jfsimon jfsimon committed Mar 23, 2013
View
10 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;
}
/**
View
12 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;
}
}
View
16 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;
}
}
View
9 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),
);
}

0 comments on commit 21291ca

Please sign in to comment.
Something went wrong with that request. Please try again.