Merge branch '3.3' into 3.4

nicolas-grekas · nicolas-grekas · commit ed5f884ec6c6 · 2017-10-13T18:40:10.000+02:00
* 3.3:
  Fix phpunit bridge
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/ProcessIsolationTest.php b/src/Symfony/Bridge/PhpUnit/Tests/ProcessIsolationTest.php
@@ -19,5 +19,6 @@ class ProcessIsolationTest extends TestCase
     public function testIsolation()
     {
         @trigger_error('Test abc', E_USER_DEPRECATED);
+        $test->addToAssertionCount(1);
     }
 }
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -68,7 +68,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 --no-update symfony/phpunit-bridge \">=3.2@dev\"");
+    passthru("$COMPOSER require --no-update symfony/phpunit-bridge \">=3.3.11@dev\"");
     $prevRoot = getenv('COMPOSER_ROOT_VERSION');
     putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION");
     $exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p, getcwd(), null, array('bypass_shell' => true)));

Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,6 @@ class ProcessIsolationTest extends TestCase`
`19`	`19`	`public function testIsolation()`
`20`	`20`	`{`
`21`	`21`	`@trigger_error('Test abc', E_USER_DEPRECATED);`
	`22`	`+ $test->addToAssertionCount(1);`
`22`	`23`	`}`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") \|\| md5_file(__`
`68`	`68`	`if (5.1 <= $PHPUNIT_VERSION && $PHPUNIT_VERSION < 5.4) {`
`69`	`69`	`passthru("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");`
`70`	`70`	`}`
`71`		`- passthru("$COMPOSER require --no-update symfony/phpunit-bridge \">=3.2@dev\"");`
	`71`	`+ passthru("$COMPOSER require --no-update symfony/phpunit-bridge \">=3.3.11@dev\"");`
`72`	`72`	`$prevRoot = getenv('COMPOSER_ROOT_VERSION');`
`73`	`73`	`putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION");`
`74`	`74`	`$exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p, getcwd(), null, array('bypass_shell' => true)));`