Skip to content

Commit c4ab07f

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: (33 commits) do not pass a boolean to the constructor of the Dotenv class [Notifier] Fix low-deps tests Deprecate Composer 1 [Filesystem] Add third argument `$lockFile` to `Filesystem::appendToFile()` [TwigBundle] fix auto-enabling assets/expression/routing/yaml/workflow extensions [PhpUnitBridge] fix symlink to bridge in docker by making its path relative [Dotenv] Duplicate $_SERVER values in $_ENV if they don't exist Fix markup [Notifier] Add Expo bridge Add polish translations (#43725) Rename translation:update to translation:extract [String] Add PLURAL_MAP "zombies" -- fix #43789 Added support for `statusCode` default parameter when loading a template directly from route using the `Symfony\Bundle\FrameworkBundle\Controller\TemplateController` controller. [Validator] Update validators.bs.xlf Cache voters that will always abstain [Messenger] Fix `TraceableMessageBus` implementation so it can compute caller even when used within a callback [Validator] Add the missing translations for Russian (ru) [Validator] Added missing translations for Latvian (lv) [Validator] Added missing translations [Validator] Add missing translations for Vietnamese (VI) ...
2 parents f8f6176 + 7e3cd47 commit c4ab07f

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

bin/simple-phpunit.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
}
123123

124124
$oldPwd = getcwd();
125-
$PHPUNIT_DIR = $getEnvVar('SYMFONY_PHPUNIT_DIR', $root.'/vendor/bin/.phpunit');
125+
$PHPUNIT_DIR = rtrim($getEnvVar('SYMFONY_PHPUNIT_DIR', $root.'/vendor/bin/.phpunit'), '/'.\DIRECTORY_SEPARATOR);
126126
$PHP = defined('PHP_BINARY') ? \PHP_BINARY : 'php';
127127
$PHP = escapeshellarg($PHP);
128128
if ('phpdbg' === \PHP_SAPI) {
@@ -239,6 +239,10 @@
239239
$passthruOrFail("$COMPOSER config --unset platform.php");
240240
}
241241
if (file_exists($path = $root.'/vendor/symfony/phpunit-bridge')) {
242+
$p = str_repeat('../', substr_count("$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR", '/', strlen($root))).'vendor/symfony/phpunit-bridge';
243+
if (realpath($p) === realpath($path)) {
244+
$path = $p;
245+
}
242246
$passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*@dev\"");
243247
$passthruOrFail("$COMPOSER config repositories.phpunit-bridge path ".escapeshellarg(str_replace('/', \DIRECTORY_SEPARATOR, $path)));
244248
if ('\\' === \DIRECTORY_SEPARATOR) {

0 commit comments

Comments
 (0)