symfony · Mar 10, 2011 · Mar 7, 2011 · Mar 8, 2011 · Mar 9, 2011 · Mar 9, 2011
diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Security/DocumentUserProvider.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/Security/DocumentUserProvider.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Bundle\DoctrineMongoDBBundle\Security;
 
-use Symfony\Component\Security\Core\User\AccountInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
-use Symfony\Component\Security\Core\Exception\UnsupportedAccountException;
+use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 
 class DocumentUserProvider implements UserProviderInterface
@@ -59,13 +59,13 @@ public function loadUserByUsername($username)
     /**
      * {@inheritDoc}
      */
-    public function loadUserByAccount(AccountInterface $account)
+    public function loadUser(UserInterface $user)
     {
-        if (!$account instanceof $this->class) {
-            throw new UnsupportedAccountException(sprintf('Instances of "%s" are not supported.', get_class($account)));
+        if (!$user instanceof $this->class) {
+            throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', get_class($user)));
         }
 
-        return $this->loadUserByUsername($account->getUsername());
+        return $this->loadUserByUsername($user->getUsername());
     }
 
     /**

diff --git a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
@@ -23,7 +23,7 @@
  */
 class SecurityDataCollector extends DataCollector
 {
-    protected $context;
+    private $context;
 
     public function __construct(SecurityContextInterface $context = null)
     {
@@ -53,7 +53,7 @@ public function collect(Request $request, Response $response, \Exception $except
             $this->data = array(
                 'enabled'       => true,
                 'authenticated' => $token->isAuthenticated(),
-                'user'          => (string) $token,
+                'user'          => $token->getUsername(),
                 'roles'         => array_map(function ($role){ return $role->getRole();}, $token->getRoles()),
             );
         }

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Configuration.php
@@ -58,7 +58,7 @@ public function getMainConfigTree(array $factories)
         return $tb->buildTree();
     }
 
-    protected function addAclSection($rootNode)
+    private function addAclSection($rootNode)
     {
         $rootNode
             ->arrayNode('acl')
@@ -68,7 +68,7 @@ protected function addAclSection($rootNode)
         ;
     }
 
-    protected function addRoleHierarchySection($rootNode)
+    private function addRoleHierarchySection($rootNode)
     {
         $rootNode
             ->fixXmlConfig('role', 'role_hierarchy')
@@ -87,7 +87,7 @@ protected function addRoleHierarchySection($rootNode)
         ;
     }
 
-    protected function addAccessControlSection($rootNode)
+    private function addAccessControlSection($rootNode)
     {
         $rootNode
             ->fixXmlConfig('rule', 'access_control')
@@ -122,7 +122,7 @@ protected function addAccessControlSection($rootNode)
         ;
     }
 
-    protected function addFirewallsSection($rootNode, array $factories)
+    private function addFirewallsSection($rootNode, array $factories)
     {
         $firewallNodeBuilder =
         $rootNode
@@ -186,7 +186,7 @@ protected function addFirewallsSection($rootNode, array $factories)
         }
     }
 
-    protected function addProvidersSection($rootNode)
+    private function addProvidersSection($rootNode)
     {
         $rootNode
             ->fixXmlConfig('provider')
@@ -225,7 +225,7 @@ protected function addProvidersSection($rootNode)
         ;
     }
 
-    protected function addEncodersSection($rootNode)
+    private function addEncodersSection($rootNode)
     {
         $rootNode
             ->fixXmlConfig('encoder')

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -34,11 +34,11 @@
  */
 class SecurityExtension extends Extension
 {
-    protected $requestMatchers = array();
-    protected $contextListeners = array();
-    protected $listenerPositions = array('pre_auth', 'form', 'http', 'remember_me');
-    protected $configuration;
-    protected $factories;
+    private $requestMatchers = array();
+    private $contextListeners = array();
+    private $listenerPositions = array('pre_auth', 'form', 'http', 'remember_me');
+    private $configuration;
+    private $factories;
 
     public function __construct()
     {
@@ -107,7 +107,7 @@ public function load(array $configs, ContainerBuilder $container)
         ));
     }
 
-    protected function aclLoad($config, ContainerBuilder $container)
+    private function aclLoad($config, ContainerBuilder $container)
     {
         $loader = new XmlFileLoader($container, new FileLocator(array(__DIR__.'/../Resources/config', __DIR__.'/Resources/config')));
         $loader->load('security_acl.xml');
@@ -128,7 +128,7 @@ protected function aclLoad($config, ContainerBuilder $container)
      * @param ContainerBuilder $container A ContainerBuilder instance
      */
 
-    protected function createRoleHierarchy($config, ContainerBuilder $container)
+    private function createRoleHierarchy($config, ContainerBuilder $container)
     {
         if (!isset($config['role_hierarchy'])) {
             $container->remove('security.access.role_hierarchy_voter');
@@ -140,7 +140,7 @@ protected function createRoleHierarchy($config, ContainerBuilder $container)
         $container->remove('security.access.simple_role_voter');
     }
 
-    protected function createAuthorization($config, ContainerBuilder $container)
+    private function createAuthorization($config, ContainerBuilder $container)
     {
         if (!$config['access_control']) {
             return;
@@ -165,7 +165,7 @@ protected function createAuthorization($config, ContainerBuilder $container)
         }
     }
 
-    protected function createFirewalls($config, ContainerBuilder $container)
+    private function createFirewalls($config, ContainerBuilder $container)
     {
         if (!isset($config['firewalls'])) {
             return;
@@ -213,7 +213,7 @@ protected function createFirewalls($config, ContainerBuilder $container)
         ;
     }
 
-    protected function createFirewall(ContainerBuilder $container, $id, $firewall, &$authenticationProviders, $providerIds, array $factories)
+    private function createFirewall(ContainerBuilder $container, $id, $firewall, &$authenticationProviders, $providerIds, array $factories)
     {
         // Matcher
         $i = 0;
@@ -310,7 +310,7 @@ protected function createFirewall(ContainerBuilder $container, $id, $firewall, &
         return array($matcher, $listeners, $exceptionListener);
     }
 
-    protected function createContextListener($container, $contextKey)
+    private function createContextListener($container, $contextKey)
     {
         if (isset($this->contextListeners[$contextKey])) {
             return $this->contextListeners[$contextKey];
@@ -323,7 +323,7 @@ protected function createContextListener($container, $contextKey)
         return $this->contextListeners[$contextKey] = $listenerId;
     }
 
-    protected function createAuthenticationListeners($container, $id, $firewall, &$authenticationProviders, $defaultProvider, array $factories)
+    private function createAuthenticationListeners($container, $id, $firewall, &$authenticationProviders, $defaultProvider, array $factories)
     {
         $listeners = array();
         $hasListeners = false;
@@ -359,11 +359,11 @@ protected function createAuthenticationListeners($container, $id, $firewall, &$a
         return array($listeners, $defaultEntryPoint);
     }
 
-    protected function createEncoders($encoders, ContainerBuilder $container)
+    private function createEncoders($encoders, ContainerBuilder $container)
     {
         $encoderMap = array();
         foreach ($encoders as $class => $encoder) {
-            $encoderMap[$class] = $this->createEncoder($class, $encoder, $container);
+            $encoderMap[$class] = $this->createEncoder($encoder, $container);
         }
 
         $container
@@ -372,7 +372,7 @@ protected function createEncoders($encoders, ContainerBuilder $container)
         ;
     }
 
-    protected function createEncoder($accountClass, $config, ContainerBuilder $container)
+    private function createEncoder($config, ContainerBuilder $container)
     {
         // a custom encoder service
         if (isset($config['id'])) {
@@ -403,7 +403,7 @@ protected function createEncoder($accountClass, $config, ContainerBuilder $conta
     }
 
     // Parses user providers and returns an array of their ids
-    protected function createUserProviders($config, ContainerBuilder $container)
+    private function createUserProviders($config, ContainerBuilder $container)
     {
         $providerIds = array();
         foreach ($config['providers'] as $name => $provider) {
@@ -415,7 +415,7 @@ protected function createUserProviders($config, ContainerBuilder $container)
     }
 
     // Parses a <provider> tag and returns the id for the related user provider service
-    protected function createUserDaoProvider($name, $provider, ContainerBuilder $container, $master = true)
+    private function createUserDaoProvider($name, $provider, ContainerBuilder $container, $master = true)
     {
         $name = $this->getUserProviderId(strtolower($name));
 
@@ -468,12 +468,12 @@ protected function createUserDaoProvider($name, $provider, ContainerBuilder $con
         return $name;
     }
 
-    protected function getUserProviderId($name)
+    private function getUserProviderId($name)
     {
         return 'security.user.provider.concrete.'.$name;
     }
 
-    protected function createExceptionListener($container, $config, $id, $defaultEntryPoint)
+    private function createExceptionListener($container, $config, $id, $defaultEntryPoint)
     {
         $exceptionListenerId = 'security.exception_listener.'.$id;
         $listener = $container->setDefinition($exceptionListenerId, new DefinitionDecorator('security.exception_listener'));
@@ -489,7 +489,7 @@ protected function createExceptionListener($container, $config, $id, $defaultEnt
         return $exceptionListenerId;
     }
 
-    protected function createSwitchUserListener($container, $id, $config, $defaultProvider)
+    private function createSwitchUserListener($container, $id, $config, $defaultProvider)
     {
         $userProvider = isset($config['provider']) ? $this->getUserProviderId($config['provider']) : $defaultProvider;
 
@@ -503,7 +503,7 @@ protected function createSwitchUserListener($container, $id, $config, $defaultPr
         return $switchUserListenerId;
     }
 
-    protected function createRequestMatcher($container, $path = null, $host = null, $methods = null, $ip = null, array $attributes = array())
+    private function createRequestMatcher($container, $path = null, $host = null, $methods = null, $ip = null, array $attributes = array())
     {
         $serialized = serialize(array($path, $host, $methods, $ip, $attributes));
         $id = 'security.request_matcher.'.md5($serialized).sha1($serialized);
@@ -527,7 +527,7 @@ protected function createRequestMatcher($container, $path = null, $host = null,
         return $this->requestMatchers[$id] = new Reference($id);
     }
 
-    protected function createListenerFactories(ContainerBuilder $container, $config)
+    private function createListenerFactories(ContainerBuilder $container, $config)
     {
         if (null !== $this->factories) {
             return $this->factories;

diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
@@ -8,7 +8,7 @@
         <parameter key="security.context.class">Symfony\Component\Security\Core\SecurityContext</parameter>
         <parameter key="security.context.always_authenticate">false</parameter>
 
-        <parameter key="security.account_checker.class">Symfony\Component\Security\Core\User\AccountChecker</parameter>
+        <parameter key="security.user_checker.class">Symfony\Component\Security\Core\User\UserChecker</parameter>
 
         <parameter key="security.encoder_factory.generic.class">Symfony\Component\Security\Core\Encoder\EncoderFactory</parameter>
         <parameter key="security.encoder.digest.class">Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder</parameter>
@@ -72,7 +72,7 @@
 
         <service id="security.encoder_factory" alias="security.encoder_factory.generic"></service>
 
-        <service id="security.account_checker" class="%security.account_checker.class%" public="false" />
+        <service id="security.user_checker" class="%security.user_checker.class%" public="false" />
 
 
         <!-- Authorization related services -->

diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
@@ -137,14 +137,14 @@
 
         <service id="security.authentication.provider.dao" class="%security.authentication.provider.dao.class%" abstract="true" public="false">
             <argument /> <!-- User Provider -->
-            <argument type="service" id="security.account_checker" />
+            <argument type="service" id="security.user_checker" />
             <argument /> <!-- Provider-shared Key -->
             <argument type="service" id="security.encoder_factory" />
         </service>
 
         <service id="security.authentication.provider.pre_authenticated" class="%security.authentication.provider.pre_authenticated.class%" abstract="true" public="false">
             <argument /> <!-- User Provider -->
-            <argument type="service" id="security.account_checker" />
+            <argument type="service" id="security.user_checker" />
         </service>
 
         <service id="security.exception_listener" class="%security.exception_listener.class%" public="false" abstract="true">
@@ -159,7 +159,7 @@
         <service id="security.authentication.switchuser_listener" class="%security.authentication.switchuser_listener.class%" public="false" abstract="true">
             <argument type="service" id="security.context" />
             <argument /> <!-- User Provider -->
-            <argument type="service" id="security.account_checker" />
+            <argument type="service" id="security.user_checker" />
             <argument /> <!--  Provider Key -->
             <argument type="service" id="security.access.decision_manager" />
             <argument type="service" id="logger" on-invalid="null" />

diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
@@ -23,7 +23,7 @@
         </service>
 
         <service id="security.authentication.provider.rememberme" class="%security.authentication.provider.rememberme.class%" abstract="true" public="false">
-            <argument type="service" id="security.account_checker" />
+            <argument type="service" id="security.user_checker" />
         </service>
 
         <service id="security.rememberme.token.provider.in_memory" class="%security.rembemerme.token.provider.in_memory.class%" public="false"></service>

diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php
@@ -12,8 +12,8 @@
  */
 class FirewallContext
 {
-    protected $listeners;
-    protected $exceptionListener;
+    private $listeners;
+    private $exceptionListener;
 
     public function __construct(array $listeners, ExceptionListener $exceptionListener = null)
     {

diff --git a/src/Symfony/Bundle/SecurityBundle/Templating/Helper/SecurityHelper.php b/src/Symfony/Bundle/SecurityBundle/Templating/Helper/SecurityHelper.php
@@ -18,11 +18,11 @@
 /**
  * SecurityHelper provides read-only access to the security context.
  *
- * @author     Fabien Potencier <[email protected]>
+ * @author Fabien Potencier <[email protected]>
  */
 class SecurityHelper extends Helper
 {
-    protected $context;
+    private $context;
 
     /**
      * Constructor.
@@ -34,7 +34,7 @@ public function __construct(SecurityContextInterface $context = null)
         $this->context = $context;
     }
 
-    public function vote($role, $object = null, $field = null)
+    public function isGranted($role, $object = null, $field = null)
     {
         if (null === $this->context) {
             return false;
@@ -44,7 +44,7 @@ public function vote($role, $object = null, $field = null)
             $object = new FieldVote($object, $field);
         }
 
-        return $this->context->vote($role, $object);
+        return $this->context->isGranted($role, $object);
     }
 
     /**

diff --git a/src/Symfony/Bundle/SecurityBundle/Twig/Extension/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/Twig/Extension/SecurityExtension.php
@@ -21,14 +21,14 @@
  */
 class SecurityExtension extends \Twig_Extension
 {
-    protected $context;
+    private $context;
 
     public function __construct(SecurityContextInterface $context = null)
     {
         $this->context = $context;
     }
 
-    public function vote($role, $object = null, $field = null)
+    public function isGranted($role, $object = null, $field = null)
     {
         if (null === $this->context) {
             return false;
@@ -38,7 +38,7 @@ public function vote($role, $object = null, $field = null)
             $object = new FieldVote($object, $field);
         }
 
-        return $this->context->vote($role, $object);
+        return $this->context->isGranted($role, $object);
     }
 
     /**
@@ -47,7 +47,7 @@ public function vote($role, $object = null, $field = null)
     public function getFunctions()
     {
         return array(
-            'has_role' => new \Twig_Function_Method($this, 'vote'),
+            'is_granted' => new \Twig_Function_Method($this, 'isGranted'),
         );
     }