Feature: listeners lazy-loading [closes #1]

contributte · Mar 9, 2018 · d94d504 · d94d504
1 parent 94dddd7
commit d94d504
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/src/DI/NextrasOrmEventsExtension.php b/src/DI/NextrasOrmEventsExtension.php
@@ -160,11 +160,11 @@ private function loadListenerByAnnotation($events, $repository, $listener)
 				throw new ServiceCreationException(sprintf("Object '%s' should implement '%s'", $listener, $interface));
 			}
 
-			$repositoryDef->addSetup('$service->?[] = ?', [
+			$repositoryDef->addSetup('$service->?[] = function() {call_user_func_array([?, ?], func_get_args());}', [
+				$event,
+				$listenerDef,
 				$event,
-				[$listenerDef, $event],
 			]);
 		}
 	}
-
 }
diff --git a/tests/cases/EventsTest.php b/tests/cases/EventsTest.php
@@ -68,6 +68,26 @@ protected function createSimpleContainer()
 		});
 	}
 
+	/**
+	 * @return void
+	 */
+	public function testListenerLazyLoading()
+	{
+		$container = $this->createSimpleContainer();
+		$repository = $container->getByType(FooRepository::class);
+
+		Assert::falsey($container->isCreated($container->findByType(FooListener::class)[0]));
+		Assert::falsey($container->isCreated($container->findByType(FooLifecycleListener::class)[0]));
+
+		$entity = new Foo();
+		$entity->bar = 'foobar';
+
+		$repository->persistAndFlush($entity);
+
+		Assert::truthy($container->isCreated($container->findByType(FooListener::class)[0]));
+		Assert::truthy($container->isCreated($container->findByType(FooLifecycleListener::class)[0]));
+	}
+
 	/**
 	 * @return void
 	 */