Skip to content

Commit 21d1f54

Browse files
committed
fix: graphql pagination service
1 parent 2b4b2df commit 21d1f54

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

src/Core/GraphQl/Type/FieldsBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
namespace ApiPlatform\Core\GraphQl\Type;
1515

16+
use ApiPlatform\Core\DataProvider\Pagination;
1617
use ApiPlatform\Core\GraphQl\Resolver\Factory\ResolverFactoryInterface as ResolverFactoryLegacyInterface;
1718
use ApiPlatform\Core\GraphQl\Type\TypesContainerInterface as TypesContainerLegacyInterface;
1819
use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface;
@@ -23,7 +24,6 @@
2324
use ApiPlatform\GraphQl\Resolver\Factory\ResolverFactoryInterface;
2425
use ApiPlatform\GraphQl\Type\Definition\TypeInterface;
2526
use ApiPlatform\GraphQl\Type\TypesContainerInterface;
26-
use ApiPlatform\State\Pagination\Pagination;
2727
use ApiPlatform\Util\Inflector;
2828
use GraphQL\Type\Definition\InputObjectType;
2929
use GraphQL\Type\Definition\NullableType;

src/Core/GraphQl/Type/TypeBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313

1414
namespace ApiPlatform\Core\GraphQl\Type;
1515

16+
use ApiPlatform\Core\DataProvider\Pagination;
1617
use ApiPlatform\Core\GraphQl\Type\TypesContainerInterface as TypesContainerLegacyInterface;
1718
use ApiPlatform\Core\Metadata\Resource\ResourceMetadata;
1819
use ApiPlatform\GraphQl\Serializer\ItemNormalizer;
1920
use ApiPlatform\GraphQl\Type\TypesContainerInterface;
20-
use ApiPlatform\State\Pagination\Pagination;
2121
use GraphQL\Type\Definition\InputObjectType;
2222
use GraphQL\Type\Definition\InterfaceType;
2323
use GraphQL\Type\Definition\NonNull;

src/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -839,8 +839,8 @@ private function registerLegacyServices(ContainerBuilder $container, array $conf
839839
$container->removeAlias('api_platform.graphql.schema_builder');
840840
$container->setAlias('api_platform.graphql.schema_builder', 'api_platform.graphql.schema_builder.legacy');
841841

842-
$container->removeDefinition('api_platform.pagination');
843-
$container->setDefinition('api_platform.pagination', $container->getDefinition('api_platform.pagination.legacy'));
842+
$container->removeAlias('api_platform.pagination');
843+
$container->setAlias('api_platform.pagination', 'api_platform.pagination.legacy');
844844

845845
foreach ([
846846
'api_platform.metadata.property.metadata_factory.serializer',

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,13 @@
2727
</service>
2828
<service id="ApiPlatform\Core\DataProvider\SubresourceDataProviderInterface" alias="api_platform.subresource_data_provider" />
2929

30-
<service id="api_platform.pagination" class="ApiPlatform\State\Pagination\Pagination">
30+
<service id="api_platform.pagination.next" class="ApiPlatform\State\Pagination\Pagination">
3131
<argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
3232
<argument>%api_platform.collection.pagination%</argument>
3333
<argument>%api_platform.graphql.collection.pagination%</argument>
3434
</service>
35-
<service id="ApiPlatform\State\Pagination\Pagination" alias="api_platform.pagination" />
35+
<service id="ApiPlatform\State\Pagination\Pagination" alias="api_platform.pagination.next" />
36+
<service id="api_platform.pagination" alias="api_platform.pagination.next" />
3637

3738
<service id="api_platform.pagination.legacy" class="ApiPlatform\Core\DataProvider\Pagination">
3839
<argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />

src/Symfony/Bundle/Resources/config/graphql.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
9090
<argument type="service" id="serializer" />
9191
<argument type="service" id="api_platform.graphql.serializer.context_builder" />
92-
<argument type="service" id="api_platform.pagination" />
92+
<argument type="service" id="api_platform.pagination.next" />
9393
</service>
9494

9595
<service id="api_platform.graphql.resolver.stage.deserialize" class="ApiPlatform\GraphQl\Resolver\Stage\DeserializeStage" public="false">
@@ -168,7 +168,7 @@
168168
<argument type="service" id="api_platform.graphql.types_container" />
169169
<argument type="service" id="api_platform.graphql.resolver.resource_field" />
170170
<argument type="service" id="api_platform.graphql.fields_builder_locator" />
171-
<argument type="service" id="api_platform.pagination" />
171+
<argument type="service" id="api_platform.pagination.legacy" />
172172
</service>
173173

174174
<service id="api_platform.graphql.type_builder" class="ApiPlatform\GraphQl\Type\TypeBuilder" public="false">
@@ -191,7 +191,7 @@
191191
<argument type="service" id="api_platform.graphql.resolver.factory.item_mutation" />
192192
<argument type="service" id="api_platform.graphql.resolver.factory.item_subscription" />
193193
<argument type="service" id="api_platform.filter_locator" />
194-
<argument type="service" id="api_platform.pagination" />
194+
<argument type="service" id="api_platform.pagination.legacy" />
195195
<argument type="service" id="api_platform.name_converter" on-invalid="ignore" />
196196
<argument>%api_platform.graphql.nesting_separator%</argument>
197197
</service>

0 commit comments

Comments
 (0)