Selaa lähdekoodia

reverted changes to configuration

Johannes Schmitt 12 vuotta sitten
vanhempi
commit
1863fc8852

+ 0 - 10
DependencyInjection/Configuration.php

@@ -123,7 +123,6 @@ class Configuration implements ConfigurationInterface
                     ->arrayNode('json')
                         ->addDefaultsIfNotSet()
                         ->children()
-                            ->booleanNode('serialize_null')->defaultFalse()->end()
                             ->scalarNode('options')
                                 ->defaultValue(0)
                                 ->beforeNormalization()
@@ -174,15 +173,6 @@ class Configuration implements ConfigurationInterface
                             ->arrayNode('doctype_whitelist')
                                 ->prototype('scalar')->end()
                             ->end()
-                            ->booleanNode('serialize_null')->defaultFalse()->end()
-                        ->end()
-                    ->end()
-                ->end()
-                ->children()
-                    ->arrayNode('yaml')
-                        ->addDefaultsIfNotSet()
-                        ->children()
-                            ->booleanNode('serialize_null')->defaultFalse()->end()
                         ->end()
                     ->end()
                 ->end()

+ 0 - 12
DependencyInjection/JMSSerializerExtension.php

@@ -114,18 +114,6 @@ class JMSSerializerExtension extends ConfigurableExtension
         $container
             ->setParameter('jms_serializer.json_serialization_visitor.options', $config['visitors']['json']['options'])
         ;
-
-        $container
-            ->setParameter('jms_serializer.json_serialization_visitor.serialize_null', $config['visitors']['json']['serialize_null'])
-        ;
-
-        $container
-            ->setParameter('jms_serializer.xml_serialization_visitor.serialize_null', $config['visitors']['xml']['serialize_null'])
-        ;
-
-        $container
-            ->setParameter('jms_serializer.yaml_serialization_visitor.serialize_null', $config['visitors']['yaml']['serialize_null'])
-        ;
     }
 
     public function getConfiguration(array $config, ContainerBuilder $container)

+ 0 - 9
Resources/config/services.xml

@@ -166,9 +166,6 @@
             <call method="setOptions">
                 <argument>%jms_serializer.json_serialization_visitor.options%</argument>
             </call>
-            <call method="setSerializeNull">
-                <argument>%jms_serializer.json_serialization_visitor.serialize_null%</argument>
-            </call>
             <tag name="jms_serializer.serialization_visitor" format="json" />
         </service>
         <service id="jms_serializer.json_deserialization_visitor" class="%jms_serializer.json_deserialization_visitor.class%" public="false">
@@ -178,9 +175,6 @@
         </service>
         <service id="jms_serializer.xml_serialization_visitor" class="%jms_serializer.xml_serialization_visitor.class%" public="false">
             <argument type="service" id="jms_serializer.naming_strategy" />
-            <call method="setSerializeNull">
-                <argument>%jms_serializer.xml_serialization_visitor.serialize_null%</argument>
-            </call>
             <tag name="jms_serializer.serialization_visitor" format="xml" />
         </service>
         <service id="jms_serializer.xml_deserialization_visitor" class="%jms_serializer.xml_deserialization_visitor.class%" public="false">
@@ -193,9 +187,6 @@
         </service>
         <service id="jms_serializer.yaml_serialization_visitor" class="%jms_serializer.yaml_serialization_visitor.class%" public="false">
             <argument type="service" id="jms_serializer.naming_strategy" />
-            <call method="setSerializeNull">
-                <argument>%jms_serializer.yaml_serialization_visitor.serialize_null%</argument>
-            </call>
             <tag name="jms_serializer.serialization_visitor" format="yml" />
         </service>
     </services>

+ 0 - 4
Resources/doc/configuration.rst

@@ -53,13 +53,9 @@ values:
             visitors:
                 json:
                     options: 0 # json_encode options bitmask
-                    serialize_null: false # whether to preserve keys with null values
                 xml:
-                    serialize_null: false
                     doctype_whitelist:
                         - '<!DOCTYPE authorized SYSTEM "http://some_url">' # an authorized document type for xml deserialization
-                yaml:
-                    serialize_null: false
 
     .. code-block :: xml