[3.1.0] Split out VarParser from ConfigSchema

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1601 48356398-32a2-884e-a903-53898d9a118a

library/HTMLPurifier/ConfigSchema.php

@@ -28,6 +28,11 @@ class HTMLPurifier_ConfigSchema {
      */
     static protected $singleton;
     
+    /**
+     * Variable parser.
+     */
+    protected $parser;
+    
     /**
      * Lookup table of allowed types.
      */
@@ -45,6 +50,10 @@ class HTMLPurifier_ConfigSchema {
         'mixed'     => 'Mixed'
     );
     
+    public function __construct() {
+        $this->parser = new HTMLPurifier_VarParser();
+    }
+    
     /**
      * Unserializes the default ConfigSchema.
      */
@@ -127,8 +136,9 @@ class HTMLPurifier_ConfigSchema {
                         E_USER_ERROR);
                     return;
                 }
-                $default = $this->validate($default, $type, $allow_null);
-                if ($this->isError($default)) {
+                try {
+                    $default = $this->parser->parse($default, $type, $allow_null);
+                } catch (HTMLPurifier_VarParserException $e) {
                     trigger_error('Default value does not match directive type',
                         E_USER_ERROR);
                     return;
@@ -298,99 +308,6 @@ class HTMLPurifier_ConfigSchema {
         $this->info[$new_namespace][$new_name]->directiveAliases[] = "$namespace.$name";
     }
     
-    /**
-     * Validate a variable according to type. Return null if invalid.
-     * @todo Consider making protected
-     */
-    public function validate($var, $type, $allow_null = false) {
-        if (!isset($this->types[$type])) {
-            trigger_error('Invalid type', E_USER_ERROR);
-            return;
-        }
-        if ($allow_null && $var === null) return null;
-        switch ($type) {
-            case 'mixed':
-                //if (is_string($var)) $var = unserialize($var);
-                return $var;
-            case 'istring':
-            case 'string':
-            case 'text': // no difference, just is longer/multiple line string
-            case 'itext':
-                if (!is_string($var)) break;
-                if ($type === 'istring' || $type === 'itext') $var = strtolower($var);
-                return $var;
-            case 'int':
-                if (is_string($var) && ctype_digit($var)) $var = (int) $var;
-                elseif (!is_int($var)) break;
-                return $var;
-            case 'float':
-                if (is_string($var) && is_numeric($var)) $var = (float) $var;
-                elseif (!is_float($var)) break;
-                return $var;
-            case 'bool':
-                if (is_int($var) && ($var === 0 || $var === 1)) {
-                    $var = (bool) $var;
-                } elseif (is_string($var)) {
-                    if ($var == 'on' || $var == 'true' || $var == '1') {
-                        $var = true;
-                    } elseif ($var == 'off' || $var == 'false' || $var == '0') {
-                        $var = false;
-                    } else {
-                        break;
-                    }
-                } elseif (!is_bool($var)) break;
-                return $var;
-            case 'list':
-            case 'hash':
-            case 'lookup':
-                if (is_string($var)) {
-                    // special case: technically, this is an array with
-                    // a single empty string item, but having an empty
-                    // array is more intuitive
-                    if ($var == '') return array();
-                    if (strpos($var, "\n") === false && strpos($var, "\r") === false) {
-                        // simplistic string to array method that only works
-                        // for simple lists of tag names or alphanumeric characters
-                        $var = explode(',',$var);
-                    } else {
-                        $var = preg_split('/(,|[\n\r]+)/', $var);
-                    }
-                    // remove spaces
-                    foreach ($var as $i => $j) $var[$i] = trim($j);
-                    if ($type === 'hash') {
-                        // key:value,key2:value2
-                        $nvar = array();
-                        foreach ($var as $keypair) {
-                            $c = explode(':', $keypair, 2);
-                            if (!isset($c[1])) continue;
-                            $nvar[$c[0]] = $c[1];
-                        }
-                        $var = $nvar;
-                    }
-                }
-                if (!is_array($var)) break;
-                $keys = array_keys($var);
-                if ($keys === array_keys($keys)) {
-                    if ($type == 'list') return $var;
-                    elseif ($type == 'lookup') {
-                        $new = array();
-                        foreach ($var as $key) {
-                            $new[$key] = true;
-                        }
-                        return $new;
-                    } else break;
-                }
-                if ($type === 'lookup') {
-                    foreach ($var as $key => $value) {
-                        $var[$key] = true;
-                    }
-                }
-                return $var;
-        }
-        $error = new HTMLPurifier_Error();
-        return $error;
-    }
-    
     /**
      * Takes an absolute path and munges it into a more manageable relative path
      * @todo Consider making protected
@@ -414,6 +331,13 @@ class HTMLPurifier_ConfigSchema {
         if (!($var instanceof HTMLPurifier_Error)) return false;
         return true;
     }
+    
+    /** @deprecated, use HTMLPurifier_VarParser->parse() */
+    public function validate($a, $b, $c = false) {
+        trigger_error("HTMLPurifier_ConfigSchema->validate deprecated, use HTMLPurifier_VarParser->parse instead", E_USER_NOTICE);
+        return $this->parser->parse($a, $b, $c);
+    }
+    
 }