← All changes
|
vendor/simplehtmldom/simplehtmldom/simple_html_dom.php
+35
-27
3.2.5
→
4.7.0
View file →
| @@ -20,22 +20,24 @@ | ||
| 20 | 20 | * |
| 21 | 21 | * Version $Rev$ |
| 22 | 22 | */ |
| 23 | 23 | |
| 24 | +use simplehtmldom\HtmlNode; | |
| 25 | + | |
| 24 | 26 | if (defined('DEFAULT_TARGET_CHARSET')) { |
| 25 | - define('\simplehtmldom\DEFAULT_TARGET_CHARSET', DEFAULT_TARGET_CHARSET); | |
| 27 | + define('simplehtmldom\DEFAULT_TARGET_CHARSET', DEFAULT_TARGET_CHARSET); | |
| 26 | 28 | } |
| 27 | 29 | |
| 28 | 30 | if (defined('DEFAULT_BR_TEXT')) { |
| 29 | - define('\simplehtmldom\DEFAULT_BR_TEXT', DEFAULT_BR_TEXT); | |
| 31 | + define('simplehtmldom\DEFAULT_BR_TEXT', DEFAULT_BR_TEXT); | |
| 30 | 32 | } |
| 31 | 33 | |
| 32 | 34 | if (defined('DEFAULT_SPAN_TEXT')) { |
| 33 | - define('\simplehtmldom\DEFAULT_SPAN_TEXT', DEFAULT_SPAN_TEXT); | |
| 35 | + define('simplehtmldom\DEFAULT_SPAN_TEXT', DEFAULT_SPAN_TEXT); | |
| 34 | 36 | } |
| 35 | 37 | |
| 36 | 38 | if (defined('MAX_FILE_SIZE')) { |
| 37 | - define('\simplehtmldom\MAX_FILE_SIZE', MAX_FILE_SIZE); | |
| 39 | + define('simplehtmldom\MAX_FILE_SIZE', MAX_FILE_SIZE); | |
| 38 | 40 | } |
| 39 | 41 | |
| 40 | 42 | include_once 'HtmlDocument.php'; |
| 41 | 43 | include_once 'HtmlNode.php'; |
| @@ -55,29 +57,29 @@ | ||
| 55 | 57 | if (!defined('MAX_FILE_SIZE')) { |
| 56 | 58 | define('MAX_FILE_SIZE', \simplehtmldom\MAX_FILE_SIZE); |
| 57 | 59 | } |
| 58 | 60 | |
| 59 | -define('HDOM_TYPE_ELEMENT', \simplehtmldom\HtmlNode::HDOM_TYPE_ELEMENT); | |
| 60 | -define('HDOM_TYPE_COMMENT', \simplehtmldom\HtmlNode::HDOM_TYPE_COMMENT); | |
| 61 | -define('HDOM_TYPE_TEXT', \simplehtmldom\HtmlNode::HDOM_TYPE_TEXT); | |
| 62 | -define('HDOM_TYPE_ROOT', \simplehtmldom\HtmlNode::HDOM_TYPE_ROOT); | |
| 63 | -define('HDOM_TYPE_UNKNOWN', \simplehtmldom\HtmlNode::HDOM_TYPE_UNKNOWN); | |
| 64 | -define('HDOM_QUOTE_DOUBLE', \simplehtmldom\HtmlNode::HDOM_QUOTE_DOUBLE); | |
| 65 | -define('HDOM_QUOTE_SINGLE', \simplehtmldom\HtmlNode::HDOM_QUOTE_SINGLE); | |
| 66 | -define('HDOM_QUOTE_NO', \simplehtmldom\HtmlNode::HDOM_QUOTE_NO); | |
| 67 | -define('HDOM_INFO_BEGIN', \simplehtmldom\HtmlNode::HDOM_INFO_BEGIN); | |
| 68 | -define('HDOM_INFO_END', \simplehtmldom\HtmlNode::HDOM_INFO_END); | |
| 69 | -define('HDOM_INFO_QUOTE', \simplehtmldom\HtmlNode::HDOM_INFO_QUOTE); | |
| 70 | -define('HDOM_INFO_SPACE', \simplehtmldom\HtmlNode::HDOM_INFO_SPACE); | |
| 71 | -define('HDOM_INFO_TEXT', \simplehtmldom\HtmlNode::HDOM_INFO_TEXT); | |
| 72 | -define('HDOM_INFO_INNER', \simplehtmldom\HtmlNode::HDOM_INFO_INNER); | |
| 73 | -define('HDOM_INFO_OUTER', \simplehtmldom\HtmlNode::HDOM_INFO_OUTER); | |
| 74 | -define('HDOM_INFO_ENDSPACE', \simplehtmldom\HtmlNode::HDOM_INFO_ENDSPACE); | |
| 61 | +const HDOM_TYPE_ELEMENT = HtmlNode::HDOM_TYPE_ELEMENT; | |
| 62 | +const HDOM_TYPE_COMMENT = HtmlNode::HDOM_TYPE_COMMENT; | |
| 63 | +const HDOM_TYPE_TEXT = HtmlNode::HDOM_TYPE_TEXT; | |
| 64 | +const HDOM_TYPE_ROOT = HtmlNode::HDOM_TYPE_ROOT; | |
| 65 | +const HDOM_TYPE_UNKNOWN = HtmlNode::HDOM_TYPE_UNKNOWN; | |
| 66 | +const HDOM_QUOTE_DOUBLE = HtmlNode::HDOM_QUOTE_DOUBLE; | |
| 67 | +const HDOM_QUOTE_SINGLE = HtmlNode::HDOM_QUOTE_SINGLE; | |
| 68 | +const HDOM_QUOTE_NO = HtmlNode::HDOM_QUOTE_NO; | |
| 69 | +const HDOM_INFO_BEGIN = HtmlNode::HDOM_INFO_BEGIN; | |
| 70 | +const HDOM_INFO_END = HtmlNode::HDOM_INFO_END; | |
| 71 | +const HDOM_INFO_QUOTE = HtmlNode::HDOM_INFO_QUOTE; | |
| 72 | +const HDOM_INFO_SPACE = HtmlNode::HDOM_INFO_SPACE; | |
| 73 | +const HDOM_INFO_TEXT = HtmlNode::HDOM_INFO_TEXT; | |
| 74 | +const HDOM_INFO_INNER = HtmlNode::HDOM_INFO_INNER; | |
| 75 | +const HDOM_INFO_OUTER = HtmlNode::HDOM_INFO_OUTER; | |
| 76 | +const HDOM_INFO_ENDSPACE = HtmlNode::HDOM_INFO_ENDSPACE; | |
| 75 | 77 | |
| 76 | -define('HDOM_SMARTY_AS_TEXT', \simplehtmldom\HDOM_SMARTY_AS_TEXT); | |
| 78 | +const HDOM_SMARTY_AS_TEXT = \simplehtmldom\HDOM_SMARTY_AS_TEXT; | |
| 77 | 79 | |
| 78 | -class_alias('\simplehtmldom\HtmlDocument', 'simple_html_dom', true); | |
| 79 | -class_alias('\simplehtmldom\HtmlNode', 'simple_html_dom_node', true); | |
| 80 | +class_alias('\simplehtmldom\HtmlDocument', 'simple_html_dom'); | |
| 81 | +class_alias('\simplehtmldom\HtmlNode', 'simple_html_dom_node'); | |
| 80 | 82 | |
| 81 | 83 | function file_get_html( |
| 82 | 84 | $url, |
| 83 | 85 | $use_include_path = false, |
| @@ -88,9 +90,10 @@ | ||
| 88 | 90 | $forceTagsClosed = true, |
| 89 | 91 | $target_charset = DEFAULT_TARGET_CHARSET, |
| 90 | 92 | $stripRN = true, |
| 91 | 93 | $defaultBRText = DEFAULT_BR_TEXT, |
| 92 | - $defaultSpanText = DEFAULT_SPAN_TEXT) | |
| 94 | + $defaultSpanText = DEFAULT_SPAN_TEXT, | |
| 95 | + $enable_htmlentity_operations = true) | |
| 93 | 96 | { |
| 94 | 97 | if($maxLen <= 0) { $maxLen = MAX_FILE_SIZE; } |
| 95 | 98 | |
| 96 | 99 | $dom = new simple_html_dom( |
| @@ -99,9 +102,11 @@ | ||
| 99 | 102 | $forceTagsClosed, |
| 100 | 103 | $target_charset, |
| 101 | 104 | $stripRN, |
| 102 | 105 | $defaultBRText, |
| 103 | - $defaultSpanText | |
| 106 | + $defaultSpanText, | |
| 107 | + 0, | |
| 108 | + $enable_htmlentity_operations | |
| 104 | 109 | ); |
| 105 | 110 | |
| 106 | 111 | $contents = file_get_contents( |
| 107 | 112 | $url, |
| @@ -125,9 +130,10 @@ | ||
| 125 | 130 | $forceTagsClosed = true, |
| 126 | 131 | $target_charset = DEFAULT_TARGET_CHARSET, |
| 127 | 132 | $stripRN = true, |
| 128 | 133 | $defaultBRText = DEFAULT_BR_TEXT, |
| 129 | - $defaultSpanText = DEFAULT_SPAN_TEXT) | |
| 134 | + $defaultSpanText = DEFAULT_SPAN_TEXT, | |
| 135 | + $enable_htmlentity_operations = true) | |
| 130 | 136 | { |
| 131 | 137 | $dom = new simple_html_dom( |
| 132 | 138 | null, |
| 133 | 139 | $lowercase, |
| @@ -134,9 +140,11 @@ | ||
| 134 | 140 | $forceTagsClosed, |
| 135 | 141 | $target_charset, |
| 136 | 142 | $stripRN, |
| 137 | 143 | $defaultBRText, |
| 138 | - $defaultSpanText | |
| 144 | + $defaultSpanText, | |
| 145 | + 0, | |
| 146 | + $enable_htmlentity_operations | |
| 139 | 147 | ); |
| 140 | 148 | |
| 141 | 149 | if (empty($str) || strlen($str) > MAX_FILE_SIZE) { |
| 142 | 150 | $dom->clear(); |