Format file size in validation message according to binaryFormat option

jfredon · jfredon · commit 45e5084b1515 · 2018-07-29T20:05:51.000+02:00
diff --git a/src/Symfony/Component/Validator/Constraints/FileValidator.php b/src/Symfony/Component/Validator/Constraints/FileValidator.php
@@ -58,7 +58,7 @@ public function validate($value, Constraint $constraint)
                         $binaryFormat = $constraint->binaryFormat;
                     } else {
                         $limitInBytes = $iniLimitSize;
-                        $binaryFormat = true;
+                        $binaryFormat = null === $constraint->binaryFormat ? true : $constraint->binaryFormat;
                     }
 
                     list($sizeAsString, $limitAsString, $suffix) = $this->factorizeSizes(0, $limitInBytes, $binaryFormat);
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
@@ -455,11 +455,17 @@ public function uploadedFileErrorProvider()
                 '{{ suffix }}' => 'bytes',
             ), '1');
 
+            // access FileValidator::factorizeSizes() private method to format max file size
+            $reflection = new \ReflectionClass(get_class(new FileValidator()));
+            $method = $reflection->getMethod('factorizeSizes');
+            $method->setAccessible(true);
+            list($sizeAsString, $limit, $suffix) = $method->invokeArgs(new FileValidator(), array(0, UploadedFile::getMaxFilesize(), false));
+
             // it correctly parses the maxSize option and not only uses simple string comparison
             // 1000M should be bigger than the ini value
             $tests[] = array(UPLOAD_ERR_INI_SIZE, 'uploadIniSizeErrorMessage', array(
-                '{{ limit }}' => UploadedFile::getMaxFilesize() / 1048576,
-                '{{ suffix }}' => 'MiB',
+                '{{ limit }}' => $limit,
+                '{{ suffix }}' => $suffix,
             ), '1000M');
 
             // it correctly parses the maxSize option and not only uses simple string comparison

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function validate($value, Constraint $constraint)`
`58`	`58`	`$binaryFormat = $constraint->binaryFormat;`
`59`	`59`	`} else {`
`60`	`60`	`$limitInBytes = $iniLimitSize;`
`61`		`- $binaryFormat = true;`
	`61`	`+ $binaryFormat = null === $constraint->binaryFormat ? true : $constraint->binaryFormat;`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`list($sizeAsString, $limitAsString, $suffix) = $this->factorizeSizes(0, $limitInBytes, $binaryFormat);`