Add to twig bundle configuration

mtibben · mtibben · commit db70c1a0fcb4 · 2018-01-05T09:44:47.000+11:00
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 
 /**
  * TwigExtension configuration structure.
@@ -42,6 +43,7 @@ public function getConfigTreeBuilder()
         $this->addGlobalsSection($rootNode);
         $this->addTwigOptions($rootNode);
         $this->addTwigFormatOptions($rootNode);
+        $this->addHttpExceptionLogLevels($rootNode);
 
         return $treeBuilder;
     }
@@ -194,4 +196,43 @@ private function addTwigFormatOptions(ArrayNodeDefinition $rootNode)
             ->end()
         ;
     }
+
+    private function addHttpExceptionLogLevels(ArrayNodeDefinition $rootNode)
+    {
+        $rootNode
+            ->children()
+                ->arrayNode('http_exception_log_levels')
+                    ->info('The override log levels for http exceptions')
+                    ->example(array('403' => 'NOTICE', '404' => 'INFO'))
+                    ->useAttributeAsKey('http_exception_log_levels')
+                    ->prototype('variable')->end()
+                    ->validate()
+                        ->always(function ($v) {
+                            $map = array();
+                            foreach ($v as $status => $level) {
+                                if (!(is_int($status) && 100 <= $status && $status <= 599)) {
+                                    throw new InvalidConfigurationException(sprintf(
+                                        'The configured status code "%s" in twig.http_exception_log_levels is not a valid http status code.',
+                                         $status
+                                    ));
+                                }
+
+                                $levelConstant = 'Psr\Log\LogLevel::'.$level;
+                                if (!defined($levelConstant)) {
+                                    throw new InvalidConfigurationException(sprintf(
+                                        'The configured log level "%s" in twig.http_exception_log_levels is invalid as it is not defined in Psr\\Log\\LogLevel.',
+                                         $level
+                                    ));
+                                }
+
+                                $map[$status] = constant($levelConstant);
+                            }
+
+                            return $map;
+                        })
+                    ->end()
+                ->end()
+            ->end()
+        ;
+    }
 }
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -78,6 +78,7 @@ public function load(array $configs, ContainerBuilder $container)
         $config = $this->processConfiguration($configuration, $configs);
 
         $container->setParameter('twig.exception_listener.controller', $config['exception_controller']);
+        $container->setParameter('twig.exception_listener.http_log_levels', $config['http_exception_log_levels']);
 
         $container->setParameter('twig.form.resources', $config['form_themes']);
         $container->setParameter('twig.default_path', $config['default_path']);
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -128,7 +128,7 @@
             <tag name="monolog.logger" channel="request" />
             <argument>%twig.exception_listener.controller%</argument>
             <argument type="service" id="logger" on-invalid="null" />
-            <argument>%framework.http_exception.log_levels%</argument>
+            <argument>%twig.exception_listener.http_log_levels%</argument>
         </service>
 
         <service id="twig.controller.exception" class="Symfony\Bundle\TwigBundle\Controller\ExceptionController" public="true">
