fix when eventListeners not set

Author: AydinHassan

src/Factory/EventDispatcherFactory.php

@@ -40,7 +40,7 @@ public function __invoke(ContainerInterface $container)
         $dispatcher->listen('verify.post.check', $container->get(SelfCheckListener::class));
 
         //add listeners from config
-        $eventListeners = $container->get('eventListeners') ?: [];
+        $eventListeners = $container->has('eventListeners') ? $container->get('eventListeners') : [];
 
         if (!is_array($eventListeners)) {
             throw InvalidArgumentException::typeMisMatch('array', $eventListeners);

src/Factory/MenuFactory.php

@@ -50,20 +50,21 @@ public function __invoke(ContainerInterface $c)
             ->addLineBreak('_')
             ->addLineBreak()
             ->addStaticItem('Exercises')
-            ->addStaticItem('---------')
-            ->addItems(
-                array_map(function (ExerciseInterface $exercise) use ($exerciseRenderer, $userState, $workshopType, $eventDispatcher) {
-                    return [
-                        $exercise->getName(),
-                        function (CliMenu $menu) use ($exerciseRenderer, $eventDispatcher, $exercise) {
-                            $this->dispatchExerciseSelectedEvent($eventDispatcher, $exercise);
-                            $exerciseRenderer->__invoke($menu);
-                        },
-                        $userState->completedExercise($exercise->getName()),
-                        $this->isExerciseDisabled($exercise, $userState, $workshopType)
-                    ];
-                }, $exerciseRepository->findAll())
-            )
+            ->addStaticItem('---------');
+
+        foreach ($exerciseRepository->findAll() as $exercise) {
+            $builder->addItem(
+                $exercise->getName(),
+                function (CliMenu $menu) use ($exerciseRenderer, $eventDispatcher, $exercise) {
+                    $this->dispatchExerciseSelectedEvent($eventDispatcher, $exercise);
+                    $exerciseRenderer->__invoke($menu);
+                },
+                $userState->completedExercise($exercise->getName()),
+                $this->isExerciseDisabled($exercise, $userState, $workshopType)
+            );
+        }
+
+        $builder
             ->addLineBreak()
             ->addLineBreak('-')
             ->addLineBreak()

test/Factory/EventDispatcherFactoryTest.php

@@ -109,6 +109,11 @@ public function testConfigEventListenersThrowsExceptionIfEventsNotArray()
             ->will($this->returnValue($selfCheckListener));
 
         $c->expects($this->at(4))
+            ->method('has')
+            ->with('eventListeners')
+            ->willReturn(true);
+
+        $c->expects($this->at(5))
             ->method('get')
             ->with('eventListeners')
             ->will($this->returnValue(new \stdClass));
@@ -150,6 +155,11 @@ public function testConfigEventListenersThrowsExceptionIfEventsListenersNotArray
             ->will($this->returnValue($selfCheckListener));
 
         $c->expects($this->at(4))
+            ->method('has')
+            ->with('eventListeners')
+            ->willReturn(true);
+
+        $c->expects($this->at(5))
             ->method('get')
             ->with('eventListeners')
             ->will($this->returnValue([ 'someEvent' => new \stdClass]));
@@ -191,6 +201,11 @@ public function testConfigEventListenersThrowsExceptionIfEventsListenerNotCallab
             ->will($this->returnValue($selfCheckListener));
 
         $c->expects($this->at(4))
+            ->method('has')
+            ->with('eventListeners')
+            ->willReturn(true);
+
+        $c->expects($this->at(5))
             ->method('get')
             ->with('eventListeners')
             ->will($this->returnValue([ 'someEvent' => [new \stdClass]]));
@@ -232,11 +247,16 @@ public function testConfigEventListenersThrowsExceptionIfEventsListenerContainer
             ->will($this->returnValue($selfCheckListener));
 
         $c->expects($this->at(4))
+            ->method('has')
+            ->with('eventListeners')
+            ->willReturn(true);
+
+        $c->expects($this->at(5))
             ->method('get')
             ->with('eventListeners')
             ->will($this->returnValue([ 'someEvent' => ['nonExistingContainerEntry']]));
 
-        $c->expects($this->once())
+        $c->expects($this->at(6))
             ->method('has')
             ->with('nonExistingContainerEntry')
             ->will($this->returnValue(false));
@@ -278,16 +298,21 @@ public function testConfigEventListenersThrowsExceptionIfEventsListenerContainer
             ->will($this->returnValue($selfCheckListener));
 
         $c->expects($this->at(4))
+            ->method('has')
+            ->with('eventListeners')
+            ->willReturn(true);
+
+        $c->expects($this->at(5))
             ->method('get')
             ->with('eventListeners')
             ->will($this->returnValue([ 'someEvent' => ['notCallableEntry']]));
 
-        $c->expects($this->once())
+        $c->expects($this->at(6))
             ->method('has')
             ->with('notCallableEntry')
             ->will($this->returnValue(true));
 
-        $c->expects($this->at(6))
+        $c->expects($this->at(7))
             ->method('get')
             ->with('notCallableEntry')
             ->will($this->returnValue(null));
@@ -332,11 +357,15 @@ public function testConfigEventListenersWithAnonymousFunction()
         };
 
         $c->expects($this->at(4))
+            ->method('has')
+            ->with('eventListeners')
+            ->willReturn(true);
+
+        $c->expects($this->at(5))
             ->method('get')
             ->with('eventListeners')
             ->will($this->returnValue([ 'someEvent' => [$callback]]));
 
-
         $dispatcher = (new EventDispatcherFactory)->__invoke($c);
         $this->assertInstanceOf(EventDispatcher::class, $dispatcher);
         $this->assertSame(
@@ -398,22 +427,25 @@ public function testConfigEventListenersWithContainerEntry()
             ->with(SelfCheckListener::class)
             ->will($this->returnValue($selfCheckListener));
 
-
-
         $c->expects($this->at(4))
+            ->method('has')
+            ->with('eventListeners')
+            ->willReturn(true);
+
+        $c->expects($this->at(5))
             ->method('get')
             ->with('eventListeners')
             ->will($this->returnValue([ 'someEvent' => ['containerEntry']]));
 
-        $c->expects($this->once())
+        $c->expects($this->at(6))
             ->method('has')
             ->with('containerEntry')
             ->will($this->returnValue(true));
 
         $callback = function () {
         };
 
-        $c->expects($this->at(6))
+        $c->expects($this->at(7))
             ->method('get')
             ->with('containerEntry')
             ->will($this->returnValue($callback));