From 3ec2b6903b0438f986b28e7f08569e8366936cc1 Mon Sep 17 00:00:00 2001
From: Pascal Montoya <pascal.montoya@gmail.com>
Date: Thu, 7 Nov 2019 16:39:49 +0100
Subject: [PATCH] Fix symfony dispatch deprecation

---
 Event/ApplyFilterConditionEvent.php | 2 +-
 Event/GetFilterConditionEvent.php   | 2 +-
 Event/PrepareEvent.php              | 2 +-
 Filter/FilterBuilderUpdater.php     | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Event/ApplyFilterConditionEvent.php b/Event/ApplyFilterConditionEvent.php
index 05d24c0..877a6c2 100644
--- a/Event/ApplyFilterConditionEvent.php
+++ b/Event/ApplyFilterConditionEvent.php
@@ -3,7 +3,7 @@
 namespace Lexik\Bundle\FormFilterBundle\Event;
 
 use Lexik\Bundle\FormFilterBundle\Filter\Condition\ConditionBuilderInterface;
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 
 /**
  * Event class to compute the WHERE clause from the conditions.
diff --git a/Event/GetFilterConditionEvent.php b/Event/GetFilterConditionEvent.php
index 16e06b0..08699d0 100644
--- a/Event/GetFilterConditionEvent.php
+++ b/Event/GetFilterConditionEvent.php
@@ -2,7 +2,7 @@
 
 namespace Lexik\Bundle\FormFilterBundle\Event;
 
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 use Lexik\Bundle\FormFilterBundle\Filter\Condition\Condition;
 use Lexik\Bundle\FormFilterBundle\Filter\Condition\ConditionInterface;
 use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface;
diff --git a/Event/PrepareEvent.php b/Event/PrepareEvent.php
index e78cbf1..6f9b78f 100644
--- a/Event/PrepareEvent.php
+++ b/Event/PrepareEvent.php
@@ -2,7 +2,7 @@
 
 namespace Lexik\Bundle\FormFilterBundle\Event;
 
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface;
 
 /**
diff --git a/Filter/FilterBuilderUpdater.php b/Filter/FilterBuilderUpdater.php
index 66c927e..c674a61 100644
--- a/Filter/FilterBuilderUpdater.php
+++ b/Filter/FilterBuilderUpdater.php
@@ -85,7 +85,7 @@ public function addFilterConditions(FormInterface $form, $queryBuilder, $alias =
     {
         // create the right QueryInterface object
         $event = new PrepareEvent($queryBuilder);
-        $this->dispatcher->dispatch(FilterEvents::PREPARE, $event);
+        $this->dispatcher->dispatch($event, FilterEvents::PREPARE);
 
         if (!$event->getFilterQuery() instanceof QueryInterface) {
             throw new \RuntimeException("Couldn't find any filter query object.");
@@ -103,7 +103,7 @@ public function addFilterConditions(FormInterface $form, $queryBuilder, $alias =
 
         // walk condition nodes to add condition on the query builder instance
         $name = sprintf('lexik_filter.apply_filters.%s', $event->getFilterQuery()->getEventPartName());
-        $this->dispatcher->dispatch($name, new ApplyFilterConditionEvent($queryBuilder, $this->conditionBuilder));
+        $this->dispatcher->dispatch(new ApplyFilterConditionEvent($queryBuilder, $this->conditionBuilder), $name);
 
         $this->conditionBuilder = null;
 
@@ -207,7 +207,7 @@ protected function getFilterCondition(FormInterface $form, AbstractType $formTyp
             }
 
             $event = new GetFilterConditionEvent($filterQuery, $field, $values);
-            $this->dispatcher->dispatch($eventName, $event);
+            $this->dispatcher->dispatch($event, $eventName);
 
             $condition = $event->getCondition();
         }