Support namespaces in all methods

Author: adamziel

components/DataLiberation/EntityReader/EPubEntityReader.php

@@ -167,7 +167,7 @@ private function parse_manifest() {
 			}
 			if ( $xml->matches_breadcrumbs( array( 'metadata', '*' ) ) ) {
 				$parsed['metadata'][] = array(
-					'tag'        => $xml->get_local_tag_name(),
+					'tag'        => $xml->get_tag_local_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_local_tag_name();
+			$tag = $this->xml->get_tag_local_name();
 			/**
 			 * Custom adjustment: the Accessibility WXR file uses a non-standard
 			 * wp:wp_author tag.
@@ -741,7 +741,7 @@ private function read_next_entity() {
 				$is_site_option_opener = (
 					count( $this->xml->get_breadcrumbs() ) === 3 &&
 					$this->xml->matches_breadcrumbs( array( 'rss', 'channel', '*' ) ) &&
-					array_key_exists( $this->xml->get_local_tag_name(), static::KNOWN_SITE_OPTIONS )
+					array_key_exists( $this->xml->get_tag_local_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_local_tag_name(), static::KNOWN_SITE_OPTIONS ) ) {
+		if ( ! array_key_exists( $this->xml->get_tag_local_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_local_tag_name() ],
+			'option_name'  => static::KNOWN_SITE_OPTIONS[ $this->xml->get_tag_local_name() ],
 			'option_value' => $this->text_buffer,
 		);
 		$this->emit_entity();

components/XML/Tests/XMLProcessorTest.php

@@ -25,7 +25,7 @@ class XMLAttributeToken {
 	 *
 	 * @var string
 	 */
-	public $name;
+	public $qualified_name;
 
 	/**
 	 * Attribute value.
@@ -102,8 +102,8 @@ class XMLAttributeToken {
 	 * @param  string  $namespace  Namespace.
 	 *
 	 */
-	public function __construct( $name, $value_start, $value_length, $start, $length, $namespace_prefix=null, $local_name=null, $namespace=null ) {
-		$this->name            = $name;
+	public function __construct( $qualified_name, $value_start, $value_length, $start, $length, $namespace_prefix=null, $local_name=null, $namespace=null ) {
+		$this->qualified_name  = $qualified_name;
 		$this->value_starts_at = $value_start;
 		$this->value_length    = $value_length;
 		$this->start           = $start;

components/XML/XMLAttributeToken.php

@@ -68,5 +68,9 @@ public function __construct( $local_name, $namespace_prefix, $namespace, $namesp
 		$this->namespaces_in_scope = $namespaces_in_scope;
 		$this->qualified_name = $namespace_prefix ? $namespace_prefix . ':' . $local_name : $local_name;
 	}
+
+	public function get_full_name() {
+		return $this->namespace ? '{' . $this->namespace . '}' . $this->local_name : $this->local_name;
+	}
 
 }