Merge pull request #3 from softonic/Laravel-8-support

Laravel 8 support

Author: xaviapa

.travis.yml

@@ -4,10 +4,6 @@ sudo: false
 
 matrix:
   include:
-  - php: 7.1
-    env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true
-  - php: 7.2
-    env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true
   - php: 7.3
     env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true
   - php: master
@@ -31,4 +27,4 @@ script:
 
 after_script:
 - if [ "$COLLECT_COVERAGE" == "true" ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover build/clover.xml; fi
-- if [ "$VALIDATE_CODING_STYLE" == "true" ]; then composer phpcs; fi
+- if [ "$VALIDATE_CODING_STYLE" == "true" ]; then composer phpcs; fi

README.md

@@ -47,11 +47,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
 -------
 

composer.json

@@ -9,15 +9,15 @@
         "issues": "https://github.com/softonic/laravel-request-content-decompress-middleware/issues"
     },
     "require": {
-        "php": ">=7.1",
-        "illuminate/http": "^5.8 || ^6.0 || ^7.0",
-        "illuminate/contracts": "^5.8 || ^6.0 || ^7.0",
+        "php": ">=7.3",
+        "illuminate/http": "^7.0 || ^8.0",
+        "illuminate/contracts": "^7.0 || ^8.0",
         "ext-zlib": "*"
     },
     "require-dev": {
+        "friendsofphp/php-cs-fixer": "^2.16",
         "mockery/mockery": "^1.2",
-        "phpunit/phpunit": "^7.0",
-        "friendsofphp/php-cs-fixer": "^2.4"
+        "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;"

docker-compose.yml

@@ -1,19 +1,31 @@
-version: '3.6'
+version: "3.7"
 
 services:
-  test:
+  php:
     volumes:
     - ./:/app
-    image: ricc/composer-prestissimo:latest
-    command: composer run test
+    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: composer:2.0
+    command: composer run tests
+
+  fixcs:
     volumes:
     - ./:/app
-    image: ricc/psysh:latest
+    image: composer:2.0
+    command: composer run fix-cs