Symfony: make it easier to autowire

littlecubiclegames · Sep 15, 2021 · 379b1f2 · 379b1f2
1 parent 4d66c3d
commit 379b1f2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/src/Log/QuestLogListener.php b/src/Log/QuestLogListener.php
@@ -12,7 +12,7 @@ class QuestLogListener implements EventSubscriberInterface
     /** @var QuestLoggerInterface[] */
     private $questLogger;
 
-    public function __construct(array $questLogger)
+    public function __construct(iterable $questLogger)
     {
         $this->questLogger = $questLogger;
     }

diff --git a/src/Progress/ProgressHandler.php b/src/Progress/ProgressHandler.php
@@ -7,17 +7,18 @@
 use LittleCubicleGames\Quests\Storage\QuestStorageInterface;
 use LittleCubicleGames\Quests\Workflow\QuestDefinitionInterface;
 use Symfony\Component\Workflow\Workflow;
+use Symfony\Component\Workflow\WorkflowInterface;
 
 class ProgressHandler
 {
-    /** @var Workflow */
+    /** @var WorkflowInterface */
     private $worfkflow;
     /** @var QuestStorageInterface */
     private $questStorage;
 
-    public function __construct(Workflow $worfkflow, QuestStorageInterface $questStorage)
+    public function __construct(WorkflowInterface $questsStateMachine, QuestStorageInterface $questStorage)
     {
-        $this->worfkflow = $worfkflow;
+        $this->worfkflow = $questsStateMachine;
         $this->questStorage = $questStorage;
     }
 

diff --git a/src/QuestAdvancer.php b/src/QuestAdvancer.php
@@ -6,6 +6,7 @@
 use LittleCubicleGames\Quests\Storage\QuestStorageInterface;
 use LittleCubicleGames\Quests\Workflow\QuestDefinitionInterface;
 use Symfony\Component\Workflow\Workflow;
+use Symfony\Component\Workflow\WorkflowInterface;
 
 class QuestAdvancer
 {
@@ -14,10 +15,10 @@ class QuestAdvancer
     /** @var Workflow */
     private $questWorkflow;
 
-    public function __construct(QuestStorageInterface $questStorage, Workflow $questWorkflow)
+    public function __construct(QuestStorageInterface $questStorage, WorkflowInterface $questsStateMachine)
     {
         $this->questStorage = $questStorage;
-        $this->questWorkflow = $questWorkflow;
+        $this->questWorkflow = $questsStateMachine;
     }
 
     public function startQuest(int $questId, int $userId): QuestInterface

diff --git a/src/Reward/Collect/Provider.php b/src/Reward/Collect/Provider.php
@@ -9,7 +9,7 @@ class Provider
     /** @var CollectorInterface[] */
     private $collectors;
 
-    public function __construct(array $collectors)
+    public function __construct(iterable $collectors)
     {
         $this->collectors = $collectors;
     }

diff --git a/src/Reward/NoRewardListener.php b/src/Reward/NoRewardListener.php
@@ -8,18 +8,19 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Workflow\Event\Event;
 use Symfony\Component\Workflow\Workflow;
+use Symfony\Component\Workflow\WorkflowInterface;
 
 class NoRewardListener implements EventSubscriberInterface
 {
     /** @var RegistryInterface */
     private $questRegistry;
-    /** @var Workflow */
+    /** @var WorkflowInterface */
     private $worfkflow;
 
-    public function __construct(RegistryInterface $questRegistry, Workflow $worfkflow)
+    public function __construct(RegistryInterface $questRegistry, WorkflowInterface $questsStateMachine)
     {
         $this->questRegistry = $questRegistry;
-        $this->worfkflow = $worfkflow;
+        $this->worfkflow = $questsStateMachine;
     }
 
     public function validate(Event $event): void