forceArrayWhenRepeatable in Interpreter, fixes #52

Author: sabas

src/EDI/Interpreter.php

@@ -42,6 +42,12 @@ class Interpreter
      */
     private $patchFiles = true;
 
+    /**
+     * @var bool
+     */
+    private $forceArrayWhenRepeatable = false;
+
+
     /**
      * @var \SimpleXMLElement
      */
@@ -141,6 +147,16 @@ public function togglePatching(bool $flag)
         $this->patchFiles = $flag;
     }
 
+    /**
+     * @param bool $flag
+     *
+     * @return void
+     */
+    public function forceArrayWhenRepeatable(bool $flag)
+    {
+        $this->forceArrayWhenRepeatable = $flag;
+    }
+
     /**
      * Patch the error messages array
      *
@@ -525,7 +541,7 @@ private function processXmlSegment(\SimpleXMLElement $elm, array &$message, int
             if (\call_user_func($this->comparisonFunction, $message[$segmentIdx], $elm)) {
                 $jsonMessage = $this->processSegment($message[$segmentIdx], $this->xmlSeg, $segmentIdx, $errors);
                 $segmentVisited = true;
-                $this->doAddArray($array, $jsonMessage);
+                $this->doAddArray($array, $jsonMessage, (int)$elm['maxrepeat']);
                 ++$segmentIdx;
             } else {
                 if (!$segmentVisited && isset($elm['required'])) {
@@ -540,7 +556,7 @@ private function processXmlSegment(\SimpleXMLElement $elm, array &$message, int
                     if ($this->patchFiles && isset($this->segmentTemplates[$elmType])) {
                         $jsonMessage = $this->processSegment($this->segmentTemplates[$elmType], $this->xmlSeg, $segmentIdx, $errors);
                         $fixed = true;
-                        $this->doAddArray($array, $jsonMessage);
+                        $this->doAddArray($array, $jsonMessage, (int)$elm['maxrepeat']);
                     }
 
                     $errors[] = [
@@ -563,7 +579,7 @@ private function processXmlSegment(\SimpleXMLElement $elm, array &$message, int
      *
      * @return void
      */
-    private function doAddArray(array &$array, array &$jsonMessage)
+    private function doAddArray(array &$array, array &$jsonMessage, $maxRepeat = 1)
     {
         if (isset($array[$jsonMessage['key']])) {
             if (
@@ -578,6 +594,12 @@ private function doAddArray(array &$array, array &$jsonMessage)
             $array[$jsonMessage['key']][] = $jsonMessage['value'];
         } else {
             $array[$jsonMessage['key']] = $jsonMessage['value'];
+            // if segment can be repeated then the flag forces to be an array also
+            // if there's only one segment
+            if ($maxRepeat > 1 && $this->forceArrayWhenRepeatable) {
+                d('lol', $jsonMessage, $maxRepeat);
+                $array[$jsonMessage['key']] = [$jsonMessage['value']];
+            }
         }
     }