fix merge
This commit is contained in:
parent
6328eff652
commit
5eed0d7619
@ -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__);
|
||||
|
@ -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');
|
||||
|
Reference in New Issue
Block a user