From 6d8aabab2347feabdd804b609dcd4513f09f78d4 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Fri, 11 Feb 2022 09:21:19 +0000
Subject: composer libs minor version updates

---
 vendor/sabre/uri/composer.json     | 2 +-
 vendor/sabre/uri/lib/Version.php   | 2 +-
 vendor/sabre/uri/lib/functions.php | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'vendor/sabre/uri')

diff --git a/vendor/sabre/uri/composer.json b/vendor/sabre/uri/composer.json
index 4a68797a5..d58fd51f7 100644
--- a/vendor/sabre/uri/composer.json
+++ b/vendor/sabre/uri/composer.json
@@ -37,7 +37,7 @@
         }
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "~2.16.1",
+        "friendsofphp/php-cs-fixer": "~2.17.1",
         "phpstan/phpstan": "^0.12",
         "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0"
     },
diff --git a/vendor/sabre/uri/lib/Version.php b/vendor/sabre/uri/lib/Version.php
index 4a6c58405..4527a0d8a 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.1';
+    const VERSION = '2.2.2';
 }
diff --git a/vendor/sabre/uri/lib/functions.php b/vendor/sabre/uri/lib/functions.php
index 0d64cead0..18a324337 100644
--- a/vendor/sabre/uri/lib/functions.php
+++ b/vendor/sabre/uri/lib/functions.php
@@ -84,7 +84,7 @@ function resolve(string $basePath, string $newPath): string
     $path = implode('/', $newPathParts);
 
     // If the source url ended with a /, we want to preserve that.
-    $newParts['path'] = $path;
+    $newParts['path'] = 0 === strpos($path, '/') ? $path : '/'.$path;
     if ($delta['query']) {
         $newParts['query'] = $delta['query'];
     } elseif (!empty($base['query']) && empty($delta['host']) && empty($delta['path'])) {
@@ -214,7 +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<string, int|string> $parts
+ * @param array<string, int|string|null> $parts
  */
 function build(array $parts): string
 {
@@ -261,7 +261,7 @@ function build(array $parts): string
  * is used) and we need a method that just operates on UTF-8 characters.
  *
  * In addition basename and dirname are platform aware, and will treat
- * backslash (\) as a directory separator on windows.
+ * backslash (\) as a directory separator on Windows.
  *
  * This method returns the 2 components as an array.
  *
-- 
cgit v1.2.3