Merge pull request #200 from gRegorLove/issue182

Zegnat · web-flow · commit 966bd852b5a6 · 2020-05-02T13:03:59.000+02:00
Fix parsing for iframe.u-*[src]
diff --git a/Mf2/Parser.php b/Mf2/Parser.php
@@ -656,7 +656,7 @@ public function parseU(\DOMElement $u) {
 			$uValue = $u->getAttribute('href');
 		} elseif ( $u->tagName == 'img' and $u->hasAttribute('src') ) {
 			$uValue = $this->parseImg($u);
-		} elseif (in_array($u->tagName, array('audio', 'video', 'source')) and $u->hasAttribute('src')) {
+		} elseif (in_array($u->tagName, array('audio', 'video', 'source', 'iframe')) and $u->hasAttribute('src')) {
 			$uValue = $u->getAttribute('src');
 		} elseif ($u->tagName == 'video' and !$u->hasAttribute('src') and $u->hasAttribute('poster')) {
 			$uValue = $u->getAttribute('poster');
diff --git a/tests/Mf2/ParseUTest.php b/tests/Mf2/ParseUTest.php
@@ -303,33 +303,49 @@ public function testImpliedUWithEmptyHref() {
 		$this->assertEquals('http://example.com/', $output['items'][4]['children'][0]['properties']['url'][0]);
 	}
 
-  public function testValueFromLinkTag() {
-    $input = <<< END
+	public function testValueFromLinkTag() {
+		$input = <<< END
 <!doctype html>
 <html class="h-entry">
-  <head>
-    <link rel="canonical" class="u-url p-name" href="https://example.com/" title="Example.com homepage">
-  </head>
-  <body></body>
+	<head>
+		<link rel="canonical" class="u-url p-name" href="https://example.com/" title="Example.com homepage">
+	</head>
+	<body></body>
 </html>
 END;
 
-    $parser = new Parser($input, 'https://example.com');
-    $output = $parser->parse();
+		$parser = new Parser($input, 'https://example.com');
+		$output = $parser->parse();
+
+		$this->assertArrayHasKey('url', $output['items'][0]['properties']);
+		$this->assertEquals('https://example.com/', $output['items'][0]['properties']['url'][0]);
 
-    $this->assertArrayHasKey('url', $output['items'][0]['properties']);
-    $this->assertEquals('https://example.com/', $output['items'][0]['properties']['url'][0]);
+		$this->assertArrayHasKey('name', $output['items'][0]['properties']);
+		$this->assertEquals('Example.com homepage', $output['items'][0]['properties']['name'][0]);
+	}
 
-    $this->assertArrayHasKey('name', $output['items'][0]['properties']);
-    $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();
 
-  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]);
+	}
 
-    $this->assertArrayHasKey('url', $output['items'][0]['properties']);
-    $this->assertEquals('https://example.com/relative.html', $output['items'][0]['properties']['url'][0]);
-  }
+	/**
+	 * @see https://github.com/microformats/php-mf2/issues/182
+	 */
+	public function testResolveFromIframeElement() {
+		$input = '<div class="h-entry">
+<h1 class="p-name">Title</h1>
+<iframe src="https://example.com/index.html" class="u-url">
+  <p>Your browser does not support iframes.</p>
+</iframe>
+</div>';
+		$parser = new Parser($input, 'https://example.com');
+		$output = $parser->parse();
 
+		$this->assertArrayHasKey('url', $output['items'][0]['properties']);
+		$this->assertEquals('https://example.com/index.html', $output['items'][0]['properties']['url'][0]);
+	}
 }
