Restructured code after PR comments. Changed PHPDOC for interface.

mtrojanowski · mtrojanowski · commit e2cc24d88d96 · 2015-09-28T23:32:10.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php b/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php
@@ -54,17 +54,15 @@ public function loadUserByUsername($username)
         if (null !== $this->property) {
             $user = $this->repository->findOneBy(array($this->property => $username));
         } else {
-            if (!($this->repository instanceof UserLoaderInterface
-                || $this->repository instanceof UserProviderInterface)
-            ) {
-                throw new \InvalidArgumentException(sprintf(
-                    'The Doctrine repository "%s" must implement UserLoaderInterface.',
-                    get_class($this->repository)
-                ));
-            }
-
-            if ($this->repository instanceof UserProviderInterface) {
-                @trigger_error('Implementing loadUserByUsername from Symfony\Component\Security\Core\User\UserProviderInterface is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface instead.', E_USER_DEPRECATED);
+            if (!$this->repository instanceof UserLoaderInterface) {
+                if (!$this->repository instanceof UserProviderInterface) {
+                    throw new \InvalidArgumentException(sprintf(
+                        'The Doctrine repository "%s" must implement UserLoaderInterface.',
+                        get_class($this->repository)
+                    ));
+                }
+
+                @trigger_error('Implementing loadUserByUsername from Symfony\Component\Security\Core\User\UserProviderInterface is deprecated since version 2.8 and will be removed in 3.0. Use the Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface instead.', E_USER_DEPRECATED);
             }
 
             $user = $this->repository->loadUserByUsername($username);
diff --git a/src/Symfony/Bridge/Doctrine/Security/User/UserLoaderInterface.php b/src/Symfony/Bridge/Doctrine/Security/User/UserLoaderInterface.php
@@ -15,17 +15,11 @@
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 
 /**
- * Represents a class that loads UserInterface objects from some source for the authentication system.
+ * Represents a class that loads UserInterface objects from Doctrine source for the authentication system.
  *
- * In a typical authentication configuration, a username (i.e. some unique
- * user identifier) credential enters the system (via form login, or any
- * method). The user provider that is configured with that authentication
- * method is asked to load the UserInterface object for the given username
- * (via loadUserByUsername) so that the rest of the process can continue.
- *
- * Internally, a user provider can load users from any source (databases,
- * configuration, web service). This is totally independent of how the authentication
- * information is submitted or what the UserInterface object looks like.
+ * This interface is meant to facilitate the loading of a User from Doctrine source using a custom method.
+ * If you want to implement your own logic of retrieving the user from Doctrine your repository should implement this
+ * interface.
  *
  * @see UserInterface
  *
