Removed StepAwareInterface => use only FlowAwareInterface

Author: Tobias Wojtylak

src/Controller/DefaultStepController.php

@@ -20,14 +20,11 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
-class DefaultStepController extends Controller implements TemplateAwareControllerInterface, StepAwareInterface, FlowAwareInterface
+class DefaultStepController extends Controller implements TemplateAwareControllerInterface, FlowAwareInterface
 {
     /** @var string */
     private $template = 'MultiStepBundle::default_step.html.twig';
 
-    /** @var MultiStepFlowInterface */
-    private $flow;
-
     /** @var FlowContext */
     private $flowContext;
 
@@ -144,14 +141,9 @@ public function getPreviousStepLink(): ?string
         return $this->hasPreviousStep() ? $this->router->generateStepLink($this->getPreviousStep()) : null;
     }
 
-    public function getFlow(): ?MultiStepFlowInterface
-    {
-        return $this->flow;
-    }
-
-    public function setFlow(?MultiStepFlowInterface $flow): void
+    public function getFlow(): MultiStepFlowInterface
     {
-        $this->flow = $flow;
+        return $this->flowContext->getFlow();
     }
 
     public function getStep(): ?MultiStepInterface

src/Controller/FlowAwareInterface.php

@@ -9,11 +9,30 @@
 
 namespace solutionDrive\MultiStepBundle\Controller;
 
+use solutionDrive\MultiStepBundle\Context\FlowContextInterface;
 use solutionDrive\MultiStepBundle\Model\MultiStepFlowInterface;
+use solutionDrive\MultiStepBundle\Model\MultiStepInterface;
+use solutionDrive\MultiStepBundle\Router\MultistepRouterInterface;
 
 interface FlowAwareInterface
 {
-    public function getFlow(): ?MultiStepFlowInterface;
+    public function setFlowContext(FlowContextInterface $flowContext): void;
 
-    public function setFlow(?MultiStepFlowInterface $flow): void;
+    public function getFlowContext(): FlowContextInterface;
+
+    public function setRouter(MultistepRouterInterface $router): void;
+
+    public function getRouter(): MultistepRouterInterface;
+
+    public function getNextStep(): ?MultiStepInterface;
+
+    public function getNextStepLink(): ?string;
+
+    public function getPreviousStep(): ?MultiStepInterface;
+
+    public function getPreviousStepLink(): ?string;
+
+    public function getStep(): ?MultiStepInterface;
+
+    public function getFlow(): MultiStepFlowInterface;
 }