feature #25056 [Bridge/PhpUnit] Sync the bridge version installed in vendor/ and in phpunit clone (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 17fba0c2080d · 2017-11-20T21:47:24.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [Bridge/PhpUnit] Sync the bridge version installed in vendor/ and in phpunit clone | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Right now, the bridge is installed at least twice: in vendor/ of the tested package, and in phpunit's clone. By forcing the vendor one to be used for the phpunit clone also, we sync the version of the code, so that things become more manageable and easier to debug. Applies also to our own CI. Commits ------- 038c671 [Bridge/PhpUnit] Sync the bridge version installed in vendor/ and in phpunit clone
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -68,7 +68,17 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
     if (5.1 <= $PHPUNIT_VERSION && $PHPUNIT_VERSION < 5.4) {
         passthru("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
     }
-    passthru("$COMPOSER require --no-update symfony/phpunit-bridge \"~3.4-beta5@dev|^4.0-beta5@dev\"");
+    passthru("$COMPOSER require --no-update symfony/phpunit-bridge \"*\"");
+    if (file_exists(($path = dirname(__DIR__)).'/composer.json')) {
+        if (file_exists($path.'/vendor/symfony/phpunit-bridge/composer.json')) {
+            $path .= '/vendor/symfony/phpunit-bridge';
+        }
+    } elseif (file_exists($path.'/symfony/phpunit-bridge/composer.json')) {
+        $path .= '/symfony/phpunit-bridge';
+    }
+    if (file_exists($path)) {
+        passthru("$COMPOSER config repositories.phpunit-bridge path ".escapeshellarg($path));
+    }
     $prevRoot = getenv('COMPOSER_ROOT_VERSION');
     putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
     $exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p, getcwd(), null, array('bypass_shell' => true)));
