minor fixes

videlalvaro · Sep 5, 2011 · 1956f00 · 1956f00
1 parent 9a879f4
commit 1956f00
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ODM/PHPCR/Mapping/ClassMetadataInfo.php
@@ -579,6 +579,9 @@ protected function validateAndCompleteAssociationMapping($mapping)
         if (isset($mapping['targetDocument']) && strpos($mapping['targetDocument'], '\\') === false && strlen($this->namespace)) {
             $mapping['targetDocument'] = $this->namespace . '\\' . $mapping['targetDocument'];
         }
+        if (!is_bool($mapping['weak'])) {
+            throw new MappingException("The attribute 'weak' for the '" . $this->name . "' association has to be a boolean true or false.");
+        }
         return $mapping;
     }
 

diff --git a/lib/Doctrine/ODM/PHPCR/UnitOfWork.php b/lib/Doctrine/ODM/PHPCR/UnitOfWork.php
@@ -879,6 +879,7 @@ public function flush($persist_to_backend = true)
 
                     if ($class->associationsMappings[$fieldName]['type'] === $class::MANY_TO_MANY) {
                         if (isset($fieldValue)) {
+                            $refNodesIds = array();
                             foreach ($fieldValue as $fv ) {
                                 if ($fv === null) {
                                     continue;