@@ -46,8 +46,10 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable
4646 return [];
4747 }
4848
49- $ path = $ attributes [0 ]?->path
50- ?? $ argument ->getName ();
49+ /** @var UploadedFile|null $attribute */
50+ $ attribute = $ attributes [0 ];
51+
52+ $ path = $ attribute ?->path ?? $ argument ->getName ();
5153
5254 return [
5355 $ this ->extractor ()->extractFilesFromRequest (
@@ -58,7 +60,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable
5860 PendingFile::class,
5961 true
6062 ),
61- $ attributes [ 0 ] ?->image || PendingImage::class === $ argument ->getType ()
63+ $ attribute ?->image || PendingImage::class === $ argument ->getType ()
6264 ),
6365 ];
6466 }
@@ -90,14 +92,21 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable
9092 $ attributes = $ argument ->getAttributes (UploadedFile::class);
9193 \assert (!empty ($ attributes ));
9294
93- $ path = $ attributes [0 ]?->path
94- ?? $ argument ->getName ();
95+ /** @var UploadedFile|null $attribute */
96+ $ attribute = $ attributes [0 ];
97+
98+ $ path = $ attribute ?->path ?? $ argument ->getName ();
9599
96100 return [
97101 $ this ->extractor ()->extractFilesFromRequest (
98102 $ request ,
99103 $ path ,
100- $ argument ->getType ()
104+ !is_a (
105+ $ argument ->getType () ?? PendingFile::class,
106+ PendingFile::class,
107+ true
108+ ),
109+ $ attribute ?->image || PendingImage::class === $ argument ->getType ()
101110 ),
102111 ];
103112 }
0 commit comments