From b0267e6dcf603397218d3bc49a9ff031cb5aec06 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 11 Feb 2021 10:33:17 +0100
Subject: [PATCH 1/2] Fix transient test

---
 .../Command/CacheClearCommand/CacheClearCommandTest.php     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
index 4b557011a9..27f2973d82 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
@@ -18,6 +18,7 @@ use Symfony\Component\Config\ConfigCacheFactory;
 use Symfony\Component\Config\Resource\ResourceInterface;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
+use Symfony\Component\Filesystem\Exception\IOException;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
 
@@ -37,7 +38,10 @@ class CacheClearCommandTest extends TestCase
 
     protected function tearDown(): void
     {
-        $this->fs->remove($this->kernel->getProjectDir());
+        try {
+            $this->fs->remove($this->kernel->getProjectDir());
+        } catch (IOException $e) {
+        }
     }
 
     public function testCacheIsFreshAfterCacheClearedWithWarmup()

From b22562f97592afe2c7d7cd363be5985c8680283c Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 11 Feb 2021 13:34:09 +0100
Subject: [PATCH 2/2] [Contracts] fix branch-aliases

---
 src/Symfony/Contracts/Cache/composer.json           | 8 +++-----
 src/Symfony/Contracts/EventDispatcher/composer.json | 8 +++-----
 src/Symfony/Contracts/HttpClient/composer.json      | 8 +++-----
 src/Symfony/Contracts/Service/composer.json         | 8 +++-----
 src/Symfony/Contracts/Translation/composer.json     | 8 +++-----
 5 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/src/Symfony/Contracts/Cache/composer.json b/src/Symfony/Contracts/Cache/composer.json
index b77a03dacc..7d0735e309 100644
--- a/src/Symfony/Contracts/Cache/composer.json
+++ b/src/Symfony/Contracts/Cache/composer.json
@@ -27,14 +27,12 @@
     },
     "minimum-stability": "dev",
     "extra": {
+        "branch-alias": {
+            "dev-main": "1.1-dev"
+        },
         "thanks": {
             "name": "symfony/contracts",
             "url": "https://github.com/symfony/contracts"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "1.1-dev"
-        }
     }
 }
diff --git a/src/Symfony/Contracts/EventDispatcher/composer.json b/src/Symfony/Contracts/EventDispatcher/composer.json
index 0d14e98fea..9d4bd7bea7 100644
--- a/src/Symfony/Contracts/EventDispatcher/composer.json
+++ b/src/Symfony/Contracts/EventDispatcher/composer.json
@@ -27,14 +27,12 @@
     },
     "minimum-stability": "dev",
     "extra": {
+        "branch-alias": {
+            "dev-main": "1.1-dev"
+        },
         "thanks": {
             "name": "symfony/contracts",
             "url": "https://github.com/symfony/contracts"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "1.1-dev"
-        }
     }
 }
diff --git a/src/Symfony/Contracts/HttpClient/composer.json b/src/Symfony/Contracts/HttpClient/composer.json
index b56709738b..2464d08175 100644
--- a/src/Symfony/Contracts/HttpClient/composer.json
+++ b/src/Symfony/Contracts/HttpClient/composer.json
@@ -26,14 +26,12 @@
     },
     "minimum-stability": "dev",
     "extra": {
+        "branch-alias": {
+            "dev-main": "1.1-dev"
+        },
         "thanks": {
             "name": "symfony/contracts",
             "url": "https://github.com/symfony/contracts"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "1.1-dev"
-        }
     }
 }
diff --git a/src/Symfony/Contracts/Service/composer.json b/src/Symfony/Contracts/Service/composer.json
index 8134ba6b88..e3bf920ca2 100644
--- a/src/Symfony/Contracts/Service/composer.json
+++ b/src/Symfony/Contracts/Service/composer.json
@@ -27,14 +27,12 @@
     },
     "minimum-stability": "dev",
     "extra": {
+        "branch-alias": {
+            "dev-main": "1.1-dev"
+        },
         "thanks": {
             "name": "symfony/contracts",
             "url": "https://github.com/symfony/contracts"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "1.1-dev"
-        }
     }
 }
diff --git a/src/Symfony/Contracts/Translation/composer.json b/src/Symfony/Contracts/Translation/composer.json
index 8fd0d88df7..8fe4b20949 100644
--- a/src/Symfony/Contracts/Translation/composer.json
+++ b/src/Symfony/Contracts/Translation/composer.json
@@ -26,14 +26,12 @@
     },
     "minimum-stability": "dev",
     "extra": {
+        "branch-alias": {
+            "dev-main": "1.1-dev"
+        },
         "thanks": {
             "name": "symfony/contracts",
             "url": "https://github.com/symfony/contracts"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "1.1-dev"
-        }
     }
 }