jenkins-bot has submitted this change and it was merged. Change subject: Unify names of time precision constants ......................................................................
Unify names of time precision constants This requires https://github.com/DataValues/Time/pull/42 and a new release of DataValues Time. Same patch in JavaScript: https://github.com/wmde/DataValuesJavascript/pull/68 Bug: T96685 Bug: T99911 Change-Id: I9489af3950c65620e007d739ca2e161e1a0a81e6 --- M lib/includes/formatters/HtmlTimeFormatter.php M lib/includes/formatters/MwTimeIsoFormatter.php M lib/includes/formatters/TimeDetailsFormatter.php M lib/includes/parsers/MWTimeIsoParser.php M lib/tests/phpunit/TimeFormatterParserRoundtripTest.php M lib/tests/phpunit/formatters/HtmlTimeFormatterTest.php M lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php M lib/tests/phpunit/formatters/TimeDetailsFormatterTest.php M lib/tests/phpunit/parsers/MwTimeIsoParserTest.php M lib/tests/phpunit/parsers/TimeParserFactoryTest.php M lib/tests/phpunit/parsers/YearTimeParserTest.php M repo/includes/ValidatorBuilders.php 12 files changed, 180 insertions(+), 181 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/includes/formatters/HtmlTimeFormatter.php b/lib/includes/formatters/HtmlTimeFormatter.php index 7c71882..5f5d52c 100644 --- a/lib/includes/formatters/HtmlTimeFormatter.php +++ b/lib/includes/formatters/HtmlTimeFormatter.php @@ -5,7 +5,6 @@ use DataValues\TimeValue; use InvalidArgumentException; use ValueFormatters\FormatterOptions; -use ValueFormatters\TimeFormatter; use ValueFormatters\ValueFormatter; use ValueFormatters\ValueFormatterBase; @@ -20,8 +19,8 @@ class HtmlTimeFormatter extends ValueFormatterBase { private static $calendarKeys = array( - TimeFormatter::CALENDAR_GREGORIAN => 'valueview-expert-timevalue-calendar-gregorian', - TimeFormatter::CALENDAR_JULIAN => 'valueview-expert-timevalue-calendar-julian', + TimeValue::CALENDAR_GREGORIAN => 'valueview-expert-timevalue-calendar-gregorian', + TimeValue::CALENDAR_JULIAN => 'valueview-expert-timevalue-calendar-julian', ); /** @@ -116,7 +115,7 @@ private function getDefaultCalendar( $year ) { // The Gregorian calendar was introduced in October 1582, // so we'll default to Julian for all years before 1583. - return $year <= 1582 ? TimeFormatter::CALENDAR_JULIAN : TimeFormatter::CALENDAR_GREGORIAN; + return $year <= 1582 ? TimeValue::CALENDAR_JULIAN : TimeValue::CALENDAR_GREGORIAN; } /** diff --git a/lib/includes/formatters/MwTimeIsoFormatter.php b/lib/includes/formatters/MwTimeIsoFormatter.php index d8f4390..a18c5ff 100644 --- a/lib/includes/formatters/MwTimeIsoFormatter.php +++ b/lib/includes/formatters/MwTimeIsoFormatter.php @@ -220,45 +220,45 @@ $func = 'round'; switch ( $precision ) { - case TimeValue::PRECISION_Ga: + case TimeValue::PRECISION_YEAR1G: $msg = 'Gannum'; $shift = 1e+9; break; - case TimeValue::PRECISION_100Ma: + case TimeValue::PRECISION_YEAR100M: $msg = 'Mannum'; $shift = 1e+8; $unshift = 1e+2; break; - case TimeValue::PRECISION_10Ma: + case TimeValue::PRECISION_YEAR10M: $msg = 'Mannum'; $shift = 1e+7; $unshift = 1e+1; break; - case TimeValue::PRECISION_Ma: + case TimeValue::PRECISION_YEAR1M: $msg = 'Mannum'; $shift = 1e+6; break; - case TimeValue::PRECISION_100ka: + case TimeValue::PRECISION_YEAR100K: $msg = 'annum'; $shift = 1e+5; $unshift = 1e+5; break; - case TimeValue::PRECISION_10ka: + case TimeValue::PRECISION_YEAR10K: $msg = 'annum'; $shift = 1e+4; $unshift = 1e+4; break; - case TimeValue::PRECISION_ka: + case TimeValue::PRECISION_YEAR1K: $msg = 'millennium'; $func = 'ceil'; $shift = 1e+3; break; - case TimeValue::PRECISION_100a: + case TimeValue::PRECISION_YEAR100: $msg = 'century'; $func = 'ceil'; $shift = 1e+2; break; - case TimeValue::PRECISION_10a: + case TimeValue::PRECISION_YEAR10: $msg = '10annum'; $func = 'floor'; $shift = 1e+1; diff --git a/lib/includes/formatters/TimeDetailsFormatter.php b/lib/includes/formatters/TimeDetailsFormatter.php index d2d2570..6aba78d 100644 --- a/lib/includes/formatters/TimeDetailsFormatter.php +++ b/lib/includes/formatters/TimeDetailsFormatter.php @@ -6,7 +6,6 @@ use Html; use InvalidArgumentException; use ValueFormatters\FormatterOptions; -use ValueFormatters\TimeFormatter; use ValueFormatters\ValueFormatter; use ValueFormatters\ValueFormatterBase; @@ -140,10 +139,10 @@ */ private function getCalendarModelHtml( $calendarModel ) { switch ( $calendarModel ) { - case TimeFormatter::CALENDAR_GREGORIAN: + case TimeValue::CALENDAR_GREGORIAN: $key = 'valueview-expert-timevalue-calendar-gregorian'; break; - case TimeFormatter::CALENDAR_JULIAN: + case TimeValue::CALENDAR_JULIAN: $key = 'valueview-expert-timevalue-calendar-julian'; break; default: @@ -181,7 +180,7 @@ } if ( $precision < TimeValue::PRECISION_YEAR ) { - // PRECISION_10a becomes 10 years, PRECISION_100a becomes 100 years, and so on. + // PRECISION_YEAR10 becomes 10 years, PRECISION_YEAR100 becomes 100 years, and so on. $precisionInYears = pow( 10, TimeValue::PRECISION_YEAR - $precision ); $amount *= $precisionInYears; } elseif ( $precision > TimeValue::PRECISION_SECOND ) { diff --git a/lib/includes/parsers/MWTimeIsoParser.php b/lib/includes/parsers/MWTimeIsoParser.php index ca0ac32..7f57bde 100644 --- a/lib/includes/parsers/MWTimeIsoParser.php +++ b/lib/includes/parsers/MWTimeIsoParser.php @@ -33,23 +33,23 @@ * parsed with the given message keys */ private static $precisionMsgKeys = array( - TimeValue::PRECISION_Ga => array( + TimeValue::PRECISION_YEAR1G => array( 'wikibase-time-precision-Gannum', 'wikibase-time-precision-BCE-Gannum', ), - TimeValue::PRECISION_Ma => array( + TimeValue::PRECISION_YEAR1M => array( 'wikibase-time-precision-Mannum', 'wikibase-time-precision-BCE-Mannum', ), - TimeValue::PRECISION_ka => array( + TimeValue::PRECISION_YEAR1K => array( 'wikibase-time-precision-millennium', 'wikibase-time-precision-BCE-millennium', ), - TimeValue::PRECISION_100a => array( + TimeValue::PRECISION_YEAR100 => array( 'wikibase-time-precision-century', 'wikibase-time-precision-BCE-century', ), - TimeValue::PRECISION_10a => array( + TimeValue::PRECISION_YEAR10 => array( 'wikibase-time-precision-annum', 'wikibase-time-precision-BCE-annum', 'wikibase-time-precision-10annum', @@ -58,11 +58,11 @@ ); private static $paddedZeros = array( - TimeValue::PRECISION_Ga => 9, - TimeValue::PRECISION_Ma => 6, - TimeValue::PRECISION_ka => 3, - TimeValue::PRECISION_100a => 2, - TimeValue::PRECISION_10a => 0 + TimeValue::PRECISION_YEAR1G => 9, + TimeValue::PRECISION_YEAR1M => 6, + TimeValue::PRECISION_YEAR1K => 3, + TimeValue::PRECISION_YEAR100 => 2, + TimeValue::PRECISION_YEAR10 => 0 ); /** diff --git a/lib/tests/phpunit/TimeFormatterParserRoundtripTest.php b/lib/tests/phpunit/TimeFormatterParserRoundtripTest.php index 25f6ef4..09bec19 100644 --- a/lib/tests/phpunit/TimeFormatterParserRoundtripTest.php +++ b/lib/tests/phpunit/TimeFormatterParserRoundtripTest.php @@ -3,7 +3,6 @@ namespace Wikibase\Lib\Test; use DataValues\TimeValue; -use ValueFormatters\TimeFormatter; use Wikibase\Lib\MwTimeIsoFormatter; use Wikibase\Lib\Parsers\TimeParserFactory; @@ -22,24 +21,25 @@ array( '+0000001987654321-12-31T00:00:00Z', TimeValue::PRECISION_DAY ), array( '+0000001987654321-12-00T00:00:00Z', TimeValue::PRECISION_MONTH ), array( '+0000001987654321-00-00T00:00:00Z', TimeValue::PRECISION_YEAR ), - array( '+0000001987654320-00-00T00:00:00Z', TimeValue::PRECISION_10a ), - array( '+0000001987654300-00-00T00:00:00Z', TimeValue::PRECISION_100a ), - array( '+0000001987654000-00-00T00:00:00Z', TimeValue::PRECISION_ka ), - array( '+0000001987650000-00-00T00:00:00Z', TimeValue::PRECISION_10ka ), - array( '+0000001987600000-00-00T00:00:00Z', TimeValue::PRECISION_100ka ), - array( '+0000001987000000-00-00T00:00:00Z', TimeValue::PRECISION_Ma ), - array( '+0000001980000000-00-00T00:00:00Z', TimeValue::PRECISION_10Ma ), - array( '+0000001900000000-00-00T00:00:00Z', TimeValue::PRECISION_100Ma ), - array( '+0000001000000000-00-00T00:00:00Z', TimeValue::PRECISION_Ga ), + array( '+0000001987654320-00-00T00:00:00Z', TimeValue::PRECISION_YEAR10 ), + array( '+0000001987654300-00-00T00:00:00Z', TimeValue::PRECISION_YEAR100 ), + array( '+0000001987654000-00-00T00:00:00Z', TimeValue::PRECISION_YEAR1K ), + array( '+0000001987650000-00-00T00:00:00Z', TimeValue::PRECISION_YEAR10K ), + array( '+0000001987600000-00-00T00:00:00Z', TimeValue::PRECISION_YEAR100K ), + array( '+0000001987000000-00-00T00:00:00Z', TimeValue::PRECISION_YEAR1M ), + array( '+0000001980000000-00-00T00:00:00Z', TimeValue::PRECISION_YEAR10M ), + array( '+0000001900000000-00-00T00:00:00Z', TimeValue::PRECISION_YEAR100M ), + array( '+0000001000000000-00-00T00:00:00Z', TimeValue::PRECISION_YEAR1G ), ); } public function timeValueProvider() { + $gregorian = 'http://www.wikidata.org/entity/Q1985727'; $cases = array(); foreach ( $this->isoTimestampProvider() as $case ) { $cases[] = array( - new TimeValue( $case[0], 0, 0, 0, $case[1], TimeFormatter::CALENDAR_GREGORIAN ) + new TimeValue( $case[0], 0, 0, 0, $case[1], $gregorian ) ); } diff --git a/lib/tests/phpunit/formatters/HtmlTimeFormatterTest.php b/lib/tests/phpunit/formatters/HtmlTimeFormatterTest.php index 9799521..f92f2bc 100644 --- a/lib/tests/phpunit/formatters/HtmlTimeFormatterTest.php +++ b/lib/tests/phpunit/formatters/HtmlTimeFormatterTest.php @@ -178,7 +178,7 @@ '14th century' => array( '+1300-00-00T00:00:00Z', - TimeValue::PRECISION_100a, + TimeValue::PRECISION_YEAR100, $julian, '/^MOCKDATE$/' ), diff --git a/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php b/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php index 49abd09..8c58ab8 100644 --- a/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php +++ b/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php @@ -5,7 +5,6 @@ use DataValues\TimeValue; use MediaWikiTestCase; use ValueFormatters\FormatterOptions; -use ValueFormatters\TimeFormatter; use ValueFormatters\ValueFormatter; use ValueParsers\IsoTimestampParser; use ValueParsers\ParserOptions; @@ -34,6 +33,8 @@ * @return array */ public function formatProvider() { + $gregorian = 'http://www.wikidata.org/entity/Q1985727'; + $tests = array( // Positive dates array( @@ -79,133 +80,133 @@ // Rounding for decades is different from rounding for centuries array( - '+1982-01-01T01:01:01Z', TimeValue::PRECISION_10a, + '+1982-01-01T01:01:01Z', TimeValue::PRECISION_YEAR10, '1980s', ), array( - '+1988-01-01T01:01:01Z', TimeValue::PRECISION_10a, + '+1988-01-01T01:01:01Z', TimeValue::PRECISION_YEAR10, '1980s', ), array( - '-1982-01-01T01:01:01Z', TimeValue::PRECISION_10a, + '-1982-01-01T01:01:01Z', TimeValue::PRECISION_YEAR10, '1980s BCE', ), array( - '-1988-01-01T01:01:01Z', TimeValue::PRECISION_10a, + '-1988-01-01T01:01:01Z', TimeValue::PRECISION_YEAR10, '1980s BCE', ), array( - '+1822-01-01T01:01:01Z', TimeValue::PRECISION_100a, + '+1822-01-01T01:01:01Z', TimeValue::PRECISION_YEAR100, '19. century', ), array( - '+1822-01-01T01:01:01Z', TimeValue::PRECISION_100a, + '+1822-01-01T01:01:01Z', TimeValue::PRECISION_YEAR100, '19. century', ), array( - '-1888-01-01T01:01:01Z', TimeValue::PRECISION_100a, + '-1888-01-01T01:01:01Z', TimeValue::PRECISION_YEAR100, '19. century BCE', ), array( - '-1888-01-01T01:01:01Z', TimeValue::PRECISION_100a, + '-1888-01-01T01:01:01Z', TimeValue::PRECISION_YEAR100, '19. century BCE', ), array( - '+1222-01-01T01:01:01Z', TimeValue::PRECISION_ka, + '+1222-01-01T01:01:01Z', TimeValue::PRECISION_YEAR1K, '2. millennium', ), array( - '+1888-01-01T01:01:01Z', TimeValue::PRECISION_ka, + '+1888-01-01T01:01:01Z', TimeValue::PRECISION_YEAR1K, '2. millennium', ), array( - '-1222-01-01T01:01:01Z', TimeValue::PRECISION_ka, + '-1222-01-01T01:01:01Z', TimeValue::PRECISION_YEAR1K, '2. millennium BCE', ), // So what about the "Millenium Disagreement"? array( - '+1600-01-01T01:01:01Z', TimeValue::PRECISION_100a, + '+1600-01-01T01:01:01Z', TimeValue::PRECISION_YEAR100, '16. century', ), array( - '+2000-01-01T01:01:01Z', TimeValue::PRECISION_ka, + '+2000-01-01T01:01:01Z', TimeValue::PRECISION_YEAR1K, '2. millennium', ), // Positive dates, stepping through precisions array( - '+12345678912-01-01T01:01:01Z', TimeValue::PRECISION_10a, + '+12345678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR10, '12345678910s', ), array( - '+12345678919-01-01T01:01:01Z', TimeValue::PRECISION_10a, + '+12345678919-01-01T01:01:01Z', TimeValue::PRECISION_YEAR10, '12345678910s', ), array( - '+12345678912-01-01T01:01:01Z', TimeValue::PRECISION_100a, + '+12345678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR100, '123456790. century', ), array( - '+12345678992-01-01T01:01:01Z', TimeValue::PRECISION_100a, + '+12345678992-01-01T01:01:01Z', TimeValue::PRECISION_YEAR100, '123456790. century', ), array( - '+12345678112-01-01T01:01:01Z', TimeValue::PRECISION_ka, + '+12345678112-01-01T01:01:01Z', TimeValue::PRECISION_YEAR1K, '12345679. millennium', ), array( - '+12345678912-01-01T01:01:01Z', TimeValue::PRECISION_ka, + '+12345678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR1K, '12345679. millennium', ), array( - '+12345671912-01-01T01:01:01Z', TimeValue::PRECISION_10ka, + '+12345671912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR10K, '12345670000 years CE', ), array( - '+12345678912-01-01T01:01:01Z', TimeValue::PRECISION_10ka, + '+12345678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR10K, '12345680000 years CE', ), array( - '+12345618912-01-01T01:01:01Z', TimeValue::PRECISION_100ka, + '+12345618912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR100K, '12345600000 years CE', ), array( - '+12345678912-01-01T01:01:01Z', TimeValue::PRECISION_100ka, + '+12345678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR100K, '12345700000 years CE', ), array( - '+12345178912-01-01T01:01:01Z', TimeValue::PRECISION_Ma, + '+12345178912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR1M, '12345 million years CE', ), array( - '+12345678912-01-01T01:01:01Z', TimeValue::PRECISION_Ma, + '+12345678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR1M, '12346 million years CE', ), array( - '+12341678912-01-01T01:01:01Z', TimeValue::PRECISION_10Ma, + '+12341678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR10M, '12340 million years CE', ), array( - '+12345678912-01-01T01:01:01Z', TimeValue::PRECISION_10Ma, + '+12345678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR10M, '12350 million years CE', ), array( - '+12345678912-01-01T01:01:01Z', TimeValue::PRECISION_100Ma, + '+12345678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR100M, '12300 million years CE', ), array( - '+12375678912-01-01T01:01:01Z', TimeValue::PRECISION_100Ma, + '+12375678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR100M, '12400 million years CE', ), array( - '+12345678912-01-01T01:01:01Z', TimeValue::PRECISION_Ga, + '+12345678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR1G, '12 billion years CE', ), array( - '+12545678912-01-01T01:01:01Z', TimeValue::PRECISION_Ga, + '+12545678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR1G, '13 billion years CE', ), @@ -253,75 +254,75 @@ // Negative dates, stepping through precisions array( - '-12345678912-01-01T01:01:01Z', TimeValue::PRECISION_10a, + '-12345678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR10, '12345678910s BCE', ), array( - '-12345678919-01-01T01:01:01Z', TimeValue::PRECISION_10a, + '-12345678919-01-01T01:01:01Z', TimeValue::PRECISION_YEAR10, '12345678910s BCE', ), array( - '-12345678912-01-01T01:01:01Z', TimeValue::PRECISION_100a, + '-12345678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR100, '123456790. century BCE', ), array( - '-12345678992-01-01T01:01:01Z', TimeValue::PRECISION_100a, + '-12345678992-01-01T01:01:01Z', TimeValue::PRECISION_YEAR100, '123456790. century BCE', ), array( - '-12345678112-01-01T01:01:01Z', TimeValue::PRECISION_ka, + '-12345678112-01-01T01:01:01Z', TimeValue::PRECISION_YEAR1K, '12345679. millennium BCE', ), array( - '-12345678912-01-01T01:01:01Z', TimeValue::PRECISION_ka, + '-12345678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR1K, '12345679. millennium BCE', ), array( - '-12345671912-01-01T01:01:01Z', TimeValue::PRECISION_10ka, + '-12345671912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR10K, '12345670000 years BCE', ), array( - '-12345678912-01-01T01:01:01Z', TimeValue::PRECISION_10ka, + '-12345678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR10K, '12345680000 years BCE', ), array( - '-12345618912-01-01T01:01:01Z', TimeValue::PRECISION_100ka, + '-12345618912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR100K, '12345600000 years BCE', ), array( - '-12345678912-01-01T01:01:01Z', TimeValue::PRECISION_100ka, + '-12345678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR100K, '12345700000 years BCE', ), array( - '-12345178912-01-01T01:01:01Z', TimeValue::PRECISION_Ma, + '-12345178912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR1M, '12345 million years BCE', ), array( - '-12345678912-01-01T01:01:01Z', TimeValue::PRECISION_Ma, + '-12345678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR1M, '12346 million years BCE', ), array( - '-12341678912-01-01T01:01:01Z', TimeValue::PRECISION_10Ma, + '-12341678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR10M, '12340 million years BCE', ), array( - '-12345678912-01-01T01:01:01Z', TimeValue::PRECISION_10Ma, + '-12345678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR10M, '12350 million years BCE', ), array( - '-12345678912-01-01T01:01:01Z', TimeValue::PRECISION_100Ma, + '-12345678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR100M, '12300 million years BCE', ), array( - '-12375678912-01-01T01:01:01Z', TimeValue::PRECISION_100Ma, + '-12375678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR100M, '12400 million years BCE', ), array( - '-12345678912-01-01T01:01:01Z', TimeValue::PRECISION_Ga, + '-12345678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR1G, '12 billion years BCE', ), array( - '-12545678912-01-01T01:01:01Z', TimeValue::PRECISION_Ga, + '-12545678912-01-01T01:01:01Z', TimeValue::PRECISION_YEAR1G, '13 billion years BCE', ), @@ -378,15 +379,15 @@ // centuries and millenia start with 1, so we can format "low" years just fine array( - '+100-00-00T00:00:06Z', TimeValue::PRECISION_ka, + '+100-00-00T00:00:06Z', TimeValue::PRECISION_YEAR1K, '1. millennium' ), array( - '-100-00-00T00:00:06Z', TimeValue::PRECISION_ka, + '-100-00-00T00:00:06Z', TimeValue::PRECISION_YEAR1K, '1. millennium BCE' ), array( - '+10-00-00T00:00:07Z', TimeValue::PRECISION_100a, + '+10-00-00T00:00:07Z', TimeValue::PRECISION_YEAR100, '1. century' ), @@ -402,77 +403,77 @@ // Precision to low, falling back to year array( - '-1-00-00T00:00:00Z', TimeValue::PRECISION_Ga, + '-1-00-00T00:00:00Z', TimeValue::PRECISION_YEAR1G, '1 BCE', ), array( - '-1-00-00T00:00:00Z', TimeValue::PRECISION_100Ma, + '-1-00-00T00:00:00Z', TimeValue::PRECISION_YEAR100M, '1 BCE', ), array( - '-1-00-00T00:00:00Z', TimeValue::PRECISION_10Ma, + '-1-00-00T00:00:00Z', TimeValue::PRECISION_YEAR10M, '1 BCE', ), array( - '-1-00-00T00:00:00Z', TimeValue::PRECISION_Ma, + '-1-00-00T00:00:00Z', TimeValue::PRECISION_YEAR1M, '1 BCE', ), array( - '-1-00-00T00:00:00Z', TimeValue::PRECISION_100ka, + '-1-00-00T00:00:00Z', TimeValue::PRECISION_YEAR100K, '1 BCE', ), array( - '-1-00-00T00:00:00Z', TimeValue::PRECISION_10ka, + '-1-00-00T00:00:00Z', TimeValue::PRECISION_YEAR10K, '1 BCE', ), array( - '-1-00-00T00:00:00Z', TimeValue::PRECISION_ka, + '-1-00-00T00:00:00Z', TimeValue::PRECISION_YEAR1K, '1. millennium BCE', ), array( - '-1-00-00T00:00:00Z', TimeValue::PRECISION_100a, + '-1-00-00T00:00:00Z', TimeValue::PRECISION_YEAR100, '1. century BCE', ), array( - '-1-00-00T00:00:00Z', TimeValue::PRECISION_10a, + '-1-00-00T00:00:00Z', TimeValue::PRECISION_YEAR10, '1 BCE', ), // Better than the raw ISO string array( - '-00000000000-01-01T01:01:01Z', TimeValue::PRECISION_Ga, + '-00000000000-01-01T01:01:01Z', TimeValue::PRECISION_YEAR1G, '0', ), array( - '-0-01-01T01:01:01Z', TimeValue::PRECISION_Ga, + '-0-01-01T01:01:01Z', TimeValue::PRECISION_YEAR1G, '0', ), array( - '+100000000-00-00T00:00:00Z', TimeValue::PRECISION_Ga, + '+100000000-00-00T00:00:00Z', TimeValue::PRECISION_YEAR1G, '100000000', ), array( - '+10000000-00-00T00:00:01Z', TimeValue::PRECISION_100Ma, + '+10000000-00-00T00:00:01Z', TimeValue::PRECISION_YEAR100M, '10000000', ), array( - '+1000000-00-00T00:00:02Z', TimeValue::PRECISION_10Ma, + '+1000000-00-00T00:00:02Z', TimeValue::PRECISION_YEAR10M, '1000000', ), array( - '+100000-00-00T00:00:03Z', TimeValue::PRECISION_Ma, + '+100000-00-00T00:00:03Z', TimeValue::PRECISION_YEAR1M, '100000', ), array( - '+10000-00-00T00:00:04Z', TimeValue::PRECISION_100ka, + '+10000-00-00T00:00:04Z', TimeValue::PRECISION_YEAR100K, '10000', ), array( - '+1000-00-00T00:00:05Z', TimeValue::PRECISION_10ka, + '+1000-00-00T00:00:05Z', TimeValue::PRECISION_YEAR10K, '1000', ), array( - '+1-00-00T00:00:08Z', TimeValue::PRECISION_10a, + '+1-00-00T00:00:08Z', TimeValue::PRECISION_YEAR10, '1', ), array( @@ -496,7 +497,7 @@ $args[0], 0, 0, 0, $args[1], - TimeFormatter::CALENDAR_GREGORIAN + $gregorian ); $argLists[] = array( isset( $args[2] ) ? $args[2] : $args[0], @@ -522,7 +523,7 @@ '+0000000000003333-01-01T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR, - TimeFormatter::CALENDAR_GREGORIAN + $gregorian ), false, $languageCode diff --git a/lib/tests/phpunit/formatters/TimeDetailsFormatterTest.php b/lib/tests/phpunit/formatters/TimeDetailsFormatterTest.php index 52bea62..1e8ebc2 100644 --- a/lib/tests/phpunit/formatters/TimeDetailsFormatterTest.php +++ b/lib/tests/phpunit/formatters/TimeDetailsFormatterTest.php @@ -5,7 +5,6 @@ use DataValues\NumberValue; use DataValues\TimeValue; use ValueFormatters\FormatterOptions; -use ValueFormatters\TimeFormatter; use ValueFormatters\ValueFormatter; use Wikibase\Lib\TimeDetailsFormatter; @@ -101,7 +100,8 @@ } public function quantityFormatProvider() { - $gregorian = TimeFormatter::CALENDAR_GREGORIAN; + $gregorian = 'http://www.wikidata.org/entity/Q1985727'; + $julian = 'http://www.wikidata.org/entity/Q1985786'; $day = TimeValue::PRECISION_DAY; return array( @@ -136,7 +136,7 @@ '@.*<td[^<>]*isotime">\+99999-01-01T00:00:00</td>.*@s' ), 'Julian' => array( - new TimeValue( '+2001-01-01T00:00:00Z', 0, 0, 0, $day, TimeFormatter::CALENDAR_JULIAN ), + new TimeValue( '+2001-01-01T00:00:00Z', 0, 0, 0, $day, $julian ), '@.*<td[^<>]*calendar">\(valueview-expert-timevalue-calendar-julian\)</td>.*@s' ), 'Non-standard calendar model' => array( @@ -152,11 +152,11 @@ '@.*<td[^<>]*precision">\(seconds: 1\)</td>.*@s' ), '10 years precision' => array( - new TimeValue( '+2001-01-01T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_10a, $gregorian ), + new TimeValue( '+2001-01-01T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR10, $gregorian ), '@.*<td[^<>]*precision">\(years: 10\)</td>.*@s' ), 'Max. precision' => array( - new TimeValue( '+2001-01-01T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_Ga, $gregorian ), + new TimeValue( '+2001-01-01T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1G, $gregorian ), '@.*<td[^<>]*precision">\(years: 1000000000\)</td>.*@s' ), 'Before' => array( @@ -164,7 +164,7 @@ '@.*<td[^<>]*before">\(years: 2\)</td>.*@s' ), 'After in years' => array( - new TimeValue( '+2001-01-01T00:00:00Z', 0, 0, 5, TimeValue::PRECISION_10a, $gregorian ), + new TimeValue( '+2001-01-01T00:00:00Z', 0, 0, 5, TimeValue::PRECISION_YEAR10, $gregorian ), '@.*<td[^<>]*after">\(years: 50\)</td>.*@s' ), 'After in days' => array( diff --git a/lib/tests/phpunit/parsers/MwTimeIsoParserTest.php b/lib/tests/phpunit/parsers/MwTimeIsoParserTest.php index cddb6da..2f9d82c 100644 --- a/lib/tests/phpunit/parsers/MwTimeIsoParserTest.php +++ b/lib/tests/phpunit/parsers/MwTimeIsoParserTest.php @@ -47,112 +47,112 @@ $valid = array( // + dates '13 billion years CE' => - array( '+13000000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_Ga, $gregorian ), + array( '+13000000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1G, $gregorian ), '130 billion years CE' => - array( '+130000000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_Ga, $gregorian ), + array( '+130000000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1G, $gregorian ), '13000 billion years CE' => - array( '+13000000000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_Ga, $gregorian ), + array( '+13000000000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1G, $gregorian ), '13,000 billion years CE' => - array( '+13000000000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_Ga, $gregorian ), + array( '+13000000000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1G, $gregorian ), '13,000 million years CE' => - array( '+13000000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_Ga, $gregorian ), + array( '+13000000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1G, $gregorian ), '13,800 million years CE' => - array( '+13800000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_100Ma, $gregorian ), + array( '+13800000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR100M, $gregorian ), '100 million years CE' => - array( '+100000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_100Ma, $gregorian ), + array( '+100000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR100M, $gregorian ), '70 million years CE' => - array( '+70000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_10Ma, $gregorian ), + array( '+70000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR10M, $gregorian ), '77 million years CE' => - array( '+77000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_Ma, $gregorian ), + array( '+77000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1M, $gregorian ), '13 million years CE' => - array( '+13000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_Ma, $gregorian ), + array( '+13000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1M, $gregorian ), '1 million years CE' => - array( '+1000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_Ma, $gregorian ), + array( '+1000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1M, $gregorian ), '100000 years CE' => - array( '+100000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_100ka, $gregorian ), + array( '+100000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR100K, $gregorian ), '100,000 years CE' => - array( '+100000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_100ka, $gregorian ), + array( '+100000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR100K, $gregorian ), '10000 years CE' => - array( '+10000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_10ka, $gregorian ), + array( '+10000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR10K, $gregorian ), '99000 years CE' => - array( '+99000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_ka, $gregorian ), + array( '+99000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1K, $gregorian ), '99,000 years CE' => - array( '+99000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_ka, $gregorian ), + array( '+99000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1K, $gregorian ), '5. millennium' => - array( '+5000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_ka, $gregorian ), + array( '+5000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1K, $gregorian ), '55. millennium' => - array( '+55000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_ka, $gregorian ), + array( '+55000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1K, $gregorian ), '10. century' => - array( '+1000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_100a, $julian ), + array( '+1000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR100, $julian ), '12. century' => - array( '+1200-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_100a, $julian ), + array( '+1200-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR100, $julian ), '1980s' => - array( '+1980-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_10a, $gregorian ), + array( '+1980-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR10, $gregorian ), '2000s' => - array( '+2000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_10a, $gregorian ), + array( '+2000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR10, $gregorian ), '10s' => - array( '+0010-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_10a, $julian ), + array( '+0010-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR10, $julian ), '12s' => - array( '+0012-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_10a, $julian ), + array( '+0012-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR10, $julian ), // - dates '13 billion years BCE' => - array( '-13000000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_Ga, $julian ), + array( '-13000000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1G, $julian ), '130 billion years BCE' => - array( '-130000000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_Ga, $julian ), + array( '-130000000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1G, $julian ), '13000 billion years BCE' => - array( '-13000000000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_Ga, $julian ), + array( '-13000000000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1G, $julian ), '13,000 billion years BCE' => - array( '-13000000000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_Ga, $julian ), + array( '-13000000000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1G, $julian ), '13,000 million years BCE' => - array( '-13000000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_Ga, $julian ), + array( '-13000000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1G, $julian ), '13,800 million years BCE' => - array( '-13800000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_100Ma, $julian ), + array( '-13800000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR100M, $julian ), '100 million years BCE' => - array( '-100000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_100Ma, $julian ), + array( '-100000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR100M, $julian ), '70 million years BCE' => - array( '-70000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_10Ma, $julian ), + array( '-70000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR10M, $julian ), '77 million years BCE' => - array( '-77000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_Ma, $julian ), + array( '-77000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1M, $julian ), '13 million years BCE' => - array( '-13000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_Ma, $julian ), + array( '-13000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1M, $julian ), '1 million years BCE' => - array( '-1000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_Ma, $julian ), + array( '-1000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1M, $julian ), '100000 years BCE' => - array( '-100000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_100ka, $julian ), + array( '-100000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR100K, $julian ), '100,000 years BCE' => - array( '-100000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_100ka, $julian ), + array( '-100000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR100K, $julian ), '10000 years BCE' => - array( '-10000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_10ka, $julian ), + array( '-10000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR10K, $julian ), '99000 years BCE' => - array( '-99000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_ka, $julian ), + array( '-99000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1K, $julian ), '99,000 years BCE' => - array( '-99000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_ka, $julian ), + array( '-99000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1K, $julian ), '5. millennium BCE' => - array( '-5000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_ka, $julian ), + array( '-5000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1K, $julian ), '55. millennium BCE' => - array( '-55000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_ka, $julian ), + array( '-55000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1K, $julian ), '10. century BCE' => - array( '-1000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_100a, $julian ), + array( '-1000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR100, $julian ), '12. century BCE' => - array( '-1200-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_100a, $julian ), + array( '-1200-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR100, $julian ), '10s BCE' => - array( '-0010-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_10a, $julian ), + array( '-0010-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR10, $julian ), '12s BCE' => - array( '-0012-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_10a, $julian ), + array( '-0012-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR10, $julian ), // also parse BC '5. millennium BC' => - array( '-5000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_ka, $julian ), + array( '-5000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1K, $julian ), '55. millennium BC' => - array( '-55000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_ka, $julian ), + array( '-55000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1K, $julian ), '10. century BC' => - array( '-1000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_100a, $julian ), + array( '-1000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR100, $julian ), '12. century BC' => - array( '-1200-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_100a, $julian ), + array( '-1200-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR100, $julian ), '10s BC' => - array( '-0010-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_10a, $julian ), + array( '-0010-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR10, $julian ), '12s BC' => - array( '-0012-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_10a, $julian ), + array( '-0012-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR10, $julian ), ); foreach ( $valid as $value => $expected ) { diff --git a/lib/tests/phpunit/parsers/TimeParserFactoryTest.php b/lib/tests/phpunit/parsers/TimeParserFactoryTest.php index a94379d..3e7e4e3 100644 --- a/lib/tests/phpunit/parsers/TimeParserFactoryTest.php +++ b/lib/tests/phpunit/parsers/TimeParserFactoryTest.php @@ -69,7 +69,7 @@ '1 1999 BC' => array( '-11999-00-00T00:00:00Z', TimeValue::PRECISION_YEAR, $julian ), '1,000,000 BC' => - array( '-1000000-00-00T00:00:00Z', TimeValue::PRECISION_Ma, $julian ), + array( '-1000000-00-00T00:00:00Z', TimeValue::PRECISION_YEAR1M, $julian ), /** * @see Wikibase\Lib\Parsers\YearMonthTimeParser @@ -106,13 +106,13 @@ * @see Wikibase\Lib\Parsers\Test\MWTimeIsoParserTest */ '13 billion years CE' => - array( '+13000000000-00-00T00:00:00Z', TimeValue::PRECISION_Ga ), + array( '+13000000000-00-00T00:00:00Z', TimeValue::PRECISION_YEAR1G ), '13,000 million years CE' => - array( '+13000000000-00-00T00:00:00Z', TimeValue::PRECISION_Ga ), + array( '+13000000000-00-00T00:00:00Z', TimeValue::PRECISION_YEAR1G ), '13,000 million years BCE' => - array( '-13000000000-00-00T00:00:00Z', TimeValue::PRECISION_Ga, $julian ), + array( '-13000000000-00-00T00:00:00Z', TimeValue::PRECISION_YEAR1G, $julian ), '1980s' => - array( '+1980-00-00T00:00:00Z', TimeValue::PRECISION_10a ), + array( '+1980-00-00T00:00:00Z', TimeValue::PRECISION_YEAR10 ), /** * @see ValueParsers\PhpDateTimeParser diff --git a/lib/tests/phpunit/parsers/YearTimeParserTest.php b/lib/tests/phpunit/parsers/YearTimeParserTest.php index 6695ca7..a8b5b28 100644 --- a/lib/tests/phpunit/parsers/YearTimeParserTest.php +++ b/lib/tests/phpunit/parsers/YearTimeParserTest.php @@ -73,11 +73,11 @@ '2010' => array( '+2010-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR, $gregorian ), '2000000' => - array( '+2000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_Ma, $gregorian ), + array( '+2000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1M, $gregorian ), '2000000000' => - array( '+2000000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_Ga, $gregorian ), + array( '+2000000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1G, $gregorian ), '2000020000' => - array( '+2000020000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_10ka, $gregorian ), + array( '+2000020000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR10K, $gregorian ), '2000001' => array( '+2000001-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR, $gregorian ), '02000001' => @@ -87,9 +87,9 @@ '000000001' => array( '+0001-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR, $julian ), '-1000000' => - array( '-1000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_Ma, $julian ), + array( '-1000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1M, $julian ), '-1 000 000' => - array( '-1000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_Ma, $julian ), + array( '-1000000-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR1M, $julian ), // Digit grouping in the Indian numbering system '-1,99,999' => array( '-199999-00-00T00:00:00Z', 0, 0, 0, TimeValue::PRECISION_YEAR, $julian ), diff --git a/repo/includes/ValidatorBuilders.php b/repo/includes/ValidatorBuilders.php index 27d7c79..07f7996 100644 --- a/repo/includes/ValidatorBuilders.php +++ b/repo/includes/ValidatorBuilders.php @@ -238,7 +238,7 @@ $precisionValidators = array(); $precisionValidators[] = new TypeValidator( 'integer' ); - $precisionValidators[] = new NumberRangeValidator( TimeValue::PRECISION_Ga, $maxPrecision ); + $precisionValidators[] = new NumberRangeValidator( TimeValue::PRECISION_YEAR1G, $maxPrecision ); $validators[] = new DataFieldValidator( 'precision', -- To view, visit https://gerrit.wikimedia.org/r/194306 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9489af3950c65620e007d739ca2e161e1a0a81e6 Gerrit-PatchSet: 9 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]> Gerrit-Reviewer: Addshore <[email protected]> Gerrit-Reviewer: Bene <[email protected]> Gerrit-Reviewer: Daniel Kinzler <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
