Simplify DateIntervalToStringTransformer invalid value handling

MisatoTremor · MisatoTremor · commit 8045bc5cb684 · 2015-10-14T10:29:57.000+02:00
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToStringTransformer.php
@@ -89,20 +89,17 @@ public function reverseTransform($value)
         if (!is_string($value)) {
             throw new TransformationFailedException('Expected a string.');
         }
+        if (!$this->isISO8601($value)) {
+            throw new TransformationFailedException('Non ISO 8601 date strings are not supported yet');
+        }
+        $valuePattern = '/^'.preg_replace('/%([yYmMdDhHiIsSwW])(\w)/', '(?P<$1>\d+)$2', $this->format).'$/';
+        if (!preg_match($valuePattern, $value)) {
+            throw new TransformationFailedException(
+                sprintf('Value "%s" contains intervals not accepted by format "%s".', $value, $this->format)
+            );
+        }
         try {
-            if ($this->isISO8601($value)) {
-                $valuePattern = '/^'.preg_replace('/%([yYmMdDhHiIsSwW])(\w)/', '(?P<$1>\d+)$2', $this->format).'$/';
-                if (!preg_match($valuePattern, $value)) {
-                    throw new TransformationFailedException(
-                        sprintf('Value "%s" contains intervals not accepted by format "%s".', $value, $this->format)
-                    );
-                }
-                $dateInterval = new \DateInterval($value);
-            } else {
-                throw new TransformationFailedException('Non ISO 8601 date strings are not supported yet');
-            }
-        } catch (TransformationFailedException $e) {
-            throw $e;
+            $dateInterval = new \DateInterval($value);
         } catch (\Exception $e) {
             throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
         }
