Merge branch 'v3.2' of github.com:dvlpp/sharp into v3.2

dvlpp · Oct 7, 2019 · 661c3c7 · 661c3c7
2 parents 854e60d + ac992ba
commit 661c3c7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,8 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 5.7
+  - 5.8
   - hhvm
 
 before_script:

diff --git a/composer.json b/composer.json
@@ -7,14 +7,14 @@
     }],
     "require": {
         "php": ">=5.5.9",
-        "laravel/framework": "5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
-        "laravelcollective/html": "5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
+        "laravel/framework": "5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*",
+        "laravelcollective/html": "5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*",
         "intervention/image": "2.*",
         "erusev/parsedown": "~1.1",
         "mustache/mustache": "~2.6.0"
     },
     "require-dev": {
-        "laravel/laravel": "5.6.*",
+        "laravel/laravel": "5.8.*",
         "laravel/browser-kit-testing": "^4.0",
         "fzaninotto/faker": "~1.4",
         "mockery/mockery": "0.9.*",
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,8 @@ php: @@
       - 5.4
       - 5.5
       - 5.6
+      - 5.7
+      - 5.8
       - hhvm
     before_script:
@@ Expand Down @@