diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
Nicolas Grekas 2019-08-04 00:51:07 +02:00
parent 6328eff652
commit 5eed0d7619
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
View File

@ -11,13 +11,10 @@
namespace Symfony\Component\HttpClient\Tests; namespace Symfony\Component\HttpClient\Tests;
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Contracts\HttpClient\Test\HttpClientTestCase as BaseHttpClientTestCase; use Symfony\Contracts\HttpClient\Test\HttpClientTestCase as BaseHttpClientTestCase;
abstract class HttpClientTestCase extends BaseHttpClientTestCase abstract class HttpClientTestCase extends BaseHttpClientTestCase
{ {
use ForwardCompatTestTrait;
public function testToStream() public function testToStream()
{ {
$client = $this->getHttpClient(__FUNCTION__); $client = $this->getHttpClient(__FUNCTION__);

5
src/Symfony/Component/Intl/Tests/ResourceBundleTestCase.php
View File

@ -12,13 +12,10 @@
namespace Symfony\Component\Intl\Tests; namespace Symfony\Component\Intl\Tests;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Intl\Locale; use Symfony\Component\Intl\Locale;
abstract class ResourceBundleTestCase extends TestCase abstract class ResourceBundleTestCase extends TestCase
{ {
use ForwardCompatTestTrait;
// Include the locales statically so that the data providers are decoupled // Include the locales statically so that the data providers are decoupled
// from the Intl class. Otherwise tests will fail if the intl extension is // 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 // 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 static $rootLocales;
private function doSetUp() protected function setUp()
{ {
Locale::setDefault('en'); Locale::setDefault('en');
Locale::setDefaultFallback('en'); Locale::setDefaultFallback('en');