Skip to content

Commit 96375d0

Browse files
soyukasoyuka
authored
Merge pull request #6651 from soyuka/4.0
Merge 3.4
2 parents 4d99196 + 665fd3a commit 96375d0

File tree

45 files changed

+450
-92
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+450
-92
lines changed

‎.gitattributes‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
/.editorconfig export-ignore
2-
/.gitattributes export-ignore
3-
/.github export-ignore
4-
/.gitignore export-ignore
5-
/.php_cs.dist export-ignore
1+
*.sh export-ignore
2+
.editorconfig export-ignore
3+
.gitattributes export-ignore
4+
.github export-ignore
5+
.gitignore export-ignore
6+
.php-cs-fixer.dist.php export-ignore
7+
phpstan.neon.dist export-ignore
8+
phpunit.xml.dist export-ignore
9+
/.commitlintrc export-ignore
610
/appveyor.yml export-ignore
711
/behat.yml.dist export-ignore
12+
/codecov.yml
813
/docs export-ignore
914
/features export-ignore
10-
/phpstan.neon.dist export-ignore
11-
/phpunit.xml.dist export-ignore
15+
/package-lock.json export-ignore
16+
/pmu.baseline
1217
/tests export-ignore
13-
/update-js.sh export-ignore
1418
/yarn.lock export-ignore

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.idea
12
*.log
23
/.php-cs-fixer.php
34
/.php-cs-fixer.cache

‎composer.json‎

