Skip to content

Commit

Permalink
Remove config/bootstrap.php when not needed anymore
Browse files Browse the repository at this point in the history
  • Loading branch information
fabpot committed Jan 20, 2024
1 parent 66d9ffb commit 3d7366d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
3 changes: 3 additions & 0 deletions symfony/phpunit-bridge/5.3/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,8 @@
".phpunit.result.cache",
"/phpunit.xml"
],
"conflict": {
"symfony/framework-bundle": "<5.4"
},
"aliases": ["simple-phpunit"]
}
4 changes: 1 addition & 3 deletions symfony/phpunit-bridge/5.3/tests/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}

Expand Down
3 changes: 2 additions & 1 deletion symfony/phpunit-bridge/6.3/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"/phpunit.xml"
],
"conflict": {
"phpunit/phpunit": "<9.6"
"phpunit/phpunit": "<9.6",
"symfony/framework-bundle": "<5.4"
},
"aliases": ["simple-phpunit"]
}
4 changes: 1 addition & 3 deletions symfony/phpunit-bridge/6.3/tests/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}

Expand Down

0 comments on commit 3d7366d

Please sign in to comment.