Update composer and travis dependencies

spatie · Sep 16, 2019 · 27f54c1 · 27f54c1
1 parent d52a1fd
commit 27f54c1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,17 +15,17 @@ matrix:
         - php: 7.2
           env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable'
         - php: 7.2
-          env: LARAVEL='6.0.*' TESTBENCH='4.0.*' COMPOSER_FLAGS='--prefer-lowest'
+          env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-lowest'
         - php: 7.2
-          env: LARAVEL='6.0.*' TESTBENCH='4.0.*' COMPOSER_FLAGS='--prefer-stable'
+          env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable'
         - php: 7.3
           env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-lowest'
         - php: 7.3
           env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable'
         - php: 7.3
-          env: LARAVEL='6.0.*' TESTBENCH='4.0.*' COMPOSER_FLAGS='--prefer-lowest'
+          env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-lowest'
         - php: 7.3
-          env: LARAVEL='6.0.*' TESTBENCH='4.0.*' COMPOSER_FLAGS='--prefer-stable'
+          env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable'
     fast_finish: true
 
 before_script:

diff --git a/composer.json b/composer.json
@@ -31,10 +31,10 @@
     ],
     "require": {
         "php" : "^7.2",
-        "laravel/framework": "~5.8.0|~6.0.0"
+        "laravel/framework": "~5.8.0|^6.0"
     },
     "require-dev": {
-        "orchestra/testbench": "~3.8.0|~4.0.0",
+        "orchestra/testbench": "~3.8.0|^4.0",
         "phpunit/phpunit": "^8.0",
         "spatie/phpunit-snapshot-assertions": "^2.0"
     },