bug #40998 [Form] Use reference date in reverse transform (KDederichs)

nicolas-grekas · nicolas-grekas · commit 639b74d34ed6 · 2022-04-12T15:19:22.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Form] Use reference date in reverse transform | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #40997 | License | MIT Use reference time in reverse transform to fix the display inconsistancies Commits ------- 1a368fc Use reference date in reverse transform Fixes #40997
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -204,7 +204,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ));
         } elseif ('array' === $options['input']) {
             $builder->addModelTransformer(new ReversedTransformer(
-                new DateTimeToArrayTransformer($options['model_timezone'], $options['model_timezone'], $parts)
+                new DateTimeToArrayTransformer($options['model_timezone'], $options['model_timezone'], $parts, 'text' === $options['widget'], $options['reference_date'])
             ));
         }
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
@@ -991,6 +991,27 @@ public function testArrayTimeWithReferenceDoesNotUseReferenceTimeOnZero()
         $this->assertSame($input, $form->getViewData());
     }
 
+    public function testArrayTimeWithReferenceDoesUseReferenceDateOnModelTransform()
+    {
+        $input = [
+            'hour' => '21',
+            'minute' => '45',
+        ];
+
+        $form = $this->factory->create(static::TESTED_TYPE, $input, [
+            'model_timezone' => 'UTC',
+            'view_timezone' => 'Europe/Berlin',
+            'reference_date' => new \DateTimeImmutable('01-05-2021 12:34:56', new \DateTimeZone('UTC')),
+            'input' => 'array',
+        ]);
+
+        $this->assertSame($input, $form->getData());
+        $this->assertEquals([
+            'hour' => '23',
+            'minute' => '45',
+        ], $form->getViewData());
+    }
+
     /**
      * @dataProvider provideEmptyData
      */

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`204`	`204`	`));`
`205`	`205`	`} elseif ('array' === $options['input']) {`
`206`	`206`	`$builder->addModelTransformer(new ReversedTransformer(`
`207`		`- new DateTimeToArrayTransformer($options['model_timezone'], $options['model_timezone'], $parts)`
	`207`	`+ new DateTimeToArrayTransformer($options['model_timezone'], $options['model_timezone'], $parts, 'text' === $options['widget'], $options['reference_date'])`
`208`	`208`	`));`
`209`	`209`	`}`
`210`	`210`	`}`