3 files changed, 22 insertions, 78 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/di/extension/config.php b/phpBB/phpbb/di/extension/config.php
index 27ebc94bae..7984a783df 100644
--- a/phpBB/phpbb/di/extension/config.php
+++ b/phpBB/phpbb/di/extension/config.php
@@ -39,16 +39,24 @@ class config extends Extension
 	*/
 	public function load(array $config, ContainerBuilder $container)
 	{
-		$container->setParameter('core.adm_relative_path', ($this->config_php->get('phpbb_adm_relative_path') ? $this->config_php->get('phpbb_adm_relative_path') : 'adm/'));
-		$container->setParameter('core.table_prefix', $this->config_php->get('table_prefix'));
-		$container->setParameter('cache.driver.class', $this->convert_30_acm_type($this->config_php->get('acm_type')));
-		$container->setParameter('dbal.driver.class', $this->config_php->convert_30_dbms_to_31($this->config_php->get('dbms')));
-		$container->setParameter('dbal.dbhost', $this->config_php->get('dbhost'));
-		$container->setParameter('dbal.dbuser', $this->config_php->get('dbuser'));
-		$container->setParameter('dbal.dbpasswd', $this->config_php->get('dbpasswd'));
-		$container->setParameter('dbal.dbname', $this->config_php->get('dbname'));
-		$container->setParameter('dbal.dbport', $this->config_php->get('dbport'));
-		$container->setParameter('dbal.new_link', defined('PHPBB_DB_NEW_LINK') && PHPBB_DB_NEW_LINK);
+		$parameters = array(
+			'core.adm_relative_path'	=> $this->config_php->get('phpbb_adm_relative_path') ? $this->config_php->get('phpbb_adm_relative_path') : 'adm/',
+			'core.table_prefix'			=> $this->config_php->get('table_prefix'),
+			'cache.driver.class'		=> $this->convert_30_acm_type($this->config_php->get('acm_type')),
+			'dbal.driver.class'			=> $this->config_php->convert_30_dbms_to_31($this->config_php->get('dbms')),
+			'dbal.dbhost'				=> $this->config_php->get('dbhost'),
+			'dbal.dbuser'				=> $this->config_php->get('dbuser'),
+			'dbal.dbpasswd'				=> $this->config_php->get('dbpasswd'),
+			'dbal.dbname'				=> $this->config_php->get('dbname'),
+			'dbal.dbport'				=> $this->config_php->get('dbport'),
+			'dbal.new_link'				=> defined('PHPBB_DB_NEW_LINK') && PHPBB_DB_NEW_LINK,
+		);
+		$parameter_bag = $container->getParameterBag();
+
+		foreach ($parameters as $parameter => $value)
+		{
+			$container->setParameter($parameter, $parameter_bag->escapeValue($value));
+		}
 	}
 
 	/**
diff --git a/phpBB/phpbb/di/pass/kernel_pass.php b/phpBB/phpbb/di/pass/kernel_pass.php
deleted file mode 100644
index c154c7532d..0000000000
--- a/phpBB/phpbb/di/pass/kernel_pass.php
+++ /dev/null
@@ -1,67 +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\di\pass;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-
-class kernel_pass implements CompilerPassInterface
-{
-	/**
-	* Modify the container before it is passed to the rest of the code
-	*
-	* @param ContainerBuilder $container ContainerBuilder object
-	* @return null
-	* @throws \InvalidArgumentException
-	*/
-	public function process(ContainerBuilder $container)
-	{
-		$definition = $container->getDefinition('dispatcher');
-
-		foreach ($container->findTaggedServiceIds('kernel.event_listener') as $id => $events)
-		{
-			foreach ($events as $event)
-			{
-				$priority = isset($event['priority']) ? $event['priority'] : 0;
-
-				if (!isset($event['event']))
-				{
-					throw new \InvalidArgumentException(sprintf('Service "%1$s" must define the "event" attribute on "kernel.event_listener" tags.', $id));
-				}
-
-				if (!isset($event['method']))
-				{
-					throw new \InvalidArgumentException(sprintf('Service "%1$s" must define the "method" attribute on "kernel.event_listener" tags.', $id));
-				}
-
-				$definition->addMethodCall('addListenerService', array($event['event'], array($id, $event['method']), $priority));
-			}
-		}
-
-		foreach ($container->findTaggedServiceIds('kernel.event_subscriber') as $id => $attributes)
-		{
-			// We must assume that the class value has been correctly filled, even if the service is created by a factory
-			$class = $container->getDefinition($id)->getClass();
-
-			$refClass = new \ReflectionClass($class);
-			$interface = 'Symfony\Component\EventDispatcher\EventSubscriberInterface';
-			if (!$refClass->implementsInterface($interface))
-			{
-				throw new \InvalidArgumentException(sprintf('Service "%1$s" must implement interface "%2$s".', $id, $interface));
-			}
-
-			$definition->addMethodCall('addSubscriberService', array($id, $class));
-		}
-	}
-}