From dbfe748d274f6843fc91a3071df7be45c4ab5b00 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 7 May 2020 15:22:25 +0000 Subject: composer updates --- vendor/sabre/uri/lib/Version.php | 2 +- vendor/sabre/uri/lib/functions.php | 25 ++++--------------------- 2 files changed, 5 insertions(+), 22 deletions(-) (limited to 'vendor/sabre/uri/lib') diff --git a/vendor/sabre/uri/lib/Version.php b/vendor/sabre/uri/lib/Version.php index ad6c89867..ba7caf273 100644 --- a/vendor/sabre/uri/lib/Version.php +++ b/vendor/sabre/uri/lib/Version.php @@ -16,5 +16,5 @@ class Version /** * Full version number. */ - const VERSION = '2.1.3'; + const VERSION = '2.2.0'; } diff --git a/vendor/sabre/uri/lib/functions.php b/vendor/sabre/uri/lib/functions.php index 161e684d7..329c862ee 100644 --- a/vendor/sabre/uri/lib/functions.php +++ b/vendor/sabre/uri/lib/functions.php @@ -18,11 +18,6 @@ namespace Sabre\Uri; * This function takes a basePath, which itself _may_ also be relative, and * then applies the relative path on top of it. * - * @param string $basePath - * @param string $newPath - * - * @return string - * * @throws InvalidUriException */ function resolve(string $basePath, string $newPath): string @@ -112,10 +107,6 @@ function resolve(string $basePath, string $newPath): string * * It will also change a %3a into a %3A. * - * @param string $uri - * - * @return string - * * @throws InvalidUriException */ function normalize(string $uri): string @@ -183,9 +174,7 @@ function normalize(string $uri): string * Unlike PHP's parse_url, it will also convert any non-ascii characters to * percent-encoded strings. PHP's parse_url corrupts these characters on OS X. * - * @param string $uri - * - * @return array + * @return array * * @throws InvalidUriException */ @@ -225,9 +214,7 @@ function parse(string $uri): array * This function takes the components returned from PHP's parse_url, and uses * it to generate a new uri. * - * @param array $parts - * - * @return string + * @param array $parts */ function build(array $parts): string { @@ -281,9 +268,7 @@ function build(array $parts): string * If there is no dirname, it will return an empty string. Any / appearing at * the end of the string is stripped off. * - * @param string $path - * - * @return array + * @return array */ function split(string $path): array { @@ -305,9 +290,7 @@ function split(string $path): array * This function is only called if the main parse method fails. It's pretty * crude and probably slow, so the original parse_url is usually preferred. * - * @param string $uri - * - * @return array + * @return array * * @throws InvalidUriException */ -- cgit v1.2.3 From fae70bf0a7f1b566d25e30064f60d58ab150951a Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 7 May 2020 23:35:02 +0200 Subject: Revert "composer updates" This reverts commit dbfe748d274f6843fc91a3071df7be45c4ab5b00 --- vendor/sabre/uri/lib/Version.php | 2 +- vendor/sabre/uri/lib/functions.php | 25 +++++++++++++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) (limited to 'vendor/sabre/uri/lib') diff --git a/vendor/sabre/uri/lib/Version.php b/vendor/sabre/uri/lib/Version.php index ba7caf273..ad6c89867 100644 --- a/vendor/sabre/uri/lib/Version.php +++ b/vendor/sabre/uri/lib/Version.php @@ -16,5 +16,5 @@ class Version /** * Full version number. */ - const VERSION = '2.2.0'; + const VERSION = '2.1.3'; } diff --git a/vendor/sabre/uri/lib/functions.php b/vendor/sabre/uri/lib/functions.php index 329c862ee..161e684d7 100644 --- a/vendor/sabre/uri/lib/functions.php +++ b/vendor/sabre/uri/lib/functions.php @@ -18,6 +18,11 @@ namespace Sabre\Uri; * This function takes a basePath, which itself _may_ also be relative, and * then applies the relative path on top of it. * + * @param string $basePath + * @param string $newPath + * + * @return string + * * @throws InvalidUriException */ function resolve(string $basePath, string $newPath): string @@ -107,6 +112,10 @@ function resolve(string $basePath, string $newPath): string * * It will also change a %3a into a %3A. * + * @param string $uri + * + * @return string + * * @throws InvalidUriException */ function normalize(string $uri): string @@ -174,7 +183,9 @@ function normalize(string $uri): string * Unlike PHP's parse_url, it will also convert any non-ascii characters to * percent-encoded strings. PHP's parse_url corrupts these characters on OS X. * - * @return array + * @param string $uri + * + * @return array * * @throws InvalidUriException */ @@ -214,7 +225,9 @@ function parse(string $uri): array * This function takes the components returned from PHP's parse_url, and uses * it to generate a new uri. * - * @param array $parts + * @param array $parts + * + * @return string */ function build(array $parts): string { @@ -268,7 +281,9 @@ function build(array $parts): string * If there is no dirname, it will return an empty string. Any / appearing at * the end of the string is stripped off. * - * @return array + * @param string $path + * + * @return array */ function split(string $path): array { @@ -290,7 +305,9 @@ function split(string $path): array * This function is only called if the main parse method fails. It's pretty * crude and probably slow, so the original parse_url is usually preferred. * - * @return array + * @param string $uri + * + * @return array * * @throws InvalidUriException */ -- cgit v1.2.3 From f132436af3c90cff8dcef852bd836546311036f3 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 7 May 2020 21:48:26 +0000 Subject: composer updates 2 --- vendor/sabre/uri/lib/Version.php | 2 +- vendor/sabre/uri/lib/functions.php | 25 ++++--------------------- 2 files changed, 5 insertions(+), 22 deletions(-) (limited to 'vendor/sabre/uri/lib') diff --git a/vendor/sabre/uri/lib/Version.php b/vendor/sabre/uri/lib/Version.php index ad6c89867..ba7caf273 100644 --- a/vendor/sabre/uri/lib/Version.php +++ b/vendor/sabre/uri/lib/Version.php @@ -16,5 +16,5 @@ class Version /** * Full version number. */ - const VERSION = '2.1.3'; + const VERSION = '2.2.0'; } diff --git a/vendor/sabre/uri/lib/functions.php b/vendor/sabre/uri/lib/functions.php index 161e684d7..329c862ee 100644 --- a/vendor/sabre/uri/lib/functions.php +++ b/vendor/sabre/uri/lib/functions.php @@ -18,11 +18,6 @@ namespace Sabre\Uri; * This function takes a basePath, which itself _may_ also be relative, and * then applies the relative path on top of it. * - * @param string $basePath - * @param string $newPath - * - * @return string - * * @throws InvalidUriException */ function resolve(string $basePath, string $newPath): string @@ -112,10 +107,6 @@ function resolve(string $basePath, string $newPath): string * * It will also change a %3a into a %3A. * - * @param string $uri - * - * @return string - * * @throws InvalidUriException */ function normalize(string $uri): string @@ -183,9 +174,7 @@ function normalize(string $uri): string * Unlike PHP's parse_url, it will also convert any non-ascii characters to * percent-encoded strings. PHP's parse_url corrupts these characters on OS X. * - * @param string $uri - * - * @return array + * @return array * * @throws InvalidUriException */ @@ -225,9 +214,7 @@ function parse(string $uri): array * This function takes the components returned from PHP's parse_url, and uses * it to generate a new uri. * - * @param array $parts - * - * @return string + * @param array $parts */ function build(array $parts): string { @@ -281,9 +268,7 @@ function build(array $parts): string * If there is no dirname, it will return an empty string. Any / appearing at * the end of the string is stripped off. * - * @param string $path - * - * @return array + * @return array */ function split(string $path): array { @@ -305,9 +290,7 @@ function split(string $path): array * This function is only called if the main parse method fails. It's pretty * crude and probably slow, so the original parse_url is usually preferred. * - * @param string $uri - * - * @return array + * @return array * * @throws InvalidUriException */ -- cgit v1.2.3