From bea78f42e36b0063308626348684885c7c433443 Mon Sep 17 00:00:00 2001
From: Miha Vrhovnik <miha.vrhovnik@pagein.si>
Date: Mon, 30 Jan 2012 11:44:08 +0100
Subject: [PATCH] Proxy not initialized when parent has get<IDENTIFIER>
 function. Fixes DDC-1625

---
 lib/Doctrine/ORM/Proxy/ProxyFactory.php       |  2 +-
 .../ORM/Functional/ReferenceProxyTest.php     | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/lib/Doctrine/ORM/Proxy/ProxyFactory.php b/lib/Doctrine/ORM/Proxy/ProxyFactory.php
index 75781eaeb..ed5d1560c 100644
--- a/lib/Doctrine/ORM/Proxy/ProxyFactory.php
+++ b/lib/Doctrine/ORM/Proxy/ProxyFactory.php
@@ -285,7 +285,7 @@ class ProxyFactory
         );
 
         if ($cheapCheck) {
-            $code = file($class->reflClass->getFileName());
+            $code = file($method->getDeclaringClass()->getFileName());
             $code = trim(implode(" ", array_slice($code, $method->getStartLine() - 1, $method->getEndLine() - $method->getStartLine() + 1)));
 
             $pattern = sprintf(self::PATTERN_MATCH_ID_METHOD, $method->getName(), $identifier);
diff --git a/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php b/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php
index 676d41878..3ce24e739 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php
@@ -6,6 +6,7 @@ use Doctrine\ORM\Proxy\ProxyFactory;
 use Doctrine\ORM\Proxy\ProxyClassGenerator;
 use Doctrine\Tests\Models\ECommerce\ECommerceProduct;
 use Doctrine\Tests\Models\ECommerce\ECommerceShipping;
+use Doctrine\Tests\Models\Company\CompanyAuction;
 
 require_once __DIR__ . '/../../TestInit.php';
 
@@ -39,6 +40,18 @@ class ReferenceProxyTest extends \Doctrine\Tests\OrmFunctionalTestCase
         return $product->getId();
     }
 
+    public function createAuction()
+    {
+        $event = new CompanyAuction();
+        $event->setData('Doctrine Cookbook');
+        $this->_em->persist($event);
+
+        $this->_em->flush();
+        $this->_em->clear();
+
+        return $event->getId();
+    }
+
     public function testLazyLoadsFieldValuesFromDatabase()
     {
         $id = $this->createProduct();
@@ -161,6 +174,21 @@ class ReferenceProxyTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertFalse($entity->__isInitialized__, "Getting the identifier doesn't initialize the proxy.");
     }
 
+    /**
+     * @group DDC-1625
+     */
+    public function testDoNotInitializeProxyOnGettingTheIdentifier_DDC_1625()
+    {
+        $id = $this->createAuction();
+
+        /* @var $entity Doctrine\Tests\Models\Company\CompanyAuction */
+        $entity = $this->_em->getReference('Doctrine\Tests\Models\Company\CompanyAuction' , $id);
+
+        $this->assertFalse($entity->__isInitialized__, "Pre-Condition: Object is unitialized proxy.");
+        $this->assertEquals($id, $entity->getId());
+        $this->assertFalse($entity->__isInitialized__, "Getting the identifier doesn't initialize the proxy when extending.");
+    }
+    
     public function testDoNotInitializeProxyOnGettingTheIdentifierAndReturnTheRightType()
     {
         $product = new ECommerceProduct();