mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* develop-ascraeus:
  [ticket/13061] Replace the service event.subscriber_loader by a compiler pass
This commit is contained in:
Joas Schilling
2014-09-17 20:11:23 +02:00
parent d2e1c5c866 910cd5edbe
commit dd89af7151
5 changed files with 4 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/phpbb/di/container_builder.php
View File

@@ -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'));
}
}

39
phpBB/phpbb/event/extension_subscriber_loader.php
View File

@@ -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);
}
}
}
}