Merge branch '4.4'

nicolas-grekas · nicolas-grekas · commit 63ad8dc41f00 · 2019-08-04T00:51:43.000+02:00
* 4.4:
  fix merge
diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php b/src/Symfony/Component/HttpClient/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__);
diff --git a/src/Symfony/Component/Intl/Tests/ResourceBundleTestCase.php b/src/Symfony/Component/Intl/Tests/ResourceBundleTestCase.php
@@ -12,13 +12,10 @@
 namespace Symfony\Component\Intl\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Intl\Locale;
 
 abstract class ResourceBundleTestCase extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     // Include the locales statically so that the data providers are decoupled
     // from the Intl class. Otherwise tests will fail if the intl extension is
     // not loaded, because it is NOT possible to skip the execution of data
@@ -699,7 +696,7 @@ abstract class ResourceBundleTestCase extends TestCase
 
     private static $rootLocales;
 
-    private function doSetUp()
+    protected function setUp()
     {
         Locale::setDefault('en');
         Locale::setDefaultFallback('en');

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__);`