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: query parameter parsed as character entity #194

Merged
merged 4 commits into from
Sep 1, 2020
Merged

fix: query parameter parsed as character entity #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db6e7e6
added test
bytestream Aug 24, 2020
4f240ec
fix: character entity parsing
bytestream Aug 24, 2020
19cb86c
replaced assertStringContainsString with assertContains
bytestream Aug 24, 2020
475f5f5
phpcs
bytestream Aug 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions src/HTML5/Parser/Tokenizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1181,16 +1181,11 @@ protected function decodeCharacterReference($inAttribute = false)
return $entity;
}

// If in an attribute, then failing to match ; means unconsume the
// entire string. Otherwise, failure to match is an error.
if ($inAttribute) {
$this->scanner->unconsume($this->scanner->position() - $start);

return '&';
}
// Failing to match ; means unconsume the entire string.
$this->scanner->unconsume($this->scanner->position() - $start);

$this->parseError('Expected &ENTITY;, got &ENTITY%s (no trailing ;) ', $tok);

return '&' . $entity;
return '&';
}
}
9 changes: 9 additions & 0 deletions test/HTML5/Html5Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,4 +480,13 @@ public function testCDATA()
$res = $this->cycleFragment('a<![CDATA[ This <is> a test. ]]>b');
$this->assertRegExp('|<!\[CDATA\[ This <is> a test\. \]\]>|', $res);
}

public function testAnchorTargetQueryParam()
{
$res = $this->cycle('<a href="https://domain.com/page.php?foo=bar&target=baz">https://domain.com/page.php?foo=bar&target=baz</a>');
$this->assertContains(
'<a href="https://domain.com/page.php?foo=bar&amp;target=baz">https://domain.com/page.php?foo=bar&amp;target=baz</a>',
$res
);
}
}