diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch jfsimon/issue-7413 (PR #7456)

Browse Source 
This PR was merged into the master branch.

Discussion
----------

Improve bytes conversion method

This PR improves bytes conversion `regex` method introduced in #7413 (thanks to @vicb's comments).

* Adds support of `+` prefix.
* Adds support of blank chars between `+`, number and unit.
* Adds support of octal/hexa bases.

Notice that this can not be unit tested for `ServerParams` and `UploadedFile` classes because `ini_set()` function does not work with `post_max_size` and `upload_max_filesize` settings.

For information, this convertion is located in 3 classes:
* `Symfony\Component\Form\Extension\Validator\Util\ServerParams`
* `Symfony\Component\HttpFoundation\File\UploadedFile`
* `Symfony\Component\HttpKernel\DataCollector\MemoryDataCollector`

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7413

Commits
-------

21291ca improved bytes conversion method
This commit is contained in:
Fabien Potencier 2013-03-25 21:28:18 +01:00
commit e8b7f0fd34
4 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Symfony/Component/Form/Extension/Validator/Util/ServerParams.php
View File

@ -29,12 +29,14 @@ class ServerParams
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;
}
/**

12
src/Symfony/Component/HttpFoundation/File/UploadedFile.php
View File

@ -231,17 +231,19 @@ class UploadedFile extends File
*/
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;
}
}

16
src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
View File

@ -25,7 +25,7 @@ class MemoryDataCollector extends DataCollector
{
$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 @@ class MemoryDataCollector extends DataCollector
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;
}
}

9
src/Symfony/Component/HttpKernel/Tests/DataCollector/MemoryDataCollectorTest.php
View File

@ -46,9 +46,14 @@ class MemoryDataCollectorTest extends \PHPUnit_Framework_TestCase
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),
);
}