Skip to content

Commit 06e949b

Browse files
Merge branch '6.2' into 6.3
* 6.2: Fix merge Migrate to `static` data providers using `rector/rector`
2 parents 8422187 + db5bb4e commit 06e949b

File tree

8 files changed

+19
-19
lines changed

8 files changed

+19
-19
lines changed

Tests/CurrenciesTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ public function testGetSymbol($displayLocale)
674674
}
675675
}
676676

677-
public function provideCurrencies()
677+
public static function provideCurrencies()
678678
{
679679
return array_map(
680680
fn ($currency) => [$currency],
@@ -701,7 +701,7 @@ public function testGetRoundingIncrement($currency)
701701
$this->assertIsNumeric(Currencies::getRoundingIncrement($currency));
702702
}
703703

704-
public function provideCurrenciesWithNumericEquivalent()
704+
public static function provideCurrenciesWithNumericEquivalent()
705705
{
706706
return array_map(
707707
fn ($value) => [$value],
@@ -717,7 +717,7 @@ public function testGetNumericCode($currency)
717717
$this->assertSame(self::ALPHA3_TO_NUMERIC[$currency], Currencies::getNumericCode($currency));
718718
}
719719

720-
public function provideCurrenciesWithoutNumericEquivalent()
720+
public static function provideCurrenciesWithoutNumericEquivalent()
721721
{
722722
return array_map(
723723
fn ($value) => [$value],
@@ -734,7 +734,7 @@ public function testGetNumericCodeFailsIfNoNumericEquivalent($currency)
734734
Currencies::getNumericCode($currency);
735735
}
736736

737-
public function provideValidNumericCodes()
737+
public static function provideValidNumericCodes()
738738
{
739739
$numericToAlpha3 = $this->getNumericToAlpha3Mapping();
740740

@@ -759,7 +759,7 @@ public function testForNumericCode($numeric, $expected)
759759
$this->assertSame($expected, $actual);
760760
}
761761

762-
public function provideInvalidNumericCodes()
762+
public static function provideInvalidNumericCodes()
763763
{
764764
$validNumericCodes = array_keys($this->getNumericToAlpha3Mapping());
765765
$invalidNumericCodes = array_diff(range(0, 1000), $validNumericCodes);

Tests/Data/Bundle/Reader/BundleEntryReaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public function testDontFallbackIfLocaleDoesNotExistAndFallbackDisabled()
165165
$this->reader->readEntry(self::RES_DIR, 'en_GB', ['Entries', 'Bam'], false);
166166
}
167167

168-
public function provideMergeableValues()
168+
public static function provideMergeableValues()
169169
{
170170
return [
171171
['foo', null, 'foo'],

Tests/LanguagesTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1742,7 +1742,7 @@ public function testGetNameDefaultLocale()
17421742
}
17431743
}
17441744

1745-
public function provideLanguagesWithAlpha3Equivalent()
1745+
public static function provideLanguagesWithAlpha3Equivalent()
17461746
{
17471747
return array_map(
17481748
fn ($value) => [$value],
@@ -1758,7 +1758,7 @@ public function testGetAlpha3Code($language)
17581758
$this->assertSame(self::ALPHA2_TO_ALPHA3[$language], Languages::getAlpha3Code($language));
17591759
}
17601760

1761-
public function provideLanguagesWithoutAlpha3Equivalent()
1761+
public static function provideLanguagesWithoutAlpha3Equivalent()
17621762
{
17631763
return array_map(
17641764
fn ($value) => [$value],
@@ -1792,7 +1792,7 @@ public function testGetAlpha3Codes()
17921792
$this->assertSame(self::ALPHA3_CODES, Languages::getAlpha3Codes());
17931793
}
17941794

1795-
public function provideLanguagesWithAlpha2Equivalent()
1795+
public static function provideLanguagesWithAlpha2Equivalent()
17961796
{
17971797
return array_map(
17981798
fn ($value) => [$value],
@@ -1808,7 +1808,7 @@ public function testGetAlpha2Code($language)
18081808
$this->assertSame(self::ALPHA3_TO_ALPHA2[$language], Languages::getAlpha2Code($language));
18091809
}
18101810

1811-
public function provideLanguagesWithoutAlpha2Equivalent()
1811+
public static function provideLanguagesWithoutAlpha2Equivalent()
18121812
{
18131813
return array_map(
18141814
fn ($value) => [$value],

Tests/LocaleTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
class LocaleTest extends TestCase
1818
{
19-
public function provideGetFallbackTests()
19+
public static function provideGetFallbackTests()
2020
{
2121
$tests = [
2222
['sl_Latn_IT', 'sl_Latn_IT_nedis'],

Tests/TimezonesTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ public function testGetCountryCodeAvailability(string $timezone)
639639
}
640640
}
641641

642-
public function provideTimezones(): iterable
642+
public static function provideTimezones(): iterable
643643
{
644644
return array_map(fn ($timezone) => [$timezone], self::ZONES);
645645
}
@@ -655,7 +655,7 @@ public function testForCountryCodeAvailability(string $country)
655655
$this->addToAssertionCount(1);
656656
}
657657

658-
public function provideCountries(): iterable
658+
public static function provideCountries(): iterable
659659
{
660660
return array_map(fn ($country) => [$country], Countries::getCountryCodes());
661661
}

Tests/Transliterator/EmojiTransliteratorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function testTransliterate(string $locale, string $input, string $expecte
3030
$this->assertSame($expected, $tr->transliterate($input));
3131
}
3232

33-
public function provideTransliterateTests(): iterable
33+
public static function provideTransliterateTests(): iterable
3434
{
3535
yield [
3636
'fr',
@@ -92,7 +92,7 @@ public function testAllTransliterator(string $locale)
9292
$this->assertNotEmpty($tr->transliterate('😀'));
9393
}
9494

95-
public function provideLocaleTest(): iterable
95+
public static function provideLocaleTest(): iterable
9696
{
9797
$file = (new Finder())
9898
->in(__DIR__.'/../../Resources/data/transliterator/emoji')

Tests/Util/IcuVersionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020
class IcuVersionTest extends TestCase
2121
{
22-
public function normalizeProvider()
22+
public static function normalizeProvider()
2323
{
2424
return [
2525
[null, '1', '10'],
@@ -49,7 +49,7 @@ public function testNormalize($precision, $version, $result)
4949
$this->assertSame($result, IcuVersion::normalize($version, $precision));
5050
}
5151

52-
public function compareProvider()
52+
public static function compareProvider()
5353
{
5454
return [
5555
[null, '1', '==', '1', true],

Tests/Util/VersionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020
class VersionTest extends TestCase
2121
{
22-
public function normalizeProvider()
22+
public static function normalizeProvider()
2323
{
2424
return [
2525
[null, '1', '1'],
@@ -53,7 +53,7 @@ public function testNormalize($precision, $version, $result)
5353
$this->assertSame($result, Version::normalize($version, $precision));
5454
}
5555

56-
public function compareProvider()
56+
public static function compareProvider()
5757
{
5858
return [
5959
[null, '1', '==', '1', true],

0 commit comments

Comments
 (0)