qa: remove laminas/laminas-zendframework-bridge and conflict with z…

…endframework pendant Signed-off-by: Maximilian Bösing <[email protected]>
laminas · Sep 13, 2021 · 471c9c3 · 471c9c3
1 parent b9e19dc
commit 471c9c3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -21,8 +21,7 @@
     },
     "extra": {},
     "require": {
-        "php": "^7.3 || ~8.0.0 || ~8.1.0",
-        "laminas/laminas-zendframework-bridge": "^1.0"
+        "php": "^7.3 || ~8.0.0 || ~8.1.0"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~1.0.0",
@@ -48,7 +47,7 @@
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
-    "replace": {
-        "zendframework/zend-i18n-resources": "^2.6.1"
+    "conflict": {
+        "zendframework/zend-i18n-resources": "*"
     }
 }
diff --git a/composer.lock b/composer.lock