Skip to content

Commit 37a2787

Browse files
committed
Review
1 parent 01eacf5 commit 37a2787

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

src/Bridge/Symfony/Bundle/DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public function getConfigTreeBuilder()
9494
->arrayNode('validator')
9595
->addDefaultsIfNotSet()
9696
->children()
97-
->variableNode('serialize_payload_fields')->defaultNull()->info('Enable the serialization of payload fields when a validation error is thrown.')->end()
97+
->variableNode('serialize_payload_fields')->defaultValue([])->info('Set to null to serializer all payload fields when a validation error is thrown, or set the fields you want to include explicitly.')->end()
9898
->end()
9999
->end()
100100
->arrayNode('eager_loading')

src/Serializer/AbstractConstraintViolationListNormalizer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ protected function getMessagesAndViolations(ConstraintViolationListInterface $co
6767

6868
$constraint = $violation->getConstraint();
6969
if (
70-
null !== $this->serializePayloadFields &&
70+
[] !== $this->serializePayloadFields &&
7171
$constraint &&
7272
$constraint->payload &&
7373
// If some fields are whitelisted, only them are added
74-
$payloadFields = [] === $this->serializePayloadFields ? $constraint->payload : array_intersect_key($constraint->payload, $this->serializePayloadFields)
74+
$payloadFields = null === $this->serializePayloadFields ? $constraint->payload : array_intersect_key($constraint->payload, $this->serializePayloadFields)
7575
) {
7676
$violationData['payload'] = $payloadFields;
7777
}

tests/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1112,7 +1112,7 @@ private function getBaseContainerBuilderProphecy(array $doctrineIntegrationsToLo
11121112
'api_platform.graphql.graphiql.enabled' => true,
11131113
'api_platform.graphql.graphql_playground.enabled' => true,
11141114
'api_platform.resource_class_directories' => Argument::type('array'),
1115-
'api_platform.validator.serialize_payload_fields' => null,
1115+
'api_platform.validator.serialize_payload_fields' => [],
11161116
'api_platform.elasticsearch.enabled' => false,
11171117
];
11181118

tests/Bridge/Symfony/Bundle/DependencyInjection/ConfigurationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ private function runDefaultConfigTests(array $doctrineIntegrationsToLoad = ['orm
104104
'default_operation_path_resolver' => 'api_platform.operation_path_resolver.underscore',
105105
'path_segment_name_generator' => 'api_platform.path_segment_name_generator.underscore',
106106
'validator' => [
107-
'serialize_payload_fields' => null,
107+
'serialize_payload_fields' => [],
108108
],
109109
'name_converter' => null,
110110
'enable_fos_user' => true,

tests/Hydra/Serializer/ConstraintViolationNormalizerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function testNormalize(?array $fields, array $result)
9090
public function payloadFieldsProvider(): iterable
9191
{
9292
yield [['severity', 'anotherField1'], ['severity' => 'warning']];
93-
yield [[], ['severity' => 'warning', 'anotherField2' => 'aValue']];
94-
yield [null, []];
93+
yield [null, ['severity' => 'warning', 'anotherField2' => 'aValue']];
94+
yield [[], []];
9595
}
9696
}

0 commit comments

Comments
 (0)