From a9b0666ecea5aa8a8f0f84079a0f94eefd600aa8 Mon Sep 17 00:00:00 2001
From: Kevin Krummnacker <kevin.krummnacker@gmail.com>
Date: Sat, 19 Dec 2020 15:45:43 +0100
Subject: [PATCH] Allow PHP 8 for the upcoming 3.0 (#275)

* bump version to allow php 8

* allow php 8 in travis

* add scrutinizer config
---
 .scrutinizer.yml | 13 +++++++++++++
 .travis.yml      |  4 ++++
 composer.json    |  4 ++--
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 .scrutinizer.yml

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
new file mode 100644
index 0000000..5025c3a
--- /dev/null
+++ b/.scrutinizer.yml
@@ -0,0 +1,13 @@
+imports:
+    - php
+
+build:
+    environment:
+        php: '7.2.13'
+    tests:
+        override:
+            -
+                command: 'vendor/bin/phpunit --coverage-clover=clover.xml'
+                coverage:
+                    file: 'clover.xml'
+                    format: 'clover'
diff --git a/.travis.yml b/.travis.yml
index cbfa0ab..245a2fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,10 @@ matrix:
       env:
         - psalm=yes
       dist: bionic
+    - php: 8.0
+      env:
+        - psalm=yes
+      dist: bionic
 
 install:
   - if [ "$deps" = "low" ]; then composer update --prefer-lowest; else composer install; fi
diff --git a/composer.json b/composer.json
index 84d0432..c9dbd5e 100644
--- a/composer.json
+++ b/composer.json
@@ -19,9 +19,9 @@
   },
   "require-dev": {
     "php-coveralls/php-coveralls": "^2.2",
-    "phpunit/phpunit": "^8",
+    "phpunit/phpunit": "^8.5.8|^9.3.3",
     "dominicsayers/isemail": "^3.0.7",
-    "vimeo/psalm": "^3.11"
+    "vimeo/psalm": "^4"
   },
   "suggest": {
     "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"