Introduce XMLStackOfOpenElements

Author: adamziel

components/DataLiberation/EntityReader/EPubEntityReader.php

@@ -141,7 +141,7 @@ private function parse_manifest() {
 			return false;
 		}
 
-		$full_path = $xml->get_attribute_by_qualified_name( 'full-path' );
+		$full_path = $xml->get_attribute( 'full-path' );
 		if ( ! $full_path ) {
 			return false;
 		}
@@ -163,11 +163,11 @@ private function parse_manifest() {
 			$parsed_entry = array();
 			$keys         = $xml->get_attribute_qualified_names_with_prefix( '' );
 			foreach ( $keys as $key ) {
-				$parsed_entry[ $key ] = $xml->get_attribute_by_qualified_name( $key );
+				$parsed_entry[ $key ] = $xml->get_attribute( $key );
 			}
 			if ( $xml->matches_breadcrumbs( array( 'metadata', '*' ) ) ) {
 				$parsed['metadata'][] = array(
-					'tag'        => $xml->get_qualified_tag(),
+					'tag'        => $xml->get_local_tag_name(),
 					'attributes' => $parsed_entry,
 				);
 			} elseif ( $xml->matches_breadcrumbs( array( 'manifest', 'item' ) ) ) {

components/DataLiberation/EntityReader/WXREntityReader.php

@@ -659,7 +659,7 @@ private function read_next_entity() {
 				$this->last_xml_cursor_outside_of_entity      = $this->xml->get_reentrancy_cursor();
 			}
 
-			$tag = $this->xml->get_qualified_tag();
+			$tag = $this->xml->get_local_tag_name();
 			/**
 			 * Custom adjustment: the Accessibility WXR file uses a non-standard
 			 * wp:wp_author tag.
@@ -734,14 +734,14 @@ private function read_next_entity() {
 				$this->last_opener_attributes = array();
 				$names                        = $this->xml->get_attribute_qualified_names_with_prefix( '' );
 				foreach ( $names as $name ) {
-					$this->last_opener_attributes[ $name ] = $this->xml->get_attribute_by_qualified_name( $name );
+					$this->last_opener_attributes[ $name ] = $this->xml->get_attribute( $name );
 				}
 				$this->text_buffer = '';
 
 				$is_site_option_opener = (
 					count( $this->xml->get_breadcrumbs() ) === 3 &&
 					$this->xml->matches_breadcrumbs( array( 'rss', 'channel', '*' ) ) &&
-					array_key_exists( $this->xml->get_qualified_tag(), static::KNOWN_SITE_OPTIONS )
+					array_key_exists( $this->xml->get_local_tag_name(), static::KNOWN_SITE_OPTIONS )
 				);
 				if ( $is_site_option_opener ) {
 					$this->last_xml_byte_offset_outside_of_entity = $this->xml->get_token_byte_offset_in_the_input_stream();
@@ -848,13 +848,13 @@ private function read_next_entity() {
 	 * @return bool Whether a site_option entity was emitted.
 	 */
 	private function parse_site_option() {
-		if ( ! array_key_exists( $this->xml->get_qualified_tag(), static::KNOWN_SITE_OPTIONS ) ) {
+		if ( ! array_key_exists( $this->xml->get_local_tag_name(), static::KNOWN_SITE_OPTIONS ) ) {
 			return false;
 		}
 
 		$this->entity_type = 'site_option';
 		$this->entity_data = array(
-			'option_name'  => static::KNOWN_SITE_OPTIONS[ $this->xml->get_qualified_tag() ],
+			'option_name'  => static::KNOWN_SITE_OPTIONS[ $this->xml->get_local_tag_name() ],
 			'option_value' => $this->text_buffer,
 		);
 		$this->emit_entity();