cv fixing

starkj · Aug 19, 2011 · 14a194d · 14a194d
1 parent 898727b
commit 14a194d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ODM/PHPCR/Mapping/Driver/AnnotationDriver.php
@@ -142,8 +142,7 @@ public function loadMetadataForClass($className, ClassMetadata $class)
         }
         $class->setNodeType($documentAnnot->nodeType);
 
-        if (isset($documentAnnot->referenceable) && $documentAnnot->referenceable)
-        {
+        if (isset($documentAnnot->referenceable) && $documentAnnot->referenceable) {
             $class->setReferenceable(true);
         }
 

diff --git a/lib/Doctrine/ODM/PHPCR/UnitOfWork.php b/lib/Doctrine/ODM/PHPCR/UnitOfWork.php
@@ -561,7 +561,10 @@ public function computeChangeSet(ClassMetadata $class, $document)
 
             $changed = false;
             foreach ($actualData as $fieldName => $fieldValue) {
-                if (!isset($class->fieldMappings[$fieldName]) && !isset($class->childMappings[$fieldName]) && !isset($class->associationsMappings[$fieldName])) {
+                if (!isset($class->fieldMappings[$fieldName]) 
+                    && !isset($class->childMappings[$fieldName])
+                    && !isset($class->associationsMappings[$fieldName])
+                ) {
                     continue;
                 }
                 if ($class->isCollectionValuedAssociation($fieldName)) {

diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Functional/ReferenceTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Functional/ReferenceTest.php
@@ -37,7 +37,7 @@ public function testCreate()
         $refRefTestObj = new RefRefTestObj();
 
         $refTestObj->id = "/functional/refTestObj";
-       $refRefTestObj->id = "/functional/refRefTestObj";
+        $refRefTestObj->id = "/functional/refRefTestObj";
         $refRefTestObj->name = "referenced";
 
         $refTestObj->reference = $refRefTestObj;