From f0e832a6a1590c9bb69958a0d4195206f81e5db2 Mon Sep 17 00:00:00 2001 From: Jules Pietri Date: Mon, 27 Feb 2017 08:09:42 +0100 Subject: [PATCH] [HttpKernel] Refactored SessionValueResolver --- .../ArgumentResolver/SessionValueResolver.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/SessionValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/SessionValueResolver.php index 1c733fbdb7c04..9e656d281b309 100644 --- a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/SessionValueResolver.php +++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/SessionValueResolver.php @@ -28,19 +28,12 @@ final class SessionValueResolver implements ArgumentValueResolverInterface */ public function supports(Request $request, ArgumentMetadata $argument) { - if (SessionInterface::class !== $argument->getType() && !is_subclass_of($argument->getType(), SessionInterface::class)) { + $type = $argument->getType(); + if (SessionInterface::class !== $type && !is_subclass_of($type, SessionInterface::class)) { return false; } - $session = $request->getSession(); - - if (null === $session) { - return false; - } - - $class = get_class($session); - - return $class === $argument->getType() || is_subclass_of($class, $argument->getType()); + return $request->getSession() instanceof $type; } /**