Merge pull request #146 from tomek12311/fix/question-marks-are-not-parsed-correctly

sabas · web-flow · commit d59afa43b4a8 · 2025-01-08T16:42:23.000+01:00
FIX: Question marks are not parsed correctly
diff --git a/src/EDI/Parser.php b/src/EDI/Parser.php
@@ -522,10 +522,10 @@ private function unwrap(string &$string): array
             $this->errors[] = 'This file contains some segments without terminators';
         }
 
-        $terminatorRegex = '/(([^'.$this->symbRel.']'.$this->symbRel.'{2})+|[^'.$this->symbRel.'])'.$this->symbEnd.'|[\r\n]+/';
+        $terminatorRegex = '/((?<!'.$this->symbRel.')(?:'.$this->symbRel.$this->symbRel.')*)'.$this->symbEnd.'|[\r\n]+/';
 
         if ($this->strict) {
-            $terminatorRegex = '/(([^'.$this->symbRel.']'.$this->symbRel.'{2})+|[^'.$this->symbRel.'])'.$this->symbEnd.'/';
+            $terminatorRegex = '/((?<!'.$this->symbRel.')(?:'.$this->symbRel.$this->symbRel.')*)'.$this->symbEnd.'/';
         }
 
         $string = (string) \preg_replace(
diff --git a/tests/EDITest/ParserTest.php b/tests/EDITest/ParserTest.php
@@ -90,8 +90,10 @@ public static function multipleEscapedSegmentsProvider(): array
             ["EQD+CX??????DU12?+3456+2?:0'",  [['EQD', 'CX???DU12+3456', '2:0']]],
             ["EQD+CX????????DU12?+3456+2?:0'", [['EQD', 'CX????DU12+3456', '2:0']]],
             ["EQD+CX??DU12?+3456+2?:0??'",    [['EQD', 'CX?DU12+3456', '2:0?']]],
-            ["EQD+CX??DU12?+3456+2?:0????'",  [['EQD', 'CX?DU12+3456', "2:0??'"]]], // TODO? -> ' is correct here?
-            ["EQD+CX??DU12?+3456+2?:0??????'", [['EQD', 'CX?DU12+3456', "2:0???'"]]], // TODO? -> ' is correct here?
+            ["EQD+CX??DU12?+3456+2?:0???'",    [['EQD', 'CX?DU12+3456', "2:0?'"]]],
+            ["EQD+CX??DU12?+3456+2?:0????'",  [['EQD', 'CX?DU12+3456', "2:0??"]]],
+            ["EQD+CX??DU12?+3456+2?:0??????'", [['EQD', 'CX?DU12+3456', "2:0???"]]],
+            ["EQD+CX??DU12?+3456+2?:0???????'", [['EQD', 'CX?DU12+3456', "2:0???'"]]],
             ["??EQD+CX??DU12?+3456+2?:0'",    [['?EQD', 'CX?DU12+3456', '2:0']]],
             ["????EQD+CX??DU12?+3456+2?:0'",  [['??EQD', 'CX?DU12+3456', '2:0']]],
             ["??????EQD+CX??DU12?+3456+2?:0'", [['???EQD', 'CX?DU12+3456', '2:0']]],

Original file line number	Diff line number	Diff line change
`@@ -522,10 +522,10 @@ private function unwrap(string &$string): array`
`522`	`522`	`$this->errors[] = 'This file contains some segments without terminators';`
`523`	`523`	`}`
`524`	`524`
`525`		`- $terminatorRegex = '/(([^'.$this->symbRel.']'.$this->symbRel.'{2})+\|[^'.$this->symbRel.'])'.$this->symbEnd.'\|[\r\n]+/';`
	`525`	`+ $terminatorRegex = '/((?<!'.$this->symbRel.')(?:'.$this->symbRel.$this->symbRel.')*)'.$this->symbEnd.'\|[\r\n]+/';`
`526`	`526`
`527`	`527`	`if ($this->strict) {`
`528`		`- $terminatorRegex = '/(([^'.$this->symbRel.']'.$this->symbRel.'{2})+\|[^'.$this->symbRel.'])'.$this->symbEnd.'/';`
	`528`	`+ $terminatorRegex = '/((?<!'.$this->symbRel.')(?:'.$this->symbRel.$this->symbRel.')*)'.$this->symbEnd.'/';`
`529`	`529`	`}`
`530`	`530`
`531`	`531`	`$string = (string) \preg_replace(`