Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(jsonld): mitigate #6465 #6469

Merged
merged 1 commit into from
Jul 15, 2024
Merged

fix(jsonld): mitigate #6465 #6469

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions src/Serializer/AbstractItemNormalizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,7 @@ public function normalize(mixed $object, ?string $format = null, array $context
// Never remove this, with `application/json` we don't use our AbstractCollectionNormalizer and we need
// to remove the collection operation from our context or we'll introduce security issues
if (isset($context['operation']) && $context['operation'] instanceof CollectionOperationInterface) {
unset($context['operation_name']);
unset($context['operation']);
unset($context['iri']);
unset($context['operation_name'], $context['operation'], $context['iri']);
}

if ($this->resourceClassResolver->isResourceClass($resourceClass)) {
Expand Down Expand Up @@ -176,8 +174,7 @@ public function normalize(mixed $object, ?string $format = null, array $context
$data = parent::normalize($object, $format, $context);

$context['data'] = $data;
unset($context['property_metadata']);
unset($context['api_attribute']);
unset($context['property_metadata'], $context['api_attribute']);

if ($emptyResourceAsIri && \is_array($data) && 0 === \count($data)) {
$context['data'] = $iri;
Expand Down Expand Up @@ -761,6 +758,7 @@ protected function getAttributeValue(object $object, string $attribute, ?string
unset(
$context['resource_class'],
$context['force_resource_class'],
$context['uri_variables'],
);

// Anonymous resources
Expand Down Expand Up @@ -791,8 +789,11 @@ protected function getAttributeValue(object $object, string $attribute, ?string
throw new LogicException(sprintf('The injected serializer must be an instance of "%s".', NormalizerInterface::class));
}

unset($context['resource_class']);
unset($context['force_resource_class']);
unset(
$context['resource_class'],
$context['force_resource_class'],
$context['uri_variables']
);

$attributeValue = $this->propertyAccessor->getValue($object, $attribute);

Expand Down Expand Up @@ -850,8 +851,7 @@ protected function normalizeRelation(ApiProperty $propertyMetadata, ?object $rel
$context['iri'] = $iri = $this->iriConverter->getIriFromResource(resource: $relatedObject, context: $context);
$context['data'] = $iri;
$context['object'] = $relatedObject;
unset($context['property_metadata']);
unset($context['api_attribute']);
unset($context['property_metadata'], $context['api_attribute']);

if ($this->tagCollector) {
$this->tagCollector->collect($context);
Expand Down Expand Up @@ -909,6 +909,7 @@ private function createAndValidateAttributeValue(string $attribute, mixed $value
) {
$resourceClass = $this->resourceClassResolver->getResourceClass(null, $className);
$context['resource_class'] = $resourceClass;
unset($context['uri_variables']);

return $this->denormalizeCollection($attribute, $propertyMetadata, $type, $resourceClass, $value, $format, $context);
}
Expand All @@ -933,7 +934,7 @@ private function createAndValidateAttributeValue(string $attribute, mixed $value
throw new LogicException(sprintf('The injected serializer must be an instance of "%s".', DenormalizerInterface::class));
}

unset($context['resource_class']);
unset($context['resource_class'], $context['uri_variables']);

return $this->serializer->denormalize($value, $className.'[]', $format, $context);
}
Expand All @@ -943,7 +944,7 @@ private function createAndValidateAttributeValue(string $attribute, mixed $value
throw new LogicException(sprintf('The injected serializer must be an instance of "%s".', DenormalizerInterface::class));
}

unset($context['resource_class']);
unset($context['resource_class'], $context['uri_variables']);

return $this->serializer->denormalize($value, $className, $format, $context);
}
Expand Down
Loading