From 0b8b76bfef2607a0e99fd28e531ee44d17640e83 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Mon, 18 Jun 2012 08:12:50 +0200
Subject: [PATCH] [Security] allowed class names to be passed as an argument to
 EncoderFactoryInterface::getEncoder()

---
 src/Symfony/Component/Security/CHANGELOG.md   |  1 +
 .../Security/Core/Encoder/EncoderFactory.php  |  6 +++---
 .../Core/Encoder/EncoderFactoryInterface.php  |  8 +++++---
 .../Tests/Core/Encoder/EncoderFactoryTest.php | 19 +++++++++++++++++++
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/Security/CHANGELOG.md b/src/Symfony/Component/Security/CHANGELOG.md
index a555f1e7a5e0..36ca15b9234b 100644
--- a/src/Symfony/Component/Security/CHANGELOG.md
+++ b/src/Symfony/Component/Security/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 2.1.0
 -----
 
+ * EncoderFactoryInterface::getEncoder() can now also take a class name as an argument
  * allow switching to the user that is already impersonated
  * added support for the remember_me parameter in the query
  * added AccessMapInterface
diff --git a/src/Symfony/Component/Security/Core/Encoder/EncoderFactory.php b/src/Symfony/Component/Security/Core/Encoder/EncoderFactory.php
index 738706addbac..866c80971c03 100644
--- a/src/Symfony/Component/Security/Core/Encoder/EncoderFactory.php
+++ b/src/Symfony/Component/Security/Core/Encoder/EncoderFactory.php
@@ -30,10 +30,10 @@ public function __construct(array $encoders)
     /**
      * {@inheritDoc}
      */
-    public function getEncoder(UserInterface $user)
+    public function getEncoder($user)
     {
         foreach ($this->encoders as $class => $encoder) {
-            if (!$user instanceof $class) {
+            if ((is_object($user) && !$user instanceof $class) || (!is_subclass_of($user, $class) && $user != $class)) {
                 continue;
             }
 
@@ -44,7 +44,7 @@ public function getEncoder(UserInterface $user)
             return $this->encoders[$class];
         }
 
-        throw new \RuntimeException(sprintf('No encoder has been configured for account "%s".', get_class($user)));
+        throw new \RuntimeException(sprintf('No encoder has been configured for account "%s".', is_object($class) ? get_class($user) : $class));
     }
 
     /**
diff --git a/src/Symfony/Component/Security/Core/Encoder/EncoderFactoryInterface.php b/src/Symfony/Component/Security/Core/Encoder/EncoderFactoryInterface.php
index 3ae07e65a551..125e57b8f2df 100644
--- a/src/Symfony/Component/Security/Core/Encoder/EncoderFactoryInterface.php
+++ b/src/Symfony/Component/Security/Core/Encoder/EncoderFactoryInterface.php
@@ -23,9 +23,11 @@ interface EncoderFactoryInterface
     /**
      * Returns the password encoder to use for the given account.
      *
-     * @param UserInterface $user
+     * @param UserInterface|string $user A UserInterface instance of a class name
      *
-     * @return PasswordEncoderInterface never null
+     * @return PasswordEncoderInterface
+     *
+     * @throws \RuntimeException when no password encoder could be found for the user
      */
-    function getEncoder(UserInterface $user);
+    function getEncoder($user);
 }
diff --git a/src/Symfony/Component/Security/Tests/Core/Encoder/EncoderFactoryTest.php b/src/Symfony/Component/Security/Tests/Core/Encoder/EncoderFactoryTest.php
index a06080961e9a..d0bcb3ef961d 100644
--- a/src/Symfony/Component/Security/Tests/Core/Encoder/EncoderFactoryTest.php
+++ b/src/Symfony/Component/Security/Tests/Core/Encoder/EncoderFactoryTest.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder;
 use Symfony\Component\Security\Core\Encoder\EncoderFactory;
+use Symfony\Component\Security\Core\User\User;
 
 class EncoderFactoryTest extends \PHPUnit_Framework_TestCase
 {
@@ -37,7 +38,25 @@ public function testGetEncoderWithService()
 
         $encoder = $factory->getEncoder($this->getMock('Symfony\Component\Security\Core\User\UserInterface'));
         $expectedEncoder = new MessageDigestPasswordEncoder('sha1');
+        $this->assertEquals($expectedEncoder->encodePassword('foo', ''), $encoder->encodePassword('foo', ''));
+
+        $encoder = $factory->getEncoder(new User('user', 'pass'));
+        $expectedEncoder = new MessageDigestPasswordEncoder('sha1');
+        $this->assertEquals($expectedEncoder->encodePassword('foo', ''), $encoder->encodePassword('foo', ''));
+    }
+
+    public function testGetEncoderWithClassName()
+    {
+        $factory = new EncoderFactory(array(
+            'Symfony\Component\Security\Core\User\UserInterface' => new MessageDigestPasswordEncoder('sha1'),
+        ));
 
+        $encoder = $factory->getEncoder('Symfony\Component\Security\Core\User\UserInterface');
+        $expectedEncoder = new MessageDigestPasswordEncoder('sha1');
+        $this->assertEquals($expectedEncoder->encodePassword('foo', ''), $encoder->encodePassword('foo', ''));
+
+        $encoder = $factory->getEncoder('Symfony\Component\Security\Core\User\User');
+        $expectedEncoder = new MessageDigestPasswordEncoder('sha1');
         $this->assertEquals($expectedEncoder->encodePassword('foo', ''), $encoder->encodePassword('foo', ''));
     }
 }