Improve flush callbacks and fixed unit tests

Author: jenssegers

src/RollbarServiceProvider.php

@@ -28,28 +28,28 @@ public function boot()
             $app['rollbar.handler']->log($level, $message, $context);
         });
 
-        if (method_exists($app, 'version') and starts_with($app->version(), '5'))
+        // Flush callback
+        $flush = function() use ($app)
         {
-             // Register Laravel 5 shutdown function
-            $this->app->terminating(function() use ($app)
+            if ($app->resolved('rollbar.client'))
             {
                 $app['rollbar.client']->flush();
-            });
+            }
+        };
+
+        if (method_exists($app, 'version') and starts_with($app->version(), '5'))
+        {
+            // Register Laravel 5 shutdown function
+            $this->app->terminating($flush);
         }
         else
         {
             // Register Laravel 4 shutdown function
-            $this->app->shutdown(function() use ($app)
-            {
-                $app['rollbar.client']->flush();
-            });
+            $this->app->shutdown($flush);
         }
 
         // Register PHP shutdown function
-        register_shutdown_function(function() use ($app)
-        {
-            $app['rollbar.client']->flush();
-        });
+        register_shutdown_function($flush);
     }
 
     /**

tests/RollbarTest.php

@@ -13,6 +13,8 @@ public function setUp()
     public function tearDown()
     {
         Mockery::close();
+
+        parent::tearDown();
     }
 
     protected function getPackageProviders($app)
@@ -159,4 +161,24 @@ public function testAboveLevel()
         $this->app->log->emergency('hello');
     }
 
+    public function testFlushOnTerminate()
+    {
+        $clientMock = Mockery::mock('RollbarNotifier');
+        $clientMock->shouldReceive('flush')->once();
+        $this->app['rollbar.client'] = $clientMock;
+
+        $handler = $this->app->make('rollbar.handler');
+
+        $this->app->terminate();
+    }
+
+    public function testDontFlushIfUnresolved()
+    {
+        $clientMock = Mockery::mock('RollbarNotifier');
+        $clientMock->shouldReceive('flush')->times(0);
+        $this->app['rollbar.client'] = $clientMock;
+
+        $this->app->terminate();
+    }
+
 }