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

- Rename Duplicate to Unique, as the name of validator indicates what we want the input to be

Browse Source 
- Enable flush to work when includes are renamed

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1597 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang 2008-03-04 04:20:55 +00:00
parent 4c798bd17e
commit 14437cbf47
7 changed files with 15 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/HTMLPurifier.includes.php
View File

@ -133,6 +133,7 @@ require 'HTMLPurifier/ConfigSchema/StringHashReverseAdapter.php';
require 'HTMLPurifier/ConfigSchema/Validator.php';
require 'HTMLPurifier/ConfigSchema/Validator/Alnum.php';
require 'HTMLPurifier/ConfigSchema/Validator/Exists.php';
require 'HTMLPurifier/ConfigSchema/Validator/Unique.php';
require 'HTMLPurifier/DefinitionCache/Decorator.php';
require 'HTMLPurifier/DefinitionCache/Null.php';
require 'HTMLPurifier/DefinitionCache/Serializer.php';

16
library/HTMLPurifier/ConfigSchema.php
View File

@ -158,22 +158,6 @@ class HTMLPurifier_ConfigSchema {
* @param $description Description of the namespace
*/
public function addNamespace($namespace, $description) {
if (HTMLPURIFIER_SCHEMA_STRICT) {
if (isset($this->info[$namespace])) {
trigger_error('Cannot redefine namespace', E_USER_ERROR);
return;
}
if (!ctype_alnum($namespace)) {
trigger_error('Namespace name must be alphanumeric',
E_USER_ERROR);
return;
}
if (empty($description)) {
trigger_error('Description must be non-empty',
E_USER_ERROR);
return;
}
}
$this->info[$namespace] = array();
$this->info_namespace[$namespace] = new HTMLPurifier_ConfigDef_Namespace();
$this->info_namespace[$namespace]->description = $description;

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

@ -60,7 +60,7 @@ class HTMLPurifier_ConfigSchema_Interchange
// Common validators
$validator->addValidator(new HTMLPurifier_ConfigSchema_Validator_Exists('ID'));
$validator->addValidator(new HTMLPurifier_ConfigSchema_Validator_Duplicate());
$validator->addValidator(new HTMLPurifier_ConfigSchema_Validator_Unique());
$validator->addValidator(new HTMLPurifier_ConfigSchema_Validator_Exists('DESCRIPTION'));
// Namespace validators

2
library/HTMLPurifier/ConfigSchema/Validator/Duplicate.php → library/HTMLPurifier/ConfigSchema/Validator/Unique.php
View File

@ -6,7 +6,7 @@
* Although this tests both possible values, in practice the ID
* will only be in one or the other. We do this to keep things simple.
*/
class HTMLPurifier_ConfigSchema_Validator_Duplicate extends HTMLPurifier_ConfigSchema_Validator
class HTMLPurifier_ConfigSchema_Validator_Unique extends HTMLPurifier_ConfigSchema_Validator
{
public function validate(&$arr, $interchange) {

4
tests/HTMLPurifier/ConfigSchema/Validator/DuplicateTest.php → tests/HTMLPurifier/ConfigSchema/Validator/UniqueTest.php
View File

@ -1,11 +1,11 @@
<?php
class HTMLPurifier_ConfigSchema_Validator_DuplicateTest extends HTMLPurifier_ConfigSchema_ValidatorHarness
class HTMLPurifier_ConfigSchema_Validator_UniqueTest extends HTMLPurifier_ConfigSchema_ValidatorHarness
{
public function setup() {
parent::setup();
$this->validator = new HTMLPurifier_ConfigSchema_Validator_Duplicate();
$this->validator = new HTMLPurifier_ConfigSchema_Validator_Unique();
}
public function testValidateNamespace() {

9
tests/HTMLPurifier/ConfigSchemaTest.php
View File

@ -19,15 +19,6 @@ class HTMLPurifier_ConfigSchemaTest extends HTMLPurifier_Harness
$this->assertIdentical($this->schema->info_namespace, array(
'http' => new HTMLPurifier_ConfigDef_Namespace($d)
));
$this->expectError('Cannot redefine namespace');
$this->schema->addNamespace('http', 'It is used to serve webpages.');
$this->expectError('Namespace name must be alphanumeric');
$this->schema->addNamespace('ssh+http', 'This http is tunneled through SSH.');
$this->expectError('Description must be non-empty');
$this->schema->addNamespace('ftp', null);
}
function test_define() {

20
tests/index.php
View File

@ -57,6 +57,16 @@ if ($AC['disable-phpt'] && $AC['only-phpt']) {
exit(1);
}
// Shell-script code is executed
if ($AC['flush']) {
if (SimpleReporter::inCli() && !$AC['xml']) {
passthru($AC['php'] . ' ../maintenance/flush.php');
} else {
shell_exec($AC['php'] . ' ../maintenance/flush.php');
}
}
// initialize and load HTML Purifier
// use ?standalone to load the alterative standalone stub
if ($AC['standalone']) {
@ -68,16 +78,6 @@ if ($AC['standalone']) {
}
require 'HTMLPurifier/Harness.php';
// Shell-script code is executed
if ($AC['flush']) {
if (SimpleReporter::inCli() && !$AC['xml']) {
passthru($AC['php'] . ' ../maintenance/flush.php');
} else {
shell_exec($AC['php'] . ' ../maintenance/flush.php');
}
}
// Now, userland code begins to be executed
// setup special DefinitionCacheFactory decorator