Merge branch '2.7' into 2.8

wouterj · Sep 24, 2015 · 25fe737 · 25fe737
2 parents 6a01917 + 713541a
commit 25fe737
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/cookbook/security/voters.rst b/cookbook/security/voters.rst
@@ -224,14 +224,8 @@ from the authorization checker is called.
             // get a Post instance
             $post = ...;
 
-<<<<<<< HEAD
-            $this->denyAccessUnlessGranted('view', $post, 'Unauthorized access!');
-=======
             // keep in mind that this will call all registered security voters
-            if (false === $this->get('security.context')->isGranted('view', $post)) {
-                throw new AccessDeniedException('Unauthorized access!');
-            }
->>>>>>> 2.3
+            $this->denyAccessUnlessGranted('view', $post, 'Unauthorized access!');
 
             return new Response('<h1>'.$post->getName().'</h1>');
         }