Skip to content

Commit 6ccc305

Browse files
soyukasoyuka
authored
ci: bump lowest dependencies (#7237)
1 parent 1290ebb commit 6ccc305

File tree

16 files changed

+44
-33
lines changed

16 files changed

+44
-33
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
"symfony/property-info": "^6.4 || ^7.1",
116116
"symfony/serializer": "^6.4 || ^7.0",
117117
"symfony/translation-contracts": "^3.3",
118-
"symfony/type-info": "v7.3.0-RC1",
118+
"symfony/type-info": "^7.3",
119119
"symfony/web-link": "^6.4 || ^7.1",
120120
"willdurand/negotiation": "^3.1"
121121
},

‎src/Elasticsearch/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
],
2525
"require": {
2626
"php": ">=8.2",
27-
"api-platform/metadata": "^4.1.11",
27+
"api-platform/metadata": "4.2.x-dev as dev-main",
2828
"api-platform/serializer": "^4.1.11",
2929
"api-platform/state": "^4.1.11",
3030
"elasticsearch/elasticsearch": "^7.17 || ^8.4",

‎src/GraphQl/composer.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
],
2222
"require": {
2323
"php": ">=8.2",
24-
"api-platform/metadata": "^4.1.11",
25-
"api-platform/state": "^4.1.11",
26-
"api-platform/serializer": "^4.1.11",
27-
"symfony/property-info": "^6.4 || ^7.1",
28-
"symfony/serializer": "^6.4 || ^7.0",
24+
"api-platform/metadata": "4.2.x-dev as dev-main",
25+
"api-platform/state": "4.2.x-dev as dev-main",
26+
"api-platform/serializer": "4.2.x-dev as dev-main",
27+
"symfony/property-info": "^6.4.20 || ^7.1",
28+
"symfony/serializer": "^6.4 || ^7.1",
2929
"symfony/type-info": "^7.3",
3030
"webonyx/graphql-php": "^15.0",
3131
"willdurand/negotiation": "^3.1"
@@ -36,7 +36,6 @@
3636
"twig/twig": "^1.42.3 || ^2.12 || ^3.0",
3737
"symfony/mercure-bundle": "*",
3838
"symfony/routing": "^6.4 || ^7.0",
39-
"symfony/type-info": "^7.3",
4039
"phpunit/phpunit": "11.5.x-dev"
4140
},
4241
"autoload": {

‎src/Hydra/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
],
2626
"require": {
2727
"php": ">=8.2",
28-
"api-platform/state": "^4.1",
28+
"api-platform/state": "^4.1.8",
2929
"api-platform/documentation": "^4.1",
30-
"api-platform/metadata": "^4.1",
30+
"api-platform/metadata": "4.2.x-dev as dev-main",
3131
"api-platform/jsonld": "^4.1",
32-
"api-platform/json-schema": "^4.1",
32+
"api-platform/json-schema": "4.2.x-dev as dev-main",
3333
"api-platform/serializer": "^4.1",
3434
"symfony/web-link": "^6.4 || ^7.1",
3535
"symfony/type-info": "^7.3"

‎src/JsonApi/Tests/JsonSchema/SchemaFactoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ protected function setUp(): void
5151
$propertyNameCollectionFactory->create(Dummy::class, ['enable_getter_setter_extraction' => true, 'schema_type' => Schema::TYPE_OUTPUT])->willReturn(new PropertyNameCollection());
5252
$propertyMetadataFactory = $this->prophesize(PropertyMetadataFactoryInterface::class);
5353

54-
$definitionNameFactory = new DefinitionNameFactory();
54+
$definitionNameFactory = new DefinitionNameFactory(null);
5555

5656
$baseSchemaFactory = new BaseSchemaFactory(
5757
resourceMetadataFactory: $resourceMetadataFactory->reveal(),

‎src/JsonApi/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
"require": {
2424
"php": ">=8.2",
2525
"api-platform/documentation": "^4.1.11",
26-
"api-platform/json-schema": "^4.1.11",
27-
"api-platform/metadata": "^4.1.11",
26+
"api-platform/json-schema": "4.2.x-dev as dev-main",
27+
"api-platform/metadata": "4.2.x-dev as dev-main",
2828
"api-platform/serializer": "^4.1.11",
2929
"api-platform/state": "^4.1.11",
3030
"symfony/error-handler": "^6.4 || ^7.0",

‎src/JsonSchema/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
],
2626
"require": {
2727
"php": ">=8.2",
28-
"api-platform/metadata": "^4.1.11",
28+
"api-platform/metadata": "4.2.x-dev as dev-main",
2929
"symfony/console": "^6.4 || ^7.0",
3030
"symfony/property-info": "^6.4 || ^7.1",
3131
"symfony/serializer": "^6.4 || ^7.0",

‎src/OpenApi/Tests/Serializer/OpenApiNormalizerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ public function testNormalize(): void
208208
$propertyNameCollectionFactory = $propertyNameCollectionFactoryProphecy->reveal();
209209
$propertyMetadataFactory = $propertyMetadataFactoryProphecy->reveal();
210210

211-
$definitionNameFactory = new DefinitionNameFactory();
211+
$definitionNameFactory = new DefinitionNameFactory(null);
212212

213213
$schemaFactory = new SchemaFactory(
214214
resourceMetadataFactory: $resourceMetadataFactory,

‎src/OpenApi/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
],
2929
"require": {
3030
"php": ">=8.2",
31-
"api-platform/json-schema": "^4.1.11",
32-
"api-platform/metadata": "^4.1.11",
33-
"api-platform/state": "^4.1.11",
31+
"api-platform/json-schema": "4.2.x-dev as dev-main",
32+
"api-platform/metadata": "4.2.x-dev as dev-main",
33+
"api-platform/state": "4.2.x-dev as dev-main",
3434
"symfony/console": "^6.4 || ^7.0",
3535
"symfony/filesystem": "^6.4 || ^7.0",
3636
"symfony/property-access": "^6.4 || ^7.0",

‎src/Serializer/AbstractItemNormalizer.php

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ protected function getAttributeValue(object $object, string $attribute, ?string
754754
&& ($className = $collectionValueType->getClassName())
755755
&& $this->resourceClassResolver->isResourceClass($className)
756756
) {
757-
$childContext = $this->createChildContext($this->createOperationContext($context, $className), $attribute, $format);
757+
$childContext = $this->createChildContext($this->createOperationContext($context, $className, $propertyMetadata), $attribute, $format);
758758

759759
// @see ApiPlatform\Hal\Serializer\ItemNormalizer:getComponents logic for intentional duplicate content
760760
// @see ApiPlatform\JsonApi\Serializer\ItemNormalizer:getComponents logic for intentional duplicate content
@@ -791,7 +791,7 @@ protected function getAttributeValue(object $object, string $attribute, ?string
791791
($className = $type->getClassName())
792792
&& $this->resourceClassResolver->isResourceClass($className)
793793
) {
794-
$childContext = $this->createChildContext($this->createOperationContext($context, $className), $attribute, $format);
794+
$childContext = $this->createChildContext($this->createOperationContext($context, $className, $propertyMetadata), $attribute, $format);
795795
unset($childContext['iri'], $childContext['uri_variables'], $childContext['item_uri_template']);
796796
if ('jsonld' === $format && $uriTemplate = $propertyMetadata->getUriTemplate()) {
797797
$operation = $this->resourceMetadataCollectionFactory->create($className)->getOperation(
@@ -833,21 +833,19 @@ protected function getAttributeValue(object $object, string $attribute, ?string
833833

834834
// Anonymous resources
835835
if ($className) {
836-
$childContext = $this->createChildContext($this->createOperationContext($context, $className), $attribute, $format);
837-
$childContext['output']['gen_id'] = $propertyMetadata->getGenId() ?? true;
838-
836+
$childContext = $this->createChildContext($this->createOperationContext($context, $className, $propertyMetadata), $attribute, $format);
839837
$attributeValue = $this->propertyAccessor->getValue($object, $attribute);
840838

841839
return $this->serializer->normalize($attributeValue, $format, $childContext);
842840
}
843841

844842
if ('array' === $type->getBuiltinType()) {
845843
if ($className = ($type->getCollectionValueTypes()[0] ?? null)?->getClassName()) {
846-
$context = $this->createOperationContext($context, $className);
844+
$context = $this->createOperationContext($context, $className, $propertyMetadata);
847845
}
848846

849847
$childContext = $this->createChildContext($context, $attribute, $format);
850-
$childContext['output']['gen_id'] = $propertyMetadata->getGenId() ?? true;
848+
$childContext['output']['gen_id'] ??= $propertyMetadata->getGenId() ?? true;
851849

852850
$attributeValue = $this->propertyAccessor->getValue($object, $attribute);
853851

0 commit comments

Comments
 (0)