aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/sabre/http
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/sabre/http')
-rw-r--r--vendor/sabre/http/.gitignore15
-rw-r--r--vendor/sabre/http/.travis.yml34
-rw-r--r--vendor/sabre/http/CHANGELOG.md5
-rw-r--r--vendor/sabre/http/composer.json22
-rw-r--r--vendor/sabre/http/lib/Auth/AbstractAuth.php2
-rw-r--r--vendor/sabre/http/lib/Auth/Digest.php2
-rw-r--r--vendor/sabre/http/lib/Version.php2
7 files changed, 48 insertions, 34 deletions
diff --git a/vendor/sabre/http/.gitignore b/vendor/sabre/http/.gitignore
index d291af69a..367bba576 100644
--- a/vendor/sabre/http/.gitignore
+++ b/vendor/sabre/http/.gitignore
@@ -4,20 +4,5 @@ composer.lock
# Tests
tests/cov/
-
-# phpunit cache
.phpunit.result.cache
-
-# Composer binaries
-bin/phpunit*
-bin/phpcs*
-bin/php-cs-fixer*
-bin/phpstan
-bin/phpstan.phar
-
-# Vim
-.*.swp
-
-# development stuff
-/.idea
.php_cs.cache
diff --git a/vendor/sabre/http/.travis.yml b/vendor/sabre/http/.travis.yml
index daa24bff5..c93e4ae75 100644
--- a/vendor/sabre/http/.travis.yml
+++ b/vendor/sabre/http/.travis.yml
@@ -8,34 +8,44 @@ php:
env:
global:
+ - RUN_PHPCSFIXER="TRUE"
+ - RUN_PHPUNIT="TRUE"
- RUN_PHPSTAN="FALSE"
matrix:
- - PREFER_LOWEST="" WITH_COVERAGE="--coverage-clover=coverage.xml"
- - PREFER_LOWEST="--prefer-lowest" $WITH_COVERAGE=""
+ - PREFER_LOWEST="" REPORT_COVERAGE="TRUE" WITH_COVERAGE="--coverage-clover=coverage.xml"
+ - PREFER_LOWEST="--prefer-lowest" REPORT_COVERAGE="FALSE" WITH_COVERAGE=""
matrix:
include:
+ - name: 'PHP8'
+ dist: focal
+ php: nightly
+ env:
+ - RUN_PHPCSFIXER="FALSE"
+ - REPORT_COVERAGE="FALSE"
- name: 'PHPStan'
- php: 7.2
- env: RUN_PHPSTAN="TRUE"
+ php: 7.4
+ env:
+ - RUN_PHPCSFIXER="FALSE"
+ - RUN_PHPUNIT="FALSE"
+ - RUN_PHPSTAN="TRUE"
+ - REPORT_COVERAGE="FALSE"
fast_finish: true
cache:
directories:
- $HOME/.composer/cache
-install:
- - if [ $RUN_PHPSTAN == "TRUE" ]; then composer require --dev phpstan/phpstan:^0.12; fi
-
before_script:
- - composer update --prefer-source $PREFER_LOWEST
+ - if [ $RUN_PHPCSFIXER == "FALSE" ]; then composer remove --dev friendsofphp/php-cs-fixer; fi
+ - composer update $PREFER_LOWEST
- PHP_BIN=$(phpenv which php)
- sudo $PHP_BIN -S localhost:80 -t $TRAVIS_BUILD_DIR/tests/www 2>/dev/null &
script:
- - if [ $RUN_PHPSTAN == "FALSE" ]; then ./bin/php-cs-fixer fix --dry-run --diff; fi
- - if [ $RUN_PHPSTAN == "FALSE" ]; then ./bin/phpunit --configuration tests/phpunit.xml $WITH_COVERAGE; fi
- - if [ $RUN_PHPSTAN == "TRUE" ]; then php ./bin/phpstan analyse -c phpstan.neon lib; fi
+ - if [ $RUN_PHPCSFIXER == "TRUE" ]; then php vendor/bin/php-cs-fixer fix --dry-run --diff; fi
+ - if [ $RUN_PHPUNIT == "TRUE" ]; then php vendor/bin/phpunit --configuration tests/phpunit.xml $WITH_COVERAGE; fi
+ - if [ $RUN_PHPSTAN == "TRUE" ]; then composer phpstan; fi
after_success:
- - bash <(curl -s https://codecov.io/bash)
+ - if [ $REPORT_COVERAGE == "TRUE" ]; then bash <(curl -s https://codecov.io/bash); fi
diff --git a/vendor/sabre/http/CHANGELOG.md b/vendor/sabre/http/CHANGELOG.md
index 716e09e68..eb226f7a5 100644
--- a/vendor/sabre/http/CHANGELOG.md
+++ b/vendor/sabre/http/CHANGELOG.md
@@ -1,6 +1,11 @@
ChangeLog
=========
+5.1.1 (2020-10-03)
+-------------------------
+
+* #160: Added support for PHP 8.0 (@phil-davis)
+
5.1.0 (2020-01-31)
-------------------------
diff --git a/vendor/sabre/http/composer.json b/vendor/sabre/http/composer.json
index 198cf2344..7f54df6e8 100644
--- a/vendor/sabre/http/composer.json
+++ b/vendor/sabre/http/composer.json
@@ -5,7 +5,7 @@
"homepage" : "https://github.com/fruux/sabre-http",
"license" : "BSD-3-Clause",
"require" : {
- "php" : "^7.1",
+ "php" : "^7.1 || ^8.0",
"ext-mbstring" : "*",
"ext-ctype" : "*",
"ext-curl" : "*",
@@ -14,7 +14,8 @@
},
"require-dev" : {
"friendsofphp/php-cs-fixer": "~2.16.1",
- "phpunit/phpunit" : "^7.0 || ^8.0"
+ "phpstan/phpstan": "^0.12",
+ "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0"
},
"suggest" : {
"ext-curl" : " to make http requests with the Client class"
@@ -44,7 +45,20 @@
"Sabre\\HTTP\\" : "tests/HTTP"
}
},
- "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/http/lib/Auth/AbstractAuth.php b/vendor/sabre/http/lib/Auth/AbstractAuth.php
index ada6bf0f0..645f07edd 100644
--- a/vendor/sabre/http/lib/Auth/AbstractAuth.php
+++ b/vendor/sabre/http/lib/Auth/AbstractAuth.php
@@ -42,7 +42,7 @@ abstract class AbstractAuth
/**
* Creates the object.
*/
- public function __construct(string $realm = 'SabreTooth', RequestInterface $request, ResponseInterface $response)
+ public function __construct(string $realm, RequestInterface $request, ResponseInterface $response)
{
$this->realm = $realm;
$this->request = $request;
diff --git a/vendor/sabre/http/lib/Auth/Digest.php b/vendor/sabre/http/lib/Auth/Digest.php
index dd35a0b74..a093d8b75 100644
--- a/vendor/sabre/http/lib/Auth/Digest.php
+++ b/vendor/sabre/http/lib/Auth/Digest.php
@@ -46,7 +46,7 @@ class Digest extends AbstractAuth
/**
* Initializes the object.
*/
- public function __construct(string $realm = 'SabreTooth', RequestInterface $request, ResponseInterface $response)
+ public function __construct(string $realm, RequestInterface $request, ResponseInterface $response)
{
$this->nonce = uniqid();
$this->opaque = md5($realm);
diff --git a/vendor/sabre/http/lib/Version.php b/vendor/sabre/http/lib/Version.php
index 8946a46a6..624e2a78e 100644
--- a/vendor/sabre/http/lib/Version.php
+++ b/vendor/sabre/http/lib/Version.php
@@ -16,5 +16,5 @@ class Version
/**
* Full version number.
*/
- const VERSION = '5.1.0';
+ const VERSION = '5.1.1';
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 23:36:19 +0000