3 files changed, 8 insertions, 4 deletions
diff --git a/phpBB/phpbb/di/extension/core.php b/phpBB/phpbb/di/extension/core.php
index 2faeff3636..29c0b0e44e 100644
--- a/phpBB/phpbb/di/extension/core.php
+++ b/phpBB/phpbb/di/extension/core.php
@@ -24,6 +24,8 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 */
 class core extends Extension
 {
+	const TWIG_OPTIONS_POSITION = 6;
+
 	/**
 	 * Config path
 	 * @var string
@@ -71,7 +73,7 @@ class core extends Extension
 
 		// Set the Twig options if defined in the environment
 		$definition = $container->getDefinition('template.twig.environment');
-		$twig_environment_options = $definition->getArgument(6);
+		$twig_environment_options = $definition->getArgument(static::TWIG_OPTIONS_POSITION);
 		if ($config['twig']['debug'])
 		{
 			$twig_environment_options['debug'] = true;
@@ -82,7 +84,7 @@ class core extends Extension
 		}
 
 		// Replace the 7th argument, the options passed to the environment
-		$definition->replaceArgument(6, $twig_environment_options);
+		$definition->replaceArgument(static::TWIG_OPTIONS_POSITION, $twig_environment_options);
 
 		if ($config['twig']['enable_debug_extension'])
 		{
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 829f64b780..20b89aba4e 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -389,7 +389,8 @@ class phpbb_functional_test_case extends phpbb_test_case
 
 		$blacklist = ['phpbb_class_loader_mock', 'phpbb_class_loader_ext', 'phpbb_class_loader'];
 
-		foreach (array_keys($GLOBALS) as $key) {
+		foreach (array_keys($GLOBALS) as $key)
+		{
 			if (is_object($GLOBALS[$key]) && !in_array($key, $blacklist, true))
 			{
 				unset($GLOBALS[$key]);
diff --git a/tests/test_framework/phpbb_ui_test_case.php b/tests/test_framework/phpbb_ui_test_case.php
index e79c78db29..c8ca2a9003 100644
--- a/tests/test_framework/phpbb_ui_test_case.php
+++ b/tests/test_framework/phpbb_ui_test_case.php
@@ -261,7 +261,8 @@ class phpbb_ui_test_case extends phpbb_test_case
 
 		$blacklist = ['phpbb_class_loader_mock', 'phpbb_class_loader_ext', 'phpbb_class_loader'];
 
-		foreach (array_keys($GLOBALS) as $key) {
+		foreach (array_keys($GLOBALS) as $key)
+		{
 			if (is_object($GLOBALS[$key]) && !in_array($key, $blacklist, true))
 			{
 				unset($GLOBALS[$key]);