mirrors/htmlpurifier
0
0
Fork 0
mirror of https://github.com/ezyang/htmlpurifier.git synced 2025-01-03 05:11:52 +00:00
Code Releases Activity

Fix PHP 5.0 and other early version compatibility by removing use of __toString

Browse Source 
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1629 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang 2008-03-23 02:50:42 +00:00
parent 6d517fab09
commit 7e59923029
5 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/HTMLPurifier/ConfigSchema/Interchange.php
View File

@ -32,7 +32,7 @@ class HTMLPurifier_ConfigSchema_Interchange
* Adds a directive array to $directives
*/
public function addDirective($directive) {
if (isset($this->directives[$i = "{$directive->id}"])) {
if (isset($this->directives[$i = $directive->id->toString()])) {
throw new HTMLPurifier_ConfigSchema_Exception("Cannot redefine directive '$i'");
}
$this->directives[$i] = $directive;

6
library/HTMLPurifier/ConfigSchema/Interchange/Id.php
View File

@ -13,7 +13,11 @@ class HTMLPurifier_ConfigSchema_Interchange_Id
$this->directive = $directive;
}
public function __toString() {
/**
* @warning This is NOT magic, to ensure that people don't abuse SPL and
* cause problems for PHP 5.0 support.
*/
public function toString() {
return $this->namespace . '.' . $this->directive;
}

7
library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php
View File

@ -43,20 +43,21 @@ class HTMLPurifier_ConfigSchema_InterchangeBuilder
// These are required elements:
$directive->id = $this->id($hash->offsetGet('ID'));
$id = $directive->id->toString(); // convenience
if (isset($hash['TYPE'])) {
$type = explode('/', $hash->offsetGet('TYPE'));
if (isset($type[1])) $directive->typeAllowsNull = true;
$directive->type = $type[0];
} else {
throw new HTMLPurifier_ConfigSchema_Exception("TYPE in directive hash '{$directive->id}' not defined");
throw new HTMLPurifier_ConfigSchema_Exception("TYPE in directive hash '$id' not defined");
}
if (isset($hash['DEFAULT'])) {
try {
$directive->default = $this->varParser->parse($hash->offsetGet('DEFAULT'), $directive->type, $directive->typeAllowsNull);
} catch (HTMLPurifier_VarParserException $e) {
throw new HTMLPurifier_ConfigSchema_Exception($e->getMessage() . " in TYPE/DEFAULT in directive hash '{$directive->id}'");
throw new HTMLPurifier_ConfigSchema_Exception($e->getMessage() . " in TYPE/DEFAULT in directive hash '$id'");
}
}
@ -79,7 +80,7 @@ class HTMLPurifier_ConfigSchema_InterchangeBuilder
$this->varParser->parse($real, $directive->type, $directive->typeAllowsNull);
}
} catch (HTMLPurifier_VarParserException $e) {
throw new HTMLPurifier_ConfigSchema_Exception($e->getMessage() . " in $alias => $real in VALUE-ALIASES in directive hash '{$directive->id}'");
throw new HTMLPurifier_ConfigSchema_Exception($e->getMessage() . " in $alias => $real in VALUE-ALIASES in directive hash '$id'");
}
}

9
library/HTMLPurifier/ConfigSchema/Validator.php
View File

@ -40,7 +40,8 @@ class HTMLPurifier_ConfigSchema_Validator
$this->validateNamespace($namespace);
}
foreach ($interchange->directives as $i => $directive) {
if ($i != "{$directive->id}") $this->error(false, "Integrity violation: key '$i' does not match internal id '{$directive->id}'");
$id = $directive->id->toString();
if ($i != $id) $this->error(false, "Integrity violation: key '$i' does not match internal id '$id'");
$this->validateDirective($directive);
}
}
@ -57,7 +58,8 @@ class HTMLPurifier_ConfigSchema_Validator
}
public function validateId($id) {
$this->context[] = "id '$id'";
$id_string = $id->toString();
$this->context[] = "id '$id_string'";
if (!$id instanceof HTMLPurifier_ConfigSchema_Interchange_Id) {
// handled by InterchangeBuilder
$this->error(false, 'is not an instance of HTMLPurifier_ConfigSchema_Interchange_Id');
@ -72,7 +74,8 @@ class HTMLPurifier_ConfigSchema_Validator
}
public function validateDirective($d) {
$this->context[] = "directive '{$d->id}'";
$id = $d->id->toString();
$this->context[] = "directive '$id'";
$this->validateId($d->id);
$this->with($d, 'description')
->assertNotEmpty();

14
tests/HTMLPurifier/ConfigSchema/ValidatorTest.php
View File

@ -40,20 +40,6 @@ class HTMLPurifier_ConfigSchema_ValidatorTest extends UnitTestCase
$this->validator->validate($this->interchange);
}
public function testDirectiveIdInstanceof() {
// This example is somewhat contrived
$this->makeNamespace('Ns');
$d = new HTMLPurifier_ConfigSchema_Interchange_Directive();
$d->id = 3;
$d->default = 0;
$d->type = 'int';
$d->description = 'Description';
$this->interchange->addDirective($d);
$this->expectValidationException("Id '3' in directive '3' is not an instance of HTMLPurifier_ConfigSchema_Interchange_Id");
$this->validator->validate($this->interchange);
}
public function testDirectiveTypeNotEmpty() {
$this->makeNamespace('Ns');
$d = $this->makeDirective('Ns', 'Dir');