Merge branch 'master' of https://github.com/rollbar/rollbar-php-laravel

Author: ArturMoczulski

.travis.yml

@@ -2,6 +2,8 @@ language: php
 dist: trusty
 
 php:
+  - 7.2
+  - 7.1
   - 7.0
   - 5.6
   - 5.5

README.md

@@ -22,6 +22,24 @@ Add the service provider to the `'providers'` array in `config/app.php` (this pa
 Rollbar\Laravel\RollbarServiceProvider::class,
 ```
 
+### Disabling Laravel 5.5's auto-discovery
+
+By default Rollbar Laravel supports auto-discovery. If you do not want to auto-discover the package add the following code to your `composer.json`:
+
+```json
+"extra": {
+        "laravel": {
+            "dont-discover": [
+                "rollbar/rollbar-laravel"
+            ]
+        }
+    },
+```
+
+### Enabling / disabling Rollbar on specific environments
+
+First, [disable auto-discovery](https://github.com/rollbar/rollbar-php-laravel/blob/master/README.md#disabling-laravel-55s-auto-discovery).
+
 If you only want to enable Rollbar reporting for certain environments you can conditionally load the service provider in your `AppServiceProvider`:
 
 ```php

src/RollbarLogHandler.php

@@ -75,6 +75,11 @@ public function log($level, $message, array $context = [])
 
         $context = $this->addContext($context);
 
+        // Workaround Laravel 5.5 moving exception from message into context
+        if (! empty($context['exception']) && is_string($message)) {
+            $message = $context['exception'];
+        }
+
         return $this->logger->log($level, $message, $context);
     }