|
|
@@ -17,14 +17,14 @@ class UrlBuilder
|
|
|
* Concatenate a base url and a path
|
|
|
*
|
|
|
* @param string $base The base url
|
|
|
- * @param array $tails La suite de l'URL sous forme de tableau
|
|
|
+ * @param array<string> $tails La suite de l'URL sous forme de tableau
|
|
|
* @return string
|
|
|
*/
|
|
|
public static function concatPath(string $base, array $tails): string
|
|
|
{
|
|
|
$url = $base;
|
|
|
foreach ($tails as $tail){
|
|
|
- $url = trim($url) . '/' . trim(strval($tail));
|
|
|
+ $url = trim($url, '/') . '/' . trim(strval($tail), '/');
|
|
|
}
|
|
|
|
|
|
return $url;
|
|
|
@@ -76,12 +76,12 @@ class UrlBuilder
|
|
|
* Build an url
|
|
|
*
|
|
|
* @param string $url The base url
|
|
|
- * @param array $tails la suite de l'url sous forme de tableau
|
|
|
+ * @param array<string> $tails la suite de l'url sous forme de tableau
|
|
|
* @param list<string> $parameters A list of parameters (can be an empty array)
|
|
|
* @param bool $preprendHttps Should the 'https://' be prepended if missing
|
|
|
* @return string
|
|
|
*/
|
|
|
- public static function concat(string $url, array $tails, array $parameters, bool $preprendHttps = false): string
|
|
|
+ public static function concat(string $url, array $tails, array $parameters = [], bool $preprendHttps = false): string
|
|
|
{
|
|
|
$url = self::concatParameters(self::concatPath($url, $tails), $parameters);
|
|
|
if ($preprendHttps) {
|
|
|
@@ -105,6 +105,6 @@ class UrlBuilder
|
|
|
* @return string
|
|
|
*/
|
|
|
public function getAbsoluteUrl(string $path): string{
|
|
|
- return self::concat($this->baseUrl, [$path], []);
|
|
|
+ return self::concat($this->baseUrl, [$path]);
|
|
|
}
|
|
|
}
|