bug #45870 [Validator] Fix File constraint invalid max size exception message (fancyweb)

nicolas-grekas · nicolas-grekas · commit 780efffa939e · 2022-03-28T11:45:36.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Validator] Fix File constraint invalid max size exception message | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | - | Tickets | - | License | MIT | Doc PR | - Commits ------- a9e781f [Validator] Fix File constraint invalid max size exception message
diff --git a/src/Symfony/Component/Validator/Constraints/File.php b/src/Symfony/Component/Validator/Constraints/File.php
@@ -117,7 +117,7 @@ private function normalizeBinaryFormat($maxSize)
             $this->maxSize = $matches[1] * $factors[$unit = strtolower($matches[2])];
             $this->binaryFormat = $this->binaryFormat ?? (2 === \strlen($unit));
         } else {
-            throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum size.', $this->maxSize));
+            throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum size.', $maxSize));
         }
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
@@ -479,5 +479,14 @@ public function uploadedFileErrorProvider()
         return $tests;
     }
 
+    public function testNegativeMaxSize()
+    {
+        $this->expectException(ConstraintDefinitionException::class);
+        $this->expectExceptionMessage('"-1" is not a valid maximum size.');
+
+        $file = new File();
+        $file->maxSize = -1;
+    }
+
     abstract protected function getFile($filename);
 }

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ private function normalizeBinaryFormat($maxSize)`
`117`	`117`	`$this->maxSize = $matches[1] * $factors[$unit = strtolower($matches[2])];`
`118`	`118`	`$this->binaryFormat = $this->binaryFormat ?? (2 === \strlen($unit));`
`119`	`119`	`} else {`
`120`		`- throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum size.', $this->maxSize));`
	`120`	`+ throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum size.', $maxSize));`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -479,5 +479,14 @@ public function uploadedFileErrorProvider()`
`479`	`479`	`return $tests;`
`480`	`480`	`}`
`481`	`481`
	`482`	`+ public function testNegativeMaxSize()`
	`483`	`+ {`
	`484`	`+ $this->expectException(ConstraintDefinitionException::class);`
	`485`	`+ $this->expectExceptionMessage('"-1" is not a valid maximum size.');`
	`486`	`+`
	`487`	`+ $file = new File();`
	`488`	`+ $file->maxSize = -1;`
	`489`	`+ }`
	`490`	`+`
`482`	`491`	`abstract protected function getFile($filename);`
`483`	`492`	`}`