Merge pull request #261 from arturLitvinavicius/master

Php 8 support

Author: einorler

DependencyInjection/Configuration.php

@@ -27,8 +27,8 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('ongr_filter_manager');
+        $treeBuilder = new TreeBuilder('ongr_filter_manager');
+        $rootNode = $treeBuilder->getRootNode();
 
         $this->addManagersSection($rootNode);
         $this->addFiltersSection($rootNode);

Event/PreProcessSearchEvent.php

@@ -13,7 +13,7 @@
 
 use ONGR\ElasticsearchDSL\Search;
 use ONGR\FilterManagerBundle\Filter\FilterState;
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 
 class PreProcessSearchEvent extends Event
 {

Event/PreSearchEvent.php

@@ -12,7 +12,7 @@
 namespace ONGR\FilterManagerBundle\Event;
 
 use ONGR\FilterManagerBundle\Search\SearchRequest;
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 
 class PreSearchEvent extends Event
 {

Event/SearchResponseEvent.php

@@ -12,7 +12,7 @@
 namespace ONGR\FilterManagerBundle\Event;
 
 use ONGR\ElasticsearchBundle\Result\DocumentIterator;
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 
 class SearchResponseEvent extends Event
 {

Search/FilterManager.php

@@ -90,7 +90,7 @@ public function handleRequest(Request $request)
      */
     public function search(SearchRequest $request)
     {
-        $this->eventDispatcher->dispatch(ONGRFilterManagerEvents::PRE_SEARCH, new PreSearchEvent($request));
+        $this->eventDispatcher->dispatch(new PreSearchEvent($request), ONGRFilterManagerEvents::PRE_SEARCH);
 
         $search = $this->container->buildSearch($request);
 
@@ -107,8 +107,8 @@ public function search(SearchRequest $request)
             }
 
             $this->eventDispatcher->dispatch(
-                ONGRFilterManagerEvents::PRE_PROCESS_SEARCH,
-                new PreProcessSearchEvent($request->get($name), $relatedSearch)
+                new PreProcessSearchEvent($request->get($name), $relatedSearch),
+                ONGRFilterManagerEvents::PRE_PROCESS_SEARCH
             );
 
             $filter->preProcessSearch(
@@ -119,7 +119,7 @@ public function search(SearchRequest $request)
         }
 
         $result = $this->repository->findDocuments($search);
-        $this->eventDispatcher->dispatch(ONGRFilterManagerEvents::SEARCH_RESPONSE, new SearchResponseEvent($result));
+        $this->eventDispatcher->dispatch(new SearchResponseEvent($result), ONGRFilterManagerEvents::SEARCH_RESPONSE);
 
         return new SearchResponse(
             $this->getFiltersViewData($result, $request),

composer.json

@@ -11,15 +11,15 @@
         }
     ],
     "require": {
-        "php": "^7.0",
-        "ongr/elasticsearch-bundle": "^6.0",
-        "jms/serializer-bundle": "^2.4",
-        "symfony/twig-bundle": "^3.4|^4.0",
-        "symfony/translation": "^3.4|^4.0",
-        "symfony/asset": "^3.4|^4.0",
+        "php": "^7.0 || ^8.0",
+        "ongr/elasticsearch-bundle": "^6.0|^7.0|dev-master",
+        "jms/serializer-bundle": "^2.4|^3.0",
+        "symfony/twig-bundle": "^3.4|^4.0|^5.0|^6.0",
+        "symfony/translation": "^3.4|^4.0|^5.0|^6.0",
+        "symfony/asset": "^3.4|^4.0|^5.0|^6.0",
         "twig/twig": "^2",
-        "symfony/browser-kit": "^3.4|^4.0",
-        "symfony/css-selector": "^3.4|^4.0"
+        "symfony/browser-kit": "^3.4|^4.0|^5.4|^6.0",
+        "symfony/css-selector": "^3.4|^4.0|^5.0|^6.0"
     },
     "require-dev": {
         "monolog/monolog": "~1.0",