bug #33157 Fix getMaxFilesize() returning zero (ausi)

fabpot · fabpot · commit b382e622cf5f · 2019-08-14T09:48:19.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- Fix getMaxFilesize() returning zero | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #32790 | License | MIT With #32790 a BC break got introduced. Previously an empty `upload_max_filesize` returned `PHP_INT_MAX` but after the changes from #32790 it returns `0`. Setting `upload_max_filesize` or `post_max_size` to `0` or `''` disables the limit so for both cases `PHP_INT_MAX` should be returned. Commits ------- f4c2ea5 Fix getMaxFilesize() returning zero
diff --git a/src/Symfony/Component/HttpFoundation/File/UploadedFile.php b/src/Symfony/Component/HttpFoundation/File/UploadedFile.php
@@ -217,7 +217,7 @@ public static function getMaxFilesize()
         $sizePostMax = self::parseFilesize(ini_get('post_max_size'));
         $sizeUploadMax = self::parseFilesize(ini_get('upload_max_filesize'));
 
-        return min([$sizePostMax, $sizeUploadMax]);
+        return min($sizePostMax ?: PHP_INT_MAX, $sizeUploadMax ?: PHP_INT_MAX);
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php b/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php
@@ -281,4 +281,18 @@ public function testIsInvalidIfNotHttpUpload()
 
         $this->assertFalse($file->isValid());
     }
+
+    public function testGetMaxFilesize()
+    {
+        $size = UploadedFile::getMaxFilesize();
+
+        $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);
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ public static function getMaxFilesize()`
`217`	`217`	`$sizePostMax = self::parseFilesize(ini_get('post_max_size'));`
`218`	`218`	`$sizeUploadMax = self::parseFilesize(ini_get('upload_max_filesize'));`
`219`	`219`
`220`		`- return min([$sizePostMax, $sizeUploadMax]);`
	`220`	`+ return min($sizePostMax ?: PHP_INT_MAX, $sizeUploadMax ?: PHP_INT_MAX);`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`/**`