Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit17fba0c

Browse files
feature#25056 [Bridge/PhpUnit] Sync the bridge version installed in vendor/ and in phpunit clone (nicolas-grekas)
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
2 parents9ccefde +038c671 commit17fba0c

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

‎src/Symfony/Bridge/PhpUnit/bin/simple-phpunit‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,17 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
6868
if (5.1 <=$PHPUNIT_VERSION &&$PHPUNIT_VERSION <5.4) {
6969
passthru("$COMPOSER require --no-update phpunit/phpunit-mock-objects\"~3.1.0\"");
7070
}
71-
passthru("$COMPOSER require --no-update symfony/phpunit-bridge\"~3.4-beta5@dev|^4.0-beta5@dev\"");
71+
passthru("$COMPOSER require --no-update symfony/phpunit-bridge\"*\"");
72+
if (file_exists(($path =dirname(__DIR__)).'/composer.json')) {
73+
if (file_exists($path.'/vendor/symfony/phpunit-bridge/composer.json')) {
74+
$path .='/vendor/symfony/phpunit-bridge';
75+
}
76+
}elseif (file_exists($path.'/symfony/phpunit-bridge/composer.json')) {
77+
$path .='/symfony/phpunit-bridge';
78+
}
79+
if (file_exists($path)) {
80+
passthru("$COMPOSER config repositories.phpunit-bridge path".escapeshellarg($path));
81+
}
7282
$prevRoot =getenv('COMPOSER_ROOT_VERSION');
7383
putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
7484
$exit =proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi",array(),$p,getcwd(),null,array('bypass_shell' =>true)));

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp