Skip to content

Commit 679657d

Browse files
alexandre-dauboisalexandre-daubois
committed
[Tests] New iteration of removing $this occurrences in future static data providers
1 parent f378eb6 commit 679657d

File tree

2 files changed

+58
-58
lines changed

2 files changed

+58
-58
lines changed

‎Tests/DateFormatter/AbstractIntlDateFormatterTest.php

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -588,25 +588,25 @@ public function testParse($pattern, $value, $expected)
588588
public function parseProvider()
589589
{
590590
return array_merge(
591-
$this->parseYearProvider(),
592-
$this->parseQuarterProvider(),
593-
$this->parseMonthProvider(),
594-
$this->parseStandaloneMonthProvider(),
595-
$this->parseDayProvider(),
596-
$this->parseDayOfWeekProvider(),
597-
$this->parseDayOfYearProvider(),
598-
$this->parseHour12ClockOneBasedProvider(),
599-
$this->parseHour12ClockZeroBasedProvider(),
600-
$this->parseHour24ClockOneBasedProvider(),
601-
$this->parseHour24ClockZeroBasedProvider(),
602-
$this->parseMinuteProvider(),
603-
$this->parseSecondProvider(),
604-
$this->parseTimezoneProvider(),
605-
$this->parseAmPmProvider(),
606-
$this->parseStandaloneAmPmProvider(),
607-
$this->parseRegexMetaCharsProvider(),
608-
$this->parseQuoteCharsProvider(),
609-
$this->parseDashSlashProvider()
591+
static::parseYearProvider(),
592+
static::parseQuarterProvider(),
593+
static::parseMonthProvider(),
594+
static::parseStandaloneMonthProvider(),
595+
static::parseDayProvider(),
596+
static::parseDayOfWeekProvider(),
597+
static::parseDayOfYearProvider(),
598+
static::parseHour12ClockOneBasedProvider(),
599+
static::parseHour12ClockZeroBasedProvider(),
600+
static::parseHour24ClockOneBasedProvider(),
601+
static::parseHour24ClockZeroBasedProvider(),
602+
static::parseMinuteProvider(),
603+
static::parseSecondProvider(),
604+
static::parseTimezoneProvider(),
605+
static::parseAmPmProvider(),
606+
static::parseStandaloneAmPmProvider(),
607+
static::parseRegexMetaCharsProvider(),
608+
static::parseQuoteCharsProvider(),
609+
static::parseDashSlashProvider()
610610
);
611611
}
612612

‎Tests/NumberFormatter/AbstractNumberFormatterTest.php

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ abstract class AbstractNumberFormatterTest extends TestCase
3030
*/
3131
public function testFormatCurrencyWithDecimalStyle($value, $currency, $expected)
3232
{
33-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
33+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
3434
$this->assertEquals($expected, $formatter->formatCurrency($value, $currency));
3535
}
3636

