Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix invalid property class name parsing #250

Merged
merged 3 commits into from
Mar 8, 2024
Merged

Fix invalid property class name parsing #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3cd0703
Update nestedMfPropertyNamesFromClass
gRegorLove Oct 11, 2023
f92cc52
Add additional tests
gRegorLove Oct 11, 2023
fb0214f
Merge branch 'main' into dev/issue249
gRegorLove Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 4 additions & 8 deletions Mf2/Parser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,14 +166,10 @@ function nestedMfPropertyNamesFromClass($class) {
$prefixes = array('p-', 'u-', 'dt-', 'e-');
$propertyNames = array();

$class = str_replace(array(' ', ' ', "\n"), ' ', $class);
foreach (explode(' ', $class) as $classname) {
foreach ($prefixes as $prefix) {
// Check if $classname is a valid property classname for $prefix.
if (mb_substr($classname, 0, mb_strlen($prefix)) == $prefix && $classname != $prefix) {
$propertyName = mb_substr($classname, mb_strlen($prefix));
$propertyNames[$propertyName][] = $prefix;
}
foreach ($prefixes as $prefix) {
$classes = mfNamesFromClass($class, $prefix);
foreach ($classes as $property) {
$propertyNames[$property][] = $prefix;
}
}

Expand Down
106 changes: 105 additions & 1 deletion tests/Mf2/ParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public function testNestedMicroformatPropertyNameWorks() {
$test = 'someclass p-location someotherclass u-author p-author';
$actual = Mf2\nestedMfPropertyNamesFromClass($test);

$this->assertEquals($expected, $actual);
$this->assertEqualsCanonicalizing($expected, $actual);
}

public function testMicroformatNamesFromClassIgnoresPrefixesWithoutNames() {
Expand Down Expand Up @@ -914,5 +914,109 @@ public function testNewlineBeforePrefix() {
$this->assertEquals('Page Title', $result['items'][0]['properties']['name'][0]);
$this->assertEquals('A summary so the p-name won\'t be implied. This test demonstrates p-name is not being parsed.', $result['items'][0]['properties']['summary'][0]);
}

/**
* @see https://github.com/microformats/php-mf2/issues/249
*/
public function testInvalidRootsIgnored() {
$input = <<<EOF
<div class=" h-5 pt-2">
<div class="p-4 h-entry">
<a class="u-url" href="https://example.com/bar">bar </a>
</div>
<div class="p-4 h-entry">
<a class="u-url" href="https://example.com/foo">foo</a>
</div>
</div>
EOF;
$output = Mf2\parse($input);

# `items` should have length=2
$this->assertEquals(2, count($output['items']));

# each should be an h-entry
$this->assertEquals('h-entry', $output['items'][0]['type'][0]);
$this->assertEquals('h-entry', $output['items'][1]['type'][0]);
}

/**
* @see https://github.com/microformats/php-mf2/issues/249
*/
public function testInvalidNestedRootsIgnored() {
$input = <<<EOF
<div class=" h-5 pt-2">
<div class="p-4 h-entry">
<a class="u-url" href="https://example.com/bar">bar </a>
</div>
<div class="p-4 h-entry">
<a class="u-url" href="https://example.com/foo">foo</a>
</div>
<div class="p-4 h-5">
<a class="u-url" href="https://example.com/baz">baz</a>
</div>
</div>
EOF;
$output = Mf2\parse($input);

# `items` should have length=2
$this->assertEquals(2, count($output['items']));

# each should be an h-entry
$this->assertEquals('h-entry', $output['items'][0]['type'][0]);
$this->assertEquals('h-entry', $output['items'][1]['type'][0]);
}

/**
* @see https://github.com/microformats/php-mf2/issues/249
*/
public function testInvalidNestedPropertiesIgnored1() {
$input = <<<EOF
<div class=" h-feed pt-2">
<div class="p-4 h-entry">
<a class="u-url" href="https://example.com/bar">bar </a>
</div>
<div class="p-4 h-entry">
<a class="u-url" href="https://example.com/foo">foo</a>
</div>
</div>
EOF;
$output = Mf2\parse($input);

# `properties` should be empty
$this->assertEquals(0, count($output['items'][0]['properties']));

# `children` should have length=2
$this->assertArrayHasKey('children', $output['items'][0]);
$this->assertEquals(2, count($output['items'][0]['children']));

# each child should be an h-entry
$this->assertEquals('h-entry', $output['items'][0]['children'][0]['type'][0]);
$this->assertEquals('h-entry', $output['items'][0]['children'][1]['type'][0]);
}

/**
* @see https://github.com/microformats/php-mf2/issues/246
*/
public function testInvalidNestedPropertiesIgnored2() {
$input = <<<EOF
<article class="h-card">
<h1> TITLE </h1>
<img class="h-36 photo u-logo"
alt="An example alt title"
src="https://example.com/img.png"
/>
<p class="h-21 u-nickname"> John Doe </p>
</article>
EOF;
$output = Mf2\parse($input);

# `properties` should have length=3
$this->assertEquals(3, count($output['items'][0]['properties']));

# should have these properties
$this->assertArrayHasKey('logo', $output['items'][0]['properties']);
$this->assertArrayHasKey('nickname', $output['items'][0]['properties']);
$this->assertArrayHasKey('name', $output['items'][0]['properties']);
}
}