diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2015-05-16 00:30:19 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2015-05-16 00:30:19 +0200 |
| commit | cddecec14647c980a688dc81834df2eae48e88bb (patch) | |
| tree | 6480e240bed44e922e1f53585133c7a30d8d8469 /phpBB | |
| parent | c1ab364e28ad628b3942fb9b9945751830647521 (diff) | |
| parent | f821130c3a4a22efd491aaad962cc84a82dde56a (diff) | |
| download | forums-cddecec14647c980a688dc81834df2eae48e88bb.tar forums-cddecec14647c980a688dc81834df2eae48e88bb.tar.gz forums-cddecec14647c980a688dc81834df2eae48e88bb.tar.bz2 forums-cddecec14647c980a688dc81834df2eae48e88bb.tar.xz forums-cddecec14647c980a688dc81834df2eae48e88bb.zip | |
Merge pull request #3591 from Nicofuma/ticket/12632
[ticket/12632] Add twig.debug and twig.auto_reload in config.yml
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/config/default/container/services_twig.yml | 1 | ||||
| -rw-r--r-- | phpBB/config/development/config.yml | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/di/extension/container_configuration.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/di/extension/core.php | 14 | ||||
| -rw-r--r-- | phpBB/phpbb/template/twig/environment.php | 2 |
5 files changed, 20 insertions, 1 deletions
diff --git a/phpBB/config/default/container/services_twig.yml b/phpBB/config/default/container/services_twig.yml index d8e1ae0769..2799892376 100644 --- a/phpBB/config/default/container/services_twig.yml +++ b/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 diff --git a/phpBB/config/development/config.yml b/phpBB/config/development/config.yml index f451eebe13..93ae07fb3f 100644 --- a/phpBB/config/development/config.yml +++ b/phpBB/config/development/config.yml @@ -5,4 +5,6 @@ core: require_dev_dependencies: true twig: + debug: true + auto_reload: true enable_debug_extension: true diff --git a/phpBB/phpbb/di/extension/container_configuration.php b/phpBB/phpbb/di/extension/container_configuration.php index ee58ec2b74..4cc7c7c0d1 100644 --- a/phpBB/phpbb/di/extension/container_configuration.php +++ b/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() diff --git a/phpBB/phpbb/di/extension/core.php b/phpBB/phpbb/di/extension/core.php index c71dc61280..c9e2d4dc5b 100644 --- a/phpBB/phpbb/di/extension/core.php +++ b/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'); diff --git a/phpBB/phpbb/template/twig/environment.php b/phpBB/phpbb/template/twig/environment.php index e7b8aeab89..6e75403159 100644 --- a/phpBB/phpbb/template/twig/environment.php +++ b/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); |