merged branch frosas/patch-1 (PR #4469)

Commits ------- d55f7ed MethodNotImplementedException -> MethodArgumentValueNotImplementedException cea6489 Accept calling setLenient(false) Discussion ---------- Avoid IntlDateFormatter::setLenient(false) to throw an exception Right now it is breaking because the changes introduced here: f541844 --------------------------------------------------------------------------- by travisbot at 2012-05-31T01:35:44Z This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1483621) (merged cea6489 into 49e213c).
symfony · May 31, 2012 · 78747e6 · 78747e6
2 parents 49e213c + d55f7ed
commit 78747e6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Symfony/Component/Locale/Stub/StubIntlDateFormatter.php b/src/Symfony/Component/Locale/Stub/StubIntlDateFormatter.php
@@ -416,11 +416,13 @@ public function setCalendar($calendar)
      *
      * @see    http://www.php.net/manual/en/intldateformatter.setlenient.php
      *
-     * @throws MethodNotImplementedException
+     * @throws MethodArgumentValueNotImplementedException When $lenient is true
      */
     public function setLenient($lenient)
     {
-        throw new MethodNotImplementedException(__METHOD__);
+        if ($lenient) {
+            throw new MethodArgumentValueNotImplementedException(__METHOD__, 'lenient', $lenient, 'Only the strict parser is supported');
+        }
     }
 
     /**

diff --git a/src/Symfony/Component/Locale/Tests/Stub/StubIntlDateFormatterTest.php b/src/Symfony/Component/Locale/Tests/Stub/StubIntlDateFormatterTest.php
@@ -906,7 +906,7 @@ public function testSetCalendar()
     }
 
     /**
-     * @expectedException Symfony\Component\Locale\Exception\MethodNotImplementedException
+     * @expectedException Symfony\Component\Locale\Exception\MethodArgumentValueNotImplementedException
      */
     public function testSetLenient()
     {