merged branch stof/entity_provider (PR #2923)

fabpot · fabpot · commit ce41b8eafac2 · 2011-12-19T19:48:33.000+01:00
Commits ------- f1199c0 [DoctrineBridge] Decoupled the EntityUserProvider from the ORM Discussion ---------- [DoctrineBridge] Decoupled the EntityUserProvider from the ORM Bug fix: no Feature addition: yes Backwards compatibility break: yes Symfony2 tests pass: yes The entity provider can now be used by any Doctrine project implementing the interfaces from Doctrine Common 2.2.
diff --git a/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php b/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php
@@ -11,14 +11,14 @@
 
 namespace Symfony\Bridge\Doctrine\Security\User;
 
-use Doctrine\ORM\EntityManager;
+use Doctrine\Common\Persistence\ObjectManager;
 use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
- * Wrapper around a Doctrine EntityManager.
+ * Wrapper around a Doctrine ObjectManager.
  *
  * Provides easy to use provisioning for Doctrine entity users.
  *
@@ -32,13 +32,13 @@ class EntityUserProvider implements UserProviderInterface
     private $property;
     private $metadata;
 
-    public function __construct(EntityManager $em, $class, $property = null)
+    public function __construct(ObjectManager $em, $class, $property = null)
     {
         $this->class = $class;
         $this->metadata = $em->getClassMetadata($class);
 
         if (false !== strpos($this->class, ':')) {
-            $this->class = $this->metadata->name;
+            $this->class = $this->metadata->getName();
         }
 
         $this->repository = $em->getRepository($class);
