Merge 8f244a3 into fc9122c

Author: soyuka

features/hydra/docs.feature

@@ -76,8 +76,8 @@ Feature: Documentation support
  And the value of the node "@type" of the operation "GET" of the Hydra class "Dummy" contains "hydra:Operation"
  And the value of the node "@type" of the operation "GET" of the Hydra class "Dummy" contains "schema:FindAction"
  And the value of the node "hydra:method" of the operation "GET" of the Hydra class "Dummy" is "GET"
- And the value of the node "hydra:title" of the operation "GET" of the Hydra class "Dummy" is "Retrieves Dummy resource."
- And the value of the node "rdfs:label" of the operation "GET" of the Hydra class "Dummy" is "Retrieves Dummy resource."
+ And the value of the node "hydra:title" of the operation "GET" of the Hydra class "Dummy" is "Retrieves a Dummy resource."
+ And the value of the node "rdfs:label" of the operation "GET" of the Hydra class "Dummy" is "Retrieves a Dummy resource."
  And the value of the node "returns" of the operation "GET" of the Hydra class "Dummy" is "#Dummy"
  And the value of the node "hydra:title" of the operation "PUT" of the Hydra class "Dummy" is "Replaces the Dummy resource."
  And the value of the node "hydra:title" of the operation "DELETE" of the Hydra class "Dummy" is "Deletes the Dummy resource."

src/Api/IdentifiersExtractor.php

@@ -113,6 +113,6 @@ private function resolveIdentifierValue($item, string $class, string $property)
  }
  }
 
- throw new \RuntimeException('Not able to retrieve identifiers.');
+ throw new RuntimeException('Not able to retrieve identifiers.');
  }
 }

src/Core/Bridge/Doctrine/Orm/Extension/PaginationExtension.php

