From 38679f2aa2ad438cb4900301acd0000fe82851d2 Mon Sep 17 00:00:00 2001 From: Andreas Schempp Date: Mon, 9 Dec 2024 14:20:56 +0100 Subject: [PATCH] Fixed tests --- src/FileUploadNormalizer.php | 2 +- tests/FileUploadNormalizerTest.php | 48 ++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/src/FileUploadNormalizer.php b/src/FileUploadNormalizer.php index 6ef0d5f..66f4fcc 100644 --- a/src/FileUploadNormalizer.php +++ b/src/FileUploadNormalizer.php @@ -58,7 +58,7 @@ public function normalize(array $files): array break; } - if (str_ends_with($k, '_0')) { + if (is_string($k) && str_ends_with($k, '_0')) { $groups[] = substr($k, 0, -2); } } 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' => [