[FormBundle] Moved FormMailer dependency to separate listener

src/Kunstmaan/FormBundle/Event/SubmissionEvent.php

@@ -3,7 +3,7 @@
 namespace Kunstmaan\FormBundle\Event;
 
 use Kunstmaan\FormBundle\Entity\FormSubmission;
-use Kunstmaan\NodeBundle\Entity\AbstractPage;
+use Kunstmaan\FormBundle\Helper\FormPageInterface;
 use Symfony\Component\EventDispatcher\Event;
 
 class SubmissionEvent extends Event
@@ -14,15 +14,15 @@ class SubmissionEvent extends Event
     protected $submission;
 
     /**
-     * @var AbstractPage
+     * @var FormPageInterface
      */
     protected $page;
 
     /**
-     * @param FormSubmission $submission
-     * @param AbstractPage   $page
+     * @param FormSubmission    $submission
+     * @param FormPageInterface $page
      */
-    public function __construct(FormSubmission $submission, AbstractPage $page)
+    public function __construct(FormSubmission $submission, FormPageInterface $page)
     {
         $this->submission = $submission;
         $this->page = $page;
@@ -37,7 +37,7 @@ public function getSubmission()
     }
 
     /**
-     * @return AbstractPage
+     * @return FormPageInterface
      */
     public function getPage()
     {

src/Kunstmaan/FormBundle/EventListener/SendEmailListener.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Kunstmaan\FormBundle\EventListener;
+
+use Kunstmaan\FormBundle\Event\SubmissionEvent;
+use Kunstmaan\FormBundle\Helper\FormMailerInterface;
+
+/**
+ * An event listener for sending an email after the form submission is completed
+ */
+class SendEmailListener
+{
+    /**
+     * @var FormMailerInterface
+     */
+    private $formMailer;
+
+    /**
+     * @param FormMailerInterface $formMailer The form Mailer
+     */
+    public function __construct(FormMailerInterface $formMailer)
+    {
+        $this->formMailer = $formMailer;
+    }
+
+    /**
+     * Configure the form submissions link on top of the form in the sub action menu
+     *
+     * @param SubmissionEvent $event
+     */
+    public function onSubmission(SubmissionEvent $event)
+    {
+        $page = $event->getPage();
+        $formSubmission = $event->getSubmission();
+
+        $from = $page->getFromEmail();
+        $to = $page->getToEmail();
+        $subject = $page->getSubject();
+        if (!empty($from) && !empty($to) && !empty($subject)) {
+            $this->formMailer->sendContactMail($formSubmission, $from, $to, $subject);
+        }
+    }
+}

src/Kunstmaan/FormBundle/Helper/FormHandler.php

@@ -82,14 +82,6 @@ public function handleForm(FormPageInterface $page, Request $request, RenderCont
                 $event = new SubmissionEvent($formSubmission, $page);
                 $this->container->get('event_dispatcher')->dispatch(FormEvents::ADD_SUBMISSION, $event);
 
-                $from = $page->getFromEmail();
-                $to = $page->getToEmail();
-                $subject = $page->getSubject();
-                if (!empty($from) && !empty($to) && !empty($subject)) {
-                    $mailer = $this->container->get('kunstmaan_form.form_mailer');
-                    $mailer->sendContactMail($formSubmission, $from, $to, $subject);
-                }
-
                 return new RedirectResponse($page->generateThankYouUrl($router, $context));
             }
         }

src/Kunstmaan/FormBundle/Resources/config/services.yml

@@ -1,6 +1,7 @@
 parameters:
   kunstmaan_form.form_mailer.class: 'Kunstmaan\FormBundle\Helper\FormMailer'
   kunstmaan_form.form_handler.class: 'Kunstmaan\FormBundle\Helper\FormHandler'
+  kunstmaan_form.sendemail_listener.class: 'Kunstmaan\FormBundle\EventListener\SendEmailListener'
 
 services:
     kunstmaan_form.menu.adaptor.forms:
@@ -23,3 +24,9 @@ services:
         arguments: ['@doctrine.orm.entity_manager', '@router']
         tags:
             - { name: 'kernel.event_listener', event: 'kunstmaan_node.configureSubActionMenu', method: 'onSubActionMenuConfigure' }
+
+    kunstmaan_form.send_email_listener:
+        class: "%kunstmaan_form.sendemail_listener.class%"
+        arguments: ['@kunstmaan_form.form_mailer']
+        tags:
+            - { name: 'kernel.event_listener', event: 'kunstmaan_form.add_submission', method: 'onSubmission' }