From 1f82d6a88292311c5725af2720e45f4ca6d61763 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:30 +0200
Subject: [PATCH] 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 3c7ec7e..d71a7b1 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,6 @@
     },
     "require": {
         "php": "^7.3 || ~8.0.0 || ~8.1.0",
-        "laminas/laminas-zendframework-bridge": "^1.0",
         "mezzio/mezzio-authentication": "^1.0",
         "psr/container": "^1.0",
         "psr/http-message": "^1.0.1",
@@ -42,7 +41,8 @@
         "phpunit/phpunit": "^9.3"
     },
     "conflict": {
-        "container-interop/container-interop": "<1.2.0"
+        "container-interop/container-interop": "<1.2.0",
+        "zendframework/zend-expressive-authorization": "*"
     },
     "suggest": {
         "mezzio/mezzio-authorization-acl": "^1.0; provides a laminas-permissions-acl-backed adapter",
@@ -67,8 +67,5 @@
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
-    },
-    "replace": {
-        "zendframework/zend-expressive-authorization": "^1.0.1"
     }
 }
diff --git a/composer.lock b/composer.lock
index 776aa72..255ad28 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": "8cd9faf9eac57368cdfe5ec8fe8686bb",
+    "content-hash": "7d57ba3e5c360f1fbe04ce270ae30adb",
     "packages": [
         {
             "name": "laminas/laminas-zendframework-bridge",
@@ -2527,6 +2527,7 @@
                     "type": "github"
                 }
             ],
+            "abandoned": true,
             "time": "2020-09-28T06:45:17+00:00"
         },
         {