Skip to content

Commit b1a14fb

Browse files
Merge branch '4.3' into 4.4
* 4.3: Fix assertInternalType deprecation in phpunit 9 Ensure signatures for setUp|tearDown|setUpAfterClass|tearDownAfterClass methods in tests are compatible with phpunit 8.2
2 parents 1cc26d4 + ce4194e commit b1a14fb

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Tests/CurrenciesTest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,16 @@
1111

1212
namespace Symfony\Component\Intl\Tests;
1313

14+
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1415
use Symfony\Component\Intl\Currencies;
1516

1617
/**
1718
* @group intl-data
1819
*/
1920
class CurrenciesTest extends ResourceBundleTestCase
2021
{
22+
use ForwardCompatTestTrait;
23+
2124
// The below arrays document the state of the ICU data bundled with this package.
2225

2326
private static $currencies = [
@@ -693,7 +696,7 @@ public function testGetFractionDigits($currency)
693696
*/
694697
public function testGetRoundingIncrement($currency)
695698
{
696-
$this->assertInternalType('numeric', Currencies::getRoundingIncrement($currency));
699+
$this->assertIsNumeric(Currencies::getRoundingIncrement($currency));
697700
}
698701

699702
public function provideCurrenciesWithNumericEquivalent()

Tests/ResourceBundleTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ abstract class ResourceBundleTestCase extends TestCase
696696

697697
private static $rootLocales;
698698

699-
protected function setUp()
699+
protected function setUp(): void
700700
{
701701
Locale::setDefault('en');
702702
Locale::setDefaultFallback('en');

0 commit comments

Comments
 (0)