bug #43799 [PhpUnitBridge] fix symlink to bridge in docker by making its path relative (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 2a981475aae4 · 2021-10-28T16:41:14.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [PhpUnitBridge] fix symlink to bridge in docker by making its path relative | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #40879 | License | MIT | Doc PR | - This is a simpler and less generic version of #40879 that should fit the goal: > When running symfony from a docker container with a volume mapped to the host, it may cause issues when symlinks are generated from container root, as absolute links. > For composer to generate a relative symlink, declaration of the path repository should be relative. Commits ------- 3672ee2 [PhpUnitBridge] fix symlink to bridge in docker by making its path relative
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php
@@ -126,7 +126,7 @@
 }
 
 $oldPwd = getcwd();
-$PHPUNIT_DIR = $getEnvVar('SYMFONY_PHPUNIT_DIR', $root.'/vendor/bin/.phpunit');
+$PHPUNIT_DIR = rtrim($getEnvVar('SYMFONY_PHPUNIT_DIR', $root.'/vendor/bin/.phpunit'), '/'.\DIRECTORY_SEPARATOR);
 $PHP = defined('PHP_BINARY') ? \PHP_BINARY : 'php';
 $PHP = escapeshellarg($PHP);
 if ('phpdbg' === \PHP_SAPI) {
@@ -238,6 +238,10 @@
         $passthruOrFail("$COMPOSER config --unset platform.php");
     }
     if (file_exists($path = $root.'/vendor/symfony/phpunit-bridge')) {
+        $p = str_repeat('../', substr_count("$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR", '/', strlen($root))).'vendor/symfony/phpunit-bridge';
+        if (realpath($p) === realpath($path)) {
+            $path = $p;
+        }
         $passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*@dev\"");
         $passthruOrFail("$COMPOSER config repositories.phpunit-bridge path ".escapeshellarg(str_replace('/', \DIRECTORY_SEPARATOR, $path)));
         if ('\\' === \DIRECTORY_SEPARATOR) {
