@@ -12,7 +12,7 @@ |
||
| 12 | 12 | { |
| 13 | 13 | public function validate() : bool |
| 14 | 14 | { |
| 15 | - if($this->hasScheme() || $this->isFragmentOnly()) { |
|
| 15 | + if ($this->hasScheme() || $this->isFragmentOnly()) { |
|
| 16 | 16 | return true; |
| 17 | 17 | } |
| 18 | 18 | |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | { |
| 14 | 14 | public function validate() : bool |
| 15 | 15 | { |
| 16 | - if(!$this->hasScheme() || URISchemes::isValidSchemeName((string)$this->getScheme())) { |
|
| 16 | + if (!$this->hasScheme() || URISchemes::isValidSchemeName((string)$this->getScheme())) { |
|
| 17 | 17 | return true; |
| 18 | 18 | } |
| 19 | 19 | |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | $this->parser->setError( |
| 23 | 23 | URLInfo::ERROR_INVALID_SCHEME, |
| 24 | - t('The scheme %1$s is not supported for links.', $this->getScheme()) . ' ' . |
|
| 24 | + t('The scheme %1$s is not supported for links.', $this->getScheme()).' '. |
|
| 25 | 25 | t('Valid schemes are: %1$s.', implode(', ', URISchemes::getSchemeNames())) |
| 26 | 26 | ); |
| 27 | 27 | |
@@ -73,8 +73,8 @@ discard block |
||
| 73 | 73 | */ |
| 74 | 74 | public static function detectScheme(string $url) : ?string |
| 75 | 75 | { |
| 76 | - foreach(self::$schemes as $scheme) { |
|
| 77 | - if(stripos($url, $scheme) === 0) { |
|
| 76 | + foreach (self::$schemes as $scheme) { |
|
| 77 | + if (stripos($url, $scheme) === 0) { |
|
| 78 | 78 | return $scheme; |
| 79 | 79 | } |
| 80 | 80 | } |
@@ -85,20 +85,20 @@ discard block |
||
| 85 | 85 | /** |
| 86 | 86 | * @var string[]|null |
| 87 | 87 | */ |
| 88 | - private static ?array $schemeNames = null; |
|
| 88 | + private static ? array $schemeNames = null; |
|
| 89 | 89 | |
| 90 | 90 | /** |
| 91 | 91 | * @return string[] |
| 92 | 92 | */ |
| 93 | 93 | public static function getSchemeNames() : array |
| 94 | 94 | { |
| 95 | - if(isset(self::$schemeNames)) { |
|
| 95 | + if (isset(self::$schemeNames)) { |
|
| 96 | 96 | return self::$schemeNames; |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | self::$schemeNames = array(); |
| 100 | 100 | |
| 101 | - foreach(self::$schemes as $scheme) { |
|
| 101 | + foreach (self::$schemes as $scheme) { |
|
| 102 | 102 | self::$schemeNames[] = self::resolveSchemeName($scheme); |
| 103 | 103 | } |
| 104 | 104 | |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | { |
| 132 | 132 | self::requireValidScheme($scheme); |
| 133 | 133 | |
| 134 | - if(!in_array($scheme, self::$schemes, true)) |
|
| 134 | + if (!in_array($scheme, self::$schemes, true)) |
|
| 135 | 135 | { |
| 136 | 136 | self::$schemes[] = $scheme; |
| 137 | 137 | } |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | |
| 142 | 142 | public static function requireValidScheme(string $scheme) : void |
| 143 | 143 | { |
| 144 | - if(strpos($scheme, ':')) |
|
| 144 | + if (strpos($scheme, ':')) |
|
| 145 | 145 | { |
| 146 | 146 | return; |
| 147 | 147 | } |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | * @param bool $enable Whether to turn it on or off. |
| 36 | 36 | * @return URINormalizer |
| 37 | 37 | */ |
| 38 | - public function enableAuth(bool $enable=true) : URINormalizer |
|
| 38 | + public function enableAuth(bool $enable = true) : URINormalizer |
|
| 39 | 39 | { |
| 40 | 40 | $this->auth = $enable; |
| 41 | 41 | return $this; |
@@ -72,9 +72,9 @@ discard block |
||
| 72 | 72 | $scheme = $this->info->getScheme(); |
| 73 | 73 | $normalized = ''; |
| 74 | 74 | |
| 75 | - if(!empty($scheme)) |
|
| 75 | + if (!empty($scheme)) |
|
| 76 | 76 | { |
| 77 | - $normalized = $this->info->getScheme() . '://'; |
|
| 77 | + $normalized = $this->info->getScheme().'://'; |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | $normalized = $this->renderAuth($normalized); |
@@ -89,48 +89,48 @@ discard block |
||
| 89 | 89 | |
| 90 | 90 | protected function renderAuth(string $normalized) : string |
| 91 | 91 | { |
| 92 | - if(!$this->auth || !$this->info->hasUsername()) { |
|
| 92 | + if (!$this->auth || !$this->info->hasUsername()) { |
|
| 93 | 93 | return $normalized; |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | - return $normalized . urlencode($this->info->getUsername()).':'.urlencode($this->info->getPassword()).'@'; |
|
| 96 | + return $normalized.urlencode($this->info->getUsername()).':'.urlencode($this->info->getPassword()).'@'; |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | protected function renderPort(string $normalized) : string |
| 100 | 100 | { |
| 101 | - if(!$this->info->hasPort()) { |
|
| 101 | + if (!$this->info->hasPort()) { |
|
| 102 | 102 | return $normalized; |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | - return $normalized . ':'.$this->info->getPort(); |
|
| 105 | + return $normalized.':'.$this->info->getPort(); |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | protected function renderPath(string $normalized) : string |
| 109 | 109 | { |
| 110 | - if(!$this->info->hasPath()) { |
|
| 110 | + if (!$this->info->hasPath()) { |
|
| 111 | 111 | return $normalized; |
| 112 | 112 | } |
| 113 | 113 | |
| 114 | - return $normalized . $this->info->getPath(); |
|
| 114 | + return $normalized.$this->info->getPath(); |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | protected function renderParams(string $normalized) : string |
| 118 | 118 | { |
| 119 | 119 | $params = $this->info->getParams(); |
| 120 | 120 | |
| 121 | - if(empty($params)) { |
|
| 121 | + if (empty($params)) { |
|
| 122 | 122 | return $normalized; |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | - return $normalized . '?'.http_build_query($params, '', '&', PHP_QUERY_RFC3986); |
|
| 125 | + return $normalized.'?'.http_build_query($params, '', '&', PHP_QUERY_RFC3986); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | protected function renderFragment(string $normalized) : string |
| 129 | 129 | { |
| 130 | - if(!$this->info->hasFragment()) { |
|
| 130 | + if (!$this->info->hasFragment()) { |
|
| 131 | 131 | return $normalized; |
| 132 | 132 | } |
| 133 | 133 | |
| 134 | - return $normalized . '#'.$this->info->getFragment(); |
|
| 134 | + return $normalized.'#'.$this->info->getFragment(); |
|
| 135 | 135 | } |
| 136 | 136 | } |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | 'fragment' |
| 75 | 75 | ); |
| 76 | 76 | |
| 77 | - foreach($parts as $part) |
|
| 77 | + foreach ($parts as $part) |
|
| 78 | 78 | { |
| 79 | 79 | $method = 'render_'.$part; |
| 80 | 80 | $result[] = (string)$this->$method(); |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | |
| 86 | 86 | protected function render_scheme() : string |
| 87 | 87 | { |
| 88 | - if(!$this->info->hasScheme()) { |
|
| 88 | + if (!$this->info->hasScheme()) { |
|
| 89 | 89 | return ''; |
| 90 | 90 | } |
| 91 | 91 | |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | |
| 101 | 101 | protected function render_username() : string |
| 102 | 102 | { |
| 103 | - if(!$this->info->hasUsername()) { |
|
| 103 | + if (!$this->info->hasUsername()) { |
|
| 104 | 104 | return ''; |
| 105 | 105 | } |
| 106 | 106 | |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | |
| 117 | 117 | protected function render_host() : string |
| 118 | 118 | { |
| 119 | - if(!$this->info->hasHost()) { |
|
| 119 | + if (!$this->info->hasHost()) { |
|
| 120 | 120 | return ''; |
| 121 | 121 | } |
| 122 | 122 | |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | |
| 129 | 129 | protected function render_port() : string |
| 130 | 130 | { |
| 131 | - if(!$this->info->hasPort()) { |
|
| 131 | + if (!$this->info->hasPort()) { |
|
| 132 | 132 | return ''; |
| 133 | 133 | } |
| 134 | 134 | |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | |
| 142 | 142 | protected function render_path() : string |
| 143 | 143 | { |
| 144 | - if(!$this->info->hasPath()) { |
|
| 144 | + if (!$this->info->hasPath()) { |
|
| 145 | 145 | return ''; |
| 146 | 146 | } |
| 147 | 147 | |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | { |
| 167 | 167 | $previous = $this->info->isParamExclusionEnabled(); |
| 168 | 168 | |
| 169 | - if($previous) |
|
| 169 | + if ($previous) |
|
| 170 | 170 | { |
| 171 | 171 | $this->info->setParamExclusion(false); |
| 172 | 172 | } |
@@ -182,19 +182,19 @@ discard block |
||
| 182 | 182 | { |
| 183 | 183 | $params = $this->resolveParams(); |
| 184 | 184 | |
| 185 | - if(empty($params)) { |
|
| 185 | + if (empty($params)) { |
|
| 186 | 186 | return ''; |
| 187 | 187 | } |
| 188 | 188 | |
| 189 | 189 | $tokens = array(); |
| 190 | 190 | $excluded = array(); |
| 191 | 191 | |
| 192 | - if($this->info->isParamExclusionEnabled()) |
|
| 192 | + if ($this->info->isParamExclusionEnabled()) |
|
| 193 | 193 | { |
| 194 | 194 | $excluded = $this->info->getExcludedParams(); |
| 195 | 195 | } |
| 196 | 196 | |
| 197 | - foreach($params as $param => $value) |
|
| 197 | + foreach ($params as $param => $value) |
|
| 198 | 198 | { |
| 199 | 199 | // If the parameter is numeric, it will automatically |
| 200 | 200 | // be an integer, so we need the conversion here. |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | |
| 216 | 216 | $tag = $this->resolveTag($excluded, $param); |
| 217 | 217 | |
| 218 | - if(!empty($tag)) |
|
| 218 | + if (!empty($tag)) |
|
| 219 | 219 | { |
| 220 | 220 | $tokens[] = sprintf($tag, $parts); |
| 221 | 221 | } |
@@ -234,13 +234,13 @@ discard block |
||
| 234 | 234 | protected function resolveTag(array $excluded, string $paramName) : string |
| 235 | 235 | { |
| 236 | 236 | // regular, non-excluded parameter |
| 237 | - if(!isset($excluded[$paramName])) |
|
| 237 | + if (!isset($excluded[$paramName])) |
|
| 238 | 238 | { |
| 239 | 239 | return '<span class="link-param">%s</span>'; |
| 240 | 240 | } |
| 241 | 241 | |
| 242 | 242 | // highlight excluded parameters is disabled, ignore this parameter |
| 243 | - if(!$this->info->isHighlightExcludeEnabled()) |
|
| 243 | + if (!$this->info->isHighlightExcludeEnabled()) |
|
| 244 | 244 | { |
| 245 | 245 | return ''; |
| 246 | 246 | } |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | |
| 257 | 257 | protected function render_fragment() : string |
| 258 | 258 | { |
| 259 | - if(!$this->info->hasFragment()) { |
|
| 259 | + if (!$this->info->hasFragment()) { |
|
| 260 | 260 | return ''; |
| 261 | 261 | } |
| 262 | 262 | |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | { |
| 272 | 272 | $cssFolder = realpath(__DIR__.'/../../css'); |
| 273 | 273 | |
| 274 | - if($cssFolder === false) { |
|
| 274 | + if ($cssFolder === false) { |
|
| 275 | 275 | throw new URLException( |
| 276 | 276 | 'Cannot find package CSS folder.', |
| 277 | 277 | null, |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | * @var array<string,string>|NULL |
| 71 | 71 | * @see URLInfo::getTypeLabel() |
| 72 | 72 | */ |
| 73 | - protected static ?array $typeLabels = null; |
|
| 73 | + protected static ? array $typeLabels = null; |
|
| 74 | 74 | |
| 75 | 75 | /** |
| 76 | 76 | * @var bool |
@@ -133,9 +133,9 @@ discard block |
||
| 133 | 133 | * @param bool $enabled |
| 134 | 134 | * @return URLInfo |
| 135 | 135 | */ |
| 136 | - public function setUTFEncoding(bool $enabled=true) : URLInfo |
|
| 136 | + public function setUTFEncoding(bool $enabled = true) : URLInfo |
|
| 137 | 137 | { |
| 138 | - if($this->encodeUTFChars !== $enabled) |
|
| 138 | + if ($this->encodeUTFChars !== $enabled) |
|
| 139 | 139 | { |
| 140 | 140 | $this->encodeUTFChars = $enabled; |
| 141 | 141 | $this->parse(); // reparse the URL to apply the changes |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | { |
| 240 | 240 | $port = $this->getInfoKey('port'); |
| 241 | 241 | |
| 242 | - if(!empty($port)) { |
|
| 242 | + if (!empty($port)) { |
|
| 243 | 243 | return (int)$port; |
| 244 | 244 | } |
| 245 | 245 | |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | |
| 320 | 320 | protected function getInfoKey(string $name) : string |
| 321 | 321 | { |
| 322 | - if(isset($this->info[$name])) { |
|
| 322 | + if (isset($this->info[$name])) { |
|
| 323 | 323 | return (string)$this->info[$name]; |
| 324 | 324 | } |
| 325 | 325 | |
@@ -348,13 +348,13 @@ discard block |
||
| 348 | 348 | return $this->normalize(false); |
| 349 | 349 | } |
| 350 | 350 | |
| 351 | - protected function normalize(bool $auth=true) : string |
|
| 351 | + protected function normalize(bool $auth = true) : string |
|
| 352 | 352 | { |
| 353 | - if(!$this->isValid()) { |
|
| 353 | + if (!$this->isValid()) { |
|
| 354 | 354 | return ''; |
| 355 | 355 | } |
| 356 | 356 | |
| 357 | - if(!isset($this->normalizer)) { |
|
| 357 | + if (!isset($this->normalizer)) { |
|
| 358 | 358 | $this->normalizer = new URINormalizer($this); |
| 359 | 359 | } |
| 360 | 360 | |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | */ |
| 385 | 385 | public function getHighlighted() : string |
| 386 | 386 | { |
| 387 | - if(!$this->isValid()) { |
|
| 387 | + if (!$this->isValid()) { |
|
| 388 | 388 | return ''; |
| 389 | 389 | } |
| 390 | 390 | |
@@ -424,14 +424,14 @@ discard block |
||
| 424 | 424 | */ |
| 425 | 425 | public function getParams() : array |
| 426 | 426 | { |
| 427 | - if(!$this->paramExclusion || empty($this->excludedParams)) { |
|
| 427 | + if (!$this->paramExclusion || empty($this->excludedParams)) { |
|
| 428 | 428 | return $this->info['params']; |
| 429 | 429 | } |
| 430 | 430 | |
| 431 | 431 | $keep = array(); |
| 432 | - foreach($this->info['params'] as $name => $value) |
|
| 432 | + foreach ($this->info['params'] as $name => $value) |
|
| 433 | 433 | { |
| 434 | - if(!isset($this->excludedParams[$name])) { |
|
| 434 | + if (!isset($this->excludedParams[$name])) { |
|
| 435 | 435 | $keep[$name] = $value; |
| 436 | 436 | } |
| 437 | 437 | } |
@@ -470,9 +470,9 @@ discard block |
||
| 470 | 470 | * @param string $reason A human-readable explanation why this is excluded - used when highlighting links. |
| 471 | 471 | * @return URLInfo |
| 472 | 472 | */ |
| 473 | - public function excludeParam(string $name, string $reason='') : URLInfo |
|
| 473 | + public function excludeParam(string $name, string $reason = '') : URLInfo |
|
| 474 | 474 | { |
| 475 | - if(!isset($this->excludedParams[$name])) |
|
| 475 | + if (!isset($this->excludedParams[$name])) |
|
| 476 | 476 | { |
| 477 | 477 | $this->excludedParams[$name] = $reason; |
| 478 | 478 | $this->setParamExclusion(); |
@@ -498,7 +498,7 @@ discard block |
||
| 498 | 498 | |
| 499 | 499 | public function getTypeLabel() : string |
| 500 | 500 | { |
| 501 | - if(!isset(self::$typeLabels)) |
|
| 501 | + if (!isset(self::$typeLabels)) |
|
| 502 | 502 | { |
| 503 | 503 | self::$typeLabels = array( |
| 504 | 504 | self::TYPE_EMAIL => t('Email'), |
@@ -510,7 +510,7 @@ discard block |
||
| 510 | 510 | |
| 511 | 511 | $type = $this->getType(); |
| 512 | 512 | |
| 513 | - if(!isset(self::$typeLabels[$type])) |
|
| 513 | + if (!isset(self::$typeLabels[$type])) |
|
| 514 | 514 | { |
| 515 | 515 | throw new URLException( |
| 516 | 516 | sprintf('Unknown URL type label for type [%s].', $type), |
@@ -530,7 +530,7 @@ discard block |
||
| 530 | 530 | * @param bool $highlight |
| 531 | 531 | * @return URLInfo |
| 532 | 532 | */ |
| 533 | - public function setHighlightExcluded(bool $highlight=true) : URLInfo |
|
| 533 | + public function setHighlightExcluded(bool $highlight = true) : URLInfo |
|
| 534 | 534 | { |
| 535 | 535 | $this->highlightExcluded = $highlight; |
| 536 | 536 | return $this; |
@@ -579,7 +579,7 @@ discard block |
||
| 579 | 579 | * @see URLInfo::isParamExclusionEnabled() |
| 580 | 580 | * @see URLInfo::setHighlightExcluded() |
| 581 | 581 | */ |
| 582 | - public function setParamExclusion(bool $enabled=true) : URLInfo |
|
| 582 | + public function setParamExclusion(bool $enabled = true) : URLInfo |
|
| 583 | 583 | { |
| 584 | 584 | $this->paramExclusion = $enabled; |
| 585 | 585 | return $this; |
@@ -605,13 +605,13 @@ discard block |
||
| 605 | 605 | */ |
| 606 | 606 | public function containsExcludedParams() : bool |
| 607 | 607 | { |
| 608 | - if(empty($this->excludedParams)) { |
|
| 608 | + if (empty($this->excludedParams)) { |
|
| 609 | 609 | return false; |
| 610 | 610 | } |
| 611 | 611 | |
| 612 | 612 | $names = array_keys($this->info['params']); |
| 613 | - foreach($names as $name) { |
|
| 614 | - if(isset($this->excludedParams[$name])) { |
|
| 613 | + foreach ($names as $name) { |
|
| 614 | + if (isset($this->excludedParams[$name])) { |
|
| 615 | 615 | return true; |
| 616 | 616 | } |
| 617 | 617 | } |
@@ -627,7 +627,7 @@ discard block |
||
| 627 | 627 | |
| 628 | 628 | public function offsetSet($offset, $value) : void |
| 629 | 629 | { |
| 630 | - if(in_array($offset, $this->infoKeys, true)) { |
|
| 630 | + if (in_array($offset, $this->infoKeys, true)) { |
|
| 631 | 631 | $this->info[$offset] = $value; |
| 632 | 632 | } |
| 633 | 633 | } |
@@ -644,11 +644,11 @@ discard block |
||
| 644 | 644 | |
| 645 | 645 | public function offsetGet($offset) |
| 646 | 646 | { |
| 647 | - if($offset === 'port') { |
|
| 647 | + if ($offset === 'port') { |
|
| 648 | 648 | return $this->getPort(); |
| 649 | 649 | } |
| 650 | 650 | |
| 651 | - if(in_array($offset, $this->infoKeys, true)) { |
|
| 651 | + if (in_array($offset, $this->infoKeys, true)) { |
|
| 652 | 652 | return $this->getInfoKey($offset); |
| 653 | 653 | } |
| 654 | 654 | |
@@ -683,7 +683,7 @@ discard block |
||
| 683 | 683 | * @param bool $verifySSL |
| 684 | 684 | * @return bool |
| 685 | 685 | */ |
| 686 | - public function tryConnect(bool $verifySSL=true) : bool |
|
| 686 | + public function tryConnect(bool $verifySSL = true) : bool |
|
| 687 | 687 | { |
| 688 | 688 | return $this->createConnectionTester() |
| 689 | 689 | ->setVerifySSL($verifySSL) |
@@ -726,7 +726,7 @@ discard block |
||
| 726 | 726 | */ |
| 727 | 727 | public function removeParam(string $param) : URLInfo |
| 728 | 728 | { |
| 729 | - if(isset($this->info['params'][$param])) |
|
| 729 | + if (isset($this->info['params'][$param])) |
|
| 730 | 730 | { |
| 731 | 731 | unset($this->info['params'][$param]); |
| 732 | 732 | } |
@@ -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 | } |