@@ -26,7 +26,7 @@ |
||
26 | 26 | */ |
27 | 27 | public function setup($config) |
28 | 28 | { |
29 | - $this->attr_collections['Style']['style'] = new HTMLPurifier_AttrDef_CSS(); |
|
29 | + $this->attr_collections[ 'Style' ][ 'style' ] = new HTMLPurifier_AttrDef_CSS(); |
|
30 | 30 | } |
31 | 31 | } |
32 | 32 |
@@ -24,8 +24,8 @@ discard block |
||
24 | 24 | array( |
25 | 25 | 'src*' => 'URI#embedded', |
26 | 26 | 'type' => 'Enum#application/x-shockwave-flash', |
27 | - 'width' => 'Pixels#' . $max, |
|
28 | - 'height' => 'Pixels#' . $max, |
|
27 | + 'width' => 'Pixels#'.$max, |
|
28 | + 'height' => 'Pixels#'.$max, |
|
29 | 29 | 'allowscriptaccess' => 'Enum#never', |
30 | 30 | 'allownetworking' => 'Enum#internal', |
31 | 31 | 'flashvars' => 'Text', |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | 'name' => 'ID', |
34 | 34 | ) |
35 | 35 | ); |
36 | - $embed->attr_transform_post[] = new HTMLPurifier_AttrTransform_SafeEmbed(); |
|
36 | + $embed->attr_transform_post[ ] = new HTMLPurifier_AttrTransform_SafeEmbed(); |
|
37 | 37 | } |
38 | 38 | } |
39 | 39 |
@@ -56,9 +56,9 @@ discard block |
||
56 | 56 | |
57 | 57 | foreach ($fixes as $name => $fix) { |
58 | 58 | // needs to be refactored a little to implement globbing |
59 | - if (isset($remove_fixes[$name]) || |
|
60 | - (!isset($add_fixes[$name]) && !isset($fixes_lookup[$name]))) { |
|
61 | - unset($fixes[$name]); |
|
59 | + if (isset($remove_fixes[ $name ]) || |
|
60 | + (!isset($add_fixes[ $name ]) && !isset($fixes_lookup[ $name ]))) { |
|
61 | + unset($fixes[ $name ]); |
|
62 | 62 | } |
63 | 63 | } |
64 | 64 | |
@@ -74,27 +74,27 @@ discard block |
||
74 | 74 | */ |
75 | 75 | public function getFixesForLevel($level) |
76 | 76 | { |
77 | - if ($level == $this->levels[0]) { |
|
77 | + if ($level == $this->levels[ 0 ]) { |
|
78 | 78 | return array(); |
79 | 79 | } |
80 | 80 | $activated_levels = array(); |
81 | 81 | for ($i = 1, $c = count($this->levels); $i < $c; $i++) { |
82 | - $activated_levels[] = $this->levels[$i]; |
|
83 | - if ($this->levels[$i] == $level) { |
|
82 | + $activated_levels[ ] = $this->levels[ $i ]; |
|
83 | + if ($this->levels[ $i ] == $level) { |
|
84 | 84 | break; |
85 | 85 | } |
86 | 86 | } |
87 | 87 | if ($i == $c) { |
88 | 88 | trigger_error( |
89 | - 'Tidy level ' . htmlspecialchars($level) . ' not recognized', |
|
89 | + 'Tidy level '.htmlspecialchars($level).' not recognized', |
|
90 | 90 | E_USER_WARNING |
91 | 91 | ); |
92 | 92 | return array(); |
93 | 93 | } |
94 | 94 | $ret = array(); |
95 | 95 | foreach ($activated_levels as $level) { |
96 | - foreach ($this->fixesForLevel[$level] as $fix) { |
|
97 | - $ret[$fix] = true; |
|
96 | + foreach ($this->fixesForLevel[ $level ] as $fix) { |
|
97 | + $ret[ $fix ] = true; |
|
98 | 98 | } |
99 | 99 | } |
100 | 100 | return $ret; |
@@ -111,14 +111,14 @@ discard block |
||
111 | 111 | if (!isset($this->defaultLevel)) { |
112 | 112 | return; |
113 | 113 | } |
114 | - if (!isset($this->fixesForLevel[$this->defaultLevel])) { |
|
114 | + if (!isset($this->fixesForLevel[ $this->defaultLevel ])) { |
|
115 | 115 | trigger_error( |
116 | - 'Default level ' . $this->defaultLevel . ' does not exist', |
|
116 | + 'Default level '.$this->defaultLevel.' does not exist', |
|
117 | 117 | E_USER_ERROR |
118 | 118 | ); |
119 | 119 | return; |
120 | 120 | } |
121 | - $this->fixesForLevel[$this->defaultLevel] = array_keys($fixes); |
|
121 | + $this->fixesForLevel[ $this->defaultLevel ] = array_keys($fixes); |
|
122 | 122 | } |
123 | 123 | |
124 | 124 | /** |
@@ -134,13 +134,13 @@ discard block |
||
134 | 134 | switch ($type) { |
135 | 135 | case 'attr_transform_pre': |
136 | 136 | case 'attr_transform_post': |
137 | - $attr = $params['attr']; |
|
138 | - if (isset($params['element'])) { |
|
139 | - $element = $params['element']; |
|
140 | - if (empty($this->info[$element])) { |
|
137 | + $attr = $params[ 'attr' ]; |
|
138 | + if (isset($params[ 'element' ])) { |
|
139 | + $element = $params[ 'element' ]; |
|
140 | + if (empty($this->info[ $element ])) { |
|
141 | 141 | $e = $this->addBlankElement($element); |
142 | 142 | } else { |
143 | - $e = $this->info[$element]; |
|
143 | + $e = $this->info[ $element ]; |
|
144 | 144 | } |
145 | 145 | } else { |
146 | 146 | $type = "info_$type"; |
@@ -148,19 +148,19 @@ discard block |
||
148 | 148 | } |
149 | 149 | // PHP does some weird parsing when I do |
150 | 150 | // $e->$type[$attr], so I have to assign a ref. |
151 | - $f =& $e->$type; |
|
152 | - $f[$attr] = $fix; |
|
151 | + $f = & $e->$type; |
|
152 | + $f[ $attr ] = $fix; |
|
153 | 153 | break; |
154 | 154 | case 'tag_transform': |
155 | - $this->info_tag_transform[$params['element']] = $fix; |
|
155 | + $this->info_tag_transform[ $params[ 'element' ] ] = $fix; |
|
156 | 156 | break; |
157 | 157 | case 'child': |
158 | 158 | case 'content_model_type': |
159 | - $element = $params['element']; |
|
160 | - if (empty($this->info[$element])) { |
|
159 | + $element = $params[ 'element' ]; |
|
160 | + if (empty($this->info[ $element ])) { |
|
161 | 161 | $e = $this->addBlankElement($element); |
162 | 162 | } else { |
163 | - $e = $this->info[$element]; |
|
163 | + $e = $this->info[ $element ]; |
|
164 | 164 | } |
165 | 165 | $e->$type = $fix; |
166 | 166 | break; |
@@ -193,10 +193,10 @@ discard block |
||
193 | 193 | // figure out the parameters |
194 | 194 | $params = array(); |
195 | 195 | if ($name !== '') { |
196 | - $params['element'] = $name; |
|
196 | + $params[ 'element' ] = $name; |
|
197 | 197 | } |
198 | 198 | if (!is_null($attr)) { |
199 | - $params['attr'] = $attr; |
|
199 | + $params[ 'attr' ] = $attr; |
|
200 | 200 | } |
201 | 201 | |
202 | 202 | // special case: attribute transform |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | if (is_null($property)) { |
205 | 205 | $property = 'pre'; |
206 | 206 | } |
207 | - $type = 'attr_transform_' . $property; |
|
207 | + $type = 'attr_transform_'.$property; |
|
208 | 208 | return array($type, $params); |
209 | 209 | } |
210 | 210 |
@@ -48,7 +48,7 @@ |
||
48 | 48 | return false; |
49 | 49 | } |
50 | 50 | $value = explode('!', $def->content_model); |
51 | - return new HTMLPurifier_ChildDef_Chameleon($value[0], $value[1]); |
|
51 | + return new HTMLPurifier_ChildDef_Chameleon($value[ 0 ], $value[ 1 ]); |
|
52 | 52 | } |
53 | 53 | } |
54 | 54 |
@@ -158,17 +158,17 @@ discard block |
||
158 | 158 | // merge in the includes |
159 | 159 | // sorry, no way to override an include |
160 | 160 | foreach ($v as $v2) { |
161 | - $this->attr[0][] = $v2; |
|
161 | + $this->attr[ 0 ][ ] = $v2; |
|
162 | 162 | } |
163 | 163 | continue; |
164 | 164 | } |
165 | 165 | if ($v === false) { |
166 | - if (isset($this->attr[$k])) { |
|
167 | - unset($this->attr[$k]); |
|
166 | + if (isset($this->attr[ $k ])) { |
|
167 | + unset($this->attr[ $k ]); |
|
168 | 168 | } |
169 | 169 | continue; |
170 | 170 | } |
171 | - $this->attr[$k] = $v; |
|
171 | + $this->attr[ $k ] = $v; |
|
172 | 172 | } |
173 | 173 | $this->_mergeAssocArray($this->excludes, $def->excludes); |
174 | 174 | $this->attr_transform_pre = array_merge($this->attr_transform_pre, $def->attr_transform_pre); |
@@ -203,12 +203,12 @@ discard block |
||
203 | 203 | { |
204 | 204 | foreach ($a2 as $k => $v) { |
205 | 205 | if ($v === false) { |
206 | - if (isset($a1[$k])) { |
|
207 | - unset($a1[$k]); |
|
206 | + if (isset($a1[ $k ])) { |
|
207 | + unset($a1[ $k ]); |
|
208 | 208 | } |
209 | 209 | continue; |
210 | 210 | } |
211 | - $a1[$k] = $v; |
|
211 | + $a1[ $k ] = $v; |
|
212 | 212 | } |
213 | 213 | } |
214 | 214 | } |
@@ -27,10 +27,10 @@ |
||
27 | 27 | */ |
28 | 28 | public function addDirective($directive) |
29 | 29 | { |
30 | - if (isset($this->directives[$i = $directive->id->toString()])) { |
|
30 | + if (isset($this->directives[ $i = $directive->id->toString() ])) { |
|
31 | 31 | throw new HTMLPurifier_ConfigSchema_Exception("Cannot redefine directive '$i'"); |
32 | 32 | } |
33 | - $this->directives[$i] = $directive; |
|
33 | + $this->directives[ $i ] = $directive; |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | /** |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | $this->context = $context; |
34 | 34 | $this->obj = $obj; |
35 | 35 | $this->member = $member; |
36 | - $this->contents =& $obj->$member; |
|
36 | + $this->contents = & $obj->$member; |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | /** |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | */ |
124 | 124 | protected function error($msg) |
125 | 125 | { |
126 | - throw new HTMLPurifier_ConfigSchema_Exception(ucfirst($this->member) . ' in ' . $this->context . ' ' . $msg); |
|
126 | + throw new HTMLPurifier_ConfigSchema_Exception(ucfirst($this->member).' in '.$this->context.' '.$msg); |
|
127 | 127 | } |
128 | 128 | } |
129 | 129 |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | public function validateId($id) |
67 | 67 | { |
68 | 68 | $id_string = $id->toString(); |
69 | - $this->context[] = "id '$id_string'"; |
|
69 | + $this->context[ ] = "id '$id_string'"; |
|
70 | 70 | if (!$id instanceof HTMLPurifier_ConfigSchema_Interchange_Id) { |
71 | 71 | // handled by InterchangeBuilder |
72 | 72 | $this->error(false, 'is not an instance of HTMLPurifier_ConfigSchema_Interchange_Id'); |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | public function validateDirective($d) |
87 | 87 | { |
88 | 88 | $id = $d->id->toString(); |
89 | - $this->context[] = "directive '$id'"; |
|
89 | + $this->context[ ] = "directive '$id'"; |
|
90 | 90 | $this->validateId($d->id); |
91 | 91 | |
92 | 92 | $this->with($d, 'description') |
@@ -101,15 +101,15 @@ discard block |
||
101 | 101 | // This also tests validity of $d->type |
102 | 102 | $this->parser->parse($d->default, $d->type, $d->typeAllowsNull); |
103 | 103 | } catch (HTMLPurifier_VarParserException $e) { |
104 | - $this->error('default', 'had error: ' . $e->getMessage()); |
|
104 | + $this->error('default', 'had error: '.$e->getMessage()); |
|
105 | 105 | } |
106 | 106 | // END - handled by InterchangeBuilder |
107 | 107 | |
108 | 108 | if (!is_null($d->allowed) || !empty($d->valueAliases)) { |
109 | 109 | // allowed and valueAliases require that we be dealing with |
110 | 110 | // strings, so check for that early. |
111 | - $d_int = HTMLPurifier_VarParser::$types[$d->type]; |
|
112 | - if (!isset(HTMLPurifier_VarParser::$stringTypes[$d_int])) { |
|
111 | + $d_int = HTMLPurifier_VarParser::$types[ $d->type ]; |
|
112 | + if (!isset(HTMLPurifier_VarParser::$stringTypes[ $d_int ])) { |
|
113 | 113 | $this->error('type', 'must be a string type when used with allowed or value aliases'); |
114 | 114 | } |
115 | 115 | } |
@@ -134,10 +134,10 @@ discard block |
||
134 | 134 | $this->with($d, 'allowed') |
135 | 135 | ->assertNotEmpty() |
136 | 136 | ->assertIsLookup(); // handled by InterchangeBuilder |
137 | - if (is_string($d->default) && !isset($d->allowed[$d->default])) { |
|
137 | + if (is_string($d->default) && !isset($d->allowed[ $d->default ])) { |
|
138 | 138 | $this->error('default', 'must be an allowed value'); |
139 | 139 | } |
140 | - $this->context[] = 'allowed'; |
|
140 | + $this->context[ ] = 'allowed'; |
|
141 | 141 | foreach ($d->allowed as $val => $x) { |
142 | 142 | if (!is_string($val)) { |
143 | 143 | $this->error("value $val", 'must be a string'); |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | } |
159 | 159 | $this->with($d, 'valueAliases') |
160 | 160 | ->assertIsArray(); // handled by InterchangeBuilder |
161 | - $this->context[] = 'valueAliases'; |
|
161 | + $this->context[ ] = 'valueAliases'; |
|
162 | 162 | foreach ($d->valueAliases as $alias => $real) { |
163 | 163 | if (!is_string($alias)) { |
164 | 164 | $this->error("alias $alias", 'must be a string'); |
@@ -172,9 +172,9 @@ discard block |
||
172 | 172 | } |
173 | 173 | if (!is_null($d->allowed)) { |
174 | 174 | foreach ($d->valueAliases as $alias => $real) { |
175 | - if (isset($d->allowed[$alias])) { |
|
175 | + if (isset($d->allowed[ $alias ])) { |
|
176 | 176 | $this->error("alias '$alias'", 'must not be an allowed value'); |
177 | - } elseif (!isset($d->allowed[$real])) { |
|
177 | + } elseif (!isset($d->allowed[ $real ])) { |
|
178 | 178 | $this->error("alias '$alias'", 'must be an alias to an allowed value'); |
179 | 179 | } |
180 | 180 | } |
@@ -191,18 +191,18 @@ discard block |
||
191 | 191 | { |
192 | 192 | $this->with($d, 'aliases') |
193 | 193 | ->assertIsArray(); // handled by InterchangeBuilder |
194 | - $this->context[] = 'aliases'; |
|
194 | + $this->context[ ] = 'aliases'; |
|
195 | 195 | foreach ($d->aliases as $alias) { |
196 | 196 | $this->validateId($alias); |
197 | 197 | $s = $alias->toString(); |
198 | - if (isset($this->interchange->directives[$s])) { |
|
198 | + if (isset($this->interchange->directives[ $s ])) { |
|
199 | 199 | $this->error("alias '$s'", 'collides with another directive'); |
200 | 200 | } |
201 | - if (isset($this->aliases[$s])) { |
|
202 | - $other_directive = $this->aliases[$s]; |
|
201 | + if (isset($this->aliases[ $s ])) { |
|
202 | + $other_directive = $this->aliases[ $s ]; |
|
203 | 203 | $this->error("alias '$s'", "collides with alias for directive '$other_directive'"); |
204 | 204 | } |
205 | - $this->aliases[$s] = $d->id->toString(); |
|
205 | + $this->aliases[ $s ] = $d->id->toString(); |
|
206 | 206 | } |
207 | 207 | array_pop($this->context); |
208 | 208 | } |
@@ -228,11 +228,11 @@ discard block |
||
228 | 228 | protected function error($target, $msg) |
229 | 229 | { |
230 | 230 | if ($target !== false) { |
231 | - $prefix = ucfirst($target) . ' in ' . $this->getFormattedContext(); |
|
231 | + $prefix = ucfirst($target).' in '.$this->getFormattedContext(); |
|
232 | 232 | } else { |
233 | 233 | $prefix = ucfirst($this->getFormattedContext()); |
234 | 234 | } |
235 | - throw new HTMLPurifier_ConfigSchema_Exception(trim($prefix . ' ' . $msg)); |
|
235 | + throw new HTMLPurifier_ConfigSchema_Exception(trim($prefix.' '.$msg)); |
|
236 | 236 | } |
237 | 237 | |
238 | 238 | /** |
@@ -36,26 +36,26 @@ discard block |
||
36 | 36 | public function buildDir($interchange, $dir = null) |
37 | 37 | { |
38 | 38 | if (!$dir) { |
39 | - $dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema'; |
|
39 | + $dir = HTMLPURIFIER_PREFIX.'/HTMLPurifier/ConfigSchema/schema'; |
|
40 | 40 | } |
41 | - if (file_exists($dir . '/info.ini')) { |
|
42 | - $info = parse_ini_file($dir . '/info.ini'); |
|
43 | - $interchange->name = $info['name']; |
|
41 | + if (file_exists($dir.'/info.ini')) { |
|
42 | + $info = parse_ini_file($dir.'/info.ini'); |
|
43 | + $interchange->name = $info[ 'name' ]; |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | $files = array(); |
47 | 47 | $dh = opendir($dir); |
48 | 48 | while (false !== ($file = readdir($dh))) { |
49 | - if (!$file || $file[0] == '.' || strrchr($file, '.') !== '.txt') { |
|
49 | + if (!$file || $file[ 0 ] == '.' || strrchr($file, '.') !== '.txt') { |
|
50 | 50 | continue; |
51 | 51 | } |
52 | - $files[] = $file; |
|
52 | + $files[ ] = $file; |
|
53 | 53 | } |
54 | 54 | closedir($dh); |
55 | 55 | |
56 | 56 | sort($files); |
57 | 57 | foreach ($files as $file) { |
58 | - $this->buildFile($interchange, $dir . '/' . $file); |
|
58 | + $this->buildFile($interchange, $dir.'/'.$file); |
|
59 | 59 | } |
60 | 60 | return $interchange; |
61 | 61 | } |
@@ -84,11 +84,11 @@ discard block |
||
84 | 84 | if (!$hash instanceof HTMLPurifier_StringHash) { |
85 | 85 | $hash = new HTMLPurifier_StringHash($hash); |
86 | 86 | } |
87 | - if (!isset($hash['ID'])) { |
|
87 | + if (!isset($hash[ 'ID' ])) { |
|
88 | 88 | throw new HTMLPurifier_ConfigSchema_Exception('Hash does not have any ID'); |
89 | 89 | } |
90 | - if (strpos($hash['ID'], '.') === false) { |
|
91 | - if (count($hash) == 2 && isset($hash['DESCRIPTION'])) { |
|
90 | + if (strpos($hash[ 'ID' ], '.') === false) { |
|
91 | + if (count($hash) == 2 && isset($hash[ 'DESCRIPTION' ])) { |
|
92 | 92 | $hash->offsetGet('DESCRIPTION'); // prevent complaining |
93 | 93 | } else { |
94 | 94 | throw new HTMLPurifier_ConfigSchema_Exception('All directives must have a namespace'); |
@@ -112,17 +112,17 @@ discard block |
||
112 | 112 | $directive->id = $this->id($hash->offsetGet('ID')); |
113 | 113 | $id = $directive->id->toString(); // convenience |
114 | 114 | |
115 | - if (isset($hash['TYPE'])) { |
|
115 | + if (isset($hash[ 'TYPE' ])) { |
|
116 | 116 | $type = explode('/', $hash->offsetGet('TYPE')); |
117 | - if (isset($type[1])) { |
|
117 | + if (isset($type[ 1 ])) { |
|
118 | 118 | $directive->typeAllowsNull = true; |
119 | 119 | } |
120 | - $directive->type = $type[0]; |
|
120 | + $directive->type = $type[ 0 ]; |
|
121 | 121 | } else { |
122 | 122 | throw new HTMLPurifier_ConfigSchema_Exception("TYPE in directive hash '$id' not defined"); |
123 | 123 | } |
124 | 124 | |
125 | - if (isset($hash['DEFAULT'])) { |
|
125 | + if (isset($hash[ 'DEFAULT' ])) { |
|
126 | 126 | try { |
127 | 127 | $directive->default = $this->varParser->parse( |
128 | 128 | $hash->offsetGet('DEFAULT'), |
@@ -130,43 +130,43 @@ discard block |
||
130 | 130 | $directive->typeAllowsNull |
131 | 131 | ); |
132 | 132 | } catch (HTMLPurifier_VarParserException $e) { |
133 | - throw new HTMLPurifier_ConfigSchema_Exception($e->getMessage() . " in DEFAULT in directive hash '$id'"); |
|
133 | + throw new HTMLPurifier_ConfigSchema_Exception($e->getMessage()." in DEFAULT in directive hash '$id'"); |
|
134 | 134 | } |
135 | 135 | } |
136 | 136 | |
137 | - if (isset($hash['DESCRIPTION'])) { |
|
137 | + if (isset($hash[ 'DESCRIPTION' ])) { |
|
138 | 138 | $directive->description = $hash->offsetGet('DESCRIPTION'); |
139 | 139 | } |
140 | 140 | |
141 | - if (isset($hash['ALLOWED'])) { |
|
141 | + if (isset($hash[ 'ALLOWED' ])) { |
|
142 | 142 | $directive->allowed = $this->lookup($this->evalArray($hash->offsetGet('ALLOWED'))); |
143 | 143 | } |
144 | 144 | |
145 | - if (isset($hash['VALUE-ALIASES'])) { |
|
145 | + if (isset($hash[ 'VALUE-ALIASES' ])) { |
|
146 | 146 | $directive->valueAliases = $this->evalArray($hash->offsetGet('VALUE-ALIASES')); |
147 | 147 | } |
148 | 148 | |
149 | - if (isset($hash['ALIASES'])) { |
|
149 | + if (isset($hash[ 'ALIASES' ])) { |
|
150 | 150 | $raw_aliases = trim($hash->offsetGet('ALIASES')); |
151 | 151 | $aliases = preg_split('/\s*,\s*/', $raw_aliases); |
152 | 152 | foreach ($aliases as $alias) { |
153 | - $directive->aliases[] = $this->id($alias); |
|
153 | + $directive->aliases[ ] = $this->id($alias); |
|
154 | 154 | } |
155 | 155 | } |
156 | 156 | |
157 | - if (isset($hash['VERSION'])) { |
|
157 | + if (isset($hash[ 'VERSION' ])) { |
|
158 | 158 | $directive->version = $hash->offsetGet('VERSION'); |
159 | 159 | } |
160 | 160 | |
161 | - if (isset($hash['DEPRECATED-USE'])) { |
|
161 | + if (isset($hash[ 'DEPRECATED-USE' ])) { |
|
162 | 162 | $directive->deprecatedUse = $this->id($hash->offsetGet('DEPRECATED-USE')); |
163 | 163 | } |
164 | 164 | |
165 | - if (isset($hash['DEPRECATED-VERSION'])) { |
|
165 | + if (isset($hash[ 'DEPRECATED-VERSION' ])) { |
|
166 | 166 | $directive->deprecatedVersion = $hash->offsetGet('DEPRECATED-VERSION'); |
167 | 167 | } |
168 | 168 | |
169 | - if (isset($hash['EXTERNAL'])) { |
|
169 | + if (isset($hash[ 'EXTERNAL' ])) { |
|
170 | 170 | $directive->external = preg_split('/\s*,\s*/', trim($hash->offsetGet('EXTERNAL'))); |
171 | 171 | } |
172 | 172 | |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | */ |
180 | 180 | protected function evalArray($contents) |
181 | 181 | { |
182 | - return eval('return array(' . $contents . ');'); |
|
182 | + return eval('return array('.$contents.');'); |
|
183 | 183 | } |
184 | 184 | |
185 | 185 | /** |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | { |
192 | 192 | $ret = array(); |
193 | 193 | foreach ($array as $val) { |
194 | - $ret[$val] = true; |
|
194 | + $ret[ $val ] = true; |
|
195 | 195 | } |
196 | 196 | return $ret; |
197 | 197 | } |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | { |
217 | 217 | $accessed = $hash->getAccessed(); |
218 | 218 | foreach ($hash as $k => $v) { |
219 | - if (!isset($accessed[$k])) { |
|
219 | + if (!isset($accessed[ $k ])) { |
|
220 | 220 | trigger_error("String hash key '$k' not used by builder", E_USER_NOTICE); |
221 | 221 | } |
222 | 222 | } |