makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 11:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13891] Replaced ContainerBuilder with service_collection

Browse source 
PHPBB3-13891
This commit is contained in:
JoshyPHP 2015-06-29 22:15:08 +02:00
parent 615ab099e2
commit 119f90e363
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/config/default/container/services_console.yml
View file

@ -145,7 +145,7 @@ services:
class: phpbb\console\command\reparser\list_all class: phpbb\console\command\reparser\list_all
arguments: arguments:
- @user - @user
- @service_container - @text_reparser_collection
tags: tags:
- { name: console.command } - { name: console.command }

7
phpBB/phpbb/console/command/reparser/list_all.php
View file

@ -15,7 +15,6 @@ namespace phpbb\console\command\reparser;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder;
class list_all extends \phpbb\console\command\command class list_all extends \phpbb\console\command\command
{ {
@ -28,13 +27,13 @@ class list_all extends \phpbb\console\command\command
* Constructor * Constructor
* *
* @param \phpbb\user $user * @param \phpbb\user $user
* @param ContainerBuilder $container Container used to locate the reparsers * @param \phpbb\di\service_collection $reparsers
*/ */
public function __construct(\phpbb\user $user, ContainerBuilder $container) public function __construct(\phpbb\user $user, \phpbb\di\service_collection $reparsers)
{ {
parent::__construct($user); parent::__construct($user);
$this->reparser_names = array(); $this->reparser_names = array();
foreach (array_keys($container->findTaggedServiceIds('text_reparser.plugin')) as $name) foreach ($reparsers as $name => $reparser)
{ {
// Store the names without the "text_reparser." prefix // Store the names without the "text_reparser." prefix
$this->reparser_names[] = str_replace('text_reparser.', '', $name); $this->reparser_names[] = str_replace('text_reparser.', '', $name);

16
phpBB/phpbb/console/command/reparser/reparse.php
View file

@ -20,21 +20,21 @@ use Symfony\Component\Console\Output\OutputInterface;
class reparse extends \phpbb\console\command\command class reparse extends \phpbb\console\command\command
{ {
/** /**
* @var \phpbb\textreparser\reparser_collection * @var \phpbb\di\service_collection
*/ */
protected $reparser_collection; protected $reparsers;
/** /**
* Constructor * Constructor
* *
* @param \phpbb\user $user * @param \phpbb\user $user
* @param \phpbb\textreparser\reparser_collection $reparser_collection * @param \phpbb\di\service_collection $reparser_collection
*/ */
public function __construct(\phpbb\user $user, \phpbb\textreparser\reparser_collection $reparser_collection) public function __construct(\phpbb\user $user, \phpbb\di\service_collection $reparsers)
{ {
require_once __DIR__ . '/../../../../includes/functions_content.php'; require_once __DIR__ . '/../../../../includes/functions_content.php';
$this->reparser_collection = $reparser_collection; $this->reparsers = $reparsers;
parent::__construct($user); parent::__construct($user);
} }
@ -65,7 +65,7 @@ class reparse extends \phpbb\console\command\command
if (isset($name)) if (isset($name))
{ {
// Allow "post_text" to be an alias for "text_reparser.post_text" // Allow "post_text" to be an alias for "text_reparser.post_text"
if (!isset($this->reparser_collection[$name])) if (!isset($this->reparsers[$name]))
{ {
$name = 'text_reparser.' . $name; $name = 'text_reparser.' . $name;
} }
@ -73,7 +73,7 @@ class reparse extends \phpbb\console\command\command
} }
else else
{ {
foreach ($this->reparser_collection as $name => $service) foreach ($this->reparsers as $name => $service)
{ {
$this->reparse($output, $name); $this->reparse($output, $name);
} }
@ -91,7 +91,7 @@ class reparse extends \phpbb\console\command\command
*/ */
protected function reparse(OutputInterface $output, $name) protected function reparse(OutputInterface $output, $name)
{ {
$reparser = $this->reparser_collection[$name]; $reparser = $this->reparsers[$name];
$id = $reparser->get_max_id(); $id = $reparser->get_max_id();
$n = 100; $n = 100;
while ($id > 0) while ($id > 0)