Skip to content

Commit 40b637f

Browse files
soyukasoyuka
committed
Merge branch '3.0'
2 parents 52a7274 + 08e532c commit 40b637f

29 files changed

+523
-127
lines changed

‎.github/workflows/ci.yml

+48-46
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
fail-fast: false
4141
steps:
4242
- name: Checkout
43-
uses: actions/checkout@v2
43+
uses: actions/checkout@v3
4444
- name: Setup PHP
4545
uses: shivammathur/setup-php@v2
4646
with:
@@ -66,7 +66,7 @@ jobs:
6666
SYMFONY_PHPUNIT_VERSION: '9.5'
6767
steps:
6868
- name: Checkout
69-
uses: actions/checkout@v2
69+
uses: actions/checkout@v3
7070
- name: Setup PHP
7171
uses: shivammathur/setup-php@v2
7272
with:
@@ -77,9 +77,9 @@ jobs:
7777
ini-values: memory_limit=-1
7878
- name: Get composer cache directory
7979
id: composercache
80-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
80+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
8181
- name: Cache dependencies
82-
uses: actions/cache@v2
82+
uses: actions/cache@v3
8383
with:
8484
path: ${{ steps.composercache.outputs.dir }}
8585
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -89,7 +89,7 @@ jobs:
8989
- name: Install PHPUnit
9090
run: vendor/bin/simple-phpunit --version
9191
- name: Cache PHPStan results
92-
uses: actions/cache@v2
92+
uses: actions/cache@v3
9393
with:
9494
path: /tmp/phpstan
9595
key: phpstan-php${{ matrix.php }}-${{ github.sha }}
@@ -122,7 +122,7 @@ jobs:
122122
fail-fast: false
123123
steps:
124124
- name: Checkout
125-
uses: actions/checkout@v2
125+
uses: actions/checkout@v3
126126
- name: Setup PHP
127127
uses: shivammathur/setup-php@v2
128128
with:
@@ -133,9 +133,9 @@ jobs:
133133
ini-values: memory_limit=-1
134134
- name: Get composer cache directory
135135
id: composercache
136-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
136+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
137137
- name: Cache dependencies
138-
uses: actions/cache@v2
138+
uses: actions/cache@v3
139139
with:
140140
path: ${{ steps.composercache.outputs.dir }}
141141
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -159,14 +159,14 @@ jobs:
159159
fi
160160
- name: Upload test artifacts
161161
if: always()
162-
uses: actions/upload-artifact@v1
162+
uses: actions/upload-artifact@v3
163163
with:
164164
name: phpunit-logs-php${{ matrix.php }}
165165
path: build/logs/phpunit
166166
continue-on-error: true
167167
- name: Upload coverage results to Codecov
168168
if: matrix.coverage
169-
uses: codecov/codecov-action@v1
169+
uses: codecov/codecov-action@v3
170170
with:
171171
name: phpunit-php${{ matrix.php }}
172172
flags: phpunit
@@ -196,7 +196,7 @@ jobs:
196196
fail-fast: false
197197
steps:
198198
- name: Checkout
199-
uses: actions/checkout@v2
199+
uses: actions/checkout@v3
200200
- name: Setup PHP
201201
uses: shivammathur/setup-php@v2
202202
with:
@@ -207,9 +207,9 @@ jobs:
207207
ini-values: memory_limit=-1
208208
- name: Get composer cache directory
209209
id: composercache
210-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
210+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
211211
- name: Cache dependencies
212-
uses: actions/cache@v2
212+
uses: actions/cache@v3
213213
with:
214214
path: ${{ steps.composercache.outputs.dir }}
215215
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -241,14 +241,14 @@ jobs:
241241
continue-on-error: true
242242
- name: Upload test artifacts
243243
if: always()
244-
uses: actions/upload-artifact@v1
244+
uses: actions/upload-artifact@v3
245245
with:
246246
name: behat-logs-php${{ matrix.php }}
247247
path: build/logs/behat
248248
continue-on-error: true
249249
- name: Upload coverage results to Codecov
250250
if: matrix.coverage
251-
uses: codecov/codecov-action@v1
251+
uses: codecov/codecov-action@v3
252252
with:
253253
name: behat-php${{ matrix.php }}
254254
flags: behat
@@ -269,7 +269,7 @@ jobs:
269269
tests/Fixtures/app/console api:openapi:export -o build/out/openapi/openapi_v3.json
270270
tests/Fixtures/app/console api:openapi:export --yaml -o build/out/openapi/openapi_v3.yaml
271271
- name: Setup node
272-
uses: actions/setup-node@v2
272+
uses: actions/setup-node@v3
273273
with:
274274
node-version: '14'
275275
- name: Validate OpenAPI documents
@@ -278,7 +278,7 @@ jobs:
278278
npx git+https://github.com/soyuka/swagger-cli#master validate build/out/openapi/openapi_v3.yaml
279279
- name: Upload OpenAPI artifacts
280280
if: always()
281-
uses: actions/upload-artifact@v1
281+
uses: actions/upload-artifact@v3
282282
with:
283283
name: openapi-docs-php${{ matrix.php }}
284284
path: build/out/openapi
@@ -299,7 +299,7 @@ jobs:
299299
PGPASSWORD: apiplatformrocks
300300
steps:
301301
- name: Checkout
302-
uses: actions/checkout@v2
302+
uses: actions/checkout@v3
303303
- name: Setup postgres
304304
run: |
305305
sudo systemctl start postgresql
@@ -316,9 +316,9 @@ jobs:
316316
ini-values: memory_limit=-1
317317
- name: Get composer cache directory
318318
id: composercache
319-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
319+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
320320
- name: Cache dependencies
321-
uses: actions/cache@v2
321+
uses: actions/cache@v3
322322
with:
323323
path: ${{ steps.composercache.outputs.dir }}
324324
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -355,7 +355,7 @@ jobs:
355355
DATABASE_URL: mysql://root:[email protected]/api_platform_test
356356
steps:
357357
- name: Checkout
358-
uses: actions/checkout@v2
358+
uses: actions/checkout@v3
359359
- name: Setup PHP
360360
uses: shivammathur/setup-php@v2
361361
with:
@@ -366,9 +366,9 @@ jobs:
366366
ini-values: memory_limit=-1
367367
- name: Get composer cache directory
368368
id: composercache
369-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
369+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
370370
- name: Cache dependencies
371-
uses: actions/cache@v2
371+
uses: actions/cache@v3
372372
with:
373373
path: ${{ steps.composercache.outputs.dir }}
374374
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -396,7 +396,7 @@ jobs:
396396
MONGODB_URL: mongodb://localhost:27017
397397
steps:
398398
- name: Checkout
399-
uses: actions/checkout@v2
399+
uses: actions/checkout@v3
400400
- name: Check
401401
run: |
402402
sudo systemctl start mongod.service
@@ -412,9 +412,9 @@ jobs:
412412
run: echo "COVERAGE=1" >> $GITHUB_ENV
413413
- name: Get composer cache directory
414414
id: composercache
415-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
415+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
416416
- name: Cache dependencies
417-
uses: actions/cache@v2
417+
uses: actions/cache@v3
418418
with:
419419
path: ${{ steps.composercache.outputs.dir }}
420420
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -445,13 +445,13 @@ jobs:
445445
continue-on-error: true
446446
- name: Upload test artifacts
447447
if: always()
448-
uses: actions/upload-artifact@v1
448+
uses: actions/upload-artifact@v3
449449
with:
450450
name: behat-logs-php${{ matrix.php }}
451451
path: build/logs/behat
452452
continue-on-error: true
453453
- name: Upload coverage results to Codecov
454-
uses: codecov/codecov-action@v1
454+
uses: codecov/codecov-action@v3
455455
with:
456456
name: behat-php${{ matrix.php }}
457457
flags: behat
@@ -479,7 +479,7 @@ jobs:
479479
APP_ENV: elasticsearch
480480
steps:
481481
- name: Checkout
482-
uses: actions/checkout@v2
482+
uses: actions/checkout@v3
483483
- name: Configure sysctl limits
484484
run: |
485485
sudo swapoff -a
@@ -500,9 +500,9 @@ jobs:
500500
ini-values: memory_limit=-1
501501
- name: Get composer cache directory
502502
id: composercache
503-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
503+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
504504
- name: Cache dependencies
505-
uses: actions/cache@v2
505+
uses: actions/cache@v3
506506
with:
507507
path: ${{ steps.composercache.outputs.dir }}
508508
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -529,7 +529,7 @@ jobs:
529529
SYMFONY_DEPRECATIONS_HELPER: max[total]=0
530530
steps:
531531
- name: Checkout
532-
uses: actions/checkout@v2
532+
uses: actions/checkout@v3
533533
- name: Setup PHP
534534
uses: shivammathur/setup-php@v2
535535
with:
@@ -540,9 +540,9 @@ jobs:
540540
ini-values: memory_limit=-1
541541
- name: Get composer cache directory
542542
id: composercache
543-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
543+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
544544
- name: Cache dependencies
545-
uses: actions/cache@v2
545+
uses: actions/cache@v3
546546
with:
547547
path: ${{ steps.composercache.outputs.dir }}
548548
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -570,7 +570,7 @@ jobs:
570570
#SYMFONY_DEPRECATIONS_HELPER: max[direct]=0
571571
steps:
572572
- name: Checkout
573-
uses: actions/checkout@v2
573+
uses: actions/checkout@v3
574574
- name: Setup PHP
575575
uses: shivammathur/setup-php@v2
576576
with:
@@ -581,11 +581,11 @@ jobs:
581581
ini-values: memory_limit=-1
582582
- name: Get composer cache directory
583583
id: composercache
584-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
584+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
585585
- name: Allow unstable project dependencies
586586
run: composer config minimum-stability dev
587587
- name: Cache dependencies
588-
uses: actions/cache@v2
588+
uses: actions/cache@v3
589589
with:
590590
path: ${{ steps.composercache.outputs.dir }}
591591
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -612,7 +612,7 @@ jobs:
612612
fail-fast: false
613613
steps:
614614
- name: Checkout
615-
uses: actions/checkout@v2
615+
uses: actions/checkout@v3
616616
- name: Setup PHP
617617
uses: shivammathur/setup-php@v2
618618
with:
@@ -625,11 +625,11 @@ jobs:
625625
run: sudo apt-get install moreutils
626626
- name: Get composer cache directory
627627
id: composercache
628-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
628+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
629629
- name: Allow unstable project dependencies
630630
run: composer config minimum-stability dev
631631
- name: Cache dependencies
632-
uses: actions/cache@v2
632+
uses: actions/cache@v3
633633
with:
634634
path: ${{ steps.composercache.outputs.dir }}
635635
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -659,7 +659,7 @@ jobs:
659659
DATABASE_URL: sqlite:///%kernel.project_dir%/var/data.db
660660
steps:
661661
- name: Checkout
662-
uses: actions/checkout@v1
662+
uses: actions/checkout@v3
663663
- name: Setup PHP with pre-release PECL extension
664664
uses: shivammathur/setup-php@v2
665665
with:
@@ -670,9 +670,10 @@ jobs:
670670
ini-values: memory_limit=-1
671671
- name: Get composer cache directory
672672
id: composercache
673-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
673+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
674+
shell: bash
674675
- name: Cache dependencies
675-
uses: actions/cache@v2
676+
uses: actions/cache@v3
676677
with:
677678
path: ${{ steps.composercache.outputs.dir }}
678679
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -700,7 +701,7 @@ jobs:
700701
DATABASE_URL: sqlite:///%kernel.project_dir%/var/data.db
701702
steps:
702703
- name: Checkout
703-
uses: actions/checkout@v1
704+
uses: actions/checkout@v3
704705
- name: Setup PHP with pre-release PECL extension
705706
uses: shivammathur/setup-php@v2
706707
with:
@@ -711,9 +712,10 @@ jobs:
711712
ini-values: memory_limit=-1
712713
- name: Get composer cache directory
713714
id: composercache
714-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
715+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
716+
shell: bash
715717
- name: Cache dependencies
716-
uses: actions/cache@v2
718+
uses: actions/cache@v3
717719
with:
718720
path: ${{ steps.composercache.outputs.dir }}
719721
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

