Merge branch '2.2' into 2.3
* 2.2: fixed typo in CS translation (closes #8069) fix arab translation [Finder] Fixed a path in a test. [Form] [Validator] Fixed post_max_size = 0 bug (Issue #8065)
This commit is contained in:
commit
7fb9c25f8c
@ -808,7 +808,7 @@ class FinderTest extends Iterator\RealIteratorTestCase
|
|||||||
{
|
{
|
||||||
$locations = array(
|
$locations = array(
|
||||||
__DIR__.'/Fixtures/one',
|
__DIR__.'/Fixtures/one',
|
||||||
self::$files[8],
|
self::$tmpDir.DIRECTORY_SEPARATOR.'toto',
|
||||||
);
|
);
|
||||||
|
|
||||||
$finder = new Finder();
|
$finder = new Finder();
|
||||||
|
@ -121,7 +121,7 @@ class FormValidator extends ConstraintValidator
|
|||||||
if ($form->isRoot() && null !== $length) {
|
if ($form->isRoot() && null !== $length) {
|
||||||
$max = $this->serverParams->getPostMaxSize();
|
$max = $this->serverParams->getPostMaxSize();
|
||||||
|
|
||||||
if (null !== $max && $length > $max) {
|
if (!empty($max) && $length > $max) {
|
||||||
$this->context->addViolation(
|
$this->context->addViolation(
|
||||||
$config->getOption('post_max_size_message'),
|
$config->getOption('post_max_size_message'),
|
||||||
array('{{ max }}' => $this->serverParams->getNormalizedIniPostMaxSize()),
|
array('{{ max }}' => $this->serverParams->getNormalizedIniPostMaxSize()),
|
||||||
|
@ -660,6 +660,7 @@ class FormValidatorTest extends \PHPUnit_Framework_TestCase
|
|||||||
array(1024, '1K', 0),
|
array(1024, '1K', 0),
|
||||||
array(null, '1K', 0),
|
array(null, '1K', 0),
|
||||||
array(1024, '', 0),
|
array(1024, '', 0),
|
||||||
|
array(1024, 0, 0),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
<body>
|
<body>
|
||||||
<trans-unit id="1">
|
<trans-unit id="1">
|
||||||
<source>This value should be false.</source>
|
<source>This value should be false.</source>
|
||||||
<target>هذه القيمة يجب أن تكون كاذبة.</target>
|
<target>هذه القيمة يجب أن تكون خاطئة.</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="2">
|
<trans-unit id="2">
|
||||||
<source>This value should be true.</source>
|
<source>This value should be true.</source>
|
||||||
|
Reference in New Issue
Block a user