Merge pull request #183 from symfony-cmf/performance_improvement

Save services to improve performance

Author: dbu

PublishWorkflow/PublishWorkflowChecker.php

@@ -14,7 +14,9 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Security\Core\SecurityContextInterface;
 
 /**
@@ -75,6 +77,16 @@ class PublishWorkflowChecker implements SecurityContextInterface
      */
     private $token;
 
+    /**
+     * @var TokenStorageInterface
+     */
+    private $tokenStorage = false;
+
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    private $authorizationChecker = false;
+
     /**
      * @param ContainerInterface             $container             To get the security context from.
      * @param AccessDecisionManagerInterface $accessDecisionManager Service to do the actual decision.
@@ -98,16 +110,15 @@ public function __construct(ContainerInterface $container, AccessDecisionManager
      */
     public function getToken()
     {
-        if (null === $this->token) {
-            if ($this->container->has('security.token_storage')) {
-                return $this->container->get('security.token_storage')->getToken();
-            } elseif ($this->container->has('security.context')) {
-                // to be BC with Symfony 2.3
-                return $this->container->get('security.context')->getToken();
-            }
+        if (null !== $this->token) {
+            return $this->token;
+        }
+
+        if (null === $this->getTokenStorage()) {
+            return;
         }
 
-        return $this->token;
+        return $this->getTokenStorage()->getToken();
     }
 
     /**
@@ -139,20 +150,11 @@ public function isGranted($attributes, $object = null)
             $attributes = array($attributes);
         }
 
-        $tokenStorage = $authorizationChecker = null;
-        if ($this->container->has('security.token_storage')) {
-            $tokenStorage = $this->container->get('security.token_storage');
-            $authorizationChecker = $this->container->get('security.authorization_checker');
-        } elseif ($this->container->has('security.context')) {
-            // to be BC with Symfony <2.6
-            $authorizationChecker = $tokenStorage = $this->container->get('security.context');
-        }
-
-        if ((count($attributes) === 1)
+        if (1 === count($attributes)
             && self::VIEW_ATTRIBUTE === reset($attributes)
-            && null !== $tokenStorage
-            && null !== $tokenStorage->getToken()
-            && $authorizationChecker->isGranted($this->bypassingRole)
+            && null !== $this->getTokenStorage()
+            && null !== $this->getTokenStorage()->getToken()
+            && $this->getAuthorizationChecker()->isGranted($this->bypassingRole)
         ) {
             return true;
         }
@@ -166,4 +168,36 @@ public function isGranted($attributes, $object = null)
 
         return $this->accessDecisionManager->decide($token, $attributes, $object);
     }
+
+    private function getTokenStorage()
+    {
+        if (false === $this->tokenStorage) {
+            if ($this->container->has('security.token_storage')) {
+                $this->tokenStorage = $this->container->get('security.token_storage');
+            } elseif ($this->container->has('security.context')) {
+                // for Symfony <2.6 compatibility
+                $this->tokenStorage = $this->container->get('security.context');
+            } else {
+                $this->tokenStorage = null;
+            }
+        }
+
+        return $this->tokenStorage;
+    }
+
+    private function getAuthorizationChecker()
+    {
+        if (false === $this->authorizationChecker) {
+            if ($this->container->has('security.authorization_checker')) {
+                $this->authorizationChecker = $this->container->get('security.authorization_checker');
+            } elseif ($this->container->has('security.context')) {
+                // for Symfony <2.6 compatibility
+                $this->authorizationChecker = $this->container->get('security.context');
+            } else {
+                $this->authorizationChecker = null;
+            }
+        }
+
+        return $this->authorizationChecker;
+    }
 }

Tests/Unit/PublishWorkflow/PublishWorkflowCheckerTest.php

@@ -66,6 +66,7 @@ public function setUp()
         // assuming Symfony <2.6
         $this->container->shouldReceive('has')->with('security.context')->andReturn(true);
         $this->container->shouldReceive('has')->with('security.token_storage')->andReturn(false);
+        $this->container->shouldReceive('has')->with('security.authorization_checker')->andReturn(false);
     }
 
     protected function tearDown()
@@ -159,6 +160,7 @@ public function testTokenStorageAndAuthenticationManager()
         $container->shouldReceive('get')->with('security.token_storage')->andReturn($ts);
         $container->shouldReceive('get')->with('security.authorization_checker')->andReturn($ac);
         $container->shouldReceive('has')->with('security.token_storage')->andReturn(true);
+        $container->shouldReceive('has')->with('security.authorization_checker')->andReturn(true);
 
         $ts->shouldReceive('getToken')->andReturn($token);
         $ac->shouldReceive('isGranted')->with($this->role)->andReturn(true);