aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2013-09-13 09:52:02 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2013-09-13 09:52:02 -0500
commitaa710df2db2512f6065f91dcf8b5fc7d100edf41 (patch)
tree89ae712128b68db41237e032315dcbf17dea1108 /phpBB/common.php
parentMerge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832 (diff)
downloadphpbb-aa710df2db2512f6065f91dcf8b5fc7d100edf41.tar.gz
phpbb-aa710df2db2512f6065f91dcf8b5fc7d100edf41.tar.bz2
phpbb-aa710df2db2512f6065f91dcf8b5fc7d100edf41.zip
[ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request
Now symfony_request is also a service (removed the function phpbb_create_symfony_request). Inject symfony request into filesystem Cleanup for the tests PHPBB3-11832
Diffstat (limited to 'phpBB/common.php')
-rw-r--r--phpBB/common.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index bfbc5989aa..43beb86972 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -101,7 +101,6 @@ $cache = $phpbb_container->get('cache');
// Instantiate some basic classes
$phpbb_dispatcher = $phpbb_container->get('dispatcher');
-$phpbb_filesystem = $phpbb_container->get('filesystem');
$request = $phpbb_container->get('request');
$user = $phpbb_container->get('user');
$auth = $phpbb_container->get('auth');
@@ -111,7 +110,8 @@ $db = $phpbb_container->get('dbal.conn');
request_var('', 0, false, false, $request); // "dependency injection" for a function
// Create a Symfony Request object from our phpbb_request object
-$symfony_request = phpbb_create_symfony_request($request);
+$symfony_request = $phpbb_container->get('symfony_request');
+$phpbb_filesystem = $phpbb_container->get('filesystem');
// Grab global variables, re-cache if necessary
$config = $phpbb_container->get('config');