Merge branch 'master' of github.com:indieweb/php-mf2

aaronpk · aaronpk · commit d17880c8dfbb · 2017-05-27T08:02:09.000-07:00
diff --git a/Mf2/Parser.php b/Mf2/Parser.php
@@ -508,7 +508,7 @@ public function language(DOMElement $el)
 					return unicodeTrim($node->getAttribute('content'));
 				}
 			}
-		} else {
+		} elseif ($el->parentNode instanceof DOMElement) {
 			// check the parent node
 			return $this->language($el->parentNode);			
 		}
diff --git a/tests/Mf2/ParseLanguageTest.php b/tests/Mf2/ParseLanguageTest.php
@@ -52,6 +52,43 @@ public function testHtmlAndHEntryLang()
 		$this->assertEquals('es', $result['items'][0]['properties']['html-lang']);
 	} # end method testHtmlAndHEntryLang()
 
+    /**
+     * Test HTML fragment with only h-entry lang
+     */
+    public function testFragmentHEntryLangOnly()
+    {
+        $input = '<div class="h-entry" lang="en">This test is in English.</div>';
+        $parser = new Parser($input);
+        $result = $parser->parse();
+
+        $this->assertEquals('en', $result['items'][0]['properties']['html-lang']);
+    } # end method testFragmentHEntryLangOnly()
+
+    /**
+     * Test HTML fragment with no lang
+     */
+    public function testFragmentHEntryNoLang()
+    {
+        $input = '<div class="h-entry">This test is in English.</div>';
+        $parser = new Parser($input);
+        $result = $parser->parse();
+
+        $this->assertFalse(isset($result['items'][0]['properties']['html-lang']));
+    } # end method testFragmentHEntryNoLang()
+
+    /**
+     * Test HTML fragment with no lang, loaded with loadXML()
+     */
+    public function testFragmentHEntryNoLangXML()
+    {
+        $input = new \DOMDocument();
+        $input->loadXML('<div class="h-entry">This test is in English.</div>');
+        $parser = new Parser($input);
+        $result = $parser->parse();
+
+        $this->assertFalse(isset($result['items'][0]['properties']['html-lang']));
+    } # end method testFragmentHEntryNoLangXML()
+
 	/**
 	 * Test with different <html lang>, h-entry lang, and h-entry without lang,
 	 * which should inherit from the <html lang>

Original file line number	Diff line number	Diff line change
`@@ -508,7 +508,7 @@ public function language(DOMElement $el)`
`508`	`508`	`return unicodeTrim($node->getAttribute('content'));`
`509`	`509`	`}`
`510`	`510`	`}`
`511`		`- } else {`
	`511`	`+ } elseif ($el->parentNode instanceof DOMElement) {`
`512`	`512`	`// check the parent node`
`513`	`513`	`return $this->language($el->parentNode);`
`514`	`514`	`}`