Doctrine

Timestamp:

06/08/08 20:34:31 (13 months ago)

Author:

guilhermeblanco

Message:

Fixed #1115. getInvoker() now returns the table class of component.

Location:

branches/0.11/lib/Doctrine

Files:

• Event.php (modified) (1 diff)
• Hydrator.php (modified) (3 diffs)

branches/0.11/lib/Doctrine/Event.php

@@ -313 +313 @@
 
     /**
+     * setInvoker
+     * Defines new invoker (used in Hydrator)
+     *
+     * @param mixed $invoker
+     * @return void
+     */
+    public function setInvoker($invoker)
+    {
+        $this->_invoker = $invoker;
+    }
+
+
+    /**
      * getParams
      * returns the parameters of the query

branches/0.11/lib/Doctrine/Hydrator.php

@@ -74 +74 @@
         }
 
-        $event = new Doctrine_Event(null, Doctrine_Event::HYDRATE, null);
-
         // Used variables during hydration
         reset($this->_queryComponents);
@@ -112 +110 @@
         }
 
+        $event = new Doctrine_Event(null, Doctrine_Event::HYDRATE, null);
+
         // Process result set
         $cache = array();
@@ -124 +124 @@
             $table = $this->_queryComponents[$rootAlias]['table'];
             $componentName = $table->getComponentName();
+            // Ticket #1115 (getInvoker() should return the component that has addEventListener)
+            $event->setInvoker($table);
             $event->set('data', $rowData[$rootAlias]);
             $listeners[$componentName]->preHydrate($event);