From 27cc1b863ad97352a2162bfcf856af9f83444d0b Mon Sep 17 00:00:00 2001
From: Xavi Aparicio <xavier.aparicio@softonic.com>
Date: Mon, 2 Nov 2020 17:39:49 +0100
Subject: [PATCH] Laravel 8 support

---
 .travis.yml        |  4 ----
 README.md          |  5 -----
 composer.json      | 14 +++++++-------
 docker-compose.yml | 34 +++++++++++++++++++++++-----------
 4 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a4e163b..0592bde 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,6 @@ env:
 
 matrix:
   include:
-    - php: 7.1
-      env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
-    - php: 7.2
-      env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true
     - php: 7.3
       env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true
     - php: 7.4
diff --git a/README.md b/README.md
index a28754d..32d1410 100644
--- a/README.md
+++ b/README.md
@@ -86,11 +86,6 @@ To run the tests, run the following command from the project folder.
 $ docker-compose run test
 ```
 
-To run interactively using [PsySH](http://psysh.org/):
-``` bash
-$ docker-compose run psysh
-```
-
 License
 -------
 
diff --git a/composer.json b/composer.json
index dd68887..94bbaab 100644
--- a/composer.json
+++ b/composer.json
@@ -9,15 +9,15 @@
     "issues": "https://github.com/softonic//issues"
   },
   "require": {
-    "php": ">=7.1",
-    "illuminate/http": "^5.6 || ^6.0 || ^7.0",
+    "php": ">=7.3",
+    "illuminate/http": "^7.0 || ^8.0",
+    "nyholm/psr7": "^1.2",
     "psr/http-server-middleware": "^1.0",
-    "symfony/psr-http-message-bridge": "^2.0",
-    "nyholm/psr7": "^1.2"
+    "symfony/psr-http-message-bridge": "^2.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7.0",
-    "friendsofphp/php-cs-fixer": "^2.4"
+    "friendsofphp/php-cs-fixer": "^2.16",
+    "phpunit/phpunit": "^9.0"
   },
   "autoload": {
     "psr-4": {
@@ -30,7 +30,7 @@
     }
   },
   "scripts": {
-    "test": "phpunit --coverage-text; php-cs-fixer fix -v --diff --dry-run --allow-risky=yes;",
+    "tests": "phpunit --coverage-text; php-cs-fixer fix -v --diff --dry-run --allow-risky=yes;",
     "phpunit": "phpunit --coverage-text",
     "phpcs": "php-cs-fixer fix -v --diff --dry-run --allow-risky=yes;",
     "fix-cs": "php-cs-fixer fix -v --diff --allow-risky=yes;"
diff --git a/docker-compose.yml b/docker-compose.yml
index 574a012..e4075a4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,19 +1,31 @@
-version: '3.2'
+version: "3.7"
 
 services:
+  php:
+    volumes:
+    - ./:/app
+    image: composer:2.0
+
+  install:
+    volumes:
+    - ./:/app
+    image: composer:2.0
+    command: composer install
+
+  phpunit:
+    volumes:
+    - ./:/app
+    image: composer:2.0
+    command: composer phpunit
+
   test:
     volumes:
-      - ./:/app
-    image: ricc/composer-prestissimo:latest
-    command: composer run test
+    - ./:/app
+    image: composer:2.0
+    command: composer run tests
 
   fixcs:
     volumes:
-      - ./:/app
-    image: ricc/composer-prestissimo:latest
+    - ./:/app
+    image: composer:2.0
     command: composer run fix-cs
-
-  psysh:
-    volumes:
-      - ./:/app
-    image: ricc/psysh:latest