From d496a3fedd10e5e94893bcb6de6f7696790a69ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= <lcobucci@gmail.com>
Date: Fri, 22 Feb 2019 18:07:16 +0100
Subject: [PATCH 1/6] Run build using Ubuntu 16.04

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 97cf46f..60fabbc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-dist: trusty
+dist: xenial
 sudo: false
 language: php
 

From f548b42a86f6d2fc3e76d3122543d85ad7e674c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= <lcobucci@gmail.com>
Date: Fri, 22 Feb 2019 18:07:33 +0100
Subject: [PATCH 2/6] Add PHP 7.4 to the matrix

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 60fabbc..928d8fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ language: php
 php:
   - 7.2
   - 7.3
+  - 7.4snapshot
   - nightly
 
 cache:
@@ -22,6 +23,7 @@ script:
 
 jobs:
   allow_failures:
+    - php: 7.4snapshot
     - php: nightly
 
   include:

From 050b41bf2e437867a6f2a8bba16aaf47e2072a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= <lcobucci@gmail.com>
Date: Fri, 22 Feb 2019 18:08:03 +0100
Subject: [PATCH 3/6] Allow builds on PHP 8

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index fceca8e..952b522 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "^7.2",
+        "php": "^7.2 || ^8.0",
         "ramsey/uuid": "^3.8"
     },
     "require-dev": {

From b2b120b15539ab57741143dbb1eeab74c8e2fc67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= <lcobucci@gmail.com>
Date: Fri, 22 Feb 2019 18:09:40 +0100
Subject: [PATCH 4/6] Upgrade Infection to v0.12

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 952b522..abc61d8 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
         "ramsey/uuid": "^3.8"
     },
     "require-dev": {
-        "infection/infection": "^0.11",
+        "infection/infection": "^0.12",
         "lcobucci/coding-standard": "^2.0",
         "phpstan/phpstan": "^0.10",
         "phpstan/phpstan-deprecation-rules": "^0.10",

From 00b47cef5867fee82f065843b15a51f3091ef4b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= <lcobucci@gmail.com>
Date: Fri, 22 Feb 2019 18:11:28 +0100
Subject: [PATCH 5/6] Upgrade PHPStan to v0.11

---
 composer.json     | 8 ++++----
 phpstan.neon.dist | 3 ---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index abc61d8..72232a0 100644
--- a/composer.json
+++ b/composer.json
@@ -20,10 +20,10 @@
     "require-dev": {
         "infection/infection": "^0.12",
         "lcobucci/coding-standard": "^2.0",
-        "phpstan/phpstan": "^0.10",
-        "phpstan/phpstan-deprecation-rules": "^0.10",
-        "phpstan/phpstan-phpunit": "^0.10",
-        "phpstan/phpstan-strict-rules": "^0.10",
+        "phpstan/phpstan": "^0.11",
+        "phpstan/phpstan-deprecation-rules": "^0.11",
+        "phpstan/phpstan-phpunit": "^0.11",
+        "phpstan/phpstan-strict-rules": "^0.11",
         "phpunit/phpunit": "^7.5",
         "squizlabs/php_codesniffer": "^3.4"
     },
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 1e68b08..11ee2d3 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -9,6 +9,3 @@ parameters:
     paths:
         - src
         - tests
-
-    ignoreErrors:
-        - '#Parameter \#2 $haystack of static method PHPUnit\\Framework\\Assert::.*\(\) expects .*, array|object|null given#'

From 334156a8932bdbbf702ab5868bfc445639eef88e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= <lcobucci@gmail.com>
Date: Fri, 22 Feb 2019 18:14:05 +0100
Subject: [PATCH 6/6] Upgrade to PHPUnit v8.0

---
 .gitignore    | 1 +
 composer.json | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index c7ba7c0..c06ad7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /.phpcs.cache
 /composer.lock
 /infection-log.txt
+/.phpunit.result.cache
diff --git a/composer.json b/composer.json
index 72232a0..a6a9a4a 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan-deprecation-rules": "^0.11",
         "phpstan/phpstan-phpunit": "^0.11",
         "phpstan/phpstan-strict-rules": "^0.11",
-        "phpunit/phpunit": "^7.5",
+        "phpunit/phpunit": "^8.0",
         "squizlabs/php_codesniffer": "^3.4"
     },
     "autoload": {