From a35217f740f735cedd86c647268be370d201b482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20B=C3=B6sing?=
 <2189546+boesing@users.noreply.github.com>
Date: Thu, 26 Aug 2021 20:47:25 +0200
Subject: [PATCH 1/3] qa: add PHP 8.1 to `composer.json`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maximilian Bösing <2189546+boesing@users.noreply.github.com>
---
 composer.json | 2 +-
 composer.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 73d6980..8cf3ab4 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
         }
     },
     "require": {
-        "php": "^7.3 || ~8.0.0",
+        "php": "^7.3 || ~8.0.0 || ~8.1.0",
         "fig/http-message-util": "^1.1.2",
         "laminas/laminas-zendframework-bridge": "^1.0",
         "psr/container": "^1.0",
diff --git a/composer.lock b/composer.lock
index 966af42..b97b0f3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3545a632c46a0a70712da6389ce03265",
+    "content-hash": "55e3e02447fd75ae54d7072d20e7619e",
     "packages": [
         {
             "name": "fig/http-message-util",
@@ -4702,7 +4702,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^7.3 || ~8.0.0"
+        "php": "^7.3 || ~8.0.0 || ~8.1.0"
     },
     "platform-dev": [],
     "plugin-api-version": "2.1.0"

From 3daffd00c8519feb100f1f67853caae1ef59e868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20B=C3=B6sing?=
 <2189546+boesing@users.noreply.github.com>
Date: Mon, 13 Sep 2021 22:55:51 +0200
Subject: [PATCH 2/3] qa: add/modify `.laminas-ci.json` to ignore PHP platform
 requirements for PHP 8.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maximilian Bösing <2189546+boesing@users.noreply.github.com>
---
 .laminas-ci.json | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .laminas-ci.json

diff --git a/.laminas-ci.json b/.laminas-ci.json
new file mode 100644
index 0000000..bce3fa2
--- /dev/null
+++ b/.laminas-ci.json
@@ -0,0 +1,5 @@
+{
+    "ignore_php_platform_requirements": {
+        "8.1": true
+    }
+}

From 7ae55bba1ff82a1ff211639114862baf2b143818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20B=C3=B6sing?=
 <2189546+boesing@users.noreply.github.com>
Date: Mon, 13 Sep 2021 23:58:54 +0200
Subject: [PATCH 3/3] qa: remove `laminas/laminas-zendframework-bridge` and
 conflict with zendframework pendant
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maximilian Bösing <2189546+boesing@users.noreply.github.com>
---
 composer.json | 7 ++-----
 composer.lock | 3 ++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 8cf3ab4..6e087c3 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,6 @@
     "require": {
         "php": "^7.3 || ~8.0.0 || ~8.1.0",
         "fig/http-message-util": "^1.1.2",
-        "laminas/laminas-zendframework-bridge": "^1.0",
         "psr/container": "^1.0",
         "psr/http-factory": "^1.0",
         "psr/http-message": "^1.0.1",
@@ -38,7 +37,8 @@
         "webmozart/assert": "^1.10"
     },
     "conflict": {
-        "mezzio/mezzio": "<3.5"
+        "mezzio/mezzio": "<3.5",
+        "zendframework/zend-expressive-router": "*"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~2.2.0",
@@ -75,8 +75,5 @@
         "static-analysis": "psalm --shepherd --stats",
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
-    },
-    "replace": {
-        "zendframework/zend-expressive-router": "^3.1.1"
     }
 }
diff --git a/composer.lock b/composer.lock
index b97b0f3..10ec4d2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "55e3e02447fd75ae54d7072d20e7619e",
+    "content-hash": "3c045e0b8533449d92a4c592c1e0af84",
     "packages": [
         {
             "name": "fig/http-message-util",
@@ -3541,6 +3541,7 @@
                     "type": "github"
                 }
             ],
+            "abandoned": true,
             "time": "2020-09-28T06:45:17+00:00"
         },
         {