Merge branch '3.3' into 3.4

nicolas-grekas · nicolas-grekas · commit 42390a2b00cf · 2017-10-13T18:56:07.000+02:00
* 3.3:
  Fix phpunit bridge (ter)
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/ProcessIsolationTest.php b/src/Symfony/Bridge/PhpUnit/Tests/ProcessIsolationTest.php
@@ -19,6 +19,6 @@ class ProcessIsolationTest extends TestCase
     public function testIsolation()
     {
         @trigger_error('Test abc', E_USER_DEPRECATED);
-        $test->addToAssertionCount(1);
+        $this->addToAssertionCount(1);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,6 +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`	`+ $this->addToAssertionCount(1);`
`23`	`23`	`}`
`24`	`24`	`}`