Skip to content

Commit ef502db

Browse files
soyukasoyuka
committed
Merge 3.2
2 parents d85ed0c + 27f15a3 commit ef502db

File tree

17 files changed

+433
-372
lines changed

17 files changed

+433
-372
lines changed

‎.github/workflows/ci.yml

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
strategy:
3939
matrix:
4040
php:
41-
- '8.2'
41+
- '8.3'
4242
fail-fast: false
4343
steps:
4444
- name: Checkout
@@ -61,7 +61,7 @@ jobs:
6161
strategy:
6262
matrix:
6363
php:
64-
- '8.2'
64+
- '8.3'
6565
fail-fast: false
6666
env:
6767
APP_DEBUG: '1' # https://github.com/phpstan/phpstan-symfony/issues/37
@@ -120,11 +120,14 @@ jobs:
120120
php:
121121
- '8.1'
122122
- '8.2'
123+
- '8.3'
123124
include:
124125
- php: '8.1'
125126
coverage: true
126127
- php: '8.2'
127128
coverage: true
129+
- php: '8.3'
130+
coverage: true
128131
fail-fast: false
129132
steps:
130133
- name: Checkout
@@ -189,6 +192,7 @@ jobs:
189192
php:
190193
- '8.1'
191194
- '8.2'
195+
- '8.3'
192196
component:
193197
- JsonSchema
194198
- OpenApi
@@ -224,11 +228,14 @@ jobs:
224228
php:
225229
- '8.1'
226230
- '8.2'
231+
- '8.3'
227232
include:
228233
- php: '8.1'
229234
coverage: true
230235
- php: '8.2'
231236
coverage: true
237+
- php: '8.3'
238+
coverage: true
232239
fail-fast: false
233240
steps:
234241
- name: Checkout
@@ -321,7 +328,7 @@ jobs:
321328
strategy:
322329
matrix:
323330
php:
324-
- '8.2'
331+
- '8.3'
325332
fail-fast: false
326333
env:
327334
APP_ENV: postgres
@@ -370,7 +377,7 @@ jobs:
370377
strategy:
371378
matrix:
372379
php:
373-
- '8.2'
380+
- '8.3'
374381
fail-fast: false
375382
services:
376383
mysql:
@@ -421,6 +428,7 @@ jobs:
421428
php:
422429
- '8.1'
423430
- '8.2'
431+
- '8.3'
424432
fail-fast: false
425433
env:
426434
APP_ENV: mongodb
@@ -508,6 +516,7 @@ jobs:
508516
php:
509517
- '8.1'
510518
- '8.2'
519+
- '8.3'
511520
fail-fast: false
512521
env:
513522
APP_ENV: mercure
@@ -596,7 +605,7 @@ jobs:
596605
strategy:
597606
matrix:
598607
php:
599-
- '8.2'
608+
- '8.3'
600609
fail-fast: false
601610
env:
602611
APP_ENV: elasticsearch
@@ -647,7 +656,7 @@ jobs:
647656
strategy:
648657
matrix:
649658
php:
650-
- '8.2'
659+
- '8.3'
651660
fail-fast: false
652661
env:
653662
APP_ENV: elasticsearch
@@ -697,7 +706,7 @@ jobs:
697706
strategy:
698707
matrix:
699708
php:
700-
- '8.2'
709+
- '8.3'
701710
fail-fast: false
702711
steps:
703712
- name: Checkout
@@ -735,7 +744,7 @@ jobs:
735744
strategy:
736745
matrix:
737746
php:
738-
- '8.2'
747+
- '8.3'
739748
fail-fast: false
740749
steps:
741750
- name: Checkout
@@ -778,7 +787,7 @@ jobs:
778787
strategy:
779788
matrix:
780789
php:
781-
- '8.2'
790+
- '8.3'
782791
fail-fast: false
783792
steps:
784793
- name: Checkout
@@ -822,7 +831,7 @@ jobs:
822831
strategy:
823832
matrix:
824833
php:
825-
- '8.2'
834+
- '8.3'
826835
fail-fast: false
827836
env:
828837
APP_ENV: sqlite
@@ -866,7 +875,7 @@ jobs:
866875
strategy:
867876
matrix:
868877
php:
869-
- '8.2'
878+
- '8.3'
870879
fail-fast: false
871880
env:
872881
APP_ENV: sqlite
@@ -908,7 +917,7 @@ jobs:
908917
strategy:
909918
matrix:
910919
php:
911-
- '8.2'
920+
- '8.3'
912921
fail-fast: false
913922
steps:
914923
- name: Checkout
@@ -950,7 +959,7 @@ jobs:
950959
strategy:
951960
matrix:
952961
php:
953-
- '8.2'
962+
- '8.3'
954963
fail-fast: false
955964
steps:
956965
- name: Checkout
@@ -994,9 +1003,9 @@ jobs:
9941003
strategy:
9951004
matrix:
9961005
php:
997-
- '8.2'
1006+
- '8.3'
9981007
include:
999-
- php: '8.2'
1008+
- php: '8.3'
10001009
coverage: true
10011010
fail-fast: false
10021011
steps:
@@ -1071,7 +1080,7 @@ jobs:
10711080
strategy:
10721081
matrix:
10731082
php:
1074-
- '8.2'
1083+
- '8.3'
10751084
fail-fast: false
10761085
steps:
10771086
- name: Checkout

