Merge branch 'fixed-cdata-parsing' of git://github.com/onlinesid/php-html-parser into onlinesid-fixed-cdata-parsing

Author: paquettg

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Added support for PSR7 HTTP clients and requests for URL calls.
+- Added PHAN support and fixed all issues from PHAN.
 
 ### Changed
 - Fixed issue with \ causing an infite loop.

README.md

@@ -1,7 +1,7 @@
 PHP Html Parser
 ==========================
 
-Version 2.2.0
+Version 2.2.1
 
 [![Build Status](https://travis-ci.org/paquettg/php-html-parser.png)](https://travis-ci.org/paquettg/php-html-parser)
 [![Coverage Status](https://coveralls.io/repos/paquettg/php-html-parser/badge.png)](https://coveralls.io/r/paquettg/php-html-parser)

src/PHPHtmlParser/Dom.php

@@ -615,7 +615,13 @@ protected function parse(): void
         $this->root->setHtmlSpecialCharsDecode($this->options->htmlSpecialCharsDecode);
         $activeNode = $this->root;
         while (!\is_null($activeNode)) {
-            $str = $this->content->copyUntil('<');
+            if ($activeNode && $activeNode->tag->name() === 'script'
+                && $this->options->get('cleanupInput') != true
+            ) {
+                $str = $this->content->copyUntil('</');
+            } else {
+                $str = $this->content->copyUntil('<');
+            }
             if ($str == '') {
                 $info = $this->parseTag();
                 if (!$info['status']) {

tests/DomTest.php

@@ -12,6 +12,18 @@ public function tearDown()
         Mockery::close();
     }
 
+    /**
+     * <![CDATA[ should not be modified when cleanupInput is set to false
+     */
+    public function testParsingCData()
+    {
+        $html = "<script type=\"text/javascript\">/* <![CDATA[ */var et_core_api_spam_recaptcha = '';/* ]]> */</script>";
+        $dom = new Dom();
+        $dom->setOptions(['cleanupInput' => false,]);
+        $dom->load($html);
+        $this->assertSame($html, $dom->root->outerHtml());
+    }
+
     public function testLoad()
     {
         $dom = new Dom();