From 0b9db1f54b93afde5e940b03bea2b1f6f99ccabe Mon Sep 17 00:00:00 2001
From: Nick Pope <nick@nickpope.me.uk>
Date: Wed, 13 Oct 2010 19:17:38 +0100
Subject: [PATCH] Allow non-static autoload methods w/ PHP >= 5.2.11

HTML Purifier loads itself as the first autoload function by
unregistering all existing functions and re-registering them after
registering itself.

Originally an exception was thrown when a non-static object method was
encountered as the behaviour of spl_autoload_functions() did not return
the object instance, but only the class name.  This was filed on PHP
bugs (#44144).

The bug was fixed for PHP >= 5.2.11 and >= 5.3

Signed-off-by: Nick Pope <nick@nickpope.me.uk>
Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
---
 NEWS                                                                 | 1 +
 library/HTMLPurifier/Bootstrap.php                                   | 3 ++-
 .../PHPT/loading/error-auto-with-spl-nonstatic-autoload.phpt         | 5 ++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index d918c053..247c6799 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ NEWS ( CHANGELOG and HISTORY )                                     HTMLPurifier
 
 4.2.1, unknown release date
 ! Added %HTML.Nofollow to add rel="nofollow" to external links.
+! More types of SPL autoloaders allowed on later versions of PHP.
 - Make removal of conditional IE comments ungreedy; thanks Bernd
   for reporting.
 - Escape CDATA before removing Internet Explorer comments.
diff --git a/library/HTMLPurifier/Bootstrap.php b/library/HTMLPurifier/Bootstrap.php
index 559f61a2..9a0354d6 100644
--- a/library/HTMLPurifier/Bootstrap.php
+++ b/library/HTMLPurifier/Bootstrap.php
@@ -65,10 +65,11 @@ class HTMLPurifier_Bootstrap
         if ( ($funcs = spl_autoload_functions()) === false ) {
             spl_autoload_register($autoload);
         } elseif (function_exists('spl_autoload_unregister')) {
+            $buggy  = version_compare(PHP_VERSION, '5.2.11', '<');
             $compat = version_compare(PHP_VERSION, '5.1.2', '<=') &&
                       version_compare(PHP_VERSION, '5.1.0', '>=');
             foreach ($funcs as $func) {
-                if (is_array($func)) {
+                if ($buggy && is_array($func)) {
                     // :TRICKY: There are some compatibility issues and some
                     // places where we need to error out
                     $reflector = new ReflectionMethod($func[0], $func[1]);
diff --git a/tests/HTMLPurifier/PHPT/loading/error-auto-with-spl-nonstatic-autoload.phpt b/tests/HTMLPurifier/PHPT/loading/error-auto-with-spl-nonstatic-autoload.phpt
index 6dfd5062..9a91abaf 100644
--- a/tests/HTMLPurifier/PHPT/loading/error-auto-with-spl-nonstatic-autoload.phpt
+++ b/tests/HTMLPurifier/PHPT/loading/error-auto-with-spl-nonstatic-autoload.phpt
@@ -5,6 +5,9 @@ Error when registering autoload with non-static autoload already on SPL stack
 if (!function_exists('spl_autoload_register')) {
     echo "skip - spl_autoload_register() not available";
 }
+if (version_compare(PHP_VERSION, '5.2.11', '>=')) {
+    echo "skip - non-buggy version of PHP";
+}
 --FILE--
 <?php
 class NotStatic
@@ -26,4 +29,4 @@ try {
 }
 
 --EXPECT--
-Caught error gracefully
\ No newline at end of file
+Caught error gracefully
-- 
2.11.4.GIT