aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Friedman <maf675@gmail.com>2016-03-27 09:31:47 -0700
committerMatt Friedman <maf675@gmail.com>2016-03-31 15:07:59 -0700
commitaee3eec439b39ac1f8aa79582b302a499a23acc0 (patch)
tree27c8570b5acd0d2a8601aba82c5332ff057c7a58
parent13f365916caf9b01312da3717359316faa576521 (diff)
downloadforums-aee3eec439b39ac1f8aa79582b302a499a23acc0.tar
forums-aee3eec439b39ac1f8aa79582b302a499a23acc0.tar.gz
forums-aee3eec439b39ac1f8aa79582b302a499a23acc0.tar.bz2
forums-aee3eec439b39ac1f8aa79582b302a499a23acc0.tar.xz
forums-aee3eec439b39ac1f8aa79582b302a499a23acc0.zip
[ticket/14561] Import classes with use statements
PHPBB3-14561
-rw-r--r--phpBB/phpbb/console/command/user/activate.php37
-rw-r--r--phpBB/phpbb/console/command/user/add.php32
-rw-r--r--phpBB/phpbb/console/command/user/delete.php27
-rw-r--r--phpBB/phpbb/console/command/user/reclean.php18
4 files changed, 68 insertions, 46 deletions
diff --git a/phpBB/phpbb/console/command/user/activate.php b/phpBB/phpbb/console/command/user/activate.php
index 697c1e5abe..9eab06847c 100644
--- a/phpBB/phpbb/console/command/user/activate.php
+++ b/phpBB/phpbb/console/command/user/activate.php
@@ -13,27 +13,34 @@
namespace phpbb\console\command\user;
+use phpbb\config\config;
+use phpbb\console\command\command;
+use phpbb\db\driver\driver_interface;
+use phpbb\language\language;
+use phpbb\log\log_interface;
+use phpbb\notification\manager;
+use phpbb\user;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
-class activate extends \phpbb\console\command\command
+class activate extends command
{
- /** @var \phpbb\db\driver\driver_interface */
+ /** @var driver_interface */
protected $db;
- /** @var \phpbb\config\config */
+ /** @var config */
protected $config;
- /** @var \phpbb\language\language */
+ /** @var language */
protected $language;
- /** @var \phpbb\log\log_interface */
+ /** @var log_interface */
protected $log;
- /** @var \phpbb\notification\manager */
+ /** @var manager */
protected $notifications;
/**
@@ -53,16 +60,16 @@ class activate extends \phpbb\console\command\command
/**
* Construct method
*
- * @param \phpbb\user $user
- * @param \phpbb\db\driver\driver_interface $db
- * @param \phpbb\config\config $config
- * @param \phpbb\language\language $language
- * @param \phpbb\log\log_interface $log
- * @param \phpbb\notification\manager $notifications
- * @param string $phpbb_root_path
- * @param string $php_ext
+ * @param user $user
+ * @param driver_interface $db
+ * @param config $config
+ * @param language $language
+ * @param log_interface $log
+ * @param manager $notifications
+ * @param string $phpbb_root_path
+ * @param string $php_ext
*/
- public function __construct(\phpbb\user $user, \phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\language\language $language, \phpbb\log\log_interface $log, \phpbb\notification\manager $notifications, $phpbb_root_path, $php_ext)
+ public function __construct(user $user, driver_interface $db, config $config, language $language, log_interface $log, manager $notifications, $phpbb_root_path, $php_ext)
{
$this->db = $db;
$this->config = $config;
diff --git a/phpBB/phpbb/console/command/user/add.php b/phpBB/phpbb/console/command/user/add.php
index df1f4aa54a..c60a059251 100644
--- a/phpBB/phpbb/console/command/user/add.php
+++ b/phpBB/phpbb/console/command/user/add.php
@@ -13,28 +13,34 @@
namespace phpbb\console\command\user;
+use phpbb\config\config;
+use phpbb\console\command\command;
+use phpbb\db\driver\driver_interface;
use phpbb\exception\runtime_exception;
+use phpbb\language\language;
+use phpbb\passwords\manager;
+use phpbb\user;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\Question;
use Symfony\Component\Console\Style\SymfonyStyle;
-class add extends \phpbb\console\command\command
+class add extends command
{
/** @var array Array of interactively acquired options */
protected $data;
- /** @var \phpbb\db\driver\driver_interface */
+ /** @var driver_interface */
protected $db;
- /** @var \phpbb\config\config */
+ /** @var config */
protected $config;
- /** @var \phpbb\language\language */
+ /** @var language */
protected $language;
- /** @var \phpbb\passwords\manager */
+ /** @var manager */
protected $password_manager;
/**
@@ -54,15 +60,15 @@ class add extends \phpbb\console\command\command
/**
* Construct method
*
- * @param \phpbb\user $user
- * @param \phpbb\db\driver\driver_interface $db
- * @param \phpbb\config\config $config
- * @param \phpbb\language\language $language
- * @param \phpbb\passwords\manager $password_manager
- * @param string $phpbb_root_path
- * @param string $php_ext
+ * @param user $user
+ * @param driver_interface $db
+ * @param config $config
+ * @param language $language
+ * @param manager $password_manager
+ * @param string $phpbb_root_path
+ * @param string $php_ext
*/
- public function __construct(\phpbb\user $user, \phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\language\language $language, \phpbb\passwords\manager $password_manager, $phpbb_root_path, $php_ext)
+ public function __construct(user $user, driver_interface $db, config $config, language $language, manager $password_manager, $phpbb_root_path, $php_ext)
{
$this->db = $db;
$this->config = $config;
diff --git a/phpBB/phpbb/console/command/user/delete.php b/phpBB/phpbb/console/command/user/delete.php
index 7251ecb3a5..93e75d365b 100644
--- a/phpBB/phpbb/console/command/user/delete.php
+++ b/phpBB/phpbb/console/command/user/delete.php
@@ -13,6 +13,11 @@
namespace phpbb\console\command\user;
+use phpbb\console\command\command;
+use phpbb\db\driver\driver_interface;
+use phpbb\language\language;
+use phpbb\log\log_interface;
+use phpbb\user;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
@@ -20,15 +25,15 @@ use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\ConfirmationQuestion;
use Symfony\Component\Console\Style\SymfonyStyle;
-class delete extends \phpbb\console\command\command
+class delete extends command
{
- /** @var \phpbb\db\driver\driver_interface */
+ /** @var driver_interface */
protected $db;
- /** @var \phpbb\language\language */
+ /** @var language */
protected $language;
- /** @var \phpbb\log\log_interface */
+ /** @var log_interface */
protected $log;
/**
@@ -48,14 +53,14 @@ class delete extends \phpbb\console\command\command
/**
* Construct method
*
- * @param \phpbb\user $user
- * @param \phpbb\db\driver\driver_interface $db
- * @param \phpbb\language\language $language
- * @param \phpbb\log\log_interface $log
- * @param string $phpbb_root_path
- * @param string $php_ext
+ * @param user $user
+ * @param driver_interface $db
+ * @param language $language
+ * @param log_interface $log
+ * @param string $phpbb_root_path
+ * @param string $php_ext
*/
- public function __construct(\phpbb\user $user, \phpbb\db\driver\driver_interface $db, \phpbb\language\language $language, \phpbb\log\log_interface $log, $phpbb_root_path, $php_ext)
+ public function __construct(user $user, driver_interface $db, language $language, log_interface $log, $phpbb_root_path, $php_ext)
{
$this->db = $db;
$this->language = $language;
diff --git a/phpBB/phpbb/console/command/user/reclean.php b/phpBB/phpbb/console/command/user/reclean.php
index cd5fc60a05..e2f95c16d8 100644
--- a/phpBB/phpbb/console/command/user/reclean.php
+++ b/phpBB/phpbb/console/command/user/reclean.php
@@ -13,16 +13,20 @@
namespace phpbb\console\command\user;
+use phpbb\console\command\command;
+use phpbb\db\driver\driver_interface;
+use phpbb\language\language;
+use phpbb\user;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
-class reclean extends \phpbb\console\command\command
+class reclean extends command
{
- /** @var \phpbb\db\driver\driver_interface */
+ /** @var driver_interface */
protected $db;
- /** @var \phpbb\language\language */
+ /** @var language */
protected $language;
/** @var int A count of the number of re-cleaned user names */
@@ -31,11 +35,11 @@ class reclean extends \phpbb\console\command\command
/**
* Construct method
*
- * @param \phpbb\user $user
- * @param \phpbb\db\driver\driver_interface $db
- * @param \phpbb\language\language $language
+ * @param user $user
+ * @param driver_interface $db
+ * @param language $language
*/
- public function __construct(\phpbb\user $user, \phpbb\db\driver\driver_interface $db, \phpbb\language\language $language)
+ public function __construct(user $user, driver_interface $db, language $language)
{
$this->db = $db;
$this->language = $language;