Updated to the latest 3.1.0-RC2-dev

Nicofuma · Jul 22, 2014 · fbceade · fbceade
1 parent 35c68cf
commit fbceade
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 20 deletions.
diff --git a/console/command/cache/get.php b/console/command/cache/get.php
@@ -18,11 +18,10 @@
 
 class get extends \phpbb\console\command\command
 {
-	/** @var \phpbb\cache\driver\driver_interface */
+	/**
+	* @var \phpbb\cache\driver\driver_interface
+	*/
 	protected $cache;
-
-	/** @var \phpbb\user */
-	protected $user;
 	/**
 	* Constructor
 	*
@@ -32,11 +31,10 @@ class get extends \phpbb\console\command\command
 	public function __construct(\phpbb\user $user, \phpbb\cache\driver\driver_interface $cache)
 	{
 		$this->cache = $cache;
-		$this->user = $user;
 
 		$user->add_lang_ext('nicofuma/debugtools', 'cli');
 
-		parent::__construct();
+		parent::__construct($user);
 	}
 
 	/**

diff --git a/console/command/container/debug.php b/console/command/container/debug.php
@@ -50,11 +50,6 @@ class debug extends \phpbb\console\command\command
 	*/
 	protected $php_ext;
 
-	/**
-	* @var \phpbb\user
-	*/
-	protected $user;
-
 	/**
 	* Constructor
 	*
@@ -68,11 +63,10 @@ function __construct(\phpbb\user $user, \phpbb\config_php_file $config_php_file,
 		$this->config_php_file	= $config_php_file;
 		$this->phpbb_root_path	= $phpbb_root_path;
 		$this->php_ext			= $php_ext;
-		$this->user				= $user;
 
 		$user->add_lang_ext('nicofuma/debugtools', 'cli');
 
-		parent::__construct();
+		parent::__construct($user);
 	}
 
 	/**

diff --git a/console/command/router/debug.php b/console/command/router/debug.php
@@ -31,11 +31,6 @@ class debug extends \phpbb\console\command\command
 	*/
 	protected $controller_provider;
 
-	/**
-	* @var \phpbb\user
-	*/
-	protected $user;
-
 	/**
 	* Constructor
 	*
@@ -44,12 +39,11 @@ class debug extends \phpbb\console\command\command
 	*/
 	function __construct(\phpbb\user $user, \phpbb\controller\provider $controller_provider)
 	{
-		$this->user					= $user;
 		$this->controller_provider	= $controller_provider;
 
 		$user->add_lang_ext('nicofuma/debugtools', 'cli');
 
-		parent::__construct();
+		parent::__construct($user);
 	}
 
 	/**