Merge pull request #24 from OxCom/develop

Update rollbar configuration and fix few deprectaions
OxCom · May 28, 2019 · e157606 · e157606
2 parents 3989118 + a39a468
commit e157606
Show file tree

Hide file tree

Showing 24 changed files with 153 additions and 97 deletions.
diff --git a/Command/AbstractCommand.php b/Command/AbstractCommand.php
diff --git a/Command/DeployCommand.php b/Command/DeployCommand.php
@@ -2,20 +2,58 @@
 
 namespace SymfonyRollbarBundle\Command;
 
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Class DeployCommand
  *
  * @package SymfonyRollbarBundle\Command
  */
-class DeployCommand extends \SymfonyRollbarBundle\Command\AbstractCommand
+class DeployCommand extends Command
 {
     protected static $defaultName = 'rollbar:deploy';
 
+    /**
+     * @var \Symfony\Component\Console\Style\SymfonyStyle
+     */
+    protected $io;
+
+    /**
+     * @var \Symfony\Component\DependencyInjection\ContainerInterface
+     */
+    protected $container;
+
+    /**
+     * DeployCommand constructor.
+     *
+     * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+     */
+    public function __construct(ContainerInterface $container)
+    {
+        parent::__construct();
+
+        $this->container = $container;
+    }
+
+    /**
+     * Extend the initialize method to add additional parameters to the class.
+     *
+     * {@inheritdoc}
+     */
+    public function initialize(InputInterface $input, OutputInterface $output)
+    {
+        parent::initialize($input, $output);
+
+        $io       = new SymfonyStyle($input, $output);
+        $this->io = $io;
+    }
+
     /**
      * @inheritdoc
      */
@@ -65,9 +103,9 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         /** @var \SymfonyRollbarBundle\Provider\RollbarHandler $rbHandler */
-        $rbHandler = $this->getContainer()->get('symfony_rollbar.provider.rollbar_handler');
+        $rbHandler = $this->container->get('symfony_rollbar.provider.rollbar_handler');
 
-        $environment = $this->getContainer()->getParameter('kernel.environment');
+        $environment = $this->container->getParameter('kernel.environment');
         $revision    = $input->getArgument('revision');
         $comment     = $input->getOption('comment');
         $rUser       = $input->getOption('rollbar_username');

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -26,6 +26,9 @@ class Configuration implements ConfigurationInterface
 
     const API_ENDPOINT  = 'https://api.rollbar.com/api/1/';
     const PHP_MAX_ITEMS = 10;
+    const MIN_OCCURRENCES_LEVEL = 0;
+
+    const VERBOSE = 'none';
 
     const JS_ITEMS_PER_MINUTE = 60;
     const JS_MAX_ITEMS        = 0;
@@ -98,7 +101,6 @@ public function getConfigTreeBuilder()
                         ->booleanNode('capture_error_stacktraces')->defaultTrue()->end()
                         ->scalarNode('check_ignore')->defaultNull()->end()
                         ->scalarNode('code_version')->defaultValue('')->end()
-                        ->booleanNode('enable_utf8_sanitization')->defaultTrue()->end()
                         ->scalarNode('environment')->defaultValue(static::ENVIRONMENT)->end()
                         ->arrayNode('custom')
                             ->treatNullLike([])
@@ -159,8 +161,6 @@ public function getConfigTreeBuilder()
                             ->end()
                         ->scalarNode('scrub_whitelist')->defaultNull()->end()
                         ->scalarNode('transformer')->defaultNull()->end()
-                        ->scalarNode('verbosity')->defaultValue(\Psr\Log\LogLevel::ERROR)->end()
-                        ->booleanNode('shift_function')->defaultTrue()->end()
                         ->scalarNode('timeout')->defaultValue(static::TIMEOUT)->end()
                         ->booleanNode('report_suppressed')->defaultFalse()->end()
                         ->booleanNode('use_error_reporting')->defaultFalse()->end()
@@ -170,6 +170,11 @@ public function getConfigTreeBuilder()
                         ->booleanNode('local_vars_dump')->defaultTrue()->end()
                         ->scalarNode('max_nesting_depth')->defaultValue(-1)->end()
                         ->scalarNode('max_items')->defaultValue(static::PHP_MAX_ITEMS)->end()
+                        ->booleanNode('log_payload')->defaultFalse()->end()
+                        ->booleanNode('raise_on_error')->defaultFalse()->end()
+                        ->booleanNode('transmit')->defaultTrue()->end()
+                        ->scalarNode('verbose')->defaultValue(static::VERBOSE)->end()
+                        ->scalarNode('minimum_level')->defaultValue(static::MIN_OCCURRENCES_LEVEL)->end()
                     ->end()
                 ->end()
                 ->arrayNode('rollbar_js')->children()

diff --git a/Provider/RollbarHandler.php b/Provider/RollbarHandler.php
@@ -6,6 +6,7 @@
 use Monolog\Logger;
 use Rollbar\Rollbar as RollbarNotifier;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpKernel\Kernel;
 use SymfonyRollbarBundle\DependencyInjection\SymfonyRollbarExtension;
 use Rollbar\Payload\Level;
 use SymfonyRollbarBundle\Provider\Api\Filter;
@@ -121,9 +122,13 @@ protected function initialize()
         $rConfig  = $config['rollbar'];
 
         // override specific values
+        $root = \method_exists($kernel, 'getProjectDir')
+            ? $kernel->getProjectDir()
+            : $kernel->getRootDir();
+
         $override = [
-            'root'      => $kernel->getRootDir(),
-            'framework' => 'Symfony ' . \Symfony\Component\HttpKernel\Kernel::VERSION,
+            'root'      => $root,
+            'framework' => 'Symfony ' . Kernel::VERSION,
         ];
 
         foreach ($override as $key => $value) {

diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -33,6 +33,7 @@ services:
 
   symfony_rollbar.command.deploy:
     class: "%symfony_rollbar.command.deploy.class%"
+    arguments: ["@service_container"]
     tags:
       - {name: console.command, command: "rollbar:deploy"}
 

diff --git a/Resources/doc/configuration.rst b/Resources/doc/configuration.rst
@@ -19,7 +19,6 @@ Simple configuration of bundle:
             capture_error_stacktraces: true
             check_ignore: null
             code_version: ''
-            enable_utf8_sanitization': true
             environment: 'production'
             custom:
                 - {key: hello, value: world}
@@ -47,7 +46,6 @@ Simple configuration of bundle:
             root: '%kernel.root_dir%'
             scrub_fields: ['passwd', 'password', 'secret', 'confirm_password', 'password_confirmation', 'auth_token', 'csrf_token']
             scrub_whitelist: null
-            shift_function': true
             timeout: 3
             report_suppressed: false
             use_error_reporting: false
@@ -62,7 +60,6 @@ Simple configuration of bundle:
             custom_truncation: null
             ca_cert_path: null
             transformer: null
-            verbosity: 'error'
         rollbar_js:
             enabled: true
             access_token: 'some-public-token'

diff --git a/Tests/Fixtures/app/AppKernel.php b/Tests/Fixtures/app/AppKernel.php
@@ -1,15 +1,17 @@
 <?php
 
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use SymfonyRollbarBundle\SymfonyRollbarBundle;
 
 class AppKernel extends Kernel
 {
     public function registerBundles()
     {
         $bundles = [
-            new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
-            new \SymfonyRollbarBundle\SymfonyRollbarBundle(),
+            new FrameworkBundle(),
+            new SymfonyRollbarBundle(),
         ];
 
         return $bundles;
@@ -23,6 +25,11 @@ public function getRootDir()
         return __DIR__;
     }
 
+    public function getProjectDir()
+    {
+        return $this->getRootDir();
+    }
+
     /**
      * @param \Symfony\Component\Config\Loader\LoaderInterface $loader
      *

diff --git a/Tests/Fixtures/app/config/config_test.yml b/Tests/Fixtures/app/config/config_test.yml
@@ -10,6 +10,7 @@ symfony_rollbar:
     - \ParseError
     - \Symfony\Component\HttpKernel\Exception\HttpExceptionInterface
     rollbar:
+        transmit: false
         access_token: 'SOME_ROLLBAR_ACCESS_TOKEN_123456'
         environment: '%kernel.environment%'
         person_fn: \SymfonyRollbarBundle\Tests\Fixtures\PersonProvider

diff --git a/Tests/Fixtures/app/config/config_test_drb.yml b/Tests/Fixtures/app/config/config_test_drb.yml
@@ -9,6 +9,7 @@ symfony_rollbar:
     - \SymfonyRollbarBundle\Tests\Fixtures\MyAwesomeException
     - \ParseError
     rollbar:
+        transmit: false
         access_token: 'SOME_ROLLBAR_ACCESS_TOKEN_123456'
         environment: '%kernel.environment%'
 

diff --git a/Tests/Fixtures/app/config/config_test_drbj.yml b/Tests/Fixtures/app/config/config_test_drbj.yml
@@ -9,6 +9,7 @@ symfony_rollbar:
     - \SymfonyRollbarBundle\Tests\Fixtures\MyAwesomeException
     - \ParseError
     rollbar:
+        transmit: false
         access_token: 'SOME_ROLLBAR_ACCESS_TOKEN_123456'
         environment: '%kernel.environment%'
 

diff --git a/Tests/Fixtures/app/config/config_test_if.yml b/Tests/Fixtures/app/config/config_test_if.yml
@@ -9,6 +9,7 @@ symfony_rollbar:
     - \SymfonyRollbarBundle\Tests\Fixtures\MyAwesomeException
     - \ParseError
     rollbar:
+        transmit: false
         access_token: 'SOME_ROLLBAR_ACCESS_TOKEN_123456'
         environment: '%kernel.environment%'
         person_fn: "get_awesome_person"

diff --git a/Tests/Fixtures/app/config/config_test_ifc.yml b/Tests/Fixtures/app/config/config_test_ifc.yml
@@ -9,6 +9,7 @@ symfony_rollbar:
     - \SymfonyRollbarBundle\Tests\Fixtures\MyAwesomeException
     - \ParseError
     rollbar:
+        transmit: false
         access_token: 'SOME_ROLLBAR_ACCESS_TOKEN_123456'
         environment: '%kernel.environment%'
         person_fn: "get_awesome_person"

diff --git a/Tests/Fixtures/app/config/config_test_is.yml b/Tests/Fixtures/app/config/config_test_is.yml
@@ -10,6 +10,7 @@ symfony_rollbar:
     - \SymfonyRollbarBundle\Tests\Fixtures\MyAwesomeException
     - \ParseError
     rollbar:
+        transmit: false
         access_token: 'SOME_ROLLBAR_ACCESS_TOKEN_123456'
         environment: '%kernel.environment%'
         person_fn: "symfony_rollbar.fixture.person_provider"

diff --git a/Tests/Fixtures/app/config/config_test_p.yml b/Tests/Fixtures/app/config/config_test_p.yml
@@ -9,6 +9,7 @@ symfony_rollbar:
     - \SymfonyRollbarBundle\Tests\Fixtures\MyAwesomeException
     - \ParseError
     rollbar:
+        transmit: false
         access_token: 'SOME_ROLLBAR_ACCESS_TOKEN_123456'
         environment: '%kernel.environment%'
         person:

diff --git a/Tests/Fixtures/app/config/config_test_pc.yml b/Tests/Fixtures/app/config/config_test_pc.yml
@@ -9,6 +9,7 @@ symfony_rollbar:
     - \SymfonyRollbarBundle\Tests\Fixtures\MyAwesomeException
     - \ParseError
     rollbar:
+        transmit: false
         access_token: 'SOME_ROLLBAR_ACCESS_TOKEN_123456'
         environment: '%kernel.environment%'
         person:

diff --git a/Tests/SymfonyRollbarBundle/Command/DeployCommandTest.php b/Tests/SymfonyRollbarBundle/Command/DeployCommandTest.php
@@ -21,8 +21,9 @@ public function setUp()
 
     public function testRegistration()
     {
+        $container = static::$kernel->getContainer();
         $application = new Application(static::$kernel);
-        $application->add(new DeployCommand());
+        $application->add(new DeployCommand($container));
 
         try {
             $application->find('rollbar:deploy');
@@ -71,7 +72,7 @@ public function testExecute($input, $expected, $message)
         $container->set('symfony_rollbar.provider.api_client', $client);
 
         $application = new Application(static::$kernel);
-        $application->add(new DeployCommand());
+        $application->add(new DeployCommand($container));
 
         try {
             $command = $application->find('rollbar:deploy');
@@ -112,8 +113,9 @@ public function generateExecuteInput()
 
     public function testExecuteGeneric()
     {
+        $container = static::$kernel->getContainer();
         $application = new Application(static::$kernel);
-        $application->add(new DeployCommand());
+        $application->add(new DeployCommand($container));
 
         $command       = $application->find('rollbar:deploy');
         $commandTester = new CommandTester($command);