Skip to content

Commit 2dd058a

Browse files
authored
fix(symfony): use "main" state alias for decoration (#5806)
1 parent b9cf499 commit 2dd058a

File tree

7 files changed

+20
-18
lines changed

7 files changed

+20
-18
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@
9898

9999
<service id="api_platform.action.entrypoint" class="ApiPlatform\Action\EntrypointAction" public="true">
100100
<argument type="service" id="api_platform.metadata.resource.name_collection_factory" />
101-
<argument type="service" id="api_platform.state_provider" on-invalid="null" />
102-
<argument type="service" id="api_platform.state_processor" on-invalid="null" />
101+
<argument type="service" id="api_platform.state_provider.main" on-invalid="null" />
102+
<argument type="service" id="api_platform.state_processor.main" on-invalid="null" />
103103
</service>
104104

105105
<service id="api_platform.action.documentation" class="ApiPlatform\Documentation\Action\DocumentationAction" public="true">
@@ -108,8 +108,8 @@
108108
<argument>%api_platform.description%</argument>
109109
<argument>%api_platform.version%</argument>
110110
<argument type="service" id="api_platform.openapi.factory" on-invalid="null" />
111-
<argument type="service" id="api_platform.state_provider" on-invalid="null" />
112-
<argument type="service" id="api_platform.state_processor" on-invalid="null" />
111+
<argument type="service" id="api_platform.state_provider.main" on-invalid="null" />
112+
<argument type="service" id="api_platform.state_processor.main" on-invalid="null" />
113113
</service>
114114

115115
<service id="api_platform.action.exception" class="ApiPlatform\Action\ExceptionAction" public="true">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<!-- State -->
2424

25-
<service id="api_platform.hydra.processor.link" class="ApiPlatform\Hydra\State\HydraLinkProcessor" decorates="api_platform.state_processor" decoration-priority="410">
25+
<service id="api_platform.hydra.processor.link" class="ApiPlatform\Hydra\State\HydraLinkProcessor" decorates="api_platform.state_processor.main" decoration-priority="410">
2626
<argument type="service" id="api_platform.hydra.processor.link.inner" />
2727
<argument type="service" id="api_platform.router" />
2828
</service>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
<argument type="service" id="api_platform.jsonld.context_builder" />
5757
<argument type="service" id="api_platform.metadata.resource.name_collection_factory" />
5858
<argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
59-
<argument type="service" id="api_platform.state_provider" on-invalid="null" />
60-
<argument type="service" id="api_platform.state_processor" on-invalid="null" />
59+
<argument type="service" id="api_platform.state_provider.main" on-invalid="null" />
60+
<argument type="service" id="api_platform.state_processor.main" on-invalid="null" />
6161
<argument type="service" id="api_platform.serializer" on-invalid="null" />
6262
</service>
6363
</services>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<services>
88
<!-- Event listener -->
99

10-
<service id="api_platform.mercure.processor.add_link_header" class="ApiPlatform\Symfony\State\MercureLinkProcessor" decorates="api_platform.state_processor" decoration-priority="400">
10+
<service id="api_platform.mercure.processor.add_link_header" class="ApiPlatform\Symfony\State\MercureLinkProcessor" decorates="api_platform.state_processor.main" decoration-priority="400">
1111
<argument type="service" id="api_platform.mercure.processor.add_link_header.inner" />
1212
<argument type="service" id="Symfony\Component\Mercure\Discovery" on-invalid="ignore"/>
1313
</service>

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,25 @@
99
</service>
1010
<service id="api_platform.state_provider" alias="api_platform.state_provider.locator" />
1111

12+
<service id="api_platform.state_provider.main" alias="api_platform.state_provider.locator" />
13+
1214
<service id="api_platform.state_processor.locator" class="ApiPlatform\State\CallableProcessor">
1315
<argument type="tagged_locator" tag="api_platform.state_processor" index-by="key" />
1416
</service>
1517

16-
<service id="api_platform.state_provider.content_negotiation" class="ApiPlatform\State\Provider\ContentNegotiationProvider" decorates="api_platform.state_provider" decoration-priority="100">
18+
<service id="api_platform.state_provider.content_negotiation" class="ApiPlatform\State\Provider\ContentNegotiationProvider" decorates="api_platform.state_provider.main" decoration-priority="100">
1719
<argument type="service" id="api_platform.state_provider.content_negotiation.inner" />
1820
<argument type="service" id="api_platform.negotiator" />
1921
<argument>%api_platform.formats%</argument>
2022
<argument>%api_platform.error_formats%</argument>
2123
</service>
2224

23-
<service id="api_platform.state_provider.read" class="ApiPlatform\State\Provider\ReadProvider" decorates="api_platform.state_provider" decoration-priority="500">
25+
<service id="api_platform.state_provider.read" class="ApiPlatform\State\Provider\ReadProvider" decorates="api_platform.state_provider.main" decoration-priority="500">
2426
<argument type="service" id="api_platform.state_provider.read.inner" />
2527
<argument type="service" id="api_platform.serializer.context_builder" />
2628
</service>
2729

28-
<service id="api_platform.state_provider.deserialize" class="ApiPlatform\State\Provider\DeserializeProvider" decorates="api_platform.state_provider" decoration-priority="300">
30+
<service id="api_platform.state_provider.deserialize" class="ApiPlatform\State\Provider\DeserializeProvider" decorates="api_platform.state_provider.main" decoration-priority="300">
2931
<argument type="service" id="api_platform.state_provider.deserialize.inner" />
3032
<argument type="service" id="api_platform.serializer" />
3133
<argument type="service" id="api_platform.serializer.context_builder" />
@@ -36,19 +38,19 @@
3638
<argument type="service" id="api_platform.iri_converter" />
3739
<argument type="service" id="api_platform.resource_class_resolver" />
3840
</service>
39-
<service id="api_platform.state_processor" alias="api_platform.state_processor.respond" />
41+
<service id="api_platform.state_processor.main" alias="api_platform.state_processor.respond" />
4042

4143
<service id="api_platform.state_processor.add_link_header" class="ApiPlatform\State\Processor\AddLinkHeaderProcessor" decorates="api_platform.state_processor.respond">
4244
<argument type="service" id="api_platform.state_processor.add_link_header.inner" />
4345
</service>
4446

45-
<service id="api_platform.state_processor.serialize" class="ApiPlatform\State\Processor\SerializeProcessor" decorates="api_platform.state_processor" decoration-priority="200">
47+
<service id="api_platform.state_processor.serialize" class="ApiPlatform\State\Processor\SerializeProcessor" decorates="api_platform.state_processor.main" decoration-priority="200">
4648
<argument type="service" id="api_platform.state_processor.serialize.inner" />
4749
<argument type="service" id="api_platform.serializer" />
4850
<argument type="service" id="api_platform.serializer.context_builder" />
4951
</service>
5052

51-
<service id="api_platform.state_processor.write" class="ApiPlatform\State\Processor\WriteProcessor" decorates="api_platform.state_processor" decoration-priority="100">
53+
<service id="api_platform.state_processor.write" class="ApiPlatform\State\Processor\WriteProcessor" decorates="api_platform.state_processor.main" decoration-priority="100">
5254
<argument type="service" id="api_platform.state_processor.write.inner" />
5355
<argument type="service" id="api_platform.state_processor.locator" />
5456
</service>

src/Symfony/Bundle/Resources/config/symfony/controller.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<services>
88
<service id="api_platform.symfony.main_controller" class="ApiPlatform\Symfony\Controller\MainController" public="true">
99
<argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
10-
<argument type="service" id="api_platform.state_provider" />
11-
<argument type="service" id="api_platform.state_processor" />
10+
<argument type="service" id="api_platform.state_provider.main" />
11+
<argument type="service" id="api_platform.state_processor.main" />
1212
<argument type="service" id="api_platform.uri_variables.converter" on-invalid="ignore" />
1313
<argument type="service" id="logger" on-invalid="ignore" />
1414
</service>

src/Symfony/Bundle/Resources/config/symfony/validator.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
<argument type="service" id="api_platform.filter_locator" />
1616
</service>
1717

18-
<service id="api_platform.state_provider.query_parameter_validate" class="ApiPlatform\Symfony\Validator\State\QueryParameterValidateProvider" decorates="api_platform.state_provider" decoration-priority="200">
18+
<service id="api_platform.state_provider.query_parameter_validate" class="ApiPlatform\Symfony\Validator\State\QueryParameterValidateProvider" decorates="api_platform.state_provider.main" decoration-priority="200">
1919
<argument type="service" id="api_platform.state_provider.query_parameter_validate.inner" />
2020
<argument type="service" id="api_platform.validator.query_parameter_validator" />
2121
</service>
2222

23-
<service id="api_platform.state_provider.validate" class="ApiPlatform\Symfony\Validator\State\ValidateProvider" decorates="api_platform.state_provider" decoration-priority="200">
23+
<service id="api_platform.state_provider.validate" class="ApiPlatform\Symfony\Validator\State\ValidateProvider" decorates="api_platform.state_provider.main" decoration-priority="200">
2424
<argument type="service" id="api_platform.state_provider.validate.inner" />
2525
<argument type="service" id="api_platform.validator" />
2626
</service>

0 commit comments

Comments
 (0)