Subscribers can have same argument defined explicitly

[Closes #94] [Closes #93]

src/Kdyby/Events/DI/EventsExtension.php

@@ -93,8 +93,9 @@ public function loadConfiguration()
 		}
 
 		Nette\Utils\Validators::assertField($config, 'subscribers', 'array');
-		foreach ($config['subscribers'] as $subscriber) {
-			$def = $builder->addDefinition($this->prefix('subscriber.' . md5(Nette\Utils\Json::encode($subscriber))));
+		foreach ($config['subscribers'] as $i => $subscriber) {
+			$def = $builder->addDefinition($this->prefix('subscriber.' . $i));
+
 			$def->setFactory(Nette\DI\Compiler::filterArguments([
 				is_string($subscriber) ? new Nette\DI\Statement($subscriber) : $subscriber
 			])[0]);

tests/KdybyTests/Events/Extension.phpt

@@ -53,6 +53,19 @@ class ExtensionTest extends Tester\TestCase
 
 
 
+	public function testRegisterListenersWithSameArguments()
+	{
+		$container = $this->createContainer('subscribersWithSameArgument');
+		$manager = $container->getService('events.manager');
+
+		/** @var Kdyby\Events\EventManager $manager */
+		Assert::true($manager instanceof Kdyby\Events\EventManager);
+		Assert::same(['onFoo'], array_keys($manager->getListeners()));
+		Assert::count(2, $manager->getListeners('onFoo'));
+	}
+
+
+
 	public function testValidate_direct()
 	{
 		$me = $this;

tests/KdybyTests/Events/config/subscribersWithSameArgument.neon

@@ -0,0 +1,10 @@
+events:
+	optimize: no
+	validate: no
+	autowire: no
+	subscribers:
+		- KdybyTests\Events\EventListenerConstructorMock(@routerFactory)
+		- KdybyTests\Events\EventListenerConstructorMock2(@routerFactory)
+
+services:
+	routerFactory: KdybyTests\Events\RouterFactory

tests/KdybyTests/Events/mocks.php

@@ -232,6 +232,72 @@ public function onBar()
 
 
 
+/**
+ * @author Pavol Sivý <[email protected]>
+ */
+class EventListenerConstructorMock extends Nette\Object implements Kdyby\Events\Subscriber
+{
+
+	public function __construct(RouterFactory $routerFactory)
+	{
+	}
+
+
+
+	/**
+	 * @return array
+	 */
+	public function getSubscribedEvents()
+	{
+		return [
+				'onFoo',
+		];
+	}
+
+
+
+	public function onFoo(EventArgsMock $args)
+	{
+		// pass
+	}
+
+}
+
+
+
+/**
+ * @author Pavol Sivý <[email protected]>
+ */
+class EventListenerConstructorMock2 extends Nette\Object implements Kdyby\Events\Subscriber
+{
+
+	public function __construct(RouterFactory  $routerFactory)
+	{
+	}
+
+
+
+	/**
+	 * @return array
+	 */
+	public function getSubscribedEvents()
+	{
+		return [
+				'onFoo',
+		];
+	}
+
+
+
+	public function onFoo(EventArgsMock $args)
+	{
+		// pass
+	}
+
+}
+
+
+
 /**
  * @author Filip Procházka <[email protected]>
  */