[Funnel] Add flag to state if entity is live

Author: that-guy-iain

src/Parthenon/Funnel/Funnel.php

@@ -47,8 +47,8 @@ final class Funnel implements FunnelInterface
     private FormFactoryInterface $formFactory;
     private SuccessHandlerInterface $successHandler;
     private SkipHandlerInterface $skipHandler;
-
     private SessionInterface $session;
+    private bool $isLiveEntity = false;
 
     public function __construct(FormFactoryInterface $formFactory, RequestStack $requestStack)
     {
@@ -91,6 +91,13 @@ public function setSuccessHandler(SuccessHandlerInterface $successHandler): self
         return $this;
     }
 
+    public function isLiveEntity(bool $preloaded): self
+    {
+        $this->isLiveEntity = $preloaded;
+
+        return $this;
+    }
+
     public function process(Request $request)
     {
         if (!is_object($this->entity)) {
@@ -102,7 +109,7 @@ public function process(Request $request)
 
         $funnelState = $this->getState($newState);
 
-        $entity = $funnelState->getEntity();
+        $entity = $this->isLiveEntity ? $this->entity : $funnelState->getEntity();
 
         if (null !== $request->get('skip', null)) {
             return $this->handleSkip($entity);
@@ -212,7 +219,7 @@ private function getState(bool $newState): FunnelState
     private function saveState(FunnelState $funnelState)
     {
         $this->getLogger()->info('Saving funnel state', ['entity' => get_class($this->entity)]);
-        $this->session->set(get_class($this->entity).'_funnel', $funnelState);
+        $this->session->set($this->entity->getId().'_funnel', $funnelState);
     }
 
     private function getEntityName(): string

src/Parthenon/Funnel/FunnelInterface.php

@@ -36,5 +36,7 @@ public function setSuccessHandler(SuccessHandlerInterface $successHandler): self
 
     public function setSkipHandler(SkipHandlerInterface $skipHandler): self;
 
+    public function isLiveEntity(bool $preloaded): self;
+
     public function process(Request $request);
 }