From 5eed0d76193ff0c521ae46b68fb95b47db45ba2b Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Sun, 4 Aug 2019 00:51:07 +0200 Subject: [PATCH] fix merge --- .../Component/HttpClient/Tests/HttpClientTestCase.php | 3 --- src/Symfony/Component/Intl/Tests/ResourceBundleTestCase.php | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php index 40a8f80278..f71ddb6c90 100644 --- 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 index 36940163f4..3e46098589 100644 --- 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');