From 5dc426959398544cf3171c27708e3fbbd78b3912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Kukli=C5=84ski?= Date: Fri, 18 Aug 2023 10:59:55 +0200 Subject: [PATCH] Remove composer conflict with Doctrine DBAL ^3.0 --- composer.json | 3 --- tests/Application/.env | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 83bc838..783e18b 100644 --- a/composer.json +++ b/composer.json @@ -38,9 +38,6 @@ "symfony/webpack-encore-bundle": "^1.13", "vimeo/psalm": "4.12" }, - "conflict": { - "doctrine/dbal": "^3.0" - }, "config": { "sort-packages": true, "allow-plugins": { diff --git a/tests/Application/.env b/tests/Application/.env index 2aee131..e3f5b18 100644 --- a/tests/Application/.env +++ b/tests/Application/.env @@ -3,7 +3,7 @@ # https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration ###> symfony/framework-bundle ### -APP_ENV=test +APP_ENV=dev APP_DEBUG=1 APP_SECRET=EDITME ###< symfony/framework-bundle ###