[-]: use "strpos()" before "preg_replace()" only if it makes sense

Author: voku

src/EDI/Parser.php

@@ -345,24 +345,33 @@ private function unwrap(string &$string): array
         if (
             !$this->unaChecked
             &&
-            \strpos($string, "UNA") === 0
+            \strpos($string, 'UNA') === 0
         ) {
-            $this->analyseUNA(\preg_replace("#^UNA#", '', substr($string, 0, 9)));
+            $this->analyseUNA(
+                \substr(\substr($string, 3), 0, 9)
+            );
         }
 
         if (
             !$this->unbChecked
             &&
-            \strpos($string, "UNB") === 0
+            \strpos($string, 'UNB') === 0
         ) {
-            $this->analyseUNB(\preg_replace("#^UNB\+#", '', substr($string, 0, 8)));
+            $this->analyseUNB(
+                \preg_replace(
+                    "#^UNB\+#",
+                    '',
+                    \substr($string, 0, 8)
+                )
+            );
         }
 
         $string = \preg_replace(
             "/(([^" . $this->symbRel . "]" . $this->symbRel . "{2})+|[^" . $this->symbRel . "])" . $this->symbEnd . "/",
             "$1" . $this->stringSafe,
             $string
         );
+
         $file = \preg_split(
             self::$DELIMITER . $this->stringSafe . self::$DELIMITER . "i",
             $string
@@ -393,31 +402,36 @@ private function unwrap(string &$string): array
      */
     private function splitSegment(string &$str): array
     {
-        // remove ending symbEnd
-        if (\strpos($str, $this->symbEnd) !== false) {
-            $str = \preg_replace(
+        // remove ending "symbEnd"
+        $str = \trim(
+            \preg_replace(
                 self::$DELIMITER . $this->symbEnd . '$' . self::$DELIMITER,
                 '',
                 $str
-            );
-        }
-
-        $str = \trim($str);
+            )
+        );
 
-        // replace duplicate symbRel
+        // replace duplicate "symbRel"
         $str = \str_replace(
             $this->symbUnescapedRel . $this->symbUnescapedRel,
             $this->stringSafe,
             $str
         );
 
-        // split on sepData if not escaped (negative lookbehind)
+        // split on "sepData" if not escaped (negative lookbehind)
         $matches = \preg_split(
             self::$DELIMITER . "(?<!" . $this->symbRel . ")" . $this->sepData . self::$DELIMITER,
             $str
         );
+        // fallback
+        if ($matches === false) {
+            $matches = [];
+        }
 
         foreach ($matches as &$value) {
+            if ($value === '') {
+                continue;
+            }
 
             // INFO:
             //
@@ -439,15 +453,11 @@ private function splitSegment(string &$str): array
                 }
             }
 
-            // split on sepComp
+            // split on "sepComp"
             $value = $this->splitData($value);
         }
         unset($value);
 
-        if ($matches === false) {
-            $matches = [];
-        }
-
         return $matches;
     }
 
@@ -481,15 +491,20 @@ private function splitData(string &$str)
             );
         };
 
+        // check for "sepUnescapedComp" in the string
         if (\strpos($str, $this->sepUnescapedComp) === false) {
             return $replace($str);
         }
 
-        // split on sepComp if not escaped (negative lookbehind)
+        // split on "sepComp" if not escaped (negative lookbehind)
         $array = \preg_split(
             self::$DELIMITER . "(?<!" . $this->symbRel . ")" . $this->sepComp . self::$DELIMITER,
             $str
         );
+        // fallback
+        if ($array === false) {
+            $array = [[]];
+        }
 
         if (\count($array) === 1) {
             return $replace($str);

tests/EDITest/ParserTest.php

@@ -67,7 +67,7 @@ public function testFileOk()
     {
         $string = file_get_contents(__DIR__ . '/../files/example_order_ok.edi');
 
-        for ($i = 0; $i < 2; $i++) { // keep for simple performance tests
+        for ($i = 0; $i < 100; $i++) { // keep for simple performance tests
             $errors = (new Parser($string))->errors();
         }