2 files changed, 4 insertions, 40 deletions
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php
index 553b723cc8..638c13e86d 100644
--- a/phpBB/phpbb/di/container_builder.php
+++ b/phpBB/phpbb/di/container_builder.php
@@ -15,6 +15,7 @@ namespace phpbb\di;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
+use Symfony\Component\HttpKernel\DependencyInjection\RegisterListenersPass;
 
 class container_builder
 {
@@ -160,11 +161,13 @@ class container_builder
 
 			if ($this->use_custom_pass)
 			{
+				// Symfony Kernel Listeners
 				$this->container->addCompilerPass(new \phpbb\di\pass\collection_pass());
+				$this->container->addCompilerPass(new RegisterListenersPass('dispatcher', 'event.listener_listener', 'event.listener'));
 
 				if ($this->use_kernel_pass)
 				{
-					$this->container->addCompilerPass(new \phpbb\di\pass\kernel_pass());
+					$this->container->addCompilerPass(new RegisterListenersPass('dispatcher'));
 				}
 			}
 
diff --git a/phpBB/phpbb/event/extension_subscriber_loader.php b/phpBB/phpbb/event/extension_subscriber_loader.php
deleted file mode 100644
index fc01961e9f..0000000000
--- a/phpBB/phpbb/event/extension_subscriber_loader.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-
-namespace phpbb\event;
-
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-
-class extension_subscriber_loader
-{
-	private $dispatcher;
-	private $listener_collection;
-
-	public function __construct(EventDispatcherInterface $dispatcher, \phpbb\di\service_collection $listener_collection)
-	{
-		$this->dispatcher = $dispatcher;
-		$this->listener_collection = $listener_collection;
-	}
-
-	public function load()
-	{
-		if (!empty($this->listener_collection))
-		{
-			foreach ($this->listener_collection as $listener)
-			{
-				$this->dispatcher->addSubscriber($listener);
-			}
-		}
-	}
-}