Merge pull request #82 from dingo/chore/laravel-7-compat

Laravel 7 related compat changes
dingo · Mar 12, 2020 · c36a779 · c36a779
2 parents 0a02c03 + bbf1596
commit c36a779
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,22 +1,18 @@
 language: php
 
-dist: trusty
-
-php:
-  - 7.1
-  - 7.2
-
 sudo: false
 
 env:
   global:
     - setup=basic
 matrix:
   include:
-    - php: 7.1
-      env: setup=lowest
     - php: 7.2
       env: setup=stable
+    - php: 7.3
+      env: setup=stable
+    - php: 7.4
+      env: setup=stable
 
 install:
   - if [[ $setup = 'basic' ]]; then travis_retry composer install --no-interaction --prefer-source; fi

diff --git a/composer.json b/composer.json
@@ -10,15 +10,15 @@
         }
     ],
     "require": {
-        "php": "^7.1",
+        "php": "^7.2.5",
         "illuminate/support": "^5.5 || ^6.0 || ^7.0",
         "illuminate/filesystem": "^5.5 || ^6.0 || ^7.0",
         "doctrine/annotations": "~1.2",
         "phpdocumentor/reflection-docblock": "^3.1|^4.1"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "~2.0",
-        "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.5"
+        "phpunit/phpunit": "^6.5"
     },
     "autoload": {
         "psr-4": {