From 7260a7d7abe8b2c0ee93642f7d67299b6a933d47 Mon Sep 17 00:00:00 2001 From: Ondrej Machulda Date: Tue, 20 Apr 2021 13:21:21 +0200 Subject: [PATCH] Workaround for ecs issue caused by PHP_CodeSniffer & php-cs-fixer conflict See https://github.com/symplify/symplify/issues/3130 --- CHANGELOG.md | 3 +++ composer.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b889e9..3c363b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ +## 2.1.3 - 2021-04-21 +- Lock `friendsofphp/php-cs-fixer` dependency to `<2.18.6` because of [symplify#3130](https://github.com/symplify/symplify/issues/3130). + ## 2.1.2 - 2021-02-01 - Lock `symfony/dependency-injection` also to `<4.4.19` (to extend the workaround from 2.1.1). diff --git a/composer.json b/composer.json index f30b626..461a486 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ ], "require": { "php": "^7.2", - "friendsofphp/php-cs-fixer": "^2.16.3", + "friendsofphp/php-cs-fixer": "^2.16.3 <2.18.6", "symfony/dependency-injection": "<4.4.19 || >=5.0.0 <5.2.2", "symplify/auto-bind-parameter": "<7.2.20", "symplify/autowire-array-parameter": "<7.2.20",