Skip to content

Commit 01307d0

Browse files
authored
Merge branch 'api-platform:main' into feature/property-schema-css-color-restriction
2 parents 89a2157 + 4ecde01 commit 01307d0

File tree

179 files changed

+5934
-198693
lines changed

Some content is hidden

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

179 files changed

+5934
-198693
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ concurrency:
1010

1111
env:
1212
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
13+
COMPOSER_ROOT_VERSION: "4.1.x-dev"
1314

1415
jobs:
1516
commitlint:
@@ -264,7 +265,7 @@ jobs:
264265
continue-on-error: true
265266

266267
phpunit-components:
267-
name: PHPUnit ${{ matrix.component }} (PHP ${{ matrix.php.version }} ${{ matrix.php.coverage && 'coverage' || '' }}
268+
name: PHPUnit ${{ matrix.component }} (PHP ${{ matrix.php.version }} ${{ matrix.php.coverage && 'coverage' || '' }}${{ matrix.php.lowest && 'lowest' || '' }})
268269
runs-on: ubuntu-latest
269270
timeout-minutes: 20
270271
strategy:
@@ -274,6 +275,8 @@ jobs:
274275
- version: '8.3'
275276
- version: '8.4'
276277
coverage: true
278+
- version: '8.4'
279+
lowest: true
277280
component:
278281
- api-platform/doctrine-common
279282
- api-platform/doctrine-orm
@@ -302,18 +305,24 @@ jobs:
302305
tools: pecl, composer
303306
extensions: intl, bcmath, curl, openssl, mbstring, pdo_sqlite, mongodb
304307
ini-values: memory_limit=-1
305-
- name: Linking
308+
- name: PMU
306309
run: |
307310
composer global require soyuka/pmu
308311
composer global config allow-plugins.soyuka/pmu true --no-interaction
312+
- name: Linking
313+
if: ${{ !matrix.php.lowest }}
314+
run: |
309315
composer global link . --permanent
316+
composer ${{matrix.component}} update
310317
- name: Run ${{ matrix.component }} install
318+
if: ${{ matrix.php.lowest }}
311319
run: |
312-
composer ${{matrix.component}} update
320+
cd $(composer ${{matrix.component}} --cwd)
321+
composer update${{ matrix.php.lowest && ' --prefer-lowest --prefer-source' || '' }}
313322
- name: Run ${{ matrix.component }} tests
314323
run: |
315324
mkdir -p /tmp/build/logs/phpunit
316-
composer ${{matrix.component}} test --log-junit "/tmp/build/logs/phpunit/junit.xml" ${{ matrix.php.coverage && '--coverage-clover /tmp/build/logs/phpunit/clover.xml' || '' }}
325+
composer ${{matrix.component}} test -- --log-junit "/tmp/build/logs/phpunit/junit.xml" ${{ matrix.php.coverage && '--coverage-clover /tmp/build/logs/phpunit/clover.xml' || '' }}${{ matrix.php.lowest && ' --ignore-baseline' || '' }}
317326
- name: Upload test artifacts
318327
if: always()
319328
uses: actions/upload-artifact@v4

.github/workflows/subtree.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- '3.3'
1111
- '3.4'
1212
- '4.0'
13+
- '4.1'
1314

1415
env:
1516
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,51 @@
11
# Changelog
22

3+
## v4.1.17
4+
5+
### Bug fixes
6+
7+
* [34a0d54b1](https://github.com/api-platform/core/commit/34a0d54b1fe195a233726ff2e8304c29f43954ca) fix(jsonld): genId false should work with embeded resources (#7219)
8+
* [c025b8f9f](https://github.com/api-platform/core/commit/c025b8f9f8ab51489dc75e470c057d6fae879fa0) fix(openapi): correct example usage for 3.0 (#7218)
9+
* [cdda4146b](https://github.com/api-platform/core/commit/cdda4146b429f8e605504e1dc403faa41f0255a7) fix(laravel): Allow `LinksHandler` to handle polymorphic relationships (#7231)
10+
* [dba97370f](https://github.com/api-platform/core/commit/dba97370fb8996cf4fc1d5b6d8ca92faf4e68637) fix(metadata): boolean type detection from parameter's schema (#7223)
11+
12+
## v4.1.16
13+
14+
### Bug fixes
15+
16+
* [4a99a5f6e](https://github.com/api-platform/core/commit/4a99a5f6e7eb13e9e77872dc33ec5b3dc2deef25) fix(laravel): persist HasMany and MorphMany relationships (#7208)
17+
* [9bfa5fef0](https://github.com/api-platform/core/commit/9bfa5fef0dfa129078118d0ce67f1ec2c8d548d7) fix(metadata): call dynamic validation groups #7184 (#7184)
18+
* [b2131645d](https://github.com/api-platform/core/commit/b2131645dec11a5dbf8bbe507f578720a84a686e) fix(laravel): route where uses requirements (#7199)
19+
* [b2b5f99c6](https://github.com/api-platform/core/commit/b2b5f99c64ced9f3580fdaee099d0e34e75d2697) refactor(state): merge parameter and link security (#7200)
20+
21+
Notes:
22+
23+
Two providers are now available on parameters (query parameters, header and uri variables `Link`):
24+
25+
- `ReadLinkParameterProvider` previously used for link security (renamed from `Symfony\Security\State\LinkedReadProvider`)
26+
- `IriConverterParameterProvider` this allows you to read a resource from an IRI usefull for filters (eg `?author=/authors/1`)
27+
28+
Previous tests on link security were left untouched we removed the experimental class `Symfony\Security\State\LinkAccessCheckerProvider` as well as the `LinkedReadProvider` as they're not used anymore.
29+
30+
31+
## v4.1.15 - v4.1.14 - v4.1.13
32+
33+
There was an issue with the subtree split as we attempted to test lower dependencies on the subtree split, some components where wrongly tagged.
34+
35+
The proper fix is at: https://github.com/api-platform/core/pull/7196
36+
37+
### Bug fixes
38+
39+
* [4bdfd6063](https://github.com/api-platform/core/commit/4bdfd6063a6e80fc9cc33ff16c0ec98fec688291) fix(symfony, laravel) skip webhooks when generates routing (#7175)
40+
* [582076cb6](https://github.com/api-platform/core/commit/582076cb6c0dbcde205fc49d97a0f50405544d0b) fix(openapi): duplicate get path for webhooks (#7174)
41+
* [84b967930](https://github.com/api-platform/core/commit/84b96793043c939f333c1aa2e96f69b23d3e9ece) fix(laravel): persist morph relations (#7170)
42+
* [d51cddba2](https://github.com/api-platform/core/commit/d51cddba2a7618c08e511582ac2f41a6b0eaf657) fix(laravel): index on non-primary key (#7183)
43+
* [fdb485dd2](https://github.com/api-platform/core/commit/fdb485dd2af56f7664bd90705d81e8f58c8b494a) fix(openapi): `example` and `default` with nullable value not being shown
44+
45+
### Features
46+
47+
* [79d08db6a](https://github.com/api-platform/core/commit/79d08db6a4728303b37440c610c96a490d44780a) feat(elasticsearch): add support for v9 (#7180)
48+
349
## v4.1.11 - v4.1.12
450

551
### Bug fixes

CONTRIBUTING.md

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,22 @@ If you include code from another project, please mention it in the Pull Request
246246
This section is for maintainers.
247247

248248
1. Update the JavaScript dependencies by running `./update-js.sh` (always check if it works in a browser)
249-
2. Update the `CHANGELOG.md` file (be sure to include Pull Request numbers when appropriate)
250-
3. Create a signed tag: `git tag -s vX.Y.Z -m "Version X.Y.Z"`
251-
4. Create a release using GitHub's UI and copy the changelog
252-
5. Create a new release of `api-platform/api-platform`
249+
2. Update the `CHANGELOG.md` file (be sure to include Pull Request numbers when appropriate) we use:
250+
251+
```bash
252+
bash generate-changelog.sh v4.1.11 v4.1.12 > CHANGELOG.new
253+
mv CHANGELOG.new CHANGELOG.md
254+
```
255+
4. Update `composer.json` `version` node and use
256+
257+
```bash
258+
composer blend --json-path=version
259+
```
260+
261+
This will update all the sub-components `composer.json`.
262+
263+
4. Create a signed tag: `git tag -s vX.Y.Z -m "Version X.Y.Z"`
264+
5. `git push upstream tag vX.Y.Z`
265+
6. `gh release create --generate-notes vX.Y.Z`
266+
7. Create a new release of `api-platform/api-platform`
267+

composer.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
"extra": {
4848
"branch-alias": {
4949
"dev-3.4": "3.4.x-dev",
50-
"dev-main": "4.0.x-dev"
50+
"dev-4.1": "4.1.x-dev",
51+
"dev-main": "4.2.x-dev"
5152
},
5253
"symfony": {
5354
"require": "^6.4 || ^7.1"
@@ -104,7 +105,7 @@
104105
},
105106
"require": {
106107
"php": ">=8.2",
107-
"doctrine/inflector": "^1.0 || ^2.0",
108+
"doctrine/inflector": "^2.0",
108109
"psr/cache": "^1.0 || ^2.0 || ^3.0",
109110
"psr/container": "^1.0 || ^2.0",
110111
"symfony/deprecation-contracts": "^3.1",
@@ -114,11 +115,12 @@
114115
"symfony/property-info": "^6.4 || ^7.1",
115116
"symfony/serializer": "^6.4 || ^7.0",
116117
"symfony/translation-contracts": "^3.3",
117-
"symfony/type-info": "v7.3.0-RC1",
118+
"symfony/type-info": "^7.3",
118119
"symfony/web-link": "^6.4 || ^7.1",
119120
"willdurand/negotiation": "^3.1"
120121
},
121122
"require-dev": {
123+
"ext-mongodb": "^1.21 || ^2.0",
122124
"behat/behat": "^3.11",
123125
"behat/mink": "^1.9",
124126
"doctrine/cache": "^1.11 || ^2.1",

0 commit comments

Comments
 (0)