Skip to content

Commit e357e34

Browse files
soyukasoyuka
committed
Merge 3.4
2 parents 6e15eb9 + 03d62b7 commit e357e34

File tree

25 files changed

+702
-149
lines changed

25 files changed

+702
-149
lines changed

‎features/hydra/collection.feature‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -586,3 +586,11 @@ Feature: Collections support
586586
}
587587
}
588588
"""
589+
590+
Scenario: Hydra collection without prefix
591+
When I send a "GET" request to "/no_hydra_prefixes"
592+
Then the response status code should be 200
593+
And the response should be in JSON
594+
And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
595+
And the JSON node "totalItems" should exist
596+
And the JSON node "member" should exist

‎src/Hydra/JsonSchema/SchemaFactory.php‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
namespace ApiPlatform\Hydra\JsonSchema;
1515

1616
use ApiPlatform\JsonLd\ContextBuilder;
17+
use ApiPlatform\JsonLd\Serializer\HydraPrefixTrait;
1718
use ApiPlatform\JsonSchema\Schema;
1819
use ApiPlatform\JsonSchema\SchemaFactoryAwareInterface;
1920
use ApiPlatform\JsonSchema\SchemaFactoryInterface;
@@ -26,6 +27,7 @@
2627
*/
2728
final class SchemaFactory implements SchemaFactoryInterface, SchemaFactoryAwareInterface
2829
{
30+
use HydraPrefixTrait;
2931
private const BASE_PROP = [
3032
'readOnly' => true,
3133
'type' => 'string',
@@ -57,7 +59,7 @@ final class SchemaFactory implements SchemaFactoryInterface, SchemaFactoryAwareI
5759
],
5860
] + self::BASE_PROPS;
5961

60-
public function __construct(private readonly SchemaFactoryInterface $schemaFactory)
62+
public function __construct(private readonly SchemaFactoryInterface $schemaFactory, private readonly array $defaultContext = [])
6163
{
6264
if ($this->schemaFactory instanceof SchemaFactoryAwareInterface) {
6365
$this->schemaFactory->setSchemaFactory($this);
@@ -105,17 +107,18 @@ public function buildSchema(string $className, string $format = 'jsonld', string
105107
break;
106108
}
107109

110+
$hydraPrefix = $this->getHydraPrefix(($serializerContext ?? []) + $this->defaultContext);
108111
$schema['type'] = 'object';
109112
$schema['properties'] = [
110-
'hydra:member' => [
113+
$hydraPrefix.'member' => [
111114
'type' => 'array',
112115
'items' => $items,
113116
],
114-
'hydra:totalItems' => [
117+
$hydraPrefix.'totalItems' => [
115118
'type' => 'integer',
116119
'minimum' => 0,
117120
],
118-
'hydra:view' => [
121+
$hydraPrefix.'view' => [
119122
'type' => 'object',
120123
'properties' => [
121124
'@id' => [
@@ -125,39 +128,39 @@ public function buildSchema(string $className, string $format = 'jsonld', string
125128
'@type' => [
126129
'type' => 'string',
127130
],
128-
'hydra:first' => [
131+
$hydraPrefix.'first' => [
129132
'type' => 'string',
130133
'format' => 'iri-reference',
131134
],
132-
'hydra:last' => [
135+
$hydraPrefix.'last' => [
133136
'type' => 'string',
134137
'format' => 'iri-reference',
135138
],
136-
'hydra:previous' => [
139+
$hydraPrefix.'previous' => [
137140
'type' => 'string',
138141
'format' => 'iri-reference',
139142
],
140-
'hydra:next' => [
143+
$hydraPrefix.'next' => [
141144
'type' => 'string',
142145
'format' => 'iri-reference',
143146
],
144147
],
145148
'example' => [
146149
'@id' => 'string',
147150
'type' => 'string',
148-
'hydra:first' => 'string',
149-
'hydra:last' => 'string',
150-
'hydra:previous' => 'string',
151-
'hydra:next' => 'string',
151+
$hydraPrefix.'first' => 'string',
152+
$hydraPrefix.'last' => 'string',
153+
$hydraPrefix.'previous' => 'string',
154+
$hydraPrefix.'next' => 'string',
152155
],
153156
],
154-
'hydra:search' => [
157+
$hydraPrefix.'search' => [
155158
'type' => 'object',
156159
'properties' => [
157160
'@type' => ['type' => 'string'],
158-
'hydra:template' => ['type' => 'string'],
159-
'hydra:variableRepresentation' => ['type' => 'string'],
160-
'hydra:mapping' => [
161+
$hydraPrefix.'template' => ['type' => 'string'],
162+
$hydraPrefix.'variableRepresentation' => ['type' => 'string'],
163+
$hydraPrefix.'mapping' => [
161164
'type' => 'array',
162165
'items' => [
163166
'type' => 'object',
@@ -173,7 +176,7 @@ public function buildSchema(string $className, string $format = 'jsonld', string
173176
],
174177
];
175178
$schema['required'] = [
176-
'hydra:member',
179+
$hydraPrefix.'member',
177180
];
178181

179182
return $schema;

‎src/Hydra/Serializer/CollectionFiltersNormalizer.php‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
use ApiPlatform\Doctrine\Odm\State\Options as ODMOptions;
1717
use ApiPlatform\Doctrine\Orm\State\Options;
18+
use ApiPlatform\JsonLd\Serializer\HydraPrefixTrait;
1819
use ApiPlatform\Metadata\FilterInterface;
1920
use ApiPlatform\Metadata\Parameter;
2021
use ApiPlatform\Metadata\Parameters;
@@ -34,13 +35,20 @@
3435
*/
3536
final class CollectionFiltersNormalizer implements NormalizerInterface, NormalizerAwareInterface
3637
{
38+
use HydraPrefixTrait;
3739
private ?ContainerInterface $filterLocator = null;
3840

3941
/**
40-
* @param ContainerInterface $filterLocator The new filter locator or the deprecated filter collection
42+
* @param ContainerInterface $filterLocator The new filter locator or the deprecated filter collection
43+
* @param array<string, mixed> $defaultContext
4144
*/
42-
public function __construct(private readonly NormalizerInterface $collectionNormalizer, private readonly ResourceMetadataCollectionFactoryInterface $resourceMetadataCollectionFactory, private readonly ResourceClassResolverInterface $resourceClassResolver, ContainerInterface $filterLocator)
43-
{
45+
public function __construct(
46+
private readonly NormalizerInterface $collectionNormalizer,
47+
private readonly ResourceMetadataCollectionFactoryInterface $resourceMetadataCollectionFactory,
48+
private readonly ResourceClassResolverInterface $resourceClassResolver,
49+
ContainerInterface $filterLocator,
50+
private readonly array $defaultContext = [],
51+
) {
4452
$this->filterLocator = $filterLocator;
4553
}
4654

@@ -105,7 +113,8 @@ public function normalize(mixed $object, ?string $format = null, array $context
105113
}
106114

107115
if ($currentFilters || ($parameters && \count($parameters))) {
108-
$data['hydra:search'] = $this->getSearch($resourceClass, $requestParts, $currentFilters, $parameters);
116+
$hydraPrefix = $this->getHydraPrefix($context + $this->defaultContext);
117+
$data[$hydraPrefix.'search'] = $this->getSearch($resourceClass, $requestParts, $currentFilters, $parameters, $hydraPrefix);
109118
}
110119

111120
return $data;
@@ -127,7 +136,7 @@ public function setNormalizer(NormalizerInterface $normalizer): void
127136
* @param FilterInterface[] $filters
128137
* @param array<string, Parameter> $parameters
129138
*/
130-
private function getSearch(string $resourceClass, array $parts, array $filters, array|Parameters|null $parameters): array
139+
private function getSearch(string $resourceClass, array $parts, array $filters, array|Parameters|null $parameters, string $hydraPrefix): array
131140
{
132141
$variables = [];
133142
$mapping = [];
@@ -177,7 +186,7 @@ private function getSearch(string $resourceClass, array $parts, array $filters,
177186
$mapping[] = $m;
178187
}
179188

180-
return ['@type' => 'hydra:IriTemplate', 'hydra:template' => \sprintf('%s{?%s}', $parts['path'], implode(',', $variables)), 'hydra:variableRepresentation' => 'BasicRepresentation', 'hydra:mapping' => $mapping];
189+
return ['@type' => $hydraPrefix.'IriTemplate', $hydraPrefix.'template' => \sprintf('%s{?%s}', $parts['path'], implode(',', $variables)), $hydraPrefix.'variableRepresentation' => 'BasicRepresentation', $hydraPrefix.'mapping' => $mapping];
181190
}
182191

183192
/**

‎src/Hydra/Serializer/CollectionNormalizer.php‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
namespace ApiPlatform\Hydra\Serializer;
1515

1616
use ApiPlatform\JsonLd\ContextBuilderInterface;
17+
use ApiPlatform\JsonLd\Serializer\HydraPrefixTrait;
1718
use ApiPlatform\JsonLd\Serializer\JsonLdContextTrait;
1819
use ApiPlatform\Metadata\IriConverterInterface;
1920
use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
@@ -31,6 +32,7 @@
3132
*/
3233
final class CollectionNormalizer extends AbstractCollectionNormalizer
3334
{
35+
use HydraPrefixTrait;
3436
use JsonLdContextTrait;
3537

3638
public const FORMAT = 'jsonld';
@@ -56,18 +58,19 @@ public function __construct(private readonly ContextBuilderInterface $contextBui
5658
protected function getPaginationData(iterable $object, array $context = []): array
5759
{
5860
$resourceClass = $this->resourceClassResolver->getResourceClass($object, $context['resource_class']);
61+
$hydraPrefix = $this->getHydraPrefix($context + $this->defaultContext);
5962
// This adds "jsonld_has_context" by reference, we moved the code to this class.
6063
// To follow a note I wrote in the ItemNormalizer, we need to change the JSON-LD context generation as it is more complicated then it should.
6164
$data = $this->addJsonLdContext($this->contextBuilder, $resourceClass, $context);
6265
$data['@id'] = $this->iriConverter->getIriFromResource($resourceClass, UrlGeneratorInterface::ABS_PATH, $context['operation'] ?? null, $context);
63-
$data['@type'] = 'hydra:Collection';
66+
$data['@type'] = $hydraPrefix.'Collection';
6467

6568
if ($object instanceof PaginatorInterface) {
66-
$data['hydra:totalItems'] = $object->getTotalItems();
69+
$data[$hydraPrefix.'totalItems'] = $object->getTotalItems();
6770
}
6871

6972
if (\is_array($object) || ($object instanceof \Countable && !$object instanceof PartialPaginatorInterface)) {
70-
$data['hydra:totalItems'] = \count($object);
73+
$data[$hydraPrefix.'totalItems'] = \count($object);
7174
}
7275

7376
return $data;
@@ -78,15 +81,15 @@ protected function getPaginationData(iterable $object, array $context = []): arr
7881
*/
7982
protected function getItemsData(iterable $object, ?string $format = null, array $context = []): array
8083
{
81-
$data = [];
82-
$data['hydra:member'] = [];
84+
$hydraPrefix = $this->getHydraPrefix($context + $this->defaultContext);
85+
$data = [$hydraPrefix.'member' => []];
8386
$iriOnly = $context[self::IRI_ONLY] ?? $this->defaultContext[self::IRI_ONLY];
8487

8588
foreach ($object as $obj) {
8689
if ($iriOnly) {
87-
$data['hydra:member'][] = $this->iriConverter->getIriFromResource($obj);
90+
$data[$hydraPrefix.'member'][] = $this->iriConverter->getIriFromResource($obj);
8891
} else {
89-
$data['hydra:member'][] = $this->normalizer->normalize($obj, $format, $context + ['jsonld_has_context' => true]);
92+
$data[$hydraPrefix.'member'][] = $this->normalizer->normalize($obj, $format, $context + ['jsonld_has_context' => true]);
9093
}
9194
}
9295

‎src/Hydra/Serializer/ConstraintViolationListNormalizer.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
namespace ApiPlatform\Hydra\Serializer;
1515

16+
use ApiPlatform\JsonLd\Serializer\HydraPrefixTrait;
1617
use ApiPlatform\Serializer\AbstractConstraintViolationListNormalizer;
1718
use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
1819

@@ -23,6 +24,7 @@
2324
*/
2425
final class ConstraintViolationListNormalizer extends AbstractConstraintViolationListNormalizer
2526
{
27+
use HydraPrefixTrait;
2628
public const FORMAT = 'jsonld';
2729

2830
public function __construct(?array $serializePayloadFields = null, ?NameConverterInterface $nameConverter = null)

0 commit comments

Comments
 (0)