Merge pull request #259 from craftcms/bugfix/254-single-attachment-va…

…lidation

single attachment file validation

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release Notes for Contact Form
 
+## Unreleased
+
+- Fixed a bug where it wasn’t possible to upload a single file with the `attachment` param. ([#254](https://github.com/craftcms/contact-form/issues/254))
+
 ## 2.5.2 - 2023-03-16
 
 - Added translations for `Email` and `Name`. ([#235](https://github.com/craftcms/contact-form/issues/235))

src/Mailer.php

@@ -70,6 +70,10 @@ public function send(Submission $submission, bool $runValidation = true): bool
         if ($submission->attachment !== null) {
             $allowedFileTypes = Craft::$app->getConfig()->getGeneral()->allowedFileExtensions;
 
+            if (!is_array($submission->attachment)) {
+                $submission->attachment = [$submission->attachment];
+            }
+
             foreach ($submission->attachment as $attachment) {
                 if (!$attachment) {
                     continue;

src/controllers/SendController.php

@@ -47,7 +47,7 @@ public function actionIndex()
             if (is_array($_FILES['attachment']['name'])) {
                 $submission->attachment = UploadedFile::getInstancesByName('attachment');
             } else {
-                $submission->attachment = [UploadedFile::getInstanceByName('attachment')];
+                $submission->attachment = UploadedFile::getInstanceByName('attachment');
             }
         }
 

src/models/Submission.php

@@ -39,8 +39,8 @@ class Submission extends Model
     public $message;
 
     /**
-     * @var UploadedFile[]|null[]|null
-     * @phpstan-var array<UploadedFile|null>|null
+     * @var UploadedFile|UploadedFile[]|null[]|null
+     * @phpstan-var UploadedFile|array<UploadedFile|null>|null
      */
     public $attachment;