Skip to content

Commit 7b3637f

Browse files
Merge branch '4.4' into 5.3
* 4.4: Fix tests on PHP 8.1 [Cache] Fix memory leak [DependencyInjection] fix inlining when non-shared services are involved [DoctrineBridge] add support for the JSON type [PHPUnitBridge] Fix Uncaught ValueError [FrameworkBundle] fix registering late resettable services [Validator] Missing translations for Greek (el) translate for japanese 101,102,103 [HttpClient] Curl http client has to reinit curl multi handle on reset [Validator] Add Swedish translation for issue #43737
2 parents 325aaf6 + cb7b398 commit 7b3637f

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

bin/simple-phpunit.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +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';
242+
$haystack = "$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR";
243+
$rootLen = strlen($root);
244+
245+
$p = ($rootLen <= strlen($haystack) ? str_repeat('../', substr_count($haystack, '/', $rootLen)) : '').'vendor/symfony/phpunit-bridge';
243246
if (realpath($p) === realpath($path)) {
244247
$path = $p;
245248
}

0 commit comments

Comments
 (0)