fix: configuration *_sample_rates

Author: oxcom

DependencyInjection/Configuration.php

@@ -97,24 +97,17 @@ public function getConfigTreeBuilder()
                             ->end()
                         ->arrayNode('error_sample_rates')
                             ->treatNullLike([])
-                            ->prototype('scalar')->end()
+                            ->useAttributeAsKey('type')
+                            ->arrayPrototype()
+                                ->children()
+                                    ->integerNode('type')->end()
+                                    ->floatNode('rate')->end()
+                                ->end()
+                            ->end()
                             ->defaultValue([])
                             ->end()
                         ->arrayNode('exception_sample_rates')
                             ->treatNullLike([])
-                            ->beforeNormalization()
-                                ->always(function($values) {
-                                    $result = [];
-
-                                    foreach ($values as $value) {
-                                        foreach ($value as $class => $rate) {
-                                            $result[] = ['class' => $class, 'rate' => $rate];
-                                        }
-                                    }
-
-                                    return $result;
-                                })
-                            ->end()
                             ->useAttributeAsKey('class')
                             ->arrayPrototype()
                                 ->children()

Provider/RollbarHandler.php

@@ -117,19 +117,20 @@ protected function initialize()
         }
 
         // map rates fields
-        $map = [
-            'exception_sample_rates',
-            'error_sample_rates',
-        ];
-
-        foreach ($map as $key) {
-            $rConfig[$key] = \array_map(function($data) {
-                return empty($data['rate']) ? null : $data['rate'];
-            }, $rConfig[$key]);
-
-            // drop empty values
-            $rConfig[$key] = \array_filter($rConfig[$key]);
+        $key           = 'exception_sample_rates';
+        $rConfig[$key] = \array_map(function ($data) {
+            return empty($data['rate']) ? null : $data['rate'];
+        }, $rConfig[$key]);
+        $rConfig[$key] = \array_filter($rConfig[$key]);
+
+        $key = 'error_sample_rates';
+        foreach ($rConfig[$key] as $const => $data) {
+            $newKey = constant($const);
+            unset($rConfig[$key][$const]);
+
+            $rConfig[$key][$newKey] = empty($data['rate']) ? null : $data['rate'];
         }
+        $rConfig[$key] = \array_filter($rConfig[$key]);
 
         $this->exclude = empty($config['exclude']) ? [] : $config['exclude'];
 

Tests/Fixtures/app/config/config_test.yml

@@ -15,10 +15,14 @@ symfony_rollbar:
         person_fn: \SymfonyRollbarBundle\Tests\Fixtures\PersonProvider
         checkIgnore: \SymfonyRollbarBundle\Tests\Fixtures\CheckIgnoreProvider
         exception_sample_rates:
-        -   \Symfony\Component\Security\Core\Exception\AccessDeniedException: 0.1
-        -   \Symfony\Component\HttpKernel\Exception\NotFoundHttpException: 0.5
-        -   \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException: 0.5
-        -   \Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException: 1
+        - {class: \Symfony\Component\Security\Core\Exception\AccessDeniedException, rate: 0.1}
+        - {class: \Symfony\Component\HttpKernel\Exception\NotFoundHttpException, rate: 0.5}
+        - {class: \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException, rate: 0.5}
+        - {class: \Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException, rate: 1}
+        error_sample_rates:
+        - {type: E_NOTICE, rate: 0.1}
+        - {type: E_USER_ERROR, rate: 0.5}
+        - {type: E_USER_NOTICE, rate: 0.1}
 
     rollbar_js:
         accessToken: 'SOME_ROLLBAR_ACCESS_TOKEN_654321'

Tests/SymfonyRollbarBundle/DependencyInjection/ConfigurationTest.php

@@ -26,6 +26,12 @@ public function testParameters()
         $exclude[] = '\ParseError';
         $exclude[] = '\Symfony\Component\HttpKernel\Exception\HttpExceptionInterface';
 
+        $errorRates = [
+            'E_NOTICE'      => ['rate' => 0.1],
+            'E_USER_ERROR'  => ['rate' => 0.5],
+            'E_USER_NOTICE' => ['rate' => 0.1],
+        ];
+
         $exceptionRates = [
             '\Symfony\Component\Security\Core\Exception\AccessDeniedException'                      => [
                 'rate' => 0.1,
@@ -54,7 +60,7 @@ public function testParameters()
                 'code_version'                   => '',
                 'enable_utf8_sanitization'       => true,
                 'environment'                    => static::$kernel->getEnvironment(),
-                'error_sample_rates'             => [],
+                'error_sample_rates'             => $errorRates,
                 'handler'                        => Configuration::HANDLER_BLOCKING,
                 'include_error_code_context'     => false,
                 'include_exception_code_context' => false,