comparison vendor/masterminds/html5/src/HTML5.php @ 18:af1871eacc83

Update to Drupal core 8.7.1
author Chris Cannam
date Thu, 09 May 2019 15:33:08 +0100
parents 129ea1e6d783
children
comparison
equal deleted inserted replaced
17:129ea1e6d783 18:af1871eacc83
153 public function parse($input, array $options = array()) 153 public function parse($input, array $options = array())
154 { 154 {
155 $this->errors = array(); 155 $this->errors = array();
156 $options = array_merge($this->defaultOptions, $options); 156 $options = array_merge($this->defaultOptions, $options);
157 $events = new DOMTreeBuilder(false, $options); 157 $events = new DOMTreeBuilder(false, $options);
158 $scanner = new Scanner($input); 158 $scanner = new Scanner($input, !empty($options['encoding']) ? $options['encoding'] : 'UTF-8');
159 $parser = new Tokenizer($scanner, $events, !empty($options['xmlNamespaces']) ? Tokenizer::CONFORMANT_XML : Tokenizer::CONFORMANT_HTML); 159 $parser = new Tokenizer($scanner, $events, !empty($options['xmlNamespaces']) ? Tokenizer::CONFORMANT_XML : Tokenizer::CONFORMANT_HTML);
160 160
161 $parser->parse(); 161 $parser->parse();
162 $this->errors = $events->getErrors(); 162 $this->errors = $events->getErrors();
163 163
177 */ 177 */
178 public function parseFragment($input, array $options = array()) 178 public function parseFragment($input, array $options = array())
179 { 179 {
180 $options = array_merge($this->defaultOptions, $options); 180 $options = array_merge($this->defaultOptions, $options);
181 $events = new DOMTreeBuilder(true, $options); 181 $events = new DOMTreeBuilder(true, $options);
182 $scanner = new Scanner($input); 182 $scanner = new Scanner($input, !empty($options['encoding']) ? $options['encoding'] : 'UTF-8');
183 $parser = new Tokenizer($scanner, $events, !empty($options['xmlNamespaces']) ? Tokenizer::CONFORMANT_XML : Tokenizer::CONFORMANT_HTML); 183 $parser = new Tokenizer($scanner, $events, !empty($options['xmlNamespaces']) ? Tokenizer::CONFORMANT_XML : Tokenizer::CONFORMANT_HTML);
184 184
185 $parser->parse(); 185 $parser->parse();
186 $this->errors = $events->getErrors(); 186 $this->errors = $events->getErrors();
187 187