Przeglądaj źródła

Merge pull request #21 from nickelc/master

Wrong exception message for parsing datetime
Johannes 12 lat temu
rodzic
commit
a9f3100619
1 zmienionych plików z 3 dodań i 2 usunięć
  1. 3 2
      src/JMS/Serializer/Handler/DateHandler.php

+ 3 - 2
src/JMS/Serializer/Handler/DateHandler.php

@@ -99,9 +99,10 @@ class DateHandler implements SubscribingHandlerInterface
     private function parseDateTime($data, array $type)
     {
         $timezone = isset($type['params'][1]) ? $type['params'][1] : $this->defaultTimezone;
-        $datetime = \DateTime::createFromFormat($this->getFormat($type), (string) $data, $timezone);
+        $format = $this->getFormat($type);
+        $datetime = \DateTime::createFromFormat($format, (string) $data, $timezone);
         if (false === $datetime) {
-            throw new RuntimeException(sprintf('Invalid datetime "%s", expected format %s.', $data, $this->defaultFormat));
+            throw new RuntimeException(sprintf('Invalid datetime "%s", expected format %s.', $data, $format));
         }
 
         return $datetime;