@@ -37,7 +37,7 @@ |
||
37 | 37 | if (ctype_digit($length)) { |
38 | 38 | $length .= 'px'; |
39 | 39 | } |
40 | - $this->prependCSS($attr, $this->cssName . ":$length;"); |
|
40 | + $this->prependCSS($attr, $this->cssName.":$length;"); |
|
41 | 41 | return $attr; |
42 | 42 | } |
43 | 43 | } |
@@ -35,7 +35,7 @@ |
||
35 | 35 | { |
36 | 36 | $this->attr = $attr; |
37 | 37 | $this->enumToCSS = $enum_to_css; |
38 | - $this->caseSensitive = (bool)$case_sensitive; |
|
38 | + $this->caseSensitive = (bool) $case_sensitive; |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | /** |
@@ -25,7 +25,7 @@ |
||
25 | 25 | { |
26 | 26 | $this->attr = $attr; |
27 | 27 | if (!isset($this->css[$attr])) { |
28 | - trigger_error(htmlspecialchars($attr) . ' is not valid space attribute'); |
|
28 | + trigger_error(htmlspecialchars($attr).' is not valid space attribute'); |
|
29 | 29 | } |
30 | 30 | } |
31 | 31 |
@@ -68,7 +68,7 @@ |
||
68 | 68 | */ |
69 | 69 | public static function makeFromSerial() |
70 | 70 | { |
71 | - $contents = file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema.ser'); |
|
71 | + $contents = file_get_contents(HTMLPURIFIER_PREFIX.'/HTMLPurifier/ConfigSchema/schema.ser'); |
|
72 | 72 | $r = unserialize($contents); |
73 | 73 | if (!$r) { |
74 | 74 | $hash = sha1($contents); |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | */ |
31 | 31 | protected function scriptCallback($matches) |
32 | 32 | { |
33 | - return $matches[1] . htmlspecialchars($matches[2], ENT_COMPAT, 'UTF-8') . $matches[3]; |
|
33 | + return $matches[1].htmlspecialchars($matches[2], ENT_COMPAT, 'UTF-8').$matches[3]; |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | /** |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | |
86 | 86 | $e = false; |
87 | 87 | if ($config->get('Core.CollectErrors')) { |
88 | - $e =& $context->get('ErrorCollector'); |
|
88 | + $e = & $context->get('ErrorCollector'); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | // for testing synchronization |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | |
99 | 99 | if ($maintain_line_numbers) { |
100 | 100 | // $rcursor, however, is always at the start of a token. |
101 | - $rcursor = $cursor - (int)$inside_tag; |
|
101 | + $rcursor = $cursor - (int) $inside_tag; |
|
102 | 102 | |
103 | 103 | // Column number is cheap, so we calculate it every round. |
104 | 104 | // We're interested at the *end* of the newline string, so |
@@ -323,7 +323,7 @@ discard block |
||
323 | 323 | } |
324 | 324 | $token = new |
325 | 325 | HTMLPurifier_Token_Text( |
326 | - '<' . |
|
326 | + '<'. |
|
327 | 327 | $this->parseData( |
328 | 328 | substr($html, $cursor) |
329 | 329 | ) |
@@ -375,7 +375,7 @@ discard block |
||
375 | 375 | */ |
376 | 376 | public function parseAttributeString($string, $config, $context) |
377 | 377 | { |
378 | - $string = (string)$string; // quick typecast |
|
378 | + $string = (string) $string; // quick typecast |
|
379 | 379 | |
380 | 380 | if ($string == '') { |
381 | 381 | return array(); |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | |
384 | 384 | $e = false; |
385 | 385 | if ($config->get('Core.CollectErrors')) { |
386 | - $e =& $context->get('ErrorCollector'); |
|
386 | + $e = & $context->get('ErrorCollector'); |
|
387 | 387 | } |
388 | 388 | |
389 | 389 | // let's see if we can abort as quickly as possible |
@@ -454,7 +454,7 @@ discard block |
||
454 | 454 | $key_begin = $cursor; //we're currently at the start of the key |
455 | 455 | |
456 | 456 | // scroll past all characters that are the key (not whitespace or =) |
457 | - $cursor += strcspn($string, $this->_whitespace . '=', $cursor); |
|
457 | + $cursor += strcspn($string, $this->_whitespace.'=', $cursor); |
|
458 | 458 | |
459 | 459 | $key_end = $cursor; // now at the end of the key |
460 | 460 |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | */ |
232 | 232 | public function callbackUndoCommentSubst($matches) |
233 | 233 | { |
234 | - return '<!--' . strtr($matches[1], array('&' => '&', '<' => '<')) . $matches[2]; |
|
234 | + return '<!--'.strtr($matches[1], array('&' => '&', '<' => '<')).$matches[2]; |
|
235 | 235 | } |
236 | 236 | |
237 | 237 | /** |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | */ |
243 | 243 | public function callbackArmorCommentEntities($matches) |
244 | 244 | { |
245 | - return '<!--' . str_replace('&', '&', $matches[1]) . $matches[2]; |
|
245 | + return '<!--'.str_replace('&', '&', $matches[1]).$matches[2]; |
|
246 | 246 | } |
247 | 247 | |
248 | 248 | /** |
@@ -260,10 +260,10 @@ discard block |
||
260 | 260 | if (!empty($def->doctype->dtdPublic) || !empty($def->doctype->dtdSystem)) { |
261 | 261 | $ret .= '<!DOCTYPE html '; |
262 | 262 | if (!empty($def->doctype->dtdPublic)) { |
263 | - $ret .= 'PUBLIC "' . $def->doctype->dtdPublic . '" '; |
|
263 | + $ret .= 'PUBLIC "'.$def->doctype->dtdPublic.'" '; |
|
264 | 264 | } |
265 | 265 | if (!empty($def->doctype->dtdSystem)) { |
266 | - $ret .= '"' . $def->doctype->dtdSystem . '" '; |
|
266 | + $ret .= '"'.$def->doctype->dtdSystem.'" '; |
|
267 | 267 | } |
268 | 268 | $ret .= '>'; |
269 | 269 | } |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | $ret .= '<html><head>'; |
272 | 272 | $ret .= '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />'; |
273 | 273 | // No protection if $html contains a stray </div>! |
274 | - $ret .= '</head><body>' . $html . '</body></html>'; |
|
274 | + $ret .= '</head><body>'.$html.'</body></html>'; |
|
275 | 275 | return $ret; |
276 | 276 | } |
277 | 277 | } |
@@ -89,7 +89,7 @@ |
||
89 | 89 | if (is_string($content_model)) { |
90 | 90 | // Assume that $this->keys is alphanumeric |
91 | 91 | $def->content_model = preg_replace_callback( |
92 | - '/\b(' . implode('|', $this->keys) . ')\b/', |
|
92 | + '/\b('.implode('|', $this->keys).')\b/', |
|
93 | 93 | array($this, 'generateChildDefCallback'), |
94 | 94 | $content_model |
95 | 95 | ); |
@@ -18,17 +18,17 @@ |
||
18 | 18 | public function validateToken($token, $config, $context) |
19 | 19 | { |
20 | 20 | $definition = $config->getHTMLDefinition(); |
21 | - $e =& $context->get('ErrorCollector', true); |
|
21 | + $e = & $context->get('ErrorCollector', true); |
|
22 | 22 | |
23 | 23 | // initialize IDAccumulator if necessary |
24 | - $ok =& $context->get('IDAccumulator', true); |
|
24 | + $ok = & $context->get('IDAccumulator', true); |
|
25 | 25 | if (!$ok) { |
26 | 26 | $id_accumulator = HTMLPurifier_IDAccumulator::build($config, $context); |
27 | 27 | $context->register('IDAccumulator', $id_accumulator); |
28 | 28 | } |
29 | 29 | |
30 | 30 | // initialize CurrentToken if necessary |
31 | - $current_token =& $context->get('CurrentToken', true); |
|
31 | + $current_token = & $context->get('CurrentToken', true); |
|
32 | 32 | if (!$current_token) { |
33 | 33 | $context->register('CurrentToken', $token); |
34 | 34 | } |
@@ -32,8 +32,8 @@ |
||
32 | 32 | public function generateKey($config) |
33 | 33 | { |
34 | 34 | return $config->version . ',' . // possibly replace with function calls |
35 | - $config->getBatchSerial($this->type) . ',' . |
|
36 | - $config->get($this->type . '.DefinitionRev'); |
|
35 | + $config->getBatchSerial($this->type) . ',' . |
|
36 | + $config->get($this->type . '.DefinitionRev'); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | /** |
@@ -31,9 +31,9 @@ discard block |
||
31 | 31 | */ |
32 | 32 | public function generateKey($config) |
33 | 33 | { |
34 | - return $config->version . ',' . // possibly replace with function calls |
|
35 | - $config->getBatchSerial($this->type) . ',' . |
|
36 | - $config->get($this->type . '.DefinitionRev'); |
|
34 | + return $config->version.','.// possibly replace with function calls |
|
35 | + $config->getBatchSerial($this->type).','. |
|
36 | + $config->get($this->type.'.DefinitionRev'); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | /** |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | } |
57 | 57 | // versions match, ids match, check revision number |
58 | 58 | if ($hash == $config->getBatchSerial($this->type) && |
59 | - $revision < $config->get($this->type . '.DefinitionRev')) { |
|
59 | + $revision < $config->get($this->type.'.DefinitionRev')) { |
|
60 | 60 | return true; |
61 | 61 | } |
62 | 62 | return false; |