Skip to content

Commit 4f63896

Browse files
Merge branch '4.3' into 4.4
* 4.3: [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 forward caught exception [Validator][ConstraintValidator] Stop passing unnecessary timezone argument to \DateTime add tags before processing them [MonologBridge] Fix debug processor datetime type
2 parents c71ab8d + 626c031 commit 4f63896

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Controller/ControllerTrait.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
use Symfony\Component\Messenger\Stamp\StampInterface;
3131
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
3232
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
33+
use Symfony\Component\Security\Core\User\UserInterface;
3334
use Symfony\Component\Security\Csrf\CsrfToken;
3435
use Symfony\Component\WebLink\EventListener\AddLinkHeaderListener;
3536
use Symfony\Component\WebLink\GenericLinkProvider;
@@ -352,7 +353,7 @@ protected function getDoctrine(): ManagerRegistry
352353
/**
353354
* Get a user from the Security Token Storage.
354355
*
355-
* @return object|null
356+
* @return UserInterface|object|null
356357
*
357358
* @throws \LogicException If SecurityBundle is not available
358359
*

0 commit comments

Comments
 (0)