Lines changed: 96 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,66 @@
11
{
2-
"name": "api-platform/core",
2+
"authors": [
3+
{
4+
"name": "Kévin Dunglas",
5+
"email": "[email protected]",
6+
"homepage": "https://dunglas.fr"
7+
}
8+
],
9+
"autoload": {
10+
"psr-4": {
11+
"ApiPlatform\\": "src/"
12+
}
13+
},
14+
"autoload-dev": {
15+
"psr-4": {
16+
"ApiPlatform\\Tests\\": "tests/",
17+
"App\\": "tests/Fixtures/app/var/tmp/src/"
18+
}
19+
},
20+
"config": {
21+
"preferred-install": {
22+
"*": "dist"
23+
},
24+
"sort-packages": true,
25+
"allow-plugins": {
26+
"composer/package-versions-deprecated": true,
27+
"phpstan/extension-installer": true,
28+
"php-http/discovery": true,
29+
"soyuka/pmu": true
30+
}
31+
},
32+
"conflict": {
33+
"doctrine/common": "<3.2.2",
34+
"doctrine/dbal": "<2.10",
35+
"doctrine/orm": "<2.14.0",
36+
"doctrine/mongodb-odm": "<2.4",
37+
"doctrine/persistence": "<1.3",
38+
"symfony/framework-bundle": "6.4.6 || 7.0.6",
39+
"symfony/var-exporter": "<6.1.1",
40+
"phpunit/phpunit": "<9.5",
41+
"phpspec/prophecy": "<1.15"
42+
},
343
"description": "Build a fully-featured hypermedia or GraphQL API in minutes!",
4-
"type": "library",
44+
"extra": {
45+
"branch-alias": {
46+
"dev-3.4": "3.4.x-dev",
47+
"dev-main": "4.0.x-dev"
48+
},
49+
"symfony": {
50+
"require": "^6.4 || ^7.1"
51+
},
52+
"pmu": {
53+
"projects": [
54+
"./src/*/composer.json",
55+
"src/Doctrine/*/composer.json"
56+
]
57+
},
58+
"thanks": {
59+
"name": "api-platform/api-platform",
60+
"url": "https://github.com/api-platform/api-platform"
61+
}
62+
},
63+
"homepage": "https://api-platform.com",
564
"keywords": [
665
"REST",
766
"GraphQL",
@@ -15,15 +74,31 @@
1574
"Symfony",
1675
"Laravel"
1776
],
18-
"homepage": "https://api-platform.com",
1977
"license": "MIT",
20-
"authors": [
21-
{
22-
"name": "Kévin Dunglas",
23-
"email": "[email protected]",
24-
"homepage": "https://dunglas.fr"
25-
}
26-
],
78+
"name": "api-platform/core",
79+
"replace": {
80+
"api-platform/doctrine-common": "self.version",
81+
"api-platform/doctrine-odm": "self.version",
82+
"api-platform/doctrine-orm": "self.version",
83+
"api-platform/documentation": "self.version",
84+
"api-platform/elasticsearch": "self.version",
85+
"api-platform/graphql": "self.version",
86+
"api-platform/http-cache": "self.version",
87+
"api-platform/hydra": "self.version",
88+
"api-platform/json-api": "self.version",
89+
"api-platform/json-hal": "self.version",
90+
"api-platform/json-schema": "self.version",
91+
"api-platform/jsonld": "self.version",
92+
"api-platform/laravel": "self.version",
93+
"api-platform/metadata": "self.version",
94+
"api-platform/openapi": "self.version",
95+
"api-platform/parameter-validator": "self.version",
96+
"api-platform/ramsey-uuid": "self.version",
97+
"api-platform/serializer": "self.version",
98+
"api-platform/state": "self.version",
99+
"api-platform/symfony": "self.version",
100+
"api-platform/validator": "self.version"
101+
},
27102
"require": {
28103
"php": ">=8.2",
29104
"doctrine/inflector": "^1.0 || ^2.0",
@@ -40,24 +115,24 @@
40115
"willdurand/negotiation": "^3.1"
41116
},
42117
"require-dev": {
43-
"api-platform/json-schema": "^3.4 || ^4.0",
44-
"api-platform/metadata": "^3.4 || ^4.0",
45-
"api-platform/state": "^3.4 || ^4.0",
46118
"api-platform/doctrine-common": "^3.4 || ^4.0",
47119
"api-platform/doctrine-odm": "^3.4 || ^4.0",
48120
"api-platform/doctrine-orm": "^3.4 || ^4.0",
121+
"api-platform/documentation": "^3.4 || ^4.0",
122+
"api-platform/elasticsearch": "^3.4 || ^4.0",
123+
"api-platform/graphql": "^3.4 || ^4.0",
124+
"api-platform/http-cache": "^3.4 || ^4.0",
125+
"api-platform/hydra": "^3.4 || ^4.0",
126+
"api-platform/json-api": "^3.3 || ^4.0",
127+
"api-platform/json-schema": "^3.4 || ^4.0",
128+
"api-platform/jsonld": "^3.4 || ^4.0",
129+
"api-platform/metadata": "^3.4 || ^4.0",
49130
"api-platform/openapi": "^3.4 || ^4.0",
50131
"api-platform/ramsey-uuid": "^3.4 || ^4.0",
51-
"api-platform/jsonld": "^3.4 || ^4.0",
52132
"api-platform/json-hal": "^3.4 || ^4.0",
53133
"api-platform/serializer": "^3.4 || ^4.0",
54-
"api-platform/json-api": "^3.3 || ^4.0",
55-
"api-platform/http-cache": "^3.4 || ^4.0",
56-
"api-platform/elasticsearch": "^3.4 || ^4.0",
57-
"api-platform/hydra": "^3.4 || ^4.0",
58-
"api-platform/documentation": "^3.4 || ^4.0",
134+
"api-platform/state": "^3.4 || ^4.0",
59135
"api-platform/validator": "^3.4 || ^4.0",
60-
"api-platform/graphql": "^3.4 || ^4.0",
61136
"behat/behat": "^3.11",
62137
"behat/mink": "^1.9",
63138
"doctrine/cache": "^1.11 || ^2.1",
@@ -130,17 +205,6 @@
130205
"twig/twig": "^1.42.3 || ^2.12 || ^3.0",
131206
"webonyx/graphql-php": "^15.0"
132207
},
133-
"conflict": {
134-
"doctrine/common": "<3.2.2",
135-
"doctrine/dbal": "<2.10",
136-
"doctrine/orm": "<2.14.0",
137-
"doctrine/mongodb-odm": "<2.4",
138-
"doctrine/persistence": "<1.3",
139-
"symfony/framework-bundle": "6.4.6 || 7.0.6",
140-
"symfony/var-exporter": "<6.1.1",
141-
"phpunit/phpunit": "<9.5",
142-
"phpspec/prophecy": "<1.15"
143-
},
144208
"suggest": {
145209
"doctrine/mongodb-odm-bundle": "To support MongoDB. Only versions 4.0 and later are supported.",
146210
"elasticsearch/elasticsearch": "To support Elasticsearch.",
@@ -159,46 +223,5 @@
159223
"symfony/web-profiler-bundle": "To use the data collector.",
160224
"webonyx/graphql-php": "To support GraphQL."
161225
},
162-
"autoload": {
163-
"psr-4": {
164-
"ApiPlatform\\": "src/"
165-
}
166-
},
167-
"autoload-dev": {
168-
"psr-4": {
169-
"ApiPlatform\\Tests\\": "tests/",
170-
"App\\": "tests/Fixtures/app/var/tmp/src/",
171-
"Workbench\\App\\": "src/Laravel/workbench/app/",
172-
"Workbench\\Database\\Factories\\": "src/Laravel/workbench/database/factories/",
173-
"Workbench\\Database\\Seeders\\": "src/Laravel/workbench/database/seeders/"
174-
}
175-
},
176-
"config": {
177-
"preferred-install": {
178-
"*": "dist"
179-
},
180-
"sort-packages": true,
181-
"allow-plugins": {
182-
"composer/package-versions-deprecated": true,
183-
"phpstan/extension-installer": true,
184-
"php-http/discovery": true,
185-
"soyuka/pmu": true
186-
}
187-
},
188-
"extra": {
189-
"branch-alias": {
190-
"dev-3.4": "3.4.x-dev",
191-
"dev-main": "4.0.x-dev"
192-
},
193-
"symfony": {
194-
"require": "^6.4 || ^7.0"
195-
},
196-
"pmu": {
197-
"projects": ["./src/*/composer.json", "src/Doctrine/*/composer.json"]
198-
},
199-
"thanks": {
200-
"name": "api-platform/api-platform",
201-
"url": "https://github.com/api-platform/api-platform"
202-
}
203-
}
226+
"type": "library"
204227
}

