aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/sabre/uri
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-05-07 23:35:02 +0200
committerMario <mario@mariovavti.com>2020-05-07 23:35:02 +0200
commitfae70bf0a7f1b566d25e30064f60d58ab150951a (patch)
tree1714511edb85ed0e28034ed9371d5fc515504fd6 /vendor/sabre/uri
parentffd2faf8a09a870e8dbecb3ad168e0a9b25941d3 (diff)
downloadvolse-hubzilla-fae70bf0a7f1b566d25e30064f60d58ab150951a.tar.gz
volse-hubzilla-fae70bf0a7f1b566d25e30064f60d58ab150951a.tar.bz2
volse-hubzilla-fae70bf0a7f1b566d25e30064f60d58ab150951a.zip
Revert "composer updates"
This reverts commit dbfe748d274f6843fc91a3071df7be45c4ab5b00
Diffstat (limited to 'vendor/sabre/uri')
-rw-r--r--vendor/sabre/uri/.gitignore11
-rw-r--r--vendor/sabre/uri/.php_cs.dist2
-rw-r--r--vendor/sabre/uri/composer.json5
-rw-r--r--vendor/sabre/uri/lib/Version.php2
-rw-r--r--vendor/sabre/uri/lib/functions.php25
-rw-r--r--vendor/sabre/uri/phpstan.neon1
6 files changed, 26 insertions, 20 deletions
diff --git a/vendor/sabre/uri/.gitignore b/vendor/sabre/uri/.gitignore
index 4c8ac0855..b6fc3f896 100644
--- a/vendor/sabre/uri/.gitignore
+++ b/vendor/sabre/uri/.gitignore
@@ -2,16 +2,8 @@
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
@@ -19,8 +11,5 @@ 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 c5c78a971..8d61ee259 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 29194c670..30f382937 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.1"
+ "php": ">=7"
},
"authors": [
{
@@ -37,8 +37,7 @@
}
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "~2.16.1",
- "phpunit/phpunit" : "^7 || ^8"
+ "phpunit/phpunit" : "^6"
},
"config" : {
"bin-dir" : "bin/"
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<string, string>
+ * @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<string, string> $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<int, mixed>
+ * @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<string, mixed>
+ * @param string $uri
+ *
+ * @return array
*
* @throws InvalidUriException
*/
diff --git a/vendor/sabre/uri/phpstan.neon b/vendor/sabre/uri/phpstan.neon
index 91375db8b..341d02818 100644
--- a/vendor/sabre/uri/phpstan.neon
+++ b/vendor/sabre/uri/phpstan.neon
@@ -1,2 +1,3 @@
parameters:
level: 7
+ bootstrap: %currentWorkingDirectory%/vendor/autoload.php