Merge branch 'master' into laravel-5.8-upgrade

santigarcor · Feb 28, 2019 · c84f234 · c84f234
2 parents 43d901a + 2d3dc13
commit c84f234
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,19 +1,16 @@
 language: php
 
 php:
-  - 7.0
   - 7.1
   - 7.2
+  - 7.3
 
 env:
   global:
     - setup=basic
 
 matrix:
   fast_finish: true
-  include:
-    - php: 5.6
-      env: setup=stable
 
 sudo: false
 

diff --git a/composer.json b/composer.json
@@ -10,14 +10,14 @@
         }
     ],
     "require": {
-        "php": ">=5.6.0",
-        "laravel/framework": "~5.2.32|~5.3.0|~5.4.0|~5.5.0|~5.6.0|~5.7.0|~5.8.0",
+        "php": "^7.1",
+        "laravel/framework": "~5.6.0|~5.7.0|~5.8.0",
         "kkszymanowski/traitor": "^0.2.0"
     },
     "require-dev": {
         "mockery/mockery": ">=0.9.9",
         "phpunit/phpunit": ">=4.1",
-        "orchestra/testbench": "~3.2.0|~3.3.0|~3.4.6|~3.5.0|~3.6.0|~3.7.0|~3.8.0"
+        "orchestra/testbench": "~3.6.0|~3.7.0|~3.8.0"
     },
     "autoload": {
         "psr-4": {