Skip to content

Commit f9326ed

Browse files
NyholmNyholm
committed
Merge branch '5.4' into 6.0
* 5.4: Add 5.4.* for all symfony deps Add symfony lock Add 5.3.* for all symfony deps Add 5.2.* for all symfony deps Fix version constraint of symfony deps to v4.4 (#9) Update notifier (#8) add API Platform (#7) # Conflicts: # composer.json
2 parents dc9bba4 + 53206d1 commit f9326ed

File tree

5 files changed

+74
-71
lines changed

5 files changed

+74
-71
lines changed

‎composer.json‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,52 +5,53 @@
55
"php": ">=7.1.3",
66
"ext-ctype": "*",
77
"ext-iconv": "*",
8+
"api-platform/core": "^2.6",
89
"composer/package-versions-deprecated": "1.11.99.1",
910
"doctrine/annotations": "^1.0",
1011
"doctrine/doctrine-bundle": "^2.3",
1112
"doctrine/orm": "^2.8",
1213
"phpdocumentor/reflection-docblock": "^5.2",
1314
"sensio/framework-extra-bundle": "^6.1",
14-
"symfony/asset": "*",
15-
"symfony/console": "*",
16-
"symfony/dotenv": "*",
17-
"symfony/expression-language": "*",
15+
"symfony/asset": "5.4.*",
16+
"symfony/console": "5.4.*",
17+
"symfony/dotenv": "5.4.*",
18+
"symfony/expression-language": "5.4.*",
1819
"symfony/flex": "^1.3.1",
19-
"symfony/form": "*",
20-
"symfony/framework-bundle": "*",
21-
"symfony/http-client": "*",
22-
"symfony/intl": "*",
23-
"symfony/mailer": "*",
20+
"symfony/form": "5.4.*",
21+
"symfony/framework-bundle": "5.4.*",
22+
"symfony/http-client": "5.4.*",
23+
"symfony/intl": "5.4.*",
24+
"symfony/mailer": "5.4.*",
2425
"symfony/mercure-bundle": "^0.3.2",
25-
"symfony/messenger": "*",
26+
"symfony/messenger": "5.4.*",
2627
"symfony/monolog-bundle": "^3.1",
27-
"symfony/notifier": "5.2.*",
28-
"symfony/process": "*",
29-
"symfony/property-access": "*",
30-
"symfony/property-info": "*",
31-
"symfony/proxy-manager-bridge": "*",
32-
"symfony/rate-limiter": "5.2.*",
33-
"symfony/security-bundle": "*",
34-
"symfony/serializer": "*",
35-
"symfony/translation": "*",
36-
"symfony/twig-bundle": "*",
37-
"symfony/uid": "*",
38-
"symfony/validator": "*",
39-
"symfony/web-link": "*",
28+
"symfony/notifier": "5.4.*",
29+
"symfony/process": "5.4.*",
30+
"symfony/property-access": "5.4.*",
31+
"symfony/property-info": "5.4.*",
32+
"symfony/proxy-manager-bridge": "5.4.*",
33+
"symfony/rate-limiter": "5.4.*",
34+
"symfony/security-bundle": "5.4.*",
35+
"symfony/serializer": "5.4.*",
36+
"symfony/translation": "5.4.*",
37+
"symfony/twig-bundle": "5.4.*",
38+
"symfony/uid": "5.4.*",
39+
"symfony/validator": "5.4.*",
40+
"symfony/web-link": "5.4.*",
4041
"symfony/webpack-encore-bundle": "^1.11",
41-
"symfony/yaml": "*",
42+
"symfony/yaml": "5.4.*",
4243
"twig/extra-bundle": "^3.0",
4344
"twig/twig": "^3.0"
4445
},
4546
"require-dev": {
46-
"symfony/browser-kit": "*",
47-
"symfony/css-selector": "*",
48-
"symfony/debug-bundle": "*",
47+
"symfony/browser-kit": "5.4.*",
48+
"symfony/css-selector": "5.4.*",
49+
"symfony/debug-bundle": "5.4.*",
4950
"symfony/maker-bundle": "^1.0",
5051
"symfony/phpunit-bridge": "^5.2",
51-
"symfony/stopwatch": "*",
52-
"symfony/var-dumper": "*",
53-
"symfony/web-profiler-bundle": "*"
52+
"symfony/stopwatch": "5.4.*",
53+
"symfony/var-dumper": "5.4.*",
54+
"symfony/web-profiler-bundle": "5.4.*"
5455
},
5556
"config": {
5657
"preferred-install": {

‎config/bundles.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@
1313
Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true],
1414
Symfony\Bundle\MercureBundle\MercureBundle::class => ['all' => true],
1515
Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
16+
ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
1617
];

‎config/packages/api_platform.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
api_platform:
2+
mapping:
3+
paths: ['%kernel.project_dir%/src/Entity']
4+
patch_formats:
5+
json: ['application/merge-patch+json']
6+
swagger:
7+
versions: [3]

‎config/routes/api_platform.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
api_platform:
2+
resource: .
3+
type: api_platform
4+
prefix: /api

‎symfony.lock‎

