[Security] Added named encoders to EncoderFactory

1 files changed, 20 insertions, 7 deletions

diff --git a/Core/Encoder/EncoderFactory.php b/Core/Encoder/EncoderFactory.php
index 8bad61f..bb5ba91 100644
--- a/Core/Encoder/EncoderFactory.php
+++ b/Core/Encoder/EncoderFactory.php
@@ -30,19 +30,32 @@ class EncoderFactory implements EncoderFactoryInterface
      */
     public function getEncoder($user)
     {
-        foreach ($this->encoders as $class => $encoder) {
-            if ((is_object($user) && !$user instanceof $class) || (!is_object($user) && !is_subclass_of($user, $class) && $user != $class)) {
-                continue;
+        $encoderKey = null;
+
+        if ($user instanceof EncoderAwareInterface && (null !== $encoderName = $user->getEncoderName())) {
+            if (!array_key_exists($encoderName, $this->encoders)) {
+                throw new \RuntimeException(sprintf('The encoder "%s" was not configured.', $encoderName));
             }
 
-            if (!$encoder instanceof PasswordEncoderInterface) {
-                return $this->encoders[$class] = $this->createEncoder($encoder);
+            $encoderKey = $encoderName;
+        } else {
+            foreach ($this->encoders as $class => $encoder) {
+                if ((is_object($user) && $user instanceof $class) || (!is_object($user) && (is_subclass_of($user, $class) || $user == $class))) {
+                    $encoderKey = $class;
+                    break;
+                }
             }
+        }
+
+        if (null === $encoderKey) {
+            throw new \RuntimeException(sprintf('No encoder has been configured for account "%s".', is_object($user) ? get_class($user) : $user));
+        }
 
-            return $this->encoders[$class];
+        if (!$this->encoders[$encoderKey] instanceof PasswordEncoderInterface) {
+            $this->encoders[$encoderKey] = $this->createEncoder($this->encoders[$encoderKey]);
         }
 
-        throw new \RuntimeException(sprintf('No encoder has been configured for account "%s".', is_object($user) ? get_class($user) : $user));
+        return $this->encoders[$encoderKey];
     }
 
     /**