Merge pull request #14 from PowerKiKi/drop-bridge

Drop `laminas/laminas-zendframework-bridge` and `zendframework/*` compatibility
laminas · Dec 6, 2021 · 2826fd7 · 2826fd7
2 parents a76e3a3 + 5d016f4
commit 2826fd7
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 77 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/composer.json b/composer.json
@@ -27,8 +27,7 @@
     "require": {
         "php": "^7.3 || ~8.0.0 || ~8.1.0",
         "laminas/laminas-json": "^3.1",
-        "laminas/laminas-stdlib": "^3.2",
-        "laminas/laminas-zendframework-bridge": "^1.0"
+        "laminas/laminas-stdlib": "^3.2"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~2.3.0",
@@ -60,7 +59,7 @@
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
-    "replace": {
-        "zendframework/zend-serializer": "^2.9.1"
+    "conflict": {
+        "zendframework/zend-serializer": "*"
     }
 }
diff --git a/composer.lock b/composer.lock