3 files changed, 9 insertions, 6 deletions
diff --git a/phpBB/phpbb/console/command/cache/purge.php b/phpBB/phpbb/console/command/cache/purge.php
index ec8229200c..d0c2ef6f72 100644
--- a/phpBB/phpbb/console/command/cache/purge.php
+++ b/phpBB/phpbb/console/command/cache/purge.php
@@ -26,7 +26,7 @@ class purge extends \phpbb\console\command\command
 	/** @var \phpbb\auth\auth */
 	protected $auth;
 
-	/** @var \phpbb\log\log */
+	/** @var \phpbb\log\log_interface */
 	protected $log;
 
 	/** @var \phpbb\config\config */
@@ -42,7 +42,7 @@ class purge extends \phpbb\console\command\command
 	* @param \phpbb\log\log							$log	Logger instance
 	* @param \phpbb\config\config					$config	Config instance
 	*/
-	public function __construct(\phpbb\user $user, \phpbb\cache\driver\driver_interface $cache, \phpbb\db\driver\driver_interface $db, \phpbb\auth\auth $auth, \phpbb\log\log $log, \phpbb\config\config $config)
+	public function __construct(\phpbb\user $user, \phpbb\cache\driver\driver_interface $cache, \phpbb\db\driver\driver_interface $db, \phpbb\auth\auth $auth, \phpbb\log\log_interface $log, \phpbb\config\config $config)
 	{
 		$this->cache = $cache;
 		$this->db = $db;
diff --git a/phpBB/phpbb/console/command/db/migrate.php b/phpBB/phpbb/console/command/db/migrate.php
index c3caae5f70..c760cde5b5 100644
--- a/phpBB/phpbb/console/command/db/migrate.php
+++ b/phpBB/phpbb/console/command/db/migrate.php
@@ -55,6 +55,8 @@ class migrate extends \phpbb\console\command\command
 	{
 		$this->migrator->create_migrations_table();
 
+		$this->cache->purge();
+
 		$this->load_migrations();
 		$orig_version = $this->config['version'];
 		while (!$this->migrator->finished())
@@ -119,6 +121,7 @@ class migrate extends \phpbb\console\command\command
 			->core_path('phpbb/db/migration/data/')
 			->extension_directory('/migrations')
 			->get_classes();
+
 		$this->migrator->set_migrations($migrations);
 	}
 
diff --git a/phpBB/phpbb/console/command/extension/show.php b/phpBB/phpbb/console/command/extension/show.php
index 6ce9607098..f9322034d7 100644
--- a/phpBB/phpbb/console/command/extension/show.php
+++ b/phpBB/phpbb/console/command/extension/show.php
@@ -37,22 +37,22 @@ class show extends command
 		}
 
 		$enabled = array_keys($this->manager->all_enabled());
-		$this->print_extension_list($output, 'Enabled', $enabled);
+		$this->print_extension_list($output, $this->user->lang('CLI_EXTENSIONS_ENABLED') . $this->user->lang('COLON'), $enabled);
 
 		$output->writeln('');
 
 		$disabled = array_keys($this->manager->all_disabled());
-		$this->print_extension_list($output, 'Disabled', $disabled);
+		$this->print_extension_list($output, $this->user->lang('CLI_EXTENSIONS_DISABLED') . $this->user->lang('COLON'), $disabled);
 
 		$output->writeln('');
 
 		$purged = array_diff($all, $enabled, $disabled);
-		$this->print_extension_list($output, 'Available', $purged);
+		$this->print_extension_list($output, $this->user->lang('CLI_EXTENSIONS_AVAILABLE') . $this->user->lang('COLON'), $purged);
 	}
 
 	protected function print_extension_list(OutputInterface $output, $type, array $extensions)
 	{
-		$output->writeln("<info>$type:</info>");
+		$output->writeln("<info>$type</info>");
 
 		foreach ($extensions as $extension)
 		{