From 920a039bb296e4301801714289228886c5abd18e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Fri, 18 Jun 2021 15:35:03 +0200 Subject: [PATCH] [Composer] Added conflict with laminas/laminas-code:4.4.0 (#660) * Empty commit to show failing tests * [Composer] Added conflict with laminas/laminas-code:4.4.0 --- composer.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 37394f2c62..8195020233 100644 --- a/composer.json +++ b/composer.json @@ -81,11 +81,12 @@ "symfony/phpunit-bridge": "^3.4.18" }, "conflict": { - "symfony/symfony": "3.4.9||3.4.12||3.4.16", "doctrine/dbal": "2.7.0", "doctrine/persistence": "1.3.2", - "twig/twig": "2.6.1", - "symfony/webpack-encore-bundle": "1.2.0||1.2.1" + "laminas/laminas-code": "4.4.0", + "symfony/symfony": "3.4.9||3.4.12||3.4.16", + "symfony/webpack-encore-bundle": "1.2.0||1.2.1", + "twig/twig": "2.6.1" }, "scripts": { "symfony-scripts": [