Simplified DefaultStepController: Removed getter and default redirect in renderAction

Author: Tobias Wojtylak

src/Controller/DefaultStepController.php

@@ -12,7 +12,6 @@
 use solutionDrive\MultiStepBundle\Context\FlowContext;
 use solutionDrive\MultiStepBundle\Context\FlowContextInterface;
 use solutionDrive\MultiStepBundle\Exception\NoNextOrPreviousStepException;
-use solutionDrive\MultiStepBundle\Model\MultiStepFlowInterface;
 use solutionDrive\MultiStepBundle\Model\MultiStepInterface;
 use solutionDrive\MultiStepBundle\Router\MultistepRouterInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
@@ -33,14 +32,6 @@ class DefaultStepController extends Controller implements TemplateAwareControlle
 
     public function renderAction(Request $request): Response
     {
-        // Enable simple navigation
-        if ('next' === $request->get('navigate_to_direction')) {
-            return $this->redirectToNextStep();
-        } elseif ('previous' === $request->get('navigate_to_direction')) {
-            return $this->redirectToPreviousStep();
-        }
-
-        // Render template for current step
         return $this->render($this->getTemplate(), $this->getTemplateVariables());
     }
 
@@ -53,12 +44,8 @@ public function renderAction(Request $request): Response
     public function getTemplateVariables(): array
     {
         return [
-            'flow' => $this->getFlow(),
-            'step' => $this->getStep(),
-            'hasNextStep' => $this->hasNextStep(),
-            'hasPreviousStep' => $this->hasPreviousStep(),
-            'nextStepLink' => $this->getNextStepLink(),
-            'previousStepLink' => $this->getPreviousStepLink(),
+            'flow' => $this->flowContext->getFlow(),
+            'step' => $this->flowContext->getCurrentStep(),
         ];
     }
 
@@ -88,22 +75,6 @@ protected function redirectToStep(MultiStepInterface $step, int $statusCode): Re
         return $this->redirect($this->router->generateStepLink($step), $statusCode);
     }
 
-    /**
-     * Returns true if there is a next step in the flow.
-     */
-    public function hasNextStep(): bool
-    {
-        return $this->flowContext->hasNextStep();
-    }
-
-    /**
-     * Returns true if there is a previous step in the flow.
-     */
-    public function hasPreviousStep(): bool
-    {
-        return $this->flowContext->hasPreviousStep();
-    }
-
     /**
      * Returns the configured template.
      * Can be overriden in step definition, see README.md for details.
@@ -131,26 +102,6 @@ public function getPreviousStep(): ?MultiStepInterface
         return $this->flowContext->getPreviousStep();
     }
 
-    public function getNextStepLink(): ?string
-    {
-        return $this->hasNextStep() ? $this->router->generateStepLink($this->getNextStep()) : null;
-    }
-
-    public function getPreviousStepLink(): ?string
-    {
-        return $this->hasPreviousStep() ? $this->router->generateStepLink($this->getPreviousStep()) : null;
-    }
-
-    public function getFlow(): MultiStepFlowInterface
-    {
-        return $this->flowContext->getFlow();
-    }
-
-    public function getStep(): ?MultiStepInterface
-    {
-        return $this->flowContext->getCurrentStep();
-    }
-
     public function getFlowContext(): FlowContextInterface
     {
         return $this->flowContext;

src/Controller/FlowAwareInterface.php

@@ -10,7 +10,6 @@
 namespace solutionDrive\MultiStepBundle\Controller;
 
 use solutionDrive\MultiStepBundle\Context\FlowContextInterface;
-use solutionDrive\MultiStepBundle\Model\MultiStepFlowInterface;
 use solutionDrive\MultiStepBundle\Model\MultiStepInterface;
 use solutionDrive\MultiStepBundle\Router\MultistepRouterInterface;
 
@@ -26,13 +25,5 @@ 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;
 }