fix: issue #4 - extend support for PHP7+

Author: Andrii Afanasiev

EventListener/ExceptionListener.php

@@ -42,14 +42,17 @@ public function onKernelException(GetResponseForExceptionEvent $event)
      */
     public function handleException($exception)
     {
-        if ($exception instanceof \Exception && $this->handler->shouldSkip($exception)) {
+        if (($exception instanceof \Exception || $exception instanceof \Throwable)
+            && $this->handler->shouldSkip($exception)
+        ) {
             return;
         }
 
         $payload = [];
+
         // @link http://php.net/manual/en/reserved.constants.php
         // @link http://php.net/manual/en/language.errors.php7.php
-        if (!($exception instanceof \Exception) || PHP_MAJOR_VERSION > 7 && !($exception instanceof \Throwable)) {
+        if (!$exception instanceof \Exception && !$exception instanceof \Throwable) {
             $payload   = ['message' => @serialize($exception)];
             $exception = new \Exception('Undefined exception');
         }

Provider/ApiClient.php

@@ -48,15 +48,16 @@ public function __construct(ContainerInterface $container)
     }
 
     /**
-     * @TODO: inject mocked clienty
+     * @TODO : inject mocked clienty
      *
      * @param array $payload
      *
      * @link https://rollbar.com/docs/api/deploys/
+     * @return \Psr\Http\Message\ResponseInterface
      */
     public function trackBuild($payload = [])
     {
-        $this->client->post('deploy', [
+        return $this->client->post('deploy', [
             'form_params' => $payload,
         ]);
     }

Provider/RollbarHandler.php

@@ -113,7 +113,9 @@ protected function write(array $record)
             'datetime'      => $record['datetime']->format('U'),
         ]);
 
-        if (isset($context['exception']) && $context['exception'] instanceof \Exception) {
+        if (isset($context['exception'])
+            && ($context['exception'] instanceof \Exception || $context['exception'] instanceof \Throwable)
+        ) {
             $payload['level'] = $context['level'];
             $exception        = $context['exception'];
             unset($context['exception']);
@@ -131,11 +133,11 @@ protected function write(array $record)
     }
 
     /**
-     * @param \Exception $exception
+     * @param \Throwable $exception
      *
      * @return bool
      */
-    public function shouldSkip(\Exception $exception)
+    public function shouldSkip($exception)
     {
         // check exception
         foreach ($this->exclude as $instance) {
@@ -172,15 +174,15 @@ public function close()
      * @param string $rollbarUser
      * @param string $localUser
      *
-     * @return bool
+     * @return null|\Psr\Http\Message\ResponseInterface
      */
     public function trackBuild($environment, $revision, $comment = '', $rollbarUser = '', $localUser = '')
     {
         // There is no API in Rollbar SDK for tracking builds
         $config = $this->getContainer()->getParameter(SymfonyRollbarExtension::ALIAS . '.config');
 
         if (!$config['enable']) {
-            return false;
+            return null;
         }
 
         /** @var \SymfonyRollbarBundle\Provider\ApiClient $client */

Tests/Fixtures/ErrorHandler.php

@@ -27,6 +27,8 @@ public static function getInstance()
         }
 
         return static::$instance;
+
+
     }
 
     /**
@@ -46,10 +48,10 @@ public function setAssert($assert = null)
      */
     protected function write(array $record)
     {
-        $dummy = function () {
-        };
+        if (!empty($this->assert)) {
+            $cb = $this->assert;
 
-        $closure = empty($this->assert) ? $dummy : $this->assert;
-        call_user_func($closure, $record);
+            $cb($record);
+        }
     }
 }

Tests/Fixtures/app/config/config_test.yml

@@ -7,6 +7,7 @@ symfony_rollbar:
   exclude:
       - \Symfony\Component\Debug\Exception\FatalErrorException
       - \SymfonyRollbarBundle\Tests\Fixtures\MyAwesomeException
+      - \ParseError
   rollbar:
     access_token: 'SOME_ROLLBAR_ACCESS_TOKEN_123456'
     environment: '%kernel.environment%'

Tests/SymfonyRollbarBundle/Command/DeployCommandTest.php

@@ -31,6 +31,9 @@ public function testRegistration()
 
             return;
         }
+
+        // it's should not be risky test
+        $this->assertTrue(true);
     }
 
     /**

Tests/SymfonyRollbarBundle/DependencyInjection/ConfigurationTest.php

@@ -22,6 +22,7 @@ public function testParameters()
 
         $exclude = Configuration::$exclude;
         $exclude[] = '\SymfonyRollbarBundle\Tests\Fixtures\MyAwesomeException';
+        $exclude[] = '\ParseError';
 
         $default = [
             'enable' => true,

Tests/SymfonyRollbarBundle/EventListener/ExceptionListenerTest.php

@@ -172,4 +172,39 @@ public function testSkipException()
         $this->assertTrue(true); // trick to mark not risky
         restore_error_handler();
     }
+
+    /**
+     * @dataProvider generatorHandleParams
+     * @param $data
+     */
+    public function testHandleParams(\Throwable $data)
+    {
+        $container = static::$kernel->getContainer();
+
+        $handler = new ErrorHandler();
+        $handler->setAssert(function ($record) use ($data) {
+            $this->assertNotEmpty($record);
+
+            $this->assertEquals($data->getMessage(), $record['message']);
+            $this->assertEquals(Logger::ERROR, $record['level']);
+            $this->assertNotEmpty($record['context']['exception']);
+
+            $exception = $record['context']['exception'];
+            $this->assertEquals($data, $exception);
+        });
+
+        $listener = new ExceptionListener($container);
+        $listener->getLogger()->setHandlers([$handler]);
+
+        $listener->handleException($data);
+    }
+
+    public function generatorHandleParams()
+    {
+        return [
+            [new \Exception('This is new exception')],
+            [new \Exception('This is one more new exception')],
+            [new \TypeError('This is TypeError')],
+        ];
+    }
 }

Tests/SymfonyRollbarBundle/Provider/RollbarHandlerTest.php

@@ -147,6 +147,8 @@ public function generatorShouldSkip()
             [new \Exception(), false],
             [new \SymfonyRollbarBundle\Tests\Fixtures\MyAwesomeException(), true],
             [new \Symfony\Component\Debug\Exception\UndefinedFunctionException("error", $e), true],
+            [new \TypeError("TypeError"), false],
+            [new \ParseError("ParseError"), true],
         ];
     }