‎src/Doctrine/Common/.gitattributes‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
/.github export-ignore
2+
/.gitattributes export-ignore
13
/.gitignore export-ignore
24
/Tests export-ignore
5+
/phpunit.xml.dist export-ignore

‎src/Doctrine/Common/.github/workflows/close_pr.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Close Pull Request
2+
3+
on:
4+
pull_request_target:
5+
types: [opened]
6+
7+
jobs:
8+
run:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: superbrothers/close-pull-request@v3
12+
with:
13+
comment: "Thank you for your pull request. However, you have submitted this PR on a read-only sub split of `api-platform/core`. Please submit your PR on the https://github.com/api-platform/core repository.<br><br>Thanks!"

‎src/Doctrine/Odm/.gitattributes‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
/.github export-ignore
2+
/.gitattributes export-ignore
13
/.gitignore export-ignore
24
/Tests export-ignore
5+
/phpunit.xml.dist export-ignore

‎src/Doctrine/Odm/.github/workflows/close_pr.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Close Pull Request
2+
3+
on:
4+
pull_request_target:
5+
types: [opened]
6+
7+
jobs:
8+
run:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: superbrothers/close-pull-request@v3
12+
with:
13+
comment: "Thank you for your pull request. However, you have submitted this PR on a read-only sub split of `api-platform/core`. Please submit your PR on the https://github.com/api-platform/core repository.<br><br>Thanks!"

‎src/Doctrine/Odm/composer.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
"api-platform/doctrine-common": "^3.4 || ^4.0",
2929
"api-platform/metadata": "^3.4 || ^4.0",
3030
"api-platform/state": "^3.4 || ^4.0",
31-
"doctrine/mongodb-odm": "^2.6",
32-
"doctrine/mongodb-odm-bundle": "^4.0 || ^5.0",
33-
"symfony/property-info": "^6.4 || ^7.0"
31+
"doctrine/mongodb-odm": "^2.2",
32+
"symfony/property-info": "^6.4 || ^7.1"
3433
},
3534
"require-dev": {
3635
"doctrine/doctrine-bundle": "^2.11",
37-
"phpspec/prophecy-phpunit": "^2.2",
38-
"phpunit/phpunit": "^11.2",
36+
"doctrine/mongodb-odm-bundle": "^5.0",
37+
"phpspec/prophecy-phpunit": "^2.0",
38+
"phpunit/phpunit": "^10.0",
3939
"symfony/cache": "^6.4 || ^7.0",
4040
"symfony/framework-bundle": "^6.4 || ^7.0",
4141
"symfony/property-access": "^6.4 || ^7.0",

‎src/Doctrine/Orm/.gitattributes‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
/.github export-ignore
2+
/.gitattributes export-ignore
13
/.gitignore export-ignore
24
/Tests export-ignore
5+
/phpunit.xml.dist export-ignore

‎src/Doctrine/Orm/.github/workflows/close_pr.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Close Pull Request
2+
3+
on:
4+
pull_request_target:
5+
types: [opened]
6+
7+
jobs:
8+
run:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: superbrothers/close-pull-request@v3
12+
with:
13+
comment: "Thank you for your pull request. However, you have submitted this PR on a read-only sub split of `api-platform/core`. Please submit your PR on the https://github.com/api-platform/core repository.<br><br>Thanks!"

0 commit comments

Comments
 (0)