Skip to content

Commit 4865acf

Browse files
alexandre-dauboisnicolas-grekas
authored andcommitted
[Tests] Migrate data providers to static ones
1 parent cfb7e99 commit 4865acf

File tree

5 files changed

+63
-63
lines changed

5 files changed

+63
-63
lines changed

Tests/DateFormatter/AbstractIntlDateFormatterTest.php

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function testFormat($pattern, $timestamp, $expected)
9191
$this->assertIsIntlSuccess($formatter, $errorMessage, $errorCode);
9292
}
9393

94-
public function formatProvider()
94+
public static function formatProvider()
9595
{
9696
$dateTime = new \DateTime('@0');
9797
$dateTimeImmutable = new \DateTimeImmutable('@0');
@@ -316,7 +316,7 @@ public function testFormatIllegalArgumentError($pattern, $timestamp, $errorMessa
316316
$this->assertIsIntlFailure($formatter, $errorMessage, $errorCode);
317317
}
318318

319-
public function formatErrorProvider()
319+
public static function formatErrorProvider()
320320
{
321321
return [
322322
['y-M-d', 'foobar', 'datefmt_format: string \'foobar\' is not numeric, which would be required for it to be a valid date: U_ILLEGAL_ARGUMENT_ERROR'],
@@ -333,7 +333,7 @@ public function testFormatWithTimezone($timestamp, $timezone, $expected)
333333
$this->assertSame($expected, $formatter->format($timestamp));
334334
}
335335

336-
public function formatWithTimezoneProvider()
336+
public static function formatWithTimezoneProvider()
337337
{
338338
$data = [
339339
[0, 'UTC', '1970-01-01 00:00:00'],
@@ -379,7 +379,7 @@ public function testFormatTimezone($pattern, $timezone, $expected)
379379
$this->assertEquals($expected, $formatter->format(0));
380380
}
381381

382-
public function formatTimezoneProvider()
382+
public static function formatTimezoneProvider()
383383
{
384384
return [
385385
['z', 'GMT', 'GMT'],
@@ -528,7 +528,7 @@ public function testDateAndTimeType($timestamp, $datetype, $timetype, $expected)
528528
$this->assertSame($expected, $formatter->format($timestamp));
529529
}
530530

531-
public function dateAndTimeTypeProvider()
531+
public static function dateAndTimeTypeProvider()
532532
{
533533
return [
534534
[0, IntlDateFormatter::FULL, IntlDateFormatter::NONE, 'Thursday, January 1, 1970'],
@@ -585,7 +585,7 @@ public function testParse($pattern, $value, $expected)
585585
$this->assertIsIntlSuccess($formatter, $errorMessage, $errorCode);
586586
}
587587

588-
public function parseProvider()
588+
public static function parseProvider()
589589
{
590590
return array_merge(
591591
static::parseYearProvider(),
@@ -610,15 +610,15 @@ public function parseProvider()
610610
);
611611
}
612612

613-
public function parseYearProvider()
613+
public static function parseYearProvider()
614614
{
615615
return [
616616
['y-M-d', '1970-1-1', 0],
617617
['yy-M-d', '70-1-1', 0],
618618
];
619619
}
620620

621-
public function parseQuarterProvider()
621+
public static function parseQuarterProvider()
622622
{
623623
return [
624624
['Q', '1', 0],
@@ -641,7 +641,7 @@ public function parseQuarterProvider()
641641
];
642642
}
643643

644-
public function parseMonthProvider()
644+
public static function parseMonthProvider()
645645
{
646646
return [
647647
['y-M-d', '1970-1-1', 0],
@@ -651,7 +651,7 @@ public function parseMonthProvider()
651651
];
652652
}
653653

654-
public function parseStandaloneMonthProvider()
654+
public static function parseStandaloneMonthProvider()
655655
{
656656
return [
657657
['y-L-d', '1970-1-1', 0],
@@ -660,7 +660,7 @@ public function parseStandaloneMonthProvider()
660660
];
661661
}
662662

663-
public function parseDayProvider()
663+
public static function parseDayProvider()
664664
{
665665
return [
666666
['y-M-d', '1970-1-1', 0],
@@ -670,7 +670,7 @@ public function parseDayProvider()
670670
];
671671
}
672672

673-
public function parseDayOfWeekProvider()
673+
public static function parseDayOfWeekProvider()
674674
{
675675
return [
676676
['E', 'Thu', 0],
@@ -682,15 +682,15 @@ public function parseDayOfWeekProvider()
682682
];
683683
}
684684

685-
public function parseDayOfYearProvider()
685+
public static function parseDayOfYearProvider()
686686
{
687687
return [
688688
['D', '1', 0],
689689
['D', '2', 86400],
690690
];
691691
}
692692

693-
public function parseHour12ClockOneBasedProvider()
693+
public static function parseHour12ClockOneBasedProvider()
694694
{
695695
return [
696696
// 12 hours (1-12)
@@ -715,7 +715,7 @@ public function parseHour12ClockOneBasedProvider()
715715
];
716716
}
717717

718-
public function parseHour12ClockZeroBasedProvider()
718+
public static function parseHour12ClockZeroBasedProvider()
719719
{
720720
return [
721721
// 12 hours (0-11)
@@ -740,7 +740,7 @@ public function parseHour12ClockZeroBasedProvider()
740740
];
741741
}
742742

743-
public function parseHour24ClockOneBasedProvider()
743+
public static function parseHour24ClockOneBasedProvider()
744744
{
745745
return [
746746
// 24 hours (1-24)
@@ -767,7 +767,7 @@ public function parseHour24ClockOneBasedProvider()
767767
];
768768
}
769769

770-
public function parseHour24ClockZeroBasedProvider()
770+
public static function parseHour24ClockZeroBasedProvider()
771771
{
772772
return [
773773
// 24 hours (0-23)
@@ -794,23 +794,23 @@ public function parseHour24ClockZeroBasedProvider()
794794
];
795795
}
796796

797-
public function parseMinuteProvider()
797+
public static function parseMinuteProvider()
798798
{
799799
return [
800800
['y-M-d HH:m', '1970-1-1 0:1', 60],
801801
['y-M-d HH:mm', '1970-1-1 0:10', 600],
802802
];
803803
}
804804

805-
public function parseSecondProvider()
805+
public static function parseSecondProvider()
806806
{
807807
return [
808808
['y-M-d HH:mm:s', '1970-1-1 00:01:1', 61],
809809
['y-M-d HH:mm:ss', '1970-1-1 00:01:10', 70],
810810
];
811811
}
812812

813-
public function parseTimezoneProvider()
813+
public static function parseTimezoneProvider()
814814
{
815815
if (80114 === \PHP_VERSION_ID || 80201 === \PHP_VERSION_ID) {
816816
return [['y-M-d HH:mm:ss', '1970-1-1 00:00:00', 0]];
@@ -830,7 +830,7 @@ public function parseTimezoneProvider()
830830
];
831831
}
832832

833-
public function parseAmPmProvider()
833+
public static function parseAmPmProvider()
834834
{
835835
return [
836836
// AM/PM (already covered by hours tests)
@@ -839,15 +839,15 @@ public function parseAmPmProvider()
839839
];
840840
}
841841

842-
public function parseStandaloneAmPmProvider()
842+
public static function parseStandaloneAmPmProvider()
843843
{
844844
return [
845845
['a', 'AM', 0],
846846
['a', 'PM', 43200],
847847
];
848848
}
849849

850-
public function parseRegexMetaCharsProvider()
850+
public static function parseRegexMetaCharsProvider()
851851
{
852852
return [
853853
// regexp meta chars in the pattern string
@@ -856,7 +856,7 @@ public function parseRegexMetaCharsProvider()
856856
];
857857
}
858858

859-
public function parseQuoteCharsProvider()
859+
public static function parseQuoteCharsProvider()
860860
{
861861
return [
862862
["'M'", 'M', 0],
@@ -867,7 +867,7 @@ public function parseQuoteCharsProvider()
867867
];
868868
}
869869

870-
public function parseDashSlashProvider()
870+
public static function parseDashSlashProvider()
871871
{
872872
return [
873873
['y-M-d', '1970/1/1', 0],
@@ -890,7 +890,7 @@ public function testParseError($pattern, $value)
890890
$this->assertIsIntlFailure($formatter, $errorMessage, $errorCode);
891891
}
892892

893-
public function parseErrorProvider()
893+
public static function parseErrorProvider()
894894
{
895895
return [
896896
// 1 char month
@@ -945,7 +945,7 @@ public function testSetTimeZoneId($timeZoneId, $expectedTimeZoneId)
945945
$this->assertEquals($expectedTimeZoneId, $formatter->getTimeZoneId());
946946
}
947947

948-
public function setTimeZoneIdProvider()
948+
public static function setTimeZoneIdProvider()
949949
{
950950
return [
951951
['UTC', 'UTC'],

Tests/DateFormatter/IntlDateFormatterTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -153,24 +153,24 @@ public function testFormatWithNonStandardTimezone()
153153
parent::testFormatWithNonStandardTimezone();
154154
}
155155

156-
public function parseStandaloneAmPmProvider()
156+
public static function parseStandaloneAmPmProvider()
157157
{
158-
return $this->notImplemented(parent::parseStandaloneAmPmProvider());
158+
return self::notImplemented(parent::parseStandaloneAmPmProvider());
159159
}
160160

161-
public function parseDayOfWeekProvider()
161+
public static function parseDayOfWeekProvider()
162162
{
163-
return $this->notImplemented(parent::parseDayOfWeekProvider());
163+
return self::notImplemented(parent::parseDayOfWeekProvider());
164164
}
165165

166-
public function parseDayOfYearProvider()
166+
public static function parseDayOfYearProvider()
167167
{
168-
return $this->notImplemented(parent::parseDayOfYearProvider());
168+
return self::notImplemented(parent::parseDayOfYearProvider());
169169
}
170170

171-
public function parseQuarterProvider()
171+
public static function parseQuarterProvider()
172172
{
173-
return $this->notImplemented(parent::parseQuarterProvider());
173+
return self::notImplemented(parent::parseQuarterProvider());
174174
}
175175

176176
public function testParseThreeDigitsYears()
@@ -221,7 +221,7 @@ protected function isIntlFailure($errorCode): bool
221221
* + 10 seconds) are added, then we have 86,400 seconds (24h * 60min * 60s)
222222
* + 10 seconds
223223
*/
224-
private function notImplemented(array $dataSets): array
224+
private static function notImplemented(array $dataSets): array
225225
{
226226
return array_map(function (array $row) {
227227
return [$row[0], $row[1], 0];

0 commit comments

Comments
 (0)