Construct parsers with a copy of ParserOptions

MwDateFormatParserFactory::getMwDateFormatParser modifies
the provided ParserOptions instance (lines 60-62 there).
Both calls receive the same instance, so the options for
the first call are overwritten with the second call.

Passing a shallow copy avoids this. An alternative would be
to go through all parsers and make sure they create a copy
before they modify the object.

Unfortunately, some tests start to fail, mostly due to wrong
default calendar model for ancient dates. Instead of
determining it ourselves here, we use IsoTimestampParser to
decide the correct one.

Bug: T221097
Bug: T324392
Change-Id: I5389b639dbf04f6d3e4802c802d5f2029dadc5d5

Author: matejsuchanek

repo/includes/Parsers/DateFormatParser.php

@@ -4,6 +4,8 @@
 
 use DataValues\IllegalValueException;
 use DataValues\TimeValue;
+use ValueParsers\CalendarModelParser;
+use ValueParsers\IsoTimestampParser;
 use ValueParsers\ParseException;
 use ValueParsers\ParserOptions;
 use ValueParsers\StringValueParser;
@@ -44,6 +46,9 @@ class DateFormatParser extends StringValueParser {
 	 */
 	public const OPT_PRECISION = 'precision';
 
+	/** @var IsoTimestampParser */
+	private $isoTimestampParser;
+
 	public function __construct( ParserOptions $options = null ) {
 		parent::__construct( $options );
 
@@ -52,6 +57,11 @@ public function __construct( ParserOptions $options = null ) {
 		$this->defaultOption( self::OPT_DIGIT_TRANSFORM_TABLE, null );
 		$this->defaultOption( self::OPT_MONTH_NAMES, null );
 		$this->defaultOption( self::OPT_PRECISION, null );
+
+		$this->isoTimestampParser = new IsoTimestampParser(
+			new CalendarModelParser( $this->options ),
+			$this->options
+		);
 	}
 
 	/**
@@ -109,8 +119,14 @@ protected function stringParse( $value ) {
 
 		$timestamp = vsprintf( '+%04s-%02s-%02sT%02s:%02s:%02sZ', $time );
 
+		// Use IsoTimestampParser to detect the correct calendar model.
+		$iso = $this->isoTimestampParser->parse( $timestamp );
+
 		try {
-			return new TimeValue( $timestamp, 0, 0, 0, $precision, TimeValue::CALENDAR_GREGORIAN );
+			// We intentionally do not re-use the precision from IsoTimestampParser here,
+			// because it reduces precision for values with zeros in the right-most fields.
+			// Our above method of determining the precision is therefore better.
+			return new TimeValue( $timestamp, 0, 0, 0, $precision, $iso->getCalendarModel() );
 		} catch ( IllegalValueException $ex ) {
 			throw new ParseException( $ex->getMessage(), $value, self::FORMAT_NAME );
 		}

repo/includes/Parsers/TimeParserFactory.php

@@ -90,13 +90,13 @@ private function getTimeParsers() {
 			$this->options->getOption( ValueParser::OPT_LANG ),
 			$dateFormatPreference,
 			'date',
-			$this->options
+			clone $this->options
 		);
 		$parsers[] = $mwDateFormatParserFactory->getMwDateFormatParser(
 			$this->options->getOption( ValueParser::OPT_LANG ),
 			$dateFormatPreference,
 			'monthonly',
-			$this->options
+			clone $this->options
 		);
 
 		$parsers[] = new PhpDateTimeParser(

repo/tests/phpunit/includes/Parsers/MwDateFormatParserFactoryTest.php

@@ -104,11 +104,14 @@ public function validInputProvider() {
 					if ( $precision === null ) {
 						$precision = $maximumPrecision;
 					}
+					$calendarModel = intval( substr( $mwTimestamp, 0, 4 ) ) <= 1582
+						? TimeValue::CALENDAR_JULIAN
+						: TimeValue::CALENDAR_GREGORIAN;
 					$expected = new TimeValue(
 						$this->getIsoTimestamp( $mwTimestamp, $precision ),
 						0, 0, 0,
 						$precision,
-						TimeValue::CALENDAR_GREGORIAN
+						$calendarModel
 					);
 
 					yield [