@@ -20,19 +20,19 @@ discard block |
||
| 20 | 20 | return ''; |
| 21 | 21 | } |
| 22 | 22 | $url = ''; |
| 23 | - $url .= isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : ''; |
|
| 23 | + $url .= isset($parsed_url['scheme']) ? $parsed_url['scheme'].'://' : ''; |
|
| 24 | 24 | $url .= isset($parsed_url['host']) ? $parsed_url['host'] : ''; |
| 25 | - $url .= isset($parsed_url['port']) ? ':' . $parsed_url['port'] : ''; |
|
| 25 | + $url .= isset($parsed_url['port']) ? ':'.$parsed_url['port'] : ''; |
|
| 26 | 26 | $user = isset($parsed_url['user']) ? $parsed_url['user'] : ''; |
| 27 | - $pass = isset($parsed_url['pass']) ? ':' . $parsed_url['pass'] : ''; |
|
| 28 | - $url .= $user . (($user || $pass) ? "$pass@" : ''); |
|
| 27 | + $pass = isset($parsed_url['pass']) ? ':'.$parsed_url['pass'] : ''; |
|
| 28 | + $url .= $user.(($user || $pass) ? "$pass@" : ''); |
|
| 29 | 29 | if (!empty($url)) { |
| 30 | - $url .= isset($parsed_url['path']) ? '/' . ltrim($parsed_url['path'], '/') : ''; |
|
| 30 | + $url .= isset($parsed_url['path']) ? '/'.ltrim($parsed_url['path'], '/') : ''; |
|
| 31 | 31 | } elseif (empty($url)) { |
| 32 | 32 | $url .= isset($parsed_url['path']) ? $parsed_url['path'] : ''; |
| 33 | 33 | } |
| 34 | - $url .= isset($parsed_url['query']) ? '?' . $parsed_url['query'] : ''; |
|
| 35 | - $url .= isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : ''; |
|
| 34 | + $url .= isset($parsed_url['query']) ? '?'.$parsed_url['query'] : ''; |
|
| 35 | + $url .= isset($parsed_url['fragment']) ? '#'.$parsed_url['fragment'] : ''; |
|
| 36 | 36 | |
| 37 | 37 | return $url; |
| 38 | 38 | } |
@@ -79,8 +79,8 @@ discard block |
||
| 79 | 79 | public static function substituteAttributesInRoute($attributes, $route) |
| 80 | 80 | { |
| 81 | 81 | foreach ($attributes as $key => $value) { |
| 82 | - $route = str_replace('{' . $key . '}', $value, $route); |
|
| 83 | - $route = str_replace('{' . $key . '?}', $value, $route); |
|
| 82 | + $route = str_replace('{'.$key.'}', $value, $route); |
|
| 83 | + $route = str_replace('{'.$key.'?}', $value, $route); |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | // delete empty optional arguments that are not in the $attributes array |