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
2025-08-05 21:57:26 +02:00 · 2007-11-25 02:24:39 +00:00
parent 85a23bacb6
commit 43f01925cd
195 changed files with 1003 additions and 1064 deletions
--- a/library/HTMLPurifier/AttrDef/CSS/Background.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Background.php
@@ -14,9 +14,9 @@ class HTMLPurifier_AttrDef_CSS_Background extends HTMLPurifier_AttrDef
     * Local copy of component validators.
     * @note See HTMLPurifier_AttrDef_Font::$info for a similar impl.
     */
-    var $info;
+    protected $info;
    
-    function HTMLPurifier_AttrDef_CSS_Background($config) {
+    public function HTMLPurifier_AttrDef_CSS_Background($config) {
        $def = $config->getCSSDefinition();
        $this->info['background-color'] = $def->info['background-color'];
        $this->info['background-image'] = $def->info['background-image'];
@@ -25,7 +25,7 @@ class HTMLPurifier_AttrDef_CSS_Background extends HTMLPurifier_AttrDef
        $this->info['background-position'] = $def->info['background-position'];
    }
    
-    function validate($string, $config, &$context) {
+    public function validate($string, $config, &$context) {
        
        // regular pre-processing
        $string = $this->parseCDATA($string);
--- a/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
+++ b/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
@@ -48,15 +48,15 @@ require_once 'HTMLPurifier/AttrDef/CSS/Percentage.php';
 class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef
 {
    
-    var $length;
-    var $percentage;
+    protected $length;
+    protected $percentage;
    
-    function HTMLPurifier_AttrDef_CSS_BackgroundPosition() {
+    public function HTMLPurifier_AttrDef_CSS_BackgroundPosition() {
        $this->length     = new HTMLPurifier_AttrDef_CSS_Length();
        $this->percentage = new HTMLPurifier_AttrDef_CSS_Percentage();
    }
    
-    function validate($string, $config, &$context) {
+    public function validate($string, $config, &$context) {
        $string = $this->parseCDATA($string);
        $bits = explode(' ', $string);
        
--- a/library/HTMLPurifier/AttrDef/CSS/Border.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Border.php
@@ -11,16 +11,16 @@ class HTMLPurifier_AttrDef_CSS_Border extends HTMLPurifier_AttrDef
    /**
     * Local copy of properties this property is shorthand for.
     */
-    var $info = array();
+    protected $info = array();
    
-    function HTMLPurifier_AttrDef_CSS_Border($config) {
+    public function HTMLPurifier_AttrDef_CSS_Border($config) {
        $def = $config->getCSSDefinition();
        $this->info['border-width'] = $def->info['border-width'];
        $this->info['border-style'] = $def->info['border-style'];
        $this->info['border-top-color'] = $def->info['border-top-color'];
    }
    
-    function validate($string, $config, &$context) {
+    public function validate($string, $config, &$context) {
        $string = $this->parseCDATA($string);
        // we specifically will not support rgb() syntax with spaces
        $bits = explode(' ', $string);
--- a/library/HTMLPurifier/AttrDef/CSS/Color.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Color.php
@@ -33,7 +33,7 @@ This directive has been available since 2.0.0.
 class HTMLPurifier_AttrDef_CSS_Color extends HTMLPurifier_AttrDef
 {
    
-    function validate($color, $config, &$context) {
+    public function validate($color, $config, &$context) {
        
        static $colors = null;
        if ($colors === null) $colors = $config->get('Core', 'ColorKeywords');
--- a/library/HTMLPurifier/AttrDef/CSS/Composite.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Composite.php
@@ -14,18 +14,18 @@ class HTMLPurifier_AttrDef_CSS_Composite extends HTMLPurifier_AttrDef
    
    /**
     * List of HTMLPurifier_AttrDef objects that may process strings
-     * @protected
+     * @todo Make protected
     */
-    var $defs;
+    public $defs;
    
    /**
     * @param $defs List of HTMLPurifier_AttrDef objects
     */
-    function HTMLPurifier_AttrDef_CSS_Composite($defs) {
+    public function HTMLPurifier_AttrDef_CSS_Composite($defs) {
        $this->defs = $defs;
    }
    
-    function validate($string, $config, &$context) {
+    public function validate($string, $config, &$context) {
        foreach ($this->defs as $i => $def) {
            $result = $this->defs[$i]->validate($string, $config, $context);
            if ($result !== false) return $result;
--- a/library/HTMLPurifier/AttrDef/CSS/Font.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Font.php
@@ -16,9 +16,9 @@ class HTMLPurifier_AttrDef_CSS_Font extends HTMLPurifier_AttrDef
     *       CSSDefinition, this wouldn't be necessary.  We'd instantiate
     *       our own copies.
     */
-    var $info = array();
+    protected $info = array();
    
-    function HTMLPurifier_AttrDef_CSS_Font($config) {
+    public function HTMLPurifier_AttrDef_CSS_Font($config) {
        $def = $config->getCSSDefinition();
        $this->info['font-style']   = $def->info['font-style'];
        $this->info['font-variant'] = $def->info['font-variant'];
@@ -28,7 +28,7 @@ class HTMLPurifier_AttrDef_CSS_Font extends HTMLPurifier_AttrDef
        $this->info['font-family']  = $def->info['font-family'];
    }
    
-    function validate($string, $config, &$context) {
+    public function validate($string, $config, &$context) {
        
        static $system_fonts = array(
            'caption' => true,
--- a/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
+++ b/library/HTMLPurifier/AttrDef/CSS/FontFamily.php
@@ -10,7 +10,7 @@ require_once 'HTMLPurifier/AttrDef.php';
 class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef
 {
    
-    function validate($string, $config, &$context) {
+    public function validate($string, $config, &$context) {
        static $generic_names = array(
            'serif' => true,
            'sans-serif' => true,
--- a/library/HTMLPurifier/AttrDef/CSS/Length.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Length.php
@@ -14,22 +14,22 @@ class HTMLPurifier_AttrDef_CSS_Length extends HTMLPurifier_AttrDef
     * @warning The code assumes all units are two characters long.  Be careful
     *          if we have to change this behavior!
     */
-    var $units = array('em' => true, 'ex' => true, 'px' => true, 'in' => true,
+    protected $units = array('em' => true, 'ex' => true, 'px' => true, 'in' => true,
         'cm' => true, 'mm' => true, 'pt' => true, 'pc' => true);
    /**
     * Instance of HTMLPurifier_AttrDef_Number to defer number validation to
     */
-    var $number_def;
+    protected $number_def;
    
    /**
     * @param $non_negative Bool indication whether or not negative values are
     *                      allowed.
     */
-    function HTMLPurifier_AttrDef_CSS_Length($non_negative = false) {
+    public function HTMLPurifier_AttrDef_CSS_Length($non_negative = false) {
        $this->number_def = new HTMLPurifier_AttrDef_CSS_Number($non_negative);
    }
    
-    function validate($length, $config, &$context) {
+    public function validate($length, $config, &$context) {
        
        $length = $this->parseCDATA($length);
        if ($length === '') return false;
--- a/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
+++ b/library/HTMLPurifier/AttrDef/CSS/ListStyle.php
@@ -13,16 +13,16 @@ class HTMLPurifier_AttrDef_CSS_ListStyle extends HTMLPurifier_AttrDef
     * Local copy of component validators.
     * @note See HTMLPurifier_AttrDef_CSS_Font::$info for a similar impl.
     */
-    var $info;
+    protected $info;
    
-    function HTMLPurifier_AttrDef_CSS_ListStyle($config) {
+    public function HTMLPurifier_AttrDef_CSS_ListStyle($config) {
        $def = $config->getCSSDefinition();
        $this->info['list-style-type']     = $def->info['list-style-type'];
        $this->info['list-style-position'] = $def->info['list-style-position'];
        $this->info['list-style-image'] = $def->info['list-style-image'];
    }
    
-    function validate($string, $config, &$context) {
+    public function validate($string, $config, &$context) {
        
        // regular pre-processing
        $string = $this->parseCDATA($string);
--- a/library/HTMLPurifier/AttrDef/CSS/Multiple.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Multiple.php
@@ -18,24 +18,26 @@ class HTMLPurifier_AttrDef_CSS_Multiple extends HTMLPurifier_AttrDef
    
    /**
     * Instance of component definition to defer validation to.
+     * @todo Make protected
     */
-    var $single;
+    public $single;
    
    /**
     * Max number of values allowed.
+     * @todo Make protected
     */
-    var $max;
+    public $max;
    
    /**
     * @param $single HTMLPurifier_AttrDef to multiply
     * @param $max Max number of values allowed (usually four)
     */
-    function HTMLPurifier_AttrDef_CSS_Multiple($single, $max = 4) {
+    public function HTMLPurifier_AttrDef_CSS_Multiple($single, $max = 4) {
        $this->single = $single;
        $this->max = $max;
    }
    
-    function validate($string, $config, &$context) {
+    public function validate($string, $config, &$context) {
        $string = $this->parseCDATA($string);
        if ($string === '') return false;
        $parts = explode(' ', $string); // parseCDATA replaced \r, \t and \n
--- a/library/HTMLPurifier/AttrDef/CSS/Number.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Number.php
@@ -9,16 +9,16 @@ class HTMLPurifier_AttrDef_CSS_Number extends HTMLPurifier_AttrDef
    /**
     * Bool indicating whether or not only positive values allowed.
     */
-    var $non_negative = false;
+    protected $non_negative = false;
    
    /**
     * @param $non_negative Bool indicating whether negatives are forbidden
     */
-    function HTMLPurifier_AttrDef_CSS_Number($non_negative = false) {
+    public function HTMLPurifier_AttrDef_CSS_Number($non_negative = false) {
        $this->non_negative = $non_negative;
    }
    
-    function validate($number, $config, &$context) {
+    public function validate($number, $config, &$context) {
        
        $number = $this->parseCDATA($number);
        
--- a/library/HTMLPurifier/AttrDef/CSS/Percentage.php
+++ b/library/HTMLPurifier/AttrDef/CSS/Percentage.php
@@ -12,16 +12,16 @@ class HTMLPurifier_AttrDef_CSS_Percentage extends HTMLPurifier_AttrDef
    /**
     * Instance of HTMLPurifier_AttrDef_CSS_Number to defer number validation
     */
-    var $number_def;
+    protected $number_def;
    
    /**
     * @param Bool indicating whether to forbid negative values
     */
-    function HTMLPurifier_AttrDef_CSS_Percentage($non_negative = false) {
+    public function HTMLPurifier_AttrDef_CSS_Percentage($non_negative = false) {
        $this->number_def = new HTMLPurifier_AttrDef_CSS_Number($non_negative);
    }
    
-    function validate($string, $config, &$context) {
+    public function validate($string, $config, &$context) {
        
        $string = $this->parseCDATA($string);
        
--- a/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
+++ b/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
@@ -10,7 +10,7 @@ require_once 'HTMLPurifier/AttrDef.php';
 class HTMLPurifier_AttrDef_CSS_TextDecoration extends HTMLPurifier_AttrDef
 {
    
-    function validate($string, $config, &$context) {
+    public function validate($string, $config, &$context) {
        
        static $allowed_values = array(
            'line-through' => true,
--- a/library/HTMLPurifier/AttrDef/CSS/URI.php
+++ b/library/HTMLPurifier/AttrDef/CSS/URI.php
@@ -14,11 +14,11 @@ require_once 'HTMLPurifier/AttrDef/URI.php';
 class HTMLPurifier_AttrDef_CSS_URI extends HTMLPurifier_AttrDef_URI
 {
    
-    function HTMLPurifier_AttrDef_CSS_URI() {
+    public function HTMLPurifier_AttrDef_CSS_URI() {
        parent::HTMLPurifier_AttrDef_URI(true); // always embedded
    }
    
-    function validate($uri_string, $config, &$context) {
+    public function validate($uri_string, $config, &$context) {
        // parse the URI out of the string and then pass it onto
        // the parent object