Merge pull request #3591 from Nicofuma/ticket/12632

[ticket/12632] Add twig.debug and twig.auto_reload in config.yml

phpBB/config/default/container/services_twig.yml

@@ -12,6 +12,7 @@ services:
             - %core.template.cache_path%
             - @ext.manager
             - @template.twig.loader
+            - []
 
     template.twig.lexer:
         class: phpbb\template\twig\lexer

phpBB/config/development/config.yml

@@ -5,4 +5,6 @@ core:
     require_dev_dependencies: true
 
     twig:
+        debug: true
+        auto_reload: true
         enable_debug_extension: true

phpBB/phpbb/di/extension/container_configuration.php

@@ -34,6 +34,8 @@ class container_configuration implements ConfigurationInterface
 				->arrayNode('twig')
 					->addDefaultsIfNotSet()
 					->children()
+						->booleanNode('debug')->defaultValue(null)->end()
+						->booleanNode('auto_reload')->defaultValue(null)->end()
 						->booleanNode('enable_debug_extension')->defaultValue(false)->end()
 					->end()
 				->end()

phpBB/phpbb/di/extension/core.php

@@ -69,6 +69,20 @@ 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);
+		if ($config['twig']['debug'])
+		{
+			$twig_environment_options['debug'] = true;
+		}
+		if ($config['twig']['auto_reload'])
+		{
+			$twig_environment_options['auto_reload'] = true;
+		}
+		// Replace the 6th argument, the options passed to the environment
+		$definition->replaceArgument(6, $twig_environment_options);
+
 		if ($config['twig']['enable_debug_extension'])
 		{
 			$definition = $container->getDefinition('template.twig.extensions.debug');

phpBB/phpbb/template/twig/environment.php

@@ -65,7 +65,7 @@ class environment extends \Twig_Environment
 
 		$options = array_merge(array(
 			'cache'			=> (defined('IN_INSTALL')) ? false : $cache_path,
-			'debug'			=> defined('DEBUG'),
+			'debug'			=> false,
 			'auto_reload'	=> (bool) $this->phpbb_config['load_tplcompile'],
 			'autoescape'	=> false,
 		), $options);

tests/di/fixtures/config/test/container/environment.yml

@@ -12,3 +12,14 @@ services:
 
     dispatcher:
         class: phpbb\db\driver\container_mock
+
+    template.twig.environment:
+        class: Exception
+        arguments:
+            - ~
+            - ~
+            - ~
+            - ~
+            - ~
+            - ~
+            - []

tests/di/fixtures/other_config/test/container/environment.yml

@@ -12,3 +12,14 @@ services:
 
     dispatcher:
         class: phpbb\db\driver\container_mock
+
+    template.twig.environment:
+        class: Exception
+        arguments:
+            - ~
+            - ~
+            - ~
+            - ~
+            - ~
+            - ~
+            - []