single attachment file validation

craftcms · Mar 7, 2024 · 4e4b4fb · 4e4b4fb
1 parent 8d9d3df
commit 4e4b4fb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/Mailer.php b/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;

diff --git a/src/controllers/SendController.php b/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');
             }
         }
 

diff --git a/src/models/Submission.php b/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;