Remove unnecessary includes: includes now works.

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

TODO

@@ -12,13 +12,11 @@ amount of effort to implement, it may get endlessly delayed. Do not be
 afraid to cast your vote for the next feature to be implemented!
 
 IMPORTANT
- - Put our new configuration thing into effect
- - Get rid of the manual includes in ConfigSchema (this means changing
-   generate-includes.php too)
  - Get everything into configuration objects (filters, I'm looking at you)
  - Factor demo.php into a set of Printer classes, and then create a stub
    file for users here
- - Test HTMLPurifier.auto.php
+ - Test HTMLPurifier.auto.php, HTMLPurifier.includes.php, and combinations
+   of the two.
 
 3.1 release [Error'ed]
  # Error logging for filtering/cleanup procedures

library/HTMLPurifier/ConfigSchema.php

@@ -2,12 +2,6 @@
 
 if (!defined('HTMLPURIFIER_SCHEMA_STRICT')) define('HTMLPURIFIER_SCHEMA_STRICT', false);
 
-// REMOVE THESE LATER:
-require_once 'HTMLPurifier/ConfigDef.php';
-require_once 'HTMLPurifier/ConfigDef/Directive.php';
-require_once 'HTMLPurifier/ConfigDef/DirectiveAlias.php';
-require_once 'HTMLPurifier/ConfigDef/Namespace.php';
-
 /**
  * Configuration definition, defines directives and their defaults.
  * @note If you update this, please update Printer_ConfigForm

tests/index.php

@@ -54,6 +54,7 @@ if ($AC['standalone']) {
 } else {
     set_include_path(realpath('../library') . PATH_SEPARATOR . get_include_path() );
     require_once 'HTMLPurifier.auto.php';
+    require_once 'HTMLPurifier.includes.php';
 }
 require_once 'HTMLPurifier/Harness.php';