Merge branch 'master' into v2

cmgmyr · Jan 27, 2021 · 0f25489 · 0f25489
2 parents fc9e943 + 9d6b544
commit 0f25489
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ php:
   - 7.2
   - 7.3
   - 7.4
+  - 8.0
 
 matrix:
   include:

diff --git a/composer.json b/composer.json
@@ -12,16 +12,16 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.2|^8.0",
         "illuminate/config": "^5.5|^6.0|^7.0|^8.0",
         "illuminate/support": "^5.5|^6.0|^7.0|^8.0",
         "illuminate/database": "^5.5|^6.0|^7.0|^8.0"
     },
     "require-dev": {
         "adamwathan/faktory": "0.3.*",
-        "friendsofphp/php-cs-fixer": "^2.5",
+        "friendsofphp/php-cs-fixer": "^2.18",
         "orchestra/testbench": "^3.0|^4.0|^5.0|^6.0",
-        "phpunit/phpunit": "^8.0"
+        "phpunit/phpunit": "^8.0|^9.3.3"
     },
     "autoload": {
         "psr-4": {