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

---
 .travis.yml        |  2 --
 README.md          |  7 +------
 composer.json      |  8 ++++----
 docker-compose.yml | 30 +++++++++++++++++++++---------
 4 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 67b2452..321903b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,6 @@ sudo: false
 
 matrix:
   include:
-  - php: 7.2
-    env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true
   - php: 7.3
     env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true
   - php: master
diff --git a/README.md b/README.md
index f6e675b..98939c2 100644
--- a/README.md
+++ b/README.md
@@ -44,12 +44,7 @@ Testing
 To run the tests, run the following command from the project folder.
 
 ``` bash
-$ docker-compose run tests
-```
-
-To run interactively using [PsySH](http://psysh.org/):
-``` bash
-$ docker-compose run psysh
+$ docker-compose run test
 ```
 
 License
diff --git a/composer.json b/composer.json
index 38cf4e2..83571fb 100644
--- a/composer.json
+++ b/composer.json
@@ -10,13 +10,13 @@
     },
     "require": {
         "php": ">=7.2",
-        "illuminate/http": "^5.8 || ^6.0 || ^7.0",
-        "illuminate/contracts": "^5.8 || ^6.0 || ^7.0"
+        "illuminate/http": "^7.0 || ^8.0",
+        "illuminate/contracts": "^7.0 || ^8.0"
     },
     "require-dev": {
+        "friendsofphp/php-cs-fixer": "^2.16",
         "mockery/mockery": "^1.2",
-        "phpunit/phpunit": "^8.0",
-        "friendsofphp/php-cs-fixer": "^2.4"
+        "phpunit/phpunit": "^9.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/docker-compose.yml b/docker-compose.yml
index c6e631c..e4075a4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,19 +1,31 @@
-version: '3.6'
+version: "3.7"
 
 services:
-  tests:
+  php:
     volumes:
     - ./:/app
-    image: ricc/composer-prestissimo:latest
-    command: composer run tests
+    image: composer:2.0
 
-  fixcs:
+  install:
     volumes:
     - ./:/app
-    image: ricc/composer-prestissimo:latest
-    command: composer run fix-cs
+    image: composer:2.0
+    command: composer install
+
+  phpunit:
+    volumes:
+    - ./:/app
+    image: composer:2.0
+    command: composer phpunit
 
-  psysh:
+  test:
     volumes:
     - ./:/app
-    image: ricc/psysh:latest
\ No newline at end of file
+    image: composer:2.0
+    command: composer run tests
+
+  fixcs:
+    volumes:
+    - ./:/app
+    image: composer:2.0
+    command: composer run fix-cs