Added symfony 5 compatibility

mailmotor · Aug 1, 2023 · e35b502 · e35b502
1 parent d7c2460
commit e35b502
Show file tree

Hide file tree

Showing 6 changed files with 371 additions and 465 deletions.
diff --git a/Event/MailMotorSubscribedEvent.php b/Event/MailMotorSubscribedEvent.php
@@ -2,7 +2,7 @@
 
 namespace MailMotor\Bundle\MailMotorBundle\Event;
 
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 
 /**
  * This class is in fact an immutable event class holding all the data

diff --git a/Event/MailMotorUnsubscribedEvent.php b/Event/MailMotorUnsubscribedEvent.php
@@ -2,7 +2,7 @@
 
 namespace MailMotor\Bundle\MailMotorBundle\Event;
 
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 
 /**
  * This class is in fact an immutable event class holding all the data

diff --git a/Helper/Subscriber.php b/Helper/Subscriber.php
@@ -103,15 +103,15 @@ public function subscribe(
         if ($subscribed) {
             // dispatch subscribed event
             $this->eventDispatcher->dispatch(
-                MailMotorSubscribedEvent::EVENT_NAME,
                 new MailMotorSubscribedEvent(
                     $email,
                     $this->getListId($listId),
                     $language,
                     $mergeFields,
                     $interests,
                     $doubleOptin
-                )
+                ),
+                MailMotorSubscribedEvent::EVENT_NAME
             );
         }
 
@@ -128,11 +128,11 @@ public function unsubscribe(string $email, string $listId = null): bool
         if ($unsubscribed) {
             // dispatch unsubscribed event
             $this->eventDispatcher->dispatch(
-                MailMotorUnsubscribedEvent::EVENT_NAME,
                 new MailMotorUnsubscribedEvent(
                     $email,
                     $this->getListId($listId)
-                )
+                ),
+                MailMotorUnsubscribedEvent::EVENT_NAME
             );
         }
 

diff --git a/MailMotorMailMotorBundle.php b/MailMotorMailMotorBundle.php
@@ -7,7 +7,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * MailMotor MailMotor Bundle
+ * MailMotor Bundle
  *
  * @author Jeroen Desloovere <info@jeroendesloovere.be>
  */

diff --git a/composer.json b/composer.json
@@ -15,10 +15,10 @@
     ],
     "require": {
         "php": "^7.4||^8.0",
-        "symfony/http-kernel": "^2.3|^3.0|^4.0"
+        "symfony/http-kernel": "^2.3|^3.0|^4.0|^5.0"
     },
     "require-dev": {
-        "symfony/framework-bundle": "^2.3|^3.0|^4.0",
+        "symfony/framework-bundle": "^2.3|^3.0|^4.0|^5.0",
         "phpunit/phpunit": "^9.6"
     },
     "autoload": {