update content_reg

Author: faitheir

src/DomParser/Config.php

@@ -13,7 +13,7 @@ private function __clone(){}
         'start_tag_reg'     => '/^\s*<([^>\s\/!]+)/is',
         'start_end_tag_reg' => '/(^\s*>)|(^\s*\/>)/is',
         'end_tag_reg'       => '/^\s*<([^>\s\/]+)/is',
-        'content_reg'       => '/^\s*([^<]+)|(<!--.*-->)/is',
+        'content_reg'       => '/^\s*([^<]+)|(^\s*<!--((?!-->).)*-->)/is',
         'attrs_reg'         => '/^\s*([^=>< ]+)="([^"]*)"|\s([^=><\s]+)(?=\s|>)/iU',
         # inverse parse
         'tag_indent'        => '    ',

src/DomParser/Parser.php

@@ -81,6 +81,7 @@ private function _parseStartTag($domString, $parent)
         $startTagMatch = [];
         preg_match($this->_startTagReg, $domString, $startTagMatch);
         $startTagName = $startTagMatch[1] ?? '';
+
         if (empty($startTagName))
             return [$domString, null];
 
@@ -131,13 +132,12 @@ private function _parseStartEndTag(& $domString, $node)
      * @param $parent
      * @return bool|string
      */
-    private function _parseEndTag($domString, $parent)
+    private function _parseEndTag($domString, $node)
     {
-        if(empty($parent->nodeName))
+        if(empty($node->nodeName))
             return $domString;
-
         $endTagMatch = [];
-        if (preg_match('/^\s*(<\/' . $parent->nodeName . '>)/is', $domString, $endTagMatch)) {
+        if (preg_match('/^\s*(<\/' . $node->nodeName . '>)/is', $domString, $endTagMatch)) {
             $endTagPos    = strpos($domString, $endTagMatch[0]);
             $domString    = substr($domString, $endTagPos + strlen($endTagMatch[0]));
         }
@@ -187,6 +187,7 @@ private function _parseAttrs($domString, $node)
      */
     private function _parseContent($domString, $parent)
     {
+
         # match content
         $contentMatch = [];
         $match = preg_match($this->_contentReg, $domString, $contentMatch);

tests/DomParserTest.php

@@ -28,8 +28,11 @@
     </template>
 HTML;
 
-//echo '<pre>';
 $dom = $parser->setConfig([
 ])->parse($html);
 
-print_r($dom);
+echo '<pre>';
+print_r($dom);
+
+$string = (string) $dom;
+file_put_contents('test.vue', $string);