Merge branch 'hotfix/4509'

Close zendframework/zendframework#4509
zendframework · May 23, 2013 · 9e0a7f2 · 9e0a7f2
2 parents bb01088 + 1dfc1f4
commit 9e0a7f2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/DateTimeFormatter.php b/src/DateTimeFormatter.php
@@ -74,11 +74,11 @@ protected function normalizeDateTime($value)
         if ($value === '' || $value === null) {
             return $value;
         } elseif (is_int($value)) {
-            $dateTime = new DateTime('@' . $value);
+            $value = new DateTime('@' . $value);
         } elseif (!$value instanceof DateTime) {
-            $dateTime = new DateTime($value);
+            $value = new DateTime($value);
         }
 
-        return $dateTime->format($this->format);
+        return $value->format($this->format);
     }
 }
diff --git a/test/DateTimeFormatterTest.php b/test/DateTimeFormatterTest.php
@@ -101,6 +101,15 @@ public function testFormatDateTimeFromTimestamp()
         $this->assertEquals('2013-02-01T17:30:01+0000', $result);
     }
 
+    public function testAcceptDateTimeValue()
+    {
+        date_default_timezone_set('UTC');
+
+        $filter = new DateTimeFormatter();
+        $result = $filter->filter(new DateTime('2012-01-01'));
+        $this->assertEquals('2012-01-01T00:00:00+0000', $result);
+    }
+
     public function testInvalidArgumentExceptionThrownOnInvalidInput()
     {
         $this->setExpectedException('Zend\Filter\Exception\InvalidArgumentException');