Revert "Add a skipNullValues() method"

dunglas · dunglas · commit 0e158f74e564 · 2018-10-02T17:03:58.000+02:00
This reverts commit c76527b.
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -37,20 +37,15 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
     const DISABLE_TYPE_ENFORCEMENT = 'disable_type_enforcement';
     const SKIP_NULL_VALUES = 'skip_null_values';
 
-    /**
-     * @var callable|null
-     */
-    protected $maxDepthHandler;
-
-    /**
-     * @var bool
-     */
-    protected $skipNullValues = false;
-
     private $propertyTypeExtractor;
     private $typesCache = array();
     private $attributesCache = array();
 
+    /**
+     * @var callable|null
+     */
+    private $maxDepthHandler;
+
     /**
      * @var ClassDiscriminatorResolverInterface|null
      */
@@ -226,14 +221,6 @@ public function setMaxDepthHandler(?callable $handler): void
         $this->maxDepthHandler = $handler;
     }
 
-    /**
-     * Configures the normalizer to skip null values.
-     */
-    public function skipNullValues()
-    {
-        $this->skipNullValues = true;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -416,7 +403,7 @@ private function getTypes(string $currentClass, string $attribute)
      */
     private function updateData(array $data, string $attribute, $attributeValue, string $class, ?string $format, array $context): array
     {
-        if (null === $attributeValue && ($this->skipNullValues || ($context[self::SKIP_NULL_VALUES] ?? false))) {
+        if (null === $attributeValue && ($context[self::SKIP_NULL_VALUES] ?? false)) {
             return $data;
         }
 
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -170,10 +170,6 @@ public function testSkipNullValues()
         $normalizer = new ObjectNormalizer();
         $result = $normalizer->normalize($dummy, null, array(AbstractObjectNormalizer::SKIP_NULL_VALUES => true));
         $this->assertSame(array('bar' => 'present'), $result);
-
-        $normalizer->skipNullValues();
-        $result = $normalizer->normalize($dummy);
-        $this->assertSame(array('bar' => 'present'), $result);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -170,10 +170,6 @@ public function testSkipNullValues()`
`170`	`170`	`$normalizer = new ObjectNormalizer();`
`171`	`171`	`$result = $normalizer->normalize($dummy, null, array(AbstractObjectNormalizer::SKIP_NULL_VALUES => true));`
`172`	`172`	`$this->assertSame(array('bar' => 'present'), $result);`
`173`		`-`
`174`		`- $normalizer->skipNullValues();`
`175`		`- $result = $normalizer->normalize($dummy);`
`176`		`- $this->assertSame(array('bar' => 'present'), $result);`
`177`	`173`	`}`
`178`	`174`	`}`
`179`	`175`