mirror of
https://github.com/ezyang/htmlpurifier.git
synced 2025-07-31 11:20:13 +02:00
PSR-2 reformatting PHPDoc corrections
With minor corrections. Signed-off-by: Marcus Bointon <marcus@synchromedia.co.uk> Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
This commit is contained in:
committed by
Edward Z. Yang
parent
19eee14899
commit
fac747bdbd
@@ -3,15 +3,16 @@
|
||||
class HTMLPurifier_HTMLDefinitionTest extends HTMLPurifier_Harness
|
||||
{
|
||||
|
||||
function expectError($error = false, $message = '%s') {
|
||||
public function expectError($error = false, $message = '%s')
|
||||
{
|
||||
// Because we're testing a definition, it's vital that the cache
|
||||
// is turned off for tests that expect errors.
|
||||
$this->config->set('Cache.DefinitionImpl', null);
|
||||
parent::expectError($error);
|
||||
}
|
||||
|
||||
function test_parseTinyMCEAllowedList() {
|
||||
|
||||
public function test_parseTinyMCEAllowedList()
|
||||
{
|
||||
$def = new HTMLPurifier_HTMLDefinition();
|
||||
|
||||
// note: this is case-sensitive, but its config schema
|
||||
@@ -67,8 +68,8 @@ a[href|title]
|
||||
|
||||
}
|
||||
|
||||
function test_Allowed() {
|
||||
|
||||
public function test_Allowed()
|
||||
{
|
||||
$config1 = HTMLPurifier_Config::create(array(
|
||||
'HTML.AllowedElements' => array('b', 'i', 'p', 'a'),
|
||||
'HTML.AllowedAttributes' => array('a@href', '*@id')
|
||||
@@ -82,83 +83,97 @@ a[href|title]
|
||||
|
||||
}
|
||||
|
||||
function assertPurification_AllowedElements_p() {
|
||||
public function assertPurification_AllowedElements_p()
|
||||
{
|
||||
$this->assertPurification('<p><b>Jelly</b></p>', '<p>Jelly</p>');
|
||||
}
|
||||
|
||||
function test_AllowedElements() {
|
||||
public function test_AllowedElements()
|
||||
{
|
||||
$this->config->set('HTML.AllowedElements', 'p');
|
||||
$this->assertPurification_AllowedElements_p();
|
||||
}
|
||||
|
||||
function test_AllowedElements_multiple() {
|
||||
public function test_AllowedElements_multiple()
|
||||
{
|
||||
$this->config->set('HTML.AllowedElements', 'p,div');
|
||||
$this->assertPurification('<div><p><b>Jelly</b></p></div>', '<div><p>Jelly</p></div>');
|
||||
}
|
||||
|
||||
function test_AllowedElements_invalidElement() {
|
||||
public function test_AllowedElements_invalidElement()
|
||||
{
|
||||
$this->config->set('HTML.AllowedElements', 'obviously_invalid,p');
|
||||
$this->expectError(new PatternExpectation("/Element 'obviously_invalid' is not supported/"));
|
||||
$this->assertPurification_AllowedElements_p();
|
||||
}
|
||||
|
||||
function test_AllowedElements_invalidElement_xssAttempt() {
|
||||
public function test_AllowedElements_invalidElement_xssAttempt()
|
||||
{
|
||||
$this->config->set('HTML.AllowedElements', '<script>,p');
|
||||
$this->expectError(new PatternExpectation("/Element '<script>' is not supported/"));
|
||||
$this->assertPurification_AllowedElements_p();
|
||||
}
|
||||
|
||||
function test_AllowedElements_multipleInvalidElements() {
|
||||
public function test_AllowedElements_multipleInvalidElements()
|
||||
{
|
||||
$this->config->set('HTML.AllowedElements', 'dr-wiggles,dr-pepper,p');
|
||||
$this->expectError(new PatternExpectation("/Element 'dr-wiggles' is not supported/"));
|
||||
$this->expectError(new PatternExpectation("/Element 'dr-pepper' is not supported/"));
|
||||
$this->assertPurification_AllowedElements_p();
|
||||
}
|
||||
|
||||
function assertPurification_AllowedAttributes_global_style() {
|
||||
public function assertPurification_AllowedAttributes_global_style()
|
||||
{
|
||||
$this->assertPurification(
|
||||
'<p style="font-weight:bold;" class="foo">Jelly</p><br style="clear:both;" />',
|
||||
'<p style="font-weight:bold;">Jelly</p><br style="clear:both;" />');
|
||||
}
|
||||
|
||||
function test_AllowedAttributes_global_preferredSyntax() {
|
||||
public function test_AllowedAttributes_global_preferredSyntax()
|
||||
{
|
||||
$this->config->set('HTML.AllowedElements', array('p', 'br'));
|
||||
$this->config->set('HTML.AllowedAttributes', 'style');
|
||||
$this->assertPurification_AllowedAttributes_global_style();
|
||||
}
|
||||
|
||||
function test_AllowedAttributes_global_verboseSyntax() {
|
||||
public function test_AllowedAttributes_global_verboseSyntax()
|
||||
{
|
||||
$this->config->set('HTML.AllowedElements', array('p', 'br'));
|
||||
$this->config->set('HTML.AllowedAttributes', '*@style');
|
||||
$this->assertPurification_AllowedAttributes_global_style();
|
||||
}
|
||||
|
||||
function test_AllowedAttributes_global_discouragedSyntax() {
|
||||
public function test_AllowedAttributes_global_discouragedSyntax()
|
||||
{
|
||||
// Emit errors eventually
|
||||
$this->config->set('HTML.AllowedElements', array('p', 'br'));
|
||||
$this->config->set('HTML.AllowedAttributes', '*.style');
|
||||
$this->assertPurification_AllowedAttributes_global_style();
|
||||
}
|
||||
|
||||
function assertPurification_AllowedAttributes_local_p_style() {
|
||||
public function assertPurification_AllowedAttributes_local_p_style()
|
||||
{
|
||||
$this->assertPurification(
|
||||
'<p style="font-weight:bold;" class="foo">Jelly</p><br style="clear:both;" />',
|
||||
'<p style="font-weight:bold;">Jelly</p><br />');
|
||||
}
|
||||
|
||||
function test_AllowedAttributes_local_preferredSyntax() {
|
||||
public function test_AllowedAttributes_local_preferredSyntax()
|
||||
{
|
||||
$this->config->set('HTML.AllowedElements', array('p', 'br'));
|
||||
$this->config->set('HTML.AllowedAttributes', 'p@style');
|
||||
$this->assertPurification_AllowedAttributes_local_p_style();
|
||||
}
|
||||
|
||||
function test_AllowedAttributes_local_discouragedSyntax() {
|
||||
public function test_AllowedAttributes_local_discouragedSyntax()
|
||||
{
|
||||
$this->config->set('HTML.AllowedElements', array('p', 'br'));
|
||||
$this->config->set('HTML.AllowedAttributes', 'p.style');
|
||||
$this->assertPurification_AllowedAttributes_local_p_style();
|
||||
}
|
||||
|
||||
function test_AllowedAttributes_multiple() {
|
||||
public function test_AllowedAttributes_multiple()
|
||||
{
|
||||
$this->config->set('HTML.AllowedElements', array('p', 'br'));
|
||||
$this->config->set('HTML.AllowedAttributes', 'p@style,br@class,title');
|
||||
$this->assertPurification(
|
||||
@@ -167,34 +182,39 @@ a[href|title]
|
||||
);
|
||||
}
|
||||
|
||||
function test_AllowedAttributes_local_invalidAttribute() {
|
||||
public function test_AllowedAttributes_local_invalidAttribute()
|
||||
{
|
||||
$this->config->set('HTML.AllowedElements', array('p', 'br'));
|
||||
$this->config->set('HTML.AllowedAttributes', array('p@style', 'p@<foo>'));
|
||||
$this->expectError(new PatternExpectation("/Attribute '<foo>' in element 'p' not supported/"));
|
||||
$this->assertPurification_AllowedAttributes_local_p_style();
|
||||
}
|
||||
|
||||
function test_AllowedAttributes_global_invalidAttribute() {
|
||||
public function test_AllowedAttributes_global_invalidAttribute()
|
||||
{
|
||||
$this->config->set('HTML.AllowedElements', array('p', 'br'));
|
||||
$this->config->set('HTML.AllowedAttributes', array('style', '<foo>'));
|
||||
$this->expectError(new PatternExpectation("/Global attribute '<foo>' is not supported in any elements/"));
|
||||
$this->assertPurification_AllowedAttributes_global_style();
|
||||
}
|
||||
|
||||
function test_AllowedAttributes_local_invalidAttributeDueToMissingElement() {
|
||||
public function test_AllowedAttributes_local_invalidAttributeDueToMissingElement()
|
||||
{
|
||||
$this->config->set('HTML.AllowedElements', array('p', 'br'));
|
||||
$this->config->set('HTML.AllowedAttributes', 'p.style,foo.style');
|
||||
$this->expectError(new PatternExpectation("/Cannot allow attribute 'style' if element 'foo' is not allowed\/supported/"));
|
||||
$this->assertPurification_AllowedAttributes_local_p_style();
|
||||
}
|
||||
|
||||
function test_AllowedAttributes_duplicate() {
|
||||
public function test_AllowedAttributes_duplicate()
|
||||
{
|
||||
$this->config->set('HTML.AllowedElements', array('p', 'br'));
|
||||
$this->config->set('HTML.AllowedAttributes', 'p.style,p@style');
|
||||
$this->assertPurification_AllowedAttributes_local_p_style();
|
||||
}
|
||||
|
||||
function test_AllowedAttributes_multipleErrors() {
|
||||
public function test_AllowedAttributes_multipleErrors()
|
||||
{
|
||||
$this->config->set('HTML.AllowedElements', array('p', 'br'));
|
||||
$this->config->set('HTML.AllowedAttributes', 'p.style,foo.style,<foo>');
|
||||
$this->expectError(new PatternExpectation("/Cannot allow attribute 'style' if element 'foo' is not allowed\/supported/"));
|
||||
@@ -202,58 +222,67 @@ a[href|title]
|
||||
$this->assertPurification_AllowedAttributes_local_p_style();
|
||||
}
|
||||
|
||||
function test_ForbiddenElements() {
|
||||
public function test_ForbiddenElements()
|
||||
{
|
||||
$this->config->set('HTML.ForbiddenElements', 'b');
|
||||
$this->assertPurification('<b>b</b><i>i</i>', 'b<i>i</i>');
|
||||
}
|
||||
|
||||
function test_ForbiddenElements_invalidElement() {
|
||||
public function test_ForbiddenElements_invalidElement()
|
||||
{
|
||||
$this->config->set('HTML.ForbiddenElements', 'obviously_incorrect');
|
||||
// no error!
|
||||
$this->assertPurification('<i>i</i>');
|
||||
}
|
||||
|
||||
function assertPurification_ForbiddenAttributes_b_style() {
|
||||
public function assertPurification_ForbiddenAttributes_b_style()
|
||||
{
|
||||
$this->assertPurification(
|
||||
'<b style="float:left;">b</b><i style="float:left;">i</i>',
|
||||
'<b>b</b><i style="float:left;">i</i>');
|
||||
}
|
||||
|
||||
function test_ForbiddenAttributes() {
|
||||
public function test_ForbiddenAttributes()
|
||||
{
|
||||
$this->config->set('HTML.ForbiddenAttributes', 'b@style');
|
||||
$this->assertPurification_ForbiddenAttributes_b_style();
|
||||
}
|
||||
|
||||
function test_ForbiddenAttributes_incorrectSyntax() {
|
||||
public function test_ForbiddenAttributes_incorrectSyntax()
|
||||
{
|
||||
$this->config->set('HTML.ForbiddenAttributes', 'b.style');
|
||||
$this->expectError("Error with b.style: tag.attr syntax not supported for HTML.ForbiddenAttributes; use tag@attr instead");
|
||||
$this->assertPurification('<b style="float:left;">Test</b>');
|
||||
}
|
||||
|
||||
function test_ForbiddenAttributes_incorrectGlobalSyntax() {
|
||||
public function test_ForbiddenAttributes_incorrectGlobalSyntax()
|
||||
{
|
||||
$this->config->set('HTML.ForbiddenAttributes', '*.style');
|
||||
$this->expectError("Error with *.style: *.attr syntax not supported for HTML.ForbiddenAttributes; use attr instead");
|
||||
$this->assertPurification('<b style="float:left;">Test</b>');
|
||||
}
|
||||
|
||||
function assertPurification_ForbiddenAttributes_style() {
|
||||
public function assertPurification_ForbiddenAttributes_style()
|
||||
{
|
||||
$this->assertPurification(
|
||||
'<b class="foo" style="float:left;">b</b><i style="float:left;">i</i>',
|
||||
'<b class="foo">b</b><i>i</i>');
|
||||
}
|
||||
|
||||
function test_ForbiddenAttributes_global() {
|
||||
public function test_ForbiddenAttributes_global()
|
||||
{
|
||||
$this->config->set('HTML.ForbiddenAttributes', 'style');
|
||||
$this->assertPurification_ForbiddenAttributes_style();
|
||||
}
|
||||
|
||||
function test_ForbiddenAttributes_globalVerboseFormat() {
|
||||
public function test_ForbiddenAttributes_globalVerboseFormat()
|
||||
{
|
||||
$this->config->set('HTML.ForbiddenAttributes', '*@style');
|
||||
$this->assertPurification_ForbiddenAttributes_style();
|
||||
}
|
||||
|
||||
function test_addAttribute() {
|
||||
|
||||
public function test_addAttribute()
|
||||
{
|
||||
$config = HTMLPurifier_Config::createDefault();
|
||||
$def = $config->getHTMLDefinition(true);
|
||||
$def->addAttribute('span', 'custom', 'Enum#attribute');
|
||||
@@ -265,8 +294,8 @@ a[href|title]
|
||||
|
||||
}
|
||||
|
||||
function test_addAttribute_multiple() {
|
||||
|
||||
public function test_addAttribute_multiple()
|
||||
{
|
||||
$config = HTMLPurifier_Config::createDefault();
|
||||
$def = $config->getHTMLDefinition(true);
|
||||
$def->addAttribute('span', 'custom', 'Enum#attribute');
|
||||
@@ -279,8 +308,8 @@ a[href|title]
|
||||
|
||||
}
|
||||
|
||||
function test_addElement() {
|
||||
|
||||
public function test_addElement()
|
||||
{
|
||||
$config = HTMLPurifier_Config::createDefault();
|
||||
$def = $config->getHTMLDefinition(true);
|
||||
$def->addElement('marquee', 'Inline', 'Inline', 'Common', array('width' => 'Length'));
|
||||
@@ -292,7 +321,8 @@ a[href|title]
|
||||
|
||||
}
|
||||
|
||||
function test_injector() {
|
||||
public function test_injector()
|
||||
{
|
||||
generate_mock_once('HTMLPurifier_Injector');
|
||||
$injector = new HTMLPurifier_InjectorMock();
|
||||
$injector->name = 'MyInjector';
|
||||
@@ -308,7 +338,8 @@ a[href|title]
|
||||
);
|
||||
}
|
||||
|
||||
function test_injectorMissingNeeded() {
|
||||
public function test_injectorMissingNeeded()
|
||||
{
|
||||
generate_mock_once('HTMLPurifier_Injector');
|
||||
$injector = new HTMLPurifier_InjectorMock();
|
||||
$injector->name = 'MyInjector';
|
||||
@@ -322,7 +353,8 @@ a[href|title]
|
||||
);
|
||||
}
|
||||
|
||||
function test_injectorIntegration() {
|
||||
public function test_injectorIntegration()
|
||||
{
|
||||
$module = $this->config->getHTMLDefinition(true)->getAnonymousModule();
|
||||
$module->info_injector[] = 'Linkify';
|
||||
|
||||
@@ -332,7 +364,8 @@ a[href|title]
|
||||
);
|
||||
}
|
||||
|
||||
function test_injectorIntegrationFail() {
|
||||
public function test_injectorIntegrationFail()
|
||||
{
|
||||
$this->config->set('HTML.Allowed', 'p');
|
||||
|
||||
$module = $this->config->getHTMLDefinition(true)->getAnonymousModule();
|
||||
@@ -344,7 +377,8 @@ a[href|title]
|
||||
);
|
||||
}
|
||||
|
||||
function test_notAllowedRequiredAttributeError() {
|
||||
public function test_notAllowedRequiredAttributeError()
|
||||
{
|
||||
$this->expectError("Required attribute 'src' in element 'img' was not allowed, which means 'img' will not be allowed either");
|
||||
$this->config->set('HTML.Allowed', 'img[alt]');
|
||||
$this->config->getHTMLDefinition();
|
||||
|
Reference in New Issue
Block a user