#5 Everything renamed again. Now the event handling system seems to b…

…e coherent.

config/dependencies/common.php

@@ -1,12 +1,11 @@
 <?php
-
 use App\Base\Utils\CamelCaseToSnakeCaseNameConverter;
 use App\Base\Utils\NameConverterInterface;
 use App\Process\EventHandlerInterface;
-use App\Process\Listeners\PoiListener;
-use App\Process\Listeners\QuestListener;
-use App\Process\Listeners\StepListener;
-use App\Process\EventHandler;
+use App\Process\ProcessEventHandlers\PoiHandler;
+use App\Process\ProcessEventHandlers\QuestHandler;
+use App\Process\ProcessEventHandlers\StepHandler;
+use App\Process\SystemEventHandler;
 use App\Services\Dummy\External\FooBService;
 use App\Services\Dummy\External\FooServiceInterface;
 use App\Services\Dummy\Internal\BarService;
@@ -36,16 +35,16 @@
         return EntityManager::create($connection, $config);
     },
     StateManagingServiceInterface::class => DI\autowire(StateManagingServiceInterface::class),
-    'process_listener.step' => DI\autowire(StepListener::class),
-    'process_listener.poi' => DI\autowire(PoiListener::class),
-    'process_listener.quest' => DI\autowire(QuestListener::class),
+    'process_listener.step' => DI\autowire(StepHandler::class),
+    'process_listener.poi' => DI\autowire(PoiHandler::class),
+    'process_listener.quest' => DI\autowire(QuestHandler::class),
     EventHandlerInterface::class => DI\factory(function(ContainerInterface $container) {
         $listeners = [
             'process_listener.step',
             'process_listener.poi',
             'process_listener.quest',
         ];
-        return new EventHandler($container->get(StateManagingServiceInterface::class), $listeners);
+        return new SystemEventHandler($container->get(StateManagingServiceInterface::class), $listeners);
     }),
 
 ];

src/Interop/Website/Controller/QuestController.php

@@ -15,8 +15,8 @@ class QuestController extends Controller
 
     /** @var StateManagingServiceInterface $stateManagingService */
     private $stateManagingService;
-    /** @var EventHandlerInterface $eventHandler */
-    private $eventHandler;
+    /** @var EventHandlerInterface $systemEventHandler */
+    private $systemEventHandler;
     /** @var EventDispatcherInterface */
     private $eventDispatcher;
 
@@ -32,14 +32,14 @@ public function __construct(
         EventDispatcherInterface $eventDispatcher
     ) {
         $this->stateManagingService = $stateManagingService;
-        $this->eventHandler = $processHandlingService;
+        $this->systemEventHandler = $processHandlingService;
         $this->eventDispatcher = $eventDispatcher;
     }
 
     public function processUserMessageAction(Request $request)
     {
         $message = $request->get('message');
-        $this->eventHandler->handle(new GenericEvent($message), GeneralEventName::USER_MESSAGE_RECEIVED(), $this->eventDispatcher);
+        $this->systemEventHandler->handle(new GenericEvent($message), GeneralEventName::USER_MESSAGE_RECEIVED(), $this->eventDispatcher);
 
         return new Response();
     }

src/Process/Listeners/AbstractProcessListener.php → src/Process/ProcessEventHandlers/AbstractProcessEventHandler.php

@@ -1,15 +1,15 @@
 <?php
-namespace App\Process\Listeners;
+namespace App\Process\ProcessEventHandlers;
 
 use App\Base\Enums\Processes\EventNames\AbstractEventName;
 use App\Base\Enums\Processes\States\AbstractProcessState;
-use App\Process\StateHandlers\StateHandlerInterface;
+use App\Process\StateEventHandlers\StateHandlerInterface;
 use App\Services\Process\StateManagingServiceInterface;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use App\Base\Utils\NameConverterInterface;
 
