[HttpFoundation] Drop int return type from parseFilesize()

LukeTowers · nicolas-grekas · commit a1b31f840c9b · 2021-01-19T18:19:22.000+01:00
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -26,6 +26,8 @@ install:
     - echo memory_limit=-1 >> php.ini-min
     - echo serialize_precision=14 >> php.ini-min
     - echo max_execution_time=1200 >> php.ini-min
+    - echo post_max_size=4G >> php.ini-min
+    - echo upload_max_filesize=4G >> php.ini-min
     - echo date.timezone="America/Los_Angeles" >> php.ini-min
     - echo extension_dir=ext >> php.ini-min
     - echo extension=php_xsl.dll >> php.ini-min
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
@@ -178,8 +178,10 @@ private function getFileUploadError(int $errorCode)
      * Returns the maximum size of an uploaded file as configured in php.ini.
      *
      * This method should be kept in sync with Symfony\Component\HttpFoundation\File\UploadedFile::getMaxFilesize().
+     *
+     * @return int|float The maximum size of an uploaded file in bytes (returns float if size > PHP_INT_MAX)
      */
-    private static function getMaxFilesize(): int
+    private static function getMaxFilesize()
     {
         $iniMax = strtolower(ini_get('upload_max_filesize'));
 
@@ -214,8 +216,10 @@ private static function getMaxFilesize(): int
      * (i.e. try "MB", then "kB", then "bytes").
      *
      * This method should be kept in sync with Symfony\Component\Validator\Constraints\FileValidator::factorizeSizes().
+     *
+     * @param int|float $limit
      */
-    private function factorizeSizes(int $size, int $limit)
+    private function factorizeSizes(int $size, $limit)
     {
         $coef = self::MIB_BYTES;
         $coefFactor = self::KIB_BYTES;
diff --git a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
@@ -239,7 +239,7 @@ public function move($directory, $name = null)
     /**
      * Returns the maximum size of an uploaded file as configured in php.ini.
      *
-     * @return int The maximum size of an uploaded file in bytes
+     * @return int|float The maximum size of an uploaded file in bytes (returns float if size > PHP_INT_MAX)
      */
     public static function getMaxFilesize()
     {
@@ -251,8 +251,10 @@ public static function getMaxFilesize()
 
     /**
      * Returns the given size from an ini value in bytes.
+     *
+     * @return int|float Returns float if size > PHP_INT_MAX
      */
-    private static function parseFilesize($size): int
+    private static function parseFilesize($size)
     {
         if ('' === $size) {
             return 0;
diff --git a/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php b/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php
@@ -15,6 +15,7 @@
 use Symfony\Component\HttpFoundation\File\Exception\CannotWriteFileException;
 use Symfony\Component\HttpFoundation\File\Exception\ExtensionFileException;
 use Symfony\Component\HttpFoundation\File\Exception\FileException;
+use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
 use Symfony\Component\HttpFoundation\File\Exception\FormSizeFileException;
 use Symfony\Component\HttpFoundation\File\Exception\IniSizeFileException;
 use Symfony\Component\HttpFoundation\File\Exception\NoFileException;
@@ -33,7 +34,7 @@ protected function setUp(): void
 
     public function testConstructWhenFileNotExists()
     {
-        $this->expectException(\Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException::class);
+        $this->expectException(FileNotFoundException::class);
 
         new UploadedFile(
             __DIR__.'/Fixtures/not_here',
@@ -358,13 +359,16 @@ public function testGetMaxFilesize()
     {
         $size = UploadedFile::getMaxFilesize();
 
-        $this->assertIsInt($size);
+        if ($size > \PHP_INT_MAX) {
+            $this->assertIsFloat($size);
+        } else {
+            $this->assertIsInt($size);
+        }
+
         $this->assertGreaterThan(0, $size);
 
         if (0 === (int) ini_get('post_max_size') && 0 === (int) ini_get('upload_max_filesize')) {
             $this->assertSame(\PHP_INT_MAX, $size);
-        } else {
-            $this->assertLessThan(\PHP_INT_MAX, $size);
         }
     }
 }
diff --git a/src/Symfony/Component/Validator/Constraints/FileValidator.php b/src/Symfony/Component/Validator/Constraints/FileValidator.php
@@ -214,8 +214,10 @@ private static function moreDecimalsThan(string $double, int $numberOfDecimals):
     /**
      * Convert the limit to the smallest possible number
      * (i.e. try "MB", then "kB", then "bytes").
+     *
+     * @param int|float $limit
      */
-    private function factorizeSizes(int $size, int $limit, bool $binaryFormat): array
+    private function factorizeSizes(int $size, $limit, bool $binaryFormat): array
     {
         if ($binaryFormat) {
             $coef = self::MIB_BYTES;
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
@@ -459,14 +459,12 @@ public function uploadedFileErrorProvider()
             [, $limit, $suffix] = $method->invokeArgs(new FileValidator(), [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
+            // 1000G should be bigger than the ini value
             $tests[] = [(string) \UPLOAD_ERR_INI_SIZE, 'uploadIniSizeErrorMessage', [
                 '{{ limit }}' => $limit,
                 '{{ suffix }}' => $suffix,
-            ], '1000M'];
+            ], '1000G'];
 
-            // it correctly parses the maxSize option and not only uses simple string comparison
-            // 1000M should be bigger than the ini value
             $tests[] = [(string) \UPLOAD_ERR_INI_SIZE, 'uploadIniSizeErrorMessage', [
                 '{{ limit }}' => '0.1',
                 '{{ suffix }}' => 'MB',

Original file line number	Diff line number	Diff line change
`@@ -178,8 +178,10 @@ private function getFileUploadError(int $errorCode)`
`178`	`178`	`* Returns the maximum size of an uploaded file as configured in php.ini.`
`179`	`179`	`*`
`180`	`180`	`* This method should be kept in sync with Symfony\Component\HttpFoundation\File\UploadedFile::getMaxFilesize().`
	`181`	`+ *`
	`182`	`+ * @return int\|float The maximum size of an uploaded file in bytes (returns float if size > PHP_INT_MAX)`
`181`	`183`	`*/`
`182`		`- private static function getMaxFilesize(): int`
	`184`	`+ private static function getMaxFilesize()`
`183`	`185`	`{`
`184`	`186`	`$iniMax = strtolower(ini_get('upload_max_filesize'));`
`185`	`187`
`@@ -214,8 +216,10 @@ private static function getMaxFilesize(): int`
`214`	`216`	`* (i.e. try "MB", then "kB", then "bytes").`
`215`	`217`	`*`
`216`	`218`	`* This method should be kept in sync with Symfony\Component\Validator\Constraints\FileValidator::factorizeSizes().`
	`219`	`+ *`
	`220`	`+ * @param int\|float $limit`
`217`	`221`	`*/`
`218`		`- private function factorizeSizes(int $size, int $limit)`
	`222`	`+ private function factorizeSizes(int $size, $limit)`
`219`	`223`	`{`
`220`	`224`	`$coef = self::MIB_BYTES;`
`221`	`225`	`$coefFactor = self::KIB_BYTES;`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ public function move($directory, $name = null)`
`239`	`239`	`/**`
`240`	`240`	`* Returns the maximum size of an uploaded file as configured in php.ini.`
`241`	`241`	`*`
`242`		`- * @return int The maximum size of an uploaded file in bytes`
	`242`	`+ * @return int\|float The maximum size of an uploaded file in bytes (returns float if size > PHP_INT_MAX)`
`243`	`243`	`*/`
`244`	`244`	`public static function getMaxFilesize()`
`245`	`245`	`{`
`@@ -251,8 +251,10 @@ public static function getMaxFilesize()`
`251`	`251`
`252`	`252`	`/**`
`253`	`253`	`* Returns the given size from an ini value in bytes.`
	`254`	`+ *`
	`255`	`+ * @return int\|float Returns float if size > PHP_INT_MAX`
`254`	`256`	`*/`
`255`		`- private static function parseFilesize($size): int`
	`257`	`+ private static function parseFilesize($size)`
`256`	`258`	`{`
`257`	`259`	`if ('' === $size) {`
`258`	`260`	`return 0;`