phpcbf

Author: adamziel

components/XML/class-xmlprocessor.php

@@ -34,7 +34,6 @@
  * @TODO: Track specific error states, expose informative messages, line
  *        numbers, indexes, and other debugging info.
  *
- *
  * @TODO: Support XML 1.1.
  *
  * @TODO: Evaluate the performance of utf8_codepoint_at() against using the mbstring
@@ -1934,33 +1933,33 @@ private function parse_next_tag() {
 							$quoted_string_length - 2
 						);
 						$at += $quoted_string_length;
-				}
-
-				// Skip whitespace.
-				$at += strspn( $this->xml, " \t\f\r\n", $at );
-
-				if ( $doc_length <= $at ) {
-					$this->mark_incomplete_input( 'Unclosed DOCTYPE declaration.' );
-
-					return false;
-				}
-
-				if ( '[' === $this->xml[ $at ] ) {
-					if ( ! $this->skip_doctype_internal_subset( $at ) ) {
-						return false;
 					}
 
-					// Skip whitespace following the internal subset.
+					// Skip whitespace.
 					$at += strspn( $this->xml, " \t\f\r\n", $at );
 
 					if ( $doc_length <= $at ) {
 						$this->mark_incomplete_input( 'Unclosed DOCTYPE declaration.' );
 
 						return false;
 					}
-				}
 
-				if ( '>' !== $this->xml[ $at ] ) {
+					if ( '[' === $this->xml[ $at ] ) {
+						if ( ! $this->skip_doctype_internal_subset( $at ) ) {
+							return false;
+						}
+
+						// Skip whitespace following the internal subset.
+						$at += strspn( $this->xml, " \t\f\r\n", $at );
+
+						if ( $doc_length <= $at ) {
+							$this->mark_incomplete_input( 'Unclosed DOCTYPE declaration.' );
+
+							return false;
+						}
+					}
+
+					if ( '>' !== $this->xml[ $at ] ) {
 						$this->bail(
 							sprintf(
 								'Syntax error in DOCTYPE declaration. Unexpected character "%s" at position %d.',
@@ -2638,7 +2637,7 @@ private function skip_conditional_section_body( &$offset, $section_type ) {
 	 * @return bool Whether the declaration was fully consumed.
 	 */
 	private function skip_markup_declaration( &$offset ) {
-		$doc_length = strlen( $this->xml );
+		$doc_length     = strlen( $this->xml );
 		$keyword_length = $this->parse_name( $offset );
 
 		if ( 0 === $keyword_length ) {