Working on the 3.0 version

Author: Florian Krämer

Config/bootstrap.php

@@ -1,16 +1,11 @@
 Installation
-------------
+============
 
-Clone the code into your apps plugin folder
+Using Composer
+--------------
 
-	git clone git@github.com:burzum/cakephp-html-purifier.git app/Plugin/HtmlPurifier
+Installing the plugin via [Composer](https://getcomposer.org/) is very simple, just run this in your project folder:
 
-or add it as submodule
-
-	git submodule add git@github.com:burzum/cakephp-html-purifier.git app/Plugin/HtmlPurifier
-
-In your config/bootstrap.php add
-
-```php
-Plugin::load('Burzum/HtmlPurifier', ['bootstrap' => true]);
+```sh
+composer require burzum/cakephp-html-purifier:3.0.*@dev
 ```

docs/Installation.md

@@ -1,13 +1,13 @@
 <?php
-namespace Burzum\HtmlPurifier\Lib;
-
 /**
  * Purifier
  *
  * @author Florian Krämer
  * @copyright 2012 - 2015 Florian Krämer
  * @license MIT
  */
+namespace Burzum\HtmlPurifier\Lib;
+
 class Purifier {
 
     /**
@@ -39,11 +39,12 @@ public static function &getInstance()
     }
 
     /**
-     * Config
+     * Gets and sets purifier configuration sets.
      *
      * @param string $configName
      * @param string $config
      * @throws \InvalidArgumentException
+     * @return \HTMLPurifier
      */
     public static function config($configName, $config = null)
     {

src/Lib/Purifier.php

@@ -1,4 +1,11 @@
 <?php
+/**
+ * Purifier
+ *
+ * @author Florian Krämer
+ * @copyright 2012 - 2015 Florian Krämer
+ * @license MIT
+ */
 namespace Burzum\HtmlPurifier\Lib;
 
 trait PurifierTrait {
@@ -13,4 +20,15 @@ public function purifyHtml($markup, $config = '')
     {
         return Purifier::clean($markup, $config);
     }
+
+    /**
+     * Gets a HtmlPurifier instance based on a configuration name.
+     *
+     * @param string $config
+     * @return \HtmlPurifier
+     */
+    public function getHtmlPurifier($config = 'default')
+    {
+        return Purifier::config($config);
+    }
 }

src/Lib/PurifierTrait.php

@@ -1,13 +1,17 @@
 <?php
+/**
+ * Purifier
+ *
+ * @author Florian Krämer
+ * @copyright 2012 - 2015 Florian Krämer
+ * @license MIT
+ */
 namespace App\Model\Behavior;
 
 use ArrayObject;
 use Burzum\HtmlPurifier\Lib\PurifierTrait;
-use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\ORM\Behavior;
-use HTMLPurifier;
-use HTMLPurifier_Config;
 
 class HtmlPurifierBehavior extends Behavior {
 
@@ -41,27 +45,13 @@ class HtmlPurifierBehavior extends Behavior {
      */
     public function beforeMarshal(Event $event, ArrayObject $data, ArrayObject $options)
     {
-        foreach ($this->config('fields') as $field) {
-            if (isset($data[$field])) {
+        foreach ($this->config('fields') as $key => $field) {
+            if (is_int($key) && isset($data[$field])) {
                 $data[$field] = $this->purifyHtml($data[$field], $this->config('purifierConfig'));
             }
+            if (is_string($key) && is_string($field)) {
+                $data[$key] = $this->purifyHtml($data[$key], $this->config($field));
+            }
         }
     }
-
-    public function purifier($config = null)
-    {
-//        if (is_string($config)) {
-//            $config = (array)Configure::read('HtmlPurifier.' . $config);
-//        }
-//        if (!is_array($config)) {
-//            throw new \InvalidArgumentException('Invalid purifier config value passed!');
-//        }
-//        $hash = md5(serialize($config));
-//        if (!empty($this->_purifier[$hash])) {
-//            return $this->_purifier[$hash];
-//        }
-//        $config = \HTMLPurifier_Config::create($config);
-//        $this->_purifier[$hash] = new \HTMLPurifier($config);
-//        return $this->_purifier[$hash];
-    }
 }

src/Model/Behavior/HtmlPurifierBehavior.php

@@ -1,16 +1,16 @@
 <?php
-namespace Burzum\HtmlPurifier\View\Helper;
-
-use Burzum\HtmlPurifier\Lib\Purifier;
-use Cake\View\Helper;
-
 /**
  * HtmlPurifierHelper
  *
  * @author Florian Krämer
  * @copyright 2012 - 2015 Florian Krämer
  * @license MIT
  */
+namespace Burzum\HtmlPurifier\View\Helper;
+
+use Burzum\HtmlPurifier\Lib\Purifier;
+use Cake\View\Helper;
+
 class HtmlPurifierHelper extends Helper {
 
 /**