Lines changed: 31 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
11
{
2+
"api-platform/core": {
3+
"version": "2.6",
4+
"recipe": {
5+
"repo": "github.com/symfony/recipes",
6+
"branch": "master",
7+
"version": "2.5",
8+
"ref": "05b57782a78c21a664a42055dc11cf1954ca36bb"
9+
},
10+
"files": [
11+
"config/packages/api_platform.yaml",
12+
"config/routes/api_platform.yaml",
13+
"src/Entity/.gitignore"
14+
]
15+
},
216
"composer/package-versions-deprecated": {
317
"version": "1.11.99.1"
418
},
@@ -69,6 +83,9 @@
6983
"egulias/email-validator": {
7084
"version": "3.1.1"
7185
},
86+
"fig/link-util": {
87+
"version": "1.2.0"
88+
},
7289
"friendsofphp/proxy-manager-lts": {
7390
"version": "v1.0.3"
7491
},
@@ -108,9 +125,6 @@
108125
"psr/container": {
109126
"version": "1.1.1"
110127
},
111-
"psr/event-dispatcher": {
112-
"version": "1.0.0"
113-
},
114128
"psr/link": {
115129
"version": "1.1.1"
116130
},
@@ -130,7 +144,7 @@
130144
]
131145
},
132146
"symfony/amqp-messenger": {
133-
"version": "v5.3.0-beta1"
147+
"version": "v5.3.7"
134148
},
135149
"symfony/asset": {
136150
"version": "v4.4.20"
@@ -163,6 +177,9 @@
163177
"symfony/css-selector": {
164178
"version": "v4.4.20"
165179
},
180+
"symfony/debug": {
181+
"version": "v4.4.20"
182+
},
166183
"symfony/debug-bundle": {
167184
"version": "4.1",
168185
"recipe": {
@@ -188,7 +205,7 @@
188205
"version": "v4.4.21"
189206
},
190207
"symfony/doctrine-messenger": {
191-
"version": "v5.3.0-beta1"
208+
"version": "v5.3.10"
192209
},
193210
"symfony/dom-crawler": {
194211
"version": "v4.4.20"
@@ -262,21 +279,12 @@
262279
"symfony/http-kernel": {
263280
"version": "v4.4.21"
264281
},
282+
"symfony/inflector": {
283+
"version": "v4.4.21"
284+
},
265285
"symfony/intl": {
266286
"version": "v4.4.20"
267287
},
268-
"symfony/lock": {
269-
"version": "5.2",
270-
"recipe": {
271-
"repo": "github.com/symfony/recipes",
272-
"branch": "master",
273-
"version": "5.2",
274-
"ref": "13350583a83fa636bf45a5fb62da3bdc73be52a1"
275-
},
276-
"files": [
277-
"config/packages/lock.yaml"
278-
]
279-
},
280288
"symfony/mailer": {
281289
"version": "4.3",
282290
"recipe": {
@@ -346,18 +354,6 @@
346354
"config/packages/test/monolog.yaml"
347355
]
348356
},
349-
"symfony/notifier": {
350-
"version": "5.0",
351-
"recipe": {
352-
"repo": "github.com/symfony/recipes",
353-
"branch": "master",
354-
"version": "5.0",
355-
"ref": "c31585e252b32fe0e1f30b1f256af553f4a06eb9"
356-
},
357-
"files": [
358-
"config/packages/notifier.yaml"
359-
]
360-
},
361357
"symfony/options-resolver": {
362358
"version": "v4.4.20"
363359
},
@@ -380,7 +376,7 @@
380376
]
381377
},
382378
"symfony/polyfill-intl-grapheme": {
383-
"version": "v1.22.1"
379+
"version": "v1.23.1"
384380
},
385381
"symfony/polyfill-intl-icu": {
386382
"version": "v1.22.1"
@@ -406,9 +402,6 @@
406402
"symfony/polyfill-php81": {
407403
"version": "v1.23.0"
408404
},
409-
"symfony/polyfill-uuid": {
410-
"version": "v1.23.0"
411-
},
412405
"symfony/process": {
413406
"version": "v4.4.20"
414407
},
@@ -424,11 +417,8 @@
424417
"symfony/proxy-manager-bridge": {
425418
"version": "v4.4.20"
426419
},
427-
"symfony/rate-limiter": {
428-
"version": "v5.2.6"
429-
},
430420
"symfony/redis-messenger": {
431-
"version": "v5.3.0-beta1"
421+
"version": "v5.3.10"
432422
},
433423
"symfony/routing": {
434424
"version": "4.2",
@@ -481,7 +471,7 @@
481471
"version": "v4.4.20"
482472
},
483473
"symfony/string": {
484-
"version": "v5.2.6"
474+
"version": "v6.0.0"
485475
},
486476
"symfony/test-pack": {
487477
"version": "v1.0.7"
@@ -522,9 +512,6 @@
522512
"symfony/twig-pack": {
523513
"version": "v1.0.1"
524514
},
525-
"symfony/uid": {
526-
"version": "v5.2.11"
527-
},
528515
"symfony/validator": {
529516
"version": "4.3",
530517
"recipe": {
@@ -594,5 +581,8 @@
594581
},
595582
"webmozart/assert": {
596583
"version": "1.10.0"
584+
},
585+
"willdurand/negotiation": {
586+
"version": "3.0.0"
597587
}
598588
}

0 commit comments

Comments
 (0)