Don't warn when segment ID is same as first segment in the group

php-edifact · Mar 6, 2024 · dffa093 · dffa093
1 parent e4903a8
commit dffa093
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/src/EDI/Interpreter.php b/src/EDI/Interpreter.php
@@ -115,6 +115,11 @@ class Interpreter
      */
     private $currentGroup = '';
 
+    /**
+     * @var string
+     */
+    private $currentGroupHeader = '';
+
     /**
      * Split multiple messages and process
      *
@@ -502,6 +507,9 @@ private function processXmlGroup(\SimpleXMLElement $elm, array &$message, int &$
         $groupVisited = false;
         $newGroup = [];
 
+        $this->currentGroupHeader = $message[$segmentIdx][0];
+        $this->currentGroup = $elm['id']->__toString();
+
         for ($g = 0; $g < $elm['maxrepeat']; $g++) {
             $grouptemp = [];
             if ($message[$segmentIdx][0] != $elm->children()[0]['id']) {
@@ -527,8 +535,6 @@ private function processXmlGroup(\SimpleXMLElement $elm, array &$message, int &$
                 }
             }
 
-            $this->currentGroup = $elm['id']->__toString();
-
             foreach ($elm->children() as $elm2) {
                 if ($elm2->getName() == 'group') {
                     $this->processXmlGroup($elm2, $message, $segmentIdx, $grouptemp, $errors);
@@ -562,6 +568,9 @@ private function processXmlGroup(\SimpleXMLElement $elm, array &$message, int &$
             $newGroup[] = $grouptemp;
         }
 
+        $this->currentGroupHeader = '';
+        $this->currentGroup = '';
+
         if (\count($newGroup) === 0) {
             return;
         }
@@ -657,7 +666,11 @@ private function processXmlSegment(\SimpleXMLElement $elm, array &$message, int
 
         // if additional segments are detected we are violating the maxrepeat attribute
         $loopMove = 0;
-        while (isset($message[$segmentIdx]) && \call_user_func($this->comparisonFunction, $message[$segmentIdx+$loopMove], $elm)) {
+        while (
+            isset($message[$segmentIdx]) &&
+            \call_user_func($this->comparisonFunction, $message[$segmentIdx+$loopMove], $elm) &&
+            (string)$elm['id'] !== $this->currentGroupHeader
+            ) {
             $errors[] = [
                 'text' => $this->messageTextConf['TOOMANYSEGMENTS'].($this->patchFiles ? ' (skipped)' : ''),
                 'position' => $segmentIdx,