Merge branch '2.2' into 2.3

* 2.2: fixed typo in CS translation (closes symfony#8069) fix arab translation [Finder] Fixed a path in a test. [Form] [Validator] Fixed post_max_size = 0 bug (Issue symfony#8065)
kepten · Jun 2, 2013 · 7fb9c25 · 7fb9c25
2 parents b9dadbb + afe1872
commit 7fb9c25
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php
@@ -808,7 +808,7 @@ public function testMultipleLocationsWithSubDirectories()
     {
         $locations = array(
             __DIR__.'/Fixtures/one',
-            self::$files[8],
+            self::$tmpDir.DIRECTORY_SEPARATOR.'toto',
         );
 
         $finder = new Finder();

diff --git a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
@@ -121,7 +121,7 @@ public function validate($form, Constraint $constraint)
         if ($form->isRoot() && null !== $length) {
             $max = $this->serverParams->getPostMaxSize();
 
-            if (null !== $max && $length > $max) {
+            if (!empty($max) && $length > $max) {
                 $this->context->addViolation(
                     $config->getOption('post_max_size_message'),
                     array('{{ max }}' => $this->serverParams->getNormalizedIniPostMaxSize()),

diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
@@ -660,6 +660,7 @@ public function getPostMaxSizeFixtures()
             array(1024, '1K', 0),
             array(null, '1K', 0),
             array(1024, '', 0),
+            array(1024, 0, 0),
         );
     }
 

diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.ar.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.ar.xlf
@@ -4,7 +4,7 @@
         <body>
             <trans-unit id="1">
                 <source>This value should be false.</source>
-                <target>هذه القيمة يجب أن تكون كاذبة.</target>
+                <target>هذه القيمة يجب أن تكون خاطئة.</target>
             </trans-unit>
             <trans-unit id="2">
                 <source>This value should be true.</source>

diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.cs.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.cs.xlf
@@ -180,7 +180,7 @@
             </trans-unit>
             <trans-unit id="48">
                 <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Tato hodnota musí mít přesně {{ limit }} znak.|Tato hodnota musí mít přesně {{ limit }} znaky.|Tato hodnota musí mít přesně {{limit}} znaků.</target>
+                <target>Tato hodnota musí mít přesně {{ limit }} znak.|Tato hodnota musí mít přesně {{ limit }} znaky.|Tato hodnota musí mít přesně {{ limit }} znaků.</target>
             </trans-unit>
             <trans-unit id="49">
                 <source>The file was only partially uploaded.</source>