diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-04-26 19:41:07 +0200 |
|---|---|---|
| committer | Nicofuma <github@nicofuma.fr> | 2015-05-14 23:04:03 +0200 |
| commit | c96e7ef1711932c2236620903bc256b346514dfc (patch) | |
| tree | de827ea68dc8328767003b50ca7ef43cde17ce58 /phpBB/install/install_update.php | |
| parent | 0b8632e7504a2ea46cdcc7493f15043b056f4af2 (diff) | |
| download | forums-c96e7ef1711932c2236620903bc256b346514dfc.tar forums-c96e7ef1711932c2236620903bc256b346514dfc.tar.gz forums-c96e7ef1711932c2236620903bc256b346514dfc.tar.bz2 forums-c96e7ef1711932c2236620903bc256b346514dfc.tar.xz forums-c96e7ef1711932c2236620903bc256b346514dfc.zip | |
[ticket/13770] Wither interface for container_builder
PHPBB3-13770
Diffstat (limited to 'phpBB/install/install_update.php')
| -rw-r--r-- | phpBB/install/install_update.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 288e728fce..d9ba2e7fe9 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -76,12 +76,16 @@ class install_update extends module $request->enable_super_globals(); // Create a normal container now - $phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx); - $phpbb_container_builder->set_dump_container(false); - $phpbb_container_builder->set_use_extensions(false); + $phpbb_container_builder = new \phpbb\di\container_builder($phpbb_root_path, $phpEx); + $phpbb_container = $phpbb_container_builder + ->with_config($phpbb_config_php_file) + ->without_cache() + ->without_extensions() + ; + if (file_exists($phpbb_root_path . 'install/update/new/config')) { - $phpbb_container_builder->set_config_path($phpbb_root_path . 'install/update/new/config'); + $phpbb_container_builder->with_config_path($phpbb_root_path . 'install/update/new/config'); } $phpbb_container = $phpbb_container_builder->get_container(); |