Merge pull request #113 from AdeAttwood/master

andrewnicols · web-flow · commit 15bd0a1ebdb0 · 2024-08-20T10:20:36.000+08:00
Fix `html_entity_decode` deprecation warning in PHP 8.1
diff --git a/src/Html2Text.php b/src/Html2Text.php
@@ -236,16 +236,17 @@ private function legacyConstruct($html = '', $fromFile = false, array $options =
      */
     public function __construct($html = '', $options = array())
     {
+        $this->htmlFuncFlags = (PHP_VERSION_ID < 50400)
+            ? ENT_QUOTES
+            : ENT_QUOTES | ENT_HTML5;
+
         // for backwards compatibility
         if (!is_array($options)) {
             return call_user_func_array(array($this, 'legacyConstruct'), func_get_args());
         }
 
         $this->html = $html;
         $this->options = array_merge($this->options, $options);
-        $this->htmlFuncFlags = (PHP_VERSION_ID < 50400)
-            ? ENT_QUOTES
-            : ENT_QUOTES | ENT_HTML5;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -236,16 +236,17 @@ private function legacyConstruct($html = '', $fromFile = false, array $options =`
`236`	`236`	`*/`
`237`	`237`	`public function __construct($html = '', $options = array())`
`238`	`238`	`{`
	`239`	`+ $this->htmlFuncFlags = (PHP_VERSION_ID < 50400)`
	`240`	`+ ? ENT_QUOTES`
	`241`	`+ : ENT_QUOTES \| ENT_HTML5;`
	`242`	`+`
`239`	`243`	`// for backwards compatibility`
`240`	`244`	`if (!is_array($options)) {`
`241`	`245`	`return call_user_func_array(array($this, 'legacyConstruct'), func_get_args());`
`242`	`246`	`}`
`243`	`247`
`244`	`248`	`$this->html = $html;`
`245`	`249`	`$this->options = array_merge($this->options, $options);`
`246`		`- $this->htmlFuncFlags = (PHP_VERSION_ID < 50400)`
`247`		`- ? ENT_QUOTES`
`248`		`- : ENT_QUOTES \| ENT_HTML5;`
`249`	`250`	`}`
`250`	`251`
`251`	`252`	`/**`