From a4bab49f5d83b525f2ef73de98c4d6393709c23c 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:57:20 +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 | 5 ++---
 composer.lock | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 3f2c953..d0e7522 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,6 @@
     "require": {
         "php": "^7.3 || ~8.0.0 || ~8.1.0",
         "dflydev/fig-cookies": "^2.0.1 || ^3.0",
-        "laminas/laminas-zendframework-bridge": "^1.0",
         "psr/container": "^1.0",
         "psr/http-server-middleware": "^1.0"
     },
@@ -66,7 +65,7 @@
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
-    "replace": {
-        "zendframework/zend-expressive-session": "^1.3.0"
+    "conflict": {
+        "zendframework/zend-expressive-session": "*"
     }
 }
diff --git a/composer.lock b/composer.lock
index 4242e76..0be28ad 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": "96abf262afcc79e42cf4f0c741c9ab7d",
+    "content-hash": "f50d871530131607ae842bcdbd1517bf",
     "packages": [
         {
             "name": "dflydev/fig-cookies",
@@ -3203,6 +3203,7 @@
                     "type": "github"
                 }
             ],
+            "abandoned": true,
             "time": "2020-09-28T06:45:17+00:00"
         },
         {