diff --git a/NEWS b/NEWS index d5ab1b37..31c6eb29 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,7 @@ NEWS ( CHANGELOG and HISTORY ) HTMLPurifier - Spellcheck UTF-8: The Secret To Character Encoding - Fix improper removal of the contents of elements with only whitespace. Thanks Eric Wald for reporting. +- Fix broken test suite in versions of PHP without spl_autoload_register() . Add verbose mode to command line test runner, use (--verbose) . Turn on unit tests for UnitConverter . Fix missing version number in configuration %Attr.DefaultImageAlt (added 3.2.0) diff --git a/tests/index.php b/tests/index.php index 9ed3d8bc..a9446e4f 100755 --- a/tests/index.php +++ b/tests/index.php @@ -85,6 +85,17 @@ if (!SimpleReporter::inCli()) { $AC['php'] = $php; } +// initialize and load HTML Purifier +// use ?standalone to load the alterative standalone stub +if ($AC['standalone']) { + require '../library/HTMLPurifier.standalone.php'; +} else { + require '../library/HTMLPurifier.path.php'; + require 'HTMLPurifier.includes.php'; +} +require '../library/HTMLPurifier.autoload.php'; +require 'HTMLPurifier/Harness.php'; + // Shell-script code is executed if ($AC['xml']) { @@ -100,17 +111,6 @@ if ($AC['flush']) { htmlpurifier_flush($AC['php'], $reporter); } -// initialize and load HTML Purifier -// use ?standalone to load the alterative standalone stub -if ($AC['standalone']) { - require '../library/HTMLPurifier.standalone.php'; -} else { - require '../library/HTMLPurifier.path.php'; - require 'HTMLPurifier.includes.php'; -} -require '../library/HTMLPurifier.autoload.php'; -require 'HTMLPurifier/Harness.php'; - // Now, userland code begins to be executed // setup special DefinitionCacheFactory decorator