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

fabpot · fabpot · commit 78747e6cc5f6 · 2012-05-31T07:33:01.000+02:00
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: symfony@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).
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()
     {

Original file line number	Diff line number	Diff line change
`@@ -416,11 +416,13 @@ public function setCalendar($calendar)`
`416`	`416`	`*`
`417`	`417`	`* @see http://www.php.net/manual/en/intldateformatter.setlenient.php`
`418`	`418`	`*`
`419`		`- * @throws MethodNotImplementedException`
	`419`	`+ * @throws MethodArgumentValueNotImplementedException When $lenient is true`
`420`	`420`	`*/`
`421`	`421`	`public function setLenient($lenient)`
`422`	`422`	`{`
`423`		`- throw new MethodNotImplementedException(__METHOD__);`
	`423`	`+ if ($lenient) {`
	`424`	`+ throw new MethodArgumentValueNotImplementedException(__METHOD__, 'lenient', $lenient, 'Only the strict parser is supported');`
	`425`	`+ }`
`424`	`426`	`}`
`425`	`427`
`426`	`428`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -906,7 +906,7 @@ public function testSetCalendar()`
`906`	`906`	`}`
`907`	`907`
`908`	`908`	`/**`
`909`		`- * @expectedException Symfony\Component\Locale\Exception\MethodNotImplementedException`
	`909`	`+ * @expectedException Symfony\Component\Locale\Exception\MethodArgumentValueNotImplementedException`
`910`	`910`	`*/`
`911`	`911`	`public function testSetLenient()`
`912`	`912`	`{`