Skip to content

Commit 982a921

Browse files
NyholmNyholm
committed
Merge branch '5.2' into 5.3
* 5.2: Add 5.2.* for all symfony deps Fix version constraint of symfony deps to v4.4 (#9) # Conflicts: # symfony.lock
2 parents 3d29213 + a4d2159 commit 982a921

File tree

2 files changed

+36
-98
lines changed

2 files changed

+36
-98
lines changed

‎composer.json‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,46 +12,46 @@
1212
"doctrine/orm": "^2.8",
1313
"phpdocumentor/reflection-docblock": "^5.2",
1414
"sensio/framework-extra-bundle": "^5.1",
15-
"symfony/asset": "*",
16-
"symfony/console": "*",
17-
"symfony/dotenv": "*",
18-
"symfony/expression-language": "*",
15+
"symfony/asset": "5.2.*",
16+
"symfony/console": "5.2.*",
17+
"symfony/dotenv": "5.2.*",
18+
"symfony/expression-language": "5.2.*",
1919
"symfony/flex": "^1.3.1",
20-
"symfony/form": "*",
21-
"symfony/framework-bundle": "*",
22-
"symfony/http-client": "*",
23-
"symfony/intl": "*",
24-
"symfony/mailer": "*",
20+
"symfony/form": "5.2.*",
21+
"symfony/framework-bundle": "5.2.*",
22+
"symfony/http-client": "5.2.*",
23+
"symfony/intl": "5.2.*",
24+
"symfony/mailer": "5.2.*",
2525
"symfony/mercure-bundle": "^0.3.2",
26-
"symfony/messenger": "*",
26+
"symfony/messenger": "5.2.*",
2727
"symfony/monolog-bundle": "^3.1",
2828
"symfony/notifier": "5.2.*",
29-
"symfony/process": "*",
30-
"symfony/property-access": "*",
31-
"symfony/property-info": "*",
32-
"symfony/proxy-manager-bridge": "*",
29+
"symfony/process": "5.2.*",
30+
"symfony/property-access": "5.2.*",
31+
"symfony/property-info": "5.2.*",
32+
"symfony/proxy-manager-bridge": "5.2.*",
3333
"symfony/rate-limiter": "5.2.*",
34-
"symfony/security-bundle": "*",
35-
"symfony/serializer": "*",
36-
"symfony/translation": "*",
37-
"symfony/twig-bundle": "*",
38-
"symfony/uid": "*",
39-
"symfony/validator": "*",
40-
"symfony/web-link": "*",
34+
"symfony/security-bundle": "5.2.*",
35+
"symfony/serializer": "5.2.*",
36+
"symfony/translation": "5.2.*",
37+
"symfony/twig-bundle": "5.2.*",
38+
"symfony/uid": "5.2.*",
39+
"symfony/validator": "5.2.*",
40+
"symfony/web-link": "5.2.*",
4141
"symfony/webpack-encore-bundle": "^1.11",
42-
"symfony/yaml": "*",
42+
"symfony/yaml": "5.2.*",
4343
"twig/extra-bundle": "^3.0",
4444
"twig/twig": "^3.0"
4545
},
4646
"require-dev": {
47-
"symfony/browser-kit": "*",
48-
"symfony/css-selector": "*",
49-
"symfony/debug-bundle": "*",
47+
"symfony/browser-kit": "5.2.*",
48+
"symfony/css-selector": "5.2.*",
49+
"symfony/debug-bundle": "5.2.*",
5050
"symfony/maker-bundle": "^1.0",
5151
"symfony/phpunit-bridge": "^5.2",
52-
"symfony/stopwatch": "*",
53-
"symfony/var-dumper": "*",
54-
"symfony/web-profiler-bundle": "*"
52+
"symfony/stopwatch": "5.2.*",
53+
"symfony/var-dumper": "5.2.*",
54+
"symfony/web-profiler-bundle": "5.2.*"
5555
},
5656
"config": {
5757
"preferred-install": {

‎symfony.lock‎

Lines changed: 8 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,4 @@
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/routes/api_platform.yaml",
12-
"config/packages/api_platform.yaml",
13-
"src/Entity/.gitignore"
14-
]
15-
},
162
"composer/package-versions-deprecated": {
173
"version": "1.11.99.1"
184
},
@@ -83,9 +69,6 @@
8369
"egulias/email-validator": {
8470
"version": "3.1.1"
8571
},
86-
"fig/link-util": {
87-
"version": "1.2.0"
88-
},
8972
"friendsofphp/proxy-manager-lts": {
9073
"version": "v1.0.3"
9174
},
@@ -125,9 +108,6 @@
125108
"psr/container": {
126109
"version": "1.1.1"
127110
},
128-
"psr/event-dispatcher": {
129-
"version": "1.0.0"
130-
},
131111
"psr/link": {
132112
"version": "1.1.1"
133113
},
@@ -146,9 +126,6 @@
146126
"config/packages/sensio_framework_extra.yaml"
147127
]
148128
},
149-
"symfony/amqp-messenger": {
150-
"version": "v5.3.0-beta1"
151-
},
152129
"symfony/asset": {
153130
"version": "v4.4.20"
154131
},
@@ -180,6 +157,9 @@
180157
"symfony/css-selector": {
181158
"version": "v4.4.20"
182159
},
160+
"symfony/debug": {
161+
"version": "v4.4.20"
162+
},
183163
"symfony/debug-bundle": {
184164
"version": "4.1",
185165
"recipe": {
@@ -204,9 +184,6 @@
204184
"symfony/doctrine-bridge": {
205185
"version": "v4.4.21"
206186
},
207-
"symfony/doctrine-messenger": {
208-
"version": "v5.3.0-beta1"
209-
},
210187
"symfony/dom-crawler": {
211188
"version": "v4.4.20"
212189
},
@@ -279,21 +256,12 @@
279256
"symfony/http-kernel": {
280257
"version": "v4.4.21"
281258
},
259+
"symfony/inflector": {
260+
"version": "v4.4.21"
261+
},
282262
"symfony/intl": {
283263
"version": "v4.4.20"
284264
},
285-
"symfony/lock": {
286-
"version": "5.2",
287-
"recipe": {
288-
"repo": "github.com/symfony/recipes",
289-
"branch": "master",
290-
"version": "5.2",
291-
"ref": "13350583a83fa636bf45a5fb62da3bdc73be52a1"
292-
},
293-
"files": [
294-
"config/packages/lock.yaml"
295-
]
296-
},
297265
"symfony/mailer": {
298266
"version": "4.3",
299267
"recipe": {
@@ -363,27 +331,12 @@
363331
"config/packages/test/monolog.yaml"
364332
]
365333
},
366-
"symfony/notifier": {
367-
"version": "5.0",
368-
"recipe": {
369-
"repo": "github.com/symfony/recipes",
370-
"branch": "master",
371-
"version": "5.0",
372-
"ref": "c31585e252b32fe0e1f30b1f256af553f4a06eb9"
373-
},
374-
"files": [
375-
"config/packages/notifier.yaml"
376-
]
377-
},
378334
"symfony/options-resolver": {
379335
"version": "v4.4.20"
380336
},
381337
"symfony/orm-pack": {
382338
"version": "v2.1.0"
383339
},
384-
"symfony/password-hasher": {
385-
"version": "v5.3.0-beta1"
386-
},
387340
"symfony/phpunit-bridge": {
388341
"version": "5.1",
389342
"recipe": {
@@ -400,7 +353,7 @@
400353
]
401354
},
402355
"symfony/polyfill-intl-grapheme": {
403-
"version": "v1.22.1"
356+
"version": "v1.23.1"
404357
},
405358
"symfony/polyfill-intl-icu": {
406359
"version": "v1.22.1"
@@ -426,9 +379,6 @@
426379
"symfony/polyfill-php81": {
427380
"version": "v1.23.0"
428381
},
429-
"symfony/polyfill-uuid": {
430-
"version": "v1.23.0"
431-
},
432382
"symfony/process": {
433383
"version": "v4.4.20"
434384
},
@@ -444,12 +394,6 @@
444394
"symfony/proxy-manager-bridge": {
445395
"version": "v4.4.20"
446396
},
447-
"symfony/rate-limiter": {
448-
"version": "v5.2.6"
449-
},
450-
"symfony/redis-messenger": {
451-
"version": "v5.3.0-beta1"
452-
},
453397
"symfony/routing": {
454398
"version": "4.2",
455399
"recipe": {
@@ -501,7 +445,7 @@
501445
"version": "v4.4.20"
502446
},
503447
"symfony/string": {
504-
"version": "v5.2.6"
448+
"version": "v6.0.0"
505449
},
506450
"symfony/test-pack": {
507451
"version": "v1.0.7"
@@ -542,9 +486,6 @@
542486
"symfony/twig-pack": {
543487
"version": "v1.0.1"
544488
},
545-
"symfony/uid": {
546-
"version": "v5.2.11"
547-
},
548489
"symfony/validator": {
549490
"version": "4.3",
550491
"recipe": {
@@ -614,8 +555,5 @@
614555
},
615556
"webmozart/assert": {
616557
"version": "1.10.0"
617-
},
618-
"willdurand/negotiation": {
619-
"version": "3.0.0"
620558
}
621559
}

0 commit comments

Comments
 (0)