Add Laravel 6, 7 and 8 support

Removed composer.lock
webparking · Sep 10, 2020 · e66c335 · e66c335
1 parent 895af89
commit e66c335
Show file tree

Hide file tree

Showing 10 changed files with 67 additions and 5,392 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 vendor
-.php_cs.cache
+.php_cs.cache
+.phpunit.result.cache
+composer.lock
diff --git a/.travis.yml b/.travis.yml
@@ -11,42 +11,68 @@ matrix:
   fast_finish: true
   include:
     - php: 7.1
-      env: LARAVEL='5.5.*' TESTBENCH='3.5.*' COMPOSER_FLAGS='--prefer-lowest'
+      env: LARAVEL='5.5.*' TESTBENCH='3.5.*'
     - php: 7.1
       env: LARAVEL='5.5.*' TESTBENCH='3.5.*'
     - php: 7.1
       env: LARAVEL='5.6.*' TESTBENCH='3.6.*'
     - php: 7.1
       env: LARAVEL='5.7.*' TESTBENCH='3.7.*'
     - php: 7.1
-      env: LARAVEL='5.8.*' TESTBENCH='3.8.x-dev'
+      env: LARAVEL='5.8.*' TESTBENCH='3.8.*'
     - php: 7.2
       env: LARAVEL='5.5.*' TESTBENCH='3.5.*'
     - php: 7.2
       env: LARAVEL='5.6.*' TESTBENCH='3.6.*'
     - php: 7.2
       env: LARAVEL='5.7.*' TESTBENCH='3.7.*'
     - php: 7.2
-      env: LARAVEL='5.8.*' TESTBENCH='3.8.x-dev'
+      env: LARAVEL='5.8.*' TESTBENCH='3.8.*'
+    - php: 7.2
+      env: LARAVEL='^6' TESTBENCH='^4'
+    - php: 7.2
+      env: LARAVEL='^7' TESTBENCH='^5'
     - php: 7.3
       env: LARAVEL='5.5.*' TESTBENCH='3.5.*'
     - php: 7.3
       env: LARAVEL='5.6.*' TESTBENCH='3.6.*'
     - php: 7.3
       env: LARAVEL='5.7.*' TESTBENCH='3.7.*'
     - php: 7.3
-      env: LARAVEL='5.8.*' TESTBENCH='3.8.x-dev'
+      env: LARAVEL='5.8.*' TESTBENCH='3.8.*'
+    - php: 7.3
+      env: LARAVEL='^6' TESTBENCH='^4'
+    - php: 7.3
+      env: LARAVEL='^7' TESTBENCH='^5'
+    - php: 7.3
+      env: LARAVEL='^8' TESTBENCH='6.x-dev'
+    - php: 7.4
+      env: LARAVEL='5.5.*' TESTBENCH='3.5.*'
+    - php: 7.4
+      env: LARAVEL='5.6.*' TESTBENCH='3.6.*'
+    - php: 7.4
+      env: LARAVEL='5.7.*' TESTBENCH='3.7.*'
+    - php: 7.4
+      env: LARAVEL='5.8.*' TESTBENCH='3.8.*'
+    - php: 7.4
+      env: LARAVEL='^6' TESTBENCH='^4'
+    - php: 7.4
+      env: LARAVEL='^7' TESTBENCH='^5'
+    - php: 7.4
+      env: LARAVEL='^8' TESTBENCH='6.x-dev'
+
 
 before_install:
   - mysql -e 'CREATE DATABASE db_rebuild;'
   - travis_retry composer self-update
-  - COMPOSER_MEMORY_LIMIT=-1 travis_retry composer require --no-update --no-interaction "illuminate/support:${LARAVEL}" "illuminate/console:${LARAVEL}" "illuminate/database:${LARAVEL}" "orchestra/testbench:${TESTBENCH}"
+  - composer global require hirak/prestissimo
+  - COMPOSER_MEMORY_LIMIT=-1 travis_retry composer require --no-update --no-interaction "illuminate/support:${LARAVEL}" "illuminate/console:${LARAVEL}" "illuminate/database:${LARAVEL}" "orchestra/testbench:${TESTBENCH}" "orchestra/database:${TESTBENCH}"
 
 install:
-  - COMPOSER_MEMORY_LIMIT=-1 travis_retry composer update --no-interaction --no-plugins --no-suggest --prefer-source ${COMPOSER_FLAGS}
+  - COMPOSER_MEMORY_LIMIT=-1 travis_retry composer install --no-interaction
 
 script:
   - composer test
 
 notifications:
-  email: false
+  email: false
diff --git a/composer.json b/composer.json
@@ -29,9 +29,9 @@
   "require": {
     "php": ">=7.1.0",
     "ext-json": "*",
-    "illuminate/support": "~5.5.0|~5.6.0|~5.7.0|~5.8.0",
-    "illuminate/console": "~5.5.0|~5.6.0|~5.7.0|~5.8.0",
-    "illuminate/database": "~5.5.0|~5.6.0|~5.7.0|~5.8.0",
+    "illuminate/support": "^5.5|^6.0|^7.0|^8.0",
+    "illuminate/console": "^5.5|^6.0|^7.0|^8.0",
+    "illuminate/database": "^5.5|^6.0|^7.0|^8.0",
     "webmozart/assert": "^1.0"
   },
   "autoload": {
@@ -52,10 +52,10 @@
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^2.12",
-    "phpunit/phpunit": "^6|^7.0",
-    "orchestra/testbench": "~3.5.0|~3.6.0|~3.7.0|~3.8.0",
-    "orchestra/database": "~3.5.0|~3.6.0|~3.7.0|~3.8.0",
-    "phpstan/phpstan": "^0.11.2"
+    "phpunit/phpunit": "^6.0|^7.0|^8.0",
+    "orchestra/testbench": "^3.5|^4.0|^5.0|dev-6.x",
+    "orchestra/database": "^3.5|^4.0|^5.0|dev-6.x",
+    "phpstan/phpstan": "^0.12"
   },
   "minimum-stability": "dev",
   "prefer-stable": true