[TASK] Use custom hash for steps

Prevents serialization of closures.
romm · Apr 29, 2019 · 1c2636f · 1c2636f
1 parent d08b8bc
commit 1c2636f
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 2 deletions.
diff --git a/Classes/Condition/Processor/ConditionProcessor.php b/Classes/Condition/Processor/ConditionProcessor.php
@@ -121,7 +121,7 @@ public function getActivationConditionTreeForValidator(Validator $validator)
      */
     public function getActivationConditionTreeForStep(StepDefinition $stepDefinition)
     {
-        $key = 'step-' . serialize($stepDefinition);
+        $key = 'step-' . $stepDefinition->hash();
 
         if (false === array_key_exists($key, $this->stepTree)) {
             $this->stepTree[$key] = $this->getConditionTree($stepDefinition->getActivation());
@@ -140,7 +140,7 @@ public function getActivationConditionTreeForStep(StepDefinition $stepDefinition
      */
     public function getActivationConditionTreeForSubstep(SubstepDefinition $substep)
     {
-        $key = 'substep-' . serialize($substep);
+        $key = 'substep-' . $substep->hash();
 
         if (false === array_key_exists($key, $this->substepTree)) {
             $this->substepTree[$key] = $this->getConditionTree($substep->getActivation());

diff --git a/Classes/Form/Definition/Step/Step/StepDefinition.php b/Classes/Form/Definition/Step/Step/StepDefinition.php
@@ -187,4 +187,34 @@ public function hasDivergence()
     {
         return false === empty($this->divergence);
     }
+
+    /**
+     * @return string
+     */
+    public function hash()
+    {
+        return serialize([
+            $this->step,
+            (function () {
+                if (!$this->activation) {
+                    return null;
+                }
+
+                return [
+                    $this->activation->getExpression(),
+                    $this->activation->getAllConditions(),
+                ];
+            })(),
+            $this->next ? $this->next->hash() : null,
+            (function () {
+                if (!$this->divergence) {
+                    return null;
+                }
+
+                return array_map(function (DivergenceStepDefinition $divergenceStepDefinition) {
+                    return $divergenceStepDefinition->hash();
+                }, $this->divergence);
+            })(),
+        ]);
+    }
 }
diff --git a/Classes/Form/Definition/Step/Step/Substep/SubstepDefinition.php b/Classes/Form/Definition/Step/Step/Substep/SubstepDefinition.php
@@ -16,6 +16,7 @@
 use Romm\Formz\Form\Definition\AbstractFormDefinitionComponent;
 use Romm\Formz\Form\Definition\Condition\Activation;
 use Romm\Formz\Form\Definition\Condition\ActivationInterface;
+use Romm\Formz\Form\Definition\Step\Step\DivergenceStepDefinition;
 use Romm\Formz\Form\Definition\Step\Step\Step;
 
 class SubstepDefinition extends AbstractFormDefinitionComponent
@@ -136,4 +137,34 @@ public function hasDivergence()
     {
         return false === empty($this->divergence);
     }
+
+    /**
+     * @return string
+     */
+    public function hash()
+    {
+        return serialize([
+            $this->substep,
+            (function () {
+                if (!$this->activation) {
+                    return null;
+                }
+
+                return [
+                    $this->activation->getExpression(),
+                    $this->activation->getAllConditions(),
+                ];
+            })(),
+            $this->next ? $this->next->hash() : null,
+            (function () {
+                if (!$this->divergence) {
+                    return null;
+                }
+
+                return array_map(function (DivergenceStepDefinition $divergenceStepDefinition) {
+                    return $divergenceStepDefinition->hash();
+                }, $this->divergence);
+            })(),
+        ]);
+    }
 }