@@ -469,7 +469,7 @@ discard block |
||
469 | 469 | $this->state = 'data'; |
470 | 470 | |
471 | 471 | while ($this->state !== null) { |
472 | - $this->{$this->state . 'State'}(); |
|
472 | + $this->{$this->state.'State'}(); |
|
473 | 473 | } |
474 | 474 | } |
475 | 475 | |
@@ -498,7 +498,7 @@ discard block |
||
498 | 498 | |
499 | 499 | private function characters($char_class, $start) |
500 | 500 | { |
501 | - return preg_replace('#^([' . $char_class . ']+).*#s', '\\1', substr($this->data, $start)); |
|
501 | + return preg_replace('#^(['.$char_class.']+).*#s', '\\1', substr($this->data, $start)); |
|
502 | 502 | } |
503 | 503 | |
504 | 504 | private function dataState() |
@@ -1289,7 +1289,7 @@ discard block |
||
1289 | 1289 | } else { |
1290 | 1290 | /* Append a U+002D HYPHEN-MINUS (-) character and the input |
1291 | 1291 | character to the comment token's data. Switch to the comment state. */ |
1292 | - $this->token['data'] .= '-' . $char; |
|
1292 | + $this->token['data'] .= '-'.$char; |
|
1293 | 1293 | $this->state = 'comment'; |
1294 | 1294 | } |
1295 | 1295 | } |
@@ -1313,7 +1313,7 @@ discard block |
||
1313 | 1313 | $this->state = 'data'; |
1314 | 1314 | |
1315 | 1315 | } else { |
1316 | - $this->token['data'] .= '--' . $char; |
|
1316 | + $this->token['data'] .= '--'.$char; |
|
1317 | 1317 | $this->state = 'comment'; |
1318 | 1318 | } |
1319 | 1319 | } |
@@ -1547,7 +1547,7 @@ discard block |
||
1547 | 1547 | |
1548 | 1548 | // Return a character token for the character corresponding to the |
1549 | 1549 | // entity name (as given by the second column of the entities table). |
1550 | - return html_entity_decode('&' . $entity . ';', ENT_QUOTES, 'UTF-8'); |
|
1550 | + return html_entity_decode('&'.$entity.';', ENT_QUOTES, 'UTF-8'); |
|
1551 | 1551 | } |
1552 | 1552 | |
1553 | 1553 | private function emitToken($token) |
@@ -2656,7 +2656,7 @@ discard block |
||
2656 | 2656 | |
2657 | 2657 | /* Act as if a stream of character tokens had been seen. */ |
2658 | 2658 | $this->insertText( |
2659 | - 'This is a searchable index. ' . |
|
2659 | + 'This is a searchable index. '. |
|
2660 | 2660 | 'Insert your search keywords here: ' |
2661 | 2661 | ); |
2662 | 2662 | |
@@ -2678,7 +2678,7 @@ discard block |
||
2678 | 2678 | /* Act as if a stream of character tokens had been seen |
2679 | 2679 | (see below for what they should say). */ |
2680 | 2680 | $this->insertText( |
2681 | - 'This is a searchable index. ' . |
|
2681 | + 'This is a searchable index. '. |
|
2682 | 2682 | 'Insert your search keywords here: ' |
2683 | 2683 | ); |
2684 | 2684 |
@@ -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 | ); |
@@ -104,9 +104,9 @@ |
||
104 | 104 | if ($result !== false) { |
105 | 105 | return $result; |
106 | 106 | } |
107 | - $this->currentNesting =& $context->get('CurrentNesting'); |
|
108 | - $this->currentToken =& $context->get('CurrentToken'); |
|
109 | - $this->inputZipper =& $context->get('InputZipper'); |
|
107 | + $this->currentNesting = & $context->get('CurrentNesting'); |
|
108 | + $this->currentToken = & $context->get('CurrentToken'); |
|
109 | + $this->inputZipper = & $context->get('InputZipper'); |
|
110 | 110 | return false; |
111 | 111 | } |
112 | 112 |
@@ -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 | } |
@@ -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; |
@@ -86,16 +86,16 @@ |
||
86 | 86 | if (!empty($node->is_whitespace)) { |
87 | 87 | continue; |
88 | 88 | } |
89 | - $list_of_children .= $node->name . ','; |
|
89 | + $list_of_children .= $node->name.','; |
|
90 | 90 | } |
91 | 91 | // add leading comma to deal with stray comma declarations |
92 | - $list_of_children = ',' . rtrim($list_of_children, ','); |
|
92 | + $list_of_children = ','.rtrim($list_of_children, ','); |
|
93 | 93 | $okay = |
94 | 94 | preg_match( |
95 | - '/^,?' . $this->_pcre_regex . '$/', |
|
95 | + '/^,?'.$this->_pcre_regex.'$/', |
|
96 | 96 | $list_of_children |
97 | 97 | ); |
98 | - return (bool)$okay; |
|
98 | + return (bool) $okay; |
|
99 | 99 | } |
100 | 100 | } |
101 | 101 |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | $tbody_mode = false; // if true, then we need to wrap any stray |
89 | 89 | // <tr>s with a <tbody>. |
90 | 90 | |
91 | - $ws_accum =& $initial_ws; |
|
91 | + $ws_accum = & $initial_ws; |
|
92 | 92 | |
93 | 93 | foreach ($children as $node) { |
94 | 94 | if ($node instanceof HTMLPurifier_Node_Comment) { |
@@ -101,13 +101,13 @@ discard block |
||
101 | 101 | // fall through |
102 | 102 | case 'tr': |
103 | 103 | $content[] = $node; |
104 | - $ws_accum =& $content; |
|
104 | + $ws_accum = & $content; |
|
105 | 105 | break; |
106 | 106 | case 'caption': |
107 | 107 | // there can only be one caption! |
108 | 108 | if ($caption !== false) break; |
109 | 109 | $caption = $node; |
110 | - $ws_accum =& $after_caption_ws; |
|
110 | + $ws_accum = & $after_caption_ws; |
|
111 | 111 | break; |
112 | 112 | case 'thead': |
113 | 113 | $tbody_mode = true; |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | // turned into <tbody>? Very tricky, indeed. |
120 | 120 | if ($thead === false) { |
121 | 121 | $thead = $node; |
122 | - $ws_accum =& $after_thead_ws; |
|
122 | + $ws_accum = & $after_thead_ws; |
|
123 | 123 | } else { |
124 | 124 | // Oops, there's a second one! What |
125 | 125 | // should we do? Current behavior is to |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | // bottom like it does for the first one. |
133 | 133 | $node->name = 'tbody'; |
134 | 134 | $content[] = $node; |
135 | - $ws_accum =& $content; |
|
135 | + $ws_accum = & $content; |
|
136 | 136 | } |
137 | 137 | break; |
138 | 138 | case 'tfoot': |
@@ -140,17 +140,17 @@ discard block |
||
140 | 140 | $tbody_mode = true; |
141 | 141 | if ($tfoot === false) { |
142 | 142 | $tfoot = $node; |
143 | - $ws_accum =& $after_tfoot_ws; |
|
143 | + $ws_accum = & $after_tfoot_ws; |
|
144 | 144 | } else { |
145 | 145 | $node->name = 'tbody'; |
146 | 146 | $content[] = $node; |
147 | - $ws_accum =& $content; |
|
147 | + $ws_accum = & $content; |
|
148 | 148 | } |
149 | 149 | break; |
150 | 150 | case 'colgroup': |
151 | 151 | case 'col': |
152 | 152 | $cols[] = $node; |
153 | - $ws_accum =& $cols; |
|
153 | + $ws_accum = & $cols; |
|
154 | 154 | break; |
155 | 155 | case '#PCDATA': |
156 | 156 | // How is whitespace handled? We treat is as sticky to |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | // we have to shuffle tr into tbody |
190 | 190 | $current_tr_tbody = null; |
191 | 191 | |
192 | - foreach($content as $node) { |
|
192 | + foreach ($content as $node) { |
|
193 | 193 | switch ($node->name) { |
194 | 194 | case 'tbody': |
195 | 195 | $current_tr_tbody = null; |
@@ -59,7 +59,7 @@ |
||
59 | 59 | return; |
60 | 60 | } |
61 | 61 | |
62 | - $class = 'HTMLPurifier_URIScheme_' . $scheme; |
|
62 | + $class = 'HTMLPurifier_URIScheme_'.$scheme; |
|
63 | 63 | if (!class_exists($class)) { |
64 | 64 | return; |
65 | 65 | } |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | // constants are slow, so we use as few as possible |
4 | 4 | if (!defined('HTMLPURIFIER_PREFIX')) { |
5 | - define('HTMLPURIFIER_PREFIX', realpath(dirname(__FILE__) . '/..')); |
|
5 | + define('HTMLPURIFIER_PREFIX', realpath(dirname(__FILE__).'/..')); |
|
6 | 6 | } |
7 | 7 | |
8 | 8 | // accomodations for versions earlier than 5.0.2 |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | // Zend extensions such as Zend debugger and APC, this invariant |
47 | 47 | // may be broken. Since we have efficient alternatives, pay |
48 | 48 | // the cost here and avoid the bug. |
49 | - require_once HTMLPURIFIER_PREFIX . '/' . $file; |
|
49 | + require_once HTMLPURIFIER_PREFIX.'/'.$file; |
|
50 | 50 | return true; |
51 | 51 | } |
52 | 52 | |
@@ -63,11 +63,11 @@ discard block |
||
63 | 63 | // Custom implementations |
64 | 64 | if (strncmp('HTMLPurifier_Language_', $class, 22) === 0) { |
65 | 65 | $code = str_replace('_', '-', substr($class, 22)); |
66 | - $file = 'HTMLPurifier/Language/classes/' . $code . '.php'; |
|
66 | + $file = 'HTMLPurifier/Language/classes/'.$code.'.php'; |
|
67 | 67 | } else { |
68 | - $file = str_replace('_', '/', $class) . '.php'; |
|
68 | + $file = str_replace('_', '/', $class).'.php'; |
|
69 | 69 | } |
70 | - if (!file_exists(HTMLPURIFIER_PREFIX . '/' . $file)) { |
|
70 | + if (!file_exists(HTMLPURIFIER_PREFIX.'/'.$file)) { |
|
71 | 71 | return false; |
72 | 72 | } |
73 | 73 | return $file; |