Merge branch '5.0RC'5.0

14 files changed, 43 insertions, 35 deletions

diff --git a/vendor/sabre/http/.gitignore b/vendor/sabre/http/.gitignore
index 5f85ecc1b..d291af69a 100644
--- a/vendor/sabre/http/.gitignore
+++ b/vendor/sabre/http/.gitignore
@@ -5,14 +5,19 @@ composer.lock
 # Tests
 tests/cov/
 
+# phpunit cache
+.phpunit.result.cache
+
 # Composer binaries
 bin/phpunit*
 bin/phpcs*
 bin/php-cs-fixer*
-bin/sabre-cs-fixer*
+bin/phpstan
+bin/phpstan.phar
 
 # 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 8d61ee259..c5c78a971 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 3b85d5f39..daa24bff5 100644
--- a/vendor/sabre/http/.travis.yml
+++ b/vendor/sabre/http/.travis.yml
@@ -1,11 +1,10 @@
 language: php
 sudo: required
 php:
-  - 7.0
   - 7.1
   - 7.2
   - 7.3
-  - 7.4snapshot
+  - 7.4
 
 env:
   global:
@@ -26,7 +25,7 @@ cache:
         - $HOME/.composer/cache
 
 install:
-  - if [ $RUN_PHPSTAN == "TRUE"  ]; then composer require --dev phpstan/phpstan; fi
+  - if [ $RUN_PHPSTAN == "TRUE"  ]; then composer require --dev phpstan/phpstan:^0.12; fi
 
 before_script:
   - composer update --prefer-source $PREFER_LOWEST
@@ -34,6 +33,7 @@ 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 a087453fa..716e09e68 100644
--- a/vendor/sabre/http/CHANGELOG.md
+++ b/vendor/sabre/http/CHANGELOG.md
@@ -1,6 +1,19 @@
 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)
+-------------------------
+
+* #138: Fixed possible infinite loop (@dpakach, @vfreex, @phil-davis)
+* #136: Improvement regex content-range (@ho4ho)
+
 5.0.4 (2019-10-08)
 -------------------------
 
diff --git a/vendor/sabre/http/composer.json b/vendor/sabre/http/composer.json
index 851a08730..198cf2344 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.0",
+        "php"          : "^7.1",
         "ext-mbstring" : "*",
         "ext-ctype"    : "*",
         "ext-curl"     : "*",
@@ -13,7 +13,8 @@
         "sabre/uri"    : "^2.0"
     },
     "require-dev" : {
-        "phpunit/phpunit" : "^6.0 || ^7.0"
+        "friendsofphp/php-cs-fixer": "~2.16.1",
+        "phpunit/phpunit" : "^7.0 || ^8.0"
     },
     "suggest" : {
         "ext-curl" : " to make http requests with the Client class"
@@ -38,6 +39,11 @@
             "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 48862e7da..b79c564da 100644
--- a/vendor/sabre/http/lib/Client.php
+++ b/vendor/sabre/http/lib/Client.php
@@ -450,8 +450,6 @@ 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 fc34f8d7f..90153fda5 100644
--- a/vendor/sabre/http/lib/Message.php
+++ b/vendor/sabre/http/lib/Message.php
@@ -283,8 +283,6 @@ 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 d5504ac78..6f49dadfc 100644
--- a/vendor/sabre/http/lib/MessageDecoratorTrait.php
+++ b/vendor/sabre/http/lib/MessageDecoratorTrait.php
@@ -180,8 +180,6 @@ 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 8070845d9..8504f0f59 100644
--- a/vendor/sabre/http/lib/MessageInterface.php
+++ b/vendor/sabre/http/lib/MessageInterface.php
@@ -29,8 +29,6 @@ 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 289dba5cc..5f9fe7c65 100644
--- a/vendor/sabre/http/lib/ResponseDecorator.php
+++ b/vendor/sabre/http/lib/ResponseDecorator.php
@@ -64,8 +64,6 @@ 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/Sapi.php b/vendor/sabre/http/lib/Sapi.php
index 80254f3f3..73674a5a1 100644
--- a/vendor/sabre/http/lib/Sapi.php
+++ b/vendor/sabre/http/lib/Sapi.php
@@ -99,7 +99,7 @@ class Sapi
                     // If this is a partial response, flush the beginning bytes until the first position that is a multiple of the page size.
                     $contentRange = $response->getHeader('Content-Range');
                     // Matching "Content-Range: bytes 1234-5678/7890"
-                    if (null !== $contentRange && preg_match('/^bytes\s([0-9]*)-([0-9]*)\//i', $contentRange, $matches) && '' !== $matches[1]) {
+                    if (null !== $contentRange && preg_match('/^bytes\s([0-9]+)-([0-9]+)\//i', $contentRange, $matches)) {
                         // 4kB should be the default page size on most architectures
                         $pageSize = 4096;
                         $offset = (int) $matches[1];
@@ -109,7 +109,15 @@ class Sapi
                         }
                     }
                     while ($left > 0) {
-                        $left -= stream_copy_to_stream($body, $output, min($left, $chunk_size));
+                        $copied = stream_copy_to_stream($body, $output, min($left, $chunk_size));
+                        // stream_copy_to_stream($src, $dest, $maxLength) must return the number of bytes copied or false in case of failure
+                        // But when the $maxLength is greater than the total number of bytes remaining in the stream,
+                        // It returns the negative number of bytes copied
+                        // So break the loop in such cases.
+                        if ($copied <= 0) {
+                            break;
+                        }
+                        $left -= $copied;
                     }
                 } else {
                     // workaround for 32 Bit systems to avoid stream_copy_to_stream
diff --git a/vendor/sabre/http/lib/Version.php b/vendor/sabre/http/lib/Version.php
index 20a401773..8946a46a6 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.0.4';
+    const VERSION = '5.1.0';
 }
diff --git a/vendor/sabre/http/lib/functions.php b/vendor/sabre/http/lib/functions.php
index 197a9e661..a23840a1a 100644
--- a/vendor/sabre/http/lib/functions.php
+++ b/vendor/sabre/http/lib/functions.php
@@ -29,8 +29,6 @@ use InvalidArgumentException;
  * See:
  *   http://tools.ietf.org/html/rfc7231#section-7.1.1.1
  *
- * @param string $dateString
- *
  * @return bool|DateTime
  */
 function parseDate(string $dateString)
@@ -75,10 +73,6 @@ 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
 {
@@ -107,7 +101,6 @@ function toDate(DateTime $dateTime): string
  * implying that no accept header was sent.
  *
  * @param string|null $acceptHeaderValue
- * @param array       $availableOptions
  *
  * @return string|null
  */
@@ -218,8 +211,6 @@ function negotiateContentType($acceptHeaderValue, array $availableOptions)
  * uses them.
  *
  * @param string|string[] $input
- *
- * @return array
  */
 function parsePrefer($input): array
 {
@@ -303,7 +294,7 @@ function getHeaderValues($values, $values2 = null): array
         $values = array_merge($values, (array) $values2);
     }
 
-    $result = array();
+    $result = [];
     foreach ($values as $l1) {
         foreach (explode(',', $l1) as $l2) {
             $result[] = trim($l2);
@@ -320,10 +311,6 @@ 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 241663a72..213da6dad 100644
--- a/vendor/sabre/http/phpstan.neon
+++ b/vendor/sabre/http/phpstan.neon
@@ -1,3 +1,2 @@
 parameters:
   level: 1
-  bootstrap: %currentWorkingDirectory%/vendor/autoload.php