* Added direct support for laravel 5.6.x

Andrew McLagan · Andrew McLagan · commit 8c6c55bf4890 · 2018-07-05T11:47:15.000+10:00
* Changed php support to min of &gt;=7.1 as per laravel 5.6
* Changed reqiured dependancy `illuminate/support` to minimum ^5.0
* Added local docker `phpunit`, `phpunit-versions`, `composer` helpers `./bin/`
    - e.g. simply type `bin/phpunit`
* Updated travis config
* Use of class constants to add coverage of namespace collision edge cases
* Added config helper to DRY codebase
* Added basic method return type declarations (strong typing is a win:win)
diff --git a/.travis.yml b/.travis.yml
@@ -5,9 +5,6 @@ php:
   - 7.2
   - 7.1
   - 7.0
-  - 5.6
-  - 5.5
-  - 5.4
   - hhvm
   - nightly
   
diff --git a/bin/composer b/bin/composer
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+docker run --rm --interactive --tty \
+	-e "TERM=xterm-256color" \
+    -v $PWD:/app \
+    composer "$@"
diff --git a/bin/phpunit b/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 "$@"
+
diff --git a/bin/phpunit-versions b/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
diff --git a/composer.json b/composer.json
@@ -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"
+        "phpunit/phpunit": "~7.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml b/phpunit.xml
@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="true"
-         syntaxCheck="false"
 >
     <testsuites>
         <testsuite name="Test Suite">
diff --git a/src/Facades/Rollbar.php b/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;
     }
 }
diff --git a/src/RollbarServiceProvider.php b/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);
+    }
 }
diff --git a/tests/RollbarTest.php b/tests/RollbarTest.php
@@ -1,6 +1,11 @@
-<?php namespace Rollbar\Laravel;
+<?php 
+
+namespace Rollbar\Laravel;
 
 use Rollbar\Laravel\Facades\Rollbar as RollbarFacade;
