fix merge

nicolas-grekas · nicolas-grekas · commit 470df063b65d · 2019-08-04T00:51:07.000+02:00
diff --git a/Tests/HttpClientTestCase.php b/Tests/HttpClientTestCase.php
@@ -11,13 +11,10 @@
 
 namespace Symfony\Component\HttpClient\Tests;
 
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Contracts\HttpClient\Test\HttpClientTestCase as BaseHttpClientTestCase;
 
 abstract class HttpClientTestCase extends BaseHttpClientTestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testToStream()
     {
         $client = $this->getHttpClient(__FUNCTION__);

Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,10 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\HttpClient\Tests;`
`13`	`13`
`14`		`-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`15`	`14`	`use Symfony\Contracts\HttpClient\Test\HttpClientTestCase as BaseHttpClientTestCase;`
`16`	`15`
`17`	`16`	`abstract class HttpClientTestCase extends BaseHttpClientTestCase`
`18`	`17`	`{`
`19`		`- use ForwardCompatTestTrait;`
`20`		`-`
`21`	`18`	`public function testToStream()`
`22`	`19`	`{`
`23`	`20`	`$client = $this->getHttpClient(__FUNCTION__);`