From 7a65b0cc4ea172446064d4f83b74438a9dacef09 Mon Sep 17 00:00:00 2001 From: Nicofuma Date: Tue, 19 May 2015 21:59:41 +0200 Subject: [PATCH 1/2] [ticket/13849] Fix development environment PHPBB3-13849 --- phpBB/phpbb/di/extension/core.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/phpbb/di/extension/core.php b/phpBB/phpbb/di/extension/core.php index c9e2d4dc5b..91b321a684 100644 --- a/phpBB/phpbb/di/extension/core.php +++ b/phpBB/phpbb/di/extension/core.php @@ -71,7 +71,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(7); if ($config['twig']['debug']) { $twig_environment_options['debug'] = true; @@ -80,8 +80,8 @@ class core extends Extension { $twig_environment_options['auto_reload'] = true; } - // Replace the 6th argument, the options passed to the environment - $definition->replaceArgument(6, $twig_environment_options); + // Replace the 8th argument, the options passed to the environment + $definition->replaceArgument(7, $twig_environment_options); if ($config['twig']['enable_debug_extension']) { From b9ff0bbba4cf357baad32576c01f36a9f2627ffa Mon Sep 17 00:00:00 2001 From: Nicofuma Date: Tue, 19 May 2015 22:42:32 +0200 Subject: [PATCH 2/2] [ticket/13849] Fix tests PHPBB3-13849 --- tests/di/fixtures/config/test/container/environment.yml | 1 + tests/di/fixtures/other_config/test/container/environment.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/di/fixtures/config/test/container/environment.yml b/tests/di/fixtures/config/test/container/environment.yml index 0873078844..14c986d123 100644 --- a/tests/di/fixtures/config/test/container/environment.yml +++ b/tests/di/fixtures/config/test/container/environment.yml @@ -22,4 +22,5 @@ services: - ~ - ~ - ~ + - ~ - [] diff --git a/tests/di/fixtures/other_config/test/container/environment.yml b/tests/di/fixtures/other_config/test/container/environment.yml index 2aa29db2eb..e285b1b781 100644 --- a/tests/di/fixtures/other_config/test/container/environment.yml +++ b/tests/di/fixtures/other_config/test/container/environment.yml @@ -22,4 +22,5 @@ services: - ~ - ~ - ~ + - ~ - []