diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-04-16 20:44:02 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-04-16 20:44:02 +0200 |
| commit | f077b72d0ddabd13350bea276069b68d5df4a89c (patch) | |
| tree | d072352cd49d016b203a2e1de5464cfd9b9dd0c8 /phpBB/phpbb/console | |
| parent | db9ef52fdd40e2ae8118f458bd12eda540b57bd3 (diff) | |
| parent | 4bdef6fd21a5dcab455b0cd1ee2652de606929c3 (diff) | |
| download | forums-f077b72d0ddabd13350bea276069b68d5df4a89c.tar forums-f077b72d0ddabd13350bea276069b68d5df4a89c.tar.gz forums-f077b72d0ddabd13350bea276069b68d5df4a89c.tar.bz2 forums-f077b72d0ddabd13350bea276069b68d5df4a89c.tar.xz forums-f077b72d0ddabd13350bea276069b68d5df4a89c.zip | |
Merge pull request #3487 from MateBartus/ticket/13697
[ticket/13697] Moving filesystem related functions to filesystem service
Diffstat (limited to 'phpBB/phpbb/console')
| -rw-r--r-- | phpBB/phpbb/console/command/db/migrate.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/phpbb/console/command/db/migrate.php b/phpBB/phpbb/console/command/db/migrate.php index 87c2a057d1..2490bf1310 100644 --- a/phpBB/phpbb/console/command/db/migrate.php +++ b/phpBB/phpbb/console/command/db/migrate.php @@ -35,13 +35,17 @@ class migrate extends \phpbb\console\command\command /** @var string phpBB root path */ protected $phpbb_root_path; - 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_root_path) + /** @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) { $this->migrator = $migrator; $this->extension_manager = $extension_manager; $this->config = $config; $this->cache = $cache; $this->log = $log; + $this->filesystem = $filesystem; $this->phpbb_root_path = $phpbb_root_path; parent::__construct($user); $this->user->add_lang(array('common', 'install', 'migrator')); @@ -57,7 +61,7 @@ class migrate extends \phpbb\console\command\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->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->create_migrations_table(); |