merged branch odi86/check-post-max-size-zero (PR #8149)

fabpot · fabpot · commit 49006b42a99a · 2013-06-02T14:03:10.000+02:00
This PR was merged into the 2.1 branch. Discussion ---------- [Form] [Validator] Fixed post_max_size = 0 bug (issue #8065) | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #8065 | License | MIT | Doc PR | Commits ------- 2038329 [Form] [Validator] Fixed post_max_size = 0 bug (Issue #8065)
diff --git a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
@@ -126,7 +126,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
@@ -520,6 +520,7 @@ public function getPostMaxSizeFixtures()
             array(1024, '1K', 0, null),
             array(null, '1K', 0, null),
             array(1024, '', 0, null),
+            array(1024, 0, 0, null),
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -520,6 +520,7 @@ public function getPostMaxSizeFixtures()`
`520`	`520`	`array(1024, '1K', 0, null),`
`521`	`521`	`array(null, '1K', 0, null),`
`522`	`522`	`array(1024, '', 0, null),`
	`523`	`+ array(1024, 0, 0, null),`
`523`	`524`	`);`
`524`	`525`	`}`
`525`	`526`