Merge branch 'release/4.0.0'

sebastiaanluca · Aug 11, 2019 · 21bec0c · 21bec0c
2 parents 782f121 + af8385c
commit 21bec0c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,8 @@ env:
   matrix:
     - LARAVEL_VERSION="5.8.*" COMPOSER_FLAGS="--prefer-lowest"
     - LARAVEL_VERSION="5.8.*" COMPOSER_FLAGS="--prefer-stable"
+    - LARAVEL_VERSION="^6.0" COMPOSER_FLAGS="--prefer-lowest"
+    - LARAVEL_VERSION="^6.0" COMPOSER_FLAGS="--prefer-stable"
     - LARAVEL_VERSION="dev-master" ORCHESTRA_VERSION="dev-master" COMPOSER_FLAGS="--prefer-lowest" MINIMUM_STABILITY="dev"
     - LARAVEL_VERSION="dev-master" ORCHESTRA_VERSION="dev-master" COMPOSER_FLAGS="--prefer-stable" MINIMUM_STABILITY="dev"
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 ## Unreleased
 
+## 4.0.0 (2019-08-11)
+
+- Add support for Laravel 6.0
+
 ## 3.0.0 (2019-03-01)
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -20,12 +20,12 @@
     ],
     "require": {
         "php": "^7.2",
-        "laravel/framework": "5.8.*"
+        "laravel/framework": "5.8.*|^6.0"
     },
     "require-dev": {
-        "orchestra/testbench": "3.8.*",
+        "orchestra/testbench": "3.8.*|^4.0",
         "phpunit/phpunit": "^8.2",
-        "sebastiaanluca/php-codesniffer-ruleset": "^0.3.0"
+        "sebastiaanluca/php-codesniffer-ruleset": "^0.4.2"
     },
     "autoload": {
         "psr-4": {
@@ -65,5 +65,7 @@
                 "SebastiaanLuca\\ConditionalProviders\\ConditionalProvidersServiceProvider"
             ]
         }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }