mirror/php-htmlpurifier
1
0
Fork 0
mirror of https://github.com/ezyang/htmlpurifier.git synced 2025-08-03 12:47:56 +02:00
Code Issues Releases Wiki Activity

Rename Definition to HTMLDefinition.

Browse Source 
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@255 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2006-08-14 21:22:49 +00:00
parent 4ef26bbd31
commit e770d994a7
7 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/HTMLPurifier.php
View File

@@ -21,7 +21,7 @@
require_once 'HTMLPurifier/ConfigDef.php'; require_once 'HTMLPurifier/ConfigDef.php';
require_once 'HTMLPurifier/Config.php'; require_once 'HTMLPurifier/Config.php';
require_once 'HTMLPurifier/Lexer.php'; require_once 'HTMLPurifier/Lexer.php';
require_once 'HTMLPurifier/Definition.php'; require_once 'HTMLPurifier/HTMLDefinition.php';
require_once 'HTMLPurifier/Generator.php'; require_once 'HTMLPurifier/Generator.php';
require_once 'HTMLPurifier/Strategy/Core.php'; require_once 'HTMLPurifier/Strategy/Core.php';

6
library/HTMLPurifier/Definition.php → library/HTMLPurifier/HTMLDefinition.php
View File

@@ -41,7 +41,7 @@ require_once 'HTMLPurifier/TagTransform.php';
* automatic recompilation, suggesting that we would have a DefinitionGenerator. * automatic recompilation, suggesting that we would have a DefinitionGenerator.
*/ */
class HTMLPurifier_Definition class HTMLPurifier_HTMLDefinition
{ {
var $info = array(); var $info = array();
@@ -68,13 +68,13 @@ class HTMLPurifier_Definition
if ($prototype) { if ($prototype) {
$instance = $prototype; $instance = $prototype;
} elseif (!$instance) { } elseif (!$instance) {
$instance = new HTMLPurifier_Definition(); $instance = new HTMLPurifier_HTMLDefinition();
$instance->setup(); $instance->setup();
} }
return $instance; return $instance;
} }
function HTMLPurifier_Definition() {} function HTMLPurifier_HTMLDefinition() {}
function setup() { function setup() {

4
library/HTMLPurifier/Strategy/FixNesting.php
View File

@@ -1,7 +1,7 @@
<?php <?php
require_once 'HTMLPurifier/Strategy.php'; require_once 'HTMLPurifier/Strategy.php';
require_once 'HTMLPurifier/Definition.php'; require_once 'HTMLPurifier/HTMLDefinition.php';
/** /**
* Takes a well formed list of tokens and fixes their nesting. * Takes a well formed list of tokens and fixes their nesting.
@@ -37,7 +37,7 @@ class HTMLPurifier_Strategy_FixNesting extends HTMLPurifier_Strategy
var $definition; var $definition;
function HTMLPurifier_Strategy_FixNesting() { function HTMLPurifier_Strategy_FixNesting() {
$this->definition = HTMLPurifier_Definition::instance(); $this->definition = HTMLPurifier_HTMLDefinition::instance();
} }
function execute($tokens, $config) { function execute($tokens, $config) {

4
library/HTMLPurifier/Strategy/MakeWellFormed.php
View File

@@ -1,7 +1,7 @@
<?php <?php
require_once 'HTMLPurifier/Strategy.php'; require_once 'HTMLPurifier/Strategy.php';
require_once 'HTMLPurifier/Definition.php'; require_once 'HTMLPurifier/HTMLDefinition.php';
require_once 'HTMLPurifier/Generator.php'; require_once 'HTMLPurifier/Generator.php';
class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
@@ -12,7 +12,7 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
function HTMLPurifier_Strategy_MakeWellFormed() { function HTMLPurifier_Strategy_MakeWellFormed() {
$this->generator = new HTMLPurifier_Generator(); $this->generator = new HTMLPurifier_Generator();
$this->definition = HTMLPurifier_Definition::instance(); $this->definition = HTMLPurifier_HTMLDefinition::instance();
} }
function execute($tokens, $config) { function execute($tokens, $config) {

4
library/HTMLPurifier/Strategy/RemoveForeignElements.php
View File

@@ -1,7 +1,7 @@
<?php <?php
require_once 'HTMLPurifier/Strategy.php'; require_once 'HTMLPurifier/Strategy.php';
require_once 'HTMLPurifier/Definition.php'; require_once 'HTMLPurifier/HTMLDefinition.php';
require_once 'HTMLPurifier/Generator.php'; require_once 'HTMLPurifier/Generator.php';
require_once 'HTMLPurifier/TagTransform.php'; require_once 'HTMLPurifier/TagTransform.php';
@@ -21,7 +21,7 @@ class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
function HTMLPurifier_Strategy_RemoveForeignElements() { function HTMLPurifier_Strategy_RemoveForeignElements() {
$this->generator = new HTMLPurifier_Generator(); $this->generator = new HTMLPurifier_Generator();
$this->definition = HTMLPurifier_Definition::instance(); $this->definition = HTMLPurifier_HTMLDefinition::instance();
} }
function execute($tokens, $config) { function execute($tokens, $config) {

4
library/HTMLPurifier/Strategy/ValidateAttributes.php
View File

@@ -1,7 +1,7 @@
<?php <?php
require_once 'HTMLPurifier/Strategy.php'; require_once 'HTMLPurifier/Strategy.php';
require_once 'HTMLPurifier/Definition.php'; require_once 'HTMLPurifier/HTMLDefinition.php';
require_once 'HTMLPurifier/IDAccumulator.php'; require_once 'HTMLPurifier/IDAccumulator.php';
require_once 'HTMLPurifier/ConfigDef.php'; require_once 'HTMLPurifier/ConfigDef.php';
require_once 'HTMLPurifier/AttrContext.php'; require_once 'HTMLPurifier/AttrContext.php';
@@ -20,7 +20,7 @@ class HTMLPurifier_Strategy_ValidateAttributes extends HTMLPurifier_Strategy
var $definition; var $definition;
function HTMLPurifier_Strategy_ValidateAttributes() { function HTMLPurifier_Strategy_ValidateAttributes() {
$this->definition = HTMLPurifier_Definition::instance(); $this->definition = HTMLPurifier_HTMLDefinition::instance();
} }
function execute($tokens, $config) { function execute($tokens, $config) {

1
tests/HTMLPurifier/StrategyHarness.php
View File

@@ -1,6 +1,5 @@
<?php <?php
require_once 'HTMLPurifier/Definition.php';
require_once 'HTMLPurifier/Lexer/DirectLex.php'; require_once 'HTMLPurifier/Lexer/DirectLex.php';
class HTMLPurifier_StrategyHarness extends UnitTestCase class HTMLPurifier_StrategyHarness extends UnitTestCase