[Validator][Console][HttpFoundation] Use "KiB" everywhere (instead of "kB")

Author: snoob

Constraints/FileValidator.php

@@ -45,9 +45,9 @@ public function validate($value, Constraint $constraint)
                         if (ctype_digit((string) $constraint->maxSize)) {
                             $maxSize = (int) $constraint->maxSize;
                         } elseif (preg_match('/^\d++k$/', $constraint->maxSize)) {
-                            $maxSize = $constraint->maxSize * 1024;
+                            $maxSize = $constraint->maxSize * 1000;
                         } elseif (preg_match('/^\d++M$/', $constraint->maxSize)) {
-                            $maxSize = $constraint->maxSize * 1048576;
+                            $maxSize = $constraint->maxSize * 1000 * 1000;
                         } else {
                             throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum size', $constraint->maxSize));
                         }
@@ -119,9 +119,9 @@ public function validate($value, Constraint $constraint)
             } elseif (preg_match('/^\d++k$/', $constraint->maxSize)) {
                 $size = round(filesize($path) / 1000, 2);
                 $limit = (int) $constraint->maxSize;
-                $suffix = 'kB';
+                $suffix = 'KB';
             } elseif (preg_match('/^\d++M$/', $constraint->maxSize)) {
-                $size = round(filesize($path) / 1000000, 2);
+                $size = round(filesize($path) / (1000 * 1000), 2);
                 $limit = (int) $constraint->maxSize;
                 $suffix = 'MB';
             } else {

Tests/Constraints/FileValidatorTest.php

@@ -116,8 +116,8 @@ public function testTooLargeKiloBytes()
             ->method('addViolation')
             ->with('myMessage', array(
                 '{{ limit }}'   => '1',
-                '{{ size }}'    => '1.4',
-                '{{ suffix }}'  => 'kB',
+                '{{ size }}'    => '1.37',
+                '{{ suffix }}'  => 'KiB',
                 '{{ file }}'    => $this->path,
             ));
 
@@ -137,14 +137,38 @@ public function testTooLargeMegaBytes()
             ->method('addViolation')
             ->with('myMessage', array(
                 '{{ limit }}'   => '1',
-                '{{ size }}'    => '1.4',
-                '{{ suffix }}'  => 'MB',
+                '{{ size }}'    => '1.34',
+                '{{ suffix }}'  => 'MiB',
                 '{{ file }}'    => $this->path,
             ));
 
         $this->validator->validate($this->getFile($this->path), $constraint);
     }
 
+    public function testMaxSizeKiloBytes()
+    {
+        fwrite($this->file, str_repeat('0', 1010));
+
+        $constraint = new File(array(
+            'maxSize' => '1k',
+        ));
+
+        $this->context->expects($this->never())->method('addViolation');
+        $this->validator->validate($this->getFile($this->path), $constraint);
+    }
+
+    public function testMaxSizeMegaBytes()
+    {
+        fwrite($this->file, str_repeat('0', (1024 * 1022)));
+
+        $constraint = new File(array(
+            'maxSize' => '1M',
+        ));
+
+        $this->context->expects($this->never())->method('addViolation');
+        $this->validator->validate($this->getFile($this->path), $constraint);
+    }
+
     /**
      * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
      */