Changeset 5016

Timestamp:

10/01/08 19:55:50 (3 months ago)

Author:

romanb

Message:

[1.1] Fixed #1510.

Location:

branches/1.1/lib/Doctrine

Files:

• Hydrator.php (modified) (3 diffs)
• Hydrator/ArrayDriver.php (modified) (1 diff)
• Hydrator/RecordDriver.php (modified) (1 diff)

branches/1.1/lib/Doctrine/Hydrator.php

@@ -156 +156 @@
             }
 
-            $this->_setLastElement($prev, $result, $index, $rootAlias, false);
+            $driver->setLastElement($prev, $result, $index, $rootAlias, false);
             unset($rowData[$rootAlias]);
 
@@ -238 +238 @@
                 if ($prev[$parent][$relationAlias] !== null) {
                     $coll =& $prev[$parent][$relationAlias];
-                    $this->_setLastElement($prev, $coll, $index, $dqlAlias, $oneToOne);
+                    $driver->setLastElement($prev, $coll, $index, $dqlAlias, $oneToOne);
                 }
             }
@@ -249 +249 @@
 
         return $result;
-    }
-
-    /**
-     * sets the last element of given data array / collection
-     * as previous element
-     *
-     * @param boolean|integer $index
-     * @return void
-     * @todo Detailed documentation
-     */
-    protected function _setLastElement(&$prev, &$coll, $index, $dqlAlias, $oneToOne)
-    {
-        if ($coll === self::$_null || $coll === null) {
-            unset($prev[$dqlAlias]); // Ticket #1228
-            return;
-        }
-
-        if ($index !== false) {
-            // Link element at $index to previous element for the component
-            // identified by the DQL alias $alias
-            $prev[$dqlAlias] =& $coll[$index];
-            return;
-        }
-
-        if (is_array($coll) && $coll) {
-            if ($oneToOne) {
-                $prev[$dqlAlias] =& $coll;
-            } else {
-                end($coll);
-                $prev[$dqlAlias] =& $coll[key($coll)];
-            }
-        } else if (count($coll) > 0) {
-            $prev[$dqlAlias] = $coll->getLast();
-        }
     }
 

branches/1.1/lib/Doctrine/Hydrator/ArrayDriver.php

@@ -68 +68 @@
         return key($data);
     }
+    
+    /**
+     * sets the last element of given data array / collection
+     * as previous element
+     *
+     * @param boolean|integer $index
+     * @return void
+     * @todo Detailed documentation
+     */
+    public function setLastElement(&$prev, &$coll, $index, $dqlAlias, $oneToOne)
+    {
+        if ($coll === null) {
+            unset($prev[$dqlAlias]); // Ticket #1228
+            return;
+        }
+
+        if ($index !== false) {
+            // Link element at $index to previous element for the component
+            // identified by the DQL alias $alias
+            $prev[$dqlAlias] =& $coll[$index];
+            return;
+        }
+        
+        if ($coll) {
+            if ($oneToOne) {
+                $prev[$dqlAlias] =& $coll;
+            } else {
+                end($coll);
+                $prev[$dqlAlias] =& $coll[key($coll)];
+            }
+        }
+    }
 
     public function flush()

branches/1.1/lib/Doctrine/Hydrator/RecordDriver.php

@@ -105 +105 @@
     
     /**
+     * sets the last element of given data array / collection
+     * as previous element
+     *
+     * @param boolean|integer $index
+     * @return void
+     * @todo Detailed documentation
+     */
+    public function setLastElement(&$prev, &$coll, $index, $dqlAlias, $oneToOne)
+    {
+        if ($coll === self::$_null) {
+            unset($prev[$dqlAlias]); // Ticket #1228
+            return;
+        }
+
+        if ($index !== false) {
+            // Link element at $index to previous element for the component
+            // identified by the DQL alias $alias
+            $prev[$dqlAlias] = $coll[$index];
+            return;
+        }
+        
+        if (count($coll) > 0) {
+            $prev[$dqlAlias] = $coll->getLast();
+        }
+    }
+    
+    /**
      * Get the classname to return. Most often this is just the options['name']
      *