mewebstudio / Purifier

src/PurifierServiceProvider.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
     /**
      * Get the services provided by the provider.
      *
-     * @return array
+     * @return string[]
      */
     public function provides()
     {

Spacing +4 added lines, -4 removed lines

@@ -33,7 +33,7 @@ 
     {
         $source = realpath(__DIR__.'/../config/purifier.php');
         if ($this->app instanceof LaravelApplication && $this->app->runningInConsole()) {
-            $this->publishes([$source => config_path('purifier.php')]);
+            $this->publishes([ $source => config_path('purifier.php') ]);
         } elseif ($this->app instanceof LumenApplication) {
             $this->app->configure('purifier');
         }
@@ -48,8 +48,8 @@ 
      */
     public function register()
     {
-        $this->app->singleton('purifier', function (Container $app) {
-            return new Purifier($app['files'], $app['config']);
+        $this->app->singleton('purifier', function(Container $app) {
+            return new Purifier($app[ 'files' ], $app[ 'config' ]);
         });
 
         $this->app->alias('purifier', Purifier::class);
@@ -62,6 +62,6 @@ 
      */
     public function provides()
     {
-        return ['purifier'];
+        return [ 'purifier' ];
     }
 }

src/Purifier.php

Indentation +85 added lines, -85 removed lines

@@ -78,21 +78,21 @@ 
         
         // Load custom definition if set
         if ($definitionConfig = $this->config->get('purifier.settings.custom_definition')) {
-	        $this->addCustomDefinition($definitionConfig, $config);
+            $this->addCustomDefinition($definitionConfig, $config);
         }
         
         // Load custom elements if set
         if ($elements = $this->config->get('purifier.settings.custom_elements')) {
-	        if ($def = $config->maybeGetRawHTMLDefinition()) {
-		        $this->addCustomElements($elements, $def);
-	        }
+            if ($def = $config->maybeGetRawHTMLDefinition()) {
+                $this->addCustomElements($elements, $def);
+            }
         }
         
         // Load custom attributes if set
         if ($attributes = $this->config->get('purifier.settings.custom_attributes')) {
-	        if ($def = $config->maybeGetRawHTMLDefinition()) {
-		        $this->addCustomAttributes($attributes, $def);
-	        }
+            if ($def = $config->maybeGetRawHTMLDefinition()) {
+                $this->addCustomAttributes($attributes, $def);
+            }
         }
 
         // Create HTMLPurifier object
@@ -100,94 +100,94 @@ 
     }
     
     /**
-	 * Add a custom definition
-	 *
-	 * @see http://htmlpurifier.org/docs/enduser-customize.html
-	 * @param array $definitionConfig
-	 * @param HTML_Purifier_Config $configObject Defaults to using default config
-	 * 
-	 * @return HTML_Purifier_Config $configObject
-	 */
-	private function addCustomDefinition(array $definitionConfig, $configObject = null)
-	{
-		if (!$configObject) {
-			$configObject = HTMLPurifier_Config::createDefault();
-			$configObject->loadArray($this->getConfig());
-		}
+     * Add a custom definition
+     *
+     * @see http://htmlpurifier.org/docs/enduser-customize.html
+     * @param array $definitionConfig
+     * @param HTML_Purifier_Config $configObject Defaults to using default config
+     * 
+     * @return HTML_Purifier_Config $configObject
+     */
+    private function addCustomDefinition(array $definitionConfig, $configObject = null)
+    {
+        if (!$configObject) {
+            $configObject = HTMLPurifier_Config::createDefault();
+            $configObject->loadArray($this->getConfig());
+        }
 		
-		// Setup the custom definition
-		$configObject->set('HTML.DefinitionID', $definitionConfig['id']);
-		$configObject->set('HTML.DefinitionRev', $definitionConfig['rev']);
+        // Setup the custom definition
+        $configObject->set('HTML.DefinitionID', $definitionConfig['id']);
+        $configObject->set('HTML.DefinitionRev', $definitionConfig['rev']);
 		
-		// Enable debug mode
-		if (!isset($definitionConfig['debug']) || $definitionConfig['debug']) {
-			$configObject->set('Cache.DefinitionImpl', null);
-		}
+        // Enable debug mode
+        if (!isset($definitionConfig['debug']) || $definitionConfig['debug']) {
+            $configObject->set('Cache.DefinitionImpl', null);
+        }
 		
-		// Start configuring the definition
-		if ($def = $configObject->maybeGetRawHTMLDefinition()) {
-			// Create the definition attributes
-			if (!empty($definitionConfig['attributes'])) {
-				$this->addCustomAttributes($definitionConfig['attributes'], $def);
-			}
+        // Start configuring the definition
+        if ($def = $configObject->maybeGetRawHTMLDefinition()) {
+            // Create the definition attributes
+            if (!empty($definitionConfig['attributes'])) {
+                $this->addCustomAttributes($definitionConfig['attributes'], $def);
+            }
 			
-			// Create the definition elements
-			if (!empty($definitionConfig['elements'])) {
-				$this->addCustomElements($definitionConfig['elements'], $def);
-			}
-		}
+            // Create the definition elements
+            if (!empty($definitionConfig['elements'])) {
+                $this->addCustomElements($definitionConfig['elements'], $def);
+            }
+        }
 		
-		return $configObject;
-	}
+        return $configObject;
+    }
 	
-	/**
-	 * Add provided attributes to the provided definition
-	 *
-	 * @param array $attributes
-	 * @param HTMLPurifier_HTMLDefinition $definition
-	 * 
-	 * @return HTMLPurifier_HTMLDefinition $definition
-	 */
-	private function addCustomAttributes(array $attributes, $definition)
-	{
-		foreach ($attributes as $attribute) {
-			// Get configuration of attribute
-			$required = !empty($attribute[3]) ? true : false;
-			$onElement = $attribute[0];
-			$attrName = $required ? $attribute[1] . '*' : $attribute[1];
-			$validValues = $attribute[2];
+    /**
+     * Add provided attributes to the provided definition
+     *
+     * @param array $attributes
+     * @param HTMLPurifier_HTMLDefinition $definition
+     * 
+     * @return HTMLPurifier_HTMLDefinition $definition
+     */
+    private function addCustomAttributes(array $attributes, $definition)
+    {
+        foreach ($attributes as $attribute) {
+            // Get configuration of attribute
+            $required = !empty($attribute[3]) ? true : false;
+            $onElement = $attribute[0];
+            $attrName = $required ? $attribute[1] . '*' : $attribute[1];
+            $validValues = $attribute[2];
 			
-			$definition->addAttribute($onElement, $attrName, $validValues);
-		}
+            $definition->addAttribute($onElement, $attrName, $validValues);
+        }
 		
-		return $definition;
-	}
+        return $definition;
+    }
 	
-	/**
-	 * Add provided elements to the provided definition
-	 *
-	 * @param array $elements
-	 * @param HTMLPurifier_HTMLDefinition $definition
-	 * 
-	 * @return HTMLPurifier_HTMLDefinition $definition
-	 */
-	private function addCustomElements(array $elements, $definition)
-	{
-		foreach ($elements as $element) {
-			// Get configuration of element
-			$name = $element[0];
-			$contentSet = $element[1];
-			$allowedChildren = $element[2];
-			$attributeCollection = $element[3];
-			$attributes = isset($element[4]) ? $element[4] : null;
+    /**
+     * Add provided elements to the provided definition
+     *
+     * @param array $elements
+     * @param HTMLPurifier_HTMLDefinition $definition
+     * 
+     * @return HTMLPurifier_HTMLDefinition $definition
+     */
+    private function addCustomElements(array $elements, $definition)
+    {
+        foreach ($elements as $element) {
+            // Get configuration of element
+            $name = $element[0];
+            $contentSet = $element[1];
+            $allowedChildren = $element[2];
+            $attributeCollection = $element[3];
+            $attributes = isset($element[4]) ? $element[4] : null;
 			
-			if (!empty($attributes)) {
-				$definition->addElement($name, $contentSet, $allowedChildren, $attributeCollection, $attributes);
-			} else {
-				$definition->addElement($name, $contentSet, $allowedChildren, $attributeCollection);
-			}
-		}
-	}
+            if (!empty($attributes)) {
+                $definition->addElement($name, $contentSet, $allowedChildren, $attributeCollection, $attributes);
+            } else {
+                $definition->addElement($name, $contentSet, $allowedChildren, $attributeCollection);
+            }
+        }
+    }
 
     /**
      * Check/Create cache directory

Spacing +30 added lines, -30 removed lines

@@ -60,7 +60,7 @@ 
      */
     private function setUp()
     {
-        if (!$this->config->has('purifier')) {
+        if ( ! $this->config->has('purifier')) {
             throw new Exception('Configuration parameters not loaded!');
         }
 
@@ -70,7 +70,7 @@ 
         $config = HTMLPurifier_Config::createDefault();
 
         // Allow configuration to be modified
-        if (!$this->config->get('purifier.finalize')) {
+        if ( ! $this->config->get('purifier.finalize')) {
             $config->autoFinalize = false;
         }
 
@@ -110,30 +110,30 @@ 
 	 */
 	private function addCustomDefinition(array $definitionConfig, $configObject = null)
 	{
-		if (!$configObject) {
+		if ( ! $configObject) {
 			$configObject = HTMLPurifier_Config::createDefault();
 			$configObject->loadArray($this->getConfig());
 		}
 		
 		// Setup the custom definition
-		$configObject->set('HTML.DefinitionID', $definitionConfig['id']);
-		$configObject->set('HTML.DefinitionRev', $definitionConfig['rev']);
+		$configObject->set('HTML.DefinitionID', $definitionConfig[ 'id' ]);
+		$configObject->set('HTML.DefinitionRev', $definitionConfig[ 'rev' ]);
 		
 		// Enable debug mode
-		if (!isset($definitionConfig['debug']) || $definitionConfig['debug']) {
+		if ( ! isset($definitionConfig[ 'debug' ]) || $definitionConfig[ 'debug' ]) {
 			$configObject->set('Cache.DefinitionImpl', null);
 		}
 		
 		// Start configuring the definition
 		if ($def = $configObject->maybeGetRawHTMLDefinition()) {
 			// Create the definition attributes
-			if (!empty($definitionConfig['attributes'])) {
-				$this->addCustomAttributes($definitionConfig['attributes'], $def);
+			if ( ! empty($definitionConfig[ 'attributes' ])) {
+				$this->addCustomAttributes($definitionConfig[ 'attributes' ], $def);
 			}
 			
 			// Create the definition elements
-			if (!empty($definitionConfig['elements'])) {
-				$this->addCustomElements($definitionConfig['elements'], $def);
+			if ( ! empty($definitionConfig[ 'elements' ])) {
+				$this->addCustomElements($definitionConfig[ 'elements' ], $def);
 			}
 		}
 		
@@ -152,10 +152,10 @@ 
 	{
 		foreach ($attributes as $attribute) {
 			// Get configuration of attribute
-			$required = !empty($attribute[3]) ? true : false;
-			$onElement = $attribute[0];
-			$attrName = $required ? $attribute[1] . '*' : $attribute[1];
-			$validValues = $attribute[2];
+			$required = ! empty($attribute[ 3 ]) ? true : false;
+			$onElement = $attribute[ 0 ];
+			$attrName = $required ? $attribute[ 1 ].'*' : $attribute[ 1 ];
+			$validValues = $attribute[ 2 ];
 			
 			$definition->addAttribute($onElement, $attrName, $validValues);
 		}
@@ -175,13 +175,13 @@ 
 	{
 		foreach ($elements as $element) {
 			// Get configuration of element
-			$name = $element[0];
-			$contentSet = $element[1];
-			$allowedChildren = $element[2];
-			$attributeCollection = $element[3];
-			$attributes = isset($element[4]) ? $element[4] : null;
+			$name = $element[ 0 ];
+			$contentSet = $element[ 1 ];
+			$allowedChildren = $element[ 2 ];
+			$attributeCollection = $element[ 3 ];
+			$attributes = isset($element[ 4 ]) ? $element[ 4 ] : null;
 			
-			if (!empty($attributes)) {
+			if ( ! empty($attributes)) {
 				$definition->addElement($name, $contentSet, $allowedChildren, $attributeCollection, $attributes);
 			} else {
 				$definition->addElement($name, $contentSet, $allowedChildren, $attributeCollection);
@@ -197,8 +197,8 @@ 
         $cachePath = $this->config->get('purifier.cachePath');
 
         if ($cachePath) {
-            if (!$this->files->isDirectory($cachePath)) {
-                $this->files->makeDirectory($cachePath, $this->config->get('purifier.cacheFileMode', 0755),true);
+            if ( ! $this->files->isDirectory($cachePath)) {
+                $this->files->makeDirectory($cachePath, $this->config->get('purifier.cacheFileMode', 0755), true);
             }
         }
     }
@@ -220,19 +220,19 @@ 
      */
     protected function getConfig($config = null)
     {
-        $default_config = [];
-        $default_config['Core.Encoding'] = $this->config->get('purifier.encoding');
-        $default_config['Cache.SerializerPath'] = $this->config->get('purifier.cachePath');
-        $default_config['Cache.SerializerPermissions'] = $this->config->get('purifier.cacheFileMode', 0755);
+        $default_config = [ ];
+        $default_config[ 'Core.Encoding' ] = $this->config->get('purifier.encoding');
+        $default_config[ 'Cache.SerializerPath' ] = $this->config->get('purifier.cachePath');
+        $default_config[ 'Cache.SerializerPermissions' ] = $this->config->get('purifier.cacheFileMode', 0755);
 
-        if (!$config) {
+        if ( ! $config) {
             $config = $this->config->get('purifier.settings.default');
         } elseif (is_string($config)) {
             $config = $this->config->get('purifier.settings.'.$config);
         }
 
-        if (!is_array($config)) {
-            $config = [];
+        if ( ! is_array($config)) {
+            $config = [ ];
         }
 
         $config = $default_config + $config;
@@ -249,7 +249,7 @@ 
     public function clean($dirty, $config = null)
     {
         if (is_array($dirty)) {
-            return array_map(function ($item) use ($config) {
+            return array_map(function($item) use ($config) {
                 return $this->clean($item, $config);
             }, $dirty);
         }

config/purifier.php

Spacing +31 added lines, -31 removed lines

@@ -42,23 +42,23 @@ 
             'debug' => false,
             'elements' => [
                 // http://developers.whatwg.org/sections.html
-                ['section', 'Block', 'Flow', 'Common'],
-                ['nav',     'Block', 'Flow', 'Common'],
-                ['article', 'Block', 'Flow', 'Common'],
-                ['aside',   'Block', 'Flow', 'Common'],
-                ['header',  'Block', 'Flow', 'Common'],
-                ['footer',  'Block', 'Flow', 'Common'],
+                [ 'section', 'Block', 'Flow', 'Common' ],
+                [ 'nav', 'Block', 'Flow', 'Common' ],
+                [ 'article', 'Block', 'Flow', 'Common' ],
+                [ 'aside', 'Block', 'Flow', 'Common' ],
+                [ 'header', 'Block', 'Flow', 'Common' ],
+                [ 'footer', 'Block', 'Flow', 'Common' ],
 				
 				// Content model actually excludes several tags, not modelled here
-                ['address', 'Block', 'Flow', 'Common'],
-                ['hgroup', 'Block', 'Required: h1 | h2 | h3 | h4 | h5 | h6', 'Common'],
+                [ 'address', 'Block', 'Flow', 'Common' ],
+                [ 'hgroup', 'Block', 'Required: h1 | h2 | h3 | h4 | h5 | h6', 'Common' ],
 				
 				// http://developers.whatwg.org/grouping-content.html
-                ['figure', 'Block', 'Optional: (figcaption, Flow) | (Flow, figcaption) | Flow', 'Common'],
-                ['figcaption', 'Inline', 'Flow', 'Common'],
+                [ 'figure', 'Block', 'Optional: (figcaption, Flow) | (Flow, figcaption) | Flow', 'Common' ],
+                [ 'figcaption', 'Inline', 'Flow', 'Common' ],
 				
 				// http://developers.whatwg.org/the-video-element.html#the-video-element
-                ['video', 'Block', 'Optional: (source, Flow) | (Flow, source) | Flow', 'Common', [
+                [ 'video', 'Block', 'Optional: (source, Flow) | (Flow, source) | Flow', 'Common', [
                     'src' => 'URI',
 					'type' => 'Text',
 					'width' => 'Length',
@@ -66,39 +66,39 @@ 
 					'poster' => 'URI',
 					'preload' => 'Enum#auto,metadata,none',
 					'controls' => 'Bool',
-                ]],
-                ['source', 'Block', 'Flow', 'Common', [
+                ] ],
+                [ 'source', 'Block', 'Flow', 'Common', [
 					'src' => 'URI',
 					'type' => 'Text',
-                ]],
+                ] ],
 
 				// http://developers.whatwg.org/text-level-semantics.html
-                ['s',    'Inline', 'Inline', 'Common'],
-                ['var',  'Inline', 'Inline', 'Common'],
-                ['sub',  'Inline', 'Inline', 'Common'],
-                ['sup',  'Inline', 'Inline', 'Common'],
-                ['mark', 'Inline', 'Inline', 'Common'],
-                ['wbr',  'Inline', 'Empty', 'Core'],
+                [ 's', 'Inline', 'Inline', 'Common' ],
+                [ 'var', 'Inline', 'Inline', 'Common' ],
+                [ 'sub', 'Inline', 'Inline', 'Common' ],
+                [ 'sup', 'Inline', 'Inline', 'Common' ],
+                [ 'mark', 'Inline', 'Inline', 'Common' ],
+                [ 'wbr', 'Inline', 'Empty', 'Core' ],
 				
 				// http://developers.whatwg.org/edits.html
-                ['ins', 'Block', 'Flow', 'Common', ['cite' => 'URI', 'datetime' => 'CDATA']],
-                ['del', 'Block', 'Flow', 'Common', ['cite' => 'URI', 'datetime' => 'CDATA']],
+                [ 'ins', 'Block', 'Flow', 'Common', [ 'cite' => 'URI', 'datetime' => 'CDATA' ] ],
+                [ 'del', 'Block', 'Flow', 'Common', [ 'cite' => 'URI', 'datetime' => 'CDATA' ] ],
             ],
             'attributes' => [
-                ['iframe', 'allowfullscreen', 'Bool'],
-                ['table', 'height', 'Text'],
-                ['td', 'border', 'Text'],
-                ['th', 'border', 'Text'],
-                ['tr', 'width', 'Text'],
-                ['tr', 'height', 'Text'],
-                ['tr', 'border', 'Text'],
+                [ 'iframe', 'allowfullscreen', 'Bool' ],
+                [ 'table', 'height', 'Text' ],
+                [ 'td', 'border', 'Text' ],
+                [ 'th', 'border', 'Text' ],
+                [ 'tr', 'width', 'Text' ],
+                [ 'tr', 'height', 'Text' ],
+                [ 'tr', 'border', 'Text' ],
             ],
         ],
         'custom_attributes' => [
-            ['a', 'target', 'Enum#_blank,_self,_target,_top'],
+            [ 'a', 'target', 'Enum#_blank,_self,_target,_top' ],
         ],
         'custom_elements' => [
-            ['u', 'Inline', 'Inline', 'Common'],
+            [ 'u', 'Inline', 'Inline', 'Common' ],
         ],
     ],
 

Indentation +13 added lines, -13 removed lines

@@ -49,30 +49,30 @@ 
                 ['header',  'Block', 'Flow', 'Common'],
                 ['footer',  'Block', 'Flow', 'Common'],
 				
-				// Content model actually excludes several tags, not modelled here
+                // Content model actually excludes several tags, not modelled here
                 ['address', 'Block', 'Flow', 'Common'],
                 ['hgroup', 'Block', 'Required: h1 | h2 | h3 | h4 | h5 | h6', 'Common'],
 				
-				// http://developers.whatwg.org/grouping-content.html
+                // http://developers.whatwg.org/grouping-content.html
                 ['figure', 'Block', 'Optional: (figcaption, Flow) | (Flow, figcaption) | Flow', 'Common'],
                 ['figcaption', 'Inline', 'Flow', 'Common'],
 				
-				// http://developers.whatwg.org/the-video-element.html#the-video-element
+                // http://developers.whatwg.org/the-video-element.html#the-video-element
                 ['video', 'Block', 'Optional: (source, Flow) | (Flow, source) | Flow', 'Common', [
                     'src' => 'URI',
-					'type' => 'Text',
-					'width' => 'Length',
-					'height' => 'Length',
-					'poster' => 'URI',
-					'preload' => 'Enum#auto,metadata,none',
-					'controls' => 'Bool',
+                    'type' => 'Text',
+                    'width' => 'Length',
+                    'height' => 'Length',
+                    'poster' => 'URI',
+                    'preload' => 'Enum#auto,metadata,none',
+                    'controls' => 'Bool',
                 ]],
                 ['source', 'Block', 'Flow', 'Common', [
-					'src' => 'URI',
-					'type' => 'Text',
+                    'src' => 'URI',
+                    'type' => 'Text',
                 ]],
 
-				// http://developers.whatwg.org/text-level-semantics.html
+                // http://developers.whatwg.org/text-level-semantics.html
                 ['s',    'Inline', 'Inline', 'Common'],
                 ['var',  'Inline', 'Inline', 'Common'],
                 ['sub',  'Inline', 'Inline', 'Common'],
@@ -80,7 +80,7 @@ 
                 ['mark', 'Inline', 'Inline', 'Common'],
                 ['wbr',  'Inline', 'Empty', 'Core'],
 				
-				// http://developers.whatwg.org/edits.html
+                // http://developers.whatwg.org/edits.html
                 ['ins', 'Block', 'Flow', 'Common', ['cite' => 'URI', 'datetime' => 'CDATA']],
                 ['del', 'Block', 'Flow', 'Common', ['cite' => 'URI', 'datetime' => 'CDATA']],
             ],

src/helpers.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-if (!function_exists('clean')) {
+if ( ! function_exists('clean')) {
     function clean($dirty, $config = null)
     {
         return app('purifier')->clean($dirty, $config);