[WIP] Support for laravel 5.6

.travis.yml

@@ -4,11 +4,6 @@ dist: trusty
 php:
   - 7.2
   - 7.1
-  - 7.0
-  - 5.6
-  - 5.5
-  - 5.4
-  - hhvm
   - nightly
 
 matrix:

README.md

@@ -47,5 +47,12 @@ For bug reports, please [open an issue on GitHub](https://github.com/rollbar/rol
 
 ## Testing
 Tests are in `tests`.
-To run the tests: `composer test`
-To fix code style issues: `composer fix`
+* To run the tests: `composer test`
+* To fix code style issues: `composer fix`
+
+## Docker
+Docker binaries are located in `./bin` and can be run by simply executing `bin/phpunit` for example.
+* To run tests: `bin/phpunit`
+* To run code sniffer: `bin/phpcs` or `bin/phpcbf`
+* To run all supported versions: `bin/phpunit-versions`
+* To run composer : `bin/composer install` OR `bin/composer update`

bin/composer

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+docker run --rm --interactive --tty \
+	-e "TERM=xterm-256color" \
+    -v $PWD:/app \
+    composer "$@"

bin/phpcbf

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+docker run -it --rm \
+	-e "TERM=xterm-256color" \
+	-v "$PWD":/usr/src \
+	-w /usr/src \
+	php:7.2-cli-alpine \
+	vendor/bin/phpcbf --standard=PSR1,PSR2 src tests
+

bin/phpcs

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+docker run -it --rm \
+	-e "TERM=xterm-256color" \
+	-v "$PWD":/usr/src \
+	-w /usr/src \
+	php:7.2-cli-alpine \
+	vendor/bin/phpcs --standard=PSR1,PSR2 src tests 
+

bin/phpunit

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+docker run -it --rm \
+	-e "TERM=xterm-256color" \
+	-v "$PWD":/usr/src \
+	-w /usr/src \
+	php:7.2-cli-alpine \
+	vendor/bin/phpunit --coverage-clover build/logs/clover.xml
+

bin/phpunit-versions

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+declare -a versions=("7.1" "7.2")
+
+for version in "${versions[@]}"
+do
+    docker run -it --rm \
+    	-e "TERM=xterm-256color" \
+    	-v "$PWD":/usr/src \
+    	-w /usr/src \
+    	php:"$version"-cli-alpine \
+    	vendor/bin/phpunit "$@"
+done

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "rollbar/rollbar-laravel",
+    "name": "ethical-jobs/rollbar-laravel",
     "description": "Rollbar error monitoring integration for Laravel projects",
     "keywords": ["laravel", "rollbar", "monitoring", "error", "logging"],
     "homepage": "https://github.com/rollbar/rollbar-php-laravel",
@@ -16,16 +16,16 @@
         }
     ],
     "require": {
-        "php": ">=5.4",
-        "illuminate/support": "^4.0|^5.0",
+        "php": ">=7.0",
+        "illuminate/support": "^5.0",
         "rollbar/rollbar": "^1"
     },
     "require-dev": {
-        "orchestra/testbench": "~3.0",
+        "orchestra/testbench": "~3.6",
         "mockery/mockery": "^0.9",
         "satooshi/php-coveralls": "^1.0",
-        "squizlabs/php_codesniffer": "2.*",
-        "phpunit/phpunit": "~4.0|~5.0"
+        "squizlabs/php_codesniffer": "3.*",
+        "phpunit/phpunit": "~7.0"
     },
     "autoload": {
         "psr-4": {

phpunit.xml

@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="true"
-         syntaxCheck="false"
 >
     <testsuites>
         <testsuite name="Test Suite">

src/Facades/Rollbar.php

@@ -1,6 +1,7 @@
 <?php namespace Rollbar\Laravel\Facades;
 
 use Illuminate\Support\Facades\Facade;
+use Rollbar\Laravel\RollbarLogHandler;
 
 class Rollbar extends Facade
 {
@@ -11,6 +12,6 @@ class Rollbar extends Facade
      */
     protected static function getFacadeAccessor()
     {
-        return 'Rollbar\Laravel\RollbarLogHandler';
+        return RollbarLogHandler::class;
     }
 }

src/RollbarServiceProvider.php

@@ -1,9 +1,11 @@
 <?php namespace Rollbar\Laravel;
 
-use Illuminate\Support\ServiceProvider;
 use InvalidArgumentException;
-use Rollbar\Rollbar;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\ServiceProvider;
 use Rollbar\Laravel\RollbarLogHandler;
+use Rollbar\RollbarLogger;
+use Rollbar\Rollbar;
 
 class RollbarServiceProvider extends ServiceProvider
 {
@@ -41,7 +43,7 @@ public function boot()
                 $context = $args[2];
             }
 
-            $app['Rollbar\Laravel\RollbarLogHandler']->log($level, $message, $context);
+            $app[RollbarLogHandler::class]->log($level, $message, $context);
         });
     }
 
@@ -55,9 +57,7 @@ public function register()
             return;
         }
 
-        $app = $this->app;
-
-        $this->app->singleton('Rollbar\RollbarLogger', function ($app) {
+        $this->app->singleton(RollbarLogger::class, function ($app) {
 
             $defaults = [
                 'environment'       => $app->environment(),
@@ -66,8 +66,10 @@ public function register()
                 'handle_error'      => true,
                 'handle_fatal'      => true,
             ];
-            $config = array_merge($defaults, $app['config']->get('services.rollbar', []));
-            $config['access_token'] = getenv('ROLLBAR_TOKEN') ?: $app['config']->get('services.rollbar.access_token');
+
+            $config = array_merge($defaults, $app['config']->get('logging.channels.rollbar', []));
+
+            $config['access_token'] = static::config('access_token');
 
             if (empty($config['access_token'])) {
                 throw new InvalidArgumentException('Rollbar access token not configured');
@@ -82,11 +84,11 @@ public function register()
             return Rollbar::logger();
         });
 
-        $this->app->singleton('Rollbar\Laravel\RollbarLogHandler', function ($app) {
+        $this->app->singleton(RollbarLogHandler::class, function ($app) {
 
-            $level = getenv('ROLLBAR_LEVEL') ?: $app['config']->get('services.rollbar.level', 'debug');
+            $level = static::config('level', 'debug');
 
-            return new RollbarLogHandler($app['Rollbar\RollbarLogger'], $app, $level);
+            return new RollbarLogHandler($app[RollbarLogger::class], $app, $level);
         });
     }
 
@@ -95,12 +97,34 @@ public function register()
      *
      * @return boolean
      */
-    public function stop()
+    public function stop() : bool
     {
-        $level = getenv('ROLLBAR_LEVEL') ?: $this->app->config->get('services.rollbar.level', null);
-        $token = getenv('ROLLBAR_TOKEN') ?: $this->app->config->get('services.rollbar.access_token', null);
+        $level = static::config('level');
+
+        $token = static::config('token');
+
         $hasToken = empty($token) === false;
 
         return $hasToken === false || $level === 'none';
     }
+
+    /**
+     * Return a rollbar logging config
+     *
+     * @param array|string $key
+     * @param mixed $default
+     * @return mixed
+     */
+    protected static function config($key = '', $default = null)
+    {
+        $envKey = 'ROLLBAR_'.strtoupper($key);
+
+        if ($envKey === 'ROLLBAR_ACCESS_TOKEN') {
+            $envKey = 'ROLLBAR_TOKEN';
+        }
+
+        $logKey = empty($key) ? 'logging.channels.rollbar' : "logging.channels.rollbar.$key";
+
+        return getenv($envKey) ?: Config::get($logKey, $default);
+    }
 }