@@ -39,12 +39,12 @@ discard block |
||
39 | 39 | { |
40 | 40 | $section = $this->addSection(self::SECTION_DEFAULT); |
41 | 41 | |
42 | - if(empty($iniString)) { |
|
42 | + if (empty($iniString)) { |
|
43 | 43 | return; |
44 | 44 | } |
45 | 45 | |
46 | 46 | $eol = ConvertHelper::detectEOLCharacter($iniString); |
47 | - if($eol !== null) { |
|
47 | + if ($eol !== null) { |
|
48 | 48 | $this->eol = $eol->getCharacter(); |
49 | 49 | } |
50 | 50 | |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | { |
55 | 55 | $line = new INILine($value, $index); |
56 | 56 | |
57 | - if($line->isSection()) { |
|
57 | + if ($line->isSection()) { |
|
58 | 58 | $section = $this->addSection($line->getSectionName()); |
59 | 59 | } |
60 | 60 | |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | $iniPath = FileHelper::requireFileExists($iniPath); |
86 | 86 | |
87 | 87 | $content = file_get_contents($iniPath); |
88 | - if($content !== false) { |
|
88 | + if ($content !== false) { |
|
89 | 89 | return self::createFromString($content); |
90 | 90 | } |
91 | 91 | |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | */ |
131 | 131 | public function addSection(string $name) : IniHelper_Section |
132 | 132 | { |
133 | - if(!isset($this->sections[$name])) { |
|
133 | + if (!isset($this->sections[$name])) { |
|
134 | 134 | $this->sections[$name] = new IniHelper_Section($this, $name); |
135 | 135 | } |
136 | 136 | |
@@ -157,9 +157,9 @@ discard block |
||
157 | 157 | { |
158 | 158 | $result = array(); |
159 | 159 | |
160 | - foreach($this->sections as $section) |
|
160 | + foreach ($this->sections as $section) |
|
161 | 161 | { |
162 | - if($section->isDefault()) |
|
162 | + if ($section->isDefault()) |
|
163 | 163 | { |
164 | 164 | $result = array_merge($result, $section->toArray()); |
165 | 165 | } |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | { |
200 | 200 | $parts = array(); |
201 | 201 | |
202 | - foreach($this->sections as $section) |
|
202 | + foreach ($this->sections as $section) |
|
203 | 203 | { |
204 | 204 | $parts[] = $section->toString(); |
205 | 205 | } |
@@ -247,8 +247,8 @@ discard block |
||
247 | 247 | */ |
248 | 248 | public function sectionExists(string $name) : bool |
249 | 249 | { |
250 | - foreach($this->sections as $section) { |
|
251 | - if($section->getName() === $name) { |
|
250 | + foreach ($this->sections as $section) { |
|
251 | + if ($section->getName() === $name) { |
|
252 | 252 | return true; |
253 | 253 | } |
254 | 254 | } |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | { |
278 | 278 | $info = $this->parsePath($path); |
279 | 279 | |
280 | - if(!$this->sectionExists($info['section'])) { |
|
280 | + if (!$this->sectionExists($info['section'])) { |
|
281 | 281 | return array(); |
282 | 282 | } |
283 | 283 | |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | { |
293 | 293 | $parts = explode($this->pathSeparator, $path); |
294 | 294 | |
295 | - if(count($parts) === 1) |
|
295 | + if (count($parts) === 1) |
|
296 | 296 | { |
297 | 297 | return array( |
298 | 298 | 'section' => self::SECTION_DEFAULT, |
@@ -27,14 +27,14 @@ discard block |
||
27 | 27 | $this->subject = $subject; |
28 | 28 | } |
29 | 29 | |
30 | - public function setRemoveDuplicates(bool $remove=true, bool $caseInsensitive=false) : self |
|
30 | + public function setRemoveDuplicates(bool $remove = true, bool $caseInsensitive = false) : self |
|
31 | 31 | { |
32 | 32 | $this->removeDuplicates = $remove; |
33 | 33 | $this->duplicatesCaseInsensitive = $caseInsensitive; |
34 | 34 | return $this; |
35 | 35 | } |
36 | 36 | |
37 | - public function setSorting(bool $sorting=true) : self |
|
37 | + public function setSorting(bool $sorting = true) : self |
|
38 | 38 | { |
39 | 39 | $this->sorting = $sorting; |
40 | 40 | return $this; |
@@ -55,11 +55,11 @@ discard block |
||
55 | 55 | |
56 | 56 | $words = $this->filterEmpty($words); |
57 | 57 | |
58 | - if($this->removeDuplicates) { |
|
58 | + if ($this->removeDuplicates) { |
|
59 | 59 | $words = $this->filterDuplicates($words); |
60 | 60 | } |
61 | 61 | |
62 | - if($this->sorting) { |
|
62 | + if ($this->sorting) { |
|
63 | 63 | usort($words, 'strnatcasecmp'); |
64 | 64 | } |
65 | 65 | |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | */ |
73 | 73 | private function filterDuplicates(array $words) : array |
74 | 74 | { |
75 | - if($this->duplicatesCaseInsensitive) { |
|
75 | + if ($this->duplicatesCaseInsensitive) { |
|
76 | 76 | return $this->filterDuplicatesCaseInsensitive($words); |
77 | 77 | } |
78 | 78 | |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | { |
88 | 88 | return array_intersect_key( |
89 | 89 | $array, |
90 | - array_unique( array_map( "strtolower", $array ) ) |
|
90 | + array_unique(array_map("strtolower", $array)) |
|
91 | 91 | ); |
92 | 92 | } |
93 | 93 | |
@@ -99,13 +99,13 @@ discard block |
||
99 | 99 | { |
100 | 100 | $keep = array(); |
101 | 101 | |
102 | - foreach($words as $word) |
|
102 | + foreach ($words as $word) |
|
103 | 103 | { |
104 | - if(empty($word)) { |
|
104 | + if (empty($word)) { |
|
105 | 105 | continue; |
106 | 106 | } |
107 | 107 | |
108 | - if(mb_strlen($word) < $this->minWordLength) { |
|
108 | + if (mb_strlen($word) < $this->minWordLength) { |
|
109 | 109 | continue; |
110 | 110 | } |
111 | 111 |
@@ -81,15 +81,15 @@ discard block |
||
81 | 81 | { |
82 | 82 | $result = array(); |
83 | 83 | |
84 | - foreach($this->lines as $line) |
|
84 | + foreach ($this->lines as $line) |
|
85 | 85 | { |
86 | - if(!$line->isValue()) { |
|
86 | + if (!$line->isValue()) { |
|
87 | 87 | continue; |
88 | 88 | } |
89 | 89 | |
90 | 90 | $name = $line->getVarName(); |
91 | 91 | |
92 | - if(!isset($result[$name])) |
|
92 | + if (!isset($result[$name])) |
|
93 | 93 | { |
94 | 94 | $result[$name] = $line->getVarValue(); |
95 | 95 | continue; |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | // name exists in collection? Then this is a |
99 | 99 | // duplicate key, and we need to convert it to |
100 | 100 | // an indexed array of values. |
101 | - if(!is_array($result[$name])) |
|
101 | + if (!is_array($result[$name])) |
|
102 | 102 | { |
103 | 103 | $result[$name] = array($result[$name]); |
104 | 104 | } |
@@ -118,15 +118,15 @@ discard block |
||
118 | 118 | public function toString() : string |
119 | 119 | { |
120 | 120 | $lines = array(); |
121 | - if(!$this->isDefault()) |
|
121 | + if (!$this->isDefault()) |
|
122 | 122 | { |
123 | 123 | $lines[] = '['.$this->getName().']'; |
124 | 124 | } |
125 | 125 | |
126 | - foreach($this->lines as $line) |
|
126 | + foreach ($this->lines as $line) |
|
127 | 127 | { |
128 | 128 | // we already did this |
129 | - if($line->isSection()) { |
|
129 | + if ($line->isSection()) { |
|
130 | 130 | continue; |
131 | 131 | } |
132 | 132 | |
@@ -146,9 +146,9 @@ discard block |
||
146 | 146 | { |
147 | 147 | $keep = array(); |
148 | 148 | |
149 | - foreach($this->lines as $line) |
|
149 | + foreach ($this->lines as $line) |
|
150 | 150 | { |
151 | - if($line !== $toDelete) { |
|
151 | + if ($line !== $toDelete) { |
|
152 | 152 | $keep[] = $line; |
153 | 153 | } |
154 | 154 | } |
@@ -174,23 +174,23 @@ discard block |
||
174 | 174 | // Removes any superfluous values that may |
175 | 175 | // already exist, if there are more than the |
176 | 176 | // new set of values. |
177 | - if(is_array($value)) |
|
177 | + if (is_array($value)) |
|
178 | 178 | { |
179 | 179 | $values = array_values($value); |
180 | 180 | $amountNew = count($values); |
181 | 181 | $amountExisting = count($lines); |
182 | 182 | |
183 | 183 | $max = $amountNew; |
184 | - if($amountExisting > $max) { |
|
184 | + if ($amountExisting > $max) { |
|
185 | 185 | $max = $amountExisting; |
186 | 186 | } |
187 | 187 | |
188 | - for($i=0; $i < $max; $i++) |
|
188 | + for ($i = 0; $i < $max; $i++) |
|
189 | 189 | { |
190 | 190 | // new value exists |
191 | - if(isset($values[$i])) |
|
191 | + if (isset($values[$i])) |
|
192 | 192 | { |
193 | - if(isset($lines[$i])) { |
|
193 | + if (isset($lines[$i])) { |
|
194 | 194 | $lines[$i]->setValue($values[$i]); |
195 | 195 | } else { |
196 | 196 | $this->addValueLine($name, $values[$i]); |
@@ -208,12 +208,12 @@ discard block |
||
208 | 208 | else |
209 | 209 | { |
210 | 210 | // remove all superfluous lines |
211 | - if(!empty($lines)) |
|
211 | + if (!empty($lines)) |
|
212 | 212 | { |
213 | 213 | $line = array_shift($lines); // keep only the first line |
214 | 214 | $line->setValue($value); |
215 | 215 | |
216 | - foreach($lines as $delete) { |
|
216 | + foreach ($lines as $delete) { |
|
217 | 217 | $this->deleteLine($delete); |
218 | 218 | } |
219 | 219 | } |
@@ -238,11 +238,11 @@ discard block |
||
238 | 238 | public function addValue(string $name, $value) : IniHelper_Section |
239 | 239 | { |
240 | 240 | // array value? Treat it as duplicate keys. |
241 | - if(is_array($value)) |
|
241 | + if (is_array($value)) |
|
242 | 242 | { |
243 | 243 | $values = array_values($value); |
244 | 244 | |
245 | - foreach($values as $setValue) |
|
245 | + foreach ($values as $setValue) |
|
246 | 246 | { |
247 | 247 | $this->addValue($name, $setValue); |
248 | 248 | } |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | |
253 | 253 | $lines = $this->getLinesByVariable($name); |
254 | 254 | |
255 | - if(empty($lines)) |
|
255 | + if (empty($lines)) |
|
256 | 256 | { |
257 | 257 | $this->addValueLine($name, $value); |
258 | 258 | } |
@@ -260,15 +260,15 @@ discard block |
||
260 | 260 | { |
261 | 261 | $found = false; |
262 | 262 | |
263 | - foreach($lines as $line) |
|
263 | + foreach ($lines as $line) |
|
264 | 264 | { |
265 | - if($line->getVarValue() === $value) { |
|
265 | + if ($line->getVarValue() === $value) { |
|
266 | 266 | $found = $line; |
267 | 267 | break; |
268 | 268 | } |
269 | 269 | } |
270 | 270 | |
271 | - if(!$found) |
|
271 | + if (!$found) |
|
272 | 272 | { |
273 | 273 | $this->addValueLine($name, $value); |
274 | 274 | } |
@@ -307,9 +307,9 @@ discard block |
||
307 | 307 | { |
308 | 308 | $result = array(); |
309 | 309 | |
310 | - foreach($this->lines as $line) |
|
310 | + foreach ($this->lines as $line) |
|
311 | 311 | { |
312 | - if($line->isValue() && $line->getVarName() === $name) { |
|
312 | + if ($line->isValue() && $line->getVarName() === $name) { |
|
313 | 313 | $result[] = $line; |
314 | 314 | } |
315 | 315 | } |
@@ -20,7 +20,7 @@ |
||
20 | 20 | |
21 | 21 | protected function _filter() : string |
22 | 22 | { |
23 | - if(!is_scalar($this->value)) { |
|
23 | + if (!is_scalar($this->value)) { |
|
24 | 24 | return ''; |
25 | 25 | } |
26 | 26 |
@@ -26,11 +26,11 @@ discard block |
||
26 | 26 | */ |
27 | 27 | protected function _filter() : array |
28 | 28 | { |
29 | - if(is_array($this->value)) { |
|
29 | + if (is_array($this->value)) { |
|
30 | 30 | return $this->value; |
31 | 31 | } |
32 | 32 | |
33 | - if($this->value === '' || !is_string($this->value)) { |
|
33 | + if ($this->value === '' || !is_string($this->value)) { |
|
34 | 34 | return array(); |
35 | 35 | } |
36 | 36 | |
@@ -38,19 +38,19 @@ discard block |
||
38 | 38 | $stripEmptyEntries = $this->getBoolOption('stripEmptyEntries'); |
39 | 39 | $result = explode(',', $this->value); |
40 | 40 | |
41 | - if(!$trimEntries && !$stripEmptyEntries) { |
|
41 | + if (!$trimEntries && !$stripEmptyEntries) { |
|
42 | 42 | return $result; |
43 | 43 | } |
44 | 44 | |
45 | 45 | $keep = array(); |
46 | 46 | |
47 | - foreach($result as $entry) |
|
47 | + foreach ($result as $entry) |
|
48 | 48 | { |
49 | - if($trimEntries === true) { |
|
49 | + if ($trimEntries === true) { |
|
50 | 50 | $entry = trim($entry); |
51 | 51 | } |
52 | 52 | |
53 | - if($stripEmptyEntries === true && $entry === '') { |
|
53 | + if ($stripEmptyEntries === true && $entry === '') { |
|
54 | 54 | continue; |
55 | 55 | } |
56 | 56 |
@@ -32,7 +32,7 @@ |
||
32 | 32 | */ |
33 | 33 | protected function _validate() |
34 | 34 | { |
35 | - if(in_array($this->value, $this->getArrayOption('values'), true)) { |
|
35 | + if (in_array($this->value, $this->getArrayOption('values'), true)) { |
|
36 | 36 | return $this->value; |
37 | 37 | } |
38 | 38 |
@@ -30,7 +30,7 @@ |
||
30 | 30 | |
31 | 31 | protected function _validate() : ?int |
32 | 32 | { |
33 | - if(ConvertHelper::isInteger($this->value)) { |
|
33 | + if (ConvertHelper::isInteger($this->value)) { |
|
34 | 34 | return (int)$this->value; |
35 | 35 | } |
36 | 36 |
@@ -27,13 +27,13 @@ |
||
27 | 27 | |
28 | 28 | protected function _validate() : ?string |
29 | 29 | { |
30 | - if(!is_scalar($this->value)) { |
|
30 | + if (!is_scalar($this->value)) { |
|
31 | 31 | return null; |
32 | 32 | } |
33 | 33 | |
34 | 34 | $value = (string)$this->value; |
35 | 35 | |
36 | - if(preg_match('/\A[a-zA-Z]+\z/', $value)) { |
|
36 | + if (preg_match('/\A[a-zA-Z]+\z/', $value)) { |
|
37 | 37 | return $value; |
38 | 38 | } |
39 | 39 |
@@ -36,22 +36,22 @@ |
||
36 | 36 | |
37 | 37 | // if we are validating a subvalue, it means we are |
38 | 38 | // validating a single value in the existing list. |
39 | - if($this->isSubvalue) |
|
39 | + if ($this->isSubvalue) |
|
40 | 40 | { |
41 | - if(in_array($this->value, $allowed, true)) { |
|
41 | + if (in_array($this->value, $allowed, true)) { |
|
42 | 42 | return $this->value; |
43 | 43 | } |
44 | 44 | |
45 | 45 | return null; |
46 | 46 | } |
47 | 47 | |
48 | - if(!is_array($this->value)) { |
|
48 | + if (!is_array($this->value)) { |
|
49 | 49 | return array(); |
50 | 50 | } |
51 | 51 | |
52 | 52 | $keep = array(); |
53 | - foreach($this->value as $item) { |
|
54 | - if(in_array($item, $allowed, true)) { |
|
53 | + foreach ($this->value as $item) { |
|
54 | + if (in_array($item, $allowed, true)) { |
|
55 | 55 | $keep[] = $item; |
56 | 56 | } |
57 | 57 | } |