makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11193] Instantiate a single collection_pass for all collections

Browse source 
PHPBB3-11193
This commit is contained in:
Nils Adermann 2012-11-11 18:39:24 +01:00
parent 69845585a2
commit d2a051cdd4
5 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/common.php
View file

@ -94,7 +94,7 @@ $phpbb_container = phpbb_create_dumped_container_unless_debug(
new phpbb_di_extension_core($phpbb_root_path),
),
array(
new phpbb_di_pass_collection_pass('cron.task_collection', 'cron.task'),
new phpbb_di_pass_collection_pass(),
),
$phpbb_root_path,
$phpEx

2
phpBB/config/services.yml
View file

@ -48,6 +48,8 @@ services:
class: phpbb_di_service_collection
arguments:
- @service_container
tags:
- { name: service_collection, tag: cron.task }
cron.manager:
class: phpbb_cron_manager

2
phpBB/download/file.php
View file

@ -65,7 +65,7 @@ if (isset($_GET['avatar']))
new phpbb_di_extension_core($phpbb_root_path),
),
array(
new phpbb_di_pass_collection_pass('cron.task_collection', 'cron.task'),
new phpbb_di_pass_collection_pass(),
),
$phpbb_root_path,
$phpEx

25
phpBB/includes/di/pass/collection_pass.php
View file

@ -18,17 +18,13 @@ if (!defined('IN_PHPBB'))
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
/**
* Appends an add method call to the definition of each collection service for
* the services tagged with the appropriate name defined in the collection's
* service_collection tag.
*/
class phpbb_di_pass_collection_pass implements CompilerPassInterface
{
private $collection_service;
private $service_tag;
public function __construct($collection_service, $service_tag)
{
$this->collection_service = $collection_service;
$this->service_tag = $service_tag;
}
/**
* Modify the container before it is passed to the rest of the code
*
@ -37,11 +33,14 @@ class phpbb_di_pass_collection_pass implements CompilerPassInterface
*/
public function process(ContainerBuilder $container)
{
$definition = $container->getDefinition($this->collection_service);
foreach ($container->findTaggedServiceIds($this->service_tag) as $id => $data)
foreach ($container->findTaggedServiceIds('service_collection') as $id => $data)
{
$definition->addMethodCall('add', array($id));
$definition = $container->getDefinition($id);
foreach ($container->findTaggedServiceIds($data['tag']) as $service_id => $service_data)
{
$definition->addMethodCall('add', array($service_id));
}
}
}
}

2
phpBB/install/database_update.php
View file

@ -112,7 +112,7 @@ $phpbb_container = phpbb_create_dumped_container_unless_debug(
new phpbb_di_extension_core($phpbb_root_path),
),
array(
new phpbb_di_pass_collection_pass('cron.task_collection', 'cron.task'),
new phpbb_di_pass_collection_pass(),
),
$phpbb_root_path,
$phpEx