‎CHANGELOG.md

+20
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
## v3.0.5
4+
5+
### Bug fixes
6+
7+
* [0f891616f](https://github.com/api-platform/core/commit/0f891616f65ad7a27338dbb91ab7c773f4e7d36e) fix(metadata): route prefix in the operation name (#5208)
8+
* [84a7e564d](https://github.com/api-platform/core/commit/84a7e564d0c3baded424ae754be00144e8179091) fix(metadata): getOperation cache matches arguments (#5215)
9+
* [bd0b05abc](https://github.com/api-platform/core/commit/bd0b05abc0f7e563290369eb7f45d6689d9ff10b) fix(serializer): dynamic groups should not be cached (#5207)
10+
* [ebaad51b2](https://github.com/api-platform/core/commit/ebaad51b2ce173b6c59582dcc6fb311f1f4b7fa9) fix(serializer): read groups off the root operation (#5196)
11+
312
## v3.0.4
413

514
### Bug fixes
@@ -89,6 +98,17 @@ Breaking changes:
8998
* Serializer: `skip_null_values` now defaults to `true`
9099
* Metadata: `Patch` is added to the automatic CRUD
91100

101+
## v2.7.5
102+
103+
### Bug fixes
104+
105+
* [096ac119a](https://github.com/api-platform/core/commit/096ac119a5126bdc5e7877172a033d7cdaa28983) fix(metadata): keep configured uri variables (#5217)
106+
* [2b2d468f0](https://github.com/api-platform/core/commit/2b2d468f06a63ecfa4928d5d631953acb624c181) fix(metadata): operations must inherit from resource and defaults
107+
* [2cb3b4272](https://github.com/api-platform/core/commit/2cb3b42725105aaf34dc9d71d2c03e156acd5833) fix(serializer): use iri from $context if defined (#5201)
108+
* [39398579e](https://github.com/api-platform/core/commit/39398579e32976b5b4b0219da98fdb35629a35ad) fix(symfony): definition when mercure is not installed (#5206)
109+
* [e9c7e4abb](https://github.com/api-platform/core/commit/e9c7e4abb683bb830a61712a8b63b8063e015b13) fix(serializer): avoid call to legacy iri converter with non-resource class (#5219)
110+
* [ebaad51b2](https://github.com/api-platform/core/commit/ebaad51b2ce173b6c59582dcc6fb311f1f4b7fa9) fix(serializer): read groups off the root operation (#5196)
111+
92112
## v2.7.4
93113

94114
### Bug fixes

‎composer.json

+1-7
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@
1212
"homepage": "https://dunglas.fr"
1313
}
1414
],
15-
"repositories": [
16-
{
17-
"type": "git",
18-
"url": "[email protected]:cdaguerre/contexts.git"
19-
}
20-
],
2115
"require": {
2216
"php": ">=8.1",
2317
"doctrine/inflector": "^1.0 || ^2.0",
@@ -35,7 +29,7 @@
3529
"require-dev": {
3630
"behat/behat": "^3.1",
3731
"behat/mink": "^1.9@dev",
38-
"behatch/contexts": "dev-patch-1",
32+
"soyuka/contexts": "dev-main",
3933
"doctrine/cache": "^1.11 || ^2.1",
4034
"doctrine/common": "^2.11 || ^3.0",
4135
"doctrine/data-fixtures": "^1.2.2",

0 commit comments

Comments
 (0)