From c57b66811c61fa240d33c4922ff4c925b8cce10b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20B=C3=B6sing?=
 <2189546+boesing@users.noreply.github.com>
Date: Wed, 25 Aug 2021 09:29:26 +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 | 5 ++---
 composer.lock | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 25e6618..7cef4a0 100644
--- a/composer.json
+++ b/composer.json
@@ -19,10 +19,9 @@
     "config": {
         "sort-packages": true
     },
-    "extra": {
-    },
+    "extra": {},
     "require": {
-        "php": "^7.3 || ~8.0.0",
+        "php": "^7.3 || ~8.0.0 || ~8.1.0",
         "laminas/laminas-zendframework-bridge": "^1.0"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index b928903..97896bb 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": "f83f5e891e00b731ba8b021341ad6bf9",
+    "content-hash": "d6bb4b10f115a2a5aa5b4ef6b2fd2239",
     "packages": [
         {
             "name": "laminas/laminas-zendframework-bridge",
@@ -2293,8 +2293,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 b9e19dc933b2d080fd8aff45ec5281990d6a7160 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:30:22 +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 471c9c31df7e3120489a58af8f4a9f85a348bfa3 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:50:48 +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 7cef4a0..646c57f 100644
--- a/composer.json
+++ b/composer.json
@@ -21,8 +21,7 @@
     },
     "extra": {},
     "require": {
-        "php": "^7.3 || ~8.0.0 || ~8.1.0",
-        "laminas/laminas-zendframework-bridge": "^1.0"
+        "php": "^7.3 || ~8.0.0 || ~8.1.0"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~1.0.0",
@@ -48,7 +47,7 @@
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
-    "replace": {
-        "zendframework/zend-i18n-resources": "^2.6.1"
+    "conflict": {
+        "zendframework/zend-i18n-resources": "*"
     }
 }
diff --git a/composer.lock b/composer.lock
index 97896bb..009655d 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": "d6bb4b10f115a2a5aa5b4ef6b2fd2239",
+    "content-hash": "d94d4b8992f81dd3e62fc18d0f67259d",
     "packages": [
         {
             "name": "laminas/laminas-zendframework-bridge",
@@ -1905,6 +1905,7 @@
                     "type": "github"
                 }
             ],
+            "abandoned": true,
             "time": "2020-09-28T06:45:17+00:00"
         },
         {