Skip to content

Commit

Permalink
[Tests] Migrate data providers to static ones
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexandre-daubois @nicolas-grekas
alexandre-daubois authored and nicolas-grekas committed Feb 6, 2023
1 parent cfb7e99 commit 4865acf
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 63 deletions.
54 changes: 27 additions & 27 deletions Tests/DateFormatter/AbstractIntlDateFormatterTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public function testFormat($pattern, $timestamp, $expected)
$this->assertIsIntlSuccess($formatter, $errorMessage, $errorCode);
}

public function formatProvider()
public static function formatProvider()
{
$dateTime = new \DateTime('@0');
$dateTimeImmutable = new \DateTimeImmutable('@0');
Expand Down Expand Up @@ -316,7 +316,7 @@ public function testFormatIllegalArgumentError($pattern, $timestamp, $errorMessa
$this->assertIsIntlFailure($formatter, $errorMessage, $errorCode);
}

public function formatErrorProvider()
public static function formatErrorProvider()
{
return [
['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'],
Expand All @@ -333,7 +333,7 @@ public function testFormatWithTimezone($timestamp, $timezone, $expected)
$this->assertSame($expected, $formatter->format($timestamp));
}

public function formatWithTimezoneProvider()
public static function formatWithTimezoneProvider()
{
$data = [
[0, 'UTC', '1970-01-01 00:00:00'],
Expand Down Expand Up @@ -379,7 +379,7 @@ public function testFormatTimezone($pattern, $timezone, $expected)
$this->assertEquals($expected, $formatter->format(0));
}

public function formatTimezoneProvider()
public static function formatTimezoneProvider()
{
return [
['z', 'GMT', 'GMT'],
Expand Down Expand Up @@ -528,7 +528,7 @@ public function testDateAndTimeType($timestamp, $datetype, $timetype, $expected)
$this->assertSame($expected, $formatter->format($timestamp));
}

public function dateAndTimeTypeProvider()
public static function dateAndTimeTypeProvider()
{
return [
[0, IntlDateFormatter::FULL, IntlDateFormatter::NONE, 'Thursday, January 1, 1970'],
Expand Down Expand Up @@ -585,7 +585,7 @@ public function testParse($pattern, $value, $expected)
$this->assertIsIntlSuccess($formatter, $errorMessage, $errorCode);
}

public function parseProvider()
public static function parseProvider()
{
return array_merge(
static::parseYearProvider(),
Expand All @@ -610,15 +610,15 @@ public function parseProvider()
);
}

public function parseYearProvider()
public static function parseYearProvider()
{
return [
['y-M-d', '1970-1-1', 0],
['yy-M-d', '70-1-1', 0],
];
}

public function parseQuarterProvider()
public static function parseQuarterProvider()
{
return [
['Q', '1', 0],
Expand All @@ -641,7 +641,7 @@ public function parseQuarterProvider()
];
}

public function parseMonthProvider()
public static function parseMonthProvider()
{
return [
['y-M-d', '1970-1-1', 0],
Expand All @@ -651,7 +651,7 @@ public function parseMonthProvider()
];
}

public function parseStandaloneMonthProvider()
public static function parseStandaloneMonthProvider()
{
return [
['y-L-d', '1970-1-1', 0],
Expand All @@ -660,7 +660,7 @@ public function parseStandaloneMonthProvider()
];
}

public function parseDayProvider()
public static function parseDayProvider()
{
return [
['y-M-d', '1970-1-1', 0],
Expand All @@ -670,7 +670,7 @@ public function parseDayProvider()
];
}

public function parseDayOfWeekProvider()
public static function parseDayOfWeekProvider()
{
return [
['E', 'Thu', 0],
Expand All @@ -682,15 +682,15 @@ public function parseDayOfWeekProvider()
];
}

public function parseDayOfYearProvider()
public static function parseDayOfYearProvider()
{
return [
['D', '1', 0],
['D', '2', 86400],
];
}

public function parseHour12ClockOneBasedProvider()
public static function parseHour12ClockOneBasedProvider()
{
return [
// 12 hours (1-12)
Expand All @@ -715,7 +715,7 @@ public function parseHour12ClockOneBasedProvider()
];
}

public function parseHour12ClockZeroBasedProvider()
public static function parseHour12ClockZeroBasedProvider()
{
return [
// 12 hours (0-11)
Expand All @@ -740,7 +740,7 @@ public function parseHour12ClockZeroBasedProvider()
];
}

public function parseHour24ClockOneBasedProvider()
public static function parseHour24ClockOneBasedProvider()
{
return [
// 24 hours (1-24)
Expand All @@ -767,7 +767,7 @@ public function parseHour24ClockOneBasedProvider()
];
}

public function parseHour24ClockZeroBasedProvider()
public static function parseHour24ClockZeroBasedProvider()
{
return [
// 24 hours (0-23)
Expand All @@ -794,23 +794,23 @@ public function parseHour24ClockZeroBasedProvider()
];
}

public function parseMinuteProvider()
public static function parseMinuteProvider()
{
return [
['y-M-d HH:m', '1970-1-1 0:1', 60],
['y-M-d HH:mm', '1970-1-1 0:10', 600],
];
}

public function parseSecondProvider()
public static function parseSecondProvider()
{
return [
['y-M-d HH:mm:s', '1970-1-1 00:01:1', 61],
['y-M-d HH:mm:ss', '1970-1-1 00:01:10', 70],
];
}

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

public function parseAmPmProvider()
public static function parseAmPmProvider()
{
return [
// AM/PM (already covered by hours tests)
Expand All @@ -839,15 +839,15 @@ public function parseAmPmProvider()
];
}

public function parseStandaloneAmPmProvider()
public static function parseStandaloneAmPmProvider()
{
return [
['a', 'AM', 0],
['a', 'PM', 43200],
];
}

public function parseRegexMetaCharsProvider()
public static function parseRegexMetaCharsProvider()
{
return [
// regexp meta chars in the pattern string
Expand All @@ -856,7 +856,7 @@ public function parseRegexMetaCharsProvider()
];
}

public function parseQuoteCharsProvider()
public static function parseQuoteCharsProvider()
{
return [
["'M'", 'M', 0],
Expand All @@ -867,7 +867,7 @@ public function parseQuoteCharsProvider()
];
}

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

public function parseErrorProvider()
public static function parseErrorProvider()
{
return [
// 1 char month
Expand Down Expand Up @@ -945,7 +945,7 @@ public function testSetTimeZoneId($timeZoneId, $expectedTimeZoneId)
$this->assertEquals($expectedTimeZoneId, $formatter->getTimeZoneId());
}

public function setTimeZoneIdProvider()
public static function setTimeZoneIdProvider()
{
return [
['UTC', 'UTC'],
Expand Down
18 changes: 9 additions & 9 deletions Tests/DateFormatter/IntlDateFormatterTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,24 +153,24 @@ public function testFormatWithNonStandardTimezone()
parent::testFormatWithNonStandardTimezone();
}

public function parseStandaloneAmPmProvider()
public static function parseStandaloneAmPmProvider()
{
return $this->notImplemented(parent::parseStandaloneAmPmProvider());
return self::notImplemented(parent::parseStandaloneAmPmProvider());
}

public function parseDayOfWeekProvider()
public static function parseDayOfWeekProvider()
{
return $this->notImplemented(parent::parseDayOfWeekProvider());
return self::notImplemented(parent::parseDayOfWeekProvider());
}

public function parseDayOfYearProvider()
public static function parseDayOfYearProvider()
{
return $this->notImplemented(parent::parseDayOfYearProvider());
return self::notImplemented(parent::parseDayOfYearProvider());
}

public function parseQuarterProvider()
public static function parseQuarterProvider()
{
return $this->notImplemented(parent::parseQuarterProvider());
return self::notImplemented(parent::parseQuarterProvider());
}

public function testParseThreeDigitsYears()
Expand Down Expand Up @@ -221,7 +221,7 @@ protected function isIntlFailure($errorCode): bool
* + 10 seconds) are added, then we have 86,400 seconds (24h * 60min * 60s)
* + 10 seconds
*/
private function notImplemented(array $dataSets): array
private static function notImplemented(array $dataSets): array
{
return array_map(function (array $row) {
return [$row[0], $row[1], 0];
Expand Down
Loading

0 comments on commit 4865acf

Please sign in to comment.