From 6c3b23279e53fe687adb1a4440b9be092f392438 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:51:06 +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 | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index a3ef7d1..fede1a1 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
         }
     },
     "require": {
-        "php": "^7.3 || ~8.0.0",
+        "php": "^7.3 || ~8.0.0 || ~8.1.0",
         "laminas-api-tools/api-tools-api-problem": "^1.3",
         "laminas-api-tools/api-tools-content-negotiation": "^1.5",
         "laminas/laminas-eventmanager": "^3.3",
diff --git a/composer.lock b/composer.lock
index e085afc..17f51be 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": "47cac3b32e9219efcc66efa42dec5880",
+    "content-hash": "076f8d24eb10451ba80e1bb621f1c269",
     "packages": [
         {
             "name": "brick/varexporter",
@@ -4203,6 +4203,7 @@
                     "type": "github"
                 }
             ],
+            "abandoned": true,
             "time": "2020-09-28T06:45:17+00:00"
         },
         {
@@ -5567,9 +5568,9 @@
     "minimum-stability": "stable",
     "stability-flags": [],
     "prefer-stable": false,
-    "prefer-lowest": true,
+    "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 a7efbf0417c131d907b70f4f5df5aadb9c18301a 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:19 +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 37aca2109c5355084596e72e9e17c74a24685c7a 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:57 +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 | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index fede1a1..1a95a4d 100644
--- a/composer.json
+++ b/composer.json
@@ -34,8 +34,7 @@
         "laminas/laminas-mvc": "^3.2",
         "laminas/laminas-servicemanager": "^3.6",
         "laminas/laminas-stdlib": "^3.3",
-        "laminas/laminas-view": "^2.12",
-        "laminas/laminas-zendframework-bridge": "^1.2"
+        "laminas/laminas-view": "^2.12"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~2.3.0",
@@ -64,7 +63,7 @@
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
-    "replace": {
-        "zfcampus/zf-rpc": "^1.4.2"
+    "conflict": {
+        "zfcampus/zf-rpc": "*"
     }
 }
diff --git a/composer.lock b/composer.lock
index 17f51be..bac40da 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": "076f8d24eb10451ba80e1bb621f1c269",
+    "content-hash": "2faf1f9443344930b4031980862427d0",
     "packages": [
         {
             "name": "brick/varexporter",