From 280678aec94bc8511e5924384c31868427c579ed Mon Sep 17 00:00:00 2001 From: Witold Wasiczko Date: Fri, 3 Dec 2021 17:28:55 +0100 Subject: [PATCH] Remove laminas/laminas/laminas-zendframework-bridge Signed-off-by: Witold Wasiczko --- composer.json | 7 +++---- composer.lock | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index b5749fdb..88215165 100644 --- a/composer.json +++ b/composer.json @@ -18,6 +18,9 @@ "config": { "sort-packages": true }, + "conflict": { + "zendframework/zend-test": "*" + }, "extra": { }, "require": { @@ -30,7 +33,6 @@ "laminas/laminas-stdlib": "^3.3", "laminas/laminas-uri": "^2.5", "laminas/laminas-view": "^2.6.3", - "laminas/laminas-zendframework-bridge": "^1.1", "phpunit/phpunit": "^8.4.3 || ^9.0", "symfony/css-selector": "^5.4 || ^6.0", "symfony/dom-crawler": "^5.4 || ^6.0" @@ -72,8 +74,5 @@ "test": "phpunit --colors", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml", "static-analysis": "psalm --shepherd --stats" - }, - "replace": { - "zendframework/zend-test": "^3.3.0" } } diff --git a/composer.lock b/composer.lock index 4d3c4db1..03a89e6f 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": "c2ba5bf41afdb28f79a03b06eafc4882", + "content-hash": "5f2d4e72d167b01afb54603b0451e439", "packages": [ { "name": "brick/varexporter",