diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-09-17 20:11:23 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-09-17 20:11:23 +0200 |
| commit | dd89af715154e8719cbe8955ce86f464369e2740 (patch) | |
| tree | 929a57ec63f430cc77bc0f11d58c480ab4de6d42 /phpBB/phpbb | |
| parent | d2e1c5c86607f4a07942512d55cceb2b37500a55 (diff) | |
| parent | 910cd5edbe1e7732dd3d19903f4131172f1a0a21 (diff) | |
| download | forums-dd89af715154e8719cbe8955ce86f464369e2740.tar forums-dd89af715154e8719cbe8955ce86f464369e2740.tar.gz forums-dd89af715154e8719cbe8955ce86f464369e2740.tar.bz2 forums-dd89af715154e8719cbe8955ce86f464369e2740.tar.xz forums-dd89af715154e8719cbe8955ce86f464369e2740.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13061] Replace the service event.subscriber_loader by a compiler pass
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/di/container_builder.php | 5 | ||||
| -rw-r--r-- | phpBB/phpbb/event/extension_subscriber_loader.php | 39 |
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); - } - } - } -} |