Merge branch '3.3' into 3.4

nicolas-grekas · nicolas-grekas · commit 0454396746a3 · 2017-10-13T18:49:51.000+02:00
* 3.3:
  Fix phpunit bridge (bis)
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -70,7 +70,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
     }
     passthru("$COMPOSER require --no-update symfony/phpunit-bridge \">=3.3.11@dev\"");
     $prevRoot = getenv('COMPOSER_ROOT_VERSION');
-    putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_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)));
     putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
     if ($exit) {

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") \|\| md5_file(__`
`70`	`70`	`}`
`71`	`71`	`passthru("$COMPOSER require --no-update symfony/phpunit-bridge \">=3.3.11@dev\"");`
`72`	`72`	`$prevRoot = getenv('COMPOSER_ROOT_VERSION');`
`73`		`- putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION");`
	`73`	`+ putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");`
`74`	`74`	`$exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p, getcwd(), null, array('bypass_shell' => true)));`
`75`	`75`	`putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));`
`76`	`76`	`if ($exit) {`