diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-19 14:43:48 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-19 14:43:48 +0200 |
| commit | 5b3829aab45d4eb53207c1153fc7c71c72f0f83c (patch) | |
| tree | ceb2251546de94d432fa6160e2e6c80a8a2b50fb /phpBB/phpbb/console/command/db/migrate.php | |
| parent | 9ea44abf38f81c696163f45b074c87175c240b69 (diff) | |
| parent | d45f146814a1709a16fb8e4951374242d50b6aed (diff) | |
| download | forums-5b3829aab45d4eb53207c1153fc7c71c72f0f83c.tar forums-5b3829aab45d4eb53207c1153fc7c71c72f0f83c.tar.gz forums-5b3829aab45d4eb53207c1153fc7c71c72f0f83c.tar.bz2 forums-5b3829aab45d4eb53207c1153fc7c71c72f0f83c.tar.xz forums-5b3829aab45d4eb53207c1153fc7c71c72f0f83c.zip | |
Merge pull request #3794 from CHItA/ticket/14039
[ticket/14039] Refactoring the updater
* CHItA/ticket/14039:
[ticket/14039] Use update helper to include files in container factory
[ticket/14039] Fix inclusion logic in update helper
[ticket/14039] Fix folder creation and deleted binary file issue
[ticket/14039] Fix file check for deleted files
[ticket/14039] Fix acp link
[ticket/14039] Fix ACP link generation
[ticket/14039] Fix constants for the updater
[ticket/14039] Include phpBB constants on startup
[ticket/14039] Fix migrator's language calls
[ticket/14039] Fix misunderstandable comment in the archive file updater
[ticket/14039] Use shared language service in the container factory
[ticket/14039] Fix filesystem file updater's mkdir usage
[ticket/14039] Only show log container when it has content
[ticket/14039] Use compatibility globals from the update package
[ticket/14039] Use http_exception instead of die()
[ticket/14039] Fix T_TEMPLATE_PATH constant
[ticket/14039] Fix language constants and comments
[ticket/14039] Revamp updater
Diffstat (limited to 'phpBB/phpbb/console/command/db/migrate.php')
| -rw-r--r-- | phpBB/phpbb/console/command/db/migrate.php | 9 |
1 files changed, 7 insertions, 2 deletions
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(); |