upgrade to use rollbar-php v1.0.0

Author: ArturMoczulski

README.md

@@ -13,20 +13,20 @@ Installation
 Install using composer:
 
 ```
-composer require jenssegers/rollbar
+composer require rollbar/rollbar-laravel
 ```
 
 Add the service provider to the `'providers'` array in `config/app.php`:
 
 ```php
-Jenssegers\Rollbar\RollbarServiceProvider::class,
+Rollbar\Laravel\RollbarServiceProvider::class,
 ```
 
 If you only want to enable Rollbar reporting for certain environments you can conditionally load the service provider in your `AppServiceProvider`:
 
 ```php
 if ($this->app->environment('production')) {
-    $this->app->register(\Jenssegers\Rollbar\RollbarServiceProvider::class);
+    $this->app->register(\Rollbar\Laravel\RollbarServiceProvider::class);
 }
 ```
 

composer.json

@@ -1,29 +1,42 @@
 {
-    "name": "jenssegers/rollbar",
+    "name": "rollbar/rollbar-laravel",
     "description": "Rollbar error monitoring integration for Laravel projects",
     "keywords": ["laravel", "rollbar", "monitoring", "error", "logging"],
-    "homepage": "https://github.com/jenssegers/laravel-rollbar",
+    "homepage": "https://github.com/rollbar/rollbar-php-laravel",
     "license": "MIT",
     "authors": [
         {
             "name": "Jens Segers",
             "homepage": "https://jenssegers.com"
+        },
+        {
+            "name": "Artur Moczulski",
+            "email": "[email protected]",
+            "role": "Contractor @ Rollbar, Inc."
         }
     ],
     "require": {
         "php": ">=5.4",
         "illuminate/support": "^4.0|^5.0",
-        "rollbar/rollbar": "~0.15"
+        "rollbar/rollbar": "~1.0.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^3.0",
+        "orchestra/testbench": "~3.0",
         "mockery/mockery": "^0.9",
         "satooshi/php-coveralls": "^1.0",
+        "squizlabs/php_codesniffer": "2.*",
         "phpunit/phpunit": "~4.0|~5.0"
     },
     "autoload": {
         "psr-4": {
-            "Jenssegers\\Rollbar\\": "src/"
+            "Rollbar\\Laravel\\": "src/"
         }
+    },
+    "scripts": {
+        "test": [
+          "phpunit --coverage-clover build/logs/clover.xml",
+          "phpcs --standard=PSR1,PSR2 src tests"
+        ],
+        "fix": "phpcbf --standard=PSR1,PSR2 src tests"
     }
 }

src/Facades/Rollbar.php

@@ -1,4 +1,4 @@
-<?php namespace Jenssegers\Rollbar\Facades;
+<?php namespace Rollbar\Laravel\Facades;
 
 use Illuminate\Support\Facades\Facade;
 
@@ -7,10 +7,10 @@ class Rollbar extends Facade
     /**
      * Get a schema builder instance for the default connection.
      *
-     * @return \Jenssegers\Rollbar\RollbarLogHandler
+     * @return \Rollbar\Laravel\RollbarLogHandler
      */
     protected static function getFacadeAccessor()
     {
-        return 'Jenssegers\Rollbar\RollbarLogHandler';
+        return 'Rollbar\Laravel\RollbarLogHandler';
     }
 }

src/RollbarLogHandler.php

@@ -1,20 +1,20 @@
-<?php namespace Jenssegers\Rollbar;
+<?php namespace Rollbar\Laravel;
 
 use Exception;
 use Illuminate\Foundation\Application;
 use InvalidArgumentException;
 use Monolog\Logger as Monolog;
 use Psr\Log\AbstractLogger;
