fix(email): attachments as file objects / multi-steps form

Author: tobimori

classes/Actions/EmailAction.php

@@ -228,7 +228,8 @@ public function run(): void
 						if (is_array($attachment)) {
 							$mailer->addAttachment($attachment['path'], $attachment['name']);
 						} else {
-							$mailer->addAttachment($attachment);
+							// handle kirby file objects
+							$mailer->addAttachment($attachment->root(), $attachment->filename());
 						}
 					}
 
@@ -266,7 +267,7 @@ protected function attachments(): array
 					$attachments[] = $file;
 				}
 			} else { // is PHP file object
-				$files = array_values(A::filter($value->value(), fn($file) => $file['error'] === UPLOAD_ERR_OK));
+				$files = array_values(A::filter($value->value(), fn ($file) => $file['error'] === UPLOAD_ERR_OK));
 				foreach ($files as $file) {
 					$attachments[] = [
 						'path' => $file['tmp_name'],

composer.json

@@ -4,7 +4,7 @@
 	"type": "kirby-plugin",
 	"license": "proprietary",
 	"homepage": "https://plugins.andkindness.com/dreamform",
-	"version": "2.0.2",
+	"version": "2.0.3",
 	"authors": [
 		{
 			"name": "Tobias Möritz",

composer.lock

@@ -1,32 +1,34 @@
-<?php return array(
-    'root' => array(
-        'name' => 'tobimori/kirby-dreamform',
-        'pretty_version' => '2.0.2',
-        'version' => '2.0.2.0',
-        'reference' => null,
-        'type' => 'kirby-plugin',
-        'install_path' => __DIR__ . '/../../',
-        'aliases' => array(),
-        'dev' => false,
-    ),
-    'versions' => array(
-        'getkirby/composer-installer' => array(
-            'pretty_version' => '1.2.1',
-            'version' => '1.2.1.0',
-            'reference' => 'c98ece30bfba45be7ce457e1102d1b169d922f3d',
-            'type' => 'composer-plugin',
-            'install_path' => __DIR__ . '/../getkirby/composer-installer',
-            'aliases' => array(),
-            'dev_requirement' => false,
-        ),
-        'tobimori/kirby-dreamform' => array(
-            'pretty_version' => '2.0.2',
-            'version' => '2.0.2.0',
-            'reference' => null,
-            'type' => 'kirby-plugin',
-            'install_path' => __DIR__ . '/../../',
-            'aliases' => array(),
-            'dev_requirement' => false,
-        ),
-    ),
+<?php
+
+return array(
+	'root' => array(
+		'name' => 'tobimori/kirby-dreamform',
+		'pretty_version' => '2.0.3',
+		'version' => '2.0.3.0',
+		'reference' => null,
+		'type' => 'kirby-plugin',
+		'install_path' => __DIR__ . '/../../',
+		'aliases' => array(),
+		'dev' => false,
+	),
+	'versions' => array(
+		'getkirby/composer-installer' => array(
+			'pretty_version' => '1.2.1',
+			'version' => '1.2.1.0',
+			'reference' => 'c98ece30bfba45be7ce457e1102d1b169d922f3d',
+			'type' => 'composer-plugin',
+			'install_path' => __DIR__ . '/../getkirby/composer-installer',
+			'aliases' => array(),
+			'dev_requirement' => false,
+		),
+		'tobimori/kirby-dreamform' => array(
+			'pretty_version' => '2.0.3',
+			'version' => '2.0.3.0',
+			'reference' => null,
+			'type' => 'kirby-plugin',
+			'install_path' => __DIR__ . '/../../',
+			'aliases' => array(),
+			'dev_requirement' => false,
+		),
+	),
 );