diff options
| author | David King <imkingdavid@gmail.com> | 2012-09-13 16:56:09 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2012-09-13 16:56:09 -0400 |
| commit | 298fa894e7ea0807a295cd0ed55cabef8a27a3f3 (patch) | |
| tree | 8ff2599767ad3a959f759a692f154839e99da4cd /phpBB | |
| parent | 503989979a2e6a7fb9d64ed249b09a0bef2b2f95 (diff) | |
| download | forums-298fa894e7ea0807a295cd0ed55cabef8a27a3f3.tar forums-298fa894e7ea0807a295cd0ed55cabef8a27a3f3.tar.gz forums-298fa894e7ea0807a295cd0ed55cabef8a27a3f3.tar.bz2 forums-298fa894e7ea0807a295cd0ed55cabef8a27a3f3.tar.xz forums-298fa894e7ea0807a295cd0ed55cabef8a27a3f3.zip | |
[ticket/11086] Move DI processing below $request definition
As per PR #991 (ticket/11101).
PHPBB3-11086
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install/database_update.php | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 323ba0c876..5fa6166913 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -119,7 +119,6 @@ $loader->load('services.yml'); // is not yet set up require($phpbb_root_path . 'includes/di/processor/interface.' . $phpEx); require($phpbb_root_path . 'includes/di/processor/config.' . $phpEx); - $processor = new phpbb_di_processor_config($phpbb_root_path . 'config.' . $phpEx, $phpbb_root_path, $phpEx); $processor->process($phpbb_container); @@ -127,13 +126,6 @@ $processor->process($phpbb_container); $phpbb_class_loader = $phpbb_container->get('class_loader'); $phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext'); -$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor')); -foreach ($ids as $id) -{ - $processor = $phpbb_container->get($id); - $processor->process($phpbb_container); -} - // set up caching $cache = $phpbb_container->get('cache'); @@ -144,6 +136,13 @@ $user = $phpbb_container->get('user'); $auth = $phpbb_container->get('auth'); $db = $phpbb_container->get('dbal.conn'); +$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor')); +foreach ($ids as $id) +{ + $processor = $phpbb_container->get($id); + $processor->process($phpbb_container); +} + // make sure request_var uses this request instance request_var('', 0, false, false, $request); // "dependency injection" for a function |