Merge branch '5.4' into 6.0

derrabus · derrabus · commit 68a5e3ed0378 · 2021-08-18T16:23:53.000+02:00
* 5.4:
  Don't produce TypeErrors for non-string CSRF tokens
  [HttpKernel] Fix SplFileInfo mock in HttpKernelBrowserTest
  Update NativeSessionStorage docblock to match defaults
diff --git a/Tests/HttpKernelBrowserTest.php b/Tests/HttpKernelBrowserTest.php
@@ -157,7 +157,7 @@ public function testUploadedFileWhenSizeExceedsUploadMaxFileSize()
         /* should be modified when the getClientSize will be removed */
         $file->expects($this->any())
             ->method('getSize')
-            ->willReturn(\INF)
+            ->willReturn(\PHP_INT_MAX)
         ;
         $file->expects($this->any())
             ->method('getClientSize')

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public function testUploadedFileWhenSizeExceedsUploadMaxFileSize()`
`157`	`157`	`/* should be modified when the getClientSize will be removed */`
`158`	`158`	`$file->expects($this->any())`
`159`	`159`	`->method('getSize')`
`160`		`- ->willReturn(\INF)`
	`160`	`+ ->willReturn(\PHP_INT_MAX)`
`161`	`161`	`;`
`162`	`162`	`$file->expects($this->any())`
`163`	`163`	`->method('getClientSize')`