Skip to content

Commit caf79a2

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 4ef1bc4 + 5f9abf8 commit caf79a2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Kernel.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -543,8 +543,8 @@ protected function initializeContainer()
543543
if ($collectDeprecations) {
544544
restore_error_handler();
545545

546-
file_put_contents($buildDir.'/'.$class.'Deprecations.log', serialize(array_values($collectedLogs)));
547-
file_put_contents($buildDir.'/'.$class.'Compiler.log', null !== $container ? implode("\n", $container->getCompiler()->getLog()) : '');
546+
@file_put_contents($buildDir.'/'.$class.'Deprecations.log', serialize(array_values($collectedLogs)));
547+
@file_put_contents($buildDir.'/'.$class.'Compiler.log', null !== $container ? implode("\n", $container->getCompiler()->getLog()) : '');
548548
}
549549
}
550550

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"symfony/stopwatch": "^4.4|^5.0",
4242
"symfony/translation": "^4.4|^5.0",
4343
"symfony/translation-contracts": "^1.1|^2",
44-
"psr/cache": "^1.0|^2.0",
44+
"psr/cache": "^1.0|^2.0|^3.0",
4545
"twig/twig": "^2.13|^3.0.4"
4646
},
4747
"provide": {

0 commit comments

Comments
 (0)