Changeset 28

Timestamp:

02/09/08 18:23:43 (5 years ago)

Author:

tobias382

Message:

Modified Command to intelligently detect and pass the intercepted event
instance only if the command method to be called requires it

Files:

• trunk/Phergie/Event/Handler/Command.php (modified) (1 diff)

trunk/Phergie/Event/Handler/Command.php

@@ -15 +15 @@
     protected function processCommand($message, $event)
     {
-        $arguments = preg_split('/[ ]+/', trim($message));
-        $command = 'onDo' . ucfirst(strtolower(array_shift($arguments)));
-        $arguments[] = $event;
+        preg_match('/^\S+/', $message, $match);
+        $command = 'onDo' . ucfirst(strtolower($match[0]));
+
         if (method_exists($this, $command)) {
-            call_user_func_array(array($this, $command), $arguments);
+            $method = new ReflectionMethod($this, $command);
+            $expected = $method->getNumberOfParameters();
+            $params = preg_split('/\s+/', $message, $expected + 1); 
+            array_shift($params);
+            foreach ($method->getParameters() as $key => $param) {
+                if ($param->getClass()->getName() == 'Phergie_Event_Request') {
+                    array_splice($params, $key, 0, array($event));
+                    break;
+                }
+            }
+            if (count($params) == $expected) {
+                call_user_func_array(array($this, $command), $params);
+            }
         }
     }