From 1488ea9371b9669d1b4aa04ac995bd9c4b915dee Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 3 Dec 2021 12:24:40 +0100
Subject: update to 2.14.0

keep compatibility using laminas-zendframework-bridge
  as this is only used using compat autolader
drop patch merged upstream
---
 composer.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
index 46940f8..e4e3626 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,6 @@
         "php": "^7.3 || ~8.0.0",
         "laminas/laminas-servicemanager": "^3.3.0",
         "laminas/laminas-stdlib": "^3.0",
-        "laminas/laminas-zendframework-bridge": "^1.0",
         "psr/log": "^1.1.2"
     },
     "require-dev": {
@@ -77,7 +76,7 @@
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
-    "replace": {
-        "zendframework/zend-log": "^2.12.0"
+    "conflict": {
+        "zendframework/zend-log": "*"
     }
 }
-- 
cgit