From 9655ceeefac9940940c40c5fce9e1839532bcb28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre=20Andr=C3=A9?= Date: Thu, 25 Nov 2021 14:43:20 +0100 Subject: [PATCH 1/2] Add dg/bypass-finals to the conflict packages list --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1db593bfc..e651d6117 100644 --- a/composer.json +++ b/composer.json @@ -67,7 +67,8 @@ "webmozart/path-util": "^2.3" }, "conflict": { - "phpunit/php-code-coverage": ">9 <9.1.4" + "phpunit/php-code-coverage": ">9 <9.1.4", + "dg/bypass-finals": "*" }, "require-dev": { "ext-simplexml": "*", From 1f9a23b499507ded9c96773723babc8a9806dd98 Mon Sep 17 00:00:00 2001 From: maks-rafalko Date: Sat, 27 Nov 2021 12:08:24 +0300 Subject: [PATCH 2/2] Fix composer warnigns and indentation --- composer.json | 2 +- composer.lock | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index e651d6117..163607411 100644 --- a/composer.json +++ b/composer.json @@ -68,7 +68,7 @@ }, "conflict": { "phpunit/php-code-coverage": ">9 <9.1.4", - "dg/bypass-finals": "*" + "dg/bypass-finals": "*" }, "require-dev": { "ext-simplexml": "*", diff --git a/composer.lock b/composer.lock index a7082652a..a38465376 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": "119f7c2f2bf8fba0f60d0c8b738e3594", + "content-hash": "9c965a7ee872c12bda03105422e1b416", "packages": [ { "name": "composer/xdebug-handler", @@ -2026,6 +2026,7 @@ "issues": "https://github.com/webmozart/path-util/issues", "source": "https://github.com/webmozart/path-util/tree/2.3.0" }, + "abandoned": "symfony/filesystem", "time": "2015-12-17T08:42:14+00:00" } ],