Add support for Laravel 6 (#269)

* Add Laravel 6 to test matrix

* Upgrade Laravel version constraint and dev deps

* Replace expectedException annotation with code

* Add minimum-stability dev for now

* Fix test for non resolvable integration
laravel/framework#27977

* Revert "Replace expectedException annotation with code"

This reverts commit a74c1a6

Author: erikgaal

.travis.yml

@@ -17,12 +17,15 @@ env:
     - LARAVEL=5.6.* TESTBENCH=3.6.* PHPUNIT=7.5.*
     - LARAVEL=5.7.* TESTBENCH=3.7.* PHPUNIT=7.5.*
     - LARAVEL=5.8.* TESTBENCH=3.8.* PHPUNIT=7.5.*
+    - LARAVEL=6.0.* TESTBENCH=3.9.* PHPUNIT=8.0.*
 
 matrix:
   fast_finish: true
   allow_failures:
     - php: 7.4snapshot
   exclude:
+    - php: 7.1
+      env: LARAVEL=6.0.* TESTBENCH=3.9.* PHPUNIT=8.0.*
     - php: 7.2
       env: LARAVEL=5.0.* TESTBENCH=3.0.* PHPUNIT=4.8.*
     - php: 7.3

composer.json

@@ -17,11 +17,13 @@
     "sentry/sdk": "^2.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "7.5.*",
-    "laravel/framework": "5.8.*",
-    "orchestra/testbench": "3.8.*",
+    "phpunit/phpunit": "^8.0",
+    "laravel/framework": "^6.0",
+    "orchestra/testbench": "^3.9",
     "friendsofphp/php-cs-fixer": "2.14.*"
   },
+  "minimum-stability": "dev",
+  "prefer-stable": true,
   "autoload": {
     "psr-0": {
       "Sentry\\Laravel\\": "src/"

test/Sentry/IntegrationsOptionTest.php

@@ -50,7 +50,8 @@ public function testCustomIntegrationByInstance()
     }
 
     /**
-     * @expectedException \ReflectionException
+     * Throws \ReflectionException in <=5.8 and \Illuminate\Contracts\Container\BindingResolutionException since 6.0
+     * @expectedException \Exception
      */
     public function testCustomIntegrationThrowsExceptionIfNotResolvable()
     {