From 3d7366d211a0736571dc56c9b3af854e18a82a81 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sat, 20 Jan 2024 10:06:15 +0100
Subject: [PATCH] Remove config/bootstrap.php when not needed anymore

---
 symfony/phpunit-bridge/5.3/manifest.json       | 3 +++
 symfony/phpunit-bridge/5.3/tests/bootstrap.php | 4 +---
 symfony/phpunit-bridge/6.3/manifest.json       | 3 ++-
 symfony/phpunit-bridge/6.3/tests/bootstrap.php | 4 +---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/symfony/phpunit-bridge/5.3/manifest.json b/symfony/phpunit-bridge/5.3/manifest.json
index 4fb292b5a..724e4810a 100644
--- a/symfony/phpunit-bridge/5.3/manifest.json
+++ b/symfony/phpunit-bridge/5.3/manifest.json
@@ -9,5 +9,8 @@
         ".phpunit.result.cache",
         "/phpunit.xml"
     ],
+    "conflict": {
+        "symfony/framework-bundle": "<5.4"
+    },
     "aliases": ["simple-phpunit"]
 }
diff --git a/symfony/phpunit-bridge/5.3/tests/bootstrap.php b/symfony/phpunit-bridge/5.3/tests/bootstrap.php
index 3181151d9..47a58557d 100644
--- a/symfony/phpunit-bridge/5.3/tests/bootstrap.php
+++ b/symfony/phpunit-bridge/5.3/tests/bootstrap.php
@@ -4,9 +4,7 @@
 
 require dirname(__DIR__).'/vendor/autoload.php';
 
-if (file_exists(dirname(__DIR__).'/config/bootstrap.php')) {
-    require dirname(__DIR__).'/config/bootstrap.php';
-} elseif (method_exists(Dotenv::class, 'bootEnv')) {
+if (method_exists(Dotenv::class, 'bootEnv')) {
     (new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
 }
 
diff --git a/symfony/phpunit-bridge/6.3/manifest.json b/symfony/phpunit-bridge/6.3/manifest.json
index 482a1a439..485aa5c66 100644
--- a/symfony/phpunit-bridge/6.3/manifest.json
+++ b/symfony/phpunit-bridge/6.3/manifest.json
@@ -10,7 +10,8 @@
         "/phpunit.xml"
     ],
     "conflict": {
-        "phpunit/phpunit": "<9.6"
+        "phpunit/phpunit": "<9.6",
+        "symfony/framework-bundle": "<5.4"
     },
     "aliases": ["simple-phpunit"]
 }
diff --git a/symfony/phpunit-bridge/6.3/tests/bootstrap.php b/symfony/phpunit-bridge/6.3/tests/bootstrap.php
index 3181151d9..47a58557d 100644
--- a/symfony/phpunit-bridge/6.3/tests/bootstrap.php
+++ b/symfony/phpunit-bridge/6.3/tests/bootstrap.php
@@ -4,9 +4,7 @@
 
 require dirname(__DIR__).'/vendor/autoload.php';
 
-if (file_exists(dirname(__DIR__).'/config/bootstrap.php')) {
-    require dirname(__DIR__).'/config/bootstrap.php';
-} elseif (method_exists(Dotenv::class, 'bootEnv')) {
+if (method_exists(Dotenv::class, 'bootEnv')) {
     (new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
 }