From 4a6caab4423a9bebd876875ecb18fd281bdff8d6 Mon Sep 17 00:00:00 2001
From: Lucas Yang <yangchenshin77@gmail.com>
Date: Thu, 5 Mar 2020 21:06:24 +0800
Subject: [PATCH] Support Laravel 7.x

---
 .github/ISSUE_TEMPLATE/bug_report.md |  4 ++--
 .styleci.yml                         |  1 -
 .travis.yml                          |  4 ++++
 README.md                            | 11 ++++++-----
 composer.json                        | 10 +++++-----
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index fe203ba..ec6d4e0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -9,8 +9,8 @@ assignees: ''
 
 **Use Version:**
 Use version when bugs appear.
-- Laravel: v6.0.0
-- Laravel Wizard: v2.0.0
+- Laravel: v7.0.0
+- Laravel Wizard: v2.2.0
 
 **Describe the bug**
 A clear and concise description of what the bug is.
diff --git a/.styleci.yml b/.styleci.yml
index bb97265..bef661a 100644
--- a/.styleci.yml
+++ b/.styleci.yml
@@ -7,4 +7,3 @@ disabled:
   - cast_spaces
   - concat_without_spaces
   - not_operator_with_successor_space
-  - phpdoc_to_comment
diff --git a/.travis.yml b/.travis.yml
index 6769ca8..eea4cdc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ php:
   - 7.1
   - 7.2
   - 7.3
+  - 7.4
 
 env:
   matrix:
@@ -15,12 +16,15 @@ env:
     - LARAVEL=5.7.*
     - LARAVEL=5.8.*
     - LARAVEL=^6.0
+    - LARAVEL=^7.0
 
 matrix:
   fast_finish: true
   exclude:
     - php: 7.1
       env: LARAVEL=^6.0
+    - php: 7.1
+      env: LARAVEL=^7.0
 
 install:
   - travis_retry composer require "illuminate/contracts=${LARAVEL}" --dev --prefer-dist --no-interaction --no-suggest
diff --git a/README.md b/README.md
index 420e32b..b7e38d9 100644
--- a/README.md
+++ b/README.md
@@ -38,11 +38,12 @@ A web setup wizard for Laravel application.
 
 ## Version Compatibility
 
- Laravel Wizard | Laravel                  | PHP
-:---------------|:-------------------------|:----
- 1.0.x          | 5.5.x                    | ^7.0
- 1.1.x          | 5.6.x\|5.7.x\|5.8.x      | ^7.1.3
- 2.x            | 5.6.x\|5.7.x\|5.8.x\|6.x | ^7.1.3
+ Laravel Wizard | Laravel          | PHP
+:---------------|:-----------------|:----
+ 1.0.x          | 5.5              | ^7.0
+ 1.1.x          | ^5.6             | ^7.1.3
+ 2.0.x,2.1.x    | ^5.6\|^6.x       | ^7.1.3
+ 2.2.x          | ^5.6\|^6.x\|^7.x | ^7.1.3
 
 ## Install
 
diff --git a/composer.json b/composer.json
index 60f03a6..f6085f9 100644
--- a/composer.json
+++ b/composer.json
@@ -21,13 +21,13 @@
     "require": {
         "php": "^7.1.3",
         "facade/ignition-contracts": "^1.0",
-        "illuminate/contracts": "~5.6|~5.7|~5.8|^6.0",
-        "laravel/framework": "~5.6|~5.7|~5.8|^6.0"
+        "illuminate/contracts": "~5.6|~5.7|~5.8|^6.0|^7.0",
+        "laravel/framework": "~5.6|~5.7|~5.8|^6.0|^7.0"
     },
     "require-dev": {
-        "mockery/mockery": "^1.2",
-        "orchestra/testbench": "~3.6|~3.7|~3.8|^4.0",
-        "phpunit/phpunit": "^7.0|^8.0"
+        "mockery/mockery": "^1.3.1",
+        "orchestra/testbench": "~3.6|~3.7|~3.8|^4.0|^5.0",
+        "phpunit/phpunit": "^7.0|^8.0|^9.0"
     },
     "autoload": {
         "psr-4": {