From 1f9f9fd1eabacb7414027f613b8e36fb7e3cbf74 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:49:18 +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 843aa2f..8a532b6 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",
         "laminas/laminas-permissions-acl": "^2.6",
         "laminas/laminas-zendframework-bridge": "^1.0",
         "mezzio/mezzio-authorization": "^1.0",
diff --git a/composer.lock b/composer.lock
index d2198a6..9623d8c 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": "790570afb5fee08c5a5139b6a632138a",
+    "content-hash": "a29cca331e110229665b8f93cd6e4af9",
     "packages": [
         {
             "name": "fig/http-message-util",
@@ -3327,8 +3327,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 4a118f392dc14a2909d5ed67f4966054cb931b93 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:56:18 +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 ffa3242c94cc33229a207ea5c59a3a9a8f33115e 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:59:20 +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 8a532b6..0c3453e 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,6 @@
     "require": {
         "php": "^7.3 || ~8.0.0 || ~8.1.0",
         "laminas/laminas-permissions-acl": "^2.6",
-        "laminas/laminas-zendframework-bridge": "^1.0",
         "mezzio/mezzio-authorization": "^1.0",
         "mezzio/mezzio-router": "^3.0",
         "psr/container": "^1.0",
@@ -45,7 +44,8 @@
     },
     "conflict": {
         "container-interop/container-interop": "<1.2.0",
-        "phpspec/prophecy": "<1.10.2"
+        "phpspec/prophecy": "<1.10.2",
+        "zendframework/zend-expressive-authorization-acl": "*"
     },
     "autoload": {
         "psr-4": {
@@ -66,8 +66,5 @@
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
-    },
-    "replace": {
-        "zendframework/zend-expressive-authorization-acl": "^1.0.1"
     }
 }
diff --git a/composer.lock b/composer.lock
index 9623d8c..37a31a0 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": "a29cca331e110229665b8f93cd6e4af9",
+    "content-hash": "442831f8dd612f8360ad3662eb123e4f",
     "packages": [
         {
             "name": "fig/http-message-util",
@@ -2987,6 +2987,7 @@
                     "type": "github"
                 }
             ],
+            "abandoned": true,
             "time": "2020-09-28T06:45:17+00:00"
         },
         {