Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 8ed6f40a245a · 2016-06-16T09:28:05.000+02:00
* 2.7:
  [ci] Upgrade to symfony/phpunit-bridge &gt;=3.2@dev
diff --git a/phpunit b/phpunit
@@ -56,7 +56,7 @@ 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.1@dev\"");
+    passthru("$COMPOSER require --dev --no-update symfony/phpunit-bridge \">=3.2@dev\"");
     passthru("$COMPOSER install --prefer-dist --no-progress --ansi", $exit);
     if ($exit) {
         exit($exit);

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") \|\| md5_file(__`
`56`	`56`	`if (5.1 <= $PHPUNIT_VERSION && $PHPUNIT_VERSION < 5.4) {`
`57`	`57`	`passthru("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");`
`58`	`58`	`}`
`59`		`- passthru("$COMPOSER require --dev --no-update symfony/phpunit-bridge \">=3.1@dev\"");`
	`59`	`+ passthru("$COMPOSER require --dev --no-update symfony/phpunit-bridge \">=3.2@dev\"");`
`60`	`60`	`passthru("$COMPOSER install --prefer-dist --no-progress --ansi", $exit);`
`61`	`61`	`if ($exit) {`
`62`	`62`	`exit($exit);`