[3.1.0] Initial validator implementation for namespaces.

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

library/HTMLPurifier/ConfigSchema/Interchange.php

@@ -11,12 +11,12 @@ class HTMLPurifier_ConfigSchema_Interchange
     /**
      * Array of Namespace ID => array(namespace info)
      */
-    public $namespaces;
+    public $namespaces = array();
     
     /**
      * Array of Directive ID => array(directive info)
      */
-    public $directives;
+    public $directives = array();
     
     /**
      * Adds a namespace array to $namespaces
@@ -29,7 +29,7 @@ class HTMLPurifier_ConfigSchema_Interchange
      * Adds a directive array to $directives
      */
     public function addDirective($directive) {
-        $this->directives[(string) $directive->id] = $directive;
+        $this->directives[$directive->id->__toString()] = $directive;
     }
     
 }

library/HTMLPurifier/ConfigSchema/Validator.php

@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Performs validations on HTMLPurifier_ConfigSchema_Interchange
+ */
+class HTMLPurifier_ConfigSchema_Validator
+{
+    
+    protected $interchange;
+    
+    /**
+     * Volatile context variables to provide a fluent interface.
+     */
+    protected $context, $obj, $member;
+    
+    /**
+     * Validates a fully-formed interchange object. Throws an
+     * HTMLPurifier_ConfigSchema_Exception if there's a problem.
+     */
+    public function validate($interchange) {
+        $this->interchange = $interchange;
+        foreach ($interchange->namespaces as $namespace) {
+            $this->validateNamespace($namespace);
+        }
+        foreach ($interchange->directives as $directive) {
+            $this->validateDirective($directive);
+        }
+    }
+    
+    public function validateNamespace($n) {
+        $this->context = "namespace '{$n->namespace}'";
+        $this->with($n, 'namespace')
+            ->assertIsString()
+            ->assertNotEmpty()
+            ->assertAlnum();
+        $this->with($n, 'description')
+            ->assertIsString()
+            ->assertNotEmpty();
+    }
+    
+    public function validateDirective($d) {
+        $this->context = "directive '{$d->id}'";
+    }
+    
+    // protected helper functions
+    
+    protected function with($obj, $member) {
+        return new HTMLPurifier_ConfigSchema_ValidatorAtom($this->interchange, $this->context, $obj, $member);
+    }
+    
+}

library/HTMLPurifier/ConfigSchema/ValidatorAtom.php

@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * Fluent interface for validating the contents of member variables.
+ * This should be immutable. See HTMLPurifier_ConfigSchema_Validator for
+ * use-cases.
+ */
+class HTMLPurifier_ConfigSchema_ValidatorAtom
+{
+    
+    protected $interchange, $context, $obj, $member, $contents;
+    
+    public function __construct($interchange, $context, $obj, $member) {
+        $this->interchange = $interchange;
+        $this->context     = $context;
+        $this->obj         = $obj;
+        $this->member      = $member;
+        $this->contents    =& $obj->$member;
+    }
+    
+    public function assertIsString() {
+        if (!is_string($this->contents)) $this->error('must be a string');
+        return $this;
+    }
+    
+    public function assertNotNull() {
+        if (is_null($this->contents)) $this->error('must not be null');
+        return $this;
+    }
+    
+    public function assertAlnum() {
+        if (!ctype_alnum($this->contents)) $this->error('must be alphanumeric');
+        return $this;
+    }
+    
+    public function assertNotEmpty() {
+        if (empty($this->contents)) $this->error('must not be empty');
+        return $this;
+    }
+    
+    protected function error($msg) {
+        throw new HTMLPurifier_ConfigSchema_Exception('Member variable \'' . $this->member . '\' in ' . $this->context . ' ' . $msg);
+    }
+    
+}
+
+