Update for Laravel 5

jenssegers · Feb 8, 2015 · 436a5c7 · 436a5c7
1 parent 73a9c43
commit 436a5c7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         "rollbar/rollbar": "0.9.*"
     },
     "require-dev": {
-        "orchestra/testbench": "2.2.*",
+        "orchestra/testbench": "3.0.*",
         "mockery/mockery": "*",
         "satooshi/php-coveralls": "*"
     },

diff --git a/src/RollbarServiceProvider.php b/src/RollbarServiceProvider.php
@@ -28,11 +28,22 @@ public function boot()
             $app['rollbar.handler']->log($level, $message, $context);
         });
 
-        // Register Laravel shutdown function
-        $this->app->shutdown(function() use ($app)
+        if (method_exists($app, 'version') and starts_with($app->version(), '5'))
         {
-            $app['rollbar.client']->flush();
-        });
+             // Register Laravel 5 shutdown function
+            $this->app->terminating(function() use ($app)
+            {
+                $app['rollbar.client']->flush();
+            });
+        }
+        else
+        {
+            // Register Laravel 4 shutdown function
+            $this->app->shutdown(function() use ($app)
+            {
+                $app['rollbar.client']->flush();
+            });
+        }
 
         // Register PHP shutdown function
         register_shutdown_function(function() use ($app)

diff --git a/tests/RollbarTest.php b/tests/RollbarTest.php
@@ -15,7 +15,7 @@ public function tearDown()
         Mockery::close();
     }
 
-    protected function getPackageProviders()
+    protected function getPackageProviders($app)
     {
         return ['Jenssegers\Rollbar\RollbarServiceProvider'];
     }