|
@@ -130,12 +130,12 @@ discard block |
|
|
block discarded – undo |
|
130
|
130
|
{ |
|
131
|
131
|
$path = self::decomposeUrl($pathOrUrl); |
|
132
|
132
|
$path_parts = pathinfo($path['path']); |
|
133
|
|
- $new_path = $path_parts['filename'] . '.' . $path_parts['extension'] . $extension; |
|
|
133
|
+ $new_path = $path_parts['filename'].'.'.$path_parts['extension'].$extension; |
|
134
|
134
|
if (!empty($path_parts['dirname']) && $path_parts['dirname'] !== '.') { |
|
135
|
|
- $new_path = $path_parts['dirname'] . DIRECTORY_SEPARATOR . $new_path; |
|
|
135
|
+ $new_path = $path_parts['dirname'].DIRECTORY_SEPARATOR.$new_path; |
|
136
|
136
|
$new_path = preg_replace('/([^:])(\/{2,})/', '$1/', $new_path); |
|
137
|
137
|
} |
|
138
|
|
- $output = $path['prefix'] . $new_path . $path['suffix']; |
|
|
138
|
+ $output = $path['prefix'].$new_path.$path['suffix']; |
|
139
|
139
|
|
|
140
|
140
|
return $output; |
|
141
|
141
|
} |
|
@@ -156,11 +156,11 @@ discard block |
|
|
block discarded – undo |
|
156
|
156
|
|
|
157
|
157
|
if (filter_var($pathOrUrl, FILTER_VALIDATE_URL)) { |
|
158
|
158
|
$url_parts = parse_url($pathOrUrl); |
|
159
|
|
- $result['prefix'] = $url_parts['scheme'] . '://' . $url_parts['host']; |
|
|
159
|
+ $result['prefix'] = $url_parts['scheme'].'://'.$url_parts['host']; |
|
160
|
160
|
$result['path'] = $url_parts['path']; |
|
161
|
161
|
$result['suffix'] = ''; |
|
162
|
|
- $result['suffix'] .= empty($url_parts['query']) ? '' : '?' . $url_parts['query']; |
|
163
|
|
- $result['suffix'] .= empty($url_parts['fragment']) ? '' : '#' . $url_parts['fragment']; |
|
|
162
|
+ $result['suffix'] .= empty($url_parts['query']) ? '' : '?'.$url_parts['query']; |
|
|
163
|
+ $result['suffix'] .= empty($url_parts['fragment']) ? '' : '#'.$url_parts['fragment']; |
|
164
|
164
|
} else { |
|
165
|
165
|
$result['prefix'] = ''; |
|
166
|
166
|
$result['path'] = $pathOrUrl; |