Merge branch 'hotfix/2888' into develop

Close zendframework/zendframework#2888
zendframework · Nov 13, 2012 · 73371d0 · 73371d0
commit 73371d0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/View/Helper/DateFormat.php b/src/View/Helper/DateFormat.php
@@ -124,7 +124,7 @@ public function __invoke(
         }
 
         $timezone    = $this->getTimezone();
-        $formatterId = md5($dateType . "\0" . $timeType . "\0" . $locale);
+        $formatterId = md5($dateType . "\0" . $timeType . "\0" . $locale ."\0" . $pattern);
 
         if (!isset($this->formatters[$formatterId])) {
             $this->formatters[$formatterId] = new IntlDateFormatter(

diff --git a/test/View/Helper/DateFormatTest.php b/test/View/Helper/DateFormatTest.php
@@ -243,6 +243,16 @@ public function testDefaultLocale()
     {
         $this->assertEquals(Locale::getDefault(), $this->helper->getLocale());
     }
+
+    public function testBugTwoPatternOnSameHelperInstance()
+    {
+    	$date = new DateTime('2012-07-02T22:44:03Z');
+
+    	$helper = new DateFormatHelper();
+        $helper->setTimezone('Europe/Berlin');
+    	$this->assertEquals('03/2012', $helper->__invoke($date, null, null, 'it_IT', 'dd/Y'));
+    	$this->assertEquals('03-2012', $helper->__invoke($date, null, null, 'it_IT', 'dd-Y'));
+    }
 
     public function assertMbStringEquals($expected, $test, $message = '')
     {