|
@@ -127,12 +127,12 @@ discard block |
|
|
block discarded – undo |
|
127
|
127
|
{ |
|
128
|
128
|
$normalized_authority = $this->uri_parts["host"]; |
|
129
|
129
|
|
|
130
|
|
- $normalized_authority = $this->user_info->toUriString() . $normalized_authority; |
|
|
130
|
+ $normalized_authority = $this->user_info->toUriString().$normalized_authority; |
|
131
|
131
|
|
|
132
|
132
|
$normalized_port = $this->normalizePort(); |
|
133
|
133
|
|
|
134
|
134
|
if (!is_null($normalized_port)) { |
|
135
|
|
- $normalized_authority = $normalized_authority . ":" . $normalized_port; |
|
|
135
|
+ $normalized_authority = $normalized_authority.":".$normalized_port; |
|
136
|
136
|
} |
|
137
|
137
|
|
|
138
|
138
|
return $normalized_authority; |
|
@@ -224,7 +224,7 @@ discard block |
|
|
block discarded – undo |
|
224
|
224
|
public function getPath() |
|
225
|
225
|
{ |
|
226
|
226
|
$path_unencoded = array("/"); |
|
227
|
|
- $allowed = implode($this->pchar_unencoded) . implode($this->sub_delims) . implode($path_unencoded); |
|
|
227
|
+ $allowed = implode($this->pchar_unencoded).implode($this->sub_delims).implode($path_unencoded); |
|
228
|
228
|
|
|
229
|
229
|
if ($this->containsUnallowedUriCharacters($this->uri_parts["path"], $allowed)) { |
|
230
|
230
|
$encoded_string = $this->encodeComponent($this->uri_parts["path"], $path_unencoded); |
|
@@ -545,7 +545,7 @@ discard block |
|
|
block discarded – undo |
|
545
|
545
|
$fragment_part = '(?:#(?\'fragment\'.*))?'; |
|
546
|
546
|
$reg_end = '/'; |
|
547
|
547
|
|
|
548
|
|
- $uri_syntax = $reg_start . $scheme_part . $hier_part . $query_part . $fragment_part . $reg_end; |
|
|
548
|
+ $uri_syntax = $reg_start.$scheme_part.$hier_part.$query_part.$fragment_part.$reg_end; |
|
549
|
549
|
|
|
550
|
550
|
$uri_valid = preg_match($uri_syntax, $uri, $parts); |
|
551
|
551
|
|
|
@@ -578,7 +578,7 @@ discard block |
|
|
block discarded – undo |
|
578
|
578
|
$path_part = '(?\'path\'.+)?'; |
|
579
|
579
|
$reg_end = '/'; |
|
580
|
580
|
|
|
581
|
|
- $hier_part_syntax = $reg_start . $authority_part . $path_part . $reg_end; |
|
|
581
|
+ $hier_part_syntax = $reg_start.$authority_part.$path_part.$reg_end; |
|
582
|
582
|
|
|
583
|
583
|
preg_match($hier_part_syntax, $hier_part, $hier_parts); |
|
584
|
584
|
|
|
@@ -609,7 +609,7 @@ discard block |
|
|
block discarded – undo |
|
609
|
609
|
$port_part = '(?::(?\'port\'[0-9]+))?'; |
|
610
|
610
|
$reg_end = '/'; |
|
611
|
611
|
|
|
612
|
|
- $authority_syntax = $reg_start . $user_info_part . $host_part . $port_part . $reg_end; |
|
|
612
|
+ $authority_syntax = $reg_start.$user_info_part.$host_part.$port_part.$reg_end; |
|
613
|
613
|
|
|
614
|
614
|
preg_match($authority_syntax, $authority, $authority_parts); |
|
615
|
615
|
|
|
@@ -712,7 +712,7 @@ discard block |
|
|
block discarded – undo |
|
712
|
712
|
$authority_string = ""; |
|
713
|
713
|
|
|
714
|
714
|
if (!empty($authority)) { |
|
715
|
|
- $authority_string .= "//" . $authority; |
|
|
715
|
+ $authority_string .= "//".$authority; |
|
716
|
716
|
} |
|
717
|
717
|
|
|
718
|
718
|
return $authority_string; |
|
@@ -739,7 +739,7 @@ discard block |
|
|
block discarded – undo |
|
739
|
739
|
$path_string .= $collapsed_slashes; |
|
740
|
740
|
} elseif (!empty($path)) { |
|
741
|
741
|
if (!$path_string_helper->startsWith("/")) { |
|
742
|
|
- $path_string .= "/" . $path; |
|
|
742
|
+ $path_string .= "/".$path; |
|
743
|
743
|
} else { |
|
744
|
744
|
$path_string .= $path; |
|
745
|
745
|
} |