Event namespaces respect class inheritance [Closes #55]

src/Kdyby/Events/DI/EventsExtension.php

@@ -320,7 +320,7 @@ protected function bindEventProperties(Nette\DI\ServiceDefinition $def, Nette\Re
 
 			$def->addSetup('$' . $name, array(
 				new Nette\DI\Statement($this->prefix('@manager') . '::createEvent', array(
-					array($property->getDeclaringClass()->getName(), $name),
+					array($class->getName(), $name),
 					new Code\PhpLiteral('$service->' . $name)
 				))
 			));
@@ -341,10 +341,29 @@ private function optimizeListeners(Nette\DI\ContainerBuilder $builder)
 				$listeners[$eventName][] = $serviceName;
 				if ($namespace !== NULL) {
 					$listeners[$event][] = $serviceName;
+
+					if (!class_exists($namespace)) {
+						continue; // it might not even be a "classname" event namespace
+					}
+
+					// find all subclasses and register the listener to all the classes dispatching them
+					foreach ($builder->getDefinitions() as $def) {
+						if (!$class = $def->getClass()) {
+							continue; // ignore unresolved classes
+						}
+
+						if (is_subclass_of($class, $namespace)) {
+							$listeners["$class::$event"][] = $serviceName;
+						}
+					}
 				}
 			}
 		}
 
+		foreach ($listeners as $id => $subscribers) {
+			$listeners[$id] = array_unique($subscribers);
+		}
+
 		$builder->getDefinition($this->prefix('manager'))
 			->setClass('Kdyby\Events\LazyEventManager', array($listeners))
 			->setup = $this->allowedManagerSetup;

src/Kdyby/Events/EventManager.php

@@ -337,7 +337,14 @@ private function sortListeners($eventName)
 			}
 
 		} else {
-			$available = !empty($this->listeners[$event][$namespace]) ? $this->listeners[$event][$namespace] : array();
+			$available = array();
+			do {
+				if (!empty($this->listeners[$event][$namespace])) {
+					foreach ($this->listeners[$event][$namespace] as $callback) {
+						$available[] = $callback;
+					}
+				}
+			} while ($namespace = get_parent_class($namespace));
 		}
 
 		if (empty($available)) {