Merge pull request #20 from LordSimal/master

fix PHP7.4 error due to wrong config implementation in EmailFactory
bolt · Oct 22, 2020 · 42a4050 · 42a4050
2 parents b9090ad + 198a8c8
commit 42a4050
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/EventSubscriber/Mailer.php b/src/EventSubscriber/Mailer.php
@@ -65,7 +65,7 @@ public function buildEmail(): TemplatedEmail
     {
         $meta = $this->event->getMeta();
 
-        $email = (new EmailFactory())->create($this->event->getFormConfig(), $this->event->getForm(), $meta);
+        $email = (new EmailFactory())->create($this->event->getFormConfig(), $this->event->getConfig(), $this->event->getForm(), $meta);
 
         if ($this->event->isSpam()) {
             $subject = Str::ensureStartsWith($email->getSubject(), '[SPAM] ');

diff --git a/src/Factory/EmailFactory.php b/src/Factory/EmailFactory.php
@@ -21,13 +21,19 @@ class EmailFactory
     /** @var Collection */
     private $notification;
 
-    public function create(Collection $config, Form $form, array $meta = []): TemplatedEmail
+    /**
+     * @param Collection $formConfig The config specific for the current form
+     * @param Collection $config     The global config defined config/extensions/bolt-boltforms.yaml
+     * @param Form       $form       The form object
+     * @param array      $meta       Metadata of the PostSubmitEvent
+     */
+    public function create(Collection $formConfig, Collection $config, Form $form, array $meta = []): TemplatedEmail
     {
         $this->config = $config;
-        $this->notification = collect($config->get('notification', []));
+        $this->notification = collect($formConfig->get('notification', []));
         $this->form = $form;
 
-        $debug = (bool) $config->get('debug')['enabled'];
+        $debug = (bool) $this->config->get('debug')['enabled'];
 
         $email = (new TemplatedEmail())
             ->from($this->getFrom())
@@ -38,7 +44,7 @@ public function create(Collection $config, Form $form, array $meta = []): Templa
                 'data' => $form->getData(),
                 'formname' => $form->getName(),
                 'meta' => $meta,
-                'config' => $config,
+                'config' => $formConfig,
             ]);
 
         if (self::hasCc()) {