First move to a Symfony based event system using EventDispatcher

Author: Marlinc

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src/library/Symfony/Component/EventDispatcher"]
+	path = src/library/Symfony/Component/EventDispatcher
+	url = git://github.com/symfony/EventDispatcher.git

src/Application/Autoloader.php

@@ -21,6 +21,11 @@ public function autoload($class)
             array_unshift($classPath, $this->applicationPath);
             if ($package == 'Ircbot') {
                 require_once implode(DIRECTORY_SEPARATOR, $classPath) . '.php';
+            } elseif ($package == 'Symfony') {
+                $classPath = explode('\\', $class);
+                $package = array_shift($classPath);
+                require_once $this->applicationPath . '/library/Symfony/'
+                    . implode(DIRECTORY_SEPARATOR, $classPath) . '.php';
             }
         }
     }

src/Event/Irc/Message.php

@@ -0,0 +1,40 @@
+<?php
+namespace Ircbot\Event\Irc;
+
+use Symfony\Component\EventDispatcher\Event;
+
+class Message extends Event
+{
+
+    private $sender;
+    private $target;
+    private $message;
+
+    public function __construct($sender, $target, $message)
+    {
+        $this->sender  = $sender;
+        $this->target  = $target;
+        $this->message = $message;
+    }
+    
+    public function getSender()
+    {
+        return $this->sender;
+    }
+    
+    public function getTarget()
+    {
+        return $this->target;
+    }
+    
+    public function targetIsChannel()
+    {
+        return (substr($this->target, 0, 1) == '#');
+    }
+    
+    public function getMessage()
+    {
+        return $this->message;
+    }
+
+}

src/Event/Irc/Notice.php

@@ -0,0 +1,7 @@
+<?php
+namespace Ircbot\Event\Irc;
+
+class Notice extends Message
+{
+
+}

src/Event/Irc/Privmsg.php

@@ -0,0 +1,7 @@
+<?php
+namespace Ircbot\Event\Irc;
+
+class Privmsg extends Message
+{
+
+}

src/Event/Loop/Iterated.php

@@ -0,0 +1,21 @@
+<?php
+namespace Ircbot\Event\Loop;
+
+use Symfony\Component\EventDispatcher\Event;
+
+class Iterated extends Event
+{
+
+    private $tick;
+
+    public function __construct($tick)
+    {
+        $this->tick = $tick;   
+    }
+    
+    public function getTick()
+    {
+        return $this->tick;
+    }
+
+}

src/Event/Loop/Started.php

@@ -0,0 +1,9 @@
+<?php
+namespace Ircbot\Event\Loop;
+
+use Symfony\Component\EventDispatcher\Event;
+
+class Started extends Event
+{
+
+}

src/Handler/Events.php

@@ -1,14 +1,8 @@
 <?php
-/**
- * @category IRCBot
- * @package IRCBot_Handlers
- * @subpackage Events
- * @author Marlin Cremers <[email protected]>
- */
-
 namespace Ircbot\Handler;
 
 use \Ircbot\Application\Debug;
+use \Symfony\Component\EventDispatcher\Event;
 
 /**
  * The IRCBot event handler
@@ -17,7 +11,7 @@
  * you can simply raise any event by calling the raiseEvent method
  * or register a callback with any event by calling the addEventCallback method
  */
-class Events
+class Events extends \Symfony\Component\EventDispatcher\EventDispatcher
 {
     /**
      * This variable contains all the callbacks registered with the events
@@ -42,6 +36,11 @@ public function raiseEvent($eventName, $data = null)
                 \Ircbot\Application::getInstance()->getDebugger()->log(
                     'Events', 'RaisedEvent', $eventName, Debug::LEVEL_INFO
                 );
+                \Ircbot\Application::getInstance()->getDebugger()->log(
+                    'Events', 'Event', 'WARNING  - This method is deprecated! '
+                        . 'Use dispatch instead. (' . $eventName . ')',
+                    Debug::LEVEL_WARN
+                );
             }
             foreach ($this->_callbacks as $callback) {
                 if ($callback['eventName'] == $eventName) {
@@ -80,6 +79,31 @@ public function addEventCallback($eventName, $callback)
             'Events', 'AddCallback', $eventName . ' => ' . $callbackDisplay,
             Debug::LEVEL_DEBUG
         );
+        \Ircbot\Application::getInstance()->getDebugger()->log(
+            'Events', 'Callback', 'WARNING  - This method is deprecated! '
+                . 'Use addListener instead. (' . $eventName . ')',
+            Debug::LEVEL_WARN
+        );
         return $this;
     }
+    
+    public function addListener($eventName, $listener, $priority = 0)
+    {
+        if (!$this->hasListeners($eventName)) {
+            $this->dispatch('eventdispatcher.event_used.' . $eventName);
+        }
+        parent::addListener($eventName, $listener, $priority);
+    }
+    
+    protected function doDispatch($listeners, $eventName, Event $event)
+    {
+        if ($eventName != 'loop.iterated') {
+            \Ircbot\Application::getInstance()->getDebugger()->log(
+                'Symfony', 'EventDispatcher', 'Dispatched event ' . $eventName,
+                Debug::LEVEL_INFO
+            );
+        }
+        parent::doDispatch($listeners, $eventName, $event);
+    }
+    
 }