From 52346aa6c513400842cc343aaa4a5bf470a5b93e Mon Sep 17 00:00:00 2001 From: zYne Date: Sun, 7 Oct 2007 22:43:04 +0000 Subject: [PATCH] moved hydration listeners to record listener --- lib/Doctrine/EventListener/Chain.php | 13 ------------- lib/Doctrine/EventListener/Interface.php | 3 --- lib/Doctrine/Hydrate.php | 8 ++++---- lib/Doctrine/Record.php | 3 ++- lib/Doctrine/Record/Listener.php | 8 +++++++- lib/Doctrine/Record/Listener/Chain.php | 16 +++++++++++++++- lib/Doctrine/Record/Listener/Interface.php | 6 +++++- 7 files changed, 33 insertions(+), 24 deletions(-) diff --git a/lib/Doctrine/EventListener/Chain.php b/lib/Doctrine/EventListener/Chain.php index d77db1507..a2fda74f9 100644 --- a/lib/Doctrine/EventListener/Chain.php +++ b/lib/Doctrine/EventListener/Chain.php @@ -345,19 +345,6 @@ class Doctrine_EventListener_Chain extends Doctrine_Access implements Doctrine_E } } - public function preHydrate(Doctrine_Event $event) - { - foreach ($this->_listeners as $listener) { - $listener->preHydrate($event); - } - } - public function postHydrate(Doctrine_Event $event) - { - foreach ($this->_listeners as $listener) { - $listener->postHydrate($event); - } - } - public function preFetch(Doctrine_Event $event) { foreach ($this->_listeners as $listener) { diff --git a/lib/Doctrine/EventListener/Interface.php b/lib/Doctrine/EventListener/Interface.php index b2cdc4013..2d15a13a0 100644 --- a/lib/Doctrine/EventListener/Interface.php +++ b/lib/Doctrine/EventListener/Interface.php @@ -58,9 +58,6 @@ interface Doctrine_EventListener_Interface public function preError(Doctrine_Event $event); public function postError(Doctrine_Event $event); - public function preHydrate(Doctrine_Event $event); - public function postHydrate(Doctrine_Event $event); - public function preFetch(Doctrine_Event $event); public function postFetch(Doctrine_Event $event); diff --git a/lib/Doctrine/Hydrate.php b/lib/Doctrine/Hydrate.php index 7913abb3f..44e9b7b17 100644 --- a/lib/Doctrine/Hydrate.php +++ b/lib/Doctrine/Hydrate.php @@ -1033,7 +1033,7 @@ class Doctrine_Hydrate extends Doctrine_Locator_Injectable implements Serializab $table = $this->_aliasMap[$rootAlias]['table']; $componentName = $table->getComponentName(); $event->set('data', $currData[$rootAlias]); - $table->getListener()->preHydrate($event); + $table->getRecordListener()->preHydrate($event); $element = $driver->getElement($currData[$rootAlias], $componentName); $oneToOne = false; @@ -1041,7 +1041,7 @@ class Doctrine_Hydrate extends Doctrine_Locator_Injectable implements Serializab $index = $driver->search($element, $array); if ($index === false) { $event->set('data', $element); - $table->getListener()->postHydrate($event); + $table->getRecordListener()->postHydrate($event); if (isset($this->_aliasMap[$rootAlias]['map'])) { $key = $this->_aliasMap[$rootAlias]['map']; @@ -1068,7 +1068,7 @@ class Doctrine_Hydrate extends Doctrine_Locator_Injectable implements Serializab $table = $this->_aliasMap[$alias]['table']; $componentName = $table->getComponentName(); $event->set('data', $data); - $table->getListener()->preHydrate($event); + $table->getRecordListener()->preHydrate($event); $element = $driver->getElement($data, $componentName); @@ -1092,7 +1092,7 @@ class Doctrine_Hydrate extends Doctrine_Locator_Injectable implements Serializab if ($index === false) { $event->set('data', $element); - $table->getListener()->postHydrate($event); + $table->getRecordListener()->postHydrate($event); if (isset($map['map'])) { $key = $map['map']; diff --git a/lib/Doctrine/Record.php b/lib/Doctrine/Record.php index c20cbcc3b..c3977757d 100644 --- a/lib/Doctrine/Record.php +++ b/lib/Doctrine/Record.php @@ -787,6 +787,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count return $this->_references[$name]; } catch(Doctrine_Table_Exception $e) { + foreach ($this->_table->getFilters() as $filter) { if (($value = $filter->filterGet($this, $name, $value)) !== null) { return $value; @@ -1631,4 +1632,4 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count { return (string) $this->_oid; } -} \ No newline at end of file +} diff --git a/lib/Doctrine/Record/Listener.php b/lib/Doctrine/Record/Listener.php index 2e895a1d6..bd6baed3d 100644 --- a/lib/Doctrine/Record/Listener.php +++ b/lib/Doctrine/Record/Listener.php @@ -67,4 +67,10 @@ class Doctrine_Record_Listener implements Doctrine_Record_Listener_Interface public function postInsert(Doctrine_Event $event) { } -} \ No newline at end of file + + public function preHydrate(Doctrine_Event $event) + { } + + public function postHydrate(Doctrine_Event $event) + { } +} diff --git a/lib/Doctrine/Record/Listener/Chain.php b/lib/Doctrine/Record/Listener/Chain.php index a4532a159..3d939484c 100644 --- a/lib/Doctrine/Record/Listener/Chain.php +++ b/lib/Doctrine/Record/Listener/Chain.php @@ -169,4 +169,18 @@ class Doctrine_Record_Listener_Chain extends Doctrine_Access implements Doctrine $listener->postInsert($event); } } -} \ No newline at end of file + + + public function preHydrate(Doctrine_Event $event) + { + foreach ($this->_listeners as $listener) { + $listener->preHydrate($event); + } + } + public function postHydrate(Doctrine_Event $event) + { + foreach ($this->_listeners as $listener) { + $listener->postHydrate($event); + } + } +} diff --git a/lib/Doctrine/Record/Listener/Interface.php b/lib/Doctrine/Record/Listener/Interface.php index e8f33bd03..778ca939b 100644 --- a/lib/Doctrine/Record/Listener/Interface.php +++ b/lib/Doctrine/Record/Listener/Interface.php @@ -55,4 +55,8 @@ interface Doctrine_Record_Listener_Interface public function preInsert(Doctrine_Event $event); public function postInsert(Doctrine_Event $event); -} \ No newline at end of file + + public function preHydrate(Doctrine_Event $event); + + public function postHydrate(Doctrine_Event $event); +}