Skip to content

Commit 5940ed3

Browse files
aaronpkaaronpk
committed
adds failing tests and fixes for #118
there were no tests for missing attributes, so this adds a few, and fixes the parse to test for the presence of attributes rather than the incorrect check `getAttribute('href') !== null` (getAttribute never returns null). fixes #118
1 parent 9534363 commit 5940ed3

File tree

3 files changed

+83
-11
lines changed

3 files changed

+83
-11
lines changed

‎Mf2/Parser.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -588,13 +588,13 @@ public function parseP(\DOMElement $p) {
588588

589589
$this->resolveChildUrls($p);
590590

591-
if ($p->tagName == 'img' and $p->getAttribute('alt') !== '') {
591+
if ($p->tagName == 'img' and $p->hasAttribute('alt')) {
592592
$pValue = $p->getAttribute('alt');
593-
} elseif ($p->tagName == 'area' and $p->getAttribute('alt') !== '') {
593+
} elseif ($p->tagName == 'area' and $p->hasAttribute('alt')) {
594594
$pValue = $p->getAttribute('alt');
595-
} elseif ($p->tagName == 'abbr' and $p->getAttribute('title') !== '') {
595+
} elseif ($p->tagName == 'abbr' and $p->hasAttribute('title')) {
596596
$pValue = $p->getAttribute('title');
597-
} elseif (in_array($p->tagName, array('data', 'input')) and $p->getAttribute('value') !== '') {
597+
} elseif (in_array($p->tagName, array('data', 'input')) and $p->hasAttribute('value')) {
598598
$pValue = $p->getAttribute('value');
599599
} else {
600600
$pValue = unicodeTrim($this->innerText($p));
@@ -611,11 +611,11 @@ public function parseP(\DOMElement $p) {
611611
* @todo make this adhere to value-class
612612
*/
613613
public function parseU(\DOMElement $u) {
614-
if (($u->tagName == 'a' or $u->tagName == 'area') and $u->getAttribute('href') !== null) {
614+
if (($u->tagName == 'a' or $u->tagName == 'area') and $u->hasAttribute('href')) {
615615
$uValue = $u->getAttribute('href');
616-
} elseif (in_array($u->tagName, array('img', 'audio', 'video', 'source')) and $u->getAttribute('src') !== null) {
616+
} elseif (in_array($u->tagName, array('img', 'audio', 'video', 'source')) and $u->hasAttribute('src')) {
617617
$uValue = $u->getAttribute('src');
618-
} elseif ($u->tagName == 'object' and $u->getAttribute('data') !== null) {
618+
} elseif ($u->tagName == 'object' and $u->hasAttribute('data')) {
619619
$uValue = $u->getAttribute('data');
620620
}
621621

@@ -627,9 +627,9 @@ public function parseU(\DOMElement $u) {
627627

628628
if ($classTitle !== null) {
629629
return $classTitle;
630-
} elseif ($u->tagName == 'abbr' and $u->getAttribute('title') !== null) {
630+
} elseif ($u->tagName == 'abbr' and $u->hasAttribute('title')) {
631631
return $u->getAttribute('title');
632-
} elseif (in_array($u->tagName, array('data', 'input')) and $u->getAttribute('value') !== null) {
632+
} elseif (in_array($u->tagName, array('data', 'input')) and $u->hasAttribute('value')) {
633633
return $u->getAttribute('value');
634634
} else {
635635
return unicodeTrim($this->textContent($u));
@@ -1132,7 +1132,7 @@ public function parseImpliedPhoto(\DOMElement $e) {
11321132

11331133
if ($el->tagName == 'img') {
11341134
return $el->getAttribute('src');
1135-
} else if ($el->tagName == 'object' && $el->getAttribute('data') != '') {
1135+
} else if ($el->tagName == 'object' && $el->hasAttribute('data')) {
11361136
return $el->getAttribute('data');
11371137
}
11381138

‎tests/Mf2/ParsePTest.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,18 @@ public function testParsePHandlesData() {
6767
$this->assertEquals('Example User', $output['items'][0]['properties']['name'][0]);
6868
}
6969

70+
/**
71+
* @group parseP
72+
*/
73+
public function testParsePHandlesDataWithBlankValueAttribute() {
74+
$input = '<div class="h-card"><data class="p-name" value="">Example User</data></div>';
75+
$parser = new Parser($input);
76+
$output = $parser->parse();
77+
78+
$this->assertArrayHasKey('name', $output['items'][0]['properties']);
79+
$this->assertEquals('', $output['items'][0]['properties']['name'][0]);
80+
}
81+
7082
/**
7183
* @group parseP
7284
*/

‎tests/Mf2/ParseUTest.php‎

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,31 @@ public function testParseUHandlesA() {
2525
$this->assertArrayHasKey('url', $output['items'][0]['properties']);
2626
$this->assertEquals('http://example.com', $output['items'][0]['properties']['url'][0]);
2727
}
28-
28+
29+
/**
30+
* @group parseU
31+
*/
32+
public function testParseUHandlesEmptyHrefAttribute() {
33+
$input = '<div class="h-card"><a class="u-url" href="">Awesome example website</a></div>';
34+
$parser = new Parser($input, "http://example.com/");
35+
$output = $parser->parse();
36+
37+
$this->assertArrayHasKey('url', $output['items'][0]['properties']);
38+
$this->assertEquals('http://example.com/', $output['items'][0]['properties']['url'][0]);
39+
}
40+
41+
/**
42+
* @group parseU
43+
*/
44+
public function testParseUHandlesMissingHrefAttribute() {
45+
$input = '<div class="h-card"><a class="u-url">Awesome example website</a></div>';
46+
$parser = new Parser($input, "http://example.com/");
47+
$output = $parser->parse();
48+
49+
$this->assertArrayHasKey('url', $output['items'][0]['properties']);
50+
$this->assertEquals('Awesome example website', $output['items'][0]['properties']['url'][0]);
51+
}
52+
2953
/**
3054
* @group parseU
3155
*/
@@ -73,6 +97,18 @@ public function testParseUHandlesAbbr() {
7397
$this->assertArrayHasKey('photo', $output['items'][0]['properties']);
7498
$this->assertEquals('http://example.com/someimage.png', $output['items'][0]['properties']['photo'][0]);
7599
}
100+
101+
/**
102+
* @group parseU
103+
*/
104+
public function testParseUHandlesAbbrNoTitle() {
105+
$input = '<div class="h-card"><abbr class="u-photo">no title attribute</abbr></div>';
106+
$parser = new Parser($input);
107+
$output = $parser->parse();
108+
109+
$this->assertArrayHasKey('photo', $output['items'][0]['properties']);
110+
$this->assertEquals('no title attribute', $output['items'][0]['properties']['photo'][0]);
111+
}
76112

77113
/**
78114
* @group parseU
@@ -161,6 +197,17 @@ public function testParseUHandlesVideo() {
161197
$this->assertEquals('http://example.com/video.mp4', $output['items'][0]['properties']['video'][0]);
162198
}
163199

200+
/**
201+
* @group parseU
202+
*/
203+
public function testParseUHandlesVideoNoSrc() {
204+
$input = '<div class="h-entry"><video class="u-video">no video support</video></div>';
205+
$parser = new Parser($input);
206+
$output = $parser->parse();
207+
208+
$this->assertArrayHasKey('video', $output['items'][0]['properties']);
209+
$this->assertEquals('no video support', $output['items'][0]['properties']['video'][0]);
210+
}
164211

165212
/**
166213
* @group parseU
@@ -175,6 +222,19 @@ public function testParseUHandlesSource() {
175222
$this->assertEquals('http://example.com/video.ogg', $output['items'][0]['properties']['video'][1]);
176223
}
177224

225+
/**
226+
* @group parseU
227+
*/
228+
public function testParseUHandlesVideoPoster() {
229+
$input = '<div class="h-entry"><video class="u-photo" poster="http://example.com/posterimage.jpg"><source class="u-video" src="http://example.com/video.mp4" type="video/mp4"></video></div>';
230+
$parser = new Parser($input);
231+
$output = $parser->parse();
232+
233+
$this->assertArrayHasKey('video', $output['items'][0]['properties']);
234+
$this->assertEquals('http://example.com/video.mp4', $output['items'][0]['properties']['video'][0]);
235+
$this->assertEquals('http://example.com/posterimage.jpg', $output['items'][0]['properties']['photo'][0]);
236+
}
237+
178238
/**
179239
* @group parseU
180240
*/

0 commit comments

Comments
 (0)