Merge pull request #345 from mvrhov/cdataDateTime

Add support for cdata parameter on DateTimeHandler
schmittjoh · Dec 5, 2013 · bb15db3 · bb15db3
2 parents 9cdfef0 + ceeba5e
commit bb15db3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -64,6 +64,7 @@ private function addHandlersSection(NodeBuilder $builder)
                         ->children()
                             ->scalarNode('default_format')->defaultValue(\DateTime::ISO8601)->end()
                             ->scalarNode('default_timezone')->defaultValue(date_default_timezone_get())->end()
+                            ->scalarNode('cdata')->defaultTrue()->end()
                         ->end()
                    ->end()
                 ->end()

diff --git a/DependencyInjection/JMSSerializerExtension.php b/DependencyInjection/JMSSerializerExtension.php
@@ -37,7 +37,9 @@ public function loadInternal(array $config, ContainerBuilder $container)
         // Built-in handlers.
         $container->getDefinition('jms_serializer.datetime_handler')
             ->addArgument($config['handlers']['datetime']['default_format'])
-            ->addArgument($config['handlers']['datetime']['default_timezone']);
+            ->addArgument($config['handlers']['datetime']['default_timezone'])
+            ->addArgument($config['handlers']['datetime']['cdata'])
+        ;
 
         // property naming
         $container