Skip to content

Commit 20df7df

Browse files
driesvintscrynobonetimacdonald
authored
[10.x] Test Symfony v6.4 (#48400)
* Require Symfony 6.4.x-dev * wip Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> * Fix duplication issue * Filter files * wip Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> * Update composer.json * Update composer.json --------- Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> Co-authored-by: Mior Muhammad Zaki <crynobone@gmail.com> Co-authored-by: Tim MacDonald <hello@timacdonald.me>
1 parent 89171a2 commit 20df7df

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/Illuminate/Http/Request.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,9 +477,9 @@ public static function createFrom(self $from, $to = null)
477477
*/
478478
public static function createFromBase(SymfonyRequest $request)
479479
{
480-
$newRequest = (new static)->duplicate(
480+
$newRequest = new static(
481481
$request->query->all(), $request->request->all(), $request->attributes->all(),
482-
$request->cookies->all(), $request->files->all(), $request->server->all()
482+
$request->cookies->all(), (new static)->filterFiles($request->files->all()) ?? [], $request->server->all()
483483
);
484484

485485
$newRequest->headers->replace($request->headers->all());

tests/Foundation/FoundationExceptionsHandlerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,8 @@ function ($argument) use (&$argumentActual) {
283283
$file = m::mock(UploadedFile::class);
284284
$file->shouldReceive('getPathname')->andReturn('photo.jpg');
285285
$file->shouldReceive('getClientOriginalName')->andReturn('photo.jpg');
286-
$file->shouldReceive('getClientMimeType')->andReturn(null);
287-
$file->shouldReceive('getError')->andReturn(null);
286+
$file->shouldReceive('getClientMimeType')->andReturn('application/octet-stream');
287+
$file->shouldReceive('getError')->andReturn(\UPLOAD_ERR_NO_FILE);
288288

289289
$request = Request::create('/', 'POST', $argumentExpected, [], ['photo' => $file]);
290290

0 commit comments

Comments
 (0)