From 55f28c865957e68a6030d622f8e81391c758d8de Mon Sep 17 00:00:00 2001 From: soyuka Date: Thu, 13 Nov 2025 15:23:22 +0100 Subject: [PATCH 1/5] chore: symfony/http-foundation:^6.4.14 --- composer.json | 2 +- src/HttpCache/composer.json | 2 +- src/JsonApi/composer.json | 2 +- src/State/composer.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index a5c43b2aed..7a40b89971 100644 --- a/composer.json +++ b/composer.json @@ -111,7 +111,7 @@ "psr/cache": "^1.0 || ^2.0 || ^3.0", "psr/container": "^1.0 || ^2.0", "symfony/deprecation-contracts": "^3.1", - "symfony/http-foundation": "^6.4 || ^7.0", + "symfony/http-foundation": "^6.4.14 || ^7.0", "symfony/http-kernel": "^6.4 || ^7.0", "symfony/property-access": "^6.4 || ^7.0", "symfony/property-info": "^6.4 || ^7.1", diff --git a/src/HttpCache/composer.json b/src/HttpCache/composer.json index d6ab71a57f..1ad8bc09d6 100644 --- a/src/HttpCache/composer.json +++ b/src/HttpCache/composer.json @@ -25,7 +25,7 @@ "php": ">=8.2", "api-platform/metadata": "^4.2", "api-platform/state": "^4.2", - "symfony/http-foundation": "^6.4 || ^7.0" + "symfony/http-foundation": "^6.4.14 || ^7.0" }, "require-dev": { "guzzlehttp/guzzle": "^6.0 || ^7.0", diff --git a/src/JsonApi/composer.json b/src/JsonApi/composer.json index 6217d1f9d5..f39d3d6f21 100644 --- a/src/JsonApi/composer.json +++ b/src/JsonApi/composer.json @@ -28,7 +28,7 @@ "api-platform/serializer": "^4.2", "api-platform/state": "^4.2", "symfony/error-handler": "^6.4 || ^7.0", - "symfony/http-foundation": "^6.4 || ^7.0", + "symfony/http-foundation": "^6.4.14 || ^7.0", "symfony/type-info": "^7.3" }, "require-dev": { diff --git a/src/State/composer.json b/src/State/composer.json index 97df017495..fed5b46297 100644 --- a/src/State/composer.json +++ b/src/State/composer.json @@ -38,7 +38,7 @@ "api-platform/serializer": "^4.2", "api-platform/validator": "^4.2", "phpunit/phpunit": "11.5.x-dev", - "symfony/http-foundation": "^6.4 || ^7.0", + "symfony/http-foundation": "^6.4.14 || ^7.0", "symfony/object-mapper": "^7.3", "symfony/type-info": "^7.3 || 7.4.x-dev", "symfony/web-link": "^6.4 || ^7.1", From 6014c512901e54a1ea1b84c1219f145c8444e5f8 Mon Sep 17 00:00:00 2001 From: soyuka Date: Thu, 13 Nov 2025 15:23:57 +0100 Subject: [PATCH 2/5] chore: symfony/validator:^6.4.11 --- composer.json | 3 +-- src/Doctrine/Odm/composer.json | 2 +- src/Doctrine/Orm/composer.json | 2 +- src/Serializer/composer.json | 2 +- src/Symfony/composer.json | 2 +- src/Validator/composer.json | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 7a40b89971..c25272ab5d 100644 --- a/composer.json +++ b/composer.json @@ -118,7 +118,7 @@ "symfony/serializer": "^6.4 || ^7.0", "symfony/translation-contracts": "^3.3", "symfony/type-info": "^7.3 || 7.4.x-dev", - "symfony/validator": "^6.4 || ^7.1", + "symfony/validator": "^6.4.11 || ^7.1", "symfony/web-link": "^6.4 || ^7.1", "willdurand/negotiation": "^3.1" }, @@ -192,7 +192,6 @@ "symfony/string": "^6.4 || ^7.0", "symfony/twig-bundle": "^6.4 || ^7.0", "symfony/uid": "^6.4 || ^7.0", - "symfony/validator": "^6.4 || ^7.0", "symfony/var-exporter": "^7.3 || ^7.4.x-dev", "symfony/web-profiler-bundle": "^6.4 || ^7.0", "symfony/yaml": "^6.4 || ^7.0", diff --git a/src/Doctrine/Odm/composer.json b/src/Doctrine/Odm/composer.json index b4b843b52a..b03dd33060 100644 --- a/src/Doctrine/Odm/composer.json +++ b/src/Doctrine/Odm/composer.json @@ -42,7 +42,7 @@ "symfony/property-access": "^6.4 || ^7.0", "symfony/serializer": "^6.4 || ^7.0", "symfony/uid": "^6.4 || ^7.0", - "symfony/validator": "^6.4 || ^7.0", + "symfony/validator": "^6.4.11 || ^7.0", "symfony/yaml": "^6.4 || ^7.0" }, "autoload": { diff --git a/src/Doctrine/Orm/composer.json b/src/Doctrine/Orm/composer.json index 09cd9b218f..c7169fbfd1 100644 --- a/src/Doctrine/Orm/composer.json +++ b/src/Doctrine/Orm/composer.json @@ -42,7 +42,7 @@ "symfony/serializer": "^6.4 || ^7.0", "symfony/property-info": "^6.4 || ^7.1", "symfony/uid": "^6.4 || ^7.0", - "symfony/validator": "^6.4 || ^7.0", + "symfony/validator": "^6.4.11 || ^7.0", "symfony/yaml": "^6.4 || ^7.0" }, "autoload": { diff --git a/src/Serializer/composer.json b/src/Serializer/composer.json index 8faa88d802..9aebcebd76 100644 --- a/src/Serializer/composer.json +++ b/src/Serializer/composer.json @@ -28,7 +28,7 @@ "symfony/property-access": "^6.4 || ^7.0", "symfony/property-info": "^6.4 || ^7.1", "symfony/serializer": "^6.4 || ^7.0", - "symfony/validator": "^6.4 || ^7.0" + "symfony/validator": "^6.4.11 || ^7.0" }, "require-dev": { "api-platform/doctrine-common": "^4.2", diff --git a/src/Symfony/composer.json b/src/Symfony/composer.json index 5dd626ebdf..be927f79b7 100644 --- a/src/Symfony/composer.json +++ b/src/Symfony/composer.json @@ -61,7 +61,7 @@ "symfony/object-mapper": "^7.0", "symfony/routing": "^6.4 || ^7.0", "symfony/type-info": "^7.3", - "symfony/validator": "^6.4 || ^7.0", + "symfony/validator": "^6.4.11 || ^7.0", "webonyx/graphql-php": "^15.0" }, "suggest": { diff --git a/src/Validator/composer.json b/src/Validator/composer.json index 40c8093163..5374cbc78b 100644 --- a/src/Validator/composer.json +++ b/src/Validator/composer.json @@ -27,7 +27,7 @@ "symfony/type-info": "^7.3", "symfony/http-kernel": "^6.4 || ^7.1", "symfony/serializer": "^6.4 || ^7.1", - "symfony/validator": "^6.4 || ^7.1", + "symfony/validator": "^6.4.11 || ^7.1", "symfony/web-link": "^6.4 || ^7.1" }, "require-dev": { From 2dc8f3943dd6b60c71e1c3865fa9ca21b632b0fa Mon Sep 17 00:00:00 2001 From: soyuka Date: Thu, 13 Nov 2025 15:55:30 +0100 Subject: [PATCH 3/5] cs: conflict marker --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69380f620c..3d6244d008 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog ## v4.2.3 -<<<<<<< HEAD + * [9416083f7](https://github.com/api-platform/core/commit/9416083f7631b28093f3c79db995862338477137) fix(state): object mapper aware interface (#7486) * [99718d954](https://github.com/api-platform/core/commit/99718d9547ab8b064f1184c7ec2b15d882853dcb) fix(serializer): resilient denormalizeRelation capability (#7474) * [9b2f98610](https://github.com/api-platform/core/commit/9b2f98610cbf661335416880fcd25052468107b3) fix(metadata): eliminate duplicate keys in the constructor of `Parameters` (#7492) @@ -14,7 +14,6 @@ * [fa6e206cc](https://github.com/api-platform/core/commit/fa6e206cc3cf20aa4535ad2fd83d9e53f56e713c) fix(state): detect mapping on source (#7475) * [fafbe5c7b](https://github.com/api-platform/core/commit/fafbe5c7b1418c33baea2506458449562001d2fa) fix(validator): custom message was not translated (#7424) - ### Features * [f5c257dab](https://github.com/api-platform/core/commit/f5c257dab98624e99e57603692a73b6b3ae5c7f0) feat(symfony): convert routing files to php-dsl (#7463) From d8cb5e80702e5542095dc969c2cfd023f3b45a54 Mon Sep 17 00:00:00 2001 From: soyuka Date: Thu, 13 Nov 2025 16:19:51 +0100 Subject: [PATCH 4/5] chore: bump self dependencies to avoid installing lowest --- src/Doctrine/Common/composer.json | 2 +- src/Doctrine/Odm/composer.json | 2 +- src/Doctrine/Orm/composer.json | 2 +- src/Elasticsearch/composer.json | 4 ++-- src/GraphQl/composer.json | 6 +++--- src/Hal/composer.json | 4 ++-- src/HttpCache/composer.json | 2 +- src/Hydra/composer.json | 4 ++-- src/JsonApi/composer.json | 4 ++-- src/JsonLd/composer.json | 4 ++-- src/Laravel/composer.json | 4 ++-- src/Metadata/composer.json | 2 +- src/OpenApi/composer.json | 2 +- src/Serializer/composer.json | 2 +- src/State/composer.json | 4 ++-- src/Symfony/composer.json | 4 ++-- 16 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/Doctrine/Common/composer.json b/src/Doctrine/Common/composer.json index ce5f36ce4d..bb2f3053cd 100644 --- a/src/Doctrine/Common/composer.json +++ b/src/Doctrine/Common/composer.json @@ -25,7 +25,7 @@ "require": { "php": ">=8.2", "api-platform/metadata": "^4.2", - "api-platform/state": "^4.2", + "api-platform/state": "^4.2.4", "doctrine/collections": "^2.1", "doctrine/common": "^3.2.2", "doctrine/persistence": "^3.2 || ^4.0" diff --git a/src/Doctrine/Odm/composer.json b/src/Doctrine/Odm/composer.json index b03dd33060..c634404c31 100644 --- a/src/Doctrine/Odm/composer.json +++ b/src/Doctrine/Odm/composer.json @@ -27,7 +27,7 @@ "php": ">=8.2", "api-platform/doctrine-common": "^4.2", "api-platform/metadata": "^4.2", - "api-platform/state": "^4.2", + "api-platform/state": "^4.2.4", "doctrine/mongodb-odm": "^2.10", "symfony/property-info": "^6.4 || ^7.1", "symfony/type-info": "^7.3" diff --git a/src/Doctrine/Orm/composer.json b/src/Doctrine/Orm/composer.json index c7169fbfd1..af62c91eaf 100644 --- a/src/Doctrine/Orm/composer.json +++ b/src/Doctrine/Orm/composer.json @@ -26,7 +26,7 @@ "php": ">=8.2", "api-platform/doctrine-common": "^4.2.0-alpha.3@alpha", "api-platform/metadata": "^4.2", - "api-platform/state": "^4.2", + "api-platform/state": "^4.2.4", "doctrine/orm": "^2.17 || ^3.0", "symfony/type-info": "^7.3" }, diff --git a/src/Elasticsearch/composer.json b/src/Elasticsearch/composer.json index accc597ca9..8cb8c5a384 100644 --- a/src/Elasticsearch/composer.json +++ b/src/Elasticsearch/composer.json @@ -25,8 +25,8 @@ "require": { "php": ">=8.2", "api-platform/metadata": "^4.2", - "api-platform/serializer": "^4.2", - "api-platform/state": "^4.2", + "api-platform/serializer": "^4.2.4", + "api-platform/state": "^4.2.4", "elasticsearch/elasticsearch": "^7.17 || ^8.4", "symfony/cache": "^6.4 || ^7.0", "symfony/console": "^6.4 || ^7.0", diff --git a/src/GraphQl/composer.json b/src/GraphQl/composer.json index 7d9c799ec5..6c36bc379a 100644 --- a/src/GraphQl/composer.json +++ b/src/GraphQl/composer.json @@ -22,8 +22,8 @@ "require": { "php": ">=8.2", "api-platform/metadata": "^4.2", - "api-platform/state": "^4.2", - "api-platform/serializer": "^4.2", + "api-platform/state": "^4.2.4", + "api-platform/serializer": "^4.2.4", "symfony/property-info": "^7.1", "symfony/serializer": "^6.4 || ^7.1", "symfony/type-info": "^7.3", @@ -32,7 +32,7 @@ }, "require-dev": { "phpspec/prophecy-phpunit": "^2.2", - "api-platform/validator": "^4.2", + "api-platform/validator": "^4.2.4", "twig/twig": "^1.42.3 || ^2.12 || ^3.0", "symfony/mercure-bundle": "*", "symfony/routing": "^6.4 || ^7.0", diff --git a/src/Hal/composer.json b/src/Hal/composer.json index dbfe84926e..f8584e77b4 100644 --- a/src/Hal/composer.json +++ b/src/Hal/composer.json @@ -22,10 +22,10 @@ ], "require": { "php": ">=8.2", - "api-platform/state": "^4.2", + "api-platform/state": "^4.2.4", "api-platform/metadata": "^4.2", "api-platform/documentation": "^4.2", - "api-platform/serializer": "^4.2", + "api-platform/serializer": "^4.2.4", "symfony/type-info": "^7.3" }, "autoload": { diff --git a/src/HttpCache/composer.json b/src/HttpCache/composer.json index 1ad8bc09d6..7194c2886c 100644 --- a/src/HttpCache/composer.json +++ b/src/HttpCache/composer.json @@ -24,7 +24,7 @@ "require": { "php": ">=8.2", "api-platform/metadata": "^4.2", - "api-platform/state": "^4.2", + "api-platform/state": "^4.2.4", "symfony/http-foundation": "^6.4.14 || ^7.0" }, "require-dev": { diff --git a/src/Hydra/composer.json b/src/Hydra/composer.json index 04a95a2c4e..9762845eb5 100644 --- a/src/Hydra/composer.json +++ b/src/Hydra/composer.json @@ -25,12 +25,12 @@ ], "require": { "php": ">=8.2", - "api-platform/state": "^4.2", + "api-platform/state": "^4.2.4", "api-platform/documentation": "^4.2", "api-platform/metadata": "^4.2", "api-platform/jsonld": "^4.2", "api-platform/json-schema": "^4.2", - "api-platform/serializer": "^4.2", + "api-platform/serializer": "^4.2.4", "symfony/web-link": "^6.4 || ^7.1", "symfony/type-info": "^7.3" }, diff --git a/src/JsonApi/composer.json b/src/JsonApi/composer.json index f39d3d6f21..50de99dd3a 100644 --- a/src/JsonApi/composer.json +++ b/src/JsonApi/composer.json @@ -25,8 +25,8 @@ "api-platform/documentation": "^4.2", "api-platform/json-schema": "^4.2", "api-platform/metadata": "^4.2", - "api-platform/serializer": "^4.2", - "api-platform/state": "^4.2", + "api-platform/serializer": "^4.2.4", + "api-platform/state": "^4.2.4", "symfony/error-handler": "^6.4 || ^7.0", "symfony/http-foundation": "^6.4.14 || ^7.0", "symfony/type-info": "^7.3" diff --git a/src/JsonLd/composer.json b/src/JsonLd/composer.json index 42c2a5fe11..55dfe896e6 100644 --- a/src/JsonLd/composer.json +++ b/src/JsonLd/composer.json @@ -24,9 +24,9 @@ ], "require": { "php": ">=8.2", - "api-platform/state": "^4.2", + "api-platform/state": "^4.2.4", "api-platform/metadata": "^4.2", - "api-platform/serializer": "^4.2" + "api-platform/serializer": "^4.2.4" }, "autoload": { "psr-4": { diff --git a/src/Laravel/composer.json b/src/Laravel/composer.json index 25487f0e20..bef91599d2 100644 --- a/src/Laravel/composer.json +++ b/src/Laravel/composer.json @@ -36,8 +36,8 @@ "api-platform/jsonld": "^4.2", "api-platform/metadata": "^4.2", "api-platform/openapi": "^4.2", - "api-platform/serializer": "^4.2", - "api-platform/state": "^4.2", + "api-platform/serializer": "^4.2.4", + "api-platform/state": "^4.2.4", "illuminate/config": "^11.0 || ^12.0", "illuminate/container": "^11.0 || ^12.0", "illuminate/contracts": "^11.0 || ^12.0", diff --git a/src/Metadata/composer.json b/src/Metadata/composer.json index f18231cfc5..dbbdc3ebd5 100644 --- a/src/Metadata/composer.json +++ b/src/Metadata/composer.json @@ -38,7 +38,7 @@ "require-dev": { "api-platform/json-schema": "^4.2", "api-platform/openapi": "^4.2", - "api-platform/state": "^4.2", + "api-platform/state": "^4.2.4", "phpspec/prophecy-phpunit": "^2.2", "phpstan/phpdoc-parser": "^1.29 || ^2.0", "phpunit/phpunit": "11.5.x-dev", diff --git a/src/OpenApi/composer.json b/src/OpenApi/composer.json index c337880e3a..4d904b24ea 100644 --- a/src/OpenApi/composer.json +++ b/src/OpenApi/composer.json @@ -30,7 +30,7 @@ "php": ">=8.2", "api-platform/json-schema": "^4.2", "api-platform/metadata": "^4.2", - "api-platform/state": "^4.2", + "api-platform/state": "^4.2.4", "symfony/console": "^6.4 || ^7.0", "symfony/filesystem": "^6.4 || ^7.0", "symfony/property-access": "^6.4 || ^7.0", diff --git a/src/Serializer/composer.json b/src/Serializer/composer.json index 9aebcebd76..58b8029186 100644 --- a/src/Serializer/composer.json +++ b/src/Serializer/composer.json @@ -24,7 +24,7 @@ "require": { "php": ">=8.2", "api-platform/metadata": "^4.2", - "api-platform/state": "^4.2", + "api-platform/state": "^4.2.4", "symfony/property-access": "^6.4 || ^7.0", "symfony/property-info": "^6.4 || ^7.1", "symfony/serializer": "^6.4 || ^7.0", diff --git a/src/State/composer.json b/src/State/composer.json index fed5b46297..407b22768a 100644 --- a/src/State/composer.json +++ b/src/State/composer.json @@ -35,8 +35,8 @@ "symfony/translation-contracts": "^3.0" }, "require-dev": { - "api-platform/serializer": "^4.2", - "api-platform/validator": "^4.2", + "api-platform/serializer": "^4.2.4", + "api-platform/validator": "^4.2.4", "phpunit/phpunit": "11.5.x-dev", "symfony/http-foundation": "^6.4.14 || ^7.0", "symfony/object-mapper": "^7.3", diff --git a/src/Symfony/composer.json b/src/Symfony/composer.json index be927f79b7..b180d377a0 100644 --- a/src/Symfony/composer.json +++ b/src/Symfony/composer.json @@ -35,8 +35,8 @@ "api-platform/jsonld": "^4.2.3", "api-platform/hydra": "^4.2.3", "api-platform/metadata": "^4.2.3", - "api-platform/serializer": "^4.2.3", - "api-platform/state": "^4.2.3", + "api-platform/serializer": "^4.2.4", + "api-platform/state": "^4.2.4", "api-platform/validator": "^4.2.3", "api-platform/openapi": "^4.2.3", "symfony/asset": "^6.4 || ^7.0", From 9f86ead32117599796d83868f4f17fbf14d966ae Mon Sep 17 00:00:00 2001 From: soyuka Date: Thu, 13 Nov 2025 16:35:40 +0100 Subject: [PATCH 5/5] ci: ignore phpstan issues --- .../Tests/Extractor/PropertyMetadataCompatibilityTest.php | 4 ++-- .../Tests/Extractor/ResourceMetadataCompatibilityTest.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Metadata/Tests/Extractor/PropertyMetadataCompatibilityTest.php b/src/Metadata/Tests/Extractor/PropertyMetadataCompatibilityTest.php index dabdf806ca..313457e10b 100644 --- a/src/Metadata/Tests/Extractor/PropertyMetadataCompatibilityTest.php +++ b/src/Metadata/Tests/Extractor/PropertyMetadataCompatibilityTest.php @@ -110,11 +110,11 @@ private function buildApiProperty(): ApiProperty foreach (self::FIXTURES as $parameter => $value) { if (method_exists($this, 'with'.ucfirst($parameter))) { - $value = $this->{'with'.ucfirst($parameter)}($value, self::FIXTURES); + $value = $this->{'with'.ucfirst($parameter)}($value, self::FIXTURES); // @phpstan-ignore-line } if (method_exists($property, 'with'.ucfirst($parameter))) { - $property = $property->{'with'.ucfirst($parameter)}($value, self::FIXTURES); + $property = $property->{'with'.ucfirst($parameter)}($value, self::FIXTURES); // @phpstan-ignore-line continue; } diff --git a/src/Metadata/Tests/Extractor/ResourceMetadataCompatibilityTest.php b/src/Metadata/Tests/Extractor/ResourceMetadataCompatibilityTest.php index 9e1e8e14c8..57d736c92e 100644 --- a/src/Metadata/Tests/Extractor/ResourceMetadataCompatibilityTest.php +++ b/src/Metadata/Tests/Extractor/ResourceMetadataCompatibilityTest.php @@ -572,11 +572,11 @@ private function buildApiResources(): array foreach ($fixtures as $parameter => $value) { if (method_exists($this, 'with'.ucfirst($parameter))) { - $value = $this->{'with'.ucfirst($parameter)}($value, $fixtures); + $value = $this->{'with'.ucfirst($parameter)}($value, $fixtures); // @phpstan-ignore-line } if (method_exists($resource, 'with'.ucfirst($parameter))) { - $resource = $resource->{'with'.ucfirst($parameter)}($value, $fixtures); + $resource = $resource->{'with'.ucfirst($parameter)}($value, $fixtures); // @phpstan-ignore-line continue; }