bug #19879 [Form] Incorrect timezone with DateTimeLocalizedStringTransformer (mbeccati)

fabpot · fabpot · commit d89319218dd3 · 2016-09-08T07:46:02.000-07:00
This PR was merged into the 2.7 branch. Discussion ---------- [Form] Incorrect timezone with DateTimeLocalizedStringTransformer | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #19721 | License | MIT | Doc PR | n.a. Issue was introduced in #19541 Commits ------- bf6691c Fix #19721
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
@@ -134,7 +134,10 @@ public function reverseTransform($value)
             }
 
             // read timestamp into DateTime object - the formatter delivers a timestamp
-            $dateTime = new \DateTime(sprintf('@%s', $timestamp), new \DateTimeZone($this->outputTimezone));
+            $dateTime = new \DateTime(sprintf('@%s', $timestamp));
+            // set timezone separately, as it would be ignored if set via the constructor,
+            // see http://php.net/manual/en/datetime.construct.php
+            $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));
         } catch (\Exception $e) {
             throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
         }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
@@ -134,6 +134,23 @@ public function testTransformWithDifferentTimezones()
         $this->assertEquals($dateTime->format('d.m.Y, H:i'), $transformer->transform($input));
     }
 
+    public function testReverseTransformWithNoConstructorParameters()
+    {
+        $tz = date_default_timezone_get();
+        date_default_timezone_set('Europe/Rome');
+
+        $transformer = new DateTimeToLocalizedStringTransformer();
+
+        $dateTime = new \DateTime('2010-02-03 04:05');
+
+        $this->assertEquals(
+            $dateTime->format('c'),
+            $transformer->reverseTransform('03.02.2010, 04:05')->format('c')
+        );
+
+        date_default_timezone_set($tz);
+    }
+
     public function testTransformWithDifferentPatterns()
     {
         $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::FULL, \IntlDateFormatter::FULL, \IntlDateFormatter::GREGORIAN, 'MM*yyyy*dd HH|mm|ss');

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,10 @@ public function reverseTransform($value)`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`// read timestamp into DateTime object - the formatter delivers a timestamp`
`137`		`- $dateTime = new \DateTime(sprintf('@%s', $timestamp), new \DateTimeZone($this->outputTimezone));`
	`137`	`+ $dateTime = new \DateTime(sprintf('@%s', $timestamp));`
	`138`	`+ // set timezone separately, as it would be ignored if set via the constructor,`
	`139`	`+ // see http://php.net/manual/en/datetime.construct.php`
	`140`	`+ $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));`
`138`	`141`	`} catch (\Exception $e) {`
`139`	`142`	`throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);`
`140`	`143`	`}`