Skip to content

Commit 00246ae

Browse files
soyukasoyuka
authored
Merge pull request #6046 from soyuka/fix/ci-main
Merge 3.2
2 parents ef502db + fa00602 commit 00246ae

File tree

16 files changed

+51
-52
lines changed

16 files changed

+51
-52
lines changed

‎CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,14 @@ Notes:
228228
* [92a81f024](https://github.com/api-platform/core/commit/92a81f024541054b9322e7457b75c721261e14e0) feat(graphql): allow to disable the introspection query (#5711)
229229
* [d793ffb92](https://github.com/api-platform/core/commit/d793ffb9228a21655ee35f0b90a959f93281a4cf) feat: union/intersect types (#5470)
230230

231+
## v3.1.23
232+
233+
### Bug fixes
234+
235+
* [9848bd4d4](https://github.com/api-platform/core/commit/9848bd4d4917a97000119ee98a09916af469acd8) fix: missing eager joins on to-one relationships (#5992)
236+
* [d2f281eed](https://github.com/api-platform/core/commit/d2f281eedbd87a3c1a3377bb23a229e1b17a0f45) fix(jsonschema): fix recursive documentation when using a dto entity wrapper (#5973)
237+
* [dac49cb16](https://github.com/api-platform/core/commit/dac49cb16939ae14fa14eea1190cbf995bca842b) Revert "fix: missing eager joins on to-one relationships (#5992)"
238+
231239
## v3.1.22
232240

233241
### Bug fixes

‎composer.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,11 @@
6060
"phpstan/phpstan-doctrine": "^1.0",
6161
"phpstan/phpstan-phpunit": "^1.0",
6262
"phpstan/phpstan-symfony": "^1.0",
63+
"phpunit/phpunit": "^9.5",
6364
"psr/log": "^1.0 || ^2.0 || ^3.0",
6465
"ramsey/uuid": "^3.9.7 || ^4.0",
6566
"ramsey/uuid-doctrine": "^1.4 || ^2.0",
67+
"sebastian/comparator": "<5.0",
6668
"soyuka/contexts": "v3.3.9",
6769
"soyuka/stubs-mongodb": "^1.0",
6870
"symfony/asset": "^6.1 || ^7.0",

‎src/Documentation/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
"homepage": "https://api-platform.com/community/contributors"
2020
}
2121
],
22-
"conflict": {
23-
"sebastian/comparator": ">=5.0"
24-
},
2522
"require": {
2623
"api-platform/openapi": "*@dev || ^3.1",
2724
"api-platform/metadata": "*@dev || ^3.1"
25+
},
26+
"require-dev": {
27+
"sebastian/comparator": "<5.0"
2828
}
2929
}

‎src/Elasticsearch/composer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
},
3636
"require-dev": {
3737
"phpspec/prophecy-phpunit": "^2.0",
38-
"symfony/phpunit-bridge": "^6.1"
38+
"symfony/phpunit-bridge": "^6.1",
39+
"sebastian/comparator": "<5.0"
3940
},
4041
"autoload": {
4142
"psr-4": {
@@ -56,9 +57,6 @@
5657
"php-http/discovery": false
5758
}
5859
},
59-
"conflict": {
60-
"sebastian/comparator": ">=5.0"
61-
},
6260
"extra": {
6361
"branch-alias": {
6462
"dev-main": "3.2.x-dev"

‎src/GraphQl/composer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
"symfony/mercure-bundle": "*",
3838
"symfony/phpunit-bridge": "^6.1",
3939
"symfony/routing": "^6.1",
40-
"symfony/validator": "^6.1"
40+
"symfony/validator": "^6.1",
41+
"sebastian/comparator": "<5.0"
4142
},
4243
"autoload": {
4344
"psr-4": {
@@ -47,9 +48,6 @@
4748
"/Tests/"
4849
]
4950
},
50-
"conflict": {
51-
"sebastian/comparator": ">=5.0"
52-
},
5351
"config": {
5452
"preferred-install": {
5553
"*": "dist"

‎src/HttpCache/composer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
"symfony/dependency-injection": "^6.1",
3131
"phpspec/prophecy-phpunit": "^2.0",
3232
"symfony/phpunit-bridge": "^6.1",
33-
"symfony/http-client": "^6.1"
33+
"symfony/http-client": "^6.1",
34+
"sebastian/comparator": "<5.0"
3435
},
3536
"autoload": {
3637
"psr-4": {
@@ -40,9 +41,6 @@
4041
"/Tests/"
4142
]
4243
},
43-
"conflict": {
44-
"sebastian/comparator": ">=5.0"
45-
},
4644
"config": {
4745
"preferred-install": {
4846
"*": "dist"

‎src/Hydra/composer.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232
"api-platform/metadata": "*@dev || ^3.1",
3333
"api-platform/jsonld": "*@dev || ^3.1"
3434
},
35-
"require-dev": {},
35+
"require-dev": {
36+
"sebastian/comparator": "<5.0"
37+
},
3638
"autoload": {
3739
"psr-4": {
3840
"ApiPlatform\\Hydra\\": ""
@@ -51,9 +53,6 @@
5153
"phpstan/extension-installer": true
5254
}
5355
},
54-
"conflict": {
55-
"sebastian/comparator": ">=5.0"
56-
},
5756
"extra": {
5857
"branch-alias": {
5958
"dev-main": "3.2.x-dev"

‎src/JsonLd/composer.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@
3131
"api-platform/state": "*@dev || ^3.1",
3232
"api-platform/metadata": "*@dev || ^3.1"
3333
},
34-
"require-dev": {},
34+
"require-dev": {
35+
"sebastian/comparator": "<5.0"
36+
},
3537
"autoload": {
3638
"psr-4": {
3739
"ApiPlatform\\JsonLd\\": ""
@@ -40,9 +42,6 @@
4042
"/Tests/"
4143
]
4244
},
43-
"conflict": {
44-
"sebastian/comparator": ">=5.0"
45-
},
4645
"config": {
4746
"preferred-install": {
4847
"*": "dist"

‎src/JsonSchema/composer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
},
3434
"require-dev": {
3535
"phpspec/prophecy-phpunit": "^2.0",
36-
"symfony/phpunit-bridge": "^6.1"
36+
"symfony/phpunit-bridge": "^6.1",
37+
"sebastian/comparator": "<5.0"
3738
},
3839
"autoload": {
3940
"psr-4": {
@@ -43,9 +44,6 @@
4344
"/Tests/"
4445
]
4546
},
46-
"conflict": {
47-
"sebastian/comparator": ">=5.0"
48-
},
4947
"config": {
5048
"preferred-install": {
5149
"*": "dist"

‎src/Metadata/composer.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"api-platform/state": "*@dev || ^3.1",
4141
"phpspec/prophecy-phpunit": "^2.0",
4242
"phpstan/phpdoc-parser": "^1.16",
43+
"sebastian/comparator": "<5.0",
4344
"symfony/config": "^6.1",
4445
"symfony/phpunit-bridge": "^6.1",
4546
"symfony/routing": "^6.1",
@@ -60,9 +61,6 @@
6061
"/Tests/"
6162
]
6263
},
63-
"conflict": {
64-
"sebastian/comparator": ">=5.0"
65-
},
6664
"config": {
6765
"preferred-install": {
6866
"*": "dist"

‎src/OpenApi/composer.json

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,17 @@
22
"name": "api-platform/openapi",
33
"description": "Models to build and serialize an OpenAPI specification.",
44
"type": "library",
5-
"keywords": ["REST", "GraphQL", "API", "JSON-LD", "Hydra", "JSONAPI", "OpenAPI", "HAL", "Swagger"],
5+
"keywords": [
6+
"REST",
7+
"GraphQL",
8+
"API",
9+
"JSON-LD",
10+
"Hydra",
11+
"JSONAPI",
12+
"OpenAPI",
13+
"HAL",
14+
"Swagger"
15+
],
616
"homepage": "https://api-platform.com",
717
"license": "MIT",
818
"authors": [
@@ -23,7 +33,8 @@
2333
"api-platform/state": "*@dev || ^3.1",
2434
"symfony/console": "^6.1",
2535
"symfony/property-access": "^6.1",
26-
"symfony/serializer": "^6.1"
36+
"symfony/serializer": "^6.1",
37+
"sebastian/comparator": "<5.0"
2738
},
2839
"require-dev": {
2940
"phpspec/prophecy-phpunit": "^2.0",

‎src/RamseyUuid/composer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,14 @@
2828
"phpspec/prophecy-phpunit": "^2.0",
2929
"symfony/phpunit-bridge": "^6.1",
3030
"ramsey/uuid": "^3.7 || ^4.0",
31-
"ramsey/uuid-doctrine": "^1.4"
31+
"ramsey/uuid-doctrine": "^1.4",
32+
"sebastian/comparator": "<5.0"
3233
},
3334
"autoload": {
3435
"psr-4": {
3536
"ApiPlatform\\RamseyUuid\\": ""
3637
}
3738
},
38-
"conflict": {
39-
"sebastian/comparator": ">=5.0"
40-
},
4139
"config": {
4240
"preferred-install": {
4341
"*": "dist"

‎src/Serializer/composer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
"phpspec/prophecy-phpunit": "^2.0",
3535
"symfony/mercure-bundle": "*",
3636
"symfony/phpunit-bridge": "^6.1",
37-
"symfony/yaml": "^6.3"
37+
"symfony/yaml": "^6.3",
38+
"sebastian/comparator": "<5.0"
3839
},
3940
"autoload": {
4041
"psr-4": {
@@ -44,9 +45,6 @@
4445
"/Tests/"
4546
]
4647
},
47-
"conflict": {
48-
"sebastian/comparator": ">=5.0"
49-
},
5048
"config": {
5149
"preferred-install": {
5250
"*": "dist"

‎src/State/composer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
"phpunit/phpunit": "^10.3",
2626
"symfony/web-link": "^6.3",
2727
"symfony/http-foundation": "^6.3",
28-
"willdurand/negotiation": "^3.1"
28+
"willdurand/negotiation": "^3.1",
29+
"sebastian/comparator": "<5.0"
2930
},
3031
"autoload": {
3132
"psr-4": {
@@ -35,9 +36,6 @@
3536
"/Tests/"
3637
]
3738
},
38-
"conflict": {
39-
"sebastian/comparator": ">=5.0"
40-
},
4139
"config": {
4240
"preferred-install": {
4341
"*": "dist"

‎src/Symfony/composer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
"symfony/routing": "^6.1",
3333
"symfony/validator": "^6.1",
3434
"symfony/mercure-bundle": "*",
35-
"webonyx/graphql-php": "^14.0 || ^15.0"
35+
"webonyx/graphql-php": "^14.0 || ^15.0",
36+
"sebastian/comparator": "<5.0"
3637
},
3738
"autoload": {
3839
"psr-4": {
@@ -42,9 +43,6 @@
4243
"/Tests/"
4344
]
4445
},
45-
"conflict": {
46-
"sebastian/comparator": ">=5.0"
47-
},
4846
"config": {
4947
"preferred-install": {
5048
"*": "dist"

‎src/Validator/composer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,14 @@
2525
},
2626
"require-dev": {
2727
"phpspec/prophecy-phpunit": "^2.0",
28-
"symfony/phpunit-bridge": "^6.1"
28+
"symfony/phpunit-bridge": "^6.1",
29+
"sebastian/comparator": "<5.0"
2930
},
3031
"autoload": {
3132
"psr-4": {
3233
"ApiPlatform\\Validator\\": ""
3334
}
3435
},
35-
"conflict": {
36-
"sebastian/comparator": ">=5.0"
37-
},
3836
"config": {
3937
"preferred-install": {
4038
"*": "dist"

0 commit comments

Comments
 (0)