MDL-22537 new html purifier backported to stable, unfortunately PHP5 only

lib/htmlpurifier/HTMLPurifier/Strategy/Composite.php

@@ -1,29 +1,25 @@
 <?php
 
-require_once 'HTMLPurifier/Strategy.php';
-require_once 'HTMLPurifier/Config.php';
-
 /**
  * Composite strategy that runs multiple strategies on tokens.
  */
-class HTMLPurifier_Strategy_Composite extends HTMLPurifier_Strategy
+abstract class HTMLPurifier_Strategy_Composite extends HTMLPurifier_Strategy
 {
-    
+
     /**
      * List of strategies to run tokens through.
      */
-    var $strategies = array();
-    
-    function HTMLPurifier_Strategy_Composite() {
-        trigger_error('Attempt to instantiate abstract object', E_USER_ERROR);
-    }
-    
-    function execute($tokens, $config, &$context) {
+    protected $strategies = array();
+
+    abstract public function __construct();
+
+    public function execute($tokens, $config, $context) {
         foreach ($this->strategies as $strategy) {
             $tokens = $strategy->execute($tokens, $config, $context);
         }
         return $tokens;
     }
-    
+
 }
 
+// vim: et sw=4 sts=4