| @@ -1,13 +1,13 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -namespace WindPressPackages\Masterminds; | |
| 3 | +namespace WindPressDeps\Masterminds; | |
| 4 | 4 | |
| 5 | -use WindPressPackages\Masterminds\HTML5\Parser\DOMTreeBuilder; | |
| 6 | -use WindPressPackages\Masterminds\HTML5\Parser\Scanner; | |
| 7 | -use WindPressPackages\Masterminds\HTML5\Parser\Tokenizer; | |
| 8 | -use WindPressPackages\Masterminds\HTML5\Serializer\OutputRules; | |
| 9 | -use WindPressPackages\Masterminds\HTML5\Serializer\Traverser; | |
| 5 | +use WindPressDeps\Masterminds\HTML5\Parser\DOMTreeBuilder; | |
| 6 | +use WindPressDeps\Masterminds\HTML5\Parser\Scanner; | |
| 7 | +use WindPressDeps\Masterminds\HTML5\Parser\Tokenizer; | |
| 8 | +use WindPressDeps\Masterminds\HTML5\Serializer\OutputRules; | |
| 9 | +use WindPressDeps\Masterminds\HTML5\Serializer\Traverser; | |
| 10 | 10 | /** |
| 11 | 11 | * This class offers convenience methods for parsing and serializing HTML5. |
| 12 | 12 | * It is roughly designed to mirror the \DOMDocument native class. |
| 13 | 13 | */ |
| @@ -132,9 +132,8 @@ | ||
| 132 | 132 | /** |
| 133 | 133 | * Parse an input string. |
| 134 | 134 | * |
| 135 | 135 | * @param string $input |
| 136 | - * @param array $options | |
| 137 | 136 | * |
| 138 | 137 | * @return \DOMDocument |
| 139 | 138 | */ |
| 140 | 139 | public function parse($input, array $options = array()) |
| @@ -141,10 +140,10 @@ | ||
| 141 | 140 | { |
| 142 | 141 | $this->errors = array(); |
| 143 | 142 | $options = array_merge($this->defaultOptions, $options); |
| 144 | 143 | $events = new DOMTreeBuilder(\false, $options); |
| 145 | - $scanner = new Scanner($input, (!empty($options['encoding'])) ? $options['encoding'] : 'UTF-8'); | |
| 146 | - $parser = new Tokenizer($scanner, $events, (!empty($options['xmlNamespaces'])) ? Tokenizer::CONFORMANT_XML : Tokenizer::CONFORMANT_HTML); | |
| 144 | + $scanner = new Scanner($input, !empty($options['encoding']) ? $options['encoding'] : 'UTF-8'); | |
| 145 | + $parser = new Tokenizer($scanner, $events, !empty($options['xmlNamespaces']) ? Tokenizer::CONFORMANT_XML : Tokenizer::CONFORMANT_HTML); | |
| 147 | 146 | $parser->parse(); |
| 148 | 147 | $this->errors = $events->getErrors(); |
| 149 | 148 | return $events->document(); |
| 150 | 149 | } |
| @@ -162,10 +161,10 @@ | ||
| 162 | 161 | public function parseFragment($input, array $options = array()) |
| 163 | 162 | { |
| 164 | 163 | $options = array_merge($this->defaultOptions, $options); |
| 165 | 164 | $events = new DOMTreeBuilder(\true, $options); |
| 166 | - $scanner = new Scanner($input, (!empty($options['encoding'])) ? $options['encoding'] : 'UTF-8'); | |
| 167 | - $parser = new Tokenizer($scanner, $events, (!empty($options['xmlNamespaces'])) ? Tokenizer::CONFORMANT_XML : Tokenizer::CONFORMANT_HTML); | |
| 165 | + $scanner = new Scanner($input, !empty($options['encoding']) ? $options['encoding'] : 'UTF-8'); | |
| 166 | + $parser = new Tokenizer($scanner, $events, !empty($options['xmlNamespaces']) ? Tokenizer::CONFORMANT_XML : Tokenizer::CONFORMANT_HTML); | |
| 168 | 167 | $parser->parse(); |
| 169 | 168 | $this->errors = $events->getErrors(); |
| 170 | 169 | return $events->fragment(); |
| 171 | 170 | } |