tweaked code

fabpot · fabpot · commit 30a70a206c10 · 2018-04-04T08:49:54.000+02:00
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -89,7 +89,7 @@
  *   - handler: the wrapped handler's name
  *   - [action_level|activation_strategy]: minimum level or service id to activate the handler, defaults to WARNING
  *   - [excluded_404s]: if set, the strategy will be changed to one that excludes 404s coming from URLs matching any of those patterns
- *   - [excluded_http_codes]: if set, the strategy will be changed to one that excludes specific HTTP codes
+ *   - [excluded_http_codes]: if set, the strategy will be changed to one that excludes specific HTTP codes (requires Symfony Monolog bridge 4.1+)
  *   - [buffer_size]: defaults to 0 (unlimited)
  *   - [stop_buffering]: bool to disable buffering once the handler has been activated, defaults to true
  *   - [passthru_level]: level name or int value for messages to always flush, disabled by default
@@ -383,19 +383,17 @@ public function getConfigTreeBuilder()
                                              */
 
                                             if (is_array($value)) {
-                                                return isset($value['code'])
-                                                    ? $value
-                                                    : array('code' => key($value), 'url' => current($value));
+                                                return isset($value['code']) ? $value : array('code' => key($value), 'urls' => current($value));
                                             }
 
-                                            return array('code' => $value, 'url' => array());
+                                            return array('code' => $value, 'urls' => array());
                                         }, $values);
                                     })
                                 ->end()
                                 ->prototype('array')
                                     ->children()
                                         ->scalarNode('code')->end()
-                                        ->arrayNode('url')
+                                        ->arrayNode('urls')
                                             ->prototype('scalar')->end()
                                         ->end()
                                     ->end()
diff --git a/DependencyInjection/MonologExtension.php b/DependencyInjection/MonologExtension.php
@@ -325,6 +325,9 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
                 $container->setDefinition($handlerId.'.not_found_strategy', $activationDef);
                 $activation = new Reference($handlerId.'.not_found_strategy');
             } elseif (!empty($handler['excluded_http_codes'])) {
+                if (!class_exists('Symfony\Bridge\Monolog\Handler\FingersCrossed\HttpCodeActivationStrategy')) {
+                    throw new \LogicException('"excluded_http_codes" cannot be used as your version of Monolog bridge does not support it.');
+                }
                 $activationDef = new Definition('Symfony\Bridge\Monolog\Handler\FingersCrossed\HttpCodeActivationStrategy', array(
                     new Reference('request_stack'),
                     $handler['excluded_http_codes'],
diff --git a/Tests/DependencyInjection/MonologExtensionTest.php b/Tests/DependencyInjection/MonologExtensionTest.php
@@ -385,6 +385,10 @@ public function testFingersCrossedHandlerWhenExcluded404sAreSpecified()
 
     public function testFingersCrossedHandlerWhenExcludedHttpCodesAreSpecified()
     {
+        if (!class_exists('Symfony\Bridge\Monolog\Handler\FingersCrossed\HttpCodeActivationStrategy')) {
+            $this->markTestSkipped('Symfony Monolog 4.1+ is needed.');
+        }
+
         $container = $this->getContainer(array(array('handlers' => array(
             'main' => array(
                 'type' => 'fingers_crossed',
@@ -408,9 +412,9 @@ public function testFingersCrossedHandlerWhenExcludedHttpCodesAreSpecified()
         $this->assertDICConstructorArguments($strategy, array(
             new Reference('request_stack'),
             array(
-                array('code' => 403, 'url' => array()),
-                array('code' => 404, 'url' => array()),
-                array('code' => 405, 'url' => array('^/foo', '^/bar'))
+                array('code' => 403, 'urls' => array()),
+                array('code' => 404, 'urls' => array()),
+                array('code' => 405, 'urls' => array('^/foo', '^/bar'))
             ),
             \Monolog\Logger::WARNING
         ));
