DDC-1226, DDC-1228 - Bugfix with refereshing proxy references not setting the originalEntityData.

lib/Doctrine/ORM/UnitOfWork.php

@@ -1884,13 +1884,16 @@ class UnitOfWork implements PropertyChangedListener
             if ($entity instanceof Proxy && ! $entity->__isInitialized__) {
                 $entity->__isInitialized__ = true;
                 $overrideLocalValues = true;
-                $this->originalEntityData[$oid] = $data;
                 if ($entity instanceof NotifyPropertyChanged) {
                     $entity->addPropertyChangedListener($this);
                 }
             } else {
                 $overrideLocalValues = isset($hints[Query::HINT_REFRESH]);
             }
+
+            if ($overrideLocalValues) {
+                $this->originalEntityData[$oid] = $data;
+            }
         } else {
             $entity = $class->newInstance();
             $oid = spl_object_hash($entity);

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php

@@ -0,0 +1,136 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Tests\Models\CMS\CmsEmployee;
+
+require_once __DIR__ . '/../../../TestInit.php';
+
+/**
+ * @group DDC-1228
+ * @group DDC-1226
+ */
+class DDC1228Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+        try {
+            $this->_schemaTool->createSchema(array(
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1228User'),
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1228Profile'),
+            ));
+        } catch(\PDOException $e) {
+            
+        }
+    }
+    
+    public function testOneToOnePersist()
+    {
+        $user = new DDC1228User;
+        $profile = new DDC1228Profile();
+        $profile->name = "Foo";
+        $user->profile = $profile;
+        
+        $this->_em->persist($user);
+        $this->_em->persist($profile);
+        $this->_em->flush();
+        $this->_em->clear();
+        
+        $user = $this->_em->find(__NAMESPACE__ . '\\DDC1228User', $user->id);
+        
+        $this->assertFalse($user->getProfile()->__isInitialized__, "Proxy is not initialized");
+        $user->getProfile()->setName("Bar");
+        $this->assertTrue($user->getProfile()->__isInitialized__, "Proxy is not initialized");
+        
+        $this->assertEquals("Bar", $user->getProfile()->getName());
+        $this->assertEquals(array("id" => 1, "name" => "Foo"), $this->_em->getUnitOfWork()->getOriginalEntityData($user->getProfile()));
+        
+        $this->_em->flush();
+        $this->_em->clear();
+        
+        $user = $this->_em->find(__NAMESPACE__ . '\\DDC1228User', $user->id);
+        $this->assertEquals("Bar", $user->getProfile()->getName());
+    }
+    
+    public function testRefresh()
+    {
+        $user = new DDC1228User;
+        $profile = new DDC1228Profile();
+        $profile->name = "Foo";
+        $user->profile = $profile;
+        
+        $this->_em->persist($user);
+        $this->_em->persist($profile);
+        $this->_em->flush();
+        $this->_em->clear();
+        
+        $user = $this->_em->getReference(__NAMESPACE__ . '\\DDC1228User', $user->id);
+        
+        $this->_em->refresh($user);
+        $user->name = "Baz";
+        $this->_em->flush();
+        $this->_em->clear();
+        
+        $user = $this->_em->find(__NAMESPACE__ . '\\DDC1228User', $user->id);
+        $this->assertEquals("Baz", $user->name);
+    }
+}
+
+/**
+ * @Entity
+ */
+class DDC1228User
+{
+    /**
+     * @Id @Column(type="integer") @GeneratedValue
+     * @var int
+     */
+    public $id;
+    
+    /**
+     * @column(type="string")
+     * @var string
+     */
+    public $name = '';
+    
+    /**
+     * @OneToOne(targetEntity="DDC1228Profile")
+     * @var Profile
+     */
+    public $profile;
+    
+    public function getProfile()   
+    {
+        return $this->profile;
+    }
+}
+
+/**
+ * @Entity
+ */
+class DDC1228Profile
+{
+    /**
+     * @Id @Column(type="integer") @GeneratedValue
+     * @var int
+     */
+    public $id;
+    
+    /**
+     * @column(type="string")
+     * @var string
+     */
+    public $name;
+    
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
+}