diff options
| author | Mario <mario@mariovavti.com> | 2021-01-13 09:50:53 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-01-13 09:50:53 +0000 |
| commit | 5eefdc6485b2f6082f6fe5dfd6f1731fae7e3a2a (patch) | |
| tree | 7521f4800e393538d19c393c6f495ea2d41cbf5a /vendor/sabre/uri | |
| parent | 0bc4c7d1a0e4348018e533be600ad1c648fd97fb (diff) | |
| parent | 4d2bcbc5837a7d99dc541595ca8087c335242af0 (diff) | |
| download | volse-hubzilla-5eefdc6485b2f6082f6fe5dfd6f1731fae7e3a2a.tar.gz volse-hubzilla-5eefdc6485b2f6082f6fe5dfd6f1731fae7e3a2a.tar.bz2 volse-hubzilla-5eefdc6485b2f6082f6fe5dfd6f1731fae7e3a2a.zip | |
Merge branch '5.2RC'5.2
Diffstat (limited to 'vendor/sabre/uri')
| -rw-r--r-- | vendor/sabre/uri/.gitignore | 18 | ||||
| -rw-r--r-- | vendor/sabre/uri/composer.json | 24 | ||||
| -rw-r--r-- | vendor/sabre/uri/lib/Version.php | 2 | ||||
| -rw-r--r-- | vendor/sabre/uri/lib/functions.php | 2 |
4 files changed, 21 insertions, 25 deletions
diff --git a/vendor/sabre/uri/.gitignore b/vendor/sabre/uri/.gitignore index 4c8ac0855..a6c2b5a25 100644 --- a/vendor/sabre/uri/.gitignore +++ b/vendor/sabre/uri/.gitignore @@ -2,25 +2,7 @@ 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 - -# Vim -.*.swp - -# IDEs -/.idea - -# development stuff .php_cs.cache diff --git a/vendor/sabre/uri/composer.json b/vendor/sabre/uri/composer.json index 29194c670..4a68797a5 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.1 || ^8.0" }, "authors": [ { @@ -33,14 +33,28 @@ }, "autoload-dev": { "psr-4": { - "Sabre\\Uri\\": "tests/" + "Sabre\\Uri\\": "tests/Uri" } }, "require-dev": { "friendsofphp/php-cs-fixer": "~2.16.1", - "phpunit/phpunit" : "^7 || ^8" + "phpstan/phpstan": "^0.12", + "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0" }, - "config" : { - "bin-dir" : "bin/" + "scripts": { + "phpstan": [ + "phpstan analyse lib tests" + ], + "cs-fixer": [ + "php-cs-fixer fix" + ], + "phpunit": [ + "phpunit --configuration tests/phpunit.xml" + ], + "test": [ + "composer phpstan", + "composer cs-fixer", + "composer phpunit" + ] } } diff --git a/vendor/sabre/uri/lib/Version.php b/vendor/sabre/uri/lib/Version.php index ba7caf273..4a6c58405 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.2.1'; } diff --git a/vendor/sabre/uri/lib/functions.php b/vendor/sabre/uri/lib/functions.php index 329c862ee..0d64cead0 100644 --- a/vendor/sabre/uri/lib/functions.php +++ b/vendor/sabre/uri/lib/functions.php @@ -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, string> $parts + * @param array<string, int|string> $parts */ function build(array $parts): string { |