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

[3.1.0] Make static ConfigSchema methods throw errors.

Browse Source 
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1571 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang 2008-02-20 00:37:08 +00:00
parent 6c9c8f2380
commit f2863557f5
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/HTMLPurifier/ConfigSchema.php
View File

@ -80,8 +80,16 @@ class HTMLPurifier_ConfigSchema {
return HTMLPurifier_ConfigSchema::$singleton; return HTMLPurifier_ConfigSchema::$singleton;
} }
/**
* Throws an E_USER_NOTICE stating that a method is deprecated.
*/
private static function deprecated($method) {
trigger_error("Static HTMLPurifier_ConfigSchema::$method deprecated, use add*() method instead", E_USER_NOTICE);
}
/** @see HTMLPurifier_ConfigSchema->set() */ /** @see HTMLPurifier_ConfigSchema->set() */
public static function define($namespace, $name, $default, $type, $description) { public static function define($namespace, $name, $default, $type, $description) {
HTMLPurifier_ConfigSchema::deprecated(__METHOD__);
$def =& HTMLPurifier_ConfigSchema::instance(); $def =& HTMLPurifier_ConfigSchema::instance();
$def->add($namespace, $name, $default, $type, $description); $def->add($namespace, $name, $default, $type, $description);
} }
@ -155,6 +163,7 @@ class HTMLPurifier_ConfigSchema {
/** @see HTMLPurifier_ConfigSchema->addNamespace() */ /** @see HTMLPurifier_ConfigSchema->addNamespace() */
public static function defineNamespace($namespace, $description) { public static function defineNamespace($namespace, $description) {
HTMLPurifier_ConfigSchema::deprecated(__METHOD__);
$def =& HTMLPurifier_ConfigSchema::instance(); $def =& HTMLPurifier_ConfigSchema::instance();
$def->addNamespace($namespace, $description); $def->addNamespace($namespace, $description);
} }
@ -189,6 +198,7 @@ class HTMLPurifier_ConfigSchema {
/** @see HTMLPurifier_ConfigSchema->addValueAliases() */ /** @see HTMLPurifier_ConfigSchema->addValueAliases() */
public static function defineValueAliases($namespace, $name, $aliases) { public static function defineValueAliases($namespace, $name, $aliases) {
HTMLPurifier_ConfigSchema::deprecated(__METHOD__);
$def =& HTMLPurifier_ConfigSchema::instance(); $def =& HTMLPurifier_ConfigSchema::instance();
$def->addValueAliases($namespace, $name, $aliases); $def->addValueAliases($namespace, $name, $aliases);
} }
@ -230,6 +240,7 @@ class HTMLPurifier_ConfigSchema {
/** @see HTMLPurifier_ConfigSchema->addAllowedValues() */ /** @see HTMLPurifier_ConfigSchema->addAllowedValues() */
public static function defineAllowedValues($namespace, $name, $allowed_values) { public static function defineAllowedValues($namespace, $name, $allowed_values) {
HTMLPurifier_ConfigSchema::deprecated(__METHOD__);
$def =& HTMLPurifier_ConfigSchema::instance(); $def =& HTMLPurifier_ConfigSchema::instance();
$def->addAllowedValues($namespace, $name, $allowed_values); $def->addAllowedValues($namespace, $name, $allowed_values);
} }
@ -273,6 +284,7 @@ class HTMLPurifier_ConfigSchema {
/** @see HTMLPurifier_ConfigSchema->addAlias() */ /** @see HTMLPurifier_ConfigSchema->addAlias() */
public static function defineAlias($namespace, $name, $new_namespace, $new_name) { public static function defineAlias($namespace, $name, $new_namespace, $new_name) {
HTMLPurifier_ConfigSchema::deprecated(__METHOD__);
$def =& HTMLPurifier_ConfigSchema::instance(); $def =& HTMLPurifier_ConfigSchema::instance();
$def->addAlias($namespace, $name, $new_namespace, $new_name); $def->addAlias($namespace, $name, $new_namespace, $new_name);
} }

9
tests/HTMLPurifier/DefinitionCacheTest.php
View File

@ -7,13 +7,6 @@ class HTMLPurifier_DefinitionCacheTest extends HTMLPurifier_Harness
// using null subclass because parent is abstract // using null subclass because parent is abstract
$cache = new HTMLPurifier_DefinitionCache_Null('Test'); $cache = new HTMLPurifier_DefinitionCache_Null('Test');
$old_copy = HTMLPurifier_ConfigSchema::instance();
$o = new HTMLPurifier_ConfigSchema();
HTMLPurifier_ConfigSchema::instance($o);
HTMLPurifier_ConfigSchema::defineNamespace('Test', 'Test namespace');
HTMLPurifier_ConfigSchema::define('Test', 'DefinitionRev', 1, 'int', 'Definition revision.');
generate_mock_once('HTMLPurifier_Config'); generate_mock_once('HTMLPurifier_Config');
$config = new HTMLPurifier_ConfigMock(); $config = new HTMLPurifier_ConfigMock();
$config->version = '1.0.0'; // hopefully no conflicts $config->version = '1.0.0'; // hopefully no conflicts
@ -31,8 +24,6 @@ class HTMLPurifier_DefinitionCacheTest extends HTMLPurifier_Harness
$this->assertIdentical($cache->isOld('1.0.0-hash2-1', $config), false); // if hash is different, don't touch! $this->assertIdentical($cache->isOld('1.0.0-hash2-1', $config), false); // if hash is different, don't touch!
$this->assertIdentical($cache->isOld('1.0.0beta-hash2-11', $config), true); $this->assertIdentical($cache->isOld('1.0.0beta-hash2-11', $config), true);
HTMLPurifier_ConfigSchema::instance($old_copy);
} }
} }