[Security][ACL] Fixed ObjectIdentity::fromDomainObject and UserSecurityIdentity::from(Account|Token) when working with proxies

Backported ClassUtils class from Doctrine Common 2.2
Fixes #2611, #2056, #2048, #2035

2 files changed, 98 insertions, 64 deletions

diff --git a/Tests/Acl/Domain/ObjectIdentityTest.php b/Tests/Acl/Domain/ObjectIdentityTest.php
index 20dbedf..20c74d5 100644
--- a/Tests/Acl/Domain/ObjectIdentityTest.php
+++ b/Tests/Acl/Domain/ObjectIdentityTest.php
@@ -9,83 +9,108 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Security\Tests\Acl\Domain;
-
-use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
-
-class ObjectIdentityTest extends \PHPUnit_Framework_TestCase
+namespace Symfony\Component\Security\Tests\Acl\Domain
 {
-    public function testConstructor()
+    use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
+    
+    class ObjectIdentityTest extends \PHPUnit_Framework_TestCase
     {
-        $id = new ObjectIdentity('fooid', 'footype');
-
-        $this->assertEquals('fooid', $id->getIdentifier());
-        $this->assertEquals('footype', $id->getType());
-    }
-
-    public function testFromDomainObjectPrefersInterfaceOverGetId()
-    {
-        $domainObject = $this->getMock('Symfony\Component\Security\Acl\Model\DomainObjectInterface');
-        $domainObject
-            ->expects($this->once())
-            ->method('getObjectIdentifier')
-            ->will($this->returnValue('getObjectIdentifier()'))
-        ;
-        $domainObject
-            ->expects($this->never())
-            ->method('getId')
-            ->will($this->returnValue('getId()'))
-        ;
-
-        $id = ObjectIdentity::fromDomainObject($domainObject);
-        $this->assertEquals('getObjectIdentifier()', $id->getIdentifier());
-    }
+        public function testConstructor()
+        {
+            $id = new ObjectIdentity('fooid', 'footype');
+    
+            $this->assertEquals('fooid', $id->getIdentifier());
+            $this->assertEquals('footype', $id->getType());
+        }
 
-    public function testFromDomainObjectWithoutInterface()
-    {
-        $id = ObjectIdentity::fromDomainObject(new TestDomainObject());
-        $this->assertEquals('getId()', $id->getIdentifier());
-    }
+        // Test that constructor never changes passed type, even with proxies
+        public function testConstructorWithProxy()
+        {
+            $id = new ObjectIdentity('fooid', 'Acme\DemoBundle\Proxy\__CG__\Symfony\Component\Security\Tests\Acl\Domain\TestDomainObject');
 
-    /**
-     * @dataProvider getCompareData
-     */
-    public function testEquals($oid1, $oid2, $equal)
-    {
-        if ($equal) {
-            $this->assertTrue($oid1->equals($oid2));
-        } else {
-            $this->assertFalse($oid1->equals($oid2));
+            $this->assertEquals('fooid', $id->getIdentifier());
+            $this->assertEquals('Acme\DemoBundle\Proxy\__CG__\Symfony\Component\Security\Tests\Acl\Domain\TestDomainObject', $id->getType());
+        }
+    
+        public function testFromDomainObjectPrefersInterfaceOverGetId()
+        {
+            $domainObject = $this->getMock('Symfony\Component\Security\Acl\Model\DomainObjectInterface');
+            $domainObject
+                ->expects($this->once())
+                ->method('getObjectIdentifier')
+                ->will($this->returnValue('getObjectIdentifier()'))
+            ;
+            $domainObject
+                ->expects($this->never())
+                ->method('getId')
+                ->will($this->returnValue('getId()'))
+            ;
+    
+            $id = ObjectIdentity::fromDomainObject($domainObject);
+            $this->assertEquals('getObjectIdentifier()', $id->getIdentifier());
+        }
+    
+        public function testFromDomainObjectWithoutInterface()
+        {
+            $id = ObjectIdentity::fromDomainObject(new TestDomainObject());
+            $this->assertEquals('getId()', $id->getIdentifier());
+            $this->assertEquals('Symfony\Component\Security\Tests\Acl\Domain\TestDomainObject', $id->getType());
         }
-    }
 
-    public function getCompareData()
-    {
-        return array(
-            array(new ObjectIdentity('123', 'foo'), new ObjectIdentity('123', 'foo'), true),
-            array(new ObjectIdentity('123', 'foo'), new ObjectIdentity(123, 'foo'), true),
-            array(new ObjectIdentity('1', 'foo'), new ObjectIdentity('2', 'foo'), false),
-            array(new ObjectIdentity('1', 'bla'), new ObjectIdentity('1', 'blub'), false),
-        );
+        public function testFromDomainObjectWithProxy()
+        {
+            $id = ObjectIdentity::fromDomainObject(new \Acme\DemoBundle\Proxy\__CG__\Symfony\Component\Security\Tests\Acl\Domain\TestDomainObject());
+            $this->assertEquals('getId()', $id->getIdentifier());
+            $this->assertEquals('Symfony\Component\Security\Tests\Acl\Domain\TestDomainObject', $id->getType());
+        }
+    
+        /**
+         * @dataProvider getCompareData
+         */
+        public function testEquals($oid1, $oid2, $equal)
+        {
+            if ($equal) {
+                $this->assertTrue($oid1->equals($oid2));
+            } else {
+                $this->assertFalse($oid1->equals($oid2));
+            }
+        }
+    
+        public function getCompareData()
+        {
+            return array(
+                array(new ObjectIdentity('123', 'foo'), new ObjectIdentity('123', 'foo'), true),
+                array(new ObjectIdentity('123', 'foo'), new ObjectIdentity(123, 'foo'), true),
+                array(new ObjectIdentity('1', 'foo'), new ObjectIdentity('2', 'foo'), false),
+                array(new ObjectIdentity('1', 'bla'), new ObjectIdentity('1', 'blub'), false),
+            );
+        }
+    
+        protected function setUp()
+        {
+            if (!class_exists('Doctrine\DBAL\DriverManager')) {
+                $this->markTestSkipped('The Doctrine2 DBAL is required for this test');
+            }
+        }
     }
-
-    protected function setUp()
+    
+    class TestDomainObject
     {
-        if (!class_exists('Doctrine\DBAL\DriverManager')) {
-            $this->markTestSkipped('The Doctrine2 DBAL is required for this test');
+        public function getObjectIdentifier()
+        {
+            return 'getObjectIdentifier()';
+        }
+    
+        public function getId()
+        {
+            return 'getId()';
         }
     }
 }
 
-class TestDomainObject
+namespace Acme\DemoBundle\Proxy\__CG__\Symfony\Component\Security\Tests\Acl\Domain
 {
-    public function getObjectIdentifier()
-    {
-        return 'getObjectIdentifier()';
-    }
-
-    public function getId()
+    class TestDomainObject extends \Symfony\Component\Security\Tests\Acl\Domain\TestDomainObject
     {
-        return 'getId()';
     }
 }
diff --git a/Tests/Acl/Domain/UserSecurityIdentityTest.php b/Tests/Acl/Domain/UserSecurityIdentityTest.php
index bb98fd0..9650803 100644
--- a/Tests/Acl/Domain/UserSecurityIdentityTest.php
+++ b/Tests/Acl/Domain/UserSecurityIdentityTest.php
@@ -24,6 +24,15 @@ class UserSecurityIdentityTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('Foo', $id->getClass());
     }
 
+    // Test that constructor never changes the type, even for proxies
+    public function testContructorWithProxy()
+    {
+        $id = new UserSecurityIdentity('foo', 'Acme\DemoBundle\Proxy\__CG__\Symfony\Component\Security\Tests\Acl\Domain\Foo');
+
+        $this->assertEquals('foo', $id->getUsername());
+        $this->assertEquals('Acme\DemoBundle\Proxy\__CG__\Symfony\Component\Security\Tests\Acl\Domain\Foo', $id->getClass());
+    }
+
     /**
      * @dataProvider getCompareData
      */