Skip to content

Commit 7212b99

Browse files
authored
chore: remove deprecation (api-platform#6508)
1 parent ad2d5a7 commit 7212b99

5 files changed

+4
-78
lines changed

phpunit.baseline.xml

-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
<?xml version="1.0"?>
22
<files version="1">
3-
<file path="src/GraphQl/Type/SchemaBuilder.php">
4-
<line number="38" hash="7d00ace41a693456ebf14737d43e79ae5f77c386">
5-
<issue><![CDATA[$fieldsBuilder argument of SchemaBuilder implementing "ApiPlatform\GraphQl\Type\FieldsBuilderInterface" is deprecated since API Platform 3.1. It has to implement "ApiPlatform\GraphQl\Type\FieldsBuilderEnumInterface" instead.]]></issue>
6-
</line>
7-
</file>
83
<file path="vendor/symfony/deprecation-contracts/function.php">
94
<line number="25" hash="c6af5d66288d0667e424978000f29571e4954b81">
105
<issue><![CDATA[Since symfony/validator 7.1: Not passing a value for the "requireTld" option to the Url constraint is deprecated. Its default value will change to "true".]]></issue>

src/GraphQl/Type/FieldsBuilder.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
*
4848
* @author Alan Poulain <[email protected]>
4949
*/
50-
final class FieldsBuilder implements FieldsBuilderInterface, FieldsBuilderEnumInterface
50+
final class FieldsBuilder implements FieldsBuilderEnumInterface
5151
{
5252
private readonly ContextAwareTypeBuilderInterface $typeBuilder;
5353

src/GraphQl/Type/FieldsBuilderInterface.php

-61
This file was deleted.

src/GraphQl/Type/SchemaBuilder.php

+1-4
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,8 @@
3232
*/
3333
final class SchemaBuilder implements SchemaBuilderInterface
3434
{
35-
public function __construct(private readonly ResourceNameCollectionFactoryInterface $resourceNameCollectionFactory, private readonly ResourceMetadataCollectionFactoryInterface $resourceMetadataCollectionFactory, private readonly TypesFactoryInterface $typesFactory, private readonly TypesContainerInterface $typesContainer, private readonly FieldsBuilderEnumInterface|FieldsBuilderInterface $fieldsBuilder)
35+
public function __construct(private readonly ResourceNameCollectionFactoryInterface $resourceNameCollectionFactory, private readonly ResourceMetadataCollectionFactoryInterface $resourceMetadataCollectionFactory, private readonly TypesFactoryInterface $typesFactory, private readonly TypesContainerInterface $typesContainer, private readonly FieldsBuilderEnumInterface $fieldsBuilder)
3636
{
37-
if ($this->fieldsBuilder instanceof FieldsBuilderInterface) {
38-
@trigger_error(\sprintf('$fieldsBuilder argument of SchemaBuilder implementing "%s" is deprecated since API Platform 3.1. It has to implement "%s" instead.', FieldsBuilderInterface::class, FieldsBuilderEnumInterface::class), \E_USER_DEPRECATED);
39-
}
4037
}
4138

4239
public function getSchema(): Schema

src/GraphQl/Type/TypeBuilder.php

+2-7
Original file line numberDiff line numberDiff line change
@@ -195,15 +195,10 @@ public function getEnumType(Operation $operation): GraphQLType
195195
return $this->typesContainer->get($enumName);
196196
}
197197

198-
/** @var FieldsBuilderEnumInterface|FieldsBuilderInterface $fieldsBuilder */
198+
/** @var FieldsBuilderEnumInterface $fieldsBuilder */
199199
$fieldsBuilder = $this->fieldsBuilderLocator->get('api_platform.graphql.fields_builder');
200200
$enumCases = [];
201-
// Remove the condition in API Platform 4.
202-
if ($fieldsBuilder instanceof FieldsBuilderEnumInterface) {
203-
$enumCases = $fieldsBuilder->getEnumFields($operation->getClass());
204-
} else {
205-
@trigger_error(\sprintf('api_platform.graphql.fields_builder service implementing "%s" is deprecated since API Platform 3.1. It has to implement "%s" instead.', FieldsBuilderInterface::class, FieldsBuilderEnumInterface::class), \E_USER_DEPRECATED);
206-
}
201+
$enumCases = $fieldsBuilder->getEnumFields($operation->getClass());
207202

208203
$enumConfig = [
209204
'name' => $enumName,

0 commit comments

Comments
 (0)