[FrameworkBundle] FC with EventDispatcher 4.0

xabbuh · xabbuh · commit b7c76f714724 · 2017-05-21T09:51:07.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -32,6 +32,8 @@
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
+use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\Finder\Finder;
@@ -94,6 +96,13 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('web.xml');
         $loader->load('services.xml');
 
+        // forward compatibility with Symfony 4.0 where the ContainerAwareEventDispatcher class is removed
+        if (!class_exists(ContainerAwareEventDispatcher::class)) {
+            $definition = $container->getDefinition('event_dispatcher');
+            $definition->setClass(EventDispatcher::class);
+            $definition->setArguments(array());
+        }
+
         if (PHP_VERSION_ID < 70000) {
             $definition = $container->getDefinition('kernel.class_cache.cache_warmer');
             $definition->addTag('kernel.cache_warmer');
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AutowiringTypesTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AutowiringTypesTest.php
@@ -14,6 +14,7 @@
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\CachedReader;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\Templating\EngineInterface as ComponentEngineInterface;
 use Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher;
 use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;
@@ -55,7 +56,12 @@ public function testEventDispatcherAutowiring()
         $container = static::$kernel->getContainer();
 
         $autowiredServices = $container->get('test.autowiring_types.autowired_services');
-        $this->assertInstanceOf(ContainerAwareEventDispatcher::class, $autowiredServices->getDispatcher(), 'The event_dispatcher service should be injected if the debug is not enabled');
+
+        if (class_exists(ContainerAwareEventDispatcher::class)) {
+            $this->assertInstanceOf(ContainerAwareEventDispatcher::class, $autowiredServices->getDispatcher(), 'The event_dispatcher service should be injected if the debug is not enabled');
+        } else {
+            $this->assertInstanceOf(EventDispatcher::class, $autowiredServices->getDispatcher(), 'The event_dispatcher service should be injected if the debug is not enabled');
+        }
 
         static::bootKernel(array('debug' => true));
         $container = static::$kernel->getContainer();
