@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | $lines[] = '--'.$this->boundaries->getMimeBoundary(); |
92 | 92 | $lines[] = $this->renderContentDisposition(); |
93 | 93 | |
94 | - if(!empty($this->contentType)) { |
|
94 | + if (!empty($this->contentType)) { |
|
95 | 95 | $lines[] = $this->renderContentType(); |
96 | 96 | } |
97 | 97 | |
@@ -105,9 +105,9 @@ discard block |
||
105 | 105 | { |
106 | 106 | $result = 'Content-Disposition: form-data'; |
107 | 107 | |
108 | - foreach($this->dispositionParams as $name => $value) |
|
108 | + foreach ($this->dispositionParams as $name => $value) |
|
109 | 109 | { |
110 | - $result .= '; '.$name.'="' . $value . '"'; |
|
110 | + $result .= '; '.$name.'="'.$value.'"'; |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | return $result; |
@@ -115,11 +115,11 @@ discard block |
||
115 | 115 | |
116 | 116 | protected function renderContentType() : string |
117 | 117 | { |
118 | - $result = 'Content-Type: ' . $this->contentType; |
|
118 | + $result = 'Content-Type: '.$this->contentType; |
|
119 | 119 | |
120 | - if(!empty($this->contentEncoding)) |
|
120 | + if (!empty($this->contentEncoding)) |
|
121 | 121 | { |
122 | - $result .= '; charset=' . $this->contentEncoding; |
|
122 | + $result .= '; charset='.$this->contentEncoding; |
|
123 | 123 | } |
124 | 124 | |
125 | 125 | return $result; |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | */ |
140 | 140 | public function render() : string |
141 | 141 | { |
142 | - if(empty($this->boundaries)) |
|
142 | + if (empty($this->boundaries)) |
|
143 | 143 | { |
144 | 144 | throw new RequestHelper_Exception( |
145 | 145 | 'No mime boundaries added', |
@@ -150,13 +150,13 @@ discard block |
||
150 | 150 | |
151 | 151 | $result = ''; |
152 | 152 | |
153 | - foreach($this->boundaries as $boundary) |
|
153 | + foreach ($this->boundaries as $boundary) |
|
154 | 154 | { |
155 | 155 | $result .= $boundary->render(); |
156 | 156 | } |
157 | 157 | |
158 | - $result .= "--" . $this->getMimeBoundary() . "--" . |
|
159 | - $this->getEOL() . $this->getEOL(); // always finish with two eol's!! |
|
158 | + $result .= "--".$this->getMimeBoundary()."--". |
|
159 | + $this->getEOL().$this->getEOL(); // always finish with two eol's!! |
|
160 | 160 | |
161 | 161 | return $result; |
162 | 162 | } |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | * @param bool $enable Whether to turn it on or off. |
40 | 40 | * @return URLInfo_Normalizer |
41 | 41 | */ |
42 | - public function enableAuth(bool $enable=true) : URLInfo_Normalizer |
|
42 | + public function enableAuth(bool $enable = true) : URLInfo_Normalizer |
|
43 | 43 | { |
44 | 44 | $this->auth = $enable; |
45 | 45 | return $this; |
@@ -86,48 +86,48 @@ discard block |
||
86 | 86 | |
87 | 87 | protected function renderAuth(string $normalized) : string |
88 | 88 | { |
89 | - if(!$this->info->hasUsername() || !$this->auth) { |
|
89 | + if (!$this->info->hasUsername() || !$this->auth) { |
|
90 | 90 | return $normalized; |
91 | 91 | } |
92 | 92 | |
93 | - return $normalized . urlencode($this->info->getUsername()).':'.urlencode($this->info->getPassword()).'@'; |
|
93 | + return $normalized.urlencode($this->info->getUsername()).':'.urlencode($this->info->getPassword()).'@'; |
|
94 | 94 | } |
95 | 95 | |
96 | 96 | protected function renderPort(string $normalized) : string |
97 | 97 | { |
98 | - if(!$this->info->hasPort()) { |
|
98 | + if (!$this->info->hasPort()) { |
|
99 | 99 | return $normalized; |
100 | 100 | } |
101 | 101 | |
102 | - return $normalized . ':'.$this->info->getPort(); |
|
102 | + return $normalized.':'.$this->info->getPort(); |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | protected function renderPath(string $normalized) : string |
106 | 106 | { |
107 | - if(!$this->info->hasPath()) { |
|
107 | + if (!$this->info->hasPath()) { |
|
108 | 108 | return $normalized; |
109 | 109 | } |
110 | 110 | |
111 | - return $normalized . $this->info->getPath(); |
|
111 | + return $normalized.$this->info->getPath(); |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | protected function renderParams(string $normalized) : string |
115 | 115 | { |
116 | 116 | $params = $this->info->getParams(); |
117 | 117 | |
118 | - if(empty($params)) { |
|
118 | + if (empty($params)) { |
|
119 | 119 | return $normalized; |
120 | 120 | } |
121 | 121 | |
122 | - return $normalized . '?'.http_build_query($params); |
|
122 | + return $normalized.'?'.http_build_query($params); |
|
123 | 123 | } |
124 | 124 | |
125 | 125 | protected function renderFragment(string $normalized) : string |
126 | 126 | { |
127 | - if(!$this->info->hasFragment()) { |
|
127 | + if (!$this->info->hasFragment()) { |
|
128 | 128 | return $normalized; |
129 | 129 | } |
130 | 130 | |
131 | - return $normalized . '#'.$this->info->getFragment(); |
|
131 | + return $normalized.'#'.$this->info->getFragment(); |
|
132 | 132 | } |
133 | 133 | } |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | { |
201 | 201 | $port = $this->getInfoKey('port'); |
202 | 202 | |
203 | - if(!empty($port)) { |
|
203 | + if (!empty($port)) { |
|
204 | 204 | return (int)$port; |
205 | 205 | } |
206 | 206 | |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | |
281 | 281 | protected function getInfoKey(string $name) : string |
282 | 282 | { |
283 | - if(isset($this->info[$name])) { |
|
283 | + if (isset($this->info[$name])) { |
|
284 | 284 | return (string)$this->info[$name]; |
285 | 285 | } |
286 | 286 | |
@@ -309,13 +309,13 @@ discard block |
||
309 | 309 | return $this->normalize(false); |
310 | 310 | } |
311 | 311 | |
312 | - protected function normalize(bool $auth=true) : string |
|
312 | + protected function normalize(bool $auth = true) : string |
|
313 | 313 | { |
314 | - if(!$this->isValid()) { |
|
314 | + if (!$this->isValid()) { |
|
315 | 315 | return ''; |
316 | 316 | } |
317 | 317 | |
318 | - if(!isset($this->normalizer)) { |
|
318 | + if (!isset($this->normalizer)) { |
|
319 | 319 | $this->normalizer = new URLInfo_Normalizer($this); |
320 | 320 | } |
321 | 321 | |
@@ -345,7 +345,7 @@ discard block |
||
345 | 345 | */ |
346 | 346 | public function getHighlighted() : string |
347 | 347 | { |
348 | - if(!$this->isValid()) { |
|
348 | + if (!$this->isValid()) { |
|
349 | 349 | return ''; |
350 | 350 | } |
351 | 351 | |
@@ -387,14 +387,14 @@ discard block |
||
387 | 387 | */ |
388 | 388 | public function getParams() : array |
389 | 389 | { |
390 | - if(!$this->paramExclusion || empty($this->excludedParams)) { |
|
390 | + if (!$this->paramExclusion || empty($this->excludedParams)) { |
|
391 | 391 | return $this->info['params']; |
392 | 392 | } |
393 | 393 | |
394 | 394 | $keep = array(); |
395 | - foreach($this->info['params'] as $name => $value) |
|
395 | + foreach ($this->info['params'] as $name => $value) |
|
396 | 396 | { |
397 | - if(!isset($this->excludedParams[$name])) { |
|
397 | + if (!isset($this->excludedParams[$name])) { |
|
398 | 398 | $keep[$name] = $value; |
399 | 399 | } |
400 | 400 | } |
@@ -420,7 +420,7 @@ discard block |
||
420 | 420 | */ |
421 | 421 | public function getParam(string $name) : string |
422 | 422 | { |
423 | - if(isset($this->info['params'][$name])) { |
|
423 | + if (isset($this->info['params'][$name])) { |
|
424 | 424 | return $this->info['params'][$name]; |
425 | 425 | } |
426 | 426 | |
@@ -439,7 +439,7 @@ discard block |
||
439 | 439 | */ |
440 | 440 | public function excludeParam(string $name, string $reason) : URLInfo |
441 | 441 | { |
442 | - if(!isset($this->excludedParams[$name])) |
|
442 | + if (!isset($this->excludedParams[$name])) |
|
443 | 443 | { |
444 | 444 | $this->excludedParams[$name] = $reason; |
445 | 445 | $this->setParamExclusion(); |
@@ -465,7 +465,7 @@ discard block |
||
465 | 465 | |
466 | 466 | public function getTypeLabel() : string |
467 | 467 | { |
468 | - if(!isset(self::$typeLabels)) |
|
468 | + if (!isset(self::$typeLabels)) |
|
469 | 469 | { |
470 | 470 | self::$typeLabels = array( |
471 | 471 | self::TYPE_EMAIL => t('Email'), |
@@ -477,7 +477,7 @@ discard block |
||
477 | 477 | |
478 | 478 | $type = $this->getType(); |
479 | 479 | |
480 | - if(!isset(self::$typeLabels[$type])) |
|
480 | + if (!isset(self::$typeLabels[$type])) |
|
481 | 481 | { |
482 | 482 | throw new BaseException( |
483 | 483 | sprintf('Unknown URL type label for type [%s].', $type), |
@@ -497,7 +497,7 @@ discard block |
||
497 | 497 | * @param bool $highlight |
498 | 498 | * @return URLInfo |
499 | 499 | */ |
500 | - public function setHighlightExcluded(bool $highlight=true) : URLInfo |
|
500 | + public function setHighlightExcluded(bool $highlight = true) : URLInfo |
|
501 | 501 | { |
502 | 502 | $this->highlightExcluded = $highlight; |
503 | 503 | return $this; |
@@ -545,7 +545,7 @@ discard block |
||
545 | 545 | * @see URLInfo::isParamExclusionEnabled() |
546 | 546 | * @see URLInfo::setHighlightExcluded() |
547 | 547 | */ |
548 | - public function setParamExclusion(bool $enabled=true) : URLInfo |
|
548 | + public function setParamExclusion(bool $enabled = true) : URLInfo |
|
549 | 549 | { |
550 | 550 | $this->paramExclusion = $enabled; |
551 | 551 | return $this; |
@@ -571,13 +571,13 @@ discard block |
||
571 | 571 | */ |
572 | 572 | public function containsExcludedParams() : bool |
573 | 573 | { |
574 | - if(empty($this->excludedParams)) { |
|
574 | + if (empty($this->excludedParams)) { |
|
575 | 575 | return false; |
576 | 576 | } |
577 | 577 | |
578 | 578 | $names = array_keys($this->info['params']); |
579 | - foreach($names as $name) { |
|
580 | - if(isset($this->excludedParams[$name])) { |
|
579 | + foreach ($names as $name) { |
|
580 | + if (isset($this->excludedParams[$name])) { |
|
581 | 581 | return true; |
582 | 582 | } |
583 | 583 | } |
@@ -593,7 +593,7 @@ discard block |
||
593 | 593 | |
594 | 594 | public function offsetSet($offset, $value) |
595 | 595 | { |
596 | - if(in_array($offset, $this->infoKeys)) { |
|
596 | + if (in_array($offset, $this->infoKeys)) { |
|
597 | 597 | $this->info[$offset] = $value; |
598 | 598 | } |
599 | 599 | } |
@@ -610,11 +610,11 @@ discard block |
||
610 | 610 | |
611 | 611 | public function offsetGet($offset) |
612 | 612 | { |
613 | - if($offset === 'port') { |
|
613 | + if ($offset === 'port') { |
|
614 | 614 | return $this->getPort(); |
615 | 615 | } |
616 | 616 | |
617 | - if(in_array($offset, $this->infoKeys)) { |
|
617 | + if (in_array($offset, $this->infoKeys)) { |
|
618 | 618 | return $this->getInfoKey($offset); |
619 | 619 | } |
620 | 620 | |
@@ -646,12 +646,12 @@ discard block |
||
646 | 646 | * @return bool |
647 | 647 | * @throws BaseException |
648 | 648 | */ |
649 | - public function tryConnect(bool $verifySSL=true) : bool |
|
649 | + public function tryConnect(bool $verifySSL = true) : bool |
|
650 | 650 | { |
651 | 651 | requireCURL(); |
652 | 652 | |
653 | 653 | $ch = curl_init(); |
654 | - if(!is_resource($ch)) |
|
654 | + if (!is_resource($ch)) |
|
655 | 655 | { |
656 | 656 | throw new BaseException( |
657 | 657 | 'Could not initialize a new cURL instance.', |
@@ -667,13 +667,13 @@ discard block |
||
667 | 667 | curl_setopt($ch, CURLOPT_TIMEOUT, 10); |
668 | 668 | curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); |
669 | 669 | |
670 | - if(!$verifySSL) |
|
670 | + if (!$verifySSL) |
|
671 | 671 | { |
672 | 672 | curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); |
673 | 673 | curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); |
674 | 674 | } |
675 | 675 | |
676 | - if($this->hasUsername()) |
|
676 | + if ($this->hasUsername()) |
|
677 | 677 | { |
678 | 678 | curl_setopt($ch, CURLOPT_USERNAME, $this->getUsername()); |
679 | 679 | curl_setopt($ch, CURLOPT_PASSWORD, $this->getPassword()); |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | // CURL will complain about an empty response when the |
211 | 211 | // server sends a 100-continue code. That should not be |
212 | 212 | // regarded as an error. |
213 | - if($output === false && $this->response->getCode() !== 100) |
|
213 | + if ($output === false && $this->response->getCode() !== 100) |
|
214 | 214 | { |
215 | 215 | $this->response->setError( |
216 | 216 | curl_errno($ch), |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | protected function createCURL(URLInfo $url) |
244 | 244 | { |
245 | 245 | $ch = curl_init(); |
246 | - if(!is_resource($ch)) |
|
246 | + if (!is_resource($ch)) |
|
247 | 247 | { |
248 | 248 | throw new RequestHelper_Exception( |
249 | 249 | 'Could not initialize a new cURL instance.', |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | } |
254 | 254 | |
255 | 255 | $this->setHeader('Content-Length', (string)$this->boundaries->getContentLength()); |
256 | - $this->setHeader('Content-Type', 'multipart/form-data; charset=UTF-8; boundary=' . $this->mimeBoundary); |
|
256 | + $this->setHeader('Content-Type', 'multipart/form-data; charset=UTF-8; boundary='.$this->mimeBoundary); |
|
257 | 257 | |
258 | 258 | //curl_setopt($ch, CURLOPT_VERBOSE, true); |
259 | 259 | curl_setopt($ch, CURLOPT_POST, true); |
@@ -264,13 +264,13 @@ discard block |
||
264 | 264 | curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); |
265 | 265 | curl_setopt($ch, CURLOPT_HTTPHEADER, $this->renderHeaders()); |
266 | 266 | |
267 | - if($this->verifySSL) |
|
267 | + if ($this->verifySSL) |
|
268 | 268 | { |
269 | 269 | curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); |
270 | 270 | curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); |
271 | 271 | } |
272 | 272 | |
273 | - if($url->hasUsername()) |
|
273 | + if ($url->hasUsername()) |
|
274 | 274 | { |
275 | 275 | curl_setopt($ch, CURLOPT_USERNAME, $url->getUsername()); |
276 | 276 | curl_setopt($ch, CURLOPT_PASSWORD, $url->getPassword()); |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | { |
291 | 291 | $result = array(); |
292 | 292 | |
293 | - foreach($this->headers as $name => $value) { |
|
293 | + foreach ($this->headers as $name => $value) { |
|
294 | 294 | $result[] = $name.': '.$value; |
295 | 295 | } |
296 | 296 | |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | { |
308 | 308 | $response = $this->getResponse(); |
309 | 309 | |
310 | - if($response !== null) { |
|
310 | + if ($response !== null) { |
|
311 | 311 | return $response->getHeaders(); |
312 | 312 | } |
313 | 313 |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | */ |
85 | 85 | public function setValue($value) : NumberInfo |
86 | 86 | { |
87 | - if($value instanceof NumberInfo) { |
|
87 | + if ($value instanceof NumberInfo) { |
|
88 | 88 | $value = $value->getValue(); |
89 | 89 | } |
90 | 90 | |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | |
118 | 118 | public function isPositive() : bool |
119 | 119 | { |
120 | - if(!$this->isEmpty()) { |
|
120 | + if (!$this->isEmpty()) { |
|
121 | 121 | $number = $this->getNumber(); |
122 | 122 | return $number > 0; |
123 | 123 | } |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | */ |
149 | 149 | public function hasValue() : bool |
150 | 150 | { |
151 | - if(!$this->isEmpty() && !$this->isZero()) { |
|
151 | + if (!$this->isEmpty() && !$this->isZero()) { |
|
152 | 152 | return true; |
153 | 153 | } |
154 | 154 | |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | */ |
222 | 222 | public function getUnits() |
223 | 223 | { |
224 | - if(!$this->hasUnits()) { |
|
224 | + if (!$this->hasUnits()) { |
|
225 | 225 | return 'px'; |
226 | 226 | } |
227 | 227 | |
@@ -255,15 +255,15 @@ discard block |
||
255 | 255 | */ |
256 | 256 | public function toAttribute() : string |
257 | 257 | { |
258 | - if($this->isEmpty()) { |
|
258 | + if ($this->isEmpty()) { |
|
259 | 259 | return ''; |
260 | 260 | } |
261 | 261 | |
262 | - if($this->isZero()) { |
|
262 | + if ($this->isZero()) { |
|
263 | 263 | return '0'; |
264 | 264 | } |
265 | 265 | |
266 | - if($this->isPercent()) { |
|
266 | + if ($this->isPercent()) { |
|
267 | 267 | return $this->getNumber().$this->getUnits(); |
268 | 268 | } |
269 | 269 | |
@@ -276,11 +276,11 @@ discard block |
||
276 | 276 | */ |
277 | 277 | public function toCSS() : string |
278 | 278 | { |
279 | - if($this->isEmpty()) { |
|
279 | + if ($this->isEmpty()) { |
|
280 | 280 | return ''; |
281 | 281 | } |
282 | 282 | |
283 | - if($this->isZero()) { |
|
283 | + if ($this->isZero()) { |
|
284 | 284 | return '0'; |
285 | 285 | } |
286 | 286 | |
@@ -289,7 +289,7 @@ discard block |
||
289 | 289 | |
290 | 290 | public function __toString() |
291 | 291 | { |
292 | - if($this->isEmpty()) { |
|
292 | + if ($this->isEmpty()) { |
|
293 | 293 | return ''; |
294 | 294 | } |
295 | 295 | |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | public function isBiggerThan($number) |
308 | 308 | { |
309 | 309 | $number = parseNumber($number); |
310 | - if($number->getUnits() != $this->getUnits()) { |
|
310 | + if ($number->getUnits() != $this->getUnits()) { |
|
311 | 311 | return false; |
312 | 312 | } |
313 | 313 | |
@@ -325,7 +325,7 @@ discard block |
||
325 | 325 | public function isSmallerThan($number) |
326 | 326 | { |
327 | 327 | $number = parseNumber($number); |
328 | - if($number->getUnits() != $this->getUnits()) { |
|
328 | + if ($number->getUnits() != $this->getUnits()) { |
|
329 | 329 | return false; |
330 | 330 | } |
331 | 331 | |
@@ -335,7 +335,7 @@ discard block |
||
335 | 335 | public function isBiggerEqual($number) |
336 | 336 | { |
337 | 337 | $number = parseNumber($number); |
338 | - if($number->getUnits() != $this->getUnits()) { |
|
338 | + if ($number->getUnits() != $this->getUnits()) { |
|
339 | 339 | return false; |
340 | 340 | } |
341 | 341 | |
@@ -352,14 +352,14 @@ discard block |
||
352 | 352 | */ |
353 | 353 | public function add($value) |
354 | 354 | { |
355 | - if($this->isEmpty()) { |
|
355 | + if ($this->isEmpty()) { |
|
356 | 356 | $this->setValue($value); |
357 | 357 | return $this; |
358 | 358 | } |
359 | 359 | |
360 | 360 | $number = parseNumber($value); |
361 | 361 | |
362 | - if($number->getUnits() == $this->getUnits() || !$number->hasUnits()) |
|
362 | + if ($number->getUnits() == $this->getUnits() || !$number->hasUnits()) |
|
363 | 363 | { |
364 | 364 | $new = $this->getNumber() + $number->getNumber(); |
365 | 365 | $this->setValue($new.$this->getUnits()); |
@@ -378,14 +378,14 @@ discard block |
||
378 | 378 | */ |
379 | 379 | public function subtract($value) |
380 | 380 | { |
381 | - if($this->isEmpty()) { |
|
381 | + if ($this->isEmpty()) { |
|
382 | 382 | $this->setValue($value); |
383 | 383 | return $this; |
384 | 384 | } |
385 | 385 | |
386 | 386 | $number = parseNumber($value); |
387 | 387 | |
388 | - if($number->getUnits() == $this->getUnits() || !$number->hasUnits()) |
|
388 | + if ($number->getUnits() == $this->getUnits() || !$number->hasUnits()) |
|
389 | 389 | { |
390 | 390 | $new = $this->getNumber() - $number->getNumber(); |
391 | 391 | $this->setValue($new.$this->getUnits()); |
@@ -412,25 +412,25 @@ discard block |
||
412 | 412 | |
413 | 413 | protected function percentOperation($operation, $percent) |
414 | 414 | { |
415 | - if($this->isZeroOrEmpty()) { |
|
415 | + if ($this->isZeroOrEmpty()) { |
|
416 | 416 | return $this; |
417 | 417 | } |
418 | 418 | |
419 | 419 | $percent = parseNumber($percent); |
420 | - if($percent->hasUnits() && !$percent->isPercent()) { |
|
420 | + if ($percent->hasUnits() && !$percent->isPercent()) { |
|
421 | 421 | return $this; |
422 | 422 | } |
423 | 423 | |
424 | 424 | $number = $this->getNumber(); |
425 | 425 | $value = $number * $percent->getNumber() / 100; |
426 | 426 | |
427 | - if($operation == '-') { |
|
427 | + if ($operation == '-') { |
|
428 | 428 | $number = $number - $value; |
429 | 429 | } else { |
430 | 430 | $number = $number + $value; |
431 | 431 | } |
432 | 432 | |
433 | - if($this->isUnitInteger()) { |
|
433 | + if ($this->isUnitInteger()) { |
|
434 | 434 | $number = intval($number); |
435 | 435 | } |
436 | 436 | |
@@ -481,7 +481,7 @@ discard block |
||
481 | 481 | |
482 | 482 | $key = $this->createValueKey($value); |
483 | 483 | |
484 | - if(array_key_exists($key, $cache)) { |
|
484 | + if (array_key_exists($key, $cache)) { |
|
485 | 485 | return $cache[$key]; |
486 | 486 | } |
487 | 487 | |
@@ -491,13 +491,13 @@ discard block |
||
491 | 491 | 'number' => null |
492 | 492 | ); |
493 | 493 | |
494 | - if($key === '_EMPTY_') |
|
494 | + if ($key === '_EMPTY_') |
|
495 | 495 | { |
496 | 496 | $cache[$key]['empty'] = true; |
497 | 497 | return $cache[$key]; |
498 | 498 | } |
499 | 499 | |
500 | - if($value === 0 || $value === '0') |
|
500 | + if ($value === 0 || $value === '0') |
|
501 | 501 | { |
502 | 502 | $cache[$key]['number'] = 0; |
503 | 503 | $cache[$key] = $this->filterInfo($cache[$key]); |
@@ -506,20 +506,20 @@ discard block |
||
506 | 506 | |
507 | 507 | $test = trim((string)$value); |
508 | 508 | |
509 | - if($test === '') |
|
509 | + if ($test === '') |
|
510 | 510 | { |
511 | 511 | $cache[$key]['empty'] = true; |
512 | 512 | return $cache[$key]; |
513 | 513 | } |
514 | 514 | |
515 | 515 | // replace comma notation (which is only possible if it's a string) |
516 | - if(is_string($value)) |
|
516 | + if (is_string($value)) |
|
517 | 517 | { |
518 | 518 | $test = $this->preProcess($test, $cache, $value); |
519 | 519 | } |
520 | 520 | |
521 | 521 | // convert to a number if it's numeric |
522 | - if(is_numeric($test)) |
|
522 | + if (is_numeric($test)) |
|
523 | 523 | { |
524 | 524 | $cache[$key]['number'] = (float)$test * 1; |
525 | 525 | $cache[$key] = $this->filterInfo($cache[$key]); |
@@ -545,19 +545,19 @@ discard block |
||
545 | 545 | $empty = false; |
546 | 546 | |
547 | 547 | $found = $this->findUnits($test); |
548 | - if($found !== null) |
|
548 | + if ($found !== null) |
|
549 | 549 | { |
550 | 550 | $number = $found['number']; |
551 | 551 | $units = $found['units']; |
552 | 552 | } |
553 | 553 | |
554 | 554 | // the filters have to restore the value |
555 | - if($this->postProcess) |
|
555 | + if ($this->postProcess) |
|
556 | 556 | { |
557 | 557 | $number = $this->postProcess($number, $test); |
558 | 558 | } |
559 | 559 | // empty number |
560 | - else if($number === '' || $number === null || is_bool($number)) |
|
560 | + else if ($number === '' || $number === null || is_bool($number)) |
|
561 | 561 | { |
562 | 562 | $number = null; |
563 | 563 | $empty = true; |
@@ -568,7 +568,7 @@ discard block |
||
568 | 568 | $number = trim($number); |
569 | 569 | |
570 | 570 | // may be an arbitrary string in some cases |
571 | - if(!is_numeric($number)) |
|
571 | + if (!is_numeric($number)) |
|
572 | 572 | { |
573 | 573 | $number = null; |
574 | 574 | $empty = true; |
@@ -600,17 +600,17 @@ discard block |
||
600 | 600 | $vlength = strlen($value); |
601 | 601 | $names = array_keys($this->knownUnits); |
602 | 602 | |
603 | - foreach($names as $unit) |
|
603 | + foreach ($names as $unit) |
|
604 | 604 | { |
605 | 605 | $ulength = strlen($unit); |
606 | - $start = $vlength-$ulength; |
|
607 | - if($start < 0) { |
|
606 | + $start = $vlength - $ulength; |
|
607 | + if ($start < 0) { |
|
608 | 608 | continue; |
609 | 609 | } |
610 | 610 | |
611 | 611 | $search = substr($value, $start, $ulength); |
612 | 612 | |
613 | - if($search==$unit) |
|
613 | + if ($search == $unit) |
|
614 | 614 | { |
615 | 615 | return array( |
616 | 616 | 'units' => $unit, |
@@ -630,7 +630,7 @@ discard block |
||
630 | 630 | */ |
631 | 631 | private function createValueKey($value) : string |
632 | 632 | { |
633 | - if(!is_string($value) && !is_numeric($value)) |
|
633 | + if (!is_string($value) && !is_numeric($value)) |
|
634 | 634 | { |
635 | 635 | return '_EMPTY_'; |
636 | 636 | } |
@@ -696,12 +696,12 @@ discard block |
||
696 | 696 | protected function filterInfo(array $info) : array |
697 | 697 | { |
698 | 698 | $useUnits = 'px'; |
699 | - if($info['units'] !== null) { |
|
699 | + if ($info['units'] !== null) { |
|
700 | 700 | $useUnits = $info['units']; |
701 | 701 | } |
702 | 702 | |
703 | 703 | // the units are non-decimal: convert decimal values |
704 | - if($useUnits !== null && $this->knownUnits[$useUnits] === false && !$info['empty'] && is_numeric($info['number'])) |
|
704 | + if ($useUnits !== null && $this->knownUnits[$useUnits] === false && !$info['empty'] && is_numeric($info['number'])) |
|
705 | 705 | { |
706 | 706 | $info['number'] = intval($info['number']); |
707 | 707 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | |
30 | 30 | public function addClass(string $name) |
31 | 31 | { |
32 | - if(!in_array($name, $this->classes)) { |
|
32 | + if (!in_array($name, $this->classes)) { |
|
33 | 33 | $this->classes[] = $name; |
34 | 34 | } |
35 | 35 | |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | |
39 | 39 | public function addClasses(array $names) |
40 | 40 | { |
41 | - foreach($names as $name) { |
|
41 | + foreach ($names as $name) { |
|
42 | 42 | $this->addClass($name); |
43 | 43 | } |
44 | 44 | |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | { |
55 | 55 | $idx = array_search($name, $this->classes); |
56 | 56 | |
57 | - if($idx !== false) { |
|
57 | + if ($idx !== false) { |
|
58 | 58 | unset($this->classes[$idx]); |
59 | 59 | sort($this->classes); |
60 | 60 | } |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | */ |
45 | 45 | protected static function init() : void |
46 | 46 | { |
47 | - if(!empty(self::$sizes)) { |
|
47 | + if (!empty(self::$sizes)) { |
|
48 | 48 | return; |
49 | 49 | } |
50 | 50 | |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | |
63 | 63 | self::addSize('b', 1, 1, t('B'), t('Byte'), t('Bytes')); |
64 | 64 | |
65 | - if(class_exists('AppLocalize\Localization')) |
|
65 | + if (class_exists('AppLocalize\Localization')) |
|
66 | 66 | { |
67 | 67 | \AppLocalize\Localization::onLocaleChanged(array(self::class, 'handle_localeChanged')); |
68 | 68 | } |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | |
132 | 132 | $name = strtolower($name); |
133 | 133 | |
134 | - if(isset(self::$sizes[$name])) { |
|
134 | + if (isset(self::$sizes[$name])) { |
|
135 | 135 | return self::$sizes[$name]; |
136 | 136 | } |
137 | 137 | |
@@ -173,9 +173,9 @@ discard block |
||
173 | 173 | |
174 | 174 | $result = array(); |
175 | 175 | |
176 | - foreach(self::$sizes as $size) |
|
176 | + foreach (self::$sizes as $size) |
|
177 | 177 | { |
178 | - if($size->getBase() === $base) { |
|
178 | + if ($size->getBase() === $base) { |
|
179 | 179 | $result[] = $size; |
180 | 180 | } |
181 | 181 | } |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | * @param bool $enable |
58 | 58 | * @return ConvertHelper_TabsNormalizer |
59 | 59 | */ |
60 | - public function convertTabsToSpaces(bool $enable=true) : ConvertHelper_TabsNormalizer |
|
60 | + public function convertTabsToSpaces(bool $enable = true) : ConvertHelper_TabsNormalizer |
|
61 | 61 | { |
62 | 62 | $this->tabs2spaces = $enable; |
63 | 63 | |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | |
95 | 95 | $result = $this->_normalize(); |
96 | 96 | |
97 | - if($this->tabs2spaces) |
|
97 | + if ($this->tabs2spaces) |
|
98 | 98 | { |
99 | 99 | $result = ConvertHelper::tabs2spaces($result, $this->tabSize); |
100 | 100 | } |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | { |
109 | 109 | $eol = ConvertHelper::detectEOLCharacter($string); |
110 | 110 | |
111 | - if($eol !== null) |
|
111 | + if ($eol !== null) |
|
112 | 112 | { |
113 | 113 | $this->eol = $eol->getCharacter(); |
114 | 114 | } |
@@ -126,15 +126,15 @@ discard block |
||
126 | 126 | { |
127 | 127 | $converted = array(); |
128 | 128 | |
129 | - foreach($this->lines as $line) |
|
129 | + foreach ($this->lines as $line) |
|
130 | 130 | { |
131 | 131 | $amount = substr_count($line, "\t") - $this->min; |
132 | 132 | |
133 | 133 | $line = trim($line, "\n\r\t"); |
134 | 134 | |
135 | - if($amount >= 1) |
|
135 | + if ($amount >= 1) |
|
136 | 136 | { |
137 | - $line = str_repeat("\t", $amount) . $line; |
|
137 | + $line = str_repeat("\t", $amount).$line; |
|
138 | 138 | } |
139 | 139 | |
140 | 140 | $converted[] = $line; |
@@ -149,23 +149,23 @@ discard block |
||
149 | 149 | */ |
150 | 150 | protected function countOccurrences() : void |
151 | 151 | { |
152 | - foreach($this->lines as $line) |
|
152 | + foreach ($this->lines as $line) |
|
153 | 153 | { |
154 | 154 | $amount = substr_count($line, "\t"); |
155 | 155 | |
156 | - if($amount > $this->max) |
|
156 | + if ($amount > $this->max) |
|
157 | 157 | { |
158 | 158 | $this->max = $amount; |
159 | 159 | continue; |
160 | 160 | } |
161 | 161 | |
162 | - if($amount > 0 && $amount < $this->min) |
|
162 | + if ($amount > 0 && $amount < $this->min) |
|
163 | 163 | { |
164 | 164 | $this->min = $amount; |
165 | 165 | } |
166 | 166 | } |
167 | 167 | |
168 | - if($this->min === PHP_INT_MAX) { |
|
168 | + if ($this->min === PHP_INT_MAX) { |
|
169 | 169 | $this->min = 0; |
170 | 170 | } |
171 | 171 | } |