Skip to content

Commit 5990d5d

Browse files
Merge branch '4.4' into 5.2
* 4.4: Allow psr/cache v3 but on symfony/cache [DI] fix tracking of changes to vendor/ dirs Remove EOLed 5.1 branch from PR template [HttpKernel] [Kernel] Silence deprecations logs writes Update PULL_REQUEST_TEMPLATE.md [Mailer][Mime] Update inline part names with newly generated ContentId Fixed updating catalogue metadata from intl domain [HttpFoundation] Setting `REQUEST_TIME_FLOAT` when constructing a Request object
2 parents 319b16f + 7033397 commit 5990d5d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Cache/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=7.2.5",
20-
"psr/cache": "^1.0|^2.0"
20+
"psr/cache": "^1.0|^2.0|^3.0"
2121
},
2222
"suggest": {
2323
"symfony/cache-implementation": ""

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=7.2.5",
20-
"psr/cache": "^1.0|^2.0",
20+
"psr/cache": "^1.0|^2.0|^3.0",
2121
"psr/container": "^1.0",
2222
"psr/event-dispatcher": "^1.0"
2323
},

0 commit comments

Comments
 (0)