RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-13 06:46:03 +03:00
Code Issues Projects Releases Wiki Activity

Cosmetics changes in EventManager, renamed the registerEventListener to addEventListener, optimized the source and changed the arguments order. Commented an echo line in RangeVariableDeclaration

Browse Source
This commit is contained in:
guilhermeblanco 2008-06-08 16:42:55 +00:00
parent ad2443057e
commit 24ca13980f
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Doctrine/EventManager.php
View File

@ -6,10 +6,11 @@ class Doctrine_EventManager
{ {
private $_listeners = array(); private $_listeners = array();
public function dispatchEvent($event) { public function dispatchEvent($event) {
$argIsCallback = is_string($event); $argIsCallback = is_string($event);
$callback = $argIsCallback ? $event : $event->getType(); $callback = $argIsCallback ? $event : $event->getType();
if (isset($this->_listeners[$callback])) { if (isset($this->_listeners[$callback])) {
$event = $argIsCallback ? new Doctrine_Event($event) : $event; $event = $argIsCallback ? new Doctrine_Event($event) : $event;
foreach ($this->_listeners[$callback] as $listener) { foreach ($this->_listeners[$callback] as $listener) {
@ -19,23 +20,26 @@ class Doctrine_EventManager
return ! $event->getDefaultPrevented(); return ! $event->getDefaultPrevented();
} }
public function getListeners($callback = null) { public function getListeners($callback = null) {
return $callback ? $this->_listeners[$callback] : $this->_listeners; return $callback ? $this->_listeners[$callback] : $this->_listeners;
} }
public function hasListeners($callback) { public function hasListeners($callback) {
return isset($this->_listeners[$callback]); return isset($this->_listeners[$callback]);
} }
public function registerEventListener($listener, $callbacks) {
public function addEventListener($callbacks, $listener) {
// TODO: maybe check for duplicate registrations? // TODO: maybe check for duplicate registrations?
if (is_array($callbacks)) { if ( ! is_array($callbacks)) {
foreach ($callbacks as $callback) { $callbacks = array($callbacks);
$this->_listeners[$callback] = $listener; }
}
} else { foreach ($callbacks as $callback) {
$this->_listeners[$callbacks] = $listener; $this->_listeners[$callback] = $listener;
} }
} }
} }

2
lib/Doctrine/Query/Production/RangeVariableDeclaration.php
View File

@ -216,7 +216,7 @@ class Doctrine_Query_Production_RangeVariableDeclaration extends Doctrine_Query_
$parent = $path; $parent = $path;
} catch (Doctrine_Exception $e) { } catch (Doctrine_Exception $e) {
echo "Tried to load class metadata from '".$relationName."'\n"; //echo "Tried to load class metadata from '".$relationName."'\n";
$this->_parser->semanticalError($e->getMessage()); $this->_parser->semanticalError($e->getMessage());
return; return;