Merge branch '3.3' into 3.4

* 3.3: Fix phpunit bridge (ter)
2017-10-13 18:56:07 +02:00 · 2017-10-13 18:56:07 +02:00 · 42390a2b00
commit 42390a2b00
parent 0454396746 a522f5e855
1 changed files with 1 additions and 1 deletions
--- 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);
    }
 }