@@ -62,7 +62,7 @@ public function testFormatCurrencyWithCurrencyStyle($value, $currency, $expected
6262
{
6363
IntlTestHelper::requireIntl($this, '63.1');
6464

65-
$formatter = $this->getNumberFormatter('en', NumberFormatter::CURRENCY);
65+
$formatter = static::getNumberFormatter('en', NumberFormatter::CURRENCY);
6666
$this->assertEquals($expected, $formatter->formatCurrency($value, $currency));
6767
}
6868

@@ -90,7 +90,7 @@ public function testFormatCurrencyWithCurrencyStyleCostaRicanColonsRounding($val
9090
{
9191
IntlTestHelper::requireIntl($this, '63.1');
9292

93-
$formatter = $this->getNumberFormatter('en', NumberFormatter::CURRENCY);
93+
$formatter = static::getNumberFormatter('en', NumberFormatter::CURRENCY);
9494
$this->assertEquals(sprintf($expected, $symbol), $formatter->formatCurrency($value, $currency));
9595
}
9696

@@ -108,7 +108,7 @@ public function formatCurrencyWithCurrencyStyleCostaRicanColonsRoundingProvider(
108108
*/
109109
public function testFormatCurrencyWithCurrencyStyleBrazilianRealRounding($value, $currency, $symbol, $expected)
110110
{
111-
$formatter = $this->getNumberFormatter('en', NumberFormatter::CURRENCY);
111+
$formatter = static::getNumberFormatter('en', NumberFormatter::CURRENCY);
112112
$this->assertEquals(sprintf($expected, $symbol), $formatter->formatCurrency($value, $currency));
113113
}
114114

@@ -137,7 +137,7 @@ public function testFormatCurrencyWithCurrencyStyleSwissRounding($value, $curren
137137
{
138138
IntlTestHelper::requireIntl($this, '62.1');
139139

140-
$formatter = $this->getNumberFormatter('en', NumberFormatter::CURRENCY);
140+
$formatter = static::getNumberFormatter('en', NumberFormatter::CURRENCY);
141141
$this->assertEquals(sprintf($expected, $symbol), $formatter->formatCurrency($value, $currency));
142142
}
143143

@@ -168,7 +168,7 @@ public function testFormat()
168168
$errorCode = IntlGlobals::U_ZERO_ERROR;
169169
$errorMessage = 'U_ZERO_ERROR';
170170

171-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
171+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
172172
$this->assertSame('9.555', $formatter->format(9.555));
173173

174174
$this->assertSame($errorMessage, $this->getIntlErrorMessage());
@@ -183,7 +183,7 @@ public function testFormatWithCurrencyStyle()
183183
{
184184
IntlTestHelper::requireIntl($this, '63.1');
185185

186-
$formatter = $this->getNumberFormatter('en', NumberFormatter::CURRENCY);
186+
$formatter = static::getNumberFormatter('en', NumberFormatter::CURRENCY);
187187
$this->assertEquals('¤1.00', $formatter->format(1));
188188
}
189189

@@ -198,7 +198,7 @@ public function testFormatTypeInt32($formatter, $value, $expected, $message = ''
198198

199199
public function formatTypeInt32Provider()
200200
{
201-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
201+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
202202

203203
$message = '->format() TYPE_INT32 formats inconsistently an integer if out of the 32 bit range.';
204204

@@ -223,7 +223,7 @@ public function testFormatTypeInt32WithCurrencyStyle($formatter, $value, $expect
223223

224224
public function formatTypeInt32WithCurrencyStyleProvider()
225225
{
226-
$formatter = $this->getNumberFormatter('en', NumberFormatter::CURRENCY);
226+
$formatter = static::getNumberFormatter('en', NumberFormatter::CURRENCY);
227227

228228
$message = '->format() TYPE_INT32 formats inconsistently an integer if out of the 32 bit range.';
229229

@@ -248,7 +248,7 @@ public function testFormatTypeInt64($formatter, $value, $expected)
248248

249249
public function formatTypeInt64Provider()
250250
{
251-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
251+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
252252

253253
return [
254254
[$formatter, 1, '1'],
@@ -271,7 +271,7 @@ public function testFormatTypeInt64WithCurrencyStyle($formatter, $value, $expect
271271

272272
public function formatTypeInt64WithCurrencyStyleProvider()
273273
{
274-
$formatter = $this->getNumberFormatter('en', NumberFormatter::CURRENCY);
274+
$formatter = static::getNumberFormatter('en', NumberFormatter::CURRENCY);
275275

276276
return [
277277
[$formatter, 1, '¤1.00'],
@@ -292,7 +292,7 @@ public function testFormatTypeDouble($formatter, $value, $expected)
292292

293293
public function formatTypeDoubleProvider()
294294
{
295-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
295+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
296296

297297
return [
298298
[$formatter, 1, '1'],
@@ -313,7 +313,7 @@ public function testFormatTypeDoubleWithCurrencyStyle($formatter, $value, $expec
313313

314314
public function formatTypeDoubleWithCurrencyStyleProvider()
315315
{
316-
$formatter = $this->getNumberFormatter('en', NumberFormatter::CURRENCY);
316+
$formatter = static::getNumberFormatter('en', NumberFormatter::CURRENCY);
317317

318318
return [
319319
[$formatter, 1, '¤1.00'],
@@ -351,8 +351,8 @@ public function testFormatTypeCurrencyReturn($formatter, $value)
351351

352352
public function formatTypeCurrencyProvider()
353353
{
354-
$df = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
355-
$cf = $this->getNumberFormatter('en', NumberFormatter::CURRENCY);
354+
$df = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
355+
$cf = static::getNumberFormatter('en', NumberFormatter::CURRENCY);
356356

357357
return [
358358
[$df, 1],
@@ -367,7 +367,7 @@ public function testFormatFractionDigits($value, $expected, $fractionDigits = nu
367367
{
368368
IntlTestHelper::requireIntl($this, '62.1');
369369

370-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
370+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
371371

372372
$attributeRet = null;
373373
if (null !== $fractionDigits) {
@@ -397,7 +397,7 @@ public function formatFractionDigitsProvider()
397397
*/
398398
public function testFormatGroupingUsed($value, $expected, $groupingUsed = null, $expectedGroupingUsed = 1)
399399
{
400-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
400+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
401401

402402
$attributeRet = null;
403403
if (null !== $groupingUsed) {
@@ -427,7 +427,7 @@ public function formatGroupingUsedProvider()
427427
*/
428428
public function testFormatRoundingModeHalfUp($value, $expected)
429429
{
430-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
430+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
431431
$formatter->setAttribute(NumberFormatter::FRACTION_DIGITS, 2);
432432

433433
$formatter->setAttribute(NumberFormatter::ROUNDING_MODE, NumberFormatter::ROUND_HALFUP);
@@ -452,7 +452,7 @@ public function formatRoundingModeRoundHalfUpProvider()
452452
*/
453453
public function testFormatRoundingModeHalfDown($value, $expected)
454454
{
455-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
455+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
456456
$formatter->setAttribute(NumberFormatter::FRACTION_DIGITS, 2);
457457

458458
$formatter->setAttribute(NumberFormatter::ROUNDING_MODE, NumberFormatter::ROUND_HALFDOWN);
@@ -476,7 +476,7 @@ public function formatRoundingModeRoundHalfDownProvider()
476476
*/
477477
public function testFormatRoundingModeHalfEven($value, $expected)
478478
{
479-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
479+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
480480
$formatter->setAttribute(NumberFormatter::FRACTION_DIGITS, 2);
481481

482482
$formatter->setAttribute(NumberFormatter::ROUNDING_MODE, NumberFormatter::ROUND_HALFEVEN);
@@ -500,7 +500,7 @@ public function formatRoundingModeRoundHalfEvenProvider()
500500
*/
501501
public function testFormatRoundingModeCeiling($value, $expected)
502502
{
503-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
503+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
504504
$formatter->setAttribute(NumberFormatter::FRACTION_DIGITS, 2);
505505

506506
$formatter->setAttribute(NumberFormatter::ROUNDING_MODE, NumberFormatter::ROUND_CEILING);
@@ -525,7 +525,7 @@ public function formatRoundingModeRoundCeilingProvider()
525525
*/
526526
public function testFormatRoundingModeFloor($value, $expected)
527527
{
528-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
528+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
529529
$formatter->setAttribute(NumberFormatter::FRACTION_DIGITS, 2);
530530

531531
$formatter->setAttribute(NumberFormatter::ROUNDING_MODE, NumberFormatter::ROUND_FLOOR);
@@ -550,7 +550,7 @@ public function formatRoundingModeRoundFloorProvider()
550550
*/
551551
public function testFormatRoundingModeDown($value, $expected)
552552
{
553-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
553+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
554554
$formatter->setAttribute(NumberFormatter::FRACTION_DIGITS, 2);
555555

556556
$formatter->setAttribute(NumberFormatter::ROUNDING_MODE, NumberFormatter::ROUND_DOWN);
@@ -575,7 +575,7 @@ public function formatRoundingModeRoundDownProvider()
575575
*/
576576
public function testFormatRoundingModeUp($value, $expected)
577577
{
578-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
578+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
579579
$formatter->setAttribute(NumberFormatter::FRACTION_DIGITS, 2);
580580

581581
$formatter->setAttribute(NumberFormatter::ROUNDING_MODE, NumberFormatter::ROUND_UP);
@@ -597,14 +597,14 @@ public function formatRoundingModeRoundUpProvider()
597597

598598
public function testGetLocale()
599599
{
600-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
600+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
601601
$this->assertEquals('en', $formatter->getLocale());
602602
}
603603

604604
public function testGetSymbol()
605605
{
606-
$decimalFormatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
607-
$currencyFormatter = $this->getNumberFormatter('en', NumberFormatter::CURRENCY);
606+
$decimalFormatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
607+
$currencyFormatter = static::getNumberFormatter('en', NumberFormatter::CURRENCY);
608608

609609
$r = new \ReflectionClassConstant(NumberFormatter::class, 'EN_SYMBOLS');
610610
$expected = $r->getValue();
@@ -619,8 +619,8 @@ public function testGetTextAttribute()
619619
{
620620
IntlTestHelper::requireIntl($this, '63.1');
621621

622-
$decimalFormatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
623-
$currencyFormatter = $this->getNumberFormatter('en', NumberFormatter::CURRENCY);
622+
$decimalFormatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
623+
$currencyFormatter = static::getNumberFormatter('en', NumberFormatter::CURRENCY);
624624

625625
$r = new \ReflectionClassConstant(NumberFormatter::class, 'EN_TEXT_ATTRIBUTES');
626626
$expected = $r->getValue();
@@ -639,7 +639,7 @@ public function testParse($value, $expected, $message, $expectedPosition, $group
639639
IntlTestHelper::requireIntl($this, '62.1');
640640

641641
$position = 0;
642-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
642+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
643643
$formatter->setAttribute(NumberFormatter::GROUPING_USED, $groupingUsed);
644644
$parsedValue = $formatter->parse($value, NumberFormatter::TYPE_DOUBLE, $position);
645645
$this->assertSame($expected, $parsedValue, $message);
@@ -713,7 +713,7 @@ public function testParseTypeDefault()
713713
$this->expectException(Warning::class);
714714
}
715715

716-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
716+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
717717
$formatter->parse('1', NumberFormatter::TYPE_DEFAULT);
718718
}
719719

@@ -722,7 +722,7 @@ public function testParseTypeDefault()
722722
*/
723723
public function testParseTypeInt32($value, $expected, $message = '')
724724
{
725-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
725+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
726726
$parsedValue = $formatter->parse($value, NumberFormatter::TYPE_INT32);
727727
$this->assertSame($expected, $parsedValue, $message);
728728
}
@@ -744,7 +744,7 @@ public function testParseTypeInt64With32BitIntegerInPhp32Bit()
744744
{
745745
IntlTestHelper::require32Bit($this);
746746

747-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
747+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
748748

749749
$parsedValue = $formatter->parse('2,147,483,647', NumberFormatter::TYPE_INT64);
750750
$this->assertIsInt($parsedValue);
@@ -759,7 +759,7 @@ public function testParseTypeInt64With32BitIntegerInPhp64Bit()
759759
{
760760
IntlTestHelper::require64Bit($this);
761761

762-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
762+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
763763

764764
$parsedValue = $formatter->parse('2,147,483,647', NumberFormatter::TYPE_INT64);
765765
$this->assertIsInt($parsedValue);
@@ -777,7 +777,7 @@ public function testParseTypeInt64With64BitIntegerInPhp32Bit()
777777
{
778778
IntlTestHelper::require32Bit($this);
779779

780-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
780+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
781781

782782
// int 64 using only 32 bit range strangeness
783783
$parsedValue = $formatter->parse('2,147,483,648', NumberFormatter::TYPE_INT64);
@@ -796,7 +796,7 @@ public function testParseTypeInt64With64BitIntegerInPhp64Bit()
796796
{
797797
IntlTestHelper::require64Bit($this);
798798

799-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
799+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
800800

801801
$parsedValue = $formatter->parse('2,147,483,648', NumberFormatter::TYPE_INT64);
802802
$this->assertIsInt($parsedValue);
@@ -814,7 +814,7 @@ public function testParseTypeInt64With64BitIntegerInPhp64Bit()
814814
*/
815815
public function testParseTypeDouble($value, $expectedValue)
816816
{
817-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
817+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
818818
$parsedValue = $formatter->parse($value, NumberFormatter::TYPE_DOUBLE);
819819
$this->assertEqualsWithDelta($expectedValue, $parsedValue, 0.001);
820820
}
@@ -839,14 +839,14 @@ public function testParseTypeCurrency()
839839
$this->expectException(Warning::class);
840840
}
841841

842-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
842+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
843843
$formatter->parse('1', NumberFormatter::TYPE_CURRENCY);
844844
}
845845

846846
public function testParseWithNotNullPositionValue()
847847
{
848848
$position = 1;
849-
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
849+
$formatter = static::getNumberFormatter('en', NumberFormatter::DECIMAL);
850850
$formatter->parse('123', NumberFormatter::TYPE_DOUBLE, $position);
851851
$this->assertEquals(3, $position);
852852
}

0 commit comments

Comments
 (0)