Fix review

dunglas · dunglas · commit 3ccd799249dc · 2020-04-21T12:47:49.000+02:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php
@@ -44,8 +44,15 @@ public function __construct($defaultContext = [], NameConverterInterface $nameCo
      */
     public function normalize($object, string $format = null, array $context = [])
     {
-        $payloadFieldsToSerialize = $context[self::PAYLOAD_FIELDS] ?? $this->defaultContext[self::PAYLOAD_FIELDS] ?? null;
-        if (\is_array($payloadFieldsToSerialize)) {
+        if (array_key_exists(self::PAYLOAD_FIELDS, $context)) {
+            $payloadFieldsToSerialize = $context[self::PAYLOAD_FIELDS];
+        } elseif (array_key_exists(self::PAYLOAD_FIELDS, $this->defaultContext)) {
+            $payloadFieldsToSerialize = $this->defaultContext[self::PAYLOAD_FIELDS];
+        } else {
+            $payloadFieldsToSerialize = [];
+        }
+
+        if (\is_array($payloadFieldsToSerialize) && [] !== $payloadFieldsToSerialize) {
             $payloadFieldsToSerialize = array_flip($payloadFieldsToSerialize);
         }
 
@@ -65,11 +72,11 @@ public function normalize($object, string $format = null, array $context = [])
 
             $constraint = $violation->getConstraint();
             if (
-                null !== $payloadFieldsToSerialize &&
+                [] !== $payloadFieldsToSerialize &&
                 $constraint &&
                 $constraint->payload &&
                 // If some or all payload fields are whitelisted, add them
-                $payloadFields = [] === $payloadFieldsToSerialize || true === $payloadFieldsToSerialize ? $constraint->payload : array_intersect_key($constraint->payload, $payloadFieldsToSerialize)
+                $payloadFields = null === $payloadFieldsToSerialize || true === $payloadFieldsToSerialize ? $constraint->payload : array_intersect_key($constraint->payload, $payloadFieldsToSerialize)
             ) {
                 $violationEntry['payload'] = $payloadFields;
             }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ConstraintViolationListNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ConstraintViolationListNormalizerTest.php
@@ -120,7 +120,7 @@ public function testNormalizePayloadFields($fields, array $expected = null)
         ]);
 
         $violation = $this->normalizer->normalize($list, null, [ConstraintViolationListNormalizer::PAYLOAD_FIELDS => $fields])['violations'][0];
-        if (null === $fields) {
+        if ([] === $fields) {
             $this->assertArrayNotHasKey('payload', $violation);
 
             return;
@@ -131,8 +131,8 @@ public function testNormalizePayloadFields($fields, array $expected = null)
     public function payloadFieldsProvider(): iterable
     {
         yield [['severity', 'anotherField1'], ['severity' => 'warning']];
-        yield [[], ['severity' => 'warning', 'anotherField2' => 'aValue']];
+        yield [null, ['severity' => 'warning', 'anotherField2' => 'aValue']];
         yield [true, ['severity' => 'warning', 'anotherField2' => 'aValue']];
-        yield [null];
+        yield [[]];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public function testNormalizePayloadFields($fields, array $expected = null)`
`120`	`120`	`]);`
`121`	`121`
`122`	`122`	`$violation = $this->normalizer->normalize($list, null, [ConstraintViolationListNormalizer::PAYLOAD_FIELDS => $fields])['violations'][0];`
`123`		`- if (null === $fields) {`
	`123`	`+ if ([] === $fields) {`
`124`	`124`	`$this->assertArrayNotHasKey('payload', $violation);`
`125`	`125`
`126`	`126`	`return;`
`@@ -131,8 +131,8 @@ public function testNormalizePayloadFields($fields, array $expected = null)`
`131`	`131`	`public function payloadFieldsProvider(): iterable`
`132`	`132`	`{`
`133`	`133`	`yield [['severity', 'anotherField1'], ['severity' => 'warning']];`
`134`		`- yield [[], ['severity' => 'warning', 'anotherField2' => 'aValue']];`
	`134`	`+ yield [null, ['severity' => 'warning', 'anotherField2' => 'aValue']];`
`135`	`135`	`yield [true, ['severity' => 'warning', 'anotherField2' => 'aValue']];`
`136`		`- yield [null];`
	`136`	`+ yield [[]];`
`137`	`137`	`}`
`138`	`138`	`}`