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

library/HTMLPurifier/Printer/CSSDefinition.php

@@ -5,9 +5,9 @@ require_once 'HTMLPurifier/Printer.php';
 class HTMLPurifier_Printer_CSSDefinition extends HTMLPurifier_Printer
 {
     
-    var $def;
+    protected $def;
     
-    function render($config) {
+    public function render($config) {
         $this->def = $config->getCSSDefinition();
         $ret = '';
         

library/HTMLPurifier/Printer/ConfigForm.php

@@ -7,36 +7,32 @@ class HTMLPurifier_Printer_ConfigForm extends HTMLPurifier_Printer
     
     /**
      * Printers for specific fields
-     * @protected
      */
-    var $fields = array();
+    protected $fields = array();
     
     /**
      * Documentation URL, can have fragment tagged on end
-     * @protected
      */
-    var $docURL;
+    protected $docURL;
     
     /**
      * Name of form element to stuff config in
-     * @protected
      */
-    var $name;
+    protected $name;
     
     /**
      * Whether or not to compress directive names, clipping them off
      * after a certain amount of letters. False to disable or integer letters
      * before clipping.
-     * @protected
      */
-    var $compress = false;
+    protected $compress = false;
     
     /**
      * @param $name Form element name for directives to be stuffed into
      * @param $doc_url String documentation URL, will have fragment tagged on
      * @param $compress Integer max length before compressing a directive name, set to false to turn off
      */
-    function HTMLPurifier_Printer_ConfigForm(
+    public function HTMLPurifier_Printer_ConfigForm(
         $name, $doc_url = null, $compress = false
     ) {
         parent::HTMLPurifier_Printer();
@@ -53,7 +49,7 @@ class HTMLPurifier_Printer_ConfigForm extends HTMLPurifier_Printer
      * @param $cols Integer columns of textarea, null to use default
      * @param $rows Integer rows of textarea, null to use default
      */
-    function setTextareaDimensions($cols = null, $rows = null) {
+    public function setTextareaDimensions($cols = null, $rows = null) {
         if ($cols) $this->fields['default']->cols = $cols;
         if ($rows) $this->fields['default']->rows = $rows;
     }
@@ -61,14 +57,14 @@ class HTMLPurifier_Printer_ConfigForm extends HTMLPurifier_Printer
     /**
      * Retrieves styling, in case it is not accessible by webserver
      */
-    function getCSS() {
+    public function getCSS() {
         return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.css');
     }
     
     /**
      * Retrieves JavaScript, in case it is not accessible by webserver
      */
-    function getJavaScript() {
+    public function getJavaScript() {
         return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.js');
     }
     
@@ -77,7 +73,7 @@ class HTMLPurifier_Printer_ConfigForm extends HTMLPurifier_Printer
      * @param $config Configuration object of current form state
      * @param $allowed Optional namespace(s) and directives to restrict form to.
      */
-    function render($config, $allowed = true, $render_controls = true) {
+    public function render($config, $allowed = true, $render_controls = true) {
         $this->config = $config;
         $this->prepareGenerator($config);
         
@@ -117,9 +113,8 @@ class HTMLPurifier_Printer_ConfigForm extends HTMLPurifier_Printer
      * Renders a single namespace
      * @param $ns String namespace name
      * @param $directive Associative array of directives to values
-     * @protected
      */
-    function renderNamespace($ns, $directives) {
+    protected function renderNamespace($ns, $directives) {
         $ret = '';
         $ret .= $this->start('tbody', array('class' => 'namespace'));
         $ret .= $this->start('tr');
@@ -178,15 +173,15 @@ class HTMLPurifier_Printer_ConfigForm_NullDecorator extends HTMLPurifier_Printer
     /**
      * Printer being decorated
      */
-    var $obj;
+    protected $obj;
     /**
      * @param $obj Printer to decorate
      */
-    function HTMLPurifier_Printer_ConfigForm_NullDecorator($obj) {
+    public function HTMLPurifier_Printer_ConfigForm_NullDecorator($obj) {
         parent::HTMLPurifier_Printer();
         $this->obj = $obj;
     }
-    function render($ns, $directive, $value, $name, $config) {
+    public function render($ns, $directive, $value, $name, $config) {
         $this->prepareGenerator($config);
         $ret = '';
         $ret .= $this->start('label', array('for' => "$name:Null_$ns.$directive"));
@@ -214,9 +209,9 @@ class HTMLPurifier_Printer_ConfigForm_NullDecorator extends HTMLPurifier_Printer
  * Swiss-army knife configuration form field printer
  */
 class HTMLPurifier_Printer_ConfigForm_default extends HTMLPurifier_Printer {
-    var $cols = 18;
-    var $rows = 5;
-    function render($ns, $directive, $value, $name, $config) {
+    public $cols = 18;
+    public $rows = 5;
+    public function render($ns, $directive, $value, $name, $config) {
         $this->prepareGenerator($config);
         // this should probably be split up a little
         $ret = '';
@@ -282,7 +277,7 @@ class HTMLPurifier_Printer_ConfigForm_default extends HTMLPurifier_Printer {
  * Bool form field printer
  */
 class HTMLPurifier_Printer_ConfigForm_bool extends HTMLPurifier_Printer {
-    function render($ns, $directive, $value, $name, $config) {
+    public function render($ns, $directive, $value, $name, $config) {
         $this->prepareGenerator($config);
         $ret = '';
         $ret .= $this->start('div', array('id' => "$name:$ns.$directive"));

library/HTMLPurifier/Printer/HTMLDefinition.php

@@ -8,9 +8,9 @@ class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
     /**
      * Instance of HTMLPurifier_HTMLDefinition, for easy access
      */
-    var $def;
+    protected $def;
     
-    function render($config) {
+    public function render($config) {
         $ret = '';
         $this->config =& $config;
         
@@ -31,7 +31,7 @@ class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
     /**
      * Renders the Doctype table
      */
-    function renderDoctype() {
+    protected function renderDoctype() {
         $doctype = $this->def->doctype;
         $ret = '';
         $ret .= $this->start('table');
@@ -48,7 +48,7 @@ class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
     /**
      * Renders environment table, which is miscellaneous info
      */
-    function renderEnvironment() {
+    protected function renderEnvironment() {
         $def = $this->def;
         
         $ret = '';
@@ -92,7 +92,7 @@ class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
     /**
      * Renders the Content Sets table
      */
-    function renderContentSets() {
+    protected function renderContentSets() {
         $ret = '';
         $ret .= $this->start('table');
         $ret .= $this->element('caption', 'Content Sets');
@@ -109,7 +109,7 @@ class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
     /**
      * Renders the Elements ($info) table
      */
-    function renderInfo() {
+    protected function renderInfo() {
         $ret = '';
         $ret .= $this->start('table');
         $ret .= $this->element('caption', 'Elements ($info)');
@@ -169,7 +169,7 @@ class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
      * Renders a row describing the allowed children of an element
      * @param $def HTMLPurifier_ChildDef of pertinent element
      */
-    function renderChildren($def) {
+    protected function renderChildren($def) {
         $context = new HTMLPurifier_Context();
         $ret = '';
         $ret .= $this->start('tr');
@@ -220,7 +220,7 @@ class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
      * Listifies a tag lookup table.
      * @param $array Tag lookup array in form of array('tagname' => true)
      */
-    function listifyTagLookup($array) {
+    protected function listifyTagLookup($array) {
         ksort($array);
         $list = array();
         foreach ($array as $name => $discard) {
@@ -235,7 +235,7 @@ class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
      * @param $array List of objects
      * @todo Also add information about internal state
      */
-    function listifyObjectList($array) {
+    protected function listifyObjectList($array) {
         ksort($array);
         $list = array();
         foreach ($array as $discard => $obj) {
@@ -248,7 +248,7 @@ class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
      * Listifies a hash of attributes to AttrDef classes
      * @param $array Array hash in form of array('attrname' => HTMLPurifier_AttrDef)
      */
-    function listifyAttr($array) {
+    protected function listifyAttr($array) {
         ksort($array);
         $list = array();
         foreach ($array as $name => $obj) {
@@ -261,7 +261,7 @@ class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
     /**
      * Creates a heavy header row
      */
-    function heavyHeader($text, $num = 1) {
+    protected function heavyHeader($text, $num = 1) {
         $ret = '';
         $ret .= $this->start('tr');
         $ret .= $this->element('th', $text, array('colspan' => $num, 'class' => 'heavy'));