From 7a068c206e8ba1ef0fd6a88d89d9d984b0b35e85 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Sun, 1 May 2011 10:21:47 +0200
Subject: [PATCH] DDC-1043 - Make computeChangeSet() algorithm more strict,
 possible leading to more updates to to values that are not exactly the same.
 However this is necessary to avoid bugs with certain PHP casting rules, i.e.
 +44 = 44

---
 lib/Doctrine/ORM/UnitOfWork.php               |  4 +--
 .../ORM/Functional/Ticket/DDC1043Test.php     | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1043Test.php

diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
index 945815a69..7716855be 100644
--- a/lib/Doctrine/ORM/UnitOfWork.php
+++ b/lib/Doctrine/ORM/UnitOfWork.php
@@ -474,9 +474,7 @@ class UnitOfWork implements PropertyChangedListener
                     }
                 } else if ($isChangeTrackingNotify) {
                     continue;
-                } else if (is_object($orgValue) && $orgValue !== $actualValue) {
-                    $changeSet[$propName] = array($orgValue, $actualValue);
-                } else if ($orgValue != $actualValue || ($orgValue === null ^ $actualValue === null)) {
+                } else if ($orgValue !== $actualValue) {
                     $changeSet[$propName] = array($orgValue, $actualValue);
                 }
             }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1043Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1043Test.php
new file mode 100644
index 000000000..31bd8350f
--- /dev/null
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1043Test.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Common\Collections\ArrayCollection;
+require_once __DIR__ . '/../../../TestInit.php';
+
+/**
+ * @group DDC-1043
+ */
+class DDC1043Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    public function setUp()
+    {
+        $this->useModelSet('cms');
+        parent::setUp();
+    }
+
+    public function testChangeSetPlusWeirdPHPCastingIntCastingRule()
+    {
+        $user = new \Doctrine\Tests\Models\CMS\CmsUser();
+        $user->name = "John Galt";
+        $user->username = "jgalt";
+        $user->status = "+44";
+
+        $this->_em->persist($user);
+        $this->_em->flush();
+
+        $user->status = "44";
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $user = $this->_em->find("Doctrine\Tests\Models\CMS\CmsUser", $user->id);
+        $this->assertSame("44", $user->status);
+    }
+}
\ No newline at end of file