Fix Symfony 4.x deprecation notices (#14)

Author: mpdude

CHANGELOG.md

@@ -1,18 +1,20 @@
 Changelog
 =========
 
-Version 1.3
------------
+## Version 2.0
+
+* `\Webfactory\Bundle\LegacyIntegrationBundle\Integration\Filter` now requires `\Symfony\Component\HttpKernel\Event\ControllerEvent` as the event
+  class for its first argument, following the changed Event class names in Symfony 4.3. 
+
+## Version 1.3
 
 * Symfony sub-requests can be dispatched to the legacy app (but the legacy app is still called at most once per web request)
 
-Version 1.2
------------
+## Version 1.2
 
 * Legacy front controllers don't have to return the HTTP status code anymore
 
-Version 1.1
------------
+## Version 1.1
 
 * Added a way to embed Symfony 2 output into the legacy response (#5)
 * Fixed that `LegacyApplicationDispatchingEventListener` would not play nicely with `SensioFrameworkExtraBundle`'s `@Cache` annotation (#6)

Controller/PassthruController.php

@@ -11,7 +11,7 @@
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Webfactory\Bundle\LegacyIntegrationBundle\Integration\Annotation as Legacy;
 
-class PassthruController extends Controller
+class PassthruController
 {
     /**
      * @Legacy\Dispatch

DependencyInjection/Configuration.php

@@ -17,13 +17,8 @@ public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('webfactory_legacy_integration');
 
-        if (method_exists($treeBuilder, 'getRootNode')) {
-            $rootNode = $treeBuilder->getRootNode();
-        } else {
-            // BC layer for symfony/config 4.1 and older
-            $rootNode = $treeBuilder->root('webfactory_legacy_integration');
-        }
- 
+        $rootNode = $treeBuilder->getRootNode();
+
         $rootNode
             ->children()
                 ->scalarNode('legacyApplicationBootstrapFile')->defaultValue('%project.webdir%/wfD2Engine.php')->end()

EventListener/LegacyApplicationDispatchingEventListener.php

@@ -9,7 +9,7 @@
 namespace Webfactory\Bundle\LegacyIntegrationBundle\EventListener;
 
 use Doctrine\Common\Annotations\Reader;
-use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
+use Symfony\Component\HttpKernel\Event\ControllerEvent;
 use Webfactory\Bundle\LegacyIntegrationBundle\Integration\Annotation\Dispatch;
 use Webfactory\Bundle\LegacyIntegrationBundle\Integration\Filter;
 use Webfactory\Bundle\LegacyIntegrationBundle\Integration\LegacyApplication;
@@ -41,7 +41,7 @@ public function addFilter(Filter $filter)
         $this->filters[] = $filter;
     }
 
-    public function onKernelController(FilterControllerEvent $event)
+    public function onKernelController(ControllerEvent $event)
     {
         if (!\is_array($controller = $event->getController())) {
             return;

Integration/Filter.php

@@ -9,9 +9,9 @@
 namespace Webfactory\Bundle\LegacyIntegrationBundle\Integration;
 
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
+use Symfony\Component\HttpKernel\Event\ControllerEvent;
 
 interface Filter
 {
-    public function filter(FilterControllerEvent $event, Response $response);
+    public function filter(ControllerEvent $event, Response $response);
 }

Integration/Filter/KeepCookiesAndHeadersFilter.php

@@ -11,8 +11,8 @@
 use Doctrine\Common\Annotations\Reader;
 use Symfony\Component\HttpFoundation\Cookie;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
-use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\Event\ControllerEvent;
+use Symfony\Component\HttpKernel\Event\ResponseEvent;
 use Webfactory\Bundle\LegacyIntegrationBundle\Integration\Annotation\KeepCookies;
 use Webfactory\Bundle\LegacyIntegrationBundle\Integration\Annotation\KeepHeaders;
 use Webfactory\Bundle\LegacyIntegrationBundle\Integration\Filter as FilterInterface;
@@ -36,7 +36,7 @@ public function __construct(Reader $reader)
         $this->reader = $reader;
     }
 
-    public function filter(FilterControllerEvent $event, Response $response)
+    public function filter(ControllerEvent $event, Response $response)
     {
         if (!\is_array($controller = $event->getController())) {
             return;
@@ -56,7 +56,7 @@ public function filter(FilterControllerEvent $event, Response $response)
         }
     }
 
-    public function onKernelResponse(FilterResponseEvent $event)
+    public function onKernelResponse(ResponseEvent $event)
     {
         if (!$this->legacyResponse) {
             return;

Integration/Filter/PassthruLegacyResponseFilter.php

@@ -9,7 +9,7 @@
 namespace Webfactory\Bundle\LegacyIntegrationBundle\Integration\Filter;
 
 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;
 
 /**
@@ -21,7 +21,7 @@
  */
 class PassthruLegacyResponseFilter implements FilterInterface
 {
-    public function filter(FilterControllerEvent $event, Response $response)
+    public function filter(ControllerEvent $event, Response $response)
     {
         if ($this->check($response)) {
             $event->setController(function () use ($response) {

Twig/Extension.php

@@ -9,7 +9,7 @@
 namespace Webfactory\Bundle\LegacyIntegrationBundle\Twig;
 
 use Psr\Container\ContainerInterface;
-use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
+use Symfony\Contracts\Service\ServiceSubscriberInterface;
 use Twig\Extension\AbstractExtension;
 use Twig\Extension\GlobalsInterface;
 use Twig\TwigFunction;

composer.json

@@ -21,11 +21,12 @@
         "doctrine/annotations": "~1.0",
         "psr/container": "^1.0",
         "psr/log": "^1.0",
-        "symfony/config": "3.4.*|^4.0",
-        "symfony/dependency-injection": "3.4.*|^4.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": "3.4.*|^4.0",
+        "symfony/http-kernel": "^4.3",
+        "symfony/service-contracts": "^1.0|^2.0",
         "twig/twig": "^1.34|^2.0",
         "webfactory/dom": "~1.0, >= 1.0.15"
     }