Merge branch 'master' of github.com:mvdnbrk/laravel-model-expires

mvdnbrk · Aug 8, 2020 · 6fc8521 · 6fc8521
2 parents d5ac1e6 + 1624216
commit 6fc8521
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,26 +7,28 @@ matrix:
       env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable'
     - php: 7.2
       env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable'
-    - php: 7.2
-      env: LARAVEL='7.*' TESTBENCH='5.*' COMPOSER_FLAGS='--prefer-lowest'
     - php: 7.2
       env: LARAVEL='7.*' TESTBENCH='5.*' COMPOSER_FLAGS='--prefer-stable'
     - php: 7.3
       env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable'
     - php: 7.3
       env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable'
-    - php: 7.3
-      env: LARAVEL='7.*' TESTBENCH='5.*' COMPOSER_FLAGS='--prefer-lowest'
     - php: 7.3
       env: LARAVEL='7.*' TESTBENCH='5.*' COMPOSER_FLAGS='--prefer-stable'
+    - php: 7.3
+      env: LARAVEL='8.*' TESTBENCH='6.*' COMPOSER_FLAGS='--prefer-lowest'
+    - php: 7.3
+      env: LARAVEL='8.*' TESTBENCH='6.*' COMPOSER_FLAGS='--prefer-stable'
     - php: 7.4
       env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable'
     - php: 7.4
       env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable'
-    - php: 7.4
-      env: LARAVEL='7.*' TESTBENCH='5.*' COMPOSER_FLAGS='--prefer-lowest'
     - php: 7.4
       env: LARAVEL='7.*' TESTBENCH='5.*' COMPOSER_FLAGS='--prefer-stable'
+    - php: 7.4
+      env: LARAVEL='8.*' TESTBENCH='6.*' COMPOSER_FLAGS='--prefer-lowest'
+    - php: 7.4
+      env: LARAVEL='8.*' TESTBENCH='6.*' COMPOSER_FLAGS='--prefer-stable'
 
 cache:
   directories:

diff --git a/composer.json b/composer.json
@@ -19,12 +19,12 @@
     ],
     "require": {
         "php": "^7.2",
-        "illuminate/support": "^5.8 || ^6.0 || ^7.0"
+        "illuminate/support": "^5.8 || ^6.0 || ^7.0 || ^8.0"
     },
     "require-dev": {
         "doctrine/dbal": "^2.10",
         "nunomaduro/collision": "^3.0 || ^4.1",
-        "orchestra/testbench": "^3.8 || ^4.4 || ^5.0",
+        "orchestra/testbench": "^3.8 || ^4.4 || ^5.0 || ^6.0",
         "phpunit/phpunit": "^8.5 || ^9.0",
         "symfony/var-dumper": "^4.4 || ^5.0"
     },