diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2015-01-14 12:34:28 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2015-01-14 12:34:28 +0100 |
| commit | 98937a7a18dc605c6d3bb8a3f20f124ec71e058a (patch) | |
| tree | 188b7b5c0741a7fd5ea54d322b9f394a21c1fe28 /phpBB/install/database_update.php | |
| parent | 853733a0eb04f917fe3195ed9f36cfcf643deffd (diff) | |
| parent | b5544b2f471ce4c93b08d19919ab062725545ce8 (diff) | |
| download | forums-98937a7a18dc605c6d3bb8a3f20f124ec71e058a.tar forums-98937a7a18dc605c6d3bb8a3f20f124ec71e058a.tar.gz forums-98937a7a18dc605c6d3bb8a3f20f124ec71e058a.tar.bz2 forums-98937a7a18dc605c6d3bb8a3f20f124ec71e058a.tar.xz forums-98937a7a18dc605c6d3bb8a3f20f124ec71e058a.zip | |
Merge pull request #3289 from MGaetan89/ticket/13450
[ticket/13450] Type-hint return value of $phpbb_container->get()
* MGaetan89/ticket/13450:
[ticket/13450] Type-hint return value of $phpbb_container->get()
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 0dc86c2051..c5ddf9e6e9 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -87,20 +87,33 @@ $phpbb_container_builder->set_dump_container(false); $phpbb_container = $phpbb_container_builder->get_container(); // set up caching +/* @var $cache \phpbb\cache\service */ $cache = $phpbb_container->get('cache'); // Instantiate some basic classes +/* @var $phpbb_dispatcher \phpbb\event\dispatcher */ $phpbb_dispatcher = $phpbb_container->get('dispatcher'); + +/* @var $request \phpbb\request\request_interface */ $request = $phpbb_container->get('request'); + +/* @var $user \phpbb\user */ $user = $phpbb_container->get('user'); + +/* @var $auth \phpbb\auth\auth */ $auth = $phpbb_container->get('auth'); + +/* @var $db \phpbb\db\driver\driver_interface */ $db = $phpbb_container->get('dbal.conn'); + +/* @var $phpbb_log \phpbb\log\log_interface */ $phpbb_log = $phpbb_container->get('log'); // make sure request_var uses this request instance request_var('', 0, false, false, $request); // "dependency injection" for a function // Grab global variables, re-cache if necessary +/* @var $config \phpbb\config\config */ $config = $phpbb_container->get('config'); set_config(null, null, null, $config); set_config_count(null, null, null, $config); @@ -120,6 +133,7 @@ if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx)) require($phpbb_root_path . 'includes/hooks/index.' . $phpEx); $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display'))); + /* @var $phpbb_hook_finder \phpbb\hook\finder */ $phpbb_hook_finder = $phpbb_container->get('hook_finder'); foreach ($phpbb_hook_finder->find() as $hook) { @@ -172,11 +186,13 @@ define('IN_DB_UPDATE', true); // End startup code +/* @var $migrator \phpbb\db\migrator */ $migrator = $phpbb_container->get('migrator'); $migrator->set_output_handler(new \phpbb\db\log_wrapper_migrator_output_handler($user, new \phpbb\db\html_migrator_output_handler($user), $phpbb_root_path . 'store/migrations_' . time() . '.log')); $migrator->create_migrations_table(); +/* @var $phpbb_extension_manager \phpbb\extension\manager */ $phpbb_extension_manager = $phpbb_container->get('ext.manager'); $migrations = $phpbb_extension_manager |