Merge pull request #21 from OxCom/develop

Extended configuration

Author: OxCom

.travis.yml

@@ -10,6 +10,9 @@ matrix:
             env: SYMFONY_VERSION=^2.8
         -   php: 7.2
             env: SYMFONY_VERSION=^2.8
+        -   php: 7.3
+            env: SYMFONY_VERSION=^2.8
+
         -   php: 5.6
             env: SYMFONY_VERSION=~3.0
         -   php: 7.0
@@ -18,6 +21,9 @@ matrix:
             env: SYMFONY_VERSION=~3.0
         -   php: 7.2
             env: SYMFONY_VERSION=~3.0
+        -   php: 7.3
+            env: SYMFONY_VERSION=~3.0
+
         -   php: 5.6
             env: SYMFONY_VERSION=~3.4
         -   php: 7.0
@@ -26,18 +32,27 @@ matrix:
             env: SYMFONY_VERSION=~3.4
         -   php: 7.2
             env: SYMFONY_VERSION=~3.4
-        -   php: 7.1
+        -   php: 7.3
+
             env: SYMFONY_VERSION=~4.0
         -   php: 7.2
             env: SYMFONY_VERSION=~4.0
+        -   php: 7.3
+            env: SYMFONY_VERSION=~4.0
+
         -   php: 7.1
             env: SYMFONY_VERSION=~4.1
         -   php: 7.2
             env: SYMFONY_VERSION=~4.1
+        -   php: 7.3
+            env: SYMFONY_VERSION=~4.1
+
         -   php: 7.1
             env: SYMFONY_VERSION=~4.2
         -   php: 7.2
             env: SYMFONY_VERSION=~4.2
+        -   php: 7.3
+            env: SYMFONY_VERSION=~4.2
 
 before_install:
     - curl -s https://getcomposer.org/installer | php

DependencyInjection/Configuration.php

@@ -24,7 +24,8 @@ class Configuration implements ConfigurationInterface
     const ENVIRONMENT = 'production';
     const TIMEOUT     = 3;
 
-    const API_ENDPOINT = 'https://api.rollbar.com/api/1/';
+    const API_ENDPOINT  = 'https://api.rollbar.com/api/1/';
+    const PHP_MAX_ITEMS = 10;
 
     const JS_ITEMS_PER_MINUTE = 60;
     const JS_MAX_ITEMS        = 0;
@@ -87,6 +88,7 @@ public function getConfigTreeBuilder()
                             ->defaultValue('%kernel.logs_dir%/rollbar.log')
                         ->end()
                         ->booleanNode('allow_exec')->defaultTrue()->end()
+                        ->booleanNode('autodetect_branch')->defaultFalse()->end()
                         ->scalarNode('endpoint')->defaultValue(static::API_ENDPOINT)->end()
                         ->scalarNode('base_api_url')->defaultValue(static::API_ENDPOINT)->end()
                         ->scalarNode('branch')->defaultValue(static::BRANCH)->end()
@@ -166,6 +168,8 @@ public function getConfigTreeBuilder()
                         ->booleanNode('send_message_trace')->defaultFalse()->end()
                         ->booleanNode('include_raw_request_body')->defaultFalse()->end()
                         ->booleanNode('local_vars_dump')->defaultTrue()->end()
+                        ->scalarNode('max_nesting_depth')->defaultValue(-1)->end()
+                        ->scalarNode('max_items')->defaultValue(static::PHP_MAX_ITEMS)->end()
                     ->end()
                 ->end()
                 ->arrayNode('rollbar_js')->children()

Tests/SymfonyRollbarBundle/DependencyInjection/ConfigurationTest.php

@@ -2,6 +2,7 @@
 
 namespace SymfonyRollbarBundle\Tests\DependencyInjection;
 
+use Rollbar\Config;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use SymfonyRollbarBundle\DependencyInjection\Configuration;
 use SymfonyRollbarBundle\DependencyInjection\SymfonyRollbarExtension;
@@ -53,6 +54,7 @@ public function testParameters()
                 'agent_log_location'             => static::$kernel->getLogDir() . '/rollbar.log',
                 'base_api_url'                   => Configuration::API_ENDPOINT,
                 'branch'                         => Configuration::BRANCH,
+                'autodetect_branch'              => false,
                 'capture_error_stacktraces'      => true,
                 'check_ignore'                   => '\SymfonyRollbarBundle\Tests\Fixtures\CheckIgnoreProvider',
                 'code_version'                   => '',
@@ -93,7 +95,8 @@ public function testParameters()
                 'ca_cert_path'                   => null,
                 'transformer'                    => null,
                 'verbosity'                      => 'error',
-
+                'max_nesting_depth'              => -1,
+                'max_items'                      => Configuration::PHP_MAX_ITEMS,
             ],
             'rollbar_js' => [
                 'access_token'                 => 'SOME_ROLLBAR_ACCESS_TOKEN_654321',
@@ -127,4 +130,21 @@ public function testEmptyConfiguration()
         $this->assertArrayHasKey('exclude', $config);
         $this->assertArrayHasKey('rollbar', $config);
     }
+
+    public function testCompareRollbarDefaults()
+    {
+        static::bootKernel();
+        $container = static::$kernel->getContainer();
+
+        $config     = $container->getParameter(SymfonyRollbarExtension::ALIAS . '.config');
+        $rbConfig   = Config::listOptions();
+
+        foreach ($rbConfig as $key) {
+            if ($key === 'enabled') {
+                continue;
+            }
+
+            $this->assertArrayHasKey($key, $config['rollbar']);
+        }
+    }
 }

Tests/SymfonyRollbarBundle/DependencyInjection/SymfonyRollbarExtensionTest.php

@@ -52,6 +52,7 @@ public function generatorConfigVars()
                 'agent_log_location'             => '%kernel.logs_dir%/rollbar.log',
                 'base_api_url'                   => 'https://api.rollbar.com/api/1/',
                 'branch'                         => Configuration::BRANCH,
+                'autodetect_branch'              => false,
                 'capture_error_stacktraces'      => true,
                 'check_ignore'                    => null,
                 'code_version'                   => '',
@@ -92,6 +93,8 @@ public function generatorConfigVars()
                 'ca_cert_path'                   => null,
                 'transformer'                    => null,
                 'verbosity'                      => 'error',
+                'max_nesting_depth'              => -1,
+                'max_items'                      => Configuration::PHP_MAX_ITEMS,
             ],
         ];
 

Tests/SymfonyRollbarBundle/Provider/RollbarHandlerTest.php

@@ -320,6 +320,7 @@ public function testInitialize()
             'agent_log_location'             => static::$kernel->getLogDir() . '/rollbar.log',
             'base_api_url'                   => Configuration::API_ENDPOINT,
             'branch'                         => Configuration::BRANCH,
+            'autodetect_branch'              => false,
             'capture_error_stacktraces'      => true,
             'check_ignore'                    => [
                 new \SymfonyRollbarBundle\Tests\Fixtures\CheckIgnoreProvider(),
@@ -367,6 +368,9 @@ public function testInitialize()
             'transformer'                    => null,
             'verbosity'                      => 'error',
             'framework'                      => 'Symfony ' . \Symfony\Component\HttpKernel\Kernel::VERSION,
+            'max_nesting_depth'              => -1,
+            'max_items'                      => Configuration::PHP_MAX_ITEMS,
+
         ];
 
         $this->assertEquals($default, $config);