Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[v2] make single attachment forms validatable using the Yii file validator #256

Closed
wants to merge 1 commit into from
Closed

[v2] make single attachment forms validatable using the Yii file validator #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Mailer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ public function send(Submission $submission, bool $runValidation = true): bool
if ($submission->attachment !== null) {
$allowedFileTypes = Craft::$app->getConfig()->getGeneral()->allowedFileExtensions;

foreach ($submission->attachment as $attachment) {
$attachments = is_array($submission->attachment) ? $submission->attachment : [$submission->attachment];
foreach ($attachments as $attachment) {
if (!$attachment) {
continue;
}
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/SendController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
if (is_array($_FILES['attachment']['name'])) {
$submission->attachment = UploadedFile::getInstancesByName('attachment');
} else {
$submission->attachment = [UploadedFile::getInstanceByName('attachment')];
$submission->attachment = UploadedFile::getInstanceByName('attachment');

Check failure on line 50 in src/controllers/SendController.php

View workflow job for this annotation

GitHub Actions / PHPStan / check 

Property craft\contactform\models\Submission::$attachment (array<craft\web\UploadedFile|null>|null) does not accept craft\web\UploadedFile|null.
}
}

Expand Down
Loading