Merge pull request #31 from Junkins/issues-29

差分データの取得前にbeforeMarshalを実行する処理を作成

Author: Junkins

src/Controller/Component/MultiStepFormComponent.php

@@ -229,8 +229,6 @@ protected function mergeData()
         $requestData = $this->request->data;
         $sessionKey = $requestData[$this->hiddenKey];
         $sessionData = $this->readData($sessionKey);
-
-        $entity = $this->handleNewEntity($requestData);
         if (!$this->isMultiple()) {
             $requestData = $this->fieldAdjustment($requestData);
         } else {
@@ -285,6 +283,15 @@ private function fieldAdjustment($data)
                 }
             }
 
+            $data    = new \ArrayObject($data);
+            if (method_exists($this->Table, 'beforeMarshal')) {
+                // バリデーションにかける beforeMarshal を実行
+                $options = new \ArrayObject([]);
+                $this->Table->dispatchEvent('Model.beforeMarshal', compact('data', 'options'));
+            }
+            // ArrayObjectから配列に戻す
+            $data = $data->getArrayCopy();
+
             $sampleEntity = $this->handleNewEntity($data);
             $sampleArray  = $sampleEntity->toArray();
             $setFields    = array_diff_key($sampleArray, $data);