Merge pull request #49 from bwaidelich/task-expose-serialized-formstate

TASK: Expose serialized form state from the Form runtime
neos · Jul 26, 2017 · bc3c7d1 · bc3c7d1
2 parents 9b22bc7 + 5334f9b
commit bc3c7d1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/Classes/Core/Runtime/FormRuntime.php b/Classes/Core/Runtime/FormRuntime.php
@@ -538,6 +538,16 @@ public function getFormState()
         return $this->formState;
     }
 
+    /**
+     * @return string
+     * @internal
+     */
+    public function getSerializedFormState()
+    {
+        $serializedFormState = base64_encode(serialize($this->getFormState()));
+        return $this->hashService->appendHmac($serializedFormState);
+    }
+
     /**
      * Get all rendering options
      *

diff --git a/Classes/ViewHelpers/FormViewHelper.php b/Classes/ViewHelpers/FormViewHelper.php
@@ -11,22 +11,16 @@
  * source code.
  */
 
-use Neos\FluidAdaptor\ViewHelpers\FormViewHelper as FluidFormViewHelper;
-use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Mvc\ActionRequest;
+use Neos\FluidAdaptor\ViewHelpers\FormViewHelper as FluidFormViewHelper;
+use Neos\Form\Core\Runtime\FormRuntime;
 use TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder;
 
 /**
  * Custom form ViewHelper that renders the form state instead of referrer fields
  */
 class FormViewHelper extends FluidFormViewHelper
 {
-    /**
-     * @Flow\Inject
-     * @var \Neos\Flow\Security\Cryptography\HashService
-     */
-    protected $hashService;
-
     /**
      * Renders hidden form fields for referrer information about
      * the current request.
@@ -38,8 +32,9 @@ protected function renderHiddenReferrerFields()
         $tagBuilder = new TagBuilder('input');
         $tagBuilder->addAttribute('type', 'hidden');
         $tagBuilder->addAttribute('name', $this->prefixFieldName('__state'));
-        $serializedFormState = base64_encode(serialize($this->arguments['object']->getFormState()));
-        $tagBuilder->addAttribute('value', $this->hashService->appendHmac($serializedFormState));
+        /** @var FormRuntime $formRuntime */
+        $formRuntime = $this->arguments['object'];
+        $tagBuilder->addAttribute('value', $formRuntime->getSerializedFormState());
         return $tagBuilder->render();
     }