Symfony 4.4 support

Author: theUniC

.gitignore

@@ -1,4 +1,6 @@
 phpunit.xml
 vendor
-Tests/Functional/cache
-Tests/Functional/logs
+Tests/Functional/var
+.phpunit.result.cache
+bin/*
+composer.lock

.travis.yml

@@ -4,29 +4,33 @@
 
 use FrequenceWeb\Bundle\ContactBundle\EventDispatcher\ContactEvents;
 use FrequenceWeb\Bundle\ContactBundle\EventDispatcher\Event\MessageSubmitEvent;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use FrequenceWeb\Bundle\ContactBundle\Model\Contact;
+use Psr\Container\ContainerInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Form\FormInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
+use Symfony\Contracts\Service\ServiceSubscriberInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * Contact controller
  *
  * @author Yohan Giarelli <yohan@giarel.li>
  */
-class DefaultController implements ContainerAwareInterface
+class DefaultController extends AbstractController
 {
-    use ContainerAwareTrait;
-
     /**
      * Action that displays the contact form
      *
      * @param Request $request
      *
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @return Response
      */
-    public function indexAction(Request $request)
+    public function indexAction(Request $request): Response
     {
         $this->container->get('session')->set('_fw_contact_referer', $request->getUri());
 
@@ -38,17 +42,19 @@ public function indexAction(Request $request)
      *
      * @param  Request $request
      *
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @return Response
      */
-    public function submitAction(Request $request)
+    public function submitAction(Request $request): Response
     {
         $form = $this->getForm();
         $form->handleRequest($request);
 
-        if ($form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             // Send the event for message handling (send mail, add to DB, don't care)
             $event = new MessageSubmitEvent($form->getData());
-            $this->container->get('event_dispatcher')->dispatch(ContactEvents::onMessageSubmit, $event);
+            /** @var EventDispatcherInterface $eventDispatcher */
+            $eventDispatcher = $this->container->get('event_dispatcher');
+            $eventDispatcher->dispatch($event, ContactEvents::onMessageSubmit);
 
             // Let say the user it's ok
             $message = $this->container->get('translator')->trans('contact.submit.success', [], 'FrequenceWebContactBundle');
@@ -71,12 +77,12 @@ public function submitAction(Request $request)
      *
      * @param  FormInterface $form
      *
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @return Response
      */
     protected function renderFormResponse(FormInterface $form)
     {
-        return $this->container->get('templating')->renderResponse(
-            'FrequenceWebContactBundle:Default:index.html.twig',
+        return $this->render(
+            '@FrequenceWebContactBundle/Default/index.html.twig',
             ['form' => $form->createView()]
         );
     }
@@ -86,11 +92,24 @@ protected function renderFormResponse(FormInterface $form)
      *
      * @return FormInterface
      */
-    protected function getForm()
+    protected function getForm(): FormInterface
     {
         return $this->container->get('form.factory')->create(
             $this->container->getParameter('frequence_web_contact.type'),
             $this->container->get('frequence_web_contact.model')
         );
     }
+
+    /**
+     * @inheritDoc
+     */
+    public static function getSubscribedServices()
+    {
+        $dependentServices = parent::getSubscribedServices();
+
+        return array_merge($dependentServices, [
+            'event_dispatcher' => EventDispatcherInterface::class,
+            'translator' => TranslatorInterface::class,
+        ]);
+    }
 }

Controller/DefaultController.php

@@ -19,8 +19,8 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('frequence_web_contact');
+        $treeBuilder = new TreeBuilder('frequence_web_contact');
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
             ->addDefaultsIfNotSet()

DependencyInjection/Configuration.php

@@ -3,7 +3,7 @@
 namespace FrequenceWeb\Bundle\ContactBundle\EventDispatcher\Event;
 
 use FrequenceWeb\Bundle\ContactBundle\Model\Contact;
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 
 /**
  * This event is thrown each time an user send a message (Only and Only if validation pass)

EventDispatcher/Event/MessageSubmitEvent.php

@@ -3,8 +3,9 @@
 namespace FrequenceWeb\Bundle\ContactBundle\EventDispatcher\Listener;
 
 use FrequenceWeb\Bundle\ContactBundle\EventDispatcher\Event\MessageSubmitEvent;
-use Symfony\Component\Templating\EngineInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Swift_Mailer;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use Twig\Environment;
 
 /**
  * Listener for contact events, that sends emails
@@ -14,7 +15,7 @@
 class EmailContactListener
 {
     /**
-     * @var \Swift_Mailer
+     * @var Swift_Mailer
      */
     protected $mailer;
 
@@ -24,35 +25,24 @@ class EmailContactListener
     protected $translator;
 
     /**
-     * @var EngineInterface
+     * @var Environment
      */
-    protected $templating;
+    protected $twig;
 
     /**
      * @var array
      */
     protected $config;
 
-    /**
-     * @param \Swift_Mailer       $mailer
-     * @param EngineInterface     $templating
-     * @param TranslatorInterface $translator
-     * @param array<string>       $config     Configuration from DIC
-     */
-    public function __construct(\Swift_Mailer $mailer, EngineInterface $templating, TranslatorInterface $translator, array $config)
+    public function __construct(Swift_Mailer $mailer, Environment $twig, TranslatorInterface $translator, array $config)
     {
         $this->mailer     = $mailer;
-        $this->templating = $templating;
+        $this->twig = $twig;
         $this->translator = $translator;
         $this->config     = $config;
     }
 
-    /**
-     * Called when onMessageSubmit event is fired
-     *
-     * @param MessageSubmitEvent $event
-     */
-    public function onMessageSubmit(MessageSubmitEvent $event)
+    public function onMessageSubmit(MessageSubmitEvent $event): void
     {
         $contact = $event->getContact();
 
@@ -66,16 +56,16 @@ public function onMessageSubmit(MessageSubmitEvent $event)
         $message->addReplyTo($contact->getEmail(), $contact->getName());
         $message->addTo($this->config['to']);
         $message->addPart(
-            $this->templating->render(
-                'FrequenceWebContactBundle:Mails:mail.html.twig',
-                array('contact' => $contact)
+            $this->twig->render(
+                '@FrequenceWebContactBundle/Mails/mail.html.twig',
+                ['contact' => $contact]
             ),
             'text/html'
         );
         $message->addPart(
-            $this->templating->render(
-                'FrequenceWebContactBundle:Mails:mail.txt.twig',
-                array('contact' => $contact)
+            $this->twig->render(
+                '@FrequenceWebContactBundle/Mails/mail.txt.twig',
+                ['contact' => $contact]
             ),
             'text/plain'
         );

EventDispatcher/Listener/EmailContactListener.php

@@ -11,10 +11,10 @@
     </parameters>
 
     <services>
-        <service id="frequence_web_contact.model" class="%frequence_web_contact.model.class%" />
+        <service id="frequence_web_contact.model" class="%frequence_web_contact.model.class%" public="true" autowire="false" />
         <service id="frequence_web_contact.email_listener" class="%frequence_web_contact.email_listener.class%">
             <argument type="service" id="mailer" />
-            <argument type="service" id="templating" />
+            <argument type="service" id="twig" />
             <argument type="service" id="translator.default" />
         </service>
     </services>

Resources/config/services.xml

@@ -1,4 +1,4 @@
-{% extends 'FrequenceWebContactBundle::layout.html.twig' %}
+{% extends '@FrequenceWebContactBundle/layout.html.twig' %}
 
 {% block body %}
 <form method="POST" action="{{ path('fw_contact_submit') }}">

Resources/views/Default/index.html.twig

@@ -3,43 +3,42 @@
 namespace FrequenceWeb\Bundle\ContactBundle\Tests\Controller;
 
 use FrequenceWeb\Bundle\ContactBundle\Tests\Functional\WebTestCase;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 
 class DefaultControllerTest extends WebTestCase
 {
-    public function testIndex()
+    public function testIndex(): void
     {
-        /** @var $client \Symfony\Bundle\FrameworkBundle\Client */
         $client = static::createClient();
-        /** @var $crawler \Symfony\Component\DomCrawler\Crawler  */
+        $client->enableProfiler();
         $crawler = $client->request('GET', '/contact.html');
 
+        file_put_contents(__DIR__ . '/../Functional/result.html', $client->getResponse()->getContent());
         $this->assertEquals(200, $client->getResponse()->getStatusCode());
 
+
         $form = $crawler->selectButton('contact_message_submit')->form();
-        $form->setValues(array(
+        $client->submit($form, [
             'contact[name]'    => 'John Doe',
             'contact[subject]' => 'I have a message for you.',
             'contact[body]'    => 'This is my message body.',
-        ));
-        $client->submit($form);
-        $collector = $client->getProfile()->getCollector('swiftmailer');
-        $this->assertCount(0, $collector->getMessages());
+        ]);
 
-        $this->assertNotInstanceOf('Symfony\\Component\\HttpFoundation\\RedirectResponse', $client->getResponse());
+        $this->assertNotInstanceOf(RedirectResponse::class, $client->getResponse());
 
         $form = $crawler->selectButton('contact_message_submit')->form();
-        $form->setValues(array(
+        $client->submit($form, [
             'contact[name]'    => 'John Doe',
             'contact[email]'   => 'john.doe@gmail.com',
             'contact[subject]' => 'I have a message for you.',
             'contact[body]'    => 'This is my message body.',
-        ));
+        ]);
         $client->submit($form);
 
         $collector = $client->getProfile()->getCollector('swiftmailer');
         $this->assertCount(1, $collector->getMessages());
 
-        $this->assertInstanceOf('Symfony\\Component\\HttpFoundation\\RedirectResponse', $client->getResponse());
+        $this->assertInstanceOf(RedirectResponse::class, $client->getResponse());
         $client->followRedirect();
     }
 }

Tests/Controller/DefaultControllerTest.php

@@ -32,4 +32,9 @@ public function registerContainerConfiguration(LoaderInterface $loader)
     {
         $loader->load(__DIR__.'/config.yml');
     }
+
+    public function getProjectDir()
+    {
+        return __DIR__;
+    }
 }