Skip to content

Commit

Permalink
bug #20034 fix composer install process, resolves #20032 (alcohol)
Browse files Browse the repository at this point in the history
This PR was merged into the 3.2-dev branch.

Discussion
----------

fix composer install process, resolves #20032

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #20032
| License       | MIT
| Doc PR        | reference to the documentation PR, if any

Commits
-------

f418cb8 fix composer install process, resolves #20032
  • Loading branch information
fabpot committed Sep 23, 2016
2 parents fd0d288 + f418cb8 commit b53fe24
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
Expand Up @@ -53,8 +53,8 @@ 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 --dev --no-update symfony/phpunit-bridge \">=3.2@dev\"");
passthru("$COMPOSER install --prefer-dist --no-progress --ansi", $exit);
passthru("$COMPOSER require --no-update symfony/phpunit-bridge \">=3.2@dev\"");
passthru("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", $exit);
if ($exit) {
exit($exit);
}
Expand Down

0 comments on commit b53fe24

Please sign in to comment.