diff options
Diffstat (limited to 'phpBB/phpbb/console/command/db')
| -rw-r--r-- | phpBB/phpbb/console/command/db/console_migrator_output_handler.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/console/command/db/migrate.php | 9 | ||||
| -rw-r--r-- | phpBB/phpbb/console/command/db/revert.php | 9 | 
3 files changed, 15 insertions, 5 deletions
| diff --git a/phpBB/phpbb/console/command/db/console_migrator_output_handler.php b/phpBB/phpbb/console/command/db/console_migrator_output_handler.php index b9741a3838..568b2646d4 100644 --- a/phpBB/phpbb/console/command/db/console_migrator_output_handler.php +++ b/phpBB/phpbb/console/command/db/console_migrator_output_handler.php @@ -13,8 +13,8 @@  namespace phpbb\console\command\db; +use phpbb\db\output_handler\migrator_output_handler_interface;  use phpbb\user; -use phpbb\db\migrator_output_handler_interface;  use Symfony\Component\Console\Output\OutputInterface;  class console_migrator_output_handler implements migrator_output_handler_interface diff --git a/phpBB/phpbb/console/command/db/migrate.php b/phpBB/phpbb/console/command/db/migrate.php index 43029b7458..ae4211f7be 100644 --- a/phpBB/phpbb/console/command/db/migrate.php +++ b/phpBB/phpbb/console/command/db/migrate.php @@ -12,6 +12,7 @@  */  namespace phpbb\console\command\db; +use phpbb\db\output_handler\log_wrapper_migrator_output_handler;  use Symfony\Component\Console\Input\InputInterface;  use Symfony\Component\Console\Output\OutputInterface; @@ -26,8 +27,12 @@ class migrate extends \phpbb\console\command\db\migration_command  	/** @var  \phpbb\filesystem\filesystem_interface */  	protected $filesystem; -	function __construct(\phpbb\user $user, \phpbb\db\migrator $migrator, \phpbb\extension\manager $extension_manager, \phpbb\config\config $config, \phpbb\cache\service $cache, \phpbb\log\log $log, \phpbb\filesystem\filesystem_interface $filesystem, $phpbb_root_path) +	/** @var \phpbb\language\language */ +	protected $language; + +	function __construct(\phpbb\user $user, \phpbb\language\language $language, \phpbb\db\migrator $migrator, \phpbb\extension\manager $extension_manager, \phpbb\config\config $config, \phpbb\cache\service $cache, \phpbb\log\log $log, \phpbb\filesystem\filesystem_interface $filesystem, $phpbb_root_path)  	{ +		$this->language = $language;  		$this->log = $log;  		$this->filesystem = $filesystem;  		$this->phpbb_root_path = $phpbb_root_path; @@ -45,7 +50,7 @@ class migrate extends \phpbb\console\command\db\migration_command  	protected function execute(InputInterface $input, OutputInterface $output)  	{ -		$this->migrator->set_output_handler(new \phpbb\db\log_wrapper_migrator_output_handler($this->user, new console_migrator_output_handler($this->user, $output), $this->phpbb_root_path . 'store/migrations_' . time() . '.log', $this->filesystem)); +		$this->migrator->set_output_handler(new log_wrapper_migrator_output_handler($this->language, new console_migrator_output_handler($this->user, $output), $this->phpbb_root_path . 'store/migrations_' . time() . '.log', $this->filesystem));  		$this->migrator->create_migrations_table(); diff --git a/phpBB/phpbb/console/command/db/revert.php b/phpBB/phpbb/console/command/db/revert.php index 838640968e..3fa2e17515 100644 --- a/phpBB/phpbb/console/command/db/revert.php +++ b/phpBB/phpbb/console/command/db/revert.php @@ -12,6 +12,7 @@  */  namespace phpbb\console\command\db; +use phpbb\db\output_handler\log_wrapper_migrator_output_handler;  use Symfony\Component\Console\Input\InputArgument;  use Symfony\Component\Console\Input\InputInterface;  use Symfony\Component\Console\Output\OutputInterface; @@ -24,9 +25,13 @@ class revert extends \phpbb\console\command\db\migration_command  	/** @var  \phpbb\filesystem\filesystem_interface */  	protected $filesystem; -	function __construct(\phpbb\user $user, \phpbb\db\migrator $migrator, \phpbb\extension\manager $extension_manager, \phpbb\config\config $config, \phpbb\cache\service $cache, \phpbb\filesystem\filesystem_interface $filesystem, $phpbb_root_path) +	/** @var \phpbb\language\language */ +	protected $language; + +	function __construct(\phpbb\user $user, \phpbb\language\language $language, \phpbb\db\migrator $migrator, \phpbb\extension\manager $extension_manager, \phpbb\config\config $config, \phpbb\cache\service $cache, \phpbb\filesystem\filesystem_interface $filesystem, $phpbb_root_path)  	{  		$this->filesystem = $filesystem; +		$this->language = $language;  		$this->phpbb_root_path = $phpbb_root_path;  		parent::__construct($user, $migrator, $extension_manager, $config, $cache);  		$this->user->add_lang(array('common', 'migrator')); @@ -49,7 +54,7 @@ class revert extends \phpbb\console\command\db\migration_command  	{  		$name = str_replace('/', '\\', $input->getArgument('name')); -		$this->migrator->set_output_handler(new \phpbb\db\log_wrapper_migrator_output_handler($this->user, new console_migrator_output_handler($this->user, $output), $this->phpbb_root_path . 'store/migrations_' . time() . '.log', $this->filesystem)); +		$this->migrator->set_output_handler(new log_wrapper_migrator_output_handler($this->language, new console_migrator_output_handler($this->user, $output), $this->phpbb_root_path . 'store/migrations_' . time() . '.log', $this->filesystem));  		$this->cache->purge(); | 
