PetLid / rssreader

vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php

Doc Comments +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
      * @param string $string
      * @param HTMLPurifier_Config $config
      * @param HTMLPurifier_Context $context
-     * @return bool|string
+     * @return string|false
      */
     public function validate($string, $config, $context)
     {

vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ID.php

Doc Comments +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
      * @param string $id
      * @param HTMLPurifier_Config $config
      * @param HTMLPurifier_Context $context
-     * @return bool|string
+     * @return false|string
      */
     public function validate($id, $config, $context)
     {

Spacing +5 added lines, -5 removed lines

@@ -53,19 +53,19 @@ 
             $prefix .= $config->get('Attr.IDPrefixLocal');
             // prevent re-appending the prefix
             if (strpos($id, $prefix) !== 0) {
-                $id = $prefix . $id;
+                $id = $prefix.$id;
             }
         } elseif ($config->get('Attr.IDPrefixLocal') !== '') {
             trigger_error(
-                '%Attr.IDPrefixLocal cannot be used unless ' .
+                '%Attr.IDPrefixLocal cannot be used unless '.
                 '%Attr.IDPrefix is set',
                 E_USER_WARNING
             );
         }
 
         if (!$this->selector) {
-            $id_accumulator =& $context->get('IDAccumulator');
-            if (isset($id_accumulator->ids[$id])) {
+            $id_accumulator = & $context->get('IDAccumulator');
+            if (isset($id_accumulator->ids[ $id ])) {
                 return false;
             }
         }
@@ -75,7 +75,7 @@ 
         if (ctype_alpha($id)) {
             $result = true;
         } else {
-            if (!ctype_alpha(@$id[0])) {
+            if (!ctype_alpha(@$id[ 0 ])) {
                 return false;
             }
             // primitive style of regexps, I suppose

vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php

Doc Comments +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
      * @param string $string
      * @param HTMLPurifier_Config $config
      * @param HTMLPurifier_Context $context
-     * @return bool|string
+     * @return false|string
      */
     public function validate($string, $config, $context)
     {
@@ -34,7 +34,7 @@ 
      * @param string $string
      * @param HTMLPurifier_Config $config
      * @param HTMLPurifier_Context $context
-     * @return array
+     * @return string[]
      */
     protected function split($string, $config, $context)
     {
@@ -56,7 +56,7 @@ 
      * Template method for removing certain tokens based on arbitrary criteria.
      * @note If we wanted to be really functional, we'd do an array_filter
      *       with a callback. But... we're not.
-     * @param array $tokens
+     * @param string[] $tokens
      * @param HTMLPurifier_Config $config
      * @param HTMLPurifier_Context $context
      * @return array

Spacing +3 added lines, -3 removed lines

@@ -45,11 +45,11 @@
         // escaping because I don't know how to do that with regexps
         // and plus it would complicate optimization efforts (you never
         // see that anyway).
-        $pattern = '/(?:(?<=\s)|\A)' . // look behind for space or string start
-            '((?:--|-?[A-Za-z_])[A-Za-z_\-0-9]*)' .
+        $pattern = '/(?:(?<=\s)|\A)'.// look behind for space or string start
+            '((?:--|-?[A-Za-z_])[A-Za-z_\-0-9]*)'.
             '(?:(?=\s)|\z)/'; // look ahead for space or string end
         preg_match_all($pattern, $string, $matches);
-        return $matches[1];
+        return $matches[ 1 ];
     }
 
     /**

vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv6.php

Doc Comments +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      * @param string $aIP
      * @param HTMLPurifier_Config $config
      * @param HTMLPurifier_Context $context
-     * @return bool|string
+     * @return false|string
      */
     public function validate($aIP, $config, $context)
     {

Spacing +8 added lines, -8 removed lines

@@ -24,13 +24,13 @@ 
         $original = $aIP;
 
         $hex = '[0-9a-fA-F]';
-        $blk = '(?:' . $hex . '{1,4})';
+        $blk = '(?:'.$hex.'{1,4})';
         $pre = '(?:/(?:12[0-8]|1[0-1][0-9]|[1-9][0-9]|[0-9]))'; // /0 - /128
 
         //      prefix check
         if (strpos($aIP, '/') !== false) {
-            if (preg_match('#' . $pre . '$#s', $aIP, $find)) {
-                $aIP = substr($aIP, 0, 0 - strlen($find[0]));
+            if (preg_match('#'.$pre.'$#s', $aIP, $find)) {
+                $aIP = substr($aIP, 0, 0 - strlen($find[ 0 ]));
                 unset($find);
             } else {
                 return false;
@@ -38,11 +38,11 @@ 
         }
 
         //      IPv4-compatiblity check
-        if (preg_match('#(?<=:' . ')' . $this->ip4 . '$#s', $aIP, $find)) {
-            $aIP = substr($aIP, 0, 0 - strlen($find[0]));
-            $ip = explode('.', $find[0]);
+        if (preg_match('#(?<=:'.')'.$this->ip4.'$#s', $aIP, $find)) {
+            $aIP = substr($aIP, 0, 0 - strlen($find[ 0 ]));
+            $ip = explode('.', $find[ 0 ]);
             $ip = array_map('dechex', $ip);
-            $aIP .= $ip[0] . $ip[1] . ':' . $ip[2] . $ip[3];
+            $aIP .= $ip[ 0 ].$ip[ 1 ].':'.$ip[ 2 ].$ip[ 3 ];
             unset($find, $ip);
         }
 
@@ -68,7 +68,7 @@ 
             $aIP = $first;
             unset($first, $second);
         } else {
-            $aIP = explode(':', $aIP[0]);
+            $aIP = explode(':', $aIP[ 0 ]);
         }
         $c = count($aIP);
 

vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Custom.php

Doc Comments +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
     private $_pcre_regex;
 
     /**
-     * @param $dtd_regex Allowed child pattern from the DTD
+     * @param string $dtd_regex Allowed child pattern from the DTD
      */
     public function __construct($dtd_regex)
     {

Spacing +6 added lines, -6 removed lines

@@ -56,8 +56,8 @@ 
 
         // collect all elements into the $elements array
         preg_match_all("/$el/", $reg, $matches);
-        foreach ($matches[0] as $match) {
-            $this->elements[$match] = true;
+        foreach ($matches[ 0 ] as $match) {
+            $this->elements[ $match ] = true;
         }
 
         // setup all elements as parentheticals with leading commas
@@ -86,16 +86,16 @@ 
             if (!empty($node->is_whitespace)) {
                 continue;
             }
-            $list_of_children .= $node->name . ',';
+            $list_of_children .= $node->name.',';
         }
         // add leading comma to deal with stray comma declarations
-        $list_of_children = ',' . rtrim($list_of_children, ',');
+        $list_of_children = ','.rtrim($list_of_children, ',');
         $okay =
             preg_match(
-                '/^,?' . $this->_pcre_regex . '$/',
+                '/^,?'.$this->_pcre_regex.'$/',
                 $list_of_children
             );
-        return (bool)$okay;
+        return (bool) $okay;
     }
 }
 

vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Optional.php

Doc Comments +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     public $type = 'optional';
 
     /**
-     * @param array $children
+     * @param HTMLPurifier_Node[] $children
      * @param HTMLPurifier_Config $config
      * @param HTMLPurifier_Context $context
      * @return array

vendor/ezyang/htmlpurifier/library/HTMLPurifier/Config.php

Doc Comments +1 added lines, -1 removed lines

@@ -763,7 +763,7 @@
      * @param bool $mq_fix Boolean whether or not to enable magic quotes fix
      * @param HTMLPurifier_ConfigSchema $schema Schema to use, if not global copy
      *
-     * @return mixed
+     * @return HTMLPurifier_Config
      */
     public static function loadArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null)
     {

Indentation +2 added lines, -2 removed lines

@@ -782,8 +782,8 @@
      */
     public function mergeArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true)
     {
-         $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $this->def);
-         $this->loadArray($ret);
+            $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $this->def);
+            $this->loadArray($ret);
     }
 
     /**

Spacing +66 added lines, -67 removed lines

@@ -178,18 +178,18 @@ 
         if (!$this->finalized) {
             $this->autoFinalize();
         }
-        if (!isset($this->def->info[$key])) {
+        if (!isset($this->def->info[ $key ])) {
             // can't add % due to SimpleTest bug
             $this->triggerError(
-                'Cannot retrieve value of undefined directive ' . htmlspecialchars($key),
+                'Cannot retrieve value of undefined directive '.htmlspecialchars($key),
                 E_USER_WARNING
             );
             return;
         }
-        if (isset($this->def->info[$key]->isAlias)) {
-            $d = $this->def->info[$key];
+        if (isset($this->def->info[ $key ]->isAlias)) {
+            $d = $this->def->info[ $key ];
             $this->triggerError(
-                'Cannot get value from aliased directive, use real name ' . $d->key,
+                'Cannot get value from aliased directive, use real name '.$d->key,
                 E_USER_ERROR
             );
             return;
@@ -198,9 +198,9 @@ 
             list($ns) = explode('.', $key);
             if ($ns !== $this->lock) {
                 $this->triggerError(
-                    'Cannot get value of namespace ' . $ns . ' when lock for ' .
-                    $this->lock .
-                    ' is active, this probably indicates a Definition setup method ' .
+                    'Cannot get value of namespace '.$ns.' when lock for '.
+                    $this->lock.
+                    ' is active, this probably indicates a Definition setup method '.
                     'is accessing directives that are not within its namespace',
                     E_USER_ERROR
                 );
@@ -223,15 +223,15 @@ 
             $this->autoFinalize();
         }
         $full = $this->getAll();
-        if (!isset($full[$namespace])) {
+        if (!isset($full[ $namespace ])) {
             $this->triggerError(
-                'Cannot retrieve undefined namespace ' .
+                'Cannot retrieve undefined namespace '.
                 htmlspecialchars($namespace),
                 E_USER_WARNING
             );
             return;
         }
-        return $full[$namespace];
+        return $full[ $namespace ];
     }
 
     /**
@@ -246,12 +246,12 @@ 
      */
     public function getBatchSerial($namespace)
     {
-        if (empty($this->serials[$namespace])) {
+        if (empty($this->serials[ $namespace ])) {
             $batch = $this->getBatch($namespace);
-            unset($batch['DefinitionRev']);
-            $this->serials[$namespace] = sha1(serialize($batch));
+            unset($batch[ 'DefinitionRev' ]);
+            $this->serials[ $namespace ] = sha1(serialize($batch));
         }
-        return $this->serials[$namespace];
+        return $this->serials[ $namespace ];
     }
 
     /**
@@ -281,7 +281,7 @@ 
         $ret = array();
         foreach ($this->plist->squash() as $name => $value) {
             list($ns, $key) = explode('.', $name, 2);
-            $ret[$ns][$key] = $value;
+            $ret[ $ns ][ $key ] = $value;
         }
         return $ret;
     }
@@ -307,20 +307,20 @@ 
         if ($this->isFinalized('Cannot set directive after finalization')) {
             return;
         }
-        if (!isset($this->def->info[$key])) {
+        if (!isset($this->def->info[ $key ])) {
             $this->triggerError(
-                'Cannot set undefined directive ' . htmlspecialchars($key) . ' to value',
+                'Cannot set undefined directive '.htmlspecialchars($key).' to value',
                 E_USER_WARNING
             );
             return;
         }
-        $def = $this->def->info[$key];
+        $def = $this->def->info[ $key ];
 
         if (isset($def->isAlias)) {
             if ($this->aliasMode) {
                 $this->triggerError(
                     'Double-aliases not allowed, please fix '.
-                    'ConfigSchema bug with' . $key,
+                    'ConfigSchema bug with'.$key,
                     E_USER_ERROR
                 );
                 return;
@@ -347,7 +347,7 @@ 
             $value = $this->parser->parse($value, $type, $allow_null);
         } catch (HTMLPurifier_VarParserException $e) {
             $this->triggerError(
-                'Value for ' . $key . ' is of invalid type, should be ' .
+                'Value for '.$key.' is of invalid type, should be '.
                 HTMLPurifier_VarParser::getTypeName($type),
                 E_USER_WARNING
             );
@@ -355,13 +355,13 @@ 
         }
         if (is_string($value) && is_object($def)) {
             // resolve value alias if defined
-            if (isset($def->aliases[$value])) {
-                $value = $def->aliases[$value];
+            if (isset($def->aliases[ $value ])) {
+                $value = $def->aliases[ $value ];
             }
             // check to see if the value is allowed
-            if (isset($def->allowed) && !isset($def->allowed[$value])) {
+            if (isset($def->allowed) && !isset($def->allowed[ $value ])) {
                 $this->triggerError(
-                    'Value not supported, valid values are: ' .
+                    'Value not supported, valid values are: '.
                     $this->_listify($def->allowed),
                     E_USER_WARNING
                 );
@@ -374,10 +374,10 @@ 
         // this is a very costly process, so it's discouraged
         // with finalization
         if ($namespace == 'HTML' || $namespace == 'CSS' || $namespace == 'URI') {
-            $this->definitions[$namespace] = null;
+            $this->definitions[ $namespace ] = null;
         }
 
-        $this->serials[$namespace] = false;
+        $this->serials[ $namespace ] = false;
     }
 
     /**
@@ -391,7 +391,7 @@ 
     {
         $list = array();
         foreach ($lookup as $name => $b) {
-            $list[] = $name;
+            $list[ ] = $name;
         }
         return implode(', ', $list);
     }
@@ -488,8 +488,8 @@ 
             // full definition
             // ---------------
             // check if definition is in memory
-            if (!empty($this->definitions[$type])) {
-                $def = $this->definitions[$type];
+            if (!empty($this->definitions[ $type ])) {
+                $def = $this->definitions[ $type ];
                 // check if the definition is setup
                 if ($def->setup) {
                     return $def;
@@ -505,7 +505,7 @@ 
             $def = $cache->get($this);
             if ($def) {
                 // definition in cache, save to memory and return it
-                $this->definitions[$type] = $def;
+                $this->definitions[ $type ] = $def;
                 return $def;
             }
             // initialize it
@@ -524,28 +524,27 @@ 
             // check preconditions
             $def = null;
             if ($optimized) {
-                if (is_null($this->get($type . '.DefinitionID'))) {
+                if (is_null($this->get($type.'.DefinitionID'))) {
                     // fatally error out if definition ID not set
                     throw new HTMLPurifier_Exception(
                         "Cannot retrieve raw version without specifying %$type.DefinitionID"
                     );
                 }
             }
-            if (!empty($this->definitions[$type])) {
-                $def = $this->definitions[$type];
+            if (!empty($this->definitions[ $type ])) {
+                $def = $this->definitions[ $type ];
                 if ($def->setup && !$optimized) {
                     $extra = $this->chatty ?
-                        " (try moving this code block earlier in your initialization)" :
-                        "";
+                        " (try moving this code block earlier in your initialization)" : "";
                     throw new HTMLPurifier_Exception(
-                        "Cannot retrieve raw definition after it has already been setup" .
+                        "Cannot retrieve raw definition after it has already been setup".
                         $extra
                     );
                 }
                 if ($def->optimized === null) {
                     $extra = $this->chatty ? " (try flushing your cache)" : "";
                     throw new HTMLPurifier_Exception(
-                        "Optimization status of definition is unknown" . $extra
+                        "Optimization status of definition is unknown".$extra
                     );
                 }
                 if ($def->optimized !== $optimized) {
@@ -554,7 +553,7 @@ 
                         " (this backtrace is for the first inconsistent call, which was for a $msg raw definition)"
                         : "";
                     throw new HTMLPurifier_Exception(
-                        "Inconsistent use of optimized and unoptimized raw definition retrievals" . $extra
+                        "Inconsistent use of optimized and unoptimized raw definition retrievals".$extra
                     );
                 }
             }
@@ -580,22 +579,22 @@ 
                 if ($def) {
                     // save the full definition for later, but don't
                     // return it yet
-                    $this->definitions[$type] = $def;
+                    $this->definitions[ $type ] = $def;
                     return null;
                 }
             }
             // check invariants for creation
             if (!$optimized) {
-                if (!is_null($this->get($type . '.DefinitionID'))) {
+                if (!is_null($this->get($type.'.DefinitionID'))) {
                     if ($this->chatty) {
                         $this->triggerError(
-                            'Due to a documentation error in previous version of HTML Purifier, your ' .
-                            'definitions are not being cached.  If this is OK, you can remove the ' .
-                            '%$type.DefinitionRev and %$type.DefinitionID declaration.  Otherwise, ' .
-                            'modify your code to use maybeGetRawDefinition, and test if the returned ' .
-                            'value is null before making any edits (if it is null, that means that a ' .
-                            'cached version is available, and no raw operations are necessary).  See ' .
-                            '<a href="http://htmlpurifier.org/docs/enduser-customize.html#optimized">' .
+                            'Due to a documentation error in previous version of HTML Purifier, your '.
+                            'definitions are not being cached.  If this is OK, you can remove the '.
+                            '%$type.DefinitionRev and %$type.DefinitionID declaration.  Otherwise, '.
+                            'modify your code to use maybeGetRawDefinition, and test if the returned '.
+                            'value is null before making any edits (if it is null, that means that a '.
+                            'cached version is available, and no raw operations are necessary).  See '.
+                            '<a href="http://htmlpurifier.org/docs/enduser-customize.html#optimized">'.
                             'Customize</a> for more details',
                             E_USER_WARNING
                         );
@@ -637,7 +636,7 @@ 
                 "Definition of $type type not supported"
             );
         }
-        $this->definitions[$type] = $def;
+        $this->definitions[ $type ] = $def;
         return $def;
     }
 
@@ -689,7 +688,7 @@ 
                 $namespace = $key;
                 $namespace_values = $value;
                 foreach ($namespace_values as $directive => $value2) {
-                    $this->set($namespace .'.'. $directive, $value2);
+                    $this->set($namespace.'.'.$directive, $value2);
                 }
             }
         }
@@ -720,14 +719,14 @@ 
             foreach ($allowed as $ns_or_directive) {
                 if (strpos($ns_or_directive, '.') !== false) {
                     // directive
-                    if ($ns_or_directive[0] == '-') {
-                        $blacklisted_directives[substr($ns_or_directive, 1)] = true;
+                    if ($ns_or_directive[ 0 ] == '-') {
+                        $blacklisted_directives[ substr($ns_or_directive, 1) ] = true;
                     } else {
-                        $allowed_directives[$ns_or_directive] = true;
+                        $allowed_directives[ $ns_or_directive ] = true;
                     }
                 } else {
                     // namespace
-                    $allowed_ns[$ns_or_directive] = true;
+                    $allowed_ns[ $ns_or_directive ] = true;
                 }
             }
         }
@@ -735,10 +734,10 @@ 
         foreach ($schema->info as $key => $def) {
             list($ns, $directive) = explode('.', $key, 2);
             if ($allowed !== true) {
-                if (isset($blacklisted_directives["$ns.$directive"])) {
+                if (isset($blacklisted_directives[ "$ns.$directive" ])) {
                     continue;
                 }
-                if (!isset($allowed_directives["$ns.$directive"]) && !isset($allowed_ns[$ns])) {
+                if (!isset($allowed_directives[ "$ns.$directive" ]) && !isset($allowed_ns[ $ns ])) {
                     continue;
                 }
             }
@@ -748,7 +747,7 @@ 
             if ($directive == 'DefinitionID' || $directive == 'DefinitionRev') {
                 continue;
             }
-            $ret[] = array($ns, $directive);
+            $ret[ ] = array($ns, $directive);
         }
         return $ret;
     }
@@ -801,7 +800,7 @@ 
     public static function prepareArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null)
     {
         if ($index !== false) {
-            $array = (isset($array[$index]) && is_array($array[$index])) ? $array[$index] : array();
+            $array = (isset($array[ $index ]) && is_array($array[ $index ])) ? $array[ $index ] : array();
         }
         $mq = $mq_fix && function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc();
 
@@ -810,15 +809,15 @@ 
         foreach ($allowed as $key) {
             list($ns, $directive) = $key;
             $skey = "$ns.$directive";
-            if (!empty($array["Null_$skey"])) {
-                $ret[$ns][$directive] = null;
+            if (!empty($array[ "Null_$skey" ])) {
+                $ret[ $ns ][ $directive ] = null;
                 continue;
             }
-            if (!isset($array[$skey])) {
+            if (!isset($array[ $skey ])) {
                 continue;
             }
-            $value = $mq ? stripslashes($array[$skey]) : $array[$skey];
-            $ret[$ns][$directive] = $value;
+            $value = $mq ? stripslashes($array[ $skey ]) : $array[ $skey ];
+            $ret[ $ns ][ $directive ] = $value;
         }
         return $ret;
     }
@@ -890,15 +889,15 @@ 
             // zip(tail(trace), trace) -- but PHP is not Haskell har har
             for ($i = 0, $c = count($trace); $i < $c - 1; $i++) {
                 // XXX this is not correct on some versions of HTML Purifier
-                if ($trace[$i + 1]['class'] === 'HTMLPurifier_Config') {
+                if ($trace[ $i + 1 ][ 'class' ] === 'HTMLPurifier_Config') {
                     continue;
                 }
-                $frame = $trace[$i];
-                $extra = " invoked on line {$frame['line']} in file {$frame['file']}";
+                $frame = $trace[ $i ];
+                $extra = " invoked on line {$frame[ 'line' ]} in file {$frame[ 'file' ]}";
                 break;
             }
         }
-        trigger_error($msg . $extra, $no);
+        trigger_error($msg.$extra, $no);
     }
 
     /**

Braces +3 added lines, -1 removed lines

@@ -133,7 +133,9 @@
         }
         if (is_string($config)) {
             $ret->loadIni($config);
-        } elseif (is_array($config)) $ret->loadArray($config);
+        } elseif (is_array($config)) {
+            $ret->loadArray($config);
+        }
         return $ret;
     }
 

vendor/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php

Doc Comments +1 added lines, -1 removed lines

@@ -351,7 +351,7 @@
     }
 
     /**
-     * @return bool
+     * @return boolean|null
      */
     public static function iconvAvailable()
     {

Indentation +1 added lines, -1 removed lines

@@ -139,7 +139,7 @@
         }
 
         $mState = 0; // cached expected number of octets after the current octet
-                     // until the beginning of the next UTF8 character sequence
+                        // until the beginning of the next UTF8 character sequence
         $mUcs4  = 0; // cached Unicode character
         $mBytes = 1; // cached expected number of octets in the current sequence
 

Spacing +20 added lines, -20 removed lines

@@ -71,13 +71,13 @@ 
                         break;
                     }
                     // wibble the boundary
-                    if (0x80 != (0xC0 & ord($text[$i + $max_chunk_size]))) {
+                    if (0x80 != (0xC0 & ord($text[ $i + $max_chunk_size ]))) {
                         $chunk_size = $max_chunk_size;
-                    } elseif (0x80 != (0xC0 & ord($text[$i + $max_chunk_size - 1]))) {
+                    } elseif (0x80 != (0xC0 & ord($text[ $i + $max_chunk_size - 1 ]))) {
                         $chunk_size = $max_chunk_size - 1;
-                    } elseif (0x80 != (0xC0 & ord($text[$i + $max_chunk_size - 2]))) {
+                    } elseif (0x80 != (0xC0 & ord($text[ $i + $max_chunk_size - 2 ]))) {
                         $chunk_size = $max_chunk_size - 2;
-                    } elseif (0x80 != (0xC0 & ord($text[$i + $max_chunk_size - 3]))) {
+                    } elseif (0x80 != (0xC0 & ord($text[ $i + $max_chunk_size - 3 ]))) {
                         $chunk_size = $max_chunk_size - 3;
                     } else {
                         return false; // rather confusing UTF-8...
@@ -155,7 +155,7 @@ 
         $len = strlen($str);
         for ($i = 0; $i < $len; $i++) {
             $in = ord($str{$i});
-            $char .= $str[$i]; // append byte to char
+            $char .= $str[ $i ]; // append byte to char
             if (0 == $mState) {
                 // When mState is zero we expect either a US-ASCII character
                 // or a multi-octet sequence.
@@ -273,7 +273,7 @@ 
                     $mState = 0;
                     $mUcs4  = 0;
                     $mBytes = 1;
-                    $char ='';
+                    $char = '';
                 }
             }
         }
@@ -309,7 +309,7 @@ 
     public static function unichr($code)
     {
         if ($code > 1114111 or $code < 0 or
-          ($code >= 55296 and $code <= 57343) ) {
+          ($code >= 55296 and $code <= 57343)) {
             // bits are set outside the "valid" range as defined
             // by UNICODE 4.1.0
             return '';
@@ -330,7 +330,7 @@ 
                     $z = (($code >> 12) & 15) | 224;
                 } else {
                     $z = (($code >> 12) & 63) | 128;
-                    $w = (($code >> 18) & 7)  | 240;
+                    $w = (($code >> 18) & 7) | 240;
                 }
             }
         }
@@ -384,7 +384,7 @@ 
             $str = self::unsafeIconv($encoding, 'utf-8//IGNORE', $str);
             if ($str === false) {
                 // $encoding is not a valid encoding
-                trigger_error('Invalid encoding ' . $encoding, E_USER_ERROR);
+                trigger_error('Invalid encoding '.$encoding, E_USER_ERROR);
                 return '';
             }
             // If the string is bjorked by Shift_JIS or a similar encoding
@@ -401,7 +401,7 @@ 
             trigger_error('Encoding not supported, please install iconv', E_USER_ERROR);
         } else {
             trigger_error(
-                'You have a buggy version of iconv, see https://bugs.php.net/bug.php?id=48147 ' .
+                'You have a buggy version of iconv, see https://bugs.php.net/bug.php?id=48147 '.
                 'and http://sourceware.org/bugzilla/show_bug.cgi?id=13541',
                 E_USER_ERROR
             );
@@ -436,13 +436,13 @@ 
             if (!$escape && !empty($ascii_fix)) {
                 $clear_fix = array();
                 foreach ($ascii_fix as $utf8 => $native) {
-                    $clear_fix[$utf8] = '';
+                    $clear_fix[ $utf8 ] = '';
                 }
                 $str = strtr($str, $clear_fix);
             }
             $str = strtr($str, array_flip($ascii_fix));
             // Normal stuff
-            $str = self::iconv('utf-8', $encoding . '//IGNORE', $str);
+            $str = self::iconv('utf-8', $encoding.'//IGNORE', $str);
             return $str;
         } elseif ($encoding === 'iso-8859-1') {
             $str = utf8_decode($str);
@@ -478,7 +478,7 @@ 
         $working = 0;
         $len = strlen($str);
         for ($i = 0; $i < $len; $i++) {
-            $bytevalue = ord($str[$i]);
+            $bytevalue = ord($str[ $i ]);
             if ($bytevalue <= 0x7F) { //0xxx xxxx
                 $result .= chr($bytevalue);
                 $bytesleft = 0;
@@ -487,7 +487,7 @@ 
                 $working += ($bytevalue & 0x3F);
                 $bytesleft--;
                 if ($bytesleft <= 0) {
-                    $result .= "&#" . $working . ";";
+                    $result .= "&#".$working.";";
                 }
             } elseif ($bytevalue <= 0xDF) { //110x xxxx
                 $working = $bytevalue & 0x1F;
@@ -533,14 +533,14 @@ 
         static $code = null;
         if ($code === null) {
             // better not use iconv, otherwise infinite loop!
-            $r = self::unsafeIconv('utf-8', 'ascii//IGNORE', "\xCE\xB1" . str_repeat('a', 9000));
+            $r = self::unsafeIconv('utf-8', 'ascii//IGNORE', "\xCE\xB1".str_repeat('a', 9000));
             if ($r === false) {
                 $code = self::ICONV_UNUSABLE;
             } elseif (($c = strlen($r)) < 9000) {
                 $code = self::ICONV_TRUNCATES;
             } elseif ($c > 9000) {
                 trigger_error(
-                    'Your copy of iconv is extremely buggy. Please notify HTML Purifier maintainers: ' .
+                    'Your copy of iconv is extremely buggy. Please notify HTML Purifier maintainers: '.
                     'include your iconv version as per phpversion()',
                     E_USER_ERROR
                 );
@@ -571,8 +571,8 @@ 
         // If ICONV_UNUSABLE, this call is irrelevant
         static $encodings = array();
         if (!$bypass) {
-            if (isset($encodings[$encoding])) {
-                return $encodings[$encoding];
+            if (isset($encodings[ $encoding ])) {
+                return $encodings[ $encoding ];
             }
             $lenc = strtolower($encoding);
             switch ($lenc) {
@@ -600,10 +600,10 @@ 
                 // Reverse engineer: what's the UTF-8 equiv of this byte
                 // sequence? This assumes that there's no variable width
                 // encoding that doesn't support ASCII.
-                $ret[self::unsafeIconv($encoding, 'UTF-8//IGNORE', $c)] = $c;
+                $ret[ self::unsafeIconv($encoding, 'UTF-8//IGNORE', $c) ] = $c;
             }
         }
-        $encodings[$encoding] = $ret;
+        $encodings[ $encoding ] = $ret;
         return $ret;
     }
 }

vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLDefinition.php

Doc Comments +1 added lines, -1 removed lines

@@ -451,7 +451,7 @@
      * separate lists for processing. Format is element[attr1|attr2],element2...
      * @warning Although it's largely drawn from TinyMCE's implementation,
      *      it is different, and you'll probably have to modify your lists
-     * @param array $list String list to parse
+     * @param string $list String list to parse
      * @return array
      * @todo Give this its own class, probably static interface
      */

Spacing +46 added lines, -46 removed lines

@@ -113,12 +113,12 @@ 
     public function addAttribute($element_name, $attr_name, $def)
     {
         $module = $this->getAnonymousModule();
-        if (!isset($module->info[$element_name])) {
+        if (!isset($module->info[ $element_name ])) {
             $element = $module->addBlankElement($element_name);
         } else {
-            $element = $module->info[$element_name];
+            $element = $module->info[ $element_name ];
         }
-        $element->attr[$attr_name] = $def;
+        $element->attr[ $attr_name ] = $def;
     }
 
     /**
@@ -198,8 +198,8 @@ 
 
         // cleanup some of the element definitions
         foreach ($this->info as $k => $v) {
-            unset($this->info[$k]->content_model);
-            unset($this->info[$k]->content_model_type);
+            unset($this->info[ $k ]->content_model);
+            unset($this->info[ $k ]->content_model_type);
         }
     }
 
@@ -223,30 +223,30 @@ 
         foreach ($this->manager->modules as $module) {
             foreach ($module->info_tag_transform as $k => $v) {
                 if ($v === false) {
-                    unset($this->info_tag_transform[$k]);
+                    unset($this->info_tag_transform[ $k ]);
                 } else {
-                    $this->info_tag_transform[$k] = $v;
+                    $this->info_tag_transform[ $k ] = $v;
                 }
             }
             foreach ($module->info_attr_transform_pre as $k => $v) {
                 if ($v === false) {
-                    unset($this->info_attr_transform_pre[$k]);
+                    unset($this->info_attr_transform_pre[ $k ]);
                 } else {
-                    $this->info_attr_transform_pre[$k] = $v;
+                    $this->info_attr_transform_pre[ $k ] = $v;
                 }
             }
             foreach ($module->info_attr_transform_post as $k => $v) {
                 if ($v === false) {
-                    unset($this->info_attr_transform_post[$k]);
+                    unset($this->info_attr_transform_post[ $k ]);
                 } else {
-                    $this->info_attr_transform_post[$k] = $v;
+                    $this->info_attr_transform_post[ $k ] = $v;
                 }
             }
             foreach ($module->info_injector as $k => $v) {
                 if ($v === false) {
-                    unset($this->info_injector[$k]);
+                    unset($this->info_injector[ $k ]);
                 } else {
-                    $this->info_injector[$k] = $v;
+                    $this->info_injector[ $k ] = $v;
                 }
             }
         }
@@ -261,7 +261,7 @@ 
     protected function setupConfigStuff($config)
     {
         $block_wrapper = $config->get('HTML.BlockWrapper');
-        if (isset($this->info_content_sets['Block'][$block_wrapper])) {
+        if (isset($this->info_content_sets[ 'Block' ][ $block_wrapper ])) {
             $this->info_block_wrapper = $block_wrapper;
         } else {
             trigger_error(
@@ -300,10 +300,10 @@ 
 
         if (is_array($allowed_elements)) {
             foreach ($this->info as $name => $d) {
-                if (!isset($allowed_elements[$name])) {
-                    unset($this->info[$name]);
+                if (!isset($allowed_elements[ $name ])) {
+                    unset($this->info[ $name ]);
                 }
-                unset($allowed_elements[$name]);
+                unset($allowed_elements[ $name ]);
             }
             // emit errors
             foreach ($allowed_elements as $element => $d) {
@@ -323,15 +323,15 @@ 
                 $keys = array($attr, "*@$attr", "*.$attr");
                 $delete = true;
                 foreach ($keys as $key) {
-                    if ($delete && isset($allowed_attributes[$key])) {
+                    if ($delete && isset($allowed_attributes[ $key ])) {
                         $delete = false;
                     }
-                    if (isset($allowed_attributes_mutable[$key])) {
-                        unset($allowed_attributes_mutable[$key]);
+                    if (isset($allowed_attributes_mutable[ $key ])) {
+                        unset($allowed_attributes_mutable[ $key ]);
                     }
                 }
                 if ($delete) {
-                    unset($this->info_global_attr[$attr]);
+                    unset($this->info_global_attr[ $attr ]);
                 }
             }
 
@@ -340,22 +340,22 @@ 
                     $keys = array("$tag@$attr", $attr, "*@$attr", "$tag.$attr", "*.$attr");
                     $delete = true;
                     foreach ($keys as $key) {
-                        if ($delete && isset($allowed_attributes[$key])) {
+                        if ($delete && isset($allowed_attributes[ $key ])) {
                             $delete = false;
                         }
-                        if (isset($allowed_attributes_mutable[$key])) {
-                            unset($allowed_attributes_mutable[$key]);
+                        if (isset($allowed_attributes_mutable[ $key ])) {
+                            unset($allowed_attributes_mutable[ $key ]);
                         }
                     }
                     if ($delete) {
-                        if ($this->info[$tag]->attr[$attr]->required) {
+                        if ($this->info[ $tag ]->attr[ $attr ]->required) {
                             trigger_error(
-                                "Required attribute '$attr' in element '$tag' " .
+                                "Required attribute '$attr' in element '$tag' ".
                                 "was not allowed, which means '$tag' will not be allowed either",
                                 E_USER_WARNING
                             );
                         }
-                        unset($this->info[$tag]->attr[$attr]);
+                        unset($this->info[ $tag ]->attr[ $attr ]);
                     }
                 }
             }
@@ -365,12 +365,12 @@ 
                 $c = count($bits);
                 switch ($c) {
                     case 2:
-                        if ($bits[0] !== '*') {
-                            $element = htmlspecialchars($bits[0]);
-                            $attribute = htmlspecialchars($bits[1]);
-                            if (!isset($this->info[$element])) {
+                        if ($bits[ 0 ] !== '*') {
+                            $element = htmlspecialchars($bits[ 0 ]);
+                            $attribute = htmlspecialchars($bits[ 1 ]);
+                            if (!isset($this->info[ $element ])) {
                                 trigger_error(
-                                    "Cannot allow attribute '$attribute' if element " .
+                                    "Cannot allow attribute '$attribute' if element ".
                                     "'$element' is not allowed/supported $support"
                                 );
                             } else {
@@ -383,7 +383,7 @@ 
                         }
                         // otherwise fall through
                     case 1:
-                        $attribute = htmlspecialchars($bits[0]);
+                        $attribute = htmlspecialchars($bits[ 0 ]);
                         trigger_error(
                             "Global attribute '$attribute' is not ".
                             "supported in any elements $support",
@@ -400,21 +400,21 @@ 
         $forbidden_attributes = $config->get('HTML.ForbiddenAttributes');
 
         foreach ($this->info as $tag => $info) {
-            if (isset($forbidden_elements[$tag])) {
-                unset($this->info[$tag]);
+            if (isset($forbidden_elements[ $tag ])) {
+                unset($this->info[ $tag ]);
                 continue;
             }
             foreach ($info->attr as $attr => $x) {
-                if (isset($forbidden_attributes["$tag@$attr"]) ||
-                    isset($forbidden_attributes["*@$attr"]) ||
-                    isset($forbidden_attributes[$attr])
+                if (isset($forbidden_attributes[ "$tag@$attr" ]) ||
+                    isset($forbidden_attributes[ "*@$attr" ]) ||
+                    isset($forbidden_attributes[ $attr ])
                 ) {
-                    unset($this->info[$tag]->attr[$attr]);
+                    unset($this->info[ $tag ]->attr[ $attr ]);
                     continue;
-                } elseif (isset($forbidden_attributes["$tag.$attr"])) { // this segment might get removed eventually
+                } elseif (isset($forbidden_attributes[ "$tag.$attr" ])) { // this segment might get removed eventually
                     // $tag.$attr are not user supplied, so no worries!
                     trigger_error(
-                        "Error with $tag.$attr: tag.attr syntax not supported for " .
+                        "Error with $tag.$attr: tag.attr syntax not supported for ".
                         "HTML.ForbiddenAttributes; use tag@attr instead",
                         E_USER_WARNING
                     );
@@ -425,10 +425,10 @@ 
             if (strlen($key) < 2) {
                 continue;
             }
-            if ($key[0] != '*') {
+            if ($key[ 0 ] != '*') {
                 continue;
             }
-            if ($key[1] == '.') {
+            if ($key[ 1 ] == '.') {
                 trigger_error(
                     "Error with $key: *.attr syntax not supported for HTML.ForbiddenAttributes; use attr instead",
                     E_USER_WARNING
@@ -441,7 +441,7 @@ 
             if ($injector->checkNeeded($config) !== false) {
                 // remove injector that does not have it's required
                 // elements/attributes present, and is thus not needed.
-                unset($this->info_injector[$i]);
+                unset($this->info_injector[ $i ]);
             }
         }
     }
@@ -475,7 +475,7 @@ 
                 list($element, $attr) = explode('[', $chunk);
             }
             if ($element !== '*') {
-                $elements[$element] = true;
+                $elements[ $element ] = true;
             }
             if (!$attr) {
                 continue;
@@ -483,7 +483,7 @@ 
             $attr = substr($attr, 0, strlen($attr) - 1); // remove trailing ]
             $attr = explode('|', $attr);
             foreach ($attr as $key) {
-                $attributes["$element.$key"] = true;
+                $attributes[ "$element.$key" ] = true;
             }
         }
         return array($elements, $attributes);