From 54fbdb47f578beb915a264326c82d05efa59a7c5 Mon Sep 17 00:00:00 2001
From: lyc <488043287@qq.com>
Date: Wed, 2 Mar 2022 16:46:49 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20<script=E5=9B=9E?=
 =?UTF-8?q?=E8=BD=A6=20=E5=8C=B9=E9=85=8D=E7=9A=84=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?=E8=BF=99=E6=A0=B7=E5=B0=B1=E4=B8=8D=E4=BC=9A=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=90=8E=E9=9D=A2=E7=9A=84=E5=85=A8=E9=83=A8=E8=A2=ABclean?=
 =?UTF-8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/PHPHtmlParser/Dom/Cleaner.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PHPHtmlParser/Dom/Cleaner.php b/src/PHPHtmlParser/Dom/Cleaner.php
index 52e5728b..173adf84 100644
--- a/src/PHPHtmlParser/Dom/Cleaner.php
+++ b/src/PHPHtmlParser/Dom/Cleaner.php
@@ -74,7 +74,7 @@ public function clean(string $str, Options $options, string $defaultCharset): st
 
         // strip out <script> tags
         if ($options->isRemoveScripts()) {
-            $str = \mb_eregi_replace("<\s*script[^>]*[^/]>(.*?)<\s*/\s*script\s*>", '', $str);
+            $str = \mb_eregi_replace("<\s*script[^>|\s]*[^/]>(.*?)<\s*/\s*script\s*>", '', $str);
             if ($str === false) {
                 throw new LogicalException('mb_eregi_replace returned false instead of a string. Error when attempting to remove scripts 1.');
             }
@@ -86,7 +86,7 @@ public function clean(string $str, Options $options, string $defaultCharset): st
 
         // strip out <style> tags
         if ($options->isRemoveStyles()) {
-            $str = \mb_eregi_replace("<\s*style[^>]*[^/]>(.*?)<\s*/\s*style\s*>", '', $str);
+            $str = \mb_eregi_replace("<\s*style[^>|\s]*[^/]>(.*?)<\s*/\s*style\s*>", '', $str);
             if ($str === false) {
                 throw new LogicalException('mb_eregi_replace returned false instead of a string. Error when attempting to strip out style tags 1.');
             }

From 7ad8aa7702cfc7d2f981c439c260e0ca8753c1a6 Mon Sep 17 00:00:00 2001
From: lyc <488043287@qq.com>
Date: Thu, 3 Mar 2022 15:28:51 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E8=BF=94=E5=9B=9Ebug?=
 =?UTF-8?q?=20=E6=98=AFbool=E7=B1=BB=E5=9E=8B=20=E7=84=B6=E5=90=8E?=
 =?UTF-8?q?=E5=BC=BA=E7=B1=BB=E5=9E=8B=E6=8A=A5=E9=94=99=20=E5=BC=BA?=
 =?UTF-8?q?=E5=88=B6=E8=BD=AC=E6=8D=A2=E4=BB=96=20=E4=B8=80=E5=AE=9A?=
 =?UTF-8?q?=E6=B2=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/PHPHtmlParser/Dom/Node/TextNode.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PHPHtmlParser/Dom/Node/TextNode.php b/src/PHPHtmlParser/Dom/Node/TextNode.php
index 1c8b646c..a78ef04c 100644
--- a/src/PHPHtmlParser/Dom/Node/TextNode.php
+++ b/src/PHPHtmlParser/Dom/Node/TextNode.php
@@ -94,10 +94,10 @@ public function text(): string
             // remember the conversion
             $this->convertedText = $text;
 
-            return $text;
+            return (string)$text;
         }
 
-        return $text;
+        return (string)$text;
     }
 
     /**

From 35cfd71f282262125263791b383d47c8dfd90a4a Mon Sep 17 00:00:00 2001
From: lyc <488043287@qq.com>
Date: Thu, 3 Mar 2022 16:28:23 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E8=BF=94=E5=9B=9Ebug?=
 =?UTF-8?q?=20tag=20=E4=B8=8D=E4=B8=80=E5=AE=9A=E6=98=AF=20obj=20=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E4=B8=80=E4=B8=8B=E6=98=AF=E4=B8=8D=E6=98=AF=20?=
 =?UTF-8?q?=E5=86=8D=E6=8B=BF=20name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/PHPHtmlParser/Dom/Parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PHPHtmlParser/Dom/Parser.php b/src/PHPHtmlParser/Dom/Parser.php
index 7ed310cb..07ecdd6d 100644
--- a/src/PHPHtmlParser/Dom/Parser.php
+++ b/src/PHPHtmlParser/Dom/Parser.php
@@ -37,7 +37,7 @@ public function parse(Options $options, Content $content, int $size): AbstractNo
         $root->setHtmlSpecialCharsDecode($options->isHtmlSpecialCharsDecode());
         $activeNode = $root;
         while ($activeNode !== null) {
-            if ($activeNode && $activeNode->tag->name() === 'script'
+            if ($activeNode && is_object($activeNode->tag) && $activeNode->tag->name() === 'script'
                 && $options->isCleanupInput() !== true
             ) {
                 $str = $content->copyUntil('</');

From c788b70edef54d38b7b74401ce120c0c67afaef8 Mon Sep 17 00:00:00 2001
From: lyc <488043287@qq.com>
Date: Mon, 7 Mar 2022 11:45:51 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E7=9A=84=E4=B8=9C=E8=A5=BF=20=E6=97=A0=E8=A7=86=E4=BB=96=20?=
 =?UTF-8?q?=E8=AE=A9=E5=A5=B9=E7=BB=A7=E7=BB=AD=E8=B7=91=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/PHPHtmlParser/Content.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PHPHtmlParser/Content.php b/src/PHPHtmlParser/Content.php
index f1332175..0e1c4db2 100755
--- a/src/PHPHtmlParser/Content.php
+++ b/src/PHPHtmlParser/Content.php
@@ -97,7 +97,7 @@ public function fastForward(int $count): Content
     {
         if (!$this->canFastForward($count)) {
             // trying to go over the content length, throw exception
-            throw new ContentLengthException('Attempt to fastForward pass the length of the content.');
+            //throw new ContentLengthException('Attempt to fastForward pass the length of the content.');
         }
         $this->pos += $count;