WIP

romm · May 18, 2017 · caa06ba · caa06ba
1 parent 9fd8011
commit caa06ba
Show file tree

Hide file tree

Showing 12 changed files with 139 additions and 78 deletions.
diff --git a/Classes/AssetHandler/Connector/JavaScriptAssetHandlerConnector.php b/Classes/AssetHandler/Connector/JavaScriptAssetHandlerConnector.php
@@ -92,10 +92,10 @@ public function includeDefaultJavaScriptFiles()
             $this->javaScriptFiles[] = 'Formz.Debug.js';
         }
 
-        foreach ($this->javaScriptFiles as $file) {
+        foreach (array_reverse($this->javaScriptFiles) as $file) {
             $filePath = StringService::get()->getExtensionRelativePath('Resources/Public/JavaScript/' . $file);
 
-            $this->includeJsFile($filePath);
+            $this->includeJsFile($filePath, true);
         }
 
         return $this;
@@ -270,13 +270,14 @@ protected function getJavaScriptFiles()
      * @see https://forge.typo3.org/issues/60213
      *
      * @param string $path
+     * @param bool   $forceOnTop
      */
-    protected function includeJsFile($path)
+    protected function includeJsFile($path, $forceOnTop = false)
     {
         $pageRenderer = $this->assetHandlerConnectorManager->getPageRenderer();
 
         if ($this->environmentService->isEnvironmentInFrontendMode()) {
-            $pageRenderer->addJsFooterFile($path);
+            $pageRenderer->addJsFooterFile($path, 'text/javascript', true, $forceOnTop);
         } else {
             $pageRenderer->addJsFile($path);
         }

diff --git a/Classes/Controller/FormController.php b/Classes/Controller/FormController.php
@@ -132,7 +132,7 @@ protected function commitMetadata()
     {
         foreach ($this->processor->getRequestForms() as $formObject) {
             if ($formObject->hasForm()
-                && $formObject->getPersistenceManager()->formIsPersistent()
+                && $formObject->isPersistent()
             ) {
                 $formObject->getFormMetadata()->commit();
             }

diff --git a/Classes/Controller/Processor/ControllerProcessor.php b/Classes/Controller/Processor/ControllerProcessor.php
@@ -68,6 +68,13 @@ class ControllerProcessor implements SingletonInterface
      */
     protected $settings = [];
 
+    /**
+     * @todo
+     *
+     * @var string
+     */
+    protected $lastDispatchedRequest;
+
     /**
      * @param MvcRequest $request
      * @param Arguments  $requestArguments
@@ -91,11 +98,19 @@ public static function prepare(MvcRequest $request, Arguments $requestArguments,
     public function setData(MvcRequest $request, Arguments $requestArguments, array $settings)
     {
         /** @var Request $request */
-        $this->realRequest = $request;
-        $this->request = clone $request;
-        $this->originalRequest = clone $request;
-        $this->requestArguments = $requestArguments;
-        $this->settings = $settings;
+        $dispatchedRequest = $request->getControllerObjectName() . '::' . $request->getControllerActionName();
+
+        if ($dispatchedRequest !== $this->lastDispatchedRequest) {
+            $this->lastDispatchedRequest = $dispatchedRequest;
+
+            $this->realRequest = $request;
+            $this->request = clone $request;
+            $this->originalRequest = clone $request;
+            $this->requestArguments = $requestArguments;
+            $this->settings = $settings;
+            $this->formArguments = null;
+            $this->dispatched = false;
+        }
 
         return $this;
     }

diff --git a/Classes/Form/FormObject/FormObject.php b/Classes/Form/FormObject/FormObject.php
@@ -20,7 +20,6 @@
 use Romm\Formz\Exceptions\PropertyNotAccessibleException;
 use Romm\Formz\Form\Definition\FormDefinition;
 use Romm\Formz\Form\Definition\Step\Step\Step;
-use Romm\Formz\Form\Definition\Step\Step\Substep\Substep;
 use Romm\Formz\Form\Definition\Step\Step\Substep\SubstepDefinition;
 use Romm\Formz\Form\FormInterface;
 use Romm\Formz\Form\FormObject\Service\FormObjectRequestData;
@@ -195,6 +194,14 @@ public function getPersistenceManager()
         return $this->persistenceManager;
     }
 
+    /**
+     * @return bool
+     */
+    public function isPersistent()
+    {
+        return $this->getProxy()->formIsPersistent();
+    }
+
     /**
      * @return bool
      */

diff --git a/Classes/Form/FormObject/FormObjectProxy.php b/Classes/Form/FormObject/FormObjectProxy.php
@@ -17,7 +17,6 @@
 use Romm\Formz\Domain\Model\FormMetadata;
 use Romm\Formz\Error\FormResult;
 use Romm\Formz\Form\Definition\Step\Step\Step;
-use Romm\Formz\Form\Definition\Step\Step\Substep\Substep;
 use Romm\Formz\Form\Definition\Step\Step\Substep\SubstepDefinition;
 use Romm\Formz\Form\FormInterface;
 use Romm\Formz\Form\FormObject\Service\FormObjectMetadata;
@@ -53,7 +52,6 @@ class FormObjectProxy
      * @var bool
      */
     protected $formWasValidated = false;
-
     /**
      * @var FormResult
      */
@@ -69,6 +67,11 @@ class FormObjectProxy
      */
     protected $metadata;
 
+    /**
+     * @var bool
+     */
+    protected $formIsPersistent = false;
+
     /**
      * @var FormObjectSteps
      */
@@ -96,6 +99,8 @@ public function getForm()
     /**
      * Will mark the form as submitted (change the result returned by the
      * function `formWasSubmitted()`).
+     *
+     * @internal
      */
     public function markFormAsSubmitted()
     {
@@ -114,6 +119,8 @@ public function formWasSubmitted()
 
     /**
      * Marks the form as validated.
+     *
+     * @internal
      */
     public function markFormAsValidated()
     {
@@ -128,6 +135,22 @@ public function formWasValidated()
         return $this->formWasValidated;
     }
 
+    /**
+     * @internal
+     */
+    public function markFormAsPersistent()
+    {
+        $this->formIsPersistent = true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function formIsPersistent()
+    {
+        return $this->formIsPersistent;
+    }
+
     /**
      * @return FormResult
      */

diff --git a/Classes/Form/FormTrait.php b/Classes/Form/FormTrait.php
@@ -36,16 +36,6 @@ trait FormTrait
      */
     protected $validationData = [];
 
-    /**
-     * @return FormObject
-     * @throws EntryNotFoundException
-     */
-    protected function getFormObject()
-    {
-        /** @var FormInterface $this */
-        return FormObjectFactory::get()->getInstanceWithFormInstance($this);
-    }
-
     /**
      * @return FormMetadataObject
      */
@@ -70,6 +60,24 @@ public function getValidationResult()
         return $this->getFormObject()->getFormResult();
     }
 
+    /**
+     * @return bool
+     */
+    public function isPersistent()
+    {
+        return $this->getFormObject()->isPersistent();
+    }
+
+    /**
+     * @return FormObject
+     * @throws EntryNotFoundException
+     */
+    private function getFormObject()
+    {
+        /** @var FormInterface $this */
+        return FormObjectFactory::get()->getInstanceWithFormInstance($this);
+    }
+
     /**
      * @deprecated This method is deprecated and will be deleted in FormZ v2.
      *

diff --git a/Classes/Middleware/Item/Persistence/PersistenceFetchingMiddleware.php b/Classes/Middleware/Item/Persistence/PersistenceFetchingMiddleware.php
@@ -15,7 +15,6 @@
 
 use Romm\Formz\Domain\Model\FormMetadata;
 use Romm\Formz\Domain\Repository\FormMetadataRepository;
-use Romm\Formz\Form\FormObject\FormObjectFactory;
 use Romm\Formz\Middleware\Argument\Arguments;
 use Romm\Formz\Middleware\Item\AbstractMiddleware;
 use Romm\Formz\Middleware\Item\FormInjection\FormInjectionSignal;
@@ -78,13 +77,6 @@ public function before(Arguments $arguments)
 
             if ($metadata) {
                 $form = $formObject->getPersistenceManager()->fetchFirst($metadata);
-
-                if ($form) {
-                    $formObject->setForm($form);
-
-                    $proxy = FormObjectFactory::get()->getProxy($form);
-                    $proxy->setFormHash($metadata->getHash());
-                }
             }
         }
 

diff --git a/Classes/Middleware/Item/Persistence/PersistenceInjectionMiddleware.php b/Classes/Middleware/Item/Persistence/PersistenceInjectionMiddleware.php
@@ -33,9 +33,7 @@ class PersistenceInjectionMiddleware extends DefaultMiddleware implements Preset
     public function process()
     {
         if ($this->getFormObject()->formWasSubmitted()) {
-            $this->getFormObject()
-                ->getPersistenceManager()
-                ->save($this->getFormObject()->getForm());
+            $this->getFormObject()->getPersistenceManager()->save();
         }
     }
 }
diff --git a/Classes/Persistence/PersistenceManager.php b/Classes/Persistence/PersistenceManager.php
@@ -17,6 +17,7 @@
 use Romm\Formz\Exceptions\InvalidEntryException;
 use Romm\Formz\Form\FormInterface;
 use Romm\Formz\Form\FormObject\FormObject;
+use Romm\Formz\Form\FormObject\FormObjectFactory;
 
 /**
  * Manages persistence for a given form object.
@@ -28,11 +29,6 @@ class PersistenceManager
      */
     protected $formObject;
 
-    /**
-     * @var bool
-     */
-    protected $formIsPersistent = false;
-
     /**
      * @var bool
      */
@@ -49,13 +45,12 @@ public function __construct(FormObject $formObject)
     /**
      * Loops on the registered persistence services and saves the given form
      * instance in each one.
-     *
-     * @param FormInterface $form
      */
-    public function save(FormInterface $form)
+    public function save()
     {
         $this->initializePersistence();
 
+        $form = $this->formObject->getForm();
         $metadata = $this->formObject->getFormMetadata();
         $identifier = $metadata->getIdentifier();
         $persistenceServices = $this->getSortedPersistenceServices();
@@ -65,7 +60,8 @@ public function save(FormInterface $form)
         }
 
         if (count($persistenceServices) > 0) {
-            $this->formIsPersistent = true;
+            $proxy = FormObjectFactory::get()->getProxy($form);
+            $proxy->markFormAsPersistent();
         }
 
         /*
@@ -100,7 +96,11 @@ public function fetchFirst(FormMetadata $metadata)
                     throw InvalidEntryException::persistenceInvalidEntryFetched($persistence, $form);
                 }
 
-                $this->formIsPersistent = true;
+                $this->formObject->setForm($form);
+
+                $proxy = FormObjectFactory::get()->getProxy($form);
+                $proxy->setFormHash($metadata->getHash());
+                $proxy->markFormAsPersistent();
 
                 return $form;
             }
@@ -146,12 +146,4 @@ protected function getSortedPersistenceServices()
 
         return $items;
     }
-
-    /**
-     * @return bool
-     */
-    public function formIsPersistent()
-    {
-        return $this->formIsPersistent;
-    }
 }
diff --git a/Classes/Validation/Validator/Form/FormValidatorExecutor.php b/Classes/Validation/Validator/Form/FormValidatorExecutor.php
@@ -191,17 +191,17 @@ protected function checkFieldValidatorActivation(Field $field)
      */
     public function validateFields()
     {
-//        $validatedStep = $this->dataObject->getValidatedStep();
-//
-//        if ($validatedStep
-//            && $validatedStep->hasSubsteps()
-//        ) {
-//            $this->aze();
-//        } else {
+        $validatedStep = $this->dataObject->getValidatedStep();
+
+        if ($validatedStep
+            && $validatedStep->hasSubsteps()
+        ) {
+            $this->aze();
+        } else {
             foreach ($this->formObject->getDefinition()->getFields() as $field) {
                 $this->launchFieldValidation($field);
             }
-//        }
+        }
 
         return $this;
     }
@@ -211,19 +211,19 @@ protected function aze()
         $substepDefinition = $this->dataObject->getValidatedStep()->getSubsteps()->getFirstSubstepDefinition();
 
         $conditionProcessor = ConditionProcessorFactory::getInstance()->get($this->formObject);
-        
+
         while ($substepDefinition) {
             $phpResult = true;
 
-            if ($substepDefinition->hasDetour()) {
-                foreach ($substepDefinition->getDetourSubsteps() as $detourSubstep) {
-                    $tree = $conditionProcessor->getActivationConditionTreeForSubstep($detourSubstep);
-                    
-                    $dataObject = new PhpConditionDataObject($this->formObject->getForm(), $this);
-                    
-                    $phpResult = $tree->getPhpResult($dataObject);
-                }
-            }
+//            if ($substepDefinition->hasDetour()) {
+//                foreach ($substepDefinition->getDetourSubsteps() as $detourSubstep) {
+//                    $tree = $conditionProcessor->getActivationConditionTreeForSubstep($detourSubstep);
+//
+//                    $dataObject = new PhpConditionDataObject($this->formObject->getForm(), $this);
+//
+//                    $phpResult = $tree->getPhpResult($dataObject);
+//                }
+//            }
 
             if (true === $phpResult) {
                 $supportedFields = $substepDefinition->getSubstep()->getSupportedFields();

diff --git a/Classes/ViewHelpers/FormViewHelper.php b/Classes/ViewHelpers/FormViewHelper.php
@@ -287,7 +287,7 @@ protected function renderHiddenReferrerFields()
         $substepDefinition = $this->formObject->getCurrentSubstepDefinition();
 
         if ($substepDefinition) {
-            $result .= '<input type="hidden" name="' . $this->prefixFieldName('currentSubstep') . '" value="' . $substepDefinition->getUniqueIdentifier() . '" />' . LF;
+            $result .= '<input type="hidden" fz-substep-field="1" name="' . $this->prefixFieldName('currentSubstep') . '" value="' . $substepDefinition->getUniqueIdentifier() . '" />' . LF;
         }
 
         return $result;