From 48ca00b505aea3e1698ad5d1ab68bf14b966b5a5 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:50:52 +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 | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index c83dc38..a4c0fba 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
         }
     },
     "require": {
-        "php": "^7.3 || ~8.0.0",
+        "php": "^7.3 || ~8.0.0 || ~8.1.0",
         "laminas/laminas-config": "^2.6 || ^3.0",
         "laminas/laminas-modulemanager": "^2.7.1",
         "laminas/laminas-stdlib": "^2.7.7 || ^3.0.1",
diff --git a/composer.lock b/composer.lock
index d8ba5fc..3eed0ae 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": "d9af36f0289cbc7f73bf85d5c35840ec",
+    "content-hash": "1b86fdfe85d7be7e47060a74b9c29b86",
     "packages": [
         {
             "name": "brick/varexporter",
@@ -4592,8 +4592,8 @@
     "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.0.0"
+    "plugin-api-version": "2.1.0"
 }

From d5ccf6cd3d910a8e2366365b6d7bca6a70437295 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:57:11 +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 be76b85c8fa27390f0bdf7aecdcf4ac7171ac05f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20B=C3=B6sing?=
 <2189546+boesing@users.noreply.github.com>
Date: Tue, 14 Sep 2021 00:00:42 +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, 5 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index a4c0fba..4feb608 100644
--- a/composer.json
+++ b/composer.json
@@ -30,8 +30,7 @@
         "php": "^7.3 || ~8.0.0 || ~8.1.0",
         "laminas/laminas-config": "^2.6 || ^3.0",
         "laminas/laminas-modulemanager": "^2.7.1",
-        "laminas/laminas-stdlib": "^2.7.7 || ^3.0.1",
-        "laminas/laminas-zendframework-bridge": "^1.0"
+        "laminas/laminas-stdlib": "^2.7.7 || ^3.0.1"
     },
     "require-dev": {
         "container-interop/container-interop": "^1.1",
@@ -61,7 +60,7 @@
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
-    "replace": {
-        "zfcampus/zf-configuration": "^1.3.3"
+    "conflict": {
+        "zfcampus/zf-configuration": "*"
     }
 }
diff --git a/composer.lock b/composer.lock
index 3eed0ae..66c33a4 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": "1b86fdfe85d7be7e47060a74b9c29b86",
+    "content-hash": "fe5d4455060578561e643b8b3043affa",
     "packages": [
         {
             "name": "brick/varexporter",
@@ -3226,6 +3226,7 @@
                     "type": "github"
                 }
             ],
+            "abandoned": true,
             "time": "2020-09-28T06:45:17+00:00"
         },
         {