Merge pull request #1285 from symfony/config-bootstrap-removal

fabpot · web-flow · commit cb5810a1937b · 2024-01-21T10:28:24.000+01:00
Remove `config/bootstrap.php` when not needed anymore
diff --git 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
@@ -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
@@ -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
@@ -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');
 }
 

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,8 @@`
`9`	`9`	`".phpunit.result.cache",`
`10`	`10`	`"/phpunit.xml"`
`11`	`11`	`],`
	`12`	`+ "conflict": {`
	`13`	`+ "symfony/framework-bundle": "<5.4"`
	`14`	`+ },`
`12`	`15`	`"aliases": ["simple-phpunit"]`
`13`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,7 @@`
`4`	`4`
`5`	`5`	`require dirname(__DIR__).'/vendor/autoload.php';`
`6`	`6`
`7`		`-if (file_exists(dirname(__DIR__).'/config/bootstrap.php')) {`
`8`		`- require dirname(__DIR__).'/config/bootstrap.php';`
`9`		`-} elseif (method_exists(Dotenv::class, 'bootEnv')) {`
	`7`	`+if (method_exists(Dotenv::class, 'bootEnv')) {`
`10`	`8`	`(new Dotenv())->bootEnv(dirname(__DIR__).'/.env');`
`11`	`9`	`}`
`12`	`10`