Revert "* DateType, DateTimeType, TimeType: - a bit changed readability"

src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php

@@ -95,17 +95,11 @@ class DateTimeToStringTransformer extends BaseDateTimeTransformer
         }
 
         try {
-            $dateTime = new \DateTime(
-                $value,
-                new \DateTimeZone($this->outputTimezone)
-            );
+            $dateTime = new \DateTime($value, new \DateTimeZone($this->outputTimezone));
 
             // Force value to be in same format as given to transform
             if ($value !== $dateTime->format($this->format)) {
-                $dateTime = new \DateTime(
-                    $dateTime->format($this->format),
-                    new \DateTimeZone($this->outputTimezone)
-                );
+                $dateTime = new \DateTime($dateTime->format($this->format), new \DateTimeZone($this->outputTimezone));
             }
 
             if ($this->inputTimezone !== $this->outputTimezone) {

src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php

@@ -46,11 +46,7 @@ class DateTimeType extends AbstractType
         }
 
         if ($options['widget'] === 'single_text') {
-            $builder->appendClientTransformer(new DateTimeToStringTransformer(
-                $options['data_timezone'],
-                $options['user_timezone'],
-                $format
-            ));
+            $builder->appendClientTransformer(new DateTimeToStringTransformer($options['data_timezone'], $options['user_timezone'], $format));
         } else {
             // Only pass a subset of the options to children
             $dateOptions = array_intersect_key($options, array_flip(array(
@@ -92,11 +88,7 @@ class DateTimeType extends AbstractType
 
             $builder
                 ->appendClientTransformer(new DataTransformerChain(array(
-                    new DateTimeToArrayTransformer(
-                        $options['data_timezone'],
-                        $options['user_timezone'],
-                        $parts
-                    ),
+                    new DateTimeToArrayTransformer($options['data_timezone'], $options['user_timezone'], $parts),
                     new ArrayToPartsTransformer(array(
                         'date' => array('year', 'month', 'day'),
                         'time' => $timeParts,
@@ -109,26 +101,15 @@ class DateTimeType extends AbstractType
 
         if ($options['input'] === 'string') {
             $builder->appendNormTransformer(new ReversedTransformer(
-                new DateTimeToStringTransformer(
-                    $options['data_timezone'],
-                    $options['data_timezone'],
-                    $format
-                )
+                new DateTimeToStringTransformer($options['data_timezone'], $options['data_timezone'], $format)
             ));
         } else if ($options['input'] === 'timestamp') {
             $builder->appendNormTransformer(new ReversedTransformer(
-                new DateTimeToTimestampTransformer(
-                    $options['data_timezone'],
-                    $options['data_timezone']
-                )
+                new DateTimeToTimestampTransformer($options['data_timezone'], $options['data_timezone'])
             ));
         } else if ($options['input'] === 'array') {
             $builder->appendNormTransformer(new ReversedTransformer(
-                new DateTimeToArrayTransformer(
-                    $options['data_timezone'],
-                    $options['data_timezone'],
-                    $parts
-                )
+                new DateTimeToArrayTransformer($options['data_timezone'], $options['data_timezone'], $parts)
             ));
         }
 

src/Symfony/Component/Form/Extension/Core/Type/DateType.php

@@ -38,12 +38,7 @@ class DateType extends AbstractType
         );
 
         if ($options['widget'] === 'single_text') {
-            $builder->appendClientTransformer(new DateTimeToLocalizedStringTransformer(
-                $options['data_timezone'],
-                $options['user_timezone'],
-                $options['format'],
-                \IntlDateFormatter::NONE
-            ));
+            $builder->appendClientTransformer(new DateTimeToLocalizedStringTransformer($options['data_timezone'], $options['user_timezone'], $options['format'], \IntlDateFormatter::NONE));
         } else {
             $yearOptions = $monthOptions = $dayOptions = array();
 
@@ -83,35 +78,22 @@ class DateType extends AbstractType
                 ->add('month', $options['widget'], $monthOptions)
                 ->add('day', $options['widget'], $dayOptions)
                 ->appendClientTransformer(new DateTimeToArrayTransformer(
-                    $options['data_timezone'],
-                    $options['user_timezone'],
-                    array('year', 'month', 'day')
+                    $options['data_timezone'], $options['user_timezone'], array('year', 'month', 'day')
                 ))
             ;
         }
 
         if ($options['input'] === 'string') {
             $builder->appendNormTransformer(new ReversedTransformer(
-                new DateTimeToStringTransformer(
-                    $options['data_timezone'],
-                    $options['data_timezone'],
-                    'Y-m-d'
-                )
+                new DateTimeToStringTransformer($options['data_timezone'], $options['data_timezone'], 'Y-m-d')
             ));
         } else if ($options['input'] === 'timestamp') {
             $builder->appendNormTransformer(new ReversedTransformer(
-                new DateTimeToTimestampTransformer(
-                    $options['data_timezone'],
-                    $options['data_timezone']
-                )
+                new DateTimeToTimestampTransformer($options['data_timezone'], $options['data_timezone'])
             ));
         } else if ($options['input'] === 'array') {
             $builder->appendNormTransformer(new ReversedTransformer(
-                new DateTimeToArrayTransformer(
-                    $options['data_timezone'],
-                    $options['data_timezone'],
-                    array('year', 'month', 'day')
-                )
+                new DateTimeToArrayTransformer($options['data_timezone'], $options['data_timezone'], array('year', 'month', 'day'))
             ));
         }
 

src/Symfony/Component/Form/Extension/Core/Type/TimeType.php

@@ -36,11 +36,7 @@ class TimeType extends AbstractType
         }
 
         if ($options['widget'] === 'single_text') {
-            $builder->appendClientTransformer(new DateTimeToStringTransformer(
-                $options['data_timezone'],
-                $options['user_timezone'],
-                $format
-            ));
+            $builder->appendClientTransformer(new DateTimeToStringTransformer($options['data_timezone'], $options['user_timezone'], $format));
         } else {
             $hourOptions = $minuteOptions = $secondOptions = array();
 
@@ -87,36 +83,20 @@ class TimeType extends AbstractType
                 $builder->add('second', $options['widget'], $secondOptions);
             }
 
-            $builder->appendClientTransformer(new DateTimeToArrayTransformer(
-                $options['data_timezone'],
-                $options['user_timezone'],
-                $parts,
-                $options['widget'] === 'text'
-            ));
+            $builder->appendClientTransformer(new DateTimeToArrayTransformer($options['data_timezone'], $options['user_timezone'], $parts, $options['widget'] === 'text'));
         }
 
         if ($options['input'] === 'string') {
             $builder->appendNormTransformer(new ReversedTransformer(
-                new DateTimeToStringTransformer(
-                    $options['data_timezone'],
-                    $options['data_timezone'],
-                    $format
-                )
+                new DateTimeToStringTransformer($options['data_timezone'], $options['data_timezone'], $format)
             ));
         } else if ($options['input'] === 'timestamp') {
             $builder->appendNormTransformer(new ReversedTransformer(
-                new DateTimeToTimestampTransformer(
-                    $options['data_timezone'],
-                    $options['data_timezone']
-                )
+                new DateTimeToTimestampTransformer($options['data_timezone'], $options['data_timezone'])
             ));
         } else if ($options['input'] === 'array') {
             $builder->appendNormTransformer(new ReversedTransformer(
-                new DateTimeToArrayTransformer(
-                    $options['data_timezone'],
-                    $options['data_timezone'],
-                    $parts
-                )
+                new DateTimeToArrayTransformer($options['data_timezone'], $options['data_timezone'], $parts)
             ));
         }