@@ -199,11 +199,9 @@ private function getPagination(QueryBuilder $queryBuilder, string $resourceClass
  }
 
  if (null === $request) {
- if (!$this->pagination->isEnabled($resourceClass, $operationName, $context)) {
- return null;
- }
+ $enabled = isset($context['graphql_operation_name']) ? $this->pagination->isGraphQlEnabled($resourceClass, $operationName, $context) : $this->pagination->isEnabled($resourceClass, $operationName, $context);
 
- if (($context['graphql_operation_name'] ?? false) && !$this->pagination->isGraphQlEnabled($resourceClass, $operationName, $context)) {
+ if (!$enabled) {
  return null;
  }
 

src/Core/Bridge/Symfony/Bundle/Resources/config/data_provider.xml

@@ -28,7 +28,7 @@
  <service id="ApiPlatform\Core\DataProvider\SubresourceDataProviderInterface" alias="api_platform.subresource_data_provider" />
 
  <service id="api_platform.pagination" class="ApiPlatform\Core\DataProvider\Pagination">
- <argument type="service" id="api_platform.metadata.resource.metadata_factory" />
+ <argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
  <argument>%api_platform.collection.pagination%</argument>
  <argument>%api_platform.graphql.collection.pagination%</argument>
  </service>

src/Core/Bridge/Symfony/Bundle/Resources/config/hydra.xml

@@ -12,7 +12,7 @@
  <argument type="service" id="api_platform.resource_class_resolver" />
  <argument>null</argument>
  <argument type="service" id="api_platform.router" />
- <argument type="service" id="api_platform.subresource_operation_factory" />
+ <argument>null</argument>
  <argument type="service" id="api_platform.name_converter" on-invalid="ignore" />
 
  <tag name="serializer.normalizer" priority="-800" />

src/Core/Bridge/Symfony/Bundle/Resources/config/metadata/metadata.xml

@@ -69,7 +69,7 @@
  </service>
 
  <service id="api_platform.metadata.property.metadata_factory.serializer" class="ApiPlatform\Metadata\Property\Factory\SerializerPropertyMetadataFactory" decorates="api_platform.metadata.property.metadata_factory" decoration-priority="30" public="false">
- <argument type="service" id="api_platform.metadata.resource.metadata_factory" />
+ <argument>null</argument>
  <argument type="service" id="serializer.mapping.class_metadata_factory" />
  <argument type="service" id="api_platform.metadata.property.metadata_factory.serializer.inner" />
  <argument type="service" id="api_platform.resource_class_resolver" />

src/Core/DataProvider/Pagination.php

@@ -135,9 +135,13 @@ public function getLimit(string $resourceClass = null, string $operationName = n
  $limit = $resourceMetadata->getCollectionOperationAttribute($operationName, 'pagination_items_per_page', $limit, true);
  $clientLimit = $resourceMetadata->getCollectionOperationAttribute($operationName, 'pagination_client_items_per_page', $clientLimit, true);
  } else {
- $operation = $resourceMetadata->getOperation($operationName);
- $limit = $operation->getPaginationItemsPerPage() ?? $limit;
- $clientLimit = $operation->getPaginationClientItemsPerPage() ?? $clientLimit;
+ try {
+ $operation = $graphql ? $resourceMetadata->getGraphQlOperation($operationName) : $resourceMetadata->getOperation($operationName);
+ $limit = $operation->getPaginationItemsPerPage() ?? $limit;
+ $clientLimit = $operation->getPaginationClientItemsPerPage() ?? $clientLimit;
+ } catch (OperationNotFoundException $e) {
+ // GraphQl operation may not exist
+ }
  }
  }
 
@@ -165,8 +169,12 @@ public function getLimit(string $resourceClass = null, string $operationName = n
  }
  $maxItemsPerPage = $resourceMetadata->getCollectionOperationAttribute($operationName, 'pagination_maximum_items_per_page', $maxItemsPerPage ?? $this->options['maximum_items_per_page'], true);
  } elseif ($resourceMetadata instanceof ResourceMetadataCollection) {
- $operation = $resourceMetadata->getOperation($operationName);
- $maxItemsPerPage = $operation->getPaginationMaximumItemsPerPage() ?? $this->options['maximum_items_per_page'];
+ try {
+ $operation = $graphql ? $resourceMetadata->getGraphQlOperation($operationName) : $resourceMetadata->getOperation($operationName);
+ $maxItemsPerPage = $operation->getPaginationMaximumItemsPerPage() ?? $this->options['maximum_items_per_page'];
+ } catch (OperationNotFoundException $e) {
+ $maxItemsPerPage = $this->options['maximum_items_per_page'];
+ }
  }
 
  if (null !== $maxItemsPerPage && $limit > $maxItemsPerPage) {
@@ -263,9 +271,13 @@ private function getEnabled(array $context, string $resourceClass = null, string
  $resourceMetadata = $this->resourceMetadataFactory->create($resourceClass);
 
  if ($resourceMetadata instanceof ResourceMetadataCollection) {
- $operation = $resourceMetadata->getOperation($operationName);
- $enabled = $partial ? $operation->getPaginationPartial() : $operation->getPaginationEnabled();
- $clientEnabled = $partial ? $operation->getPaginationClientPartial() : $operation->getPaginationClientEnabled();
+ try {
+ $operation = isset($context['graphql_operation_name']) ? $resourceMetadata->getGraphQlOperation($operationName) : $resourceMetadata->getOperation($operationName);
+ $enabled = ($partial ? $operation->getPaginationPartial() : $operation->getPaginationEnabled()) ?? $enabled;
+ $clientEnabled = ($partial ? $operation->getPaginationClientPartial() : $operation->getPaginationClientEnabled()) ?? $clientEnabled;
+ } catch (OperationNotFoundException $e) {
+ // GraphQl operation may not exist
+ }
  } else {
  $enabled = $resourceMetadata->getCollectionOperationAttribute($operationName, $partial ? 'pagination_partial' : 'pagination_enabled', $enabled, true);
  $clientEnabled = $resourceMetadata->getCollectionOperationAttribute($operationName, $partial ? 'pagination_client_partial' : 'pagination_client_enabled', $clientEnabled, true);