MDL-22537 new html purifier backported to stable, unfortunately PHP5 only

lib/htmlpurifier/HTMLPurifier/AttrDef/Integer.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef.php';
-
 /**
  * Validates an integer.
  * @note While this class was modeled off the CSS definition, no currently
@@ -11,43 +9,43 @@ require_once 'HTMLPurifier/AttrDef.php';
  */
 class HTMLPurifier_AttrDef_Integer extends HTMLPurifier_AttrDef
 {
-    
+
     /**
      * Bool indicating whether or not negative values are allowed
      */
-    var $negative = true;
-    
+    protected $negative = true;
+
     /**
      * Bool indicating whether or not zero is allowed
      */
-    var $zero = true;
-    
+    protected $zero = true;
+
     /**
      * Bool indicating whether or not positive values are allowed
      */
-    var $positive = true;
-    
+    protected $positive = true;
+
     /**
      * @param $negative Bool indicating whether or not negative values are allowed
      * @param $zero Bool indicating whether or not zero is allowed
      * @param $positive Bool indicating whether or not positive values are allowed
      */
-    function HTMLPurifier_AttrDef_Integer(
+    public function __construct(
         $negative = true, $zero = true, $positive = true
     ) {
         $this->negative = $negative;
         $this->zero     = $zero;
         $this->positive = $positive;
     }
-    
-    function validate($integer, $config, &$context) {
-        
+
+    public function validate($integer, $config, $context) {
+
         $integer = $this->parseCDATA($integer);
         if ($integer === '') return false;
-        
+
         // we could possibly simply typecast it to integer, but there are
         // certain fringe cases that must not return an integer.
-        
+
         // clip leading sign
         if ( $this->negative && $integer[0] === '-' ) {
             $digits = substr($integer, 1);
@@ -57,18 +55,19 @@ class HTMLPurifier_AttrDef_Integer extends HTMLPurifier_AttrDef
         } else {
             $digits = $integer;
         }
-        
+
         // test if it's numeric
         if (!ctype_digit($digits)) return false;
-        
+
         // perform scope tests
         if (!$this->zero     && $integer == 0) return false;
         if (!$this->positive && $integer > 0) return false;
         if (!$this->negative && $integer < 0) return false;
-        
+
         return $integer;
-        
+
     }
-    
+
 }
 
+// vim: et sw=4 sts=4