DateTime - Deserialize from more formats (default)

schmittjoh · Sep 24, 2024 · c7c3840 · c7c3840
1 parent 3b832aa
commit c7c3840
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 2 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -86,6 +86,10 @@ private function addHandlersSection(NodeBuilder $builder)
                         ->addDefaultsIfNotSet()
                         ->children()
                             ->scalarNode('default_format')->defaultValue(\DateTime::RFC3339)->end()
+                            ->arrayNode('default_deserialization_formats')
+                                ->scalarPrototype()->end()
+                                ->defaultValue([\DateTime::RFC3339])
+                            ->end()
                             ->scalarNode('default_timezone')->defaultValue(date_default_timezone_get())->end()
                             ->scalarNode('cdata')->defaultTrue()->end()
                         ->end()

diff --git a/DependencyInjection/JMSSerializerExtension.php b/DependencyInjection/JMSSerializerExtension.php
@@ -126,7 +126,8 @@ private function loadInternal(array $config, ScopedContainer $container, array $
         $container->getDefinition('jms_serializer.datetime_handler')
             ->replaceArgument(0, $config['handlers']['datetime']['default_format'])
             ->replaceArgument(1, $config['handlers']['datetime']['default_timezone'])
-            ->replaceArgument(2, $config['handlers']['datetime']['cdata']);
+            ->replaceArgument(2, $config['handlers']['datetime']['cdata'])
+            ->replaceArgument(3, $config['handlers']['datetime']['default_deserialization_formats']);
 
         $container->getDefinition('jms_serializer.array_collection_handler')
             ->replaceArgument(0, $config['handlers']['array_collection']['initialize_excluded']);

diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -73,6 +73,7 @@
             <argument/> <!-- default_format -->
             <argument/> <!-- default_timezone -->
             <argument/> <!-- cdata -->
+            <argument/> <!-- default_deserialization_formats -->
         </service>
         <service id="jms_serializer.form_error_handler" class="JMS\Serializer\Handler\FormErrorHandler" public="false">
             <argument type="service" id="translator" on-invalid="null" />

diff --git a/Resources/doc/configuration.rst b/Resources/doc/configuration.rst
@@ -201,6 +201,8 @@ values:
             handlers:
                 datetime:
                     default_format: "Y-m-d\\TH:i:sP" # ATOM
+                    default_deserialization_formats:
+                        - "Y-m-d\\TH:i:sP" # ATOM
                     default_timezone: "UTC" # defaults to whatever timezone set in php.ini or via date_default_timezone_set
                 array_collection:
                     initialize_excluded: false

diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
@@ -286,6 +286,14 @@ public function testDefaultDateFormat()
         $this->assertEquals(\DateTime::ATOM, $config['handlers']['datetime']['default_format']);
     }
 
+    public function testDefaultDateDeserializationFormats()
+    {
+        $processor = new Processor();
+        $config = $processor->processConfiguration(new Configuration(true), []);
+
+        $this->assertEquals([\DateTime::ATOM], $config['handlers']['datetime']['default_deserialization_formats']);
+    }
+
     public function testDefaultUidFormat()
     {
         $processor = new Processor();

diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
     ],
     "require": {
         "php": "^7.4 || ^8.0",
-        "jms/serializer": "^3.28",
+        "jms/serializer": "^3.31",
         "jms/metadata": "^2.6",
         "symfony/config": "^5.4 || ^6.0 || ^7.0",
         "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",