diff --git a/INSTALL b/INSTALL index 090b157d..317c89bb 100644 --- a/INSTALL +++ b/INSTALL @@ -14,10 +14,11 @@ basic sanity checks to get the most out of this library. --------------------------------------------------------------------------- 1. Compatibility -HTML Purifier works in both PHP 4 and PHP 5, from PHP 4.3.2 and up. It has -no core dependencies with other libraries. PHP 4 support will be -deprecated on December 31, 2007, at which time only essential security -fixes will be issued for the PHP 4 version until August 8, 2008. +HTML Purifier works in both PHP 4 and PHP 5, and is actively tested from +PHP 4.3.7 and up (see tests/multitest.php for specific versions). It has +no core dependencies with other libraries. PHP 4 support will be +deprecated on December 31, 2007, at which time only essential security +fixes will be issued for the PHP 4 version until August 8, 2008. These optional extensions can enhance the capabilities of HTML Purifier: diff --git a/NEWS b/NEWS index 3dcdbfe3..3d37c1ff 100644 --- a/NEWS +++ b/NEWS @@ -39,6 +39,7 @@ NEWS ( CHANGELOG and HISTORY ) HTMLPurifier HTMLDefinition errors, this may indicate problems with error-collecting facilities in PHP 5 - Make ErrorCollectorEMock work in both PHP 4 and PHP 5 +- Make PH5P work with PHP 5.0 by removing unnecessary array parameter typedef . %Core.AcceptFullDocuments renamed to %Core.ConvertDocumentToFragment to better communicate its purpose . Error unit tests can now specify the expectation of no errors. Future @@ -54,6 +55,8 @@ NEWS ( CHANGELOG and HISTORY ) HTMLPurifier . Maintenance script for generating PH5P patch added, original PH5P source file also added under version control . Full unit test runner script title made more descriptive with PHP version +. Updated INSTALL file to state that 4.3.7 is the earliest version we + are actively testing 2.1.2, released 2007-09-03 ! Implemented Object module for trusted users diff --git a/library/HTMLPurifier/Lexer/PH5P.php b/library/HTMLPurifier/Lexer/PH5P.php index ff314611..b6762379 100644 --- a/library/HTMLPurifier/Lexer/PH5P.php +++ b/library/HTMLPurifier/Lexer/PH5P.php @@ -3720,7 +3720,7 @@ class HTML5TreeConstructer { } } - private function generateImpliedEndTags(array $exclude = array()) { + private function generateImpliedEndTags($exclude = array()) { /* When the steps below require the UA to generate implied end tags, then, if the current node is a dd element, a dt element, an li element, a p element, a td element, a th element, or a tr element, the UA must diff --git a/maintenance/PH5P.patch b/maintenance/PH5P.patch index ce414b81..9365cffe 100644 --- a/maintenance/PH5P.patch +++ b/maintenance/PH5P.patch @@ -1,5 +1,5 @@ --- C:\Users\Edward\Webs\htmlpurifier\maintenance\PH5P.php 2007-11-04 23:41:49.074543700 -0500 -+++ C:\Users\Edward\Webs\htmlpurifier\maintenance/PH5P.new.php 2007-11-04 23:54:19.206543700 -0500 ++++ C:\Users\Edward\Webs\htmlpurifier\maintenance/PH5P.new.php 2007-11-05 00:23:52.839543700 -0500 @@ -211,7 +211,10 @@ // If nothing is returned, emit a U+0026 AMPERSAND character token. // Otherwise, emit the character token that was returned. @@ -43,6 +43,15 @@ $entity = $id; break; } +@@ -3659,7 +3668,7 @@ + } + } + +- private function generateImpliedEndTags(array $exclude = array()) { ++ private function generateImpliedEndTags($exclude = array()) { + /* When the steps below require the UA to generate implied end tags, + then, if the current node is a dd element, a dt element, an li element, + a p element, a td element, a th element, or a tr element, the UA must @@ -3673,7 +3682,8 @@ } } diff --git a/tests/multitest.php b/tests/multitest.php index 6f0a050b..f555b368 100644 --- a/tests/multitest.php +++ b/tests/multitest.php @@ -1,11 +1,22 @@