Merge pull request api-platform#6046 from soyuka/fix/ci-main

Merge 3.2

Author: soyuka

CHANGELOG.md

@@ -228,6 +228,14 @@ Notes:
 * [92a81f024](https://github.com/api-platform/core/commit/92a81f024541054b9322e7457b75c721261e14e0) feat(graphql): allow to disable the introspection query (#5711)
 * [d793ffb92](https://github.com/api-platform/core/commit/d793ffb9228a21655ee35f0b90a959f93281a4cf) feat: union/intersect types (#5470)
 
+## v3.1.23
+
+### Bug fixes
+
+* [9848bd4d4](https://github.com/api-platform/core/commit/9848bd4d4917a97000119ee98a09916af469acd8) fix: missing eager joins on to-one relationships (#5992)
+* [d2f281eed](https://github.com/api-platform/core/commit/d2f281eedbd87a3c1a3377bb23a229e1b17a0f45) fix(jsonschema): fix recursive documentation when using a dto entity wrapper (#5973)
+* [dac49cb16](https://github.com/api-platform/core/commit/dac49cb16939ae14fa14eea1190cbf995bca842b) Revert "fix: missing eager joins on to-one relationships (#5992)"
+
 ## v3.1.22
 
 ### Bug fixes

composer.json

@@ -60,9 +60,11 @@
         "phpstan/phpstan-doctrine": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-symfony": "^1.0",
+        "phpunit/phpunit": "^9.5",
         "psr/log": "^1.0 || ^2.0 || ^3.0",
         "ramsey/uuid": "^3.9.7 || ^4.0",
         "ramsey/uuid-doctrine": "^1.4 || ^2.0",
+        "sebastian/comparator": "<5.0",
         "soyuka/contexts": "v3.3.9",
         "soyuka/stubs-mongodb": "^1.0",
         "symfony/asset": "^6.1 || ^7.0",

src/Documentation/composer.json

@@ -19,11 +19,11 @@
 		  "homepage": "https://api-platform.com/community/contributors"
 		}
     ],
-    "conflict": {
-        "sebastian/comparator": ">=5.0"
-    },
     "require": {
         "api-platform/openapi": "*@dev || ^3.1",
         "api-platform/metadata": "*@dev || ^3.1"
+    },
+    "require-dev": {
+        "sebastian/comparator": "<5.0"
     }
 }

src/Elasticsearch/composer.json

@@ -35,7 +35,8 @@
     },
     "require-dev": {
         "phpspec/prophecy-phpunit": "^2.0",
-        "symfony/phpunit-bridge": "^6.1"
+        "symfony/phpunit-bridge": "^6.1",
+        "sebastian/comparator": "<5.0"
     },
     "autoload": {
         "psr-4": {
@@ -56,9 +57,6 @@
             "php-http/discovery": false
         }
     },
-    "conflict": {
-        "sebastian/comparator": ">=5.0"
-    },
     "extra": {
         "branch-alias": {
             "dev-main": "3.2.x-dev"

src/GraphQl/composer.json

@@ -37,7 +37,8 @@
         "symfony/mercure-bundle": "*",
         "symfony/phpunit-bridge": "^6.1",
         "symfony/routing": "^6.1",
-        "symfony/validator": "^6.1"
+        "symfony/validator": "^6.1",
+        "sebastian/comparator": "<5.0"
     },
     "autoload": {
         "psr-4": {
@@ -47,9 +48,6 @@
             "/Tests/"
         ]
     },
-    "conflict": {
-        "sebastian/comparator": ">=5.0"
-    },
     "config": {
         "preferred-install": {
             "*": "dist"

src/HttpCache/composer.json

@@ -30,7 +30,8 @@
         "symfony/dependency-injection": "^6.1",
         "phpspec/prophecy-phpunit": "^2.0",
         "symfony/phpunit-bridge": "^6.1",
-        "symfony/http-client": "^6.1"
+        "symfony/http-client": "^6.1",
+        "sebastian/comparator": "<5.0"
     },
     "autoload": {
         "psr-4": {
@@ -40,9 +41,6 @@
             "/Tests/"
         ]
     },
-    "conflict": {
-        "sebastian/comparator": ">=5.0"
-    },
     "config": {
         "preferred-install": {
             "*": "dist"

src/Hydra/composer.json

@@ -32,7 +32,9 @@
         "api-platform/metadata": "*@dev || ^3.1",
         "api-platform/jsonld": "*@dev || ^3.1"
     },
-    "require-dev": {},
+    "require-dev": {
+        "sebastian/comparator": "<5.0"
+    },
     "autoload": {
         "psr-4": {
             "ApiPlatform\\Hydra\\": ""
@@ -51,9 +53,6 @@
             "phpstan/extension-installer": true
         }
     },
-    "conflict": {
-        "sebastian/comparator": ">=5.0"
-    },
     "extra": {
         "branch-alias": {
             "dev-main": "3.2.x-dev"

src/JsonLd/composer.json

@@ -31,7 +31,9 @@
         "api-platform/state": "*@dev || ^3.1",
         "api-platform/metadata": "*@dev || ^3.1"
     },
-    "require-dev": {},
+    "require-dev": {
+        "sebastian/comparator": "<5.0"
+    },
     "autoload": {
         "psr-4": {
             "ApiPlatform\\JsonLd\\": ""
@@ -40,9 +42,6 @@
             "/Tests/"
         ]
     },
-    "conflict": {
-        "sebastian/comparator": ">=5.0"
-    },
     "config": {
         "preferred-install": {
             "*": "dist"

src/JsonSchema/composer.json

@@ -33,7 +33,8 @@
     },
     "require-dev": {
         "phpspec/prophecy-phpunit": "^2.0",
-        "symfony/phpunit-bridge": "^6.1"
+        "symfony/phpunit-bridge": "^6.1",
+        "sebastian/comparator": "<5.0"
     },
     "autoload": {
         "psr-4": {
@@ -43,9 +44,6 @@
             "/Tests/"
         ]
     },
-    "conflict": {
-        "sebastian/comparator": ">=5.0"
-    },
     "config": {
         "preferred-install": {
             "*": "dist"

src/Metadata/composer.json

@@ -40,6 +40,7 @@
         "api-platform/state": "*@dev || ^3.1",
         "phpspec/prophecy-phpunit": "^2.0",
         "phpstan/phpdoc-parser": "^1.16",
+        "sebastian/comparator": "<5.0",
         "symfony/config": "^6.1",
         "symfony/phpunit-bridge": "^6.1",
         "symfony/routing": "^6.1",
@@ -60,9 +61,6 @@
             "/Tests/"
         ]
     },
-    "conflict": {
-        "sebastian/comparator": ">=5.0"
-    },
     "config": {
         "preferred-install": {
             "*": "dist"