Merge pull request #21 from burzum/master

Merging PRs made to master back to develop.

.gitattributes

@@ -0,0 +1,7 @@
+# Remove extra files for distribution archives
+.gitattributes export-ignore
+.gitignore export-ignore
+.travis.yml export-ignore
+phpunit.xml.dist export-ignore
+tests export-ignore
+docs export-ignore

composer.json

@@ -2,7 +2,7 @@
 	"name": "burzum/cakephp-html-purifier",
 	"type": "cakephp-plugin",
 	"description": "HtmlPurifier plugin for CakePHP",
-	"keywords": ["html", "sensitization", "purifier", "validation", "tidy", "markup"],
+	"keywords": ["html", "sanitize", "purifier", "validation", "tidy", "markup"],
 	"homepage": "http://github.com/burzum/cakephp-html-purifier",
 	"license": "MIT",
 	"authors": [
@@ -27,8 +27,5 @@
 			"Cake\\Test\\": "/vendor/cakephp/cakephp/tests",
 			"Burzum\\HtmlPurifier\\Test\\": "tests"
 		}
-	},
-	"scripts": {
-		"post-autoload-dump": "Cake\\Composer\\Installer\\PluginInstaller::postAutoloadDump"
 	}
 }

src/Lib/Purifier.php

@@ -15,14 +15,14 @@ class Purifier {
      *
      * @var array
      */
-    protected $_configs = array();
+    protected $_configs = [];
 
     /**
      * HTMLPurifier instances
      *
      * @var array
      */
-    protected $_instances = array();
+    protected $_instances = [];
 
     /**
      * Return a singleton instance of the StorageManager.
@@ -31,7 +31,7 @@ class Purifier {
      */
     public static function &getInstance()
     {
-        static $instance = array();
+        static $instance = [];
         if (!$instance) {
             $instance[0] = new Purifier();
         }