diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-07-11 11:49:51 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-07-11 11:49:51 +0200 |
| commit | b2a883d504d9ece8525fcc1a4aa8e44a000db6ca (patch) | |
| tree | 81a85d5242913fa7e667b5adc873bd4a500ed406 /phpBB/install/install_update.php | |
| parent | 147b942e5c885f13181f0cb4d67cb4ccee4652df (diff) | |
| parent | 58a52fe5b90215d090ba3b992f96d401d805440c (diff) | |
| download | forums-b2a883d504d9ece8525fcc1a4aa8e44a000db6ca.tar forums-b2a883d504d9ece8525fcc1a4aa8e44a000db6ca.tar.gz forums-b2a883d504d9ece8525fcc1a4aa8e44a000db6ca.tar.bz2 forums-b2a883d504d9ece8525fcc1a4aa8e44a000db6ca.tar.xz forums-b2a883d504d9ece8525fcc1a4aa8e44a000db6ca.zip | |
Merge pull request #2671 from Nicofuma/ticket/12775
[ticket/12775] Replace functions_container with a container_builder class.
* Nicofuma/ticket/12775: (34 commits)
[ticket/12775] Set dbal.conn.driver as synthetic during installation
[ticket/12775] Add the definition of dbal.conn in fixtures/config/services.yml
[ticket/12775] Inject the connection when created in the container
[ticket/12775] Extract the vars later in install/install_update.php
[ticket/12775] Rename config_php_handler to config_php_file container_builder
[ticket/12775] Set defined_vars as a property of config_php_file
[ticket/12775] Fix doc blocks in the container builder
[ticket/12775] Remove useless includes of config.php
[ticket/12775] Move phpbb_convert_30_dbms_to_31 into the config file class
[ticket/12775] Fix comments
[ticket/12775] Update doc blocks
[ticket/12775] Fix container_builder
[ticket/12775] Rename config_php to config_php_file
[ticket/12775] Renamed to \phpbb\di\container_builder
[ticket/12775] Remove the last include of functions_container
[ticket/12775] Fix unit tests
[ticket/12775] Add tests for \phpbb\config_php
[ticket/12775] Add tests for the container factory
[ticket/12775] Use a field instead of a local var in load_config_var()
[ticket/12775] Update container and config in install/
...
Diffstat (limited to 'phpBB/install/install_update.php')
| -rw-r--r-- | phpBB/install/install_update.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index c6f771a7d5..28777a8d24 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -66,7 +66,7 @@ class install_update extends module function main($mode, $sub) { global $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language; - global $request, $phpbb_admin_path, $phpbb_adm_relative_path, $phpbb_container; + global $request, $phpbb_admin_path, $phpbb_adm_relative_path, $phpbb_container, $phpbb_config_php_file; // We must enable super globals, otherwise creating a new instance of the request class, // using the new container with a dbal connection will fail with the following PHP Notice: @@ -74,14 +74,14 @@ 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); if (file_exists($phpbb_root_path . 'install/update/new/config')) { - $phpbb_container = phpbb_create_update_container($phpbb_root_path, $phpEx, $phpbb_root_path . 'install/update/new/config'); - } - else - { - $phpbb_container = phpbb_create_update_container($phpbb_root_path, $phpEx, $phpbb_root_path . 'config'); + $phpbb_container_builder->set_config_path($phpbb_root_path . 'install/update/new/config'); } + $phpbb_container = $phpbb_container_builder->get_container(); // Writes into global $cache $cache = $phpbb_container->get('cache'); @@ -93,7 +93,7 @@ class install_update extends module $this->new_location = $phpbb_root_path . 'install/update/new/'; // Init DB - require($phpbb_root_path . 'config.' . $phpEx); + extract($phpbb_config_php_file->get_all()); require($phpbb_root_path . 'includes/constants.' . $phpEx); // Special options for conflicts/modified files @@ -102,7 +102,7 @@ class install_update extends module define('MERGE_NEW_FILE', 3); define('MERGE_MOD_FILE', 4); - $dbms = phpbb_convert_30_dbms_to_31($dbms); + $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms); $db = new $dbms(); |