Skip to content

Commit caec979

Browse files
Merge branch '4.3' into 4.4
* 4.3: Fix symfony/phpunit-bridge not up to date in phpunit 4.8 test suite Sync "not implementing the method" deprecations messages
2 parents b1a14fb + ce4194e commit caec979

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

Tests/ResourceBundleTestCase.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,13 @@
1212
namespace Symfony\Component\Intl\Tests;
1313

1414
use PHPUnit\Framework\TestCase;
15+
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1516
use Symfony\Component\Intl\Locale;
1617

1718
abstract class ResourceBundleTestCase extends TestCase
1819
{
20+
use ForwardCompatTestTrait;
21+
1922
// Include the locales statically so that the data providers are decoupled
2023
// from the Intl class. Otherwise tests will fail if the intl extension is
2124
// not loaded, because it is NOT possible to skip the execution of data
@@ -696,7 +699,7 @@ abstract class ResourceBundleTestCase extends TestCase
696699

697700
private static $rootLocales;
698701

699-
protected function setUp(): void
702+
private function doSetUp()
700703
{
701704
Locale::setDefault('en');
702705
Locale::setDefaultFallback('en');

0 commit comments

Comments
 (0)