From e8a8549fdcc9666cbd3a155dc9c4dd7f803e5ec2 Mon Sep 17 00:00:00 2001
From: Antoine Lemaire <lemaireantoine@hotmail.com>
Date: Tue, 2 May 2017 17:28:09 +0200
Subject: [PATCH] Fix deprecation of request service, upgrade minimum symfony
 version to 2.4 (#4)

---
 Resources/config/apiService.yml | 12 ++++++------
 Resources/config/service.yml    | 10 +++++-----
 Service/MailHookService.php     |  9 +++++----
 composer.json                   |  2 +-
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Resources/config/apiService.yml b/Resources/config/apiService.yml
index bddbcf4..7746e52 100644
--- a/Resources/config/apiService.yml
+++ b/Resources/config/apiService.yml
@@ -8,31 +8,31 @@ parameters:
 
 services:
     swm.mail_hook.api_service.campainmonitor:
-        class: %swm.mail_hook.api_service.campainmonitor.class%
+        class: "%swm.mail_hook.api_service.campainmonitor.class%"
         tags:
             -  { name: swm.mailhook, alias: campainmonitor }
 
     swm.mail_hook.api_service.mailgun:
-        class: %swm.mail_hook.api_service.mailgun.class%
+        class: "%swm.mail_hook.api_service.mailgun.class%"
         tags:
             -  { name: swm.mailhook, alias: mailgun }
 
     swm.mail_hook.api_service.mailjet:
-        class: %swm.mail_hook.api_service.mailjet.class%
+        class: "%swm.mail_hook.api_service.mailjet.class%"
         tags:
             -  { name: swm.mailhook, alias: mailjet }
 
     swm.mail_hook.api_service.mandrill:
-        class: %swm.mail_hook.api_service.mandrill.class%
+        class: "%swm.mail_hook.api_service.mandrill.class%"
         tags:
             -  { name: swm.mailhook, alias: mandrill }
 
     swm.mail_hook.api_service.sendgrid:
-        class: %swm.mail_hook.api_service.sendgrid.class%
+        class: "%swm.mail_hook.api_service.sendgrid.class%"
         tags:
             -  { name: swm.mailhook, alias: sendgrid }
 
     swm.mail_hook.api_service.sparkpost:
-        class: %swm.mail_hook.api_service.sparkpost.class%
+        class: "%swm.mail_hook.api_service.sparkpost.class%"
         tags:
             -  { name: swm.mailhook, alias: sparkpost }
diff --git a/Resources/config/service.yml b/Resources/config/service.yml
index 232d611..e1cb923 100644
--- a/Resources/config/service.yml
+++ b/Resources/config/service.yml
@@ -6,15 +6,15 @@ parameters:
 
 services:
     swm.mail_hook.service.mail_hook:
-        class: %swm.mail_hook.service.mail_hook.class%
+        class: "%swm.mail_hook.service.mail_hook.class%"
         scope: request
         arguments:
-            - @request
-            - @swm.mail_hook.provider.api_service
+            - "@request_stack"
+            - "@swm.mail_hook.provider.api_service"
 
     swm.mail_hook.provider.api_service:
-        class: %swm.mail_hook.provider.api_service.class%
+        class: "%swm.mail_hook.provider.api_service.class%"
 
     swm.mail_hook.hydrator.default:
-        class: %swm.mail_hook.hydrator.default.class%
+        class: "%swm.mail_hook.hydrator.default.class%"
 
diff --git a/Service/MailHookService.php b/Service/MailHookService.php
index c3ce3cd..96d2ad4 100644
--- a/Service/MailHookService.php
+++ b/Service/MailHookService.php
@@ -6,6 +6,7 @@
 use Swm\Bundle\MailHookBundle\Model as ApiServiceModel;
 use Swm\Bundle\MailHookBundle\Provider\ProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 class MailHookService
 {
@@ -20,17 +21,17 @@ class MailHookService
     private $apiServiceModelProvider;
 
     /**
-     * @param  Request           $request
+     * @param  RequestStack      $requestStack
      * @param  ProviderInterface $apiServiceProvider
      */
-    public function __construct(Request $request, ProviderInterface $apiServiceProvider)
+    public function __construct(RequestStack $requestStack, ProviderInterface $apiServiceProvider)
     {
-        $this->request            = $request;
+        $this->request            = $requestStack->getCurrentRequest();
         $this->apiServiceProvider = $apiServiceProvider;
     }
 
     /**
-     * @param  string $apiService
+     * @param  string $serviceName
      * @return array<HookInterface>
      */
     public function getHooksForService($serviceName)
diff --git a/composer.json b/composer.json
index f1e39d6..8979769 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
     ],
     "require": {
         "php": ">=5.3.9",
-        "symfony/framework-bundle": "~2.3|~3.0"
+        "symfony/framework-bundle": "~2.4|~3.0"
     },
     "require-dev": {
         "atoum/atoum": "dev-master"