From adb917273c3f0504516a9e281ea61e6e97ed1382 Mon Sep 17 00:00:00 2001
From: Libor M <liborm85@gmail.com>
Date: Sat, 17 Oct 2020 12:56:06 +0200
Subject: [PATCH] allow PHP 7.4, 8.0

---
 .travis.yml   | 11 +++++++----
 composer.json |  8 ++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index acdf95cc34..421e772c87 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,8 @@ php:
     - 7.1
     - 7.2
     - 7.3
-    - 7.4snapshot
+    - 7.4
+    - nightly
 
 matrix:
     include:
@@ -26,14 +27,16 @@ matrix:
           env: COVERAGE=1
         - php: 7.3
           env: DEPENDENCIES="--ignore-platform-reqs"
+        - php: 7.4
+          env: DEPENDENCIES="--ignore-platform-reqs"
+        - php: nightly
+          env: DEPENDENCIES="--ignore-platform-reqs"
     exclude:
         - php: 5.3
         - php: 5.4
         - php: 5.5
-        - php: 7.0
-        - php: 7.3
     allow_failures:
-        - php: 7.4snapshot
+        - php: nightly
 
 cache:
     directories:
diff --git a/composer.json b/composer.json
index f5f751ec04..43738937af 100644
--- a/composer.json
+++ b/composer.json
@@ -58,7 +58,7 @@
         "fix": "Fixes issues found by PHP-CS"
     },
     "require": {
-        "php": "^5.3.3 || ^7.0",
+        "php": "^5.3.3 || ^7.0 || ^8.0",
         "ext-xml": "*",
         "zendframework/zend-escaper": "^2.2",
         "phpoffice/common": "^0.2.9"
@@ -67,13 +67,13 @@
         "ext-zip": "*",
         "ext-gd": "*",
         "phpunit/phpunit": "^4.8.36 || ^7.0",
-        "squizlabs/php_codesniffer": "^2.9",
+        "squizlabs/php_codesniffer": "^2.9 || ^3.5",
         "friendsofphp/php-cs-fixer": "^2.2",
         "phpmd/phpmd": "2.*",
-        "phploc/phploc": "2.* || 3.* || 4.*",
+        "phploc/phploc": "2.* || 3.* || 4.* || 5.* || 6.* || 7.*",
         "dompdf/dompdf":"0.8.*",
         "tecnickcom/tcpdf": "6.*",
-        "mpdf/mpdf": "5.7.4 || 6.* || 7.*",
+        "mpdf/mpdf": "5.7.4 || 6.* || 7.* || 8.*",
         "php-coveralls/php-coveralls": "1.1.0 || ^2.0"
     },
     "suggest": {