Fix too much string casting. fixes doctrine#245

Ocramius · Oct 11, 2012 · 8e3cb5b · 8e3cb5b
1 parent befb8e2
commit 8e3cb5b
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 3 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataInfo.php
@@ -1296,7 +1296,7 @@ public function getIdentifierValue($document)
         if ($document instanceof Proxy && !$document->__isInitialized()) {
             return $document->__identifier__;
         }
-        return (string) $this->reflFields[$this->identifier]->getValue($document);
+        return $this->reflFields[$this->identifier]->getValue($document);
     }
 
     /**

diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Types/IdType.php b/lib/Doctrine/ODM/MongoDB/Mapping/Types/IdType.php
@@ -41,7 +41,7 @@ public function convertToDatabaseValue($value)
 
     public function convertToPHPValue($value)
     {
-        return $value !== null ? (string) $value : null;
+        return $value instanceof \MongoId ? (string) $value : $value;
     }
 
     public function closureToMongo()
@@ -51,6 +51,6 @@ public function closureToMongo()
 
     public function closureToPHP()
     {
-        return '$return = (string) $value;';
+        return '$return = $value instanceof \MongoId ? (string) $value : $value;';
     }
 }
diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH245Test.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH245Test.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket;
+
+use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+
+class GH245Test extends \Doctrine\ODM\MongoDB\Tests\BaseTest
+{
+	public function testTest()
+	{
+		$order = new GH245Order();
+		$order->id = 1;
+
+		$orderLog = new GH245OrderLog();
+		$orderLog->order = $order;
+
+		$this->dm->persist($orderLog);
+		$this->dm->persist($order);
+		$this->dm->flush();
+		$this->dm->clear();
+
+		$user = $this->dm->find(get_class($order), $order->id);
+
+		$this->assertTrue(is_int($order->id));
+
+		$check = $this->dm->getDocumentCollection(get_class($orderLog))->findOne();
+		$this->assertTrue(is_int($check['order']['$id']));
+	}
+}
+
+/** @ODM\Document */
+class GH245Order
+{
+	/** @ODM\Id(strategy="NONE") */
+	public $id;
+}
+
+/** @ODM\Document */
+class GH245OrderLog
+{
+	/** @ODM\Id */
+	public $id;
+
+	/** @ODM\ReferenceOne(targetDocument="GH245Order") */
+	public $order;
+}