Skip to content

fix: defaults when using attributes #3978

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

Merged
merged 1 commit into from
Jan 24, 2021
Merged

fix: defaults when using attributes #3978

Show file tree
Hide file tree
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
10 changes: 9 additions & 1 deletion src/Metadata/Resource/Factory/AnnotationResourceMetadataFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,15 @@ private function handleNotFound(?ResourceMetadata $parentPropertyMetadata, strin

private function createMetadata(ApiResource $annotation, ResourceMetadata $parentResourceMetadata = null): ResourceMetadata
{
$attributes = (null === $annotation->attributes && [] === $this->defaults['attributes']) ? null : (array) $annotation->attributes + $this->defaults['attributes'];
$attributes = null;
if (null !== $annotation->attributes || [] !== $this->defaults['attributes']) {
$attributes = (array) $annotation->attributes;
foreach ($this->defaults['attributes'] as $key => $value) {
if (!isset($attributes[$key])) {
$attributes[$key] = $value;
}
}
}

if (!$parentResourceMetadata) {
return new ResourceMetadata(
Expand Down
10 changes: 9 additions & 1 deletion src/Metadata/Resource/Factory/ExtractorResourceMetadataFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,15 @@ public function create(string $resourceClass): ResourceMetadata
$resource['itemOperations'] = $resource['itemOperations'] ?? $this->defaults['item_operations'] ?? null;
$resource['collectionOperations'] = $resource['collectionOperations'] ?? $this->defaults['collection_operations'] ?? null;
$resource['graphql'] = $resource['graphql'] ?? $this->defaults['graphql'] ?? null;
$resource['attributes'] = (null === $resource['attributes'] && [] === $this->defaults['attributes']) ? null : (array) $resource['attributes'] + $this->defaults['attributes'];

if (null !== $resource['attributes'] || [] !== $this->defaults['attributes']) {
$resource['attributes'] = (array) $resource['attributes'];
foreach ($this->defaults['attributes'] as $key => $value) {
if (!isset($resource['attributes'][$key])) {
$resource['attributes'][$key] = $value;
}
}
}

return $this->update($parentResourceMetadata ?: new ResourceMetadata(), $resource);
}
Expand Down
1 change: 1 addition & 0 deletions tests/Metadata/Resource/Factory/AnnotationResourceMetadataFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ public function testCreateWithDefaults()
'attributes' => [
'pagination_client_enabled' => true,
'pagination_maximum_items_per_page' => 10,
'stateless' => null,
],
]);
$reader = $this->prophesize(Reader::class);
Expand Down
1 change: 1 addition & 0 deletions tests/Metadata/Resource/Factory/ExtractorResourceMetadataFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ public function testItFallbacksToDefaultConfiguration()
'subresourceOperations' => null,
'itemOperations' => ['get', 'delete'],
'attributes' => [
'pagination_items_per_page' => null,
'pagination_maximum_items_per_page' => 10,
'stateless' => false,
],
Expand Down