1
0
mirror of https://github.com/ezyang/htmlpurifier.git synced 2025-08-06 06:07:26 +02:00

Convert to PHP 5 only codebase, adding visibility modifiers to all members and methods in the main library area (function only for test methods)

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1458 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2007-11-25 02:24:39 +00:00
parent 85a23bacb6
commit 43f01925cd
195 changed files with 1003 additions and 1064 deletions

View File

@@ -6,19 +6,17 @@ require_once 'HTMLPurifier/Config.php';
/**
* Composite strategy that runs multiple strategies on tokens.
*/
class HTMLPurifier_Strategy_Composite extends HTMLPurifier_Strategy
abstract class HTMLPurifier_Strategy_Composite extends HTMLPurifier_Strategy
{
/**
* List of strategies to run tokens through.
*/
var $strategies = array();
protected $strategies = array();
function HTMLPurifier_Strategy_Composite() {
trigger_error('Attempt to instantiate abstract object', E_USER_ERROR);
}
abstract public function __construct();
function execute($tokens, $config, &$context) {
public function execute($tokens, $config, &$context) {
foreach ($this->strategies as $strategy) {
$tokens = $strategy->execute($tokens, $config, $context);
}

View File

@@ -13,7 +13,7 @@ require_once 'HTMLPurifier/Strategy/ValidateAttributes.php';
class HTMLPurifier_Strategy_Core extends HTMLPurifier_Strategy_Composite
{
function HTMLPurifier_Strategy_Core() {
public function __construct() {
$this->strategies[] = new HTMLPurifier_Strategy_RemoveForeignElements();
$this->strategies[] = new HTMLPurifier_Strategy_MakeWellFormed();
$this->strategies[] = new HTMLPurifier_Strategy_FixNesting();

View File

@@ -34,7 +34,7 @@ require_once 'HTMLPurifier/HTMLDefinition.php';
class HTMLPurifier_Strategy_FixNesting extends HTMLPurifier_Strategy
{
function execute($tokens, $config, &$context) {
public function execute($tokens, $config, &$context) {
//####################################################################//
// Pre-processing

View File

@@ -27,12 +27,11 @@ class HTMLPurifier_Strategy_MakeWellFormed extends HTMLPurifier_Strategy
/**
* Locally shared variable references
* @private
*/
var $inputTokens, $inputIndex, $outputTokens, $currentNesting,
protected $inputTokens, $inputIndex, $outputTokens, $currentNesting,
$currentInjector, $injectors;
function execute($tokens, $config, &$context) {
public function execute($tokens, $config, &$context) {
$definition = $config->getHTMLDefinition();

View File

@@ -55,7 +55,7 @@ HTMLPurifier_ConfigSchema::define(
class HTMLPurifier_Strategy_RemoveForeignElements extends HTMLPurifier_Strategy
{
function execute($tokens, $config, &$context) {
public function execute($tokens, $config, &$context) {
$definition = $config->getHTMLDefinition();
$generator = new HTMLPurifier_Generator();
$result = array();

View File

@@ -13,7 +13,7 @@ require_once 'HTMLPurifier/AttrValidator.php';
class HTMLPurifier_Strategy_ValidateAttributes extends HTMLPurifier_Strategy
{
function execute($tokens, $config, &$context) {
public function execute($tokens, $config, &$context) {
// setup validator
$validator = new HTMLPurifier_AttrValidator();