-use RollbarNotifier;
+use Rollbar\RollbarLogger;
 
 class RollbarLogHandler extends AbstractLogger
 {
     /**
      * The rollbar client instance.
      *
-     * @var RollbarNotifier
+     * @var logger
      */
-    protected $rollbar;
+    protected $logger;
 
     /**
      * The Laravel application.
@@ -50,9 +50,9 @@ class RollbarLogHandler extends AbstractLogger
     /**
      * Constructor.
      */
-    public function __construct(RollbarNotifier $rollbar, Application $app, $level = 'debug')
+    public function __construct(RollbarLogger $logger, Application $app, $level = 'debug')
     {
-        $this->rollbar = $rollbar;
+        $this->logger = $logger;
 
         $this->app = $app;
 
@@ -76,9 +76,9 @@ public function log($level, $message, array $context = [])
         $context = $this->addContext($context);
 
         if ($message instanceof Exception) {
-            $this->rollbar->report_exception($message, null, $context);
+            return $this->logger->log($level, $message, $context);
         } else {
-            $this->rollbar->report_message($message, $level, $context);
+            return $this->logger->log($level, $message, $context);
         }
     }
 
@@ -91,34 +91,29 @@ protected function addContext(array $context = [])
     {
         // Add session data.
         if ($session = $this->app->session->all()) {
-            if (empty($this->rollbar->person) or ! is_array($this->rollbar->person)) {
-                $this->rollbar->person = [];
-            }
 
             // Merge person context.
             if (isset($context['person']) and is_array($context['person'])) {
-                $this->rollbar->person = $context['person'];
+                
+                $this->logger->configure(['person' => $context['person']]);
                 unset($context['person']);
-            } else {
-                if ($this->rollbar->person_fn && is_callable($this->rollbar->person_fn)) {
-                    $data = @call_user_func($this->rollbar->person_fn);
-                    if (isset($data['id'])) {
-                        $this->rollbar->person = call_user_func($this->rollbar->person_fn);
-                    }
-                }
+                
             }
 
             // Add user session information.
-            if (isset($this->rollbar->person['session'])) {
-                $this->rollbar->person['session'] = array_merge($session, $this->rollbar->person['session']);
-            } else {
-                $this->rollbar->person['session'] = $session;
-            }
+            $config = $this->logger->extend([]);
+            $person = isset($config['person']) ? $config['person'] : [];
+            
+            $person['session'] = isset($person['session']) ? 
+                array_merge($session, $person['session']) :
+                $person['session'] = $session;
 
             // User session id as user id if not set.
-            if (! isset($this->rollbar->person['id'])) {
-                $this->rollbar->person['id'] = $this->app->session->getId();
+            if (! isset($person['id'])) {
+                $person['id'] = $this->app->session->getId();
             }
+                
+            $this->logger->configure(['person' => $person]);
         }
 
         return $context;

src/RollbarServiceProvider.php

@@ -1,9 +1,9 @@
-<?php namespace Jenssegers\Rollbar;
+<?php namespace Rollbar\Laravel;
 
 use Illuminate\Support\ServiceProvider;
 use InvalidArgumentException;
-use Rollbar;
-use RollbarNotifier;
+use Rollbar\Rollbar;
+use Rollbar\Laravel\RollbarLogHandler;
 
 class RollbarServiceProvider extends ServiceProvider
 {
@@ -36,7 +36,7 @@ public function boot()
                 $context = $args[2];
             }
 
-            $app['Jenssegers\Rollbar\RollbarLogHandler']->log($level, $message, $context);
+            $app['Rollbar\Laravel\RollbarLogHandler']->log($level, $message, $context);
         });
     }
 
@@ -52,46 +52,31 @@ public function register()
 
         $app = $this->app;
 
-        $this->app->singleton('RollbarNotifier', function ($app) {
-            // Default configuration.
+        $this->app->singleton('Rollbar\RollbarLogger', function ($app) {
+            
             $defaults = [
                 'environment'  => $app->environment(),
                 'root'         => base_path(),
             ];
-
             $config = array_merge($defaults, $app['config']->get('services.rollbar', []));
-
             $config['access_token'] = getenv('ROLLBAR_TOKEN') ?: $app['config']->get('services.rollbar.access_token');
-
+            
             if (empty($config['access_token'])) {
                 throw new InvalidArgumentException('Rollbar access token not configured');
             }
-
-            Rollbar::$instance = $rollbar = new RollbarNotifier($config);
-
-            return $rollbar;
+            
+            \Rollbar\Rollbar::init($config);
+            
+            return Rollbar::logger();
         });
 
-        $this->app->singleton('Jenssegers\Rollbar\RollbarLogHandler', function ($app) {
+        $this->app->singleton('Rollbar\Laravel\RollbarLogHandler', function ($app) {
+            
             $level = getenv('ROLLBAR_LEVEL') ?: $app['config']->get('services.rollbar.level', 'debug');
 
-            return new RollbarLogHandler($app['RollbarNotifier'], $app, $level);
-        });
-
-        // Register the fatal error handler.
-        register_shutdown_function(function () use ($app) {
-            if (isset($app['RollbarNotifier'])) {
-                $app->make('RollbarNotifier');
-                Rollbar::report_fatal_error();
-            }
-        });
-
-        // If the Rollbar client was resolved, then there is a possibility that there
-        // are unsent error messages in the internal queue, so let's flush them.
-        register_shutdown_function(function () use ($app) {
-            if (isset($app['RollbarNotifier'])) {
-                $app['RollbarNotifier']->flush();
-            }
+            return new RollbarLogHandler($app['Rollbar\RollbarLogger'], $app, $level);
+            
         });
+        
     }
 }