+use Rollbar\Laravel\RollbarServiceProvider;
+use Rollbar\Laravel\RollbarLogHandler;
+use Rollbar\RollbarLogger;
 
 class RollbarTest extends \Orchestra\Testbench\TestCase
 {
@@ -14,45 +19,45 @@ public function setUp()
 
     protected function getPackageProviders($app)
     {
-        return ['Rollbar\Laravel\RollbarServiceProvider'];
+        return [RollbarServiceProvider::class];
     }
 
     public function testBinding()
     {
-        $client = $this->app->make('Rollbar\RollbarLogger');
-        $this->assertInstanceOf('Rollbar\RollbarLogger', $client);
+        $client = $this->app->make(RollbarLogger::class);
+        $this->assertInstanceOf(RollbarLogger::class, $client);
 
-        $handler = $this->app->make('Rollbar\Laravel\RollbarLogHandler');
-        $this->assertInstanceOf('Rollbar\Laravel\RollbarLogHandler', $handler);
+        $handler = $this->app->make(RollbarLogHandler::class);
+        $this->assertInstanceOf(RollbarLogHandler::class, $handler);
     }
 
     public function testIsSingleton()
     {
-        $handler1 = $this->app->make('Rollbar\Laravel\RollbarLogHandler');
-        $handler2 = $this->app->make('Rollbar\Laravel\RollbarLogHandler');
+        $handler1 = $this->app->make(RollbarLogHandler::class);
+        $handler2 = $this->app->make(RollbarLogHandler::class);
         $this->assertEquals(spl_object_hash($handler1), spl_object_hash($handler2));
     }
 
     public function testFacade()
     {
         $client = RollbarFacade::getFacadeRoot();
-        $this->assertInstanceOf('Rollbar\Laravel\RollbarLogHandler', $client);
+        $this->assertInstanceOf(RollbarLogHandler::class, $client);
     }
 
     public function testPassConfiguration()
     {
-        $client = $this->app->make('Rollbar\RollbarLogger');
+        $client = $this->app->make(RollbarLogger::class);
         $config = $client->extend([]);
         $this->assertEquals($this->access_token, $config['access_token']);
     }
 
     public function testCustomConfiguration()
     {
-        $this->app->config->set('services.rollbar.root', '/tmp');
-        $this->app->config->set('services.rollbar.included_errno', E_ERROR);
-        $this->app->config->set('services.rollbar.environment', 'staging');
+        $this->app->config->set('logging.channels.rollbar.root', '/tmp');
+        $this->app->config->set('logging.channels.rollbar.included_errno', E_ERROR);
+        $this->app->config->set('logging.channels.rollbar.environment', 'staging');
 
-        $client = $this->app->make('Rollbar\RollbarLogger');
+        $client = $this->app->make(RollbarLogger::class);
         $config = $client->extend([]);
         
         $this->assertEquals('staging', $config['environment']);
@@ -64,11 +69,11 @@ public function testAutomaticContext()
     {
         $this->app->session->put('foo', 'bar');
         
-        $logger = $this->app->make('Rollbar\RollbarLogger');
+        $logger = $this->app->make(RollbarLogger::class);
         
-        $handlerMock = \Mockery::mock('Rollbar\Laravel\RollbarLogHandler', [$logger, $this->app]);
+        $handlerMock = \Mockery::mock(RollbarLogHandler::class, [$logger, $this->app]);
         $handlerMock->shouldReceive('log')->passthru();
-        $this->app['Rollbar\Laravel\RollbarLogHandler'] = $handlerMock;
+        $this->app[RollbarLogHandler::class] = $handlerMock;
         
         $handlerMock->log('info', 'Test log message');
         
@@ -84,11 +89,11 @@ public function testMergedContext()
     {
         $this->app->session->put('foo', 'bar');
         
-        $logger = $this->app->make('Rollbar\RollbarLogger');
+        $logger = $this->app->make(RollbarLogger::class);
         
-        $handlerMock = \Mockery::mock('Rollbar\Laravel\RollbarLogHandler', [$logger, $this->app]);
+        $handlerMock = \Mockery::mock(RollbarLogHandler::class, [$logger, $this->app]);
         $handlerMock->shouldReceive('log')->passthru();
-        $this->app['Rollbar\Laravel\RollbarLogHandler'] = $handlerMock;
+        $this->app[RollbarLogHandler::class] = $handlerMock;
         
         $handlerMock->log('info', 'Test log message', [
             'tags'   => ['one' => 'two'],
@@ -108,16 +113,16 @@ public function testLogListener()
     {
         $exception = new \Exception('Testing error handler');
 
-        $clientMock = \Mockery::mock('Rollbar\RollbarLogger');
+        $clientMock = \Mockery::mock(RollbarLogger::class);
         
         $clientMock->shouldReceive('log')->times(2);
         $clientMock->shouldReceive('log')->times(1)->with('error', $exception, ['foo' => 'bar']);
 
-        $handlerMock = \Mockery::mock('Rollbar\Laravel\RollbarLogHandler', [$clientMock, $this->app]);
+        $handlerMock = \Mockery::mock(RollbarLogHandler::class, [$clientMock, $this->app]);
         
         $handlerMock->shouldReceive('log')->passthru();
         
-        $this->app['Rollbar\Laravel\RollbarLogHandler'] = $handlerMock;
+        $this->app[RollbarLogHandler::class] = $handlerMock;
 
         $this->app->log->info('hello');
         $this->app->log->error('oops');
@@ -126,11 +131,11 @@ public function testLogListener()
 
     public function testErrorLevels1()
     {
-        $this->app->config->set('services.rollbar.level', 'critical');
+        $this->app->config->set('logging.channels.rollbar.level', 'critical');
 
-        $clientMock = \Mockery::mock('Rollbar\RollbarLogger');
+        $clientMock = \Mockery::mock(RollbarLogger::class);
         $clientMock->shouldReceive('log')->times(3);
-        $this->app['Rollbar\RollbarLogger'] = $clientMock;
+        $this->app[RollbarLogger::class] = $clientMock;
 
         $this->app->log->debug('hello');
         $this->app->log->info('hello');
@@ -144,11 +149,11 @@ public function testErrorLevels1()
 
     public function testErrorLevels2()
     {
-        $this->app->config->set('services.rollbar.level', 'debug');
+        $this->app->config->set('logging.channels.rollbar.level', 'debug');
 
-        $clientMock = \Mockery::mock('Rollbar\RollbarLogger');
+        $clientMock = \Mockery::mock(RollbarLogger::class);
         $clientMock->shouldReceive('log')->times(8);
-        $this->app['Rollbar\RollbarLogger'] = $clientMock;
+        $this->app[RollbarLogger::class] = $clientMock;
 
         $this->app->log->debug('hello');
         $this->app->log->info('hello');
@@ -162,11 +167,11 @@ public function testErrorLevels2()
 
     public function testErrorLevels3()
     {
-        $this->app->config->set('services.rollbar.level', 'none');
+        $this->app->config->set('logging.channels.rollbar.level', 'none');
 
-        $clientMock = \Mockery::mock('Rollbar\RollbarLogger');
+        $clientMock = \Mockery::mock(RollbarLogger::class);
         $clientMock->shouldReceive('log')->times(0);
-        $this->app['Rollbar\RollbarLogger'] = $clientMock;
+        $this->app[RollbarLogger::class] = $clientMock;
 
         $this->app->log->debug('hello');
         $this->app->log->info('hello');
@@ -180,14 +185,14 @@ public function testErrorLevels3()
 
     public function testPersonFunctionIsCalledWhenSessionContainsAtLeastOneItem()
     {
-        $this->app->config->set('services.rollbar.person_fn', function () {
+        $this->app->config->set('logging.channels.rollbar.person_fn', function () {
             return [
                 'id' => '123',
                 'username' => 'joebloggs',
             ];
         });
 
-        $logger = $this->app->make('Rollbar\RollbarLogger');
+        $logger = $this->app->make(RollbarLogger::class);
 
         $this->app->session->put('foo', 'bar');
 

-Original file line number
+Diff line change
   - 7.2
   - 7.1
   - 7.0
 -  - 5.6
 -  - 5.5
 -  - 5.4
   - hhvm
   - nightly
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`convertWarningsToExceptions="true"`
`9`	`9`	`processIsolation="false"`
`10`	`10`	`stopOnFailure="true"`
`11`		`- syntaxCheck="false"`
`12`	`11`	`>`
`13`	`12`	`<testsuites>`
`14`	`13`	`<testsuite name="Test Suite">`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`<?php namespace Rollbar\Laravel\Facades;`
`2`	`2`
`3`	`3`	`use Illuminate\Support\Facades\Facade;`
	`4`	`+use Rollbar\Laravel\RollbarLogHandler;`
`4`	`5`
`5`	`6`	`class Rollbar extends Facade`
`6`	`7`	`{`
`@@ -11,6 +12,6 @@ class Rollbar extends Facade`
`11`	`12`	`*/`
`12`	`13`	`protected static function getFacadeAccessor()`
`13`	`14`	`{`
`14`		`- return 'Rollbar\Laravel\RollbarLogHandler';`
	`15`	`+ return RollbarLogHandler::class;`
`15`	`16`	`}`
`16`	`17`	`}`