From 6ec66a32f0e787154a9cee689b7c3e03e902b878 Mon Sep 17 00:00:00 2001
From: jmsche <contact@jmsche.fr>
Date: Fri, 10 Jun 2022 08:54:19 +0200
Subject: [PATCH 1/2] Ignore correct PHP CS Fixer config file in .gitattributes

---
 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 601811370..756ab987d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,7 @@
 /.github export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/.php_cs.dist export-ignore
+/.php-cs-fixer.dist.php export-ignore
 /.travis.yml export-ignore
 /phpunit.xml.dist export-ignore
 /tests export-ignore

From d1a692369be53445af6e391170b509d7f5d026cf Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 14 Jun 2022 23:13:39 +0200
Subject: [PATCH 2/2] Revert "Deprecate "flex-require" sections"

This reverts commit c36d11d1bca0a85dde6ca4d52bd4aceeb54dbd8f.
---
 src/Flex.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Flex.php b/src/Flex.php
index 3a861970b..005c53acf 100644
--- a/src/Flex.php
+++ b/src/Flex.php
@@ -415,9 +415,6 @@ public function update(Event $event, $operations = [])
             if (!isset($json['flex-'.$type])) {
                 continue;
             }
-
-            $this->io->writeError(sprintf('<warning>Using section "flex-%s" in composer.json is deprecated, use "%1$s" instead.</>', $type));
-
             foreach ($json['flex-'.$type] as $package => $constraint) {
                 if ($symfonyVersion && '*' === $constraint && isset($versions['splits'][$package])) {
                     // replace unbounded constraints for symfony/* packages by extra.symfony.require