Provide compatibility with Symfony 5.x (#13)

webfactory · Apr 8, 2022 · bc7b1aa · bc7b1aa
1 parent 74dc6f2
commit bc7b1aa
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/Integration/Filter/ControllerAnnotations.php b/Integration/Filter/ControllerAnnotations.php
@@ -11,7 +11,7 @@
 use Doctrine\Common\Annotations\Reader;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
+use Symfony\Component\HttpKernel\Event\ControllerEvent;
 use Webfactory\Bundle\LegacyIntegrationBundle\Integration\Filter as FilterInterface;
 
 class ControllerAnnotations implements FilterInterface
@@ -25,7 +25,7 @@ public function __construct(Reader $reader, ContainerInterface $container)
         $this->container = $container;
     }
 
-    public function filter(FilterControllerEvent $event, Response $response)
+    public function filter(ControllerEvent $event, Response $response)
     {
         if (!\is_array($controller = $event->getController())) {
             return;

diff --git a/README.md b/README.md
@@ -170,7 +170,7 @@ The `LegacyApplicationDispatchingEventListener` can take a set of _Filters_ whic
 must implement the Webfactory\Bundle\LegacyIntegrationBundle\Integration\Filter interface.
 
 Once the legacy application has been executed, all registered filters are passed
-the `FilterControllerEvent` which triggered the event listener as well as the
+the `ControllerEvent` which triggered the event listener as well as the
 `Response` object that was created for the legacy application.
 
 The primary use case for this is to be able to examine the response and choose

diff --git a/Twig/Extension.php b/Twig/Extension.php
@@ -49,7 +49,7 @@ public function getFunctions()
         ];
     }
 
-    public function getGlobals()
+    public function getGlobals(): array
     {
         return [
             'legacyApplication' => $this,

diff --git a/composer.json b/composer.json
@@ -21,13 +21,13 @@
         "doctrine/annotations": "~1.0",
         "psr/container": "^1.0",
         "psr/log": "^1.0",
-        "symfony/config": "^4.3",
-        "symfony/dependency-injection": "^4.2",
-        "symfony/framework-bundle": "3.4.*|^4.0",
-        "symfony/http-foundation": "3.4.*|^4.0",
-        "symfony/http-kernel": "^4.3",
+        "symfony/config": "^4.3|^5.0",
+        "symfony/dependency-injection": "^4.3|^5.0",
+        "symfony/framework-bundle": "3.4.*|^4.0|^5.0",
+        "symfony/http-foundation": "^4.0|^5.0",
+        "symfony/http-kernel": "^4.3|^5.0",
         "symfony/service-contracts": "^1.0|^2.0",
-        "twig/twig": "^1.34|^2.0",
+        "twig/twig": "^1.34|^2.0|^3.0",
         "webfactory/dom": "~1.0, >= 1.0.15"
     }