minor #21773 [HttpKernel] Refactored SessionValueResolver (HeahDude)

nicolas-grekas · nicolas-grekas · commit e7a9f03bae43 · 2017-02-27T15:04:15.000+01:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [HttpKernel] Refactored SessionValueResolver | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | ~ | License | MIT | Doc PR | ~ I thought the comment has been addressed in #21164, but it may have been unintentionally lost while rebasing? Commits ------- f0e832a [HttpKernel] Refactored SessionValueResolver
diff --git 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;
     }
 
     /**
