[ticket/12692] Move the language strings to cli.php

PHPBB3-12692

phpBB/config/default/container/services_console.yml

@@ -160,8 +160,8 @@ services:
     console.command.thumbnail.generate:
         class: phpbb\console\command\thumbnail\generate
         arguments:
-            - @dbal.conn
             - @user
+            - @dbal.conn
             - @cache
             - %core.root_path%
             - %core.php_ext%
@@ -178,8 +178,8 @@ services:
     console.command.thumbnail.delete:
         class: phpbb\console\command\thumbnail\delete
         arguments:
-            - @dbal.conn
             - @user
+            - @dbal.conn
             - %core.root_path%
         tags:
             - { name: console.command }

phpBB/language/en/cli.php

@@ -72,6 +72,10 @@ $lang = array_merge($lang, array(
 	'CLI_DESCRIPTION_SET_ATOMIC_CONFIG'			=> 'Sets a configuration option’s value only if the old matches the current value',
 	'CLI_DESCRIPTION_SET_CONFIG'				=> 'Sets a configuration option’s value',
 
+	'CLI_DESCRIPTION_THUMBNAIL_DELETE'		=> 'Delete all existing thumbnails.',
+	'CLI_DESCRIPTION_THUMBNAIL_GENERATE'	=> 'Generate all missing thumbnails.',
+	'CLI_DESCRIPTION_THUMBNAIL_RECREATE'	=> 'Recreate all thumbnails.',
+
 	'CLI_EXTENSION_DISABLE_FAILURE'		=> 'Could not disable extension %s',
 	'CLI_EXTENSION_DISABLE_SUCCESS'		=> 'Successfully disabled extension %s',
 	'CLI_EXTENSION_ENABLE_FAILURE'		=> 'Could not enable extension %s',
@@ -80,13 +84,16 @@ $lang = array_merge($lang, array(
 	'CLI_EXTENSION_PURGE_FAILURE'		=> 'Could not purge extension %s',
 	'CLI_EXTENSION_PURGE_SUCCESS'		=> 'Successfully purged extension %s',
 	'CLI_EXTENSION_NOT_FOUND'			=> 'No extensions were found.',
-	'CLI_EXTENSIONS_AVAILABLE'			=> 'Available',
-	'CLI_EXTENSIONS_DISABLED'			=> 'Disabled',
-	'CLI_EXTENSIONS_ENABLED'			=> 'Enabled',
 
 	'CLI_FIXUP_RECALCULATE_EMAIL_HASH_SUCCESS'	=> 'Successfully recalculated all email hashes.',
 
 	'CLI_REPARSER_REPARSE_REPARSING'		=> 'Reparsing %1$s (range %2$d..%3$d)',
 	'CLI_REPARSER_REPARSE_REPARSING_START'	=> 'Reparsing %s...',
 	'CLI_REPARSER_REPARSE_SUCCESS'			=> 'Reparsing ended with success',
+	
+	// In all the case %1$s is the logical name of the file and %2$s the real name on the filesystem
+	// eg: big_image.png (2_a51529ae7932008cf8454a95af84cacd) generated.
+	'THUMBNAIL_DELETED'		=> '%1$s (%2$s) deleted.',
+	'THUMBNAIL_SKIPPED'		=> '%1$s (%2$s) skipped.',
+	'THUMBNAIL_GENERATED'	=> '%1$s (%2$s) generated.',
 ));

phpBB/phpbb/console/command/thumbnail/delete.php

@@ -13,17 +13,15 @@
 namespace phpbb\console\command\thumbnail;
 
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class delete extends \phpbb\console\command\command
 {
-	/** @var \phpbb\db\driver\driver_interface */
+	/**
+	* @var \phpbb\db\driver\driver_interface
+	*/
 	protected $db;
 
-	/** @var \phpbb\user */
-	protected $user;
-
 	/**
 	* phpBB root path
 	* @var string
@@ -33,16 +31,16 @@ class delete extends \phpbb\console\command\command
 	/**
 	* Constructor
 	*
-	* @param \phpbb\db\driver\driver_interface $db Database connection
 	* @param \phpbb\user $user The user object (used to get language information)
+	* @param \phpbb\db\driver\driver_interface $db Database connection
 	* @param string $phpbb_root_path Root path
 	*/
-	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\user $user, $phpbb_root_path)
+	public function __construct(\phpbb\user $user, \phpbb\db\driver\driver_interface $db, $phpbb_root_path)
 	{
 		$this->db = $db;
-		$this->user = $user;
 		$this->phpbb_root_path = $phpbb_root_path;
-		parent::__construct();
+
+		parent::__construct($user);
 	}
 
 	/**

phpBB/phpbb/console/command/thumbnail/generate.php

@@ -17,13 +17,14 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class generate extends \phpbb\console\command\command
 {
-	/** @var \phpbb\db\driver\driver_interface */
+	/**
+	* @var \phpbb\db\driver\driver_interface
+	*/
 	protected $db;
 
-	/** @var \phpbb\user */
+	/**
-	protected $user;
+	* @var \phpbb\cache\service
-
+	*/
-	/** @var \phpbb\cache\service */
 	protected $cache;
 
 	/**
@@ -42,20 +43,20 @@ class generate extends \phpbb\console\command\command
 	/**
 	* Constructor
 	*
-	* @param \phpbb\db\driver\driver_interface $db Database connection
 	* @param \phpbb\user $user The user object (used to get language information)
+	* @param \phpbb\db\driver\driver_interface $db Database connection
 	* @param \phpbb\cache\service $cache The cache service
 	* @param string $phpbb_root_path Root path
 	* @param string $php_ext PHP extension
 	*/
-	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\user $user, \phpbb\cache\service $cache, $phpbb_root_path, $php_ext)
+	public function __construct(\phpbb\user $user, \phpbb\db\driver\driver_interface $db, \phpbb\cache\service $cache, $phpbb_root_path, $php_ext)
 	{
 		$this->db = $db;
-		$this->user = $user;
 		$this->cache = $cache;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
-		parent::__construct();
+
+		parent::__construct($user);
 	}
 
 	/**

phpBB/phpbb/console/command/thumbnail/recreate.php

@@ -18,20 +18,6 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class recreate extends \phpbb\console\command\command
 {
-	/** @var \phpbb\user */
-	protected $user;
-
-	/**
-	* Constructor
-	*
-	* @param \phpbb\user $user The user object (used to get language information)
-	*/
-	public function __construct(\phpbb\user $user)
-	{
-		$this->user = $user;
-		parent::__construct();
-	}
-
 	/**
 	* Sets the command name and description
 	*

tests/console/thumbnail_test.php

@@ -56,8 +56,8 @@ class phpbb_console_command_thumbnail_test extends phpbb_database_test_case
 		)));
 
 		$this->application = new Application();
-		$this->application->add(new generate($this->db, $this->user, $this->cache, $this->phpbb_root_path, $this->phpEx));
+		$this->application->add(new generate($this->user, $this->db, $this->cache, $this->phpbb_root_path, $this->phpEx));
-		$this->application->add(new delete($this->db, $this->user, $this->phpbb_root_path));
+		$this->application->add(new delete($this->user, $this->db, $this->phpbb_root_path));
 		$this->application->add(new recreate($this->user));
 	}