aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorCarlo <carlo@phpbbitalia.net>2014-07-15 11:36:51 +0200
committerCarlo <carlo@phpbbitalia.net>2014-07-15 11:36:51 +0200
commit15136e4f8e36ca972f6b1b0bb7a4867967698335 (patch)
tree43506c468517ff4a2d1101efcfc3a96596a8ebb1 /phpBB
parenta54f1275d03b4fcccfa1005cce5cae2f344e567e (diff)
downloadforums-15136e4f8e36ca972f6b1b0bb7a4867967698335.tar
forums-15136e4f8e36ca972f6b1b0bb7a4867967698335.tar.gz
forums-15136e4f8e36ca972f6b1b0bb7a4867967698335.tar.bz2
forums-15136e4f8e36ca972f6b1b0bb7a4867967698335.tar.xz
forums-15136e4f8e36ca972f6b1b0bb7a4867967698335.zip
[ticket/12685] Inject console.command_collection instead of the container
PHPBB3-12685
Diffstat (limited to 'phpBB')
-rwxr-xr-xphpBB/bin/phpbbcli.php2
-rw-r--r--phpBB/phpbb/console/application.php6
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/bin/phpbbcli.php b/phpBB/bin/phpbbcli.php
index 5fac2cf8b3..d181a63f68 100755
--- a/phpBB/bin/phpbbcli.php
+++ b/phpBB/bin/phpbbcli.php
@@ -58,5 +58,5 @@ $user = $phpbb_container->get('user');
$user->add_lang('acp/common');
$application = new \phpbb\console\application('phpBB Console', PHPBB_VERSION, $user);
-$application->register_container_commands($phpbb_container);
+$application->register_container_commands($phpbb_container->get('console.command_collection'));
$application->run($input);
diff --git a/phpBB/phpbb/console/application.php b/phpBB/phpbb/console/application.php
index 5cda90208a..5202a1fbaf 100644
--- a/phpBB/phpbb/console/application.php
+++ b/phpBB/phpbb/console/application.php
@@ -80,11 +80,11 @@ class application extends \Symfony\Component\Console\Application
/**
* Register a set of commands from the container
*
- * @param ContainerInterface $container The container
+ * @param \phpbb\di\service_collection $command_collection The console service collection
*/
- public function register_container_commands(ContainerInterface $container)
+ public function register_container_commands(\phpbb\di\service_collection $command_collection)
{
- foreach ($container->get('console.command_collection') as $service_command)
+ foreach ($command_collection as $service_command)
{
$this->add($service_command);
}