Merge pull request #170 from Zegnat/resolve-urls-late

Move resolve step last in u-* parsing

Author: aaronpk

Mf2/Parser.php

@@ -618,23 +618,16 @@ public function parseU(\DOMElement $u) {
 			$uValue = $u->getAttribute('poster');
 		} elseif ($u->tagName == 'object' and $u->hasAttribute('data')) {
 			$uValue = $u->getAttribute('data');
-		}
-
-		if (isset($uValue)) {
-			return $this->resolveUrl($uValue);
-		}
-
-		$classTitle = $this->parseValueClassTitle($u);
-
-		if ($classTitle !== null) {
-			return $classTitle;
+		} elseif (($classTitle = $this->parseValueClassTitle($u)) !== null) {
+		    $uValue = $classTitle;
 		} elseif (($u->tagName == 'abbr' or $u->tagName == 'link') and $u->hasAttribute('title')) {
-			return $u->getAttribute('title');
+			$uValue = $u->getAttribute('title');
 		} elseif (in_array($u->tagName, array('data', 'input')) and $u->hasAttribute('value')) {
-			return $u->getAttribute('value');
+			$uValue = $u->getAttribute('value');
 		} else {
-			return $this->textContent($u);
+			$uValue = $this->textContent($u);
 		}
+        return $this->resolveUrl($uValue);
 	}
 
 	/**

tests/Mf2/ParseUTest.php

@@ -47,7 +47,7 @@ public function testParseUHandlesMissingHrefAttribute() {
 		$output = $parser->parse();
 
 		$this->assertArrayHasKey('url', $output['items'][0]['properties']);
-		$this->assertEquals('Awesome example website', $output['items'][0]['properties']['url'][0]);
+		$this->assertEquals('http://example.com/Awesome example website', $output['items'][0]['properties']['url'][0]);
 	}
 
 	/**
@@ -296,4 +296,12 @@ public function testValueFromLinkTag() {
     $this->assertEquals('Example.com homepage', $output['items'][0]['properties']['name'][0]);
   }
 
+  public function testResolveFromDataElement() {
+    $parser = new Parser('<div class="h-test"><data class="u-url" value="relative.html"></data></div>', 'https://example.com/index.html');
+    $output = $parser->parse();
+    
+    $this->assertArrayHasKey('url', $output['items'][0]['properties']);
+    $this->assertEquals('https://example.com/relative.html', $output['items'][0]['properties']['url'][0]);
+  }
+
 }