From 73ea5daf97bf5447b9bb2ff912cce4a9ea21c58e Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 5 Nov 2013 19:42:34 +0100
Subject: [PATCH] [ticket/11998] Add phpBB abstraction for application and
 command.

PHPBB3-11998
---
 phpBB/bin/phpbbcli.php                        |  9 ++------
 phpBB/phpbb/console/application.php           | 23 +++++++++++++++++++
 phpBB/phpbb/console/command/command.php       | 14 +++++++++++
 .../command/fixup/recalculate_email_hash.php  |  3 +--
 4 files changed, 40 insertions(+), 9 deletions(-)
 create mode 100644 phpBB/phpbb/console/application.php
 create mode 100644 phpBB/phpbb/console/command/command.php

diff --git a/phpBB/bin/phpbbcli.php b/phpBB/bin/phpbbcli.php
index e367748fd9..05e2597960 100644
--- a/phpBB/bin/phpbbcli.php
+++ b/phpBB/bin/phpbbcli.php
@@ -7,8 +7,6 @@
 *
 */
 
-use Symfony\Component\Console\Application;
-
 if (php_sapi_name() != 'cli')
 {
 	echo 'This program must be run from the command line.' . PHP_EOL;
@@ -32,9 +30,6 @@ $phpbb_class_loader_ext->register();
 
 $phpbb_container = phpbb_create_update_container($phpbb_root_path, $phpEx, "$phpbb_root_path/config");
 
-$application = new Application('phpBB Console', PHPBB_VERSION);
-foreach($phpbb_container->findTaggedServiceIds('console.command') as $id => $void)
-{
-	$application->add($phpbb_container->get($id));
-}
+$application = new \phpbb\console\application('phpBB Console', PHPBB_VERSION);
+$application->register_container_commands($phpbb_container);
 $application->run();
diff --git a/phpBB/phpbb/console/application.php b/phpBB/phpbb/console/application.php
new file mode 100644
index 0000000000..fdcd9d42f6
--- /dev/null
+++ b/phpBB/phpbb/console/application.php
@@ -0,0 +1,23 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\console;
+
+use Symfony\Component\DependencyInjection\TaggedContainerInterface;
+
+class application extends \Symfony\Component\Console\Application
+{
+	function register_container_commands(TaggedContainerInterface $container, $tag = 'console.command')
+	{
+		foreach($container->findTaggedServiceIds($tag) as $id => $void)
+		{
+			$this->add($container->get($id));
+		}
+	}
+}
diff --git a/phpBB/phpbb/console/command/command.php b/phpBB/phpbb/console/command/command.php
new file mode 100644
index 0000000000..6abbdd203c
--- /dev/null
+++ b/phpBB/phpbb/console/command/command.php
@@ -0,0 +1,14 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\console\command;
+
+abstract class command extends \Symfony\Component\Console\Command\Command
+{
+}
diff --git a/phpBB/phpbb/console/command/fixup/recalculate_email_hash.php b/phpBB/phpbb/console/command/fixup/recalculate_email_hash.php
index b788fe5631..04db880091 100644
--- a/phpBB/phpbb/console/command/fixup/recalculate_email_hash.php
+++ b/phpBB/phpbb/console/command/fixup/recalculate_email_hash.php
@@ -8,11 +8,10 @@
 */
 namespace phpbb\console\command\fixup;
 
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class recalculate_email_hash extends Command
+class recalculate_email_hash extends \phpbb\console\command\command
 {
 	/** @var \phpbb\db\driver\driver */
 	protected $db;