composer updates 2

6 files changed, 20 insertions, 26 deletions

diff --git a/vendor/sabre/uri/.gitignore b/vendor/sabre/uri/.gitignore
index b6fc3f896..4c8ac0855 100644
--- a/vendor/sabre/uri/.gitignore
+++ b/vendor/sabre/uri/.gitignore
@@ -2,8 +2,16 @@
 vendor/
 composer.lock
 
+# Composer binaries
+bin/phpunit
+bin/phpstan
+bin/phpstan.phar
+bin/php-cs-fixer
+
 # Tests
 tests/cov/
+tests/.phpunit.result.cache
+coverage.xml
 
 # Composer binaries
 bin
@@ -11,5 +19,8 @@ bin
 # Vim
 .*.swp
 
+# IDEs
+/.idea
+
 # development stuff
 .php_cs.cache
diff --git a/vendor/sabre/uri/.php_cs.dist b/vendor/sabre/uri/.php_cs.dist
index 8d61ee259..c5c78a971 100644
--- a/vendor/sabre/uri/.php_cs.dist
+++ b/vendor/sabre/uri/.php_cs.dist
@@ -6,7 +6,7 @@ $config->getFinder()
     ->in(__DIR__);
 $config->setRules([
     '@PSR1' => true,
-    '@Symfony' =>true
+    '@Symfony' => true
 ]);
 
 return $config;
\ No newline at end of file
diff --git a/vendor/sabre/uri/composer.json b/vendor/sabre/uri/composer.json
index 30f382937..29194c670 100644
--- a/vendor/sabre/uri/composer.json
+++ b/vendor/sabre/uri/composer.json
@@ -9,7 +9,7 @@
     "homepage": "http://sabre.io/uri/",
     "license": "BSD-3-Clause",
     "require": {
-        "php": ">=7"
+        "php": "^7.1"
     },
     "authors": [
         {
@@ -37,7 +37,8 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit" : "^6"
+        "friendsofphp/php-cs-fixer": "~2.16.1",
+        "phpunit/phpunit" : "^7 || ^8"
     },
     "config" : {
         "bin-dir" : "bin/"
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<string, string>
  *
  * @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<string, string> $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<int, mixed>
  */
 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<string, mixed>
  *
  * @throws InvalidUriException
  */
diff --git a/vendor/sabre/uri/phpstan.neon b/vendor/sabre/uri/phpstan.neon
index 341d02818..91375db8b 100644
--- a/vendor/sabre/uri/phpstan.neon
+++ b/vendor/sabre/uri/phpstan.neon
@@ -1,3 +1,2 @@
 parameters:
   level: 7
-  bootstrap: %currentWorkingDirectory%/vendor/autoload.php