Setup include web. Unit tests should now be able to be run independently.

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

Definition.php

@@ -1,5 +1,10 @@
 <?php
 
+require_once 'HTMLPurifier/AttrDef.php';
+require_once 'HTMLPurifier/ChildDef.php';
+require_once 'HTMLPurifier/Generator.php';
+require_once 'HTMLPurifier/Token.php';
+
 class HTMLPurifier_Definition
 {
     

HTMLPurifier.php

@@ -1,5 +1,9 @@
 <?php
 
+require_once 'HTMLPurifier/Lexer.php';
+require_once 'HTMLPurifier/Definition.php';
+require_once 'HTMLPurifier/Generator.php';
+
 class HTMLPurifier
 {
     
@@ -14,11 +18,9 @@ class HTMLPurifier
     }
     
     function purify($html) {
-        
         $tokens = $this->lexer->tokenizeHTML($html);
         $tokens = $this->definition->purifyTokens($tokens);
         return $this->generator->generateFromTokens($tokens);
-        
     }
     
 }

Lexer.php

@@ -12,6 +12,8 @@ TODO:
 
 */
 
+require_once 'HTMLPurifier/Token.php';
+
 class HTMLPurifier_Lexer
 {
     

TODO.txt

@@ -6,7 +6,6 @@ Primary:
 Secondary:
 - Build an automated release system that will create minimal versions too
 - Build system that will in-line includes
-- Set up the file includes
 - Migrate all unit tests to use the lexer and generator
 - Build the entity lookup table
 

benchmarks/HTML_Lexer.php

@@ -4,13 +4,15 @@
 
 set_time_limit(5);
 
+// emulates inserting a dir called HTMLPurifier into your class dir
+set_include_path(get_include_path() . PATH_SEPARATOR . '../../');
+
 // PEAR
 require_once 'Benchmark/Timer.php';
 require_once 'XML/HTMLSax3.php';
 require_once 'Text/Password.php';
 
-require_once '../Token.php';
+require_once 'HTMLPurifier/Lexer.php';
-require_once '../Lexer.php';
 
 class TinyTimer extends Benchmark_Timer
 {

tests/ChildDef.php

@@ -1,5 +1,9 @@
 <?php
 
+require_once 'HTMLPurifier/ChildDef.php';
+require_once 'HTMLPurifier/Lexer.php';
+require_once 'HTMLPurifier/Generator.php';
+
 class Test_HTMLPurifier_ChildDef extends UnitTestCase
 {
     

tests/Definition.php

@@ -1,5 +1,8 @@
 <?php
 
+require_once 'HTMLPurifier/Definition.php';
+require_once 'HTMLPurifier/Lexer.php';
+
 class Test_HTMLPurifier_Definition extends UnitTestCase
 {
     

tests/Generator.php

@@ -1,5 +1,7 @@
 <?php
 
+require_once 'HTMLPurifier/Generator.php';
+
 class Test_HTMLPurifier_Generator extends UnitTestCase
 {
     

tests/HTMLPurifier.php

@@ -1,5 +1,7 @@
 <?php
 
+require_once 'HTMLPurifier/HTMLPurifier.php';
+
 class Test_HTMLPurifier extends UnitTestCase
 {
     

tests/Lexer.php

@@ -4,6 +4,8 @@
     * Benchmark the SAX parser with my homemade one
  */
 
+require_once 'HTMLPurifier/Lexer.php';
+
 class Test_HTMLPurifier_Lexer extends UnitTestCase
 {
     

tests/index.php

@@ -7,15 +7,6 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../../');
 
 require_once 'XML/HTMLSax3.php'; // optional PEAR class
 
-// enforce proper namespacing
-require_once 'HTMLPurifier/HTMLPurifier.php';
-require_once 'HTMLPurifier/Lexer.php';
-require_once 'HTMLPurifier/Token.php';
-require_once 'HTMLPurifier/Definition.php';
-require_once 'HTMLPurifier/AttrDef.php';
-require_once 'HTMLPurifier/ChildDef.php';
-require_once 'HTMLPurifier/Generator.php';
-
 $test = new GroupTest('HTMLPurifier');
 
 $test->addTestFile('HTMLPurifier.php');