Add default timezone in DatetimeFieldType based on timezone param

Sylius · Apr 8, 2024 · 2d76e8e · 2d76e8e
1 parent e688acb
commit 2d76e8e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/src/Bundle/Resources/config/services/field_types.xml b/src/Bundle/Resources/config/services/field_types.xml
@@ -17,6 +17,7 @@
 
         <service id="Sylius\Component\Grid\FieldTypes\DatetimeFieldType">
             <argument type="service" id="sylius.grid.data_extractor" />
+            <argument on-invalid="null">%timezone%</argument>
             <tag name="sylius.grid_field" type="datetime" />
         </service>
         <service id="sylius.grid_field.datetime" alias="Sylius\Component\Grid\FieldTypes\DatetimeFieldType" />

diff --git a/src/Component/FieldTypes/DatetimeFieldType.php b/src/Component/FieldTypes/DatetimeFieldType.php
@@ -22,8 +22,10 @@ final class DatetimeFieldType implements FieldTypeInterface
 {
     private DataExtractorInterface $dataExtractor;
 
-    public function __construct(DataExtractorInterface $dataExtractor)
-    {
+    public function __construct(
+        DataExtractorInterface $dataExtractor,
+        private ?string $timezone = null,
+    ) {
         $this->dataExtractor = $dataExtractor;
     }
 
@@ -51,7 +53,7 @@ public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefault('format', 'Y-m-d H:i:s');
         $resolver->setAllowedTypes('format', 'string');
-        $resolver->setDefault('timezone', null);
+        $resolver->setDefault('timezone', $this->timezone);
         $resolver->setAllowedTypes('timezone', ['null', 'string']);
     }
 }
diff --git a/src/Component/spec/FieldTypes/DatetimeFieldTypeSpec.php b/src/Component/spec/FieldTypes/DatetimeFieldTypeSpec.php
@@ -18,6 +18,7 @@
 use Sylius\Component\Grid\DataExtractor\DataExtractorInterface;
 use Sylius\Component\Grid\Definition\Field;
 use Sylius\Component\Grid\FieldTypes\FieldTypeInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 final class DatetimeFieldTypeSpec extends ObjectBehavior
 {
@@ -73,6 +74,20 @@ function it_returns_null_if_property_accessor_returns_null(DataExtractorInterfac
         ])->shouldReturn('');
     }
 
+    function it_uses_timezone_parameter_as_default_timezone_option(
+        DataExtractorInterface $dataExtractor,
+        OptionsResolver $resolver,
+    ): void {
+        $this->beConstructedWith($dataExtractor, 'Europe/Warsaw');
+
+        $resolver->setDefault('format', 'Y-m-d H:i:s')->willReturn($resolver)->shouldBeCalled();
+        $resolver->setAllowedTypes('format', 'string')->willReturn($resolver)->shouldBeCalled();
+        $resolver->setDefault('timezone', 'Europe/Warsaw')->willReturn($resolver)->shouldBeCalled();
+        $resolver->setAllowedTypes('timezone', ['null', 'string'])->willReturn($resolver)->shouldBeCalled();
+
+        $this->configureOptions($resolver);
+    }
+
     function it_throws_exception_if_returned_value_is_not_datetime(DataExtractorInterface $dataExtractor, Field $field): void
     {
         $dataExtractor->get($field, ['foo' => 'bar'])->willReturn('badObject');