@@ -28,7 +28,7 @@ |
||
28 | 28 | { |
29 | 29 | $decorator = $this->copy(); |
30 | 30 | // reference is necessary for mocks in PHP 4 |
31 | - $decorator->cache =& $cache; |
|
31 | + $decorator->cache = & $cache; |
|
32 | 32 | $decorator->type = $cache->type; |
33 | 33 | return $decorator; |
34 | 34 | } |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | if ($filename[0] === '.') { |
105 | 105 | continue; |
106 | 106 | } |
107 | - unlink($dir . '/' . $filename); |
|
107 | + unlink($dir.'/'.$filename); |
|
108 | 108 | } |
109 | 109 | } |
110 | 110 | |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | } |
129 | 129 | $key = substr($filename, 0, strlen($filename) - 4); |
130 | 130 | if ($this->isOld($key, $config)) { |
131 | - unlink($dir . '/' . $filename); |
|
131 | + unlink($dir.'/'.$filename); |
|
132 | 132 | } |
133 | 133 | } |
134 | 134 | } |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | public function generateFilePath($config) |
144 | 144 | { |
145 | 145 | $key = $this->generateKey($config); |
146 | - return $this->generateDirectoryPath($config) . '/' . $key . '.ser'; |
|
146 | + return $this->generateDirectoryPath($config).'/'.$key.'.ser'; |
|
147 | 147 | } |
148 | 148 | |
149 | 149 | /** |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | public function generateDirectoryPath($config) |
157 | 157 | { |
158 | 158 | $base = $this->generateBaseDirectoryPath($config); |
159 | - return $base . '/' . $this->type; |
|
159 | + return $base.'/'.$this->type; |
|
160 | 160 | } |
161 | 161 | |
162 | 162 | /** |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | public function generateBaseDirectoryPath($config) |
170 | 170 | { |
171 | 171 | $base = $config->get('Cache.SerializerPath'); |
172 | - $base = is_null($base) ? HTMLPURIFIER_PREFIX . '/HTMLPurifier/DefinitionCache/Serializer' : $base; |
|
172 | + $base = is_null($base) ? HTMLPURIFIER_PREFIX.'/HTMLPurifier/DefinitionCache/Serializer' : $base; |
|
173 | 173 | return $base; |
174 | 174 | } |
175 | 175 | |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | $base = $this->generateBaseDirectoryPath($config); |
212 | 212 | if (!is_dir($base)) { |
213 | 213 | trigger_error( |
214 | - 'Base directory ' . $base . ' does not exist, |
|
214 | + 'Base directory '.$base.' does not exist, |
|
215 | 215 | please create or change using %Cache.SerializerPath', |
216 | 216 | E_USER_WARNING |
217 | 217 | ); |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | mkdir($directory, $chmod); |
223 | 223 | if (!$this->_testPermissions($directory, $chmod)) { |
224 | 224 | trigger_error( |
225 | - 'Base directory ' . $base . ' does not exist, |
|
225 | + 'Base directory '.$base.' does not exist, |
|
226 | 226 | please create or change using %Cache.SerializerPath', |
227 | 227 | E_USER_WARNING |
228 | 228 | ); |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | // generally, you'll want to handle this beforehand |
252 | 252 | // so a more specific error message can be given |
253 | 253 | trigger_error( |
254 | - 'Directory ' . $dir . ' does not exist', |
|
254 | + 'Directory '.$dir.' does not exist', |
|
255 | 255 | E_USER_WARNING |
256 | 256 | ); |
257 | 257 | return false; |
@@ -272,14 +272,14 @@ discard block |
||
272 | 272 | $chmod = $chmod | 0777; |
273 | 273 | } |
274 | 274 | trigger_error( |
275 | - 'Directory ' . $dir . ' not writable, ' . |
|
276 | - 'please chmod to ' . decoct($chmod), |
|
275 | + 'Directory '.$dir.' not writable, '. |
|
276 | + 'please chmod to '.decoct($chmod), |
|
277 | 277 | E_USER_WARNING |
278 | 278 | ); |
279 | 279 | } else { |
280 | 280 | // generic error message |
281 | 281 | trigger_error( |
282 | - 'Directory ' . $dir . ' not writable, ' . |
|
282 | + 'Directory '.$dir.' not writable, '. |
|
283 | 283 | 'please alter file permissions', |
284 | 284 | E_USER_WARNING |
285 | 285 | ); |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | $original_module = $module; |
175 | 175 | $ok = false; |
176 | 176 | foreach ($this->prefixes as $prefix) { |
177 | - $module = $prefix . $original_module; |
|
177 | + $module = $prefix.$original_module; |
|
178 | 178 | if (class_exists($module)) { |
179 | 179 | $ok = true; |
180 | 180 | break; |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | $module = $original_module; |
185 | 185 | if (!class_exists($module)) { |
186 | 186 | trigger_error( |
187 | - $original_module . ' module does not exist', |
|
187 | + $original_module.' module does not exist', |
|
188 | 188 | E_USER_ERROR |
189 | 189 | ); |
190 | 190 | return; |
@@ -193,11 +193,11 @@ discard block |
||
193 | 193 | $module = new $module(); |
194 | 194 | } |
195 | 195 | if (empty($module->name)) { |
196 | - trigger_error('Module instance of ' . get_class($module) . ' must have name'); |
|
196 | + trigger_error('Module instance of '.get_class($module).' must have name'); |
|
197 | 197 | return; |
198 | 198 | } |
199 | 199 | if (!$overload && isset($this->registeredModules[$module->name])) { |
200 | - trigger_error('Overloading ' . $module->name . ' without explicit overload parameter', E_USER_WARNING); |
|
200 | + trigger_error('Overloading '.$module->name.' without explicit overload parameter', E_USER_WARNING); |
|
201 | 201 | } |
202 | 202 | $this->registeredModules[$module->name] = $module; |
203 | 203 | } |
@@ -140,12 +140,10 @@ |
||
140 | 140 | $is_hex = (@$entity[2] === 'x'); |
141 | 141 | $int = $is_hex ? hexdec($matches[1]) : (int) $matches[2]; |
142 | 142 | return isset($this->_special_dec2str[$int]) ? |
143 | - $this->_special_dec2str[$int] : |
|
144 | - $entity; |
|
143 | + $this->_special_dec2str[$int] : $entity; |
|
145 | 144 | } else { |
146 | 145 | return isset($this->_special_ent2dec[$matches[3]]) ? |
147 | - $this->_special_ent2dec[$matches[3]] : |
|
148 | - $entity; |
|
146 | + $this->_special_ent2dec[$matches[3]] : $entity; |
|
149 | 147 | } |
150 | 148 | } |
151 | 149 | } |
@@ -30,7 +30,7 @@ |
||
30 | 30 | protected function prependCSS(&$attr, $css) |
31 | 31 | { |
32 | 32 | $attr['style'] = isset($attr['style']) ? $attr['style'] : ''; |
33 | - $attr['style'] = $css . $attr['style']; |
|
33 | + $attr['style'] = $css.$attr['style']; |
|
34 | 34 | } |
35 | 35 | } |
36 | 36 |
@@ -61,7 +61,7 @@ |
||
61 | 61 | $context->register('IsInline', $is_inline); |
62 | 62 | |
63 | 63 | // setup error collector |
64 | - $e =& $context->get('ErrorCollector', true); |
|
64 | + $e = & $context->get('ErrorCollector', true); |
|
65 | 65 | |
66 | 66 | //####################################################################// |
67 | 67 | // Loop initialization |
@@ -55,7 +55,7 @@ |
||
55 | 55 | |
56 | 56 | $e = false; |
57 | 57 | if ($config->get('Core.CollectErrors')) { |
58 | - $e =& $context->get('ErrorCollector'); |
|
58 | + $e = & $context->get('ErrorCollector'); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | foreach ($tokens as $token) { |
@@ -82,10 +82,10 @@ |
||
82 | 82 | $stack = array(); |
83 | 83 | |
84 | 84 | // member variables |
85 | - $this->stack =& $stack; |
|
86 | - $this->tokens =& $tokens; |
|
87 | - $this->token =& $token; |
|
88 | - $this->zipper =& $zipper; |
|
85 | + $this->stack = & $stack; |
|
86 | + $this->tokens = & $tokens; |
|
87 | + $this->token = & $token; |
|
88 | + $this->zipper = & $zipper; |
|
89 | 89 | $this->config = $config; |
90 | 90 | $this->context = $context; |
91 | 91 |
@@ -27,7 +27,7 @@ |
||
27 | 27 | continue; |
28 | 28 | } |
29 | 29 | $node = $token->toNode(); |
30 | - $stack[count($stack)-1]->children[] = $node; |
|
30 | + $stack[count($stack) - 1]->children[] = $node; |
|
31 | 31 | if ($token instanceof HTMLPurifier_Token_Start) { |
32 | 32 | $stack[] = $node; |
33 | 33 | } |