diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-12-27 13:31:16 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-12-27 13:31:16 +0100 |
| commit | 0fe30e8a969c7b0121f09913778f66dbee6eba83 (patch) | |
| tree | 76ac2860198643eae60c4048197f4ad23ef1e464 | |
| parent | bd3ef49e0b22b107d3d05194550cbd1c006e1013 (diff) | |
| parent | 6850169095f099d8fd9f3886e60237134c77ddb4 (diff) | |
| download | forums-0fe30e8a969c7b0121f09913778f66dbee6eba83.tar forums-0fe30e8a969c7b0121f09913778f66dbee6eba83.tar.gz forums-0fe30e8a969c7b0121f09913778f66dbee6eba83.tar.bz2 forums-0fe30e8a969c7b0121f09913778f66dbee6eba83.tar.xz forums-0fe30e8a969c7b0121f09913778f66dbee6eba83.zip | |
Merge pull request #3170 from Nicofuma/ticket/13266-develop
[ticket/13266-develop] Enable twig dump function
| -rw-r--r-- | phpBB/config/default/container/services_twig.yml | 3 | ||||
| -rw-r--r-- | phpBB/config/development/config.yml | 3 | ||||
| -rw-r--r-- | phpBB/phpbb/di/extension/container_configuration.php | 8 | ||||
| -rw-r--r-- | phpBB/phpbb/di/extension/core.php | 6 |
4 files changed, 19 insertions, 1 deletions
diff --git a/phpBB/config/default/container/services_twig.yml b/phpBB/config/default/container/services_twig.yml index fc5f9ba6a1..25382a95a1 100644 --- a/phpBB/config/default/container/services_twig.yml +++ b/phpBB/config/default/container/services_twig.yml @@ -41,3 +41,6 @@ services: - @router tags: - { name: twig.extension } + + template.twig.extensions.debug: + class: Twig_Extension_Debug diff --git a/phpBB/config/development/config.yml b/phpBB/config/development/config.yml index 1c17b08931..f451eebe13 100644 --- a/phpBB/config/development/config.yml +++ b/phpBB/config/development/config.yml @@ -3,3 +3,6 @@ imports: core: require_dev_dependencies: true + + twig: + enable_debug_extension: true diff --git a/phpBB/phpbb/di/extension/container_configuration.php b/phpBB/phpbb/di/extension/container_configuration.php index 1f1c077472..ee58ec2b74 100644 --- a/phpBB/phpbb/di/extension/container_configuration.php +++ b/phpBB/phpbb/di/extension/container_configuration.php @@ -30,7 +30,13 @@ class container_configuration implements ConfigurationInterface $rootNode = $treeBuilder->root('core'); $rootNode ->children() - ->booleanNode('require_dev_dependencies')->defaultValue(false)->end() + ->booleanNode('require_dev_dependencies')->defaultValue(false)->end() + ->arrayNode('twig') + ->addDefaultsIfNotSet() + ->children() + ->booleanNode('enable_debug_extension')->defaultValue(false)->end() + ->end() + ->end() ->end() ; return $treeBuilder; diff --git a/phpBB/phpbb/di/extension/core.php b/phpBB/phpbb/di/extension/core.php index 72d46fb05b..451efc8e35 100644 --- a/phpBB/phpbb/di/extension/core.php +++ b/phpBB/phpbb/di/extension/core.php @@ -67,6 +67,12 @@ class core extends Extension ); } } + + if ($config['twig']['enable_debug_extension']) + { + $definition = $container->getDefinition('template.twig.extensions.debug'); + $definition->addTag('twig.extension'); + } } /** |