‎composer.json

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,17 @@
22
"name": "api-platform/core",
33
"description": "Build a fully-featured hypermedia or GraphQL API in minutes!",
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": [
@@ -94,7 +104,8 @@
94104
"doctrine/orm": "<2.14.0",
95105
"doctrine/mongodb-odm": "<2.4",
96106
"doctrine/persistence": "<1.3",
97-
"symfony/var-exporter" : "<6.1.1",
107+
"symfony/var-exporter": "<6.1.1",
108+
"sebastian/comparator": ">=5.0",
98109
"phpunit/phpunit": "<9.5",
99110
"phpspec/prophecy": "<1.15",
100111
"elasticsearch/elasticsearch": ">=8.0,<8.4"

‎src/Documentation/composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
"homepage": "https://api-platform.com/community/contributors"
2020
}
2121
],
22+
"conflict": {
23+
"sebastian/comparator": ">=5.0"
24+
},
2225
"require": {
2326
"api-platform/openapi": "*@dev || ^3.1",
2427
"api-platform/metadata": "*@dev || ^3.1"

‎src/Elasticsearch/composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@
5656
"php-http/discovery": false
5757
}
5858
},
59+
"conflict": {
60+
"sebastian/comparator": ">=5.0"
61+
},
5962
"extra": {
6063
"branch-alias": {
6164
"dev-main": "3.2.x-dev"

‎src/GraphQl/composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
"/Tests/"
4848
]
4949
},
50+
"conflict": {
51+
"sebastian/comparator": ">=5.0"
52+
},
5053
"config": {
5154
"preferred-install": {
5255
"*": "dist"

‎src/HttpCache/composer.json

Lines changed: 67 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,74 @@
11
{
2-
"name": "api-platform/http-cache",
3-
"description": "API Platform HttpCache component",
4-
"type": "library",
5-
"keywords": [
6-
"Cache",
7-
"Http"
8-
],
9-
"homepage": "https://api-platform.com",
10-
"license": "MIT",
11-
"authors": [
12-
{
13-
"name": "Kévin Dunglas",
14-
"email": "[email protected]",
15-
"homepage": "https://dunglas.fr"
2+
"name": "api-platform/http-cache",
3+
"description": "API Platform HttpCache component",
4+
"type": "library",
5+
"keywords": [
6+
"Cache",
7+
"Http"
8+
],
9+
"homepage": "https://api-platform.com",
10+
"license": "MIT",
11+
"authors": [
12+
{
13+
"name": "Kévin Dunglas",
14+
"email": "[email protected]",
15+
"homepage": "https://dunglas.fr"
16+
},
17+
{
18+
"name": "API Platform Community",
19+
"homepage": "https://api-platform.com/comunnity/contributors"
20+
}
21+
],
22+
"require": {
23+
"php": ">=8.1",
24+
"api-platform/metadata": "*@dev || ^3.1",
25+
"api-platform/state": "*@dev || ^3.1",
26+
"symfony/http-foundation": "^6.1"
1627
},
17-
{
18-
"name": "API Platform Community",
19-
"homepage": "https://api-platform.com/comunnity/contributors"
20-
}
21-
],
22-
"require": {
23-
"php": ">=8.1",
24-
"api-platform/metadata": "*@dev || ^3.1",
25-
"api-platform/state": "*@dev || ^3.1",
26-
"symfony/http-foundation": "^6.1"
27-
},
28-
"require-dev": {
29-
"guzzlehttp/guzzle": "^6.0 || ^7.0",
30-
"symfony/dependency-injection": "^6.1",
31-
"phpspec/prophecy-phpunit": "^2.0",
32-
"symfony/phpunit-bridge": "^6.1",
33-
"symfony/http-client": "^6.1"
34-
},
35-
"autoload": {
36-
"psr-4": {
37-
"ApiPlatform\\HttpCache\\": ""
28+
"require-dev": {
29+
"guzzlehttp/guzzle": "^6.0 || ^7.0",
30+
"symfony/dependency-injection": "^6.1",
31+
"phpspec/prophecy-phpunit": "^2.0",
32+
"symfony/phpunit-bridge": "^6.1",
33+
"symfony/http-client": "^6.1"
3834
},
39-
"exclude-from-classmap": [
40-
"/Tests/"
41-
]
42-
},
43-
"config": {
44-
"preferred-install": {
45-
"*": "dist"
35+
"autoload": {
36+
"psr-4": {
37+
"ApiPlatform\\HttpCache\\": ""
38+
},
39+
"exclude-from-classmap": [
40+
"/Tests/"
41+
]
42+
},
43+
"conflict": {
44+
"sebastian/comparator": ">=5.0"
4645
},
47-
"sort-packages": true,
48-
"allow-plugins": {
49-
"composer/package-versions-deprecated": true,
50-
"phpstan/extension-installer": true
51-
}
52-
},
53-
"extra": {
54-
"branch-alias": {
55-
"dev-main": "3.2.x-dev"
46+
"config": {
47+
"preferred-install": {
48+
"*": "dist"
49+
},
50+
"sort-packages": true,
51+
"allow-plugins": {
52+
"composer/package-versions-deprecated": true,
53+
"phpstan/extension-installer": true
54+
}
5655
},
57-
"symfony": {
58-
"require": "^6.1"
59-
}
60-
},
61-
"repositories": [
62-
{
63-
"type": "path",
64-
"url": "../Metadata"
56+
"extra": {
57+
"branch-alias": {
58+
"dev-main": "3.2.x-dev"
59+
},
60+
"symfony": {
61+
"require": "^6.1"
62+
}
6563
},
66-
{
67-
"type": "path",
68-
"url": "../State"
69-
}
70-
]
64+
"repositories": [
65+
{
66+
"type": "path",
67+
"url": "../Metadata"
68+
},
69+
{
70+
"type": "path",
71+
"url": "../State"
72+
}
73+
]
7174
}

0 commit comments

Comments
 (0)