Skip to content

Commit e70c6dc

Browse files
Merge branch '4.4' into 5.0
* 4.4: [Validator] Fix auto-mapping constraints should not be validated [Debug] Updated the README to deprecate the component [Cache] fix memory leak when using PhpFilesAdapter [Yaml] Implement multiline string as scalar block for tagged values [HttpFoundation] Use `Cache-Control: must-revalidate` only if explicit lifetime has been given [FrameworkBundle] Use UserInterface to @return in getUser method [CI] Replace php7.4snapshot with php7.4 in Travis configuration [ExpressionLanguage][Node][BinaryNode] Process division by zero Fixing bad order of operations with null coalescing operator forward caught exception [Validator][ConstraintValidator] Stop passing unnecessary timezone argument to \DateTime add tags before processing them [FrameworkBundle][ContainerLintCommand] Reinitialize bundles when the container is reprepared [Process] change the syntax of portable prepared command lines [MonologBridge] Fix debug processor datetime type
2 parents 3c8e117 + 0c2714d commit e70c6dc

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Command/ContainerLintCommand.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,11 @@ private function getContainerBuilder(): ContainerBuilder
6969
$kernel = $this->getApplication()->getKernel();
7070

7171
if (!$kernel->isDebug() || !(new ConfigCache($kernel->getContainer()->getParameter('debug.container.dump'), true))->isFresh()) {
72-
$buildContainer = \Closure::bind(function () { return $this->buildContainer(); }, $kernel, \get_class($kernel));
72+
$buildContainer = \Closure::bind(function (): ContainerBuilder {
73+
$this->initializeBundles();
74+
75+
return $this->buildContainer();
76+
}, $kernel, \get_class($kernel));
7377
$container = $buildContainer();
7478
} else {
7579
(new XmlFileLoader($container = new ContainerBuilder($parameterBag = new EnvPlaceholderParameterBag()), new FileLocator()))->load($kernel->getContainer()->getParameter('debug.container.dump'));

Controller/AbstractController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ protected function getDoctrine(): ManagerRegistry
351351
/**
352352
* Get a user from the Security Token Storage.
353353
*
354-
* @return mixed
354+
* @return UserInterface|object|null
355355
*
356356
* @throws \LogicException If SecurityBundle is not available
357357
*

0 commit comments

Comments
 (0)