1 files changed, 55 insertions, 21 deletions
diff --git a/phpBB/includes/compatibility_globals.php b/phpBB/includes/compatibility_globals.php
index 54c9287c96..0f403896a7 100644
--- a/phpBB/includes/compatibility_globals.php
+++ b/phpBB/includes/compatibility_globals.php
@@ -18,30 +18,64 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
-// set up caching
-$cache = $phpbb_container->get('cache');
+/**
+ * Sets compatibility globals in the global scope
+ *
+ * This function registers compatibility variables to the global
+ * variable scope. This is required to make it possible to include this file
+ * in a service.
+ */
+function register_compatibility_globals()
+{
+	global $phpbb_container;
+
+	global $cache, $phpbb_dispatcher, $request, $user, $auth, $db, $config, $phpbb_log;
+	global $symfony_request, $phpbb_filesystem, $phpbb_path_helper, $phpbb_extension_manager, $template;
+
+	// 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');
+	// Inject request instance, so only this instance is used with request_var
+	request_var('', 0, false, false, $request);
 
-// Instantiate some basic classes
-$phpbb_dispatcher = $phpbb_container->get('dispatcher');
-$request	= $phpbb_container->get('request');
-$user		= $phpbb_container->get('user');
-$auth		= $phpbb_container->get('auth');
-$db			= $phpbb_container->get('dbal.conn');
+	/* @var $user \phpbb\user */
+	$user = $phpbb_container->get('user');
 
-// make sure request_var uses this request instance
-request_var('', 0, false, false, $request); // "dependency injection" for a function
+	/* @var $auth \phpbb\auth\auth */
+	$auth = $phpbb_container->get('auth');
 
-// Grab global variables, re-cache if necessary
-$config = $phpbb_container->get('config');
-set_config(null, null, null, $config);
-set_config_count(null, null, null, $config);
+	/* @var $db \phpbb\db\driver\driver_interface */
+	$db = $phpbb_container->get('dbal.conn');
 
-$phpbb_log = $phpbb_container->get('log');
-$symfony_request = $phpbb_container->get('symfony_request');
-$phpbb_filesystem = $phpbb_container->get('filesystem');
-$phpbb_path_helper = $phpbb_container->get('path_helper');
+	// Grab global variables, re-cache if necessary
+	/* @var $config phpbb\config\db */
+	$config = $phpbb_container->get('config');
+	set_config('', '', false, $config);
+	set_config_count('', 0, false, $config);
 
-// load extensions
-$phpbb_extension_manager = $phpbb_container->get('ext.manager');
+	/* @var $phpbb_log \phpbb\log\log_interface */
+	$phpbb_log = $phpbb_container->get('log');
 
-$template = $phpbb_container->get('template');
+	/* @var $symfony_request \phpbb\symfony_request */
+	$symfony_request = $phpbb_container->get('symfony_request');
+
+	/* @var $phpbb_filesystem \phpbb\filesystem\filesystem_interface */
+	$phpbb_filesystem = $phpbb_container->get('filesystem');
+
+	/* @var $phpbb_path_helper \phpbb\path_helper */
+	$phpbb_path_helper = $phpbb_container->get('path_helper');
+
+	// load extensions
+	/* @var $phpbb_extension_manager \phpbb\extension\manager */
+	$phpbb_extension_manager = $phpbb_container->get('ext.manager');
+
+	/* @var $template \phpbb\template\template */
+	$template = $phpbb_container->get('template');
+}