bug #36083 [DI][Form] Fixed test suite (TimeType changes & unresolved merge conflict) (wouterj)

fabpot · fabpot · commit cc8d23a8ce28 · 2020-03-15T15:10:17.000+01:00
This PR was squashed before being merged into the 4.4 branch. Discussion ---------- [DI][Form] Fixed test suite (TimeType changes & unresolved merge conflict) | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - After the merge of #36020 , the `addViewTransformer()` was moved to the top of the statement. This is wrong, as the `$format` variable is changed when a `reference_date` is set (see line 77). This broke Symfony's testsuite :) Commits ------- 18f5b17 [DI][Form] Fixed test suite (TimeType changes & unresolved merge conflict)
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -60,8 +60,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
 
         if ('single_text' === $options['widget']) {
-            $builder->addViewTransformer(new DateTimeToStringTransformer($options['model_timezone'], $options['view_timezone'], $format));
-
             $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $e) use ($options) {
                 $data = $e->getData();
                 if ($data && preg_match('/^(?P<hours>\d{2}):(?P<minutes>\d{2})(?::(?P<seconds>\d{2})(?:\.\d+)?)?$/', $data, $matches)) {
@@ -86,6 +84,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     }
                 });
             }
+
+            $builder->addViewTransformer(new DateTimeToStringTransformer($options['model_timezone'], $options['view_timezone'], $format));
         } else {
             $hourOptions = $minuteOptions = $secondOptions = [
                 'error_bubbling' => true,

Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`if ('single_text' === $options['widget']) {`
`63`		`- $builder->addViewTransformer(new DateTimeToStringTransformer($options['model_timezone'], $options['view_timezone'], $format));`
`64`		`-`
`65`	`63`	`$builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $e) use ($options) {`
`66`	`64`	`$data = $e->getData();`
`67`	`65`	`if ($data && preg_match('/^(?P<hours>\d{2}):(?P<minutes>\d{2})(?::(?P<seconds>\d{2})(?:\.\d+)?)?$/', $data, $matches)) {`
`@@ -86,6 +84,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`86`	`84`	`}`
`87`	`85`	`});`
`88`	`86`	`}`
	`87`	`+`
	`88`	`+ $builder->addViewTransformer(new DateTimeToStringTransformer($options['model_timezone'], $options['view_timezone'], $format));`
`89`	`89`	`} else {`
`90`	`90`	`$hourOptions = $minuteOptions = $secondOptions = [`
`91`	`91`	`'error_bubbling' => true,`