jenkins-bot has submitted this change and it was merged.
Change subject: Do not use TimeFormatter constants in TimeParsers
......................................................................
Do not use TimeFormatter constants in TimeParsers
I reworked this patch. Now it only touches parsers and makes them use
the parser constants instead of the formatter ones. Formatters are
still using the formatter constants.
Change-Id: I76a85ba07d4b3b7f55f85152da1af0b66f16b30e
---
M lib/tests/phpunit/parsers/MwTimeIsoParserTest.php
M lib/tests/phpunit/parsers/PhpDateTimeParserTest.php
M lib/tests/phpunit/parsers/TimeParserTest.php
M lib/tests/phpunit/parsers/YearMonthTimeParserTest.php
M lib/tests/phpunit/parsers/YearTimeParserTest.php
5 files changed, 134 insertions(+), 134 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
Jeroen De Dauw: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/lib/tests/phpunit/parsers/MwTimeIsoParserTest.php
b/lib/tests/phpunit/parsers/MwTimeIsoParserTest.php
index e094a47..f6b5559 100644
--- a/lib/tests/phpunit/parsers/MwTimeIsoParserTest.php
+++ b/lib/tests/phpunit/parsers/MwTimeIsoParserTest.php
@@ -3,8 +3,8 @@
namespace Wikibase\Lib\Parsers\Test;
use DataValues\TimeValue;
-use ValueFormatters\TimeFormatter;
use ValueParsers\Test\StringValueParserTest;
+use ValueParsers\TimeParser;
use Wikibase\Lib\Parsers\MWTimeIsoParser;
/**
@@ -47,112 +47,112 @@
// + dates
'13 billion years CE' =>
- array( '+0000013000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000013000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeParser::CALENDAR_GREGORIAN ),
'130 billion years CE' =>
- array( '+0000130000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000130000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeParser::CALENDAR_GREGORIAN ),
'13000 billion years CE' =>
- array( '+0013000000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0013000000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeParser::CALENDAR_GREGORIAN ),
'13,000 billion years CE' =>
- array( '+0013000000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0013000000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeParser::CALENDAR_GREGORIAN ),
'13,000 million years CE' =>
- array( '+0000013000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000013000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeParser::CALENDAR_GREGORIAN ),
'13,800 million years CE' =>
- array( '+0000013800000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100Ma , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000013800000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100Ma , TimeParser::CALENDAR_GREGORIAN ),
'100 million years CE' =>
- array( '+0000000100000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100Ma , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000100000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100Ma , TimeParser::CALENDAR_GREGORIAN ),
'70 million years CE' =>
- array( '+0000000070000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10Ma , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000070000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10Ma , TimeParser::CALENDAR_GREGORIAN ),
'77 million years CE' =>
- array( '+0000000077000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ma , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000077000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ma , TimeParser::CALENDAR_GREGORIAN ),
'13 million years CE' =>
- array( '+0000000013000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ma , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000013000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ma , TimeParser::CALENDAR_GREGORIAN ),
'1 million years CE' =>
- array( '+0000000001000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ma , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000001000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ma , TimeParser::CALENDAR_GREGORIAN ),
'100000 years CE' =>
- array( '+0000000000100000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100ka , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000100000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100ka , TimeParser::CALENDAR_GREGORIAN ),
'100,000 years CE' =>
- array( '+0000000000100000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100ka , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000100000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100ka , TimeParser::CALENDAR_GREGORIAN ),
'10000 years CE' =>
- array( '+0000000000010000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10ka , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000010000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10ka , TimeParser::CALENDAR_GREGORIAN ),
'99000 years CE' =>
- array( '+0000000000099000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_ka , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000099000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_ka , TimeParser::CALENDAR_GREGORIAN ),
'99,000 years CE' =>
- array( '+0000000000099000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_ka , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000099000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_ka , TimeParser::CALENDAR_GREGORIAN ),
'5. millennium' =>
- array( '+0000000000005000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_ka , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000005000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_ka , TimeParser::CALENDAR_GREGORIAN ),
'55. millennium' =>
- array( '+0000000000055000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_ka , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000055000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_ka , TimeParser::CALENDAR_GREGORIAN ),
'10. century' =>
- array( '+0000000000001000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100a , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100a , TimeParser::CALENDAR_GREGORIAN ),
'12. century' =>
- array( '+0000000000001200-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100a , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001200-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100a , TimeParser::CALENDAR_GREGORIAN ),
'1980s' =>
- array( '+0000000000001980-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10a , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001980-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10a , TimeParser::CALENDAR_GREGORIAN ),
'2000s' =>
- array( '+0000000000002000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10a , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000002000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10a , TimeParser::CALENDAR_GREGORIAN ),
'10s' =>
- array( '+0000000000000010-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10a , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000000010-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10a , TimeParser::CALENDAR_GREGORIAN ),
'12s' =>
- array( '+0000000000000012-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10a , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000000012-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10a , TimeParser::CALENDAR_GREGORIAN ),
// - dates
'13 billion years BCE' =>
- array( '-0000013000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000013000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeParser::CALENDAR_GREGORIAN ),
'130 billion years BCE' =>
- array( '-0000130000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000130000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeParser::CALENDAR_GREGORIAN ),
'13000 billion years BCE' =>
- array( '-0013000000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0013000000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeParser::CALENDAR_GREGORIAN ),
'13,000 billion years BCE' =>
- array( '-0013000000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0013000000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeParser::CALENDAR_GREGORIAN ),
'13,000 million years BCE' =>
- array( '-0000013000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000013000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeParser::CALENDAR_GREGORIAN ),
'13,800 million years BCE' =>
- array( '-0000013800000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100Ma , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000013800000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100Ma , TimeParser::CALENDAR_GREGORIAN ),
'100 million years BCE' =>
- array( '-0000000100000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100Ma , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000100000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100Ma , TimeParser::CALENDAR_GREGORIAN ),
'70 million years BCE' =>
- array( '-0000000070000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10Ma , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000070000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10Ma , TimeParser::CALENDAR_GREGORIAN ),
'77 million years BCE' =>
- array( '-0000000077000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ma , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000077000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ma , TimeParser::CALENDAR_GREGORIAN ),
'13 million years BCE' =>
- array( '-0000000013000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ma , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000013000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ma , TimeParser::CALENDAR_GREGORIAN ),
'1 million years BCE' =>
- array( '-0000000001000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ma , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000001000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ma , TimeParser::CALENDAR_GREGORIAN ),
'100000 years BCE' =>
- array( '-0000000000100000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100ka , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000100000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100ka , TimeParser::CALENDAR_GREGORIAN ),
'100,000 years BCE' =>
- array( '-0000000000100000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100ka , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000100000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100ka , TimeParser::CALENDAR_GREGORIAN ),
'10000 years BCE' =>
- array( '-0000000000010000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10ka , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000010000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10ka , TimeParser::CALENDAR_GREGORIAN ),
'99000 years BCE' =>
- array( '-0000000000099000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_ka , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000099000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_ka , TimeParser::CALENDAR_GREGORIAN ),
'99,000 years BCE' =>
- array( '-0000000000099000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_ka , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000099000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_ka , TimeParser::CALENDAR_GREGORIAN ),
'5. millennium BCE' =>
- array( '-0000000000005000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_ka , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000005000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_ka , TimeParser::CALENDAR_GREGORIAN ),
'55. millennium BCE' =>
- array( '-0000000000055000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_ka , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000055000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_ka , TimeParser::CALENDAR_GREGORIAN ),
'10. century BCE' =>
- array( '-0000000000001000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100a , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000001000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100a , TimeParser::CALENDAR_GREGORIAN ),
'12. century BCE' =>
- array( '-0000000000001200-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100a , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000001200-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100a , TimeParser::CALENDAR_GREGORIAN ),
'10s BCE' =>
- array( '-0000000000000010-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10a , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000000010-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10a , TimeParser::CALENDAR_GREGORIAN ),
'12s BCE' =>
- array( '-0000000000000012-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10a , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000000012-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10a , TimeParser::CALENDAR_GREGORIAN ),
// also parse BC
'5. millennium BC' =>
- array( '-0000000000005000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_ka , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000005000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_ka , TimeParser::CALENDAR_GREGORIAN ),
'55. millennium BC' =>
- array( '-0000000000055000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_ka , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000055000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_ka , TimeParser::CALENDAR_GREGORIAN ),
'10. century BC' =>
- array( '-0000000000001000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100a , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000001000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100a , TimeParser::CALENDAR_GREGORIAN ),
'12. century BC' =>
- array( '-0000000000001200-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100a , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000001200-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_100a , TimeParser::CALENDAR_GREGORIAN ),
'10s BC' =>
- array( '-0000000000000010-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10a , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000000010-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10a , TimeParser::CALENDAR_GREGORIAN ),
'12s BC' =>
- array( '-0000000000000012-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10a , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000000012-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10a , TimeParser::CALENDAR_GREGORIAN ),
);
foreach ( $valid as $value => $expected ) {
diff --git a/lib/tests/phpunit/parsers/PhpDateTimeParserTest.php
b/lib/tests/phpunit/parsers/PhpDateTimeParserTest.php
index ad63be6..0dbd2c2 100644
--- a/lib/tests/phpunit/parsers/PhpDateTimeParserTest.php
+++ b/lib/tests/phpunit/parsers/PhpDateTimeParserTest.php
@@ -3,8 +3,8 @@
namespace Wikibase\Lib\Parsers\Test;
use DataValues\TimeValue;
-use ValueFormatters\TimeFormatter;
use ValueParsers\Test\StringValueParserTest;
+use ValueParsers\TimeParser;
use Wikibase\Lib\Parsers\EraParser;
use Wikibase\Lib\Parsers\PhpDateTimeParser;
@@ -224,7 +224,7 @@
array_key_exists( 2, $args ) ? $args[2] : 0,
array_key_exists( 3, $args ) ? $args[3] : 0,
array_key_exists( 4, $args ) ? $args[4] :
TimeValue::PRECISION_DAY,
- array_key_exists( 5, $args ) ? $args[5] :
TimeFormatter::CALENDAR_GREGORIAN
+ array_key_exists( 5, $args ) ? $args[5] :
TimeParser::CALENDAR_GREGORIAN
);
$argList[] = array( (string)$value, $expected );
}
diff --git a/lib/tests/phpunit/parsers/TimeParserTest.php
b/lib/tests/phpunit/parsers/TimeParserTest.php
index 5b5b41b..721c429 100644
--- a/lib/tests/phpunit/parsers/TimeParserTest.php
+++ b/lib/tests/phpunit/parsers/TimeParserTest.php
@@ -3,8 +3,8 @@
namespace Wikibase\Lib\Parsers\Test;
use DataValues\TimeValue;
-use ValueFormatters\TimeFormatter;
use ValueParsers\Test\StringValueParserTest;
+use ValueParsers\TimeParser;
use Wikibase\Lib\Parsers\MWTimeIsoParser;
/**
@@ -47,77 +47,77 @@
//Wikibase\Lib\YearTimeParser
'1999' =>
- array( '+0000000000001999-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001999-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeParser::CALENDAR_GREGORIAN ),
'2000' =>
- array( '+0000000000002000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000002000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeParser::CALENDAR_GREGORIAN ),
'2010' =>
- array( '+0000000000002010-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000002010-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeParser::CALENDAR_GREGORIAN ),
'1980 ' =>
- array( '+0000000000001980-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001980-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeParser::CALENDAR_GREGORIAN ),
'1' =>
- array( '+0000000000000001-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000000001-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeParser::CALENDAR_GREGORIAN ),
'-1000000001' =>
- array( '-0000001000000001-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000001000000001-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeParser::CALENDAR_GREGORIAN ),
'+1000000001' =>
- array( '+0000001000000001-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000001000000001-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeParser::CALENDAR_GREGORIAN ),
'1BC' =>
- array( '-0000000000000001-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000000001-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeParser::CALENDAR_GREGORIAN ),
'1CE' =>
- array( '+0000000000000001-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000000001-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeParser::CALENDAR_GREGORIAN ),
'1 1999 BC' =>
- array( '-0000000000011999-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000011999-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeParser::CALENDAR_GREGORIAN ),
'1,000,000 BC' =>
- array( '-0000000001000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ma , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000001000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ma , TimeParser::CALENDAR_GREGORIAN ),
'1,11,111 BC' =>
- array( '-0000000000111111-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000111111-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeParser::CALENDAR_GREGORIAN ),
//Wikibase\Lib\YearMonthTimeParser
'1 1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'March 1999' =>
- array( '+0000000000001999-03-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001999-03-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'1999 March' =>
- array( '+0000000000001999-03-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001999-03-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
//ValueParsers\TimeParser
'+0000000000000000-01-01T00:00:00Z (Gregorian)' =>
- array( '+0000000000000000-01-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000000000-01-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeParser::CALENDAR_GREGORIAN ),
'+0-00-20T00:00:00Z' =>
- array( '+0000000000000000-00-20T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000000000-00-20T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeParser::CALENDAR_GREGORIAN ),
//Wikibase\Lib\ParsersMwTimeIsoParser
'13 billion years CE' =>
- array( '+0000013000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000013000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeParser::CALENDAR_GREGORIAN ),
'13,000 million years CE' =>
- array( '+0000013000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000013000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeParser::CALENDAR_GREGORIAN ),
'13,000 million years BCE' =>
- array( '-0000013000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000013000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeParser::CALENDAR_GREGORIAN ),
'1980s' =>
- array( '+0000000000001980-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10a , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001980-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10a , TimeParser::CALENDAR_GREGORIAN ),
// Wikibase\Lib\PhpDateTimeParser
'10/10/10' =>
- array( '+0000000000000010-10-10T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000000010-10-10T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeParser::CALENDAR_GREGORIAN ),
'1 July 2013' =>
- array( '+0000000000002013-07-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000002013-07-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeParser::CALENDAR_GREGORIAN ),
'1 Jul 2013' =>
- array( '+0000000000002013-07-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000002013-07-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeParser::CALENDAR_GREGORIAN ),
'1 Jul 2013 BC' =>
- array( '-0000000000002013-07-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000002013-07-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeParser::CALENDAR_GREGORIAN ),
'1 Jul 2013CE' =>
- array( '+0000000000002013-07-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000002013-07-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeParser::CALENDAR_GREGORIAN ),
'+1 Jul 2013' =>
- array( '+0000000000002013-07-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000002013-07-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeParser::CALENDAR_GREGORIAN ),
'-1 Jul 2013' =>
- array( '-0000000000002013-07-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000002013-07-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeParser::CALENDAR_GREGORIAN ),
'-10100-02-29' =>
- array( '-0000000000010100-03-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000010100-03-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeParser::CALENDAR_GREGORIAN ),
'-1.11.111' =>
- array( '-0000000000000111-11-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000000111-11-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeParser::CALENDAR_GREGORIAN ),
'1.11.111 BC' =>
- array( '-0000000000000111-11-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000000111-11-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeParser::CALENDAR_GREGORIAN ),
'1 11 111 BC' =>
- array( '-0000000000000111-11-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000000111-11-01T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_DAY , TimeParser::CALENDAR_GREGORIAN ),
);
foreach ( $valid as $value => $expected ) {
diff --git a/lib/tests/phpunit/parsers/YearMonthTimeParserTest.php
b/lib/tests/phpunit/parsers/YearMonthTimeParserTest.php
index 745c468..e26f0af 100644
--- a/lib/tests/phpunit/parsers/YearMonthTimeParserTest.php
+++ b/lib/tests/phpunit/parsers/YearMonthTimeParserTest.php
@@ -3,8 +3,8 @@
namespace Wikibase\Lib\Parsers\Test;
use DataValues\TimeValue;
-use ValueFormatters\TimeFormatter;
use ValueParsers\Test\StringValueParserTest;
+use ValueParsers\TimeParser;
use Wikibase\Lib\Parsers\MWTimeIsoParser;
/**
@@ -46,77 +46,77 @@
$valid = array(
// leading zeros
'00001 1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'000000001 100001999' =>
- array( '+0000000100001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000100001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
// use string month names
'Jan/1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'January/1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'January/1' =>
- array( '+0000000000000001-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000000001-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'1999 January' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'January 1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'January-1' =>
- array( '+0000000000000001-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000000001-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'JanuARY-1' =>
- array( '+0000000000000001-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000000001-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'JaN/1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'januARY-1' =>
- array( '+0000000000000001-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000000001-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'jan/1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
// use different date separators
'1-1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'1/1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'1 / 1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'1 1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'1,1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'1.1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'1. 1999' =>
- array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001999-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
// presume mm/yy unless impossible month, in which case
switch
'12/12' =>
- array( '+0000000000000012-12-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000000012-12-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'12/11' =>
- array( '+0000000000000011-12-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000000011-12-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'11/12' =>
- array( '+0000000000000012-11-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000000012-11-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'13/12' =>
- array( '+0000000000000013-12-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000000013-12-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'12/13' =>
- array( '+0000000000000013-12-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000000013-12-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'2000 1' =>
- array( '+0000000000002000-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000002000-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
// big years
'April-1000000001' =>
- array( '+0000001000000001-04-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000001000000001-04-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'April 1000000001' =>
- array( '+0000001000000001-04-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000001000000001-04-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'1000000001 April' =>
- array( '+0000001000000001-04-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000001000000001-04-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
'1 13000' =>
- array( '+0000000000013000-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000013000-01-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_MONTH , TimeParser::CALENDAR_GREGORIAN ),
// parse 0 month as if no month has been entered
'0.1999' =>
- array( '+0000000000001999-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001999-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeParser::CALENDAR_GREGORIAN ),
'1999 0' =>
- array( '+0000000000001999-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001999-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeParser::CALENDAR_GREGORIAN ),
);
diff --git a/lib/tests/phpunit/parsers/YearTimeParserTest.php
b/lib/tests/phpunit/parsers/YearTimeParserTest.php
index 86b7c6d..ae446c0 100644
--- a/lib/tests/phpunit/parsers/YearTimeParserTest.php
+++ b/lib/tests/phpunit/parsers/YearTimeParserTest.php
@@ -3,8 +3,8 @@
namespace Wikibase\Lib\Parsers\Test;
use DataValues\TimeValue;
-use ValueFormatters\TimeFormatter;
use ValueParsers\Test\StringValueParserTest;
+use ValueParsers\TimeParser;
use Wikibase\Lib\Parsers\EraParser;
use Wikibase\Lib\Parsers\MWTimeIsoParser;
@@ -67,32 +67,32 @@
$valid = array(
'1999' =>
- array( '+0000000000001999-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000001999-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeParser::CALENDAR_GREGORIAN ),
'2000' =>
- array( '+0000000000002000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000002000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeParser::CALENDAR_GREGORIAN ),
'2010' =>
- array( '+0000000000002010-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000002010-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeParser::CALENDAR_GREGORIAN ),
'2000000' =>
- array( '+0000000002000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ma , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000002000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ma , TimeParser::CALENDAR_GREGORIAN ),
'2000000000' =>
- array( '+0000002000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000002000000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ga , TimeParser::CALENDAR_GREGORIAN ),
'2000020000' =>
- array( '+0000002000020000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10ka , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000002000020000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_10ka , TimeParser::CALENDAR_GREGORIAN ),
'2000001' =>
- array( '+0000000002000001-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000002000001-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeParser::CALENDAR_GREGORIAN ),
'02000001' =>
- array( '+0000000002000001-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000002000001-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeParser::CALENDAR_GREGORIAN ),
'1' =>
- array( '+0000000000000001-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000000001-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeParser::CALENDAR_GREGORIAN ),
'000000001' =>
- array( '+0000000000000001-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '+0000000000000001-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeParser::CALENDAR_GREGORIAN ),
'-1000000' =>
- array( '-0000000001000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ma , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000001000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ma , TimeParser::CALENDAR_GREGORIAN ),
'-1 000 000' =>
- array( '-0000000001000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ma , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000001000000-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_Ma , TimeParser::CALENDAR_GREGORIAN ),
// Digit grouping in the Indian numbering system
'-1,99,999' =>
- array( '-0000000000199999-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeFormatter::CALENDAR_GREGORIAN ),
+ array( '-0000000000199999-00-00T00:00:00Z', 0 ,
0 , 0 , TimeValue::PRECISION_YEAR , TimeParser::CALENDAR_GREGORIAN ),
);
foreach ( $valid as $value => $expected ) {
--
To view, visit https://gerrit.wikimedia.org/r/195882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I76a85ba07d4b3b7f55f85152da1af0b66f16b30e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
