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

merged branch jfsimon/issue-7480 (PR #7481)

Browse Source 
This PR was merged into the master branch.

Discussion
----------

[Form] fixes ServerParams::getPostMaxSize() regex pattern

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

Commits
-------

84541e7 [Form] fixed ServerParams::getPostMaxSize() regex pattern
This commit is contained in:
Fabien Potencier 2013-03-26 15:52:43 +01:00
commit bbb516f657
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,9 +29,9 @@ class ServerParams
return null;
}
if (preg_match('#^\+?(0x?)?([^kmg]*)([KMG]?)#', $iniMax, $match)) {
if (preg_match('#^\+?(0X?)?([^KMG]*)([KMG]?)#', $iniMax, $match)) {
$shifts = array('' => 0, 'K' => 10, 'M' => 20, 'G' => 30);
$bases = array('' => 10, '0' => 8, '0x' => 16);
$bases = array('' => 10, '0' => 8, '0X' => 16);
return (intval($match[2], $bases[$match[1]]) * (1 << $shifts[$match[3]]));
}

42
src/Symfony/Component/Form/Tests/Extension/Validator/Util/ServerParamsTest.php Normal file
View File

@ -0,0 +1,42 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Component\Form\Tests\Extension\Validator\Util;
class ServerParamsTest extends \PHPUnit_Framework_TestCase
{
/** @dataProvider getGetPostMaxSizeTestData */
public function testGetPostMaxSize($size, $bytes)
{
$serverParams = $this->getMock('Symfony\Component\Form\Extension\Validator\Util\ServerParams', array('getNormalizedIniPostMaxSize'));
$serverParams
->expects($this->any())
->method('getNormalizedIniPostMaxSize')
->will($this->returnValue(strtoupper($size)));
$this->assertEquals($bytes, $serverParams->getPostMaxSize());
}
public function getGetPostMaxSizeTestData()
{
return array(
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),
);
}
}