merged branch bschussek/issue4242 (PR symfony#4848)

Commits ------- b7aae48 [Locale] Fixed error resetting in StubIntlDateFormatter::parse() Discussion ---------- [Locale] Fixed error resetting in StubIntlDateFormatter::parse() Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: symfony#4242 Todo: - --------------------------------------------------------------------------- by bschussek at 2012-07-11T08:00:15Z ping @eriksencosta, @igorw - is this solved as intended? --------------------------------------------------------------------------- by eriksencosta at 2012-07-11T11:20:24Z Yes, thanks!

Author: fabpot

src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php

@@ -151,6 +151,9 @@ public function parse(\DateTime $dateTime, $value)
  }
  }
 
+ // reset error code and message
+ StubIntl::setError(StubIntl::U_ZERO_ERROR);
+
  return $this->calculateUnixTimestamp($dateTime, $options);
  }
 

src/Symfony/Component/Locale/Stub/StubIntlDateFormatter.php

@@ -378,10 +378,8 @@ public function parse($value, &$position = null)
  $timestamp = $transformer->parse($dateTime, $value);
 
  // behave like the intl extension. FullTransformer::parse() set the proper error
- if (false === $timestamp) {
- $this->errorCode = StubIntl::getErrorCode();
- $this->errorMessage = StubIntl::getErrorMessage();
- }
+ $this->errorCode = StubIntl::getErrorCode();
+ $this->errorMessage = StubIntl::getErrorMessage();
 
  return $timestamp;
  }

src/Symfony/Component/Locale/Tests/Stub/StubIntlDateFormatterTest.php

@@ -859,6 +859,24 @@ public function parseErrorProvider()
  );
  }
 
+ /*
+ * https://github.com/symfony/symfony/issues/4242
+ */
+ public function testParseAfterErrorIntl()
+ {
+ $this->testParseErrorIntl('y-MMMMM-d', '1970-J-1');
+ $this->testParseIntl('y-M-d', '1970-1-1', 0);
+ }
+
+ /*
+ * https://github.com/symfony/symfony/issues/4242
+ */
+ public function testParseAfterErrorStub()
+ {
+ $this->testParseErrorStub('y-MMMMM-d', '1970-J-1');
+ $this->testParseStub('y-M-d', '1970-1-1', 0);
+ }
+
  /**
  * Just to document the differences between the stub and the intl implementations. The intl can parse
  * any of the tested formats alone. The stub does not implement them as it would be needed to add more