aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/sabre/http
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/http
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/http')
-rw-r--r--vendor/sabre/http/.gitignore7
-rw-r--r--vendor/sabre/http/.php_cs.dist2
-rw-r--r--vendor/sabre/http/.travis.yml6
-rw-r--r--vendor/sabre/http/CHANGELOG.md7
-rw-r--r--vendor/sabre/http/composer.json10
-rw-r--r--vendor/sabre/http/lib/Client.php2
-rw-r--r--vendor/sabre/http/lib/Message.php2
-rw-r--r--vendor/sabre/http/lib/MessageDecoratorTrait.php2
-rw-r--r--vendor/sabre/http/lib/MessageInterface.php2
-rw-r--r--vendor/sabre/http/lib/ResponseDecorator.php2
-rw-r--r--vendor/sabre/http/lib/Version.php2
-rw-r--r--vendor/sabre/http/lib/functions.php15
-rw-r--r--vendor/sabre/http/phpstan.neon1
13 files changed, 33 insertions, 27 deletions
diff --git a/vendor/sabre/http/.gitignore b/vendor/sabre/http/.gitignore
index d291af69a..5f85ecc1b 100644
--- a/vendor/sabre/http/.gitignore
+++ b/vendor/sabre/http/.gitignore
@@ -5,19 +5,14 @@ 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
+bin/sabre-cs-fixer*
# Vim
.*.swp
# development stuff
-/.idea
.php_cs.cache
diff --git a/vendor/sabre/http/.php_cs.dist b/vendor/sabre/http/.php_cs.dist
index c5c78a971..8d61ee259 100644
--- a/vendor/sabre/http/.php_cs.dist
+++ b/vendor/sabre/http/.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/http/.travis.yml b/vendor/sabre/http/.travis.yml
index daa24bff5..3b85d5f39 100644
--- a/vendor/sabre/http/.travis.yml
+++ b/vendor/sabre/http/.travis.yml
@@ -1,10 +1,11 @@
language: php
sudo: required
php:
+ - 7.0
- 7.1
- 7.2
- 7.3
- - 7.4
+ - 7.4snapshot
env:
global:
@@ -25,7 +26,7 @@ cache:
- $HOME/.composer/cache
install:
- - if [ $RUN_PHPSTAN == "TRUE" ]; then composer require --dev phpstan/phpstan:^0.12; fi
+ - if [ $RUN_PHPSTAN == "TRUE" ]; then composer require --dev phpstan/phpstan; fi
before_script:
- composer update --prefer-source $PREFER_LOWEST
@@ -33,7 +34,6 @@ before_script:
- 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
diff --git a/vendor/sabre/http/CHANGELOG.md b/vendor/sabre/http/CHANGELOG.md
index 716e09e68..e300aad09 100644
--- a/vendor/sabre/http/CHANGELOG.md
+++ b/vendor/sabre/http/CHANGELOG.md
@@ -1,13 +1,6 @@
ChangeLog
=========
-5.1.0 (2020-01-31)
--------------------------
-
-* Added support for PHP 7.4, dropped support for PHP 7.0 (@phil-davis)
-* Updated testsuite for phpunit8, added phpstan coverage (@phil-davis)
-* Added autoload-dev for test classes (@C0pyR1ght)
-
5.0.5 (2019-11-28)
-------------------------
diff --git a/vendor/sabre/http/composer.json b/vendor/sabre/http/composer.json
index 198cf2344..851a08730 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.0",
"ext-mbstring" : "*",
"ext-ctype" : "*",
"ext-curl" : "*",
@@ -13,8 +13,7 @@
"sabre/uri" : "^2.0"
},
"require-dev" : {
- "friendsofphp/php-cs-fixer": "~2.16.1",
- "phpunit/phpunit" : "^7.0 || ^8.0"
+ "phpunit/phpunit" : "^6.0 || ^7.0"
},
"suggest" : {
"ext-curl" : " to make http requests with the Client class"
@@ -39,11 +38,6 @@
"Sabre\\HTTP\\" : "lib/"
}
},
- "autoload-dev" : {
- "psr-4" : {
- "Sabre\\HTTP\\" : "tests/HTTP"
- }
- },
"config" : {
"bin-dir" : "bin/"
}
diff --git a/vendor/sabre/http/lib/Client.php b/vendor/sabre/http/lib/Client.php
index b79c564da..48862e7da 100644
--- a/vendor/sabre/http/lib/Client.php
+++ b/vendor/sabre/http/lib/Client.php
@@ -450,6 +450,8 @@ class Client extends EventEmitter
* * http_code - HTTP status code, as an int. Only set if Only set if
* status is STATUS_SUCCESS, or STATUS_HTTPERROR
*
+ * @param array $headerLines
+ * @param string $body
* @param resource $curlHandle
*/
protected function parseCurlResponse(array $headerLines, string $body, $curlHandle): array
diff --git a/vendor/sabre/http/lib/Message.php b/vendor/sabre/http/lib/Message.php
index 90153fda5..fc34f8d7f 100644
--- a/vendor/sabre/http/lib/Message.php
+++ b/vendor/sabre/http/lib/Message.php
@@ -283,6 +283,8 @@ abstract class Message implements MessageInterface
/**
* Returns the HTTP version.
+ *
+ * @return string
*/
public function getHttpVersion(): string
{
diff --git a/vendor/sabre/http/lib/MessageDecoratorTrait.php b/vendor/sabre/http/lib/MessageDecoratorTrait.php
index 6f49dadfc..d5504ac78 100644
--- a/vendor/sabre/http/lib/MessageDecoratorTrait.php
+++ b/vendor/sabre/http/lib/MessageDecoratorTrait.php
@@ -180,6 +180,8 @@ trait MessageDecoratorTrait
* The specified header name must be treated as case-insensitive.
* This method should return true if the header was successfully deleted,
* and false if the header did not exist.
+ *
+ * @return bool
*/
public function removeHeader(string $name): bool
{
diff --git a/vendor/sabre/http/lib/MessageInterface.php b/vendor/sabre/http/lib/MessageInterface.php
index 8504f0f59..8070845d9 100644
--- a/vendor/sabre/http/lib/MessageInterface.php
+++ b/vendor/sabre/http/lib/MessageInterface.php
@@ -29,6 +29,8 @@ interface MessageInterface
*
* Note that because the underlying data may be based on a stream, this
* method could only work correctly the first time.
+ *
+ * @return string
*/
public function getBodyAsString(): string;
diff --git a/vendor/sabre/http/lib/ResponseDecorator.php b/vendor/sabre/http/lib/ResponseDecorator.php
index 5f9fe7c65..289dba5cc 100644
--- a/vendor/sabre/http/lib/ResponseDecorator.php
+++ b/vendor/sabre/http/lib/ResponseDecorator.php
@@ -64,6 +64,8 @@ class ResponseDecorator implements ResponseInterface
* Serializes the request object as a string.
*
* This is useful for debugging purposes.
+ *
+ * @return string
*/
public function __toString(): string
{
diff --git a/vendor/sabre/http/lib/Version.php b/vendor/sabre/http/lib/Version.php
index 8946a46a6..655753acf 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.0.5';
}
diff --git a/vendor/sabre/http/lib/functions.php b/vendor/sabre/http/lib/functions.php
index a23840a1a..197a9e661 100644
--- a/vendor/sabre/http/lib/functions.php
+++ b/vendor/sabre/http/lib/functions.php
@@ -29,6 +29,8 @@ use InvalidArgumentException;
* See:
* http://tools.ietf.org/html/rfc7231#section-7.1.1.1
*
+ * @param string $dateString
+ *
* @return bool|DateTime
*/
function parseDate(string $dateString)
@@ -73,6 +75,10 @@ function parseDate(string $dateString)
/**
* Transforms a DateTime object to a valid HTTP/1.1 Date header value.
+ *
+ * @param DateTime $dateTime
+ *
+ * @return string
*/
function toDate(DateTime $dateTime): string
{
@@ -101,6 +107,7 @@ function toDate(DateTime $dateTime): string
* implying that no accept header was sent.
*
* @param string|null $acceptHeaderValue
+ * @param array $availableOptions
*
* @return string|null
*/
@@ -211,6 +218,8 @@ function negotiateContentType($acceptHeaderValue, array $availableOptions)
* uses them.
*
* @param string|string[] $input
+ *
+ * @return array
*/
function parsePrefer($input): array
{
@@ -294,7 +303,7 @@ function getHeaderValues($values, $values2 = null): array
$values = array_merge($values, (array) $values2);
}
- $result = [];
+ $result = array();
foreach ($values as $l1) {
foreach (explode(',', $l1) as $l2) {
$result[] = trim($l2);
@@ -311,6 +320,10 @@ function getHeaderValues($values, $values2 = null): array
* 2. subtype
* 3. quality
* 4. parameters
+ *
+ * @param string $str
+ *
+ * @return array
*/
function parseMimeType(string $str): array
{
diff --git a/vendor/sabre/http/phpstan.neon b/vendor/sabre/http/phpstan.neon
index 213da6dad..241663a72 100644
--- a/vendor/sabre/http/phpstan.neon
+++ b/vendor/sabre/http/phpstan.neon
@@ -1,2 +1,3 @@
parameters:
level: 1
+ bootstrap: %currentWorkingDirectory%/vendor/autoload.php