diff --git a/src/FileUploadNormalizer.php b/src/FileUploadNormalizer.php index 9579ef6..66f4fcc 100644 --- a/src/FileUploadNormalizer.php +++ b/src/FileUploadNormalizer.php @@ -33,6 +33,7 @@ public function __construct( public function normalize(array $files): array { $standardizedPerKey = []; + $groups = []; foreach ($files as $k => $file) { switch (true) { @@ -56,6 +57,25 @@ public function normalize(array $files): array $standardizedPerKey[$k][] = $this->fromFile($filePath); break; } + + if (is_string($k) && str_ends_with($k, '_0')) { + $groups[] = substr($k, 0, -2); + } + } + + foreach ($groups as $group) { + if (array_key_exists($group, $standardizedPerKey)) { + continue; + } + + $standardizedPerKey[$group] = []; + + foreach ($standardizedPerKey as $k => $file) { + if (1 === \count($file) && preg_match('/^'.preg_quote($group, '/').'_\d+$/', $k)) { + $standardizedPerKey[$group][] = reset($file); + unset($standardizedPerKey[$k]); + } + } } return $standardizedPerKey; diff --git a/tests/FileUploadNormalizerTest.php b/tests/FileUploadNormalizerTest.php index 27be148..5b2f1aa 100644 --- a/tests/FileUploadNormalizerTest.php +++ b/tests/FileUploadNormalizerTest.php @@ -118,6 +118,54 @@ public static function normalizeProvider(): iterable null, ]; + yield 'File upload with indexed keys' => [ + [ + 'file_0' => [ + 'name' => 'name.jpg', + 'type' => 'image/jpeg', + 'tmp_name' => 'path/to/name.jpg', + 'error' => 0, + 'size' => 333, + 'uploaded' => true, + 'uuid' => '660d272c-f4c3-11ed-a05b-0242ac120003', + ], + 'file_1' => [ + 'name' => 'name.jpg', + 'type' => 'image/jpeg', + 'tmp_name' => 'path/to/name.jpg', + 'error' => 0, + 'size' => 333, + 'uploaded' => true, + 'uuid' => '660d272c-f4c3-11ed-a05b-0242ac120003', + ], + ], + [ + 'file' => [ + [ + 'name' => 'name.jpg', + 'type' => 'image/jpeg', + 'tmp_name' => 'path/to/name.jpg', + 'error' => 0, + 'size' => 333, + 'uploaded' => true, + 'uuid' => '660d272c-f4c3-11ed-a05b-0242ac120003', + ], + [ + 'name' => 'name.jpg', + 'type' => 'image/jpeg', + 'tmp_name' => 'path/to/name.jpg', + 'error' => 0, + 'size' => 333, + 'uploaded' => true, + 'uuid' => '660d272c-f4c3-11ed-a05b-0242ac120003', + ], + ], + ], + '/project-dir', + null, + null, + ]; + yield 'Array of it all' => [ [ 'upload_field_already_correct' => [