@@ -55,7 +55,7 @@ |
||
| 55 | 55 | $uri_userinfo = parent::toUriString(); //returns data string |
| 56 | 56 | |
| 57 | 57 | if (!empty($uri_userinfo)) { |
| 58 | - $uri_userinfo = $uri_userinfo . "@"; |
|
| 58 | + $uri_userinfo = $uri_userinfo."@"; |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | return $uri_userinfo; |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | /** |
| 48 | 48 | * Validates a given port. A port is valid if it is either null or an integer between 1 and 65535 inclusive. |
| 49 | 49 | * |
| 50 | - * @param mixed $port The port to be validated |
|
| 50 | + * @param integer|null $port The port to be validated |
|
| 51 | 51 | * @return bool Returns true if the given port is valid |
| 52 | 52 | * Returns false otherwise |
| 53 | 53 | */ |
@@ -92,7 +92,7 @@ |
||
| 92 | 92 | $uri_string = (string) $normalized_port; |
| 93 | 93 | |
| 94 | 94 | if (!is_null($normalized_port)) { |
| 95 | - $uri_string = ":" . $uri_string; |
|
| 95 | + $uri_string = ":".$uri_string; |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | return $uri_string; |
@@ -162,18 +162,18 @@ |
||
| 162 | 162 | $valid_characters = implode(static::$unencoded_characters); |
| 163 | 163 | |
| 164 | 164 | if (empty(static::$part_pattern)) { |
| 165 | - static::$part_pattern = '([\w'; //start decoded group |
|
| 165 | + static::$part_pattern = '([\w'; //start decoded group |
|
| 166 | 166 | |
| 167 | - static::$part_pattern = static::$part_pattern . preg_quote($valid_characters, "/"); |
|
| 167 | + static::$part_pattern = static::$part_pattern.preg_quote($valid_characters, "/"); |
|
| 168 | 168 | |
| 169 | - static::$part_pattern = static::$part_pattern . |
|
| 170 | - ']|' . //predefined patterns or percent-encoding |
|
| 171 | - self::$pct_encoded_pattern . |
|
| 169 | + static::$part_pattern = static::$part_pattern. |
|
| 170 | + ']|'.//predefined patterns or percent-encoding |
|
| 171 | + self::$pct_encoded_pattern. |
|
| 172 | 172 | ')*'; |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | - static::$valid_pattern = '/^$|^' . //allows part to be empty |
|
| 176 | - static::$part_pattern . |
|
| 175 | + static::$valid_pattern = '/^$|^'.//allows part to be empty |
|
| 176 | + static::$part_pattern. |
|
| 177 | 177 | '$/'; |
| 178 | 178 | } |
| 179 | 179 | |
@@ -78,15 +78,15 @@ |
||
| 78 | 78 | { |
| 79 | 79 | self::compileUnencodedCharacters(); |
| 80 | 80 | |
| 81 | - $valid_characters = self::$unreserved_pattern . self::$sub_delims_pattern; |
|
| 81 | + $valid_characters = self::$unreserved_pattern.self::$sub_delims_pattern; |
|
| 82 | 82 | |
| 83 | - $ip_v_future_pattern = '\[[\:' . $valid_characters . ']+\]'; |
|
| 83 | + $ip_v_future_pattern = '\[[\:'.$valid_characters.']+\]'; |
|
| 84 | 84 | |
| 85 | - $reg_name_pattern = '([' . $valid_characters . ']|' . self::$pct_encoded_pattern . ')*'; |
|
| 85 | + $reg_name_pattern = '(['.$valid_characters.']|'.self::$pct_encoded_pattern.')*'; |
|
| 86 | 86 | |
| 87 | - self::$part_pattern = $ip_v_future_pattern . '|'. $reg_name_pattern; |
|
| 87 | + self::$part_pattern = $ip_v_future_pattern.'|'.$reg_name_pattern; |
|
| 88 | 88 | |
| 89 | - self::$valid_pattern = '/^$|^' . //allows part to be empty |
|
| 90 | - $ip_v_future_pattern . '$|^' . $reg_name_pattern . '$/'; |
|
| 89 | + self::$valid_pattern = '/^$|^'.//allows part to be empty |
|
| 90 | + $ip_v_future_pattern.'$|^'.$reg_name_pattern.'$/'; |
|
| 91 | 91 | } |
| 92 | 92 | } |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | */ |
| 101 | 101 | public function __toString() |
| 102 | 102 | { |
| 103 | - return $this->user_info->toUriString() . $this->host->toUriString() . $this->port->toUriString(); |
|
| 103 | + return $this->user_info->toUriString().$this->host->toUriString().$this->port->toUriString(); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | /** |
@@ -127,12 +127,12 @@ discard block |
||
| 127 | 127 | */ |
| 128 | 128 | public function toUriString(Scheme $scheme = null) |
| 129 | 129 | { |
| 130 | - $authority_string = $this->user_info->toUriString() . |
|
| 131 | - $this->host->toUriString() . |
|
| 130 | + $authority_string = $this->user_info->toUriString(). |
|
| 131 | + $this->host->toUriString(). |
|
| 132 | 132 | $this->port->toUriString($scheme); |
| 133 | 133 | |
| 134 | 134 | if (!empty($authority_string)) { |
| 135 | - $authority_string = "//" . $authority_string; |
|
| 135 | + $authority_string = "//".$authority_string; |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | return $authority_string; |
@@ -149,15 +149,15 @@ discard block |
||
| 149 | 149 | $host_pattern = Host::getValidPattern(); |
| 150 | 150 | $port_pattern = Port::getValidPattern(); |
| 151 | 151 | |
| 152 | - $reg_start = '/^$|^'; //allow for empty authority |
|
| 152 | + $reg_start = '/^$|^'; //allow for empty authority |
|
| 153 | 153 | $reg_end = '$/'; |
| 154 | 154 | |
| 155 | 155 | self::$part_pattern = |
| 156 | - '((?\'user_info\'' . $user_info_pattern . ')@)?' . |
|
| 157 | - '(?\'host\'' . $host_pattern . ')' . |
|
| 158 | - '(:(?\'port\'' . $port_pattern . '))?'; |
|
| 156 | + '((?\'user_info\''.$user_info_pattern.')@)?'. |
|
| 157 | + '(?\'host\''.$host_pattern.')'. |
|
| 158 | + '(:(?\'port\''.$port_pattern.'))?'; |
|
| 159 | 159 | |
| 160 | - self::$valid_pattern = $reg_start . self::$part_pattern . $reg_end; |
|
| 160 | + self::$valid_pattern = $reg_start.self::$part_pattern.$reg_end; |
|
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | /** |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | $port_part = '(?::(?\'port\'[0-9]+))?'; |
| 179 | 179 | $reg_end = '/'; |
| 180 | 180 | |
| 181 | - $authority_syntax = $reg_start . $user_info_part . $host_part . $port_part . $reg_end; |
|
| 181 | + $authority_syntax = $reg_start.$user_info_part.$host_part.$port_part.$reg_end; |
|
| 182 | 182 | |
| 183 | 183 | preg_match($authority_syntax, $authority, $authority_parts); |
| 184 | 184 | |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | */ |
| 134 | 134 | public function getAuthority() |
| 135 | 135 | { |
| 136 | - return $this->user_info->toUriString() . $this->host->toUriString() . $this->port->toUriString($this->scheme); |
|
| 136 | + return $this->user_info->toUriString().$this->host->toUriString().$this->port->toUriString($this->scheme); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | /** |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | public function getPath() |
| 223 | 223 | { |
| 224 | 224 | $path_unencoded = array("/"); |
| 225 | - $allowed = implode($this->pchar_unencoded) . implode($this->sub_delims) . implode($path_unencoded); |
|
| 225 | + $allowed = implode($this->pchar_unencoded).implode($this->sub_delims).implode($path_unencoded); |
|
| 226 | 226 | |
| 227 | 227 | if ($this->containsUnallowedUriCharacters($this->uri_parts["path"], $allowed)) { |
| 228 | 228 | $encoded_string = $this->encodeComponent($this->uri_parts["path"], $path_unencoded); |
@@ -539,7 +539,7 @@ discard block |
||
| 539 | 539 | $fragment_part = '(?:#(?\'fragment\'.*))?'; |
| 540 | 540 | $reg_end = '/'; |
| 541 | 541 | |
| 542 | - $uri_syntax = $reg_start . $scheme_part . $hier_part . $query_part . $fragment_part . $reg_end; |
|
| 542 | + $uri_syntax = $reg_start.$scheme_part.$hier_part.$query_part.$fragment_part.$reg_end; |
|
| 543 | 543 | |
| 544 | 544 | $uri_valid = preg_match($uri_syntax, $uri, $parts); |
| 545 | 545 | |
@@ -564,7 +564,7 @@ discard block |
||
| 564 | 564 | */ |
| 565 | 565 | private function explodeHierParts($hier_part) |
| 566 | 566 | { |
| 567 | - $hier_parts = array( |
|
| 567 | + $hier_parts = array( |
|
| 568 | 568 | "authority" => "", |
| 569 | 569 | "path" => "", |
| 570 | 570 | ); |
@@ -574,7 +574,7 @@ discard block |
||
| 574 | 574 | $path_part = '(?\'path\'.+)?'; |
| 575 | 575 | $reg_end = '/'; |
| 576 | 576 | |
| 577 | - $hier_part_syntax = $reg_start . $authority_part . $path_part . $reg_end; |
|
| 577 | + $hier_part_syntax = $reg_start.$authority_part.$path_part.$reg_end; |
|
| 578 | 578 | |
| 579 | 579 | preg_match($hier_part_syntax, $hier_part, $matches); |
| 580 | 580 | |
@@ -663,7 +663,7 @@ discard block |
||
| 663 | 663 | $authority_string = ""; |
| 664 | 664 | |
| 665 | 665 | if (!empty($authority)) { |
| 666 | - $authority_string .= "//" . $authority; |
|
| 666 | + $authority_string .= "//".$authority; |
|
| 667 | 667 | } |
| 668 | 668 | |
| 669 | 669 | return $authority_string; |
@@ -690,7 +690,7 @@ discard block |
||
| 690 | 690 | $path_string .= $collapsed_slashes; |
| 691 | 691 | } elseif (!empty($path)) { |
| 692 | 692 | if (!$path_string_helper->startsWith("/")) { |
| 693 | - $path_string .= "/" . $path; |
|
| 693 | + $path_string .= "/".$path; |
|
| 694 | 694 | } else { |
| 695 | 695 | $path_string .= $path; |
| 696 | 696 | } |