diff options
| author | Mate Bartus <mate.bartus@gmail.com> | 2016-02-12 14:20:04 +0100 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2016-02-12 14:31:28 +0100 |
| commit | 68091561abef2c2f0674e3a461401f10f2ef5a25 (patch) | |
| tree | e86834eee8576b7f2a39274414d24663f724356f /phpBB/phpbb/install/module/install_finish | |
| parent | 955b9ede33c5696173a760ea271ec32d79e843b9 (diff) | |
| download | forums-68091561abef2c2f0674e3a461401f10f2ef5a25.tar forums-68091561abef2c2f0674e3a461401f10f2ef5a25.tar.gz forums-68091561abef2c2f0674e3a461401f10f2ef5a25.tar.bz2 forums-68091561abef2c2f0674e3a461401f10f2ef5a25.tar.xz forums-68091561abef2c2f0674e3a461401f10f2ef5a25.zip | |
[ticket/14462] Refactor tasks to be more modular
PHPBB3-14462
Diffstat (limited to 'phpBB/phpbb/install/module/install_finish')
| -rw-r--r-- | phpBB/phpbb/install/module/install_finish/task/notify_user.php | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/install/module/install_finish/task/populate_migrations.php | 24 |
2 files changed, 27 insertions, 3 deletions
diff --git a/phpBB/phpbb/install/module/install_finish/task/notify_user.php b/phpBB/phpbb/install/module/install_finish/task/notify_user.php index 5268b85a42..292be57f5f 100644 --- a/phpBB/phpbb/install/module/install_finish/task/notify_user.php +++ b/phpBB/phpbb/install/module/install_finish/task/notify_user.php @@ -87,9 +87,13 @@ class notify_user extends \phpbb\install\task_base $this->php_ext = $php_ext; // We need to reload config for cases when it doesn't have all values + /** @var \phpbb\cache\driver\driver_interface $cache */ + $cache = $container->get('cache.driver'); + $cache->destroy('config'); + $this->config = new db( $container->get('dbal.conn'), - $container->get('cache.driver'), + $cache, $container->get_parameter('tables.config') ); diff --git a/phpBB/phpbb/install/module/install_finish/task/populate_migrations.php b/phpBB/phpbb/install/module/install_finish/task/populate_migrations.php index 8629d9aea3..34541c361e 100644 --- a/phpBB/phpbb/install/module/install_finish/task/populate_migrations.php +++ b/phpBB/phpbb/install/module/install_finish/task/populate_migrations.php @@ -13,12 +13,21 @@ namespace phpbb\install\module\install_finish\task; +use phpbb\install\exception\resource_limit_reached_exception; +use phpbb\install\helper\config; +use phpbb\install\helper\container_factory; + /** * Populates migrations */ class populate_migrations extends \phpbb\install\task_base { /** + * @var config + */ + protected $config; + + /** * @var \phpbb\extension\manager */ protected $extension_manager; @@ -31,10 +40,12 @@ class populate_migrations extends \phpbb\install\task_base /** * Constructor * - * @param \phpbb\install\helper\container_factory $container phpBB's DI contianer + * @param config $config Installer's config + * @param container_factory $container phpBB's DI contianer */ - public function __construct(\phpbb\install\helper\container_factory $container) + public function __construct(config $config, container_factory $container) { + $this->config = $config; $this->extension_manager = $container->get('ext.manager'); $this->migrator = $container->get('migrator'); @@ -46,6 +57,15 @@ class populate_migrations extends \phpbb\install\task_base */ public function run() { + if (!$this->config->get('populate_migration_refresh_before', false)) + { + if ($this->config->get_time_remaining() < 1) + { + $this->config->set('populate_migration_refresh_before', true); + throw new resource_limit_reached_exception(); + } + } + $finder = $this->extension_manager->get_finder(); $migrations = $finder |