Doctrine

Timestamp:

01/17/08 13:25:04 (18 months ago)

Author:

guilhermeblanco

Message:

Added a fix in toArray method to prevent mapped Doctrine_Record values to be displayed fully

Location:

branches

Files:

• 0.10/lib/Doctrine/Record.php (modified) (3 diffs)
• 0.9/lib/Doctrine/Record.php (modified) (1 diff)

branches/0.10/lib/Doctrine/Record.php

@@ -1203 +1203 @@
                 $value = null;
             }
+
             $a[$column] = $value;
         }
@@ -1213 +1214 @@
         if ($deep) {
             foreach ($this->_references as $key => $relation) {
-                if ( ! $relation instanceof Doctrine_Null) {
+                if (! $relation instanceof Doctrine_Null) {
                     $a[$key] = $relation->toArray($deep, $prefixKey);
                 }
@@ -1219 +1220 @@
         }
 
-        return array_merge($a, $this->_values);
+        // [FIX] Prevent mapped Doctrine_Records from being displayed fully
+        foreach ($this->_values as $key => $value) {
+            if ($value instanceof Doctrine_Record) {
+                $a[$key] = $value->toArray($deep, $prefixKey);
+            } else {
+                $a[$key] = $value;
+            }
+        }
+
+        return $a;
     }
 

branches/0.9/lib/Doctrine/Record.php

@@ -1189 +1189 @@
                 $value = null;
             }
+
             $a[$column] = $value;
         }
+
         if ($this->_table->getIdentifierType() ==  Doctrine::IDENTIFIER_AUTOINC) {
             $i      = $this->_table->getIdentifier();
             $a[$i]  = $this->getIncremented();
         }
+
         if ($deep) {
             foreach ($this->_references as $key => $relation) {
-                if ( ! $relation instanceof Doctrine_Null) {
+                if (! $relation instanceof Doctrine_Null) {
                     $a[$key] = $relation->toArray($deep, $prefixKey);
                 }
             }
         }
-        return array_merge($a, $this->_values);
+
+        // [FIX] Prevent mapped Doctrine_Records from being displayed fully
+        foreach ($this->_values as $key => $value) {
+            if ($value instanceof Doctrine_Record) {
+                $a[$key] = $value->toArray($deep, $prefixKey);
+            } else {
+                $a[$key] = $value;
+            }
+        }
+
+        return $a;
     }