Laravel 6 compatibility

Author: emilsundberg

composer.json

@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=7.0",
-        "illuminate/support": "^5.0",
+        "illuminate/support": "^5.0 || ^6.0",
         "rollbar/rollbar": "^1"
     },
     "require-dev": {

src/RollbarServiceProvider.php

@@ -1,11 +1,12 @@
 <?php namespace Rollbar\Laravel;
 
+use Rollbar\Rollbar;
+use Rollbar\RollbarLogger;
+use Illuminate\Support\Arr;
 use InvalidArgumentException;
+use Rollbar\Laravel\MonologHandler;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\ServiceProvider;
-use Rollbar\Laravel\MonologHandler;
-use Rollbar\RollbarLogger;
-use Rollbar\Rollbar;
 
 class RollbarServiceProvider extends ServiceProvider
 {
@@ -37,9 +38,9 @@ public function register()
                 throw new InvalidArgumentException('Rollbar access token not configured');
             }
 
-            $handleException = (bool) array_pull($config, 'handle_exception');
-            $handleError = (bool) array_pull($config, 'handle_error');
-            $handleFatal = (bool) array_pull($config, 'handle_fatal');
+            $handleException = (bool) Arr::pull($config, 'handle_exception');
+            $handleError = (bool) Arr::pull($config, 'handle_error');
+            $handleFatal = (bool) Arr::pull($config, 'handle_fatal');
 
             Rollbar::init($config, $handleException, $handleError, $handleFatal);
 

tests/RollbarTest.php

@@ -10,7 +10,7 @@
 
 class RollbarTest extends \Orchestra\Testbench\TestCase
 {
-    public function setUp()
+    protected function setUp(): void
     {
         $this->access_token = 'B42nHP04s06ov18Dv8X7VI4nVUs6w04X';
         putenv('ROLLBAR_TOKEN=' . $this->access_token);