-abstract class AbstractProcessListener implements StateHandlerInterface
+abstract class AbstractProcessEventHandler implements StateHandlerInterface
 {
 
     const RELEVANT_STATE_HANDLER_NAMESPACE = '';

src/Process/Listeners/PoiListener.php → src/Process/ProcessEventHandlers/PoiHandler.php

@@ -1,12 +1,12 @@
 <?php
-namespace App\Process\Listeners;
+namespace App\Process\ProcessEventHandlers;
 
 use App\Base\Enums\Processes\EventNames\AbstractEventName;
 use App\Base\Enums\Processes\States\AbstractProcessState;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
-class PoiListener extends AbstractProcessListener
+class PoiHandler extends AbstractProcessEventHandler
 {
 
     const RELEVANT_STATE_HANDLER_NAMESPACE = '\App\Services\Process\Internal\StateHandlers\Poi';

src/Process/Listeners/QuestListener.php → src/Process/ProcessEventHandlers/QuestHandler.php

@@ -1,12 +1,12 @@
 <?php
-namespace App\Process\Listeners;
+namespace App\Process\ProcessEventHandlers;
 
 use App\Base\Enums\Processes\EventNames\AbstractEventName;
 use App\Base\Enums\Processes\States\AbstractProcessState;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
-class QuestListener extends AbstractProcessListener
+class QuestHandler extends AbstractProcessEventHandler
 {
 
     const RELEVANT_STATE_HANDLER_NAMESPACE = '\App\Services\Process\Internal\StateHandlers\Quest';

src/Process/Listeners/StepListener.php → src/Process/ProcessEventHandlers/StepHandler.php

@@ -1,12 +1,12 @@
 <?php
-namespace App\Process\Listeners;
+namespace App\Process\ProcessEventHandlers;
 
 use App\Base\Enums\Processes\EventNames\AbstractEventName;
 use App\Base\Enums\Processes\States\AbstractProcessState;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
-class StepListener extends AbstractProcessListener
+class StepHandler extends AbstractProcessEventHandler
 {
 
     const RELEVANT_STATE_HANDLER_NAMESPACE = '\App\Services\Process\Internal\StateHandlers\Step';

src/Process/StateEventHandlers/AbstractStateEventHandler.php

@@ -0,0 +1,7 @@
+<?php
+namespace App\Process\StateEventHandlers;
+
+abstract class AbstractStateEventHandler implements StateHandlerInterface
+{
+
+}

src/Process/StateHandlers/Quest/AccessFailedHandler.php → src/Process/StateEventHandlers/Quest/AccessFailedHandler.php

@@ -2,17 +2,17 @@
 namespace App\Services\Process\Internal\StateHandlers\Quest;
 
 use App\Base\Enums\Processes\EventNames\AbstractEventName;
-use App\Process\StateHandlers\StateHandlerInterface;
+use App\Process\StateEventHandlers\AbstractStateEventHandler;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
- * Class AccessFailedHandler implements StateHandlerInterface
+ * Class AccessFailedHandler extends AbstractStateEventHandler
  *
  * @package App\Services\Process\Internal\StateHandlers\Quest
  * @author Ilya Khanataev <[email protected]>
  */
-class AccessFailedHandler implements StateHandlerInterface
+class AccessFailedHandler extends AbstractStateEventHandler
 {
 
     public function handle(

src/Process/StateHandlers/Quest/AccessProcessingHandler.php → src/Process/StateEventHandlers/Quest/AccessProcessingHandler.php

@@ -2,17 +2,17 @@
 namespace App\Services\Process\Internal\StateHandlers\Quest;
 
 use App\Base\Enums\Processes\EventNames\AbstractEventName;
-use App\Process\StateHandlers\StateHandlerInterface;
+use App\Process\StateEventHandlers\AbstractStateEventHandler;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
- * Class AccessProcessingHandler implements StateHandlerInterface
+ * Class AccessProcessingHandler extends AbstractStateEventHandler
  *
  * @package App\Services\Process\Internal\StateHandlers\Quest
  * @author Ilya Khanataev <[email protected]>
  */
-class AccessProcessingHandler implements StateHandlerInterface
+class AccessProcessingHandler extends AbstractStateEventHandler
 {
 
     public function handle(

src/Process/StateHandlers/Quest/CompletedHandler.php → src/Process/StateEventHandlers/Quest/CompletedHandler.php

@@ -2,17 +2,17 @@
 namespace App\Services\Process\Internal\StateHandlers\Quest;
 
 use App\Base\Enums\Processes\EventNames\AbstractEventName;
-use App\Process\StateHandlers\StateHandlerInterface;
+use App\Process\StateEventHandlers\AbstractStateEventHandler;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
- * Class CompletedHandler implements StateHandlerInterface
+ * Class CompletedHandler extends AbstractStateEventHandler
  *
  * @package App\Services\Process\Internal\StateHandlers\Quest
  * @author Ilya Khanataev <[email protected]>
  */
-class CompletedHandler implements StateHandlerInterface
+class CompletedHandler extends AbstractStateEventHandler
 {
 
     public function handle(

src/Process/StateHandlers/Quest/FinishedHandler.php → src/Process/StateEventHandlers/Quest/FinishedHandler.php

@@ -2,17 +2,17 @@
 namespace App\Services\Process\Internal\StateHandlers\Quest;
 
 use App\Base\Enums\Processes\EventNames\AbstractEventName;
-use App\Process\StateHandlers\StateHandlerInterface;
+use App\Process\StateEventHandlers\AbstractStateEventHandler;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
- * Class FinishedHandler implements StateHandlerInterface
+ * Class FinishedHandler extends AbstractStateEventHandler
  *
  * @package App\Services\Process\Internal\StateHandlers\Quest
  * @author Ilya Khanataev <[email protected]>
  */
-class FinishedHandler implements StateHandlerInterface
+class FinishedHandler extends AbstractStateEventHandler
 {
 
     public function handle(

src/Process/StateHandlers/Quest/PlayingHandler.php → src/Process/StateEventHandlers/Quest/PlayingHandler.php

@@ -2,17 +2,17 @@
 namespace App\Services\Process\Internal\StateHandlers\Quest;
 
 use App\Base\Enums\Processes\EventNames\AbstractEventName;
-use App\Process\StateHandlers\StateHandlerInterface;
+use App\Process\StateEventHandlers\AbstractStateEventHandler;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
- * Class PlayingHandler implements StateHandlerInterface
+ * Class PlayingHandler extends AbstractStateEventHandler
  *
  * @package App\Services\Process\Internal\StateHandlers\Quest
  * @author Ilya Khanataev <[email protected]>
  */
-class PlayingHandler implements StateHandlerInterface
+class PlayingHandler extends AbstractStateEventHandler
 {
 
     public function handle(

src/Process/StateHandlers/Quest/Poi/StartedHandler.php → src/Process/StateEventHandlers/Quest/Poi/StartedHandler.php

@@ -2,17 +2,17 @@
 namespace App\Services\Process\Internal\StateHandlers\Poi;
 
 use App\Base\Enums\Processes\EventNames\AbstractEventName;
-use App\Process\StateHandlers\StateHandlerInterface;
+use App\Process\StateEventHandlers\AbstractStateEventHandler;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
- * Class StartedHandler implements StateHandlerInterface
+ * Class StartedHandler extends AbstractStateEventHandler
  *
  * @package App\Services\Process\Internal\StateHandlers\Quest
  * @author Ilya Khanataev <[email protected]>
  */
-class StartedHandler implements StateHandlerInterface
+class StartedHandler extends AbstractStateEventHandler
 {
 
     public function handle(

src/Process/StateHandlers/Quest/Poi/Step/StartedHandler.php → src/Process/StateEventHandlers/Quest/Poi/Step/StartedHandler.php

@@ -2,17 +2,17 @@
 namespace App\Services\Process\Internal\StateHandlers\Quest;
 
 use App\Base\Enums\Processes\EventNames\AbstractEventName;
-use App\Process\StateHandlers\StateHandlerInterface;
+use App\Process\StateEventHandlers\AbstractStateEventHandler;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
- * Class StartedHandler implements StateHandlerInterface
+ * Class StartedHandler extends AbstractStateEventHandler
  *
  * @package App\Services\Process\Internal\StateHandlers\Quest
  * @author Ilya Khanataev <[email protected]>
  */
-class StartedHandler implements StateHandlerInterface
+class StartedHandler extends AbstractStateEventHandler
 {
 
     public function handle(

src/Process/StateHandlers/Quest/StartedHandler.php → src/Process/StateEventHandlers/Quest/StartedHandler.php

@@ -2,17 +2,17 @@
 namespace App\Services\Process\Internal\StateHandlers\Quest;
 
 use App\Base\Enums\Processes\EventNames\AbstractEventName;
-use App\Process\StateHandlers\StateHandlerInterface;
+use App\Process\StateEventHandlers\AbstractStateEventHandler;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
- * Class StartedHandler implements StateHandlerInterface
+ * Class StartedHandler extends AbstractStateEventHandler
  *
  * @package App\Services\Process\Internal\StateHandlers\Quest
  * @author Ilya Khanataev <[email protected]>
  */
-class StartedHandler implements StateHandlerInterface
+class StartedHandler extends AbstractStateEventHandler
 {
 
     public function handle(

src/Process/StateHandlers/StateHandlerInterface.php → src/Process/StateEventHandlers/StateHandlerInterface.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Process\StateHandlers;
+namespace App\Process\StateEventHandlers;
 
 use App\Base\Enums\Processes\EventNames\AbstractEventName;
 use Symfony\Component\EventDispatcher\Event;

src/Process/EventHandler.php → src/Process/SystemEventHandler.php

@@ -2,11 +2,11 @@
 namespace App\Process;
 
 use App\Base\Enums\Processes\EventNames\AbstractEventName;
-use App\Process\StateHandlers\StateHandlerInterface;
+use App\Process\StateEventHandlers\StateHandlerInterface;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
-class EventHandler implements EventHandlerInterface
+class SystemEventHandler implements EventHandlerInterface
 {
 
     /** @var StateHandlerInterface[] */