review fixes

melya · melya · commit 93d41904910e · 2024-09-24T16:22:03.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
@@ -171,10 +171,10 @@ public function onKernelControllerArguments(ControllerArgumentsEvent $event): vo
             }
 
             if ($argument->metadata->isVariadic()) {
-                if (!(is_array($payload) && array_is_list($payload))) {
-                    throw HttpException::fromStatusCode(422);
+                if (!\is_array($payload) || !\array_is_list($payload)) {
+                    throw HttpException::fromStatusCode($validationFailedCode);
                 }
-                array_splice($arguments, $i, count($payload), $payload);
+                \array_splice($arguments, $i, \count($payload), $payload);
             } else {
                 $arguments[$i] = $payload;
             }
@@ -241,7 +241,7 @@ private function mapRequestPayload(Request $request, ArgumentMetadata $argument,
     private function mapUploadedFile(Request $request, ArgumentMetadata $argument, MapUploadedFile $attribute): UploadedFile|array|null
     {
         $default = null;
-        if ($argument->isVariadic() || "array" === $argument->getType()) {
+        if ($argument->isVariadic() || 'array' === $argument->getType()) {
             $default = [];
         }
 
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/UploadedFileValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/UploadedFileValueResolverTest.php
@@ -68,7 +68,7 @@ public function testEmpty(RequestPayloadValueResolver $resolver, Request $reques
         $attribute = new MapUploadedFile();
         $argument = new ArgumentMetadata(
             'qux',
-            "array",
+            'array',
             false,
             false,
             null,

Original file line number	Diff line number	Diff line change
`@@ -171,10 +171,10 @@ public function onKernelControllerArguments(ControllerArgumentsEvent $event): vo`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`if ($argument->metadata->isVariadic()) {`
`174`		`- if (!(is_array($payload) && array_is_list($payload))) {`
`175`		`- throw HttpException::fromStatusCode(422);`
	`174`	`+ if (!\is_array($payload) \|\| !\array_is_list($payload)) {`
	`175`	`+ throw HttpException::fromStatusCode($validationFailedCode);`
`176`	`176`	`}`
`177`		`- array_splice($arguments, $i, count($payload), $payload);`
	`177`	`+ \array_splice($arguments, $i, \count($payload), $payload);`
`178`	`178`	`} else {`
`179`	`179`	`$arguments[$i] = $payload;`
`180`	`180`	`}`
`@@ -241,7 +241,7 @@ private function mapRequestPayload(Request $request, ArgumentMetadata $argument,`
`241`	`241`	`private function mapUploadedFile(Request $request, ArgumentMetadata $argument, MapUploadedFile $attribute): UploadedFile\|array\|null`
`242`	`242`	`{`
`243`	`243`	`$default = null;`
`244`		`- if ($argument->isVariadic() \|\| "array" === $argument->getType()) {`
	`244`	`+ if ($argument->isVariadic() \|\| 'array' === $argument->getType()) {`
`245`	`245`	`$default = [];`
`246`	`246`	`}`
`247`	`247`