simplify

atk4 · Sep 26, 2023 · 53f400c · 53f400c
1 parent ebe1f68
commit 53f400c
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/src/Form/Control/Upload.php b/src/Form/Control/Upload.php
@@ -145,22 +145,21 @@ public function onUpload(\Closure $fx): void
                 $postFiles = [];
                 for ($i = 0;; ++$i) {
                     $k = 'file' . ($i > 0 ? '-' . $i : '');
-                    if (!$this->getApp()->hasRequestUploadedFile($k)) {
+                    $uploadFile = $this->getApp()->tryGetRequestUploadedFile($k);
+                    if ($uploadFile === null) {
                         break;
                     }
 
-                    $uploadFile = $this->getApp()->getRequestUploadedFile($k);
                     $postFile = [
                         'name' => $uploadFile->getClientFilename(),
-                        'type' => $uploadFile->getClientMediaType(),
-                        'tmp_name' => $uploadFile->getError() > 0 ? null : $uploadFile->getStream()->getMetadata('uri'),
                         'error' => $uploadFile->getError(),
-                        'size' => $uploadFile->getSize(),
                     ];
-                    if ($uploadFile->getError() !== 0) {
-                        // unset all details on upload error
-                        $postFile = array_intersect_key($postFile, array_flip(['error', 'name']));
-                        // TODO add error message https://www.php.net/manual/en/features.file-upload.errors.php
+                    if ($uploadFile->getError() === \UPLOAD_ERR_OK) {
+                        $postFile = array_merge($postFile, [
+                            'type' => $uploadFile->getClientMediaType(),
+                            'tmp_name' => $uploadFile->getStream()->getMetadata('uri'),
+                            'size' => $uploadFile->getSize(),
+                        ]);
                     }
                     $postFiles[] = $postFile;
                 }