Merge pull request #1452 from nextcloud/fix/bump-sabre/dav-to-4.4.0-i…

…n-master Bump sabre/http to 5.1.7 in master
nextcloud · Jul 3, 2023 · ee59165 · ee59165
2 parents 268aaef + 7001e6a
commit ee59165
Show file tree

Hide file tree

Showing 37 changed files with 278 additions and 177 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/composer/installed.json b/composer/installed.json
@@ -4050,17 +4050,17 @@
         },
         {
             "name": "sabre/http",
-            "version": "5.1.5",
-            "version_normalized": "5.1.5.0",
+            "version": "5.1.7",
+            "version_normalized": "5.1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sabre-io/http.git",
-                "reference": "164725c2d2e248384e5b6115510c545e9c47cff9"
+                "reference": "b6fa04f42f49156eaab3fb890c79f4c43a9559b7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/gitapi/repos/sabre-io/http/zipball/164725c2d2e248384e5b6115510c545e9c47cff9",
-                "reference": "164725c2d2e248384e5b6115510c545e9c47cff9",
+                "url": "https://github.com/gitapi/repos/sabre-io/http/zipball/b6fa04f42f49156eaab3fb890c79f4c43a9559b7",
+                "reference": "b6fa04f42f49156eaab3fb890c79f4c43a9559b7",
                 "shasum": ""
             },
             "require": {
@@ -4079,7 +4079,7 @@
             "suggest": {
                 "ext-curl": " to make http requests with the Client class"
             },
-            "time": "2022-07-09T08:38:22+00:00",
+            "time": "2023-06-26T10:13:00+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -4116,28 +4116,31 @@
         },
         {
             "name": "sabre/uri",
-            "version": "2.2.2",
-            "version_normalized": "2.2.2.0",
+            "version": "2.3.3",
+            "version_normalized": "2.3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sabre-io/uri.git",
-                "reference": "7cb0f489578afad5006e85cd60f18ff33f2d440d"
+                "reference": "7e0e7dfd0b7e14346a27eabd66e843a6e7f1812b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/gitapi/repos/sabre-io/uri/zipball/7cb0f489578afad5006e85cd60f18ff33f2d440d",
-                "reference": "7cb0f489578afad5006e85cd60f18ff33f2d440d",
+                "url": "https://github.com/gitapi/repos/sabre-io/uri/zipball/7e0e7dfd0b7e14346a27eabd66e843a6e7f1812b",
+                "reference": "7e0e7dfd0b7e14346a27eabd66e843a6e7f1812b",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1 || ^8.0"
+                "php": "^7.4 || ^8.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "~2.17.1",
-                "phpstan/phpstan": "^0.12",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.0"
-            },
-            "time": "2021-11-04T09:29:58+00:00",
+                "friendsofphp/php-cs-fixer": "^3.17",
+                "phpstan/extension-installer": "^1.3",
+                "phpstan/phpstan": "^1.10",
+                "phpstan/phpstan-phpunit": "^1.3",
+                "phpstan/phpstan-strict-rules": "^1.5",
+                "phpunit/phpunit": "^9.6"
+            },
+            "time": "2023-06-09T06:54:04+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -4176,23 +4179,23 @@
         },
         {
             "name": "sabre/vobject",
-            "version": "4.4.2",
-            "version_normalized": "4.4.2.0",
+            "version": "4.5.3",
+            "version_normalized": "4.5.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sabre-io/vobject.git",
-                "reference": "b8a44ea1610d9b7012e42a7ff6f1cb66f0b757dd"
+                "reference": "fe6d9183154ed6f2f913f2b568d3d51d8ae9b308"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/gitapi/repos/sabre-io/vobject/zipball/b8a44ea1610d9b7012e42a7ff6f1cb66f0b757dd",
-                "reference": "b8a44ea1610d9b7012e42a7ff6f1cb66f0b757dd",
+                "url": "https://github.com/gitapi/repos/sabre-io/vobject/zipball/fe6d9183154ed6f2f913f2b568d3d51d8ae9b308",
+                "reference": "fe6d9183154ed6f2f913f2b568d3d51d8ae9b308",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
                 "php": "^7.1 || ^8.0",
-                "sabre/xml": "^2.1"
+                "sabre/xml": "^2.1 || ^3.0 || ^4.0"
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "~2.17.1",
@@ -4203,7 +4206,7 @@
             "suggest": {
                 "hoa/bench": "If you would like to run the benchmark scripts"
             },
-            "time": "2022-06-24T11:36:21+00:00",
+            "time": "2023-01-22T12:21:50+00:00",
             "bin": [
                 "bin/vobject",
                 "bin/generate_vcards"
@@ -4283,17 +4286,17 @@
         },
         {
             "name": "sabre/xml",
-            "version": "2.2.5",
-            "version_normalized": "2.2.5.0",
+            "version": "2.2.6",
+            "version_normalized": "2.2.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sabre-io/xml.git",
-                "reference": "a6af111850e7536d200d9637c34885cd3c77a86c"
+                "reference": "9cde7cdab1e50893cc83b037b40cd47bfde42a2b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/gitapi/repos/sabre-io/xml/zipball/a6af111850e7536d200d9637c34885cd3c77a86c",
-                "reference": "a6af111850e7536d200d9637c34885cd3c77a86c",
+                "url": "https://github.com/gitapi/repos/sabre-io/xml/zipball/9cde7cdab1e50893cc83b037b40cd47bfde42a2b",
+                "reference": "9cde7cdab1e50893cc83b037b40cd47bfde42a2b",
                 "shasum": ""
             },
             "require": {
@@ -4309,7 +4312,7 @@
                 "phpstan/phpstan": "^0.12",
                 "phpunit/phpunit": "^7.5 || ^8.5 || ^9.0"
             },
-            "time": "2021-11-04T06:37:27+00:00",
+            "time": "2023-06-28T12:56:05+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {

diff --git a/composer/installed.php b/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => 'nextcloud/3rdparty',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '55d46d189a057a2ce601f3773b19b05cdc9f8311',
+        'reference' => '268aaeff738002179c0f5e9d9542ec362d987a5f',
         'type' => 'library',
         'install_path' => __DIR__ . '/../',
         'aliases' => array(),
@@ -310,7 +310,7 @@
         'nextcloud/3rdparty' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '55d46d189a057a2ce601f3773b19b05cdc9f8311',
+            'reference' => '268aaeff738002179c0f5e9d9542ec362d987a5f',
             'type' => 'library',
             'install_path' => __DIR__ . '/../',
             'aliases' => array(),
@@ -617,36 +617,36 @@
             'dev_requirement' => false,
         ),
         'sabre/http' => array(
-            'pretty_version' => '5.1.5',
-            'version' => '5.1.5.0',
-            'reference' => '164725c2d2e248384e5b6115510c545e9c47cff9',
+            'pretty_version' => '5.1.7',
+            'version' => '5.1.7.0',
+            'reference' => 'b6fa04f42f49156eaab3fb890c79f4c43a9559b7',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sabre/http',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'sabre/uri' => array(
-            'pretty_version' => '2.2.2',
-            'version' => '2.2.2.0',
-            'reference' => '7cb0f489578afad5006e85cd60f18ff33f2d440d',
+            'pretty_version' => '2.3.3',
+            'version' => '2.3.3.0',
+            'reference' => '7e0e7dfd0b7e14346a27eabd66e843a6e7f1812b',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sabre/uri',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'sabre/vobject' => array(
-            'pretty_version' => '4.4.2',
-            'version' => '4.4.2.0',
-            'reference' => 'b8a44ea1610d9b7012e42a7ff6f1cb66f0b757dd',
+            'pretty_version' => '4.5.3',
+            'version' => '4.5.3.0',
+            'reference' => 'fe6d9183154ed6f2f913f2b568d3d51d8ae9b308',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sabre/vobject',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'sabre/xml' => array(
-            'pretty_version' => '2.2.5',
-            'version' => '2.2.5.0',
-            'reference' => 'a6af111850e7536d200d9637c34885cd3c77a86c',
+            'pretty_version' => '2.2.6',
+            'version' => '2.2.6.0',
+            'reference' => '9cde7cdab1e50893cc83b037b40cd47bfde42a2b',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sabre/xml',
             'aliases' => array(),

diff --git a/sabre/http/lib/Auth/AbstractAuth.php b/sabre/http/lib/Auth/AbstractAuth.php
@@ -50,7 +50,7 @@ public function __construct(string $realm, RequestInterface $request, ResponseIn
     }
 
     /**
-     * This method sends the needed HTTP header and statuscode (401) to force
+     * This method sends the needed HTTP header and status code (401) to force
      * the user to login.
      */
     abstract public function requireLogin();

diff --git a/sabre/http/lib/Auth/Basic.php b/sabre/http/lib/Auth/Basic.php
@@ -49,7 +49,7 @@ public function getCredentials()
     }
 
     /**
-     * This method sends the needed HTTP header and statuscode (401) to force
+     * This method sends the needed HTTP header and status code (401) to force
      * the user to login.
      */
     public function requireLogin()

diff --git a/sabre/http/lib/Auth/Bearer.php b/sabre/http/lib/Auth/Bearer.php
@@ -42,7 +42,7 @@ public function getToken()
     }
 
     /**
-     * This method sends the needed HTTP header and statuscode (401) to force
+     * This method sends the needed HTTP header and status code (401) to force
      * authentication.
      */
     public function requireLogin()

diff --git a/sabre/http/lib/Auth/Digest.php b/sabre/http/lib/Auth/Digest.php
@@ -133,7 +133,7 @@ protected function validate(): bool
                 return false;
             }
             // We need to add an md5 of the entire request body to the A2 part of the hash
-            $body = $this->request->getBody($asString = true);
+            $body = $this->request->getBody();
             $this->request->setBody($body);
             $A2 .= ':'.md5($body);
         } elseif (!($this->qop & self::QOP_AUTH)) {
@@ -174,7 +174,7 @@ public function requireLogin()
     /**
      * This method returns the full digest string.
      *
-     * It should be compatibile with mod_php format and other webservers.
+     * It should be compatible with mod_php format and other webservers.
      *
      * If the header could not be found, null will be returned
      *