merged branch stof/entity_provider_proxy (PR symfony#2922)

Commits ------- 649fa52 [DoctrineBridge] Fixed the entity provider to support proxies 29f4111 [DoctrineBridge] Added a failing test showing the issue for proxy users Discussion ---------- Fixed the entity provider to support proxies Bug fix: yes Feature addition: no Backwards compatibility break: yes Symfony2 tests pass: yes If a proxy object was used, the ``supportsClass`` method would fail becasue it does a string comparison for the class name. This issue has not been reported by users yet because it is an edge case: - ``supportsClass`` is used only in the RememberMe system - getting a proxy in the entity provider is possible only if a listener running before the firewall loaded an object which has a relation to the user, which is far from being a standard use case. --------------------------------------------------------------------------- by schmittjoh at 2011/12/19 10:07:46 -0800 How about using the new proxy tools that Doctrine has? --------------------------------------------------------------------------- by stof at 2011/12/19 10:20:37 -0800 the new tool will only be available in 2.2 so only for Symfony 2.1. Once merged into master, we could eventually refactor it in the master branch to use ``Doctrine\Common\Util\ClassUtils``

Author: fabpot

src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php

@@ -100,6 +100,6 @@ public function refreshUser(UserInterface $user)
  */
  public function supportsClass($class)
  {
- return $class === $this->class;
+ return $class === $this->class || is_subclass_of($class, $this->class);
  }
 }

tests/Symfony/Tests/Bridge/Doctrine/Security/User/EntityUserProviderTest.php

@@ -75,6 +75,23 @@ public function testRefreshInvalidUser()
  $provider->refreshUser($user2);
  }
 
+ public function testSupportProxy()
+ {
+ $em = $this->createTestEntityManager();
+ $this->createSchema($em);
+
+ $user1 = new CompositeIdentEntity(1, 1, 'user1');
+
+ $em->persist($user1);
+ $em->flush();
+ $em->clear();
+
+ $provider = new EntityUserProvider($em, 'Symfony\Tests\Bridge\Doctrine\Fixtures\CompositeIdentEntity', 'name');
+
+ $user2 = $em->getReference('Symfony\Tests\Bridge\Doctrine\Fixtures\CompositeIdentEntity', array('id1' => 1, 'id2' => 1));
+ $this->assertTrue($provider->supportsClass(get_class($user2)));
+ }
+
  private function createSchema($em)
  {
  $schemaTool = new SchemaTool($em);