Merge branch 'develop' of github.com:OxCom/symfony3-rollbar-bundle into develop

Author: OxCom

.travis.yml

@@ -16,3 +16,7 @@ script:
 
 after_success:
     - bash <(curl -s https://codecov.io/bash)
+
+env:
+    global:
+        - secure: "r/35/U9I23Pt54pHDtGIluF4m+YFoRBcEi8vf0DqcZ+qMybThafvb1US5DTfvmIwnWkolc9sOdAZeAapM+0Q2SXJPIwS/JQMxHfvP6nqtZJxdLndYA6aBOJWcHWO5fL47UNMhfXrDtoqLYBkUS+VgqSTNktK/0z5Wm4P/dvMJBPBLb1waNiWC88MLmMzxU64iS7ypzCaw5Qa/vZ7JpmBVuC1aa++1+nJWc0FhT/ptSIggeBRtwyANpvIJifYNfU408eHRTJLBK3LrrgJeyc2U54JwSNQvtBcSPpb7aGNoBfzwpaRd8QoVuzL/LY1XRmedGRprVeY4eAiiHlZQLnR6KIiJFIuxN4Fpw3Vy9WddqjPmFM7JkG5iYu2iXjFVSAWO4gE2P9urZRTd+nsgBkV1Dv3cFEGftXmH+oH3tPzzmInzmlaNiHhs8MSiDvZv1oGPWdtWRAZVzJBxcofoM2GvDxj3NNQAAKWgHsbTb4eXZ3MMwdPbuYdJw/kT9uSPyqbK6zK1IzhrMZglBKZRDmlKelATRly6z2N8JNe0N5vckUYTLba9WcIt1BcaKYH5nIrNJJaYDqhBlSGaAsmwQhPsZN4AFRJzBHI+Bwc8DtxBLyQZC5wd6lL1G/fjHWQbYul6GPghTUR+W6ag/R17BiFjB+K5p1bK/vG9AWdeJjJDOE="

src/Provider/RollbarHandler.php

@@ -25,7 +25,7 @@ class RollbarHandler extends AbstractProcessingHandler
      * Records whether any log records have been added since the last flush of the rollbar notifier
      * @var bool
      */
-    private $hasRecords = false;
+    protected $hasRecords = false;
 
     /**
      * Monolog vs Rollbar
@@ -61,7 +61,7 @@ public function __construct(ContainerInterface $container, $level = Logger::ERRO
         $rConfig  = $config['rollbar'];
         $override = [
             'root'      => $kernel->getRootDir(),
-            'framework' => \Symfony\Component\HttpKernel\Kernel::VERSION,
+            'framework' => 'Symfony ' . \Symfony\Component\HttpKernel\Kernel::VERSION,
         ];
 
         foreach ($override as $key => $value) {

tests/SymfonyRollbarBundle/EventListener/ExceptionListenerTest.php

@@ -61,7 +61,7 @@ public function testInvalidHandleParams($data)
         $container = static::$kernel->getContainer();
 
         $handler = new ErrorHandler();
-        $handler->setAssert(function($record) {
+        $handler->setAssert(function ($record) {
             $this->assertNotEmpty($record);
 
             $this->assertEquals('Undefined exception', $record['message']);

tests/SymfonyRollbarBundle/Provider/RollbarHandlerTest.php

@@ -1,10 +1,14 @@
 <?php
+
 namespace Tests\SymfonyRollbarBundle\Provider;
 
+use Rollbar\Payload\Level;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Validator\Constraints\DateTime;
 
 /**
  * Class RollbarHandlerTest
+ *
  * @package Tests\SymfonyRollbarBundle\Provider
  */
 class RollbarHandlerTest extends KernelTestCase
@@ -19,7 +23,7 @@ public function setUp()
     public function testRollbarHandler()
     {
         $container = static::$kernel->getContainer();
-        $handler  = new \SymfonyRollbarBundle\Provider\RollbarHandler($container);
+        $handler   = new \SymfonyRollbarBundle\Provider\RollbarHandler($container);
 
         $hContainer = $handler->getContainer();
         $this->assertEquals($container, $hContainer);
@@ -28,33 +32,78 @@ public function testRollbarHandler()
 
     /**
      * @dataProvider recordGenerator
+     *
      * @param $record
      */
     public function testWrite($record)
     {
-        $this->markTestIncomplete('TODO: write body');
+        $container = static::$kernel->getContainer();
+        $handler   = new \SymfonyRollbarBundle\Provider\RollbarHandler($container);
+
+        $property = new \ReflectionProperty($handler, 'hasRecords');
+        $property->setAccessible(true);
+
+        $method = new \ReflectionMethod($handler, 'write');
+        $method->setAccessible(true);
+
+        $this->assertFalse($property->getValue($handler));
+        $method->invoke($handler, $record);
+        $this->assertTrue($property->getValue($handler));
     }
 
+    /**
+     * @return array
+     */
     public function recordGenerator()
     {
         return [
             [
                 [
-                    'context' => [
-                        'level' => \Monolog\Logger::ERROR,
+                    'message'    => 'RecordGenerator :: #1',
+                    'datetime'   => new \DateTime(),
+                    'level'      => \Monolog\Logger::ERROR,
+                    'level_name' => \Monolog\Logger::ERROR,
+                    'channel'    => 'symfony.rollbar',
+                    'extra'      => [],
+                    'context'    => [
                         'exception' => new \Exception('RecordGenerator :: #1'),
-                        'message' => 'RecordGenerator :: #1',
-                    ]
-                ]
+                    ],
+                ],
             ],
             [
                 [
-                    'context' => [
-                        'level' => \Monolog\Logger::ERROR,
-                        'message' => 'RecordGenerator :: #2',
-                    ]
-                ]
+                    'message'    => 'RecordGenerator :: #2',
+                    'datetime'   => new \DateTime(),
+                    'level'      => \Monolog\Logger::ERROR,
+                    'level_name' => \Monolog\Logger::ERROR,
+                    'channel'    => 'symfony.rollbar',
+                    'extra'      => [],
+                    'context'    => [],
+                ],
             ],
         ];
     }
+
+    /**
+     * @dataProvider recordGenerator
+     * @param $record
+     */
+    public function testClose($record)
+    {
+        $container = static::$kernel->getContainer();
+        $handler   = new \SymfonyRollbarBundle\Provider\RollbarHandler($container);
+
+        $property = new \ReflectionProperty($handler, 'hasRecords');
+        $property->setAccessible(true);
+
+        $method = new \ReflectionMethod($handler, 'write');
+        $method->setAccessible(true);
+
+        $this->assertFalse($property->getValue($handler));
+        $method->invoke($handler, $record);
+        $this->assertTrue($property->getValue($handler));
+
+        $handler->close();
+        $this->assertFalse($property->getValue($handler));
+    }
 }