Sync with proposal

src/Form/Extension/HttpFoundation/Type/FormFlowTypeSessionDataStorageExtension.php

@@ -5,9 +5,9 @@
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Yceruto\FormFlowBundle\Form\Extension\Core\Type\FormFlowType;
 use Yceruto\FormFlowBundle\Form\Flow\DataStorage\SessionDataStorage;
 use Yceruto\FormFlowBundle\Form\Flow\FormFlowBuilderInterface;
+use Yceruto\FormFlowBundle\Form\Flow\Type\FormFlowType;
 
 class FormFlowTypeSessionDataStorageExtension extends AbstractTypeExtension
 {

src/Form/Flow/AbstractFlowType.php

@@ -3,10 +3,22 @@
 namespace Yceruto\FormFlowBundle\Form\Flow;
 
 use Symfony\Component\Form\AbstractType;
-use Yceruto\FormFlowBundle\Form\Extension\Core\Type\FormFlowType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Yceruto\FormFlowBundle\Form\Flow\Type\FormFlowType;
 
 abstract class AbstractFlowType extends AbstractType implements FormFlowTypeInterface
 {
+    final public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        \assert($builder instanceof FormFlowBuilderInterface);
+
+        $this->buildFormFlow($builder, $options);
+    }
+
+    public function buildFormFlow(FormFlowBuilderInterface $builder, array $options): void
+    {
+    }
+
     public function getParent(): string
     {
         return FormFlowType::class;

src/Form/Flow/ActionButton.php → src/Form/Flow/FlowButton.php

@@ -7,8 +7,9 @@
 
 /**
  * A button that submits the form and handles an action.
+
  */
-class ActionButton extends SubmitButton implements ActionButtonInterface
+class FlowButton extends SubmitButton implements FlowButtonInterface
 {
     private mixed $data = null;
     private bool $handled = false;
@@ -33,21 +34,6 @@ public function getViewData(): mixed
         return $this->data;
     }
 
-    public function getAction(): string
-    {
-        return $this->getConfig()->getOption('action');
-    }
-
-    public function getHandler(): callable
-    {
-        return $this->getConfig()->getOption('handler');
-    }
-
-    public function isHandled(): bool
-    {
-        return $this->handled;
-    }
-
     public function handle(): void
     {
         /** @var FormInterface $form */
@@ -58,30 +44,35 @@ public function handle(): void
             $form = $form->getParent();
         }
 
-        $handler = $this->getHandler();
+        $handler = $this->getConfig()->getOption('handler');
         $handler($data, $this, $form);
 
         $this->handled = true;
     }
 
+    public function isHandled(): bool
+    {
+        return $this->handled;
+    }
+
     public function isResetAction(): bool
     {
-        return 'reset' === $this->getAction();
+        return 'reset' === $this->getConfig()->getAttribute('action');
     }
 
-    public function isBackAction(): bool
+    public function isPreviousAction(): bool
     {
-        return 'back' === $this->getAction();
+        return 'previous' === $this->getConfig()->getAttribute('action');
     }
 
     public function isNextAction(): bool
     {
-        return 'next' === $this->getAction();
+        return 'next' === $this->getConfig()->getAttribute('action');
     }
 
     public function isFinishAction(): bool
     {
-        return 'finish' === $this->getAction();
+        return 'finish' === $this->getConfig()->getAttribute('action');
     }
 
     public function isClearSubmission(): bool

src/Form/Flow/FlowButtonBuilder.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Yceruto\FormFlowBundle\Form\Flow;
+
+use Symfony\Component\Form\ButtonBuilder;
+
+/**
+ * A builder for {@link FlowButton} instances.
+ */
+class FlowButtonBuilder extends ButtonBuilder
+{
+    public function getForm(): FlowButton
+    {
+        return new FlowButton($this->getFormConfig());
+    }
+}

src/Form/Flow/ActionButtonInterface.php → src/Form/Flow/FlowButtonInterface.php

@@ -5,37 +5,27 @@
 use Symfony\Component\Form\ClickableInterface;
 use Symfony\Component\Form\FormInterface;
 
-interface ActionButtonInterface extends FormInterface, ClickableInterface
+interface FlowButtonInterface extends FormInterface, ClickableInterface
 {
     /**
-     * Returns the action name configured for the button.
-     */
-    public function getAction(): string;
-
-    /**
-     * Returns the callable handler configured for the button.
+     * Executes the callable handler.
      */
-    public function getHandler(): callable;
+    public function handle(): void;
 
     /**
      * Checks if the callable handler was already called.
      */
     public function isHandled(): bool;
 
-    /**
-     * Executes the callable handler.
-     */
-    public function handle(): void;
-
     /**
      * Checks if the button's action is 'reset'.
      */
     public function isResetAction(): bool;
 
     /**
-     * Checks if the button's action is 'back'.
+     * Checks if the button's action is 'previous'.
      */
-    public function isBackAction(): bool;
+    public function isPreviousAction(): bool;
 
     /**
      * Checks if the button's action is 'next'.

src/Form/Flow/FlowButtonTypeInterface.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Yceruto\FormFlowBundle\Form\Flow;
+
+use Symfony\Component\Form\FormTypeInterface;
+
+/**
+ * A type that should be converted into a {@link FlowButton} instance.
+ */
+interface FlowButtonTypeInterface extends FormTypeInterface
+{
+}

src/Form/Flow/FormFlowCursor.php → src/Form/Flow/FlowCursor.php

@@ -4,7 +4,7 @@
 
 use Symfony\Component\Form\Exception\InvalidArgumentException;
 
-class FormFlowCursor
+class FlowCursor
 {
     /**
      * @param array<string> $steps
@@ -38,7 +38,7 @@ public function getFirstStep(): string
         return $this->steps[0];
     }
 
-    public function getPrevStep(): ?string
+    public function getPreviousStep(): ?string
     {
         $currentPos = array_search($this->currentStep, $this->steps, true);
 
@@ -81,7 +81,7 @@ public function isLastStep(): bool
 
     public function canMoveBack(): bool
     {
-        return null !== $this->getPrevStep();
+        return null !== $this->getPreviousStep();
     }
 
     public function canMoveNext(): bool

src/Form/Flow/FormFlowStepBuilder.php → src/Form/Flow/FlowStepBuilder.php

@@ -5,7 +5,7 @@
 use Symfony\Component\Form\Exception\BadMethodCallException;
 use Symfony\Component\Form\FormTypeInterface;
 
-class FormFlowStepBuilder implements FormFlowStepBuilderInterface
+class FlowStepBuilder implements FlowStepBuilderInterface
 {
     private bool $locked = false;
     private int $priority = 0;
@@ -29,7 +29,7 @@ public function getName(): string
     public function getType(): string
     {
         if ($this->locked) {
-            throw new BadMethodCallException('FormFlowStepBuilder methods cannot be accessed anymore once the builder is turned into a FormFlowStepConfigInterface instance.');
+            throw new BadMethodCallException('FlowStepBuilder methods cannot be accessed anymore once the builder is turned into a FlowStepConfigInterface instance.');
         }
 
         return $this->type;
@@ -38,7 +38,7 @@ public function getType(): string
     public function getOptions(): array
     {
         if ($this->locked) {
-            throw new BadMethodCallException('FormFlowStepBuilder methods cannot be accessed anymore once the builder is turned into a FormFlowStepConfigInterface instance.');
+            throw new BadMethodCallException('FlowStepBuilder methods cannot be accessed anymore once the builder is turned into a FlowStepConfigInterface instance.');
         }
 
         return $this->options;
@@ -52,7 +52,7 @@ public function getPriority(): int
     public function setPriority(int $priority): static
     {
         if ($this->locked) {
-            throw new BadMethodCallException('FormFlowStepBuilder methods cannot be accessed anymore once the builder is turned into a FormFlowStepConfigInterface instance.');
+            throw new BadMethodCallException('FlowStepBuilder methods cannot be accessed anymore once the builder is turned into a FlowStepConfigInterface instance.');
         }
 
         $this->priority = $priority;
@@ -77,18 +77,18 @@ public function isSkipped(mixed $data): bool
     public function setSkip(?\Closure $skip): static
     {
         if ($this->locked) {
-            throw new BadMethodCallException('FormFlowStepBuilder methods cannot be accessed anymore once the builder is turned into a FormFlowStepConfigInterface instance.');
+            throw new BadMethodCallException('FlowStepBuilder methods cannot be accessed anymore once the builder is turned into a FlowStepConfigInterface instance.');
         }
 
         $this->skip = $skip;
 
         return $this;
     }
 
-    public function getStepConfig(): FormFlowStepConfigInterface
+    public function getStepConfig(): FlowStepConfigInterface
     {
         if ($this->locked) {
-            throw new BadMethodCallException('FormFlowStepBuilder methods cannot be accessed anymore once the builder is turned into a FormFlowStepConfigInterface instance.');
+            throw new BadMethodCallException('FlowStepBuilder methods cannot be accessed anymore once the builder is turned into a FlowStepConfigInterface instance.');
         }
 
         // This method should be idempotent, so clone the builder