some more test and bug fixes

videlalvaro · Aug 8, 2011 · db12f15 · db12f15
1 parent 52dc0fc
commit db12f15
Show file tree

Hide file tree

Showing 3 changed files with 366 additions and 18 deletions.
diff --git a/lib/Doctrine/ODM/PHPCR/Proxy/ReferenceProxyFactory.php b/lib/Doctrine/ODM/PHPCR/Proxy/ReferenceProxyFactory.php
@@ -168,6 +168,12 @@ private function getUnsetAttributes(ClassMetadata $class)
             $attributes .= '$this->'.$field["fieldName"];
             $attributes .= ", ";
         }
+
+        foreach ($class->associationsMappings as $field) {
+            $attributes .= '$this->'.$field["fieldName"];
+            $attributes .= ", ";
+        }
+
         $attributes = substr($attributes, 0, -2);
 
         return "unset(".$attributes.");";
@@ -303,7 +309,7 @@ public function __set($name, $value)
         $this->$name = $value;
     }
 
-    public function __get($name)
+    public function &__get($name)
     {
         $this->__doctrineLoad__();
         return $this->$name;

diff --git a/lib/Doctrine/ODM/PHPCR/UnitOfWork.php b/lib/Doctrine/ODM/PHPCR/UnitOfWork.php
@@ -426,6 +426,9 @@ private function cascadeScheduleInsert($class, $document, &$visited)
             $related = $class->reflFields[$assocName]->getValue($document);
             if ($related !== null) {
                 if ($class->associationsMappings[$assocName]['type'] & ClassMetadata::TO_ONE) {
+                    if (is_array($related)) {
+                        throw new PHPCRException("Referenced document is not stored correctly in a reference-one property. Don't use array notation.");
+                    }
                     if ($this->getDocumentState($related) == self::STATE_NEW) {
                         $this->doScheduleInsert($related, $visited);
                     }
@@ -607,7 +610,7 @@ public function computeChangeSet(ClassMetadata $class, $document)
             if ($actualData[$assocName]) {
                 if (is_array($actualData[$assocName])) {
                     foreach ($actualData[$assocName] as $ref) {
-                        if ($ref != null) {
+                        if ($ref !== null) {
                             $this->computeReferenceChanges($assoc, $ref, $id);
                         }
                     }
@@ -840,6 +843,7 @@ public function flush($persist_to_backend = true)
                                 $refNodesIds[] = $this->nodesMap[$refOid]->getIdentifier();
                             }
                             $node->setProperty($class->associationsMappings[$fieldName]['fieldName'], $refNodesIds, $type);
+                            unset($refNodesIds);
                         }
 
                     } elseif ($class->associationsMappings[$fieldName]['type'] === $class::MANY_TO_ONE) {