updated mf2 parser to latest version

Author: pfefferle

includes/Mf2/Parser.php

@@ -280,9 +280,6 @@ class Parser {
 	/** @var boolean Whether to include experimental language parsing in the result */
 	public $lang = false;
 
-	/** @var bool Whether to include alternates object (dropped from spec in favor of rel-urls) */
-	public $enableAlternates = false;
-
 	/**
 	 * Elements upgraded to mf2 during backcompat
 	 * @var SplObjectStorage
@@ -820,7 +817,7 @@ public function parseE(\DOMElement $e) {
 		if($this->lang) {
 			// Language
 			if ( $html_lang = $this->language($e) ) {
-				$return['lang'] = $html_lang;
+				$return['html-lang'] = $html_lang;
 			}
 		}
 
@@ -849,10 +846,6 @@ public function parseH(\DOMElement $e, $is_backcompat = false) {
 		// Get current µf name
 		$mfTypes = mfNamesFromElement($e, 'h-');
 
-		if (!$mfTypes) {
-			return null;
-		}
-
 		// Initalise var to store the representation in
 		$return = array();
 		$children = array();
@@ -1057,7 +1050,6 @@ public function parseH(\DOMElement $e, $is_backcompat = false) {
 
 		// Check for u-url
 		if (!array_key_exists('url', $return) && !$is_backcompat) {
-			$url = null;
 			// Look for img @src
 			if ($e->tagName == 'a' or $e->tagName == 'area') {
 				$url = $e->getAttribute('href');
@@ -1081,11 +1073,18 @@ public function parseH(\DOMElement $e, $is_backcompat = false) {
 				}
 			}
 
-			if (!is_null($url)) {
+			if (!empty($url)) {
 				$return['url'][] = $this->resolveUrl($url);
 			}
 		}
 
+		if($this->lang) {
+			// Language
+			if ( $html_lang = $this->language($e) ) {
+				$return['html-lang'] = $html_lang;
+			}
+		}
+
 		// Make sure things are in alphabetical order
 		sort($mfTypes);
 
@@ -1095,13 +1094,6 @@ public function parseH(\DOMElement $e, $is_backcompat = false) {
 			'properties' => $return
 		);
 
-		if($this->lang) {
-			// Language
-			if ( $html_lang = $this->language($e) ) {
-				$parsed['lang'] = $html_lang;
-			}
-		}
-
 		if (!empty($shape)) {
 			$parsed['shape'] = $shape;
 		}
@@ -1161,89 +1153,62 @@ public function parseImpliedPhoto(\DOMElement $e) {
 	}
 
 	/**
-	 * Parse rels and alternates
+	 * Parse Rels and Alternatives
 	 *
-	 * Returns [$rels, $rel_urls, $alternates].
-	 * For $rels and $rel_urls, if they are empty and $this->jsonMode = true, they will be returned as stdClass,
-	 * optimizing for JSON serialization. Otherwise they will be returned as an empty array.
-	 * Note that $alternates is deprecated in the microformats spec in favor of $rel_urls. $alternates only appears
-	 * in parsed results if $this->enableAlternates = true.
-	 * @return array|stdClass
+	 * Returns [$rels, $alternatives]. If the $rels value is to be empty, i.e. there are no links on the page
+	 * with a rel value *not* containing `alternate`, then the type of $rels depends on $this->jsonMode. If set
+	 * to true, it will be a stdClass instance, optimising for JSON serialisation. Otherwise (the default case),
+	 * it will be an empty array.
 	 */
 	public function parseRelsAndAlternates() {
 		$rels = array();
-		$rel_urls = array();
 		$alternates = array();
 
 		// Iterate through all a, area and link elements with rel attributes
 		foreach ($this->xpath->query('//a[@rel and @href] | //link[@rel and @href] | //area[@rel and @href]') as $hyperlink) {
-			if ($hyperlink->getAttribute('rel') == '') {
+			if ($hyperlink->getAttribute('rel') == '')
 				continue;
-			}
 
 			// Resolve the href
 			$href = $this->resolveUrl($hyperlink->getAttribute('href'));
 
 			// Split up the rel into space-separated values
 			$linkRels = array_filter(explode(' ', $hyperlink->getAttribute('rel')));
 
-			$rel_attributes = array();
-
-			if ($hyperlink->hasAttribute('media')) {
-				$rel_attributes['media'] = $hyperlink->getAttribute('media');
-			}
+			// If alternate in rels, create alternate structure, append
+			if (in_array('alternate', $linkRels)) {
+				$alt = array(
+					'url' => $href,
+					'rel' => implode(' ', array_diff($linkRels, array('alternate')))
+				);
+				if ($hyperlink->hasAttribute('media'))
+					$alt['media'] = $hyperlink->getAttribute('media');
 
-			if ($hyperlink->hasAttribute('hreflang')) {
-				$rel_attributes['hreflang'] = $hyperlink->getAttribute('hreflang');
-			}
+				if ($hyperlink->hasAttribute('hreflang'))
+					$alt['hreflang'] = $hyperlink->getAttribute('hreflang');
 
-			if ($hyperlink->hasAttribute('title')) {
-				$rel_attributes['title'] = $hyperlink->getAttribute('title');
-			}
+				if ($hyperlink->hasAttribute('title'))
+					$alt['title'] = $hyperlink->getAttribute('title');
 
-			if ($hyperlink->hasAttribute('type')) {
-				$rel_attributes['type'] = $hyperlink->getAttribute('type');
-			}
+				if ($hyperlink->hasAttribute('type'))
+					$alt['type'] = $hyperlink->getAttribute('type');
 
-			if ($hyperlink->nodeValue) {
-				$rel_attributes['text'] = $hyperlink->nodeValue;
-			}
+				if ($hyperlink->nodeValue)
+					$alt['text'] = $hyperlink->nodeValue;
 
-			if ($this->enableAlternates) {
-				// If 'alternate' in rels, create 'alternates' structure, append
-				if (in_array('alternate', $linkRels)) {
-					$alternates[] = array_merge(
-						$rel_attributes,
-						array(
-							'url' => $href,
-							'rel' => implode(' ', array_diff($linkRels, array('alternate')))
-						)
-					);
+				$alternates[] = $alt;
+			} else {
+				foreach ($linkRels as $rel) {
+					$rels[$rel][] = $href;
 				}
 			}
-
-			foreach ($linkRels as $rel) {
-				$rels[$rel][] = $href;
-			}
-
-			if (!in_array($href, $rel_urls)) {
-				$rel_urls[$href] = array_merge(
-					$rel_attributes, 
-					array('rels' => $linkRels)
-				);
-			}
-
 		}
 
 		if (empty($rels) and $this->jsonMode) {
 			$rels = new stdClass();
 		}
 
-		if (empty($rel_urls) and $this->jsonMode) {
-			$rel_urls = new stdClass();
-		}		
-		
-		return array($rels, $rel_urls, $alternates);
+		return array($rels, $alternates);
 	}
 
 	/**
@@ -1274,15 +1239,14 @@ public function parse($convertClassic = true, DOMElement $context = null) {
 		}
 
 		// Parse rels
-		list($rels, $rel_urls, $alternates) = $this->parseRelsAndAlternates();
+		list($rels, $alternates) = $this->parseRelsAndAlternates();
 
 		$top = array(
 			'items' => array_values(array_filter($mfs)),
-			'rels' => $rels,
-			'rel-urls' => $rel_urls,
+			'rels' => $rels
 		);
 
-		if ($this->enableAlternates && count($alternates)) {
+		if (count($alternates)) {
 			$top['alternates'] = $alternates;
 		}