Merge pull request #617 from nextcloud/dependabot/composer/sabre/dav-…

…4.1.5 Bump sabre/dav from 4.1.4 to 4.1.5
nextcloud · Mar 8, 2021 · e408da9 · e408da9
2 parents f938eb6 + 7c4db39
commit e408da9
Show file tree

Hide file tree

Showing 34 changed files with 121 additions and 114 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/composer/ClassLoader.php b/composer/ClassLoader.php
@@ -311,8 +311,10 @@ public function register($prepend = false)
         spl_autoload_register(array($this, 'loadClass'), true, $prepend);
 
         if (null === $this->vendorDir) {
-            //no-op
-        } elseif ($prepend) {
+            return;
+        }
+
+        if ($prepend) {
             self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
         } else {
             unset(self::$registeredLoaders[$this->vendorDir]);

diff --git a/composer/InstalledVersions.php b/composer/InstalledVersions.php
@@ -30,7 +30,7 @@ class InstalledVersions
     'aliases' => 
     array (
     ),
-    'reference' => 'b792087a9fc062adc19abb014a837c4891401235',
+    'reference' => '6c5e16eb3488ceb6ef5c08147d83d8e567374f23',
     'name' => 'nextcloud/3rdparty',
   ),
   'versions' => 
@@ -312,7 +312,7 @@ class InstalledVersions
       'aliases' => 
       array (
       ),
-      'reference' => 'b792087a9fc062adc19abb014a837c4891401235',
+      'reference' => '6c5e16eb3488ceb6ef5c08147d83d8e567374f23',
     ),
     'nextcloud/lognormalizer' => 
     array (
@@ -618,12 +618,12 @@ class InstalledVersions
     ),
     'sabre/dav' => 
     array (
-      'pretty_version' => '4.1.4',
-      'version' => '4.1.4.0',
+      'pretty_version' => '4.1.5',
+      'version' => '4.1.5.0',
       'aliases' => 
       array (
       ),
-      'reference' => '4258420f15425a5f128fe5cad454e00ab4a68ae5',
+      'reference' => 'c1afdc77a95efea6ee40c03c45f57c3c0c80ec22',
     ),
     'sabre/event' => 
     array (
@@ -654,12 +654,12 @@ class InstalledVersions
     ),
     'sabre/vobject' => 
     array (
-      'pretty_version' => '4.3.3',
-      'version' => '4.3.3.0',
+      'pretty_version' => '4.3.5',
+      'version' => '4.3.5.0',
       'aliases' => 
       array (
       ),
-      'reference' => '58f9f9b46a1080c0130bd86f4df9a568aacb9c79',
+      'reference' => 'd8a0a9ae215a8acfb51afc29101c7344670b9c83',
     ),
     'sabre/xml' => 
     array (
@@ -1141,7 +1141,6 @@ private static function getInstalled()
 $installed = array();
 
 if (self::$canGetVendors) {
-
 foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
 if (isset(self::$installedByVendor[$vendorDir])) {
 $installed[] = self::$installedByVendor[$vendorDir];

diff --git a/composer/autoload_files.php b/composer/autoload_files.php
@@ -20,8 +20,8 @@
     'a1cce3d26cc15c00fcd0b3354bd72c88' => $vendorDir . '/sabre/event/lib/Promise/functions.php',
     '3569eecfeed3bcf0bad3c998a494ecb8' => $vendorDir . '/sabre/xml/lib/Deserializer/functions.php',
     '93aa591bc4ca510c520999e34229ee79' => $vendorDir . '/sabre/xml/lib/Serializer/functions.php',
-    '25072dd6e2470089de65ae7bf11d3109' => $vendorDir . '/symfony/polyfill-php72/bootstrap.php',
     'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
+    '25072dd6e2470089de65ae7bf11d3109' => $vendorDir . '/symfony/polyfill-php72/bootstrap.php',
     'f598d06aa772fa33d905e87be6398fb1' => $vendorDir . '/symfony/polyfill-intl-idn/bootstrap.php',
     'ebdb698ed4152ae445614b69b5e4bb6a' => $vendorDir . '/sabre/http/lib/functions.php',
     '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',

diff --git a/composer/autoload_static.php b/composer/autoload_static.php
@@ -21,8 +21,8 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         'a1cce3d26cc15c00fcd0b3354bd72c88' => __DIR__ . '/..' . '/sabre/event/lib/Promise/functions.php',
         '3569eecfeed3bcf0bad3c998a494ecb8' => __DIR__ . '/..' . '/sabre/xml/lib/Deserializer/functions.php',
         '93aa591bc4ca510c520999e34229ee79' => __DIR__ . '/..' . '/sabre/xml/lib/Serializer/functions.php',
-        '25072dd6e2470089de65ae7bf11d3109' => __DIR__ . '/..' . '/symfony/polyfill-php72/bootstrap.php',
         'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php',
+        '25072dd6e2470089de65ae7bf11d3109' => __DIR__ . '/..' . '/symfony/polyfill-php72/bootstrap.php',
         'f598d06aa772fa33d905e87be6398fb1' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/bootstrap.php',
         'ebdb698ed4152ae445614b69b5e4bb6a' => __DIR__ . '/..' . '/sabre/http/lib/functions.php',
         '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',

diff --git a/composer/installed.json b/composer/installed.json
@@ -3709,17 +3709,17 @@
         },
         {
             "name": "sabre/dav",
-            "version": "4.1.4",
-            "version_normalized": "4.1.4.0",
+            "version": "4.1.5",
+            "version_normalized": "4.1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sabre-io/dav.git",
-                "reference": "4258420f15425a5f128fe5cad454e00ab4a68ae5"
+                "reference": "c1afdc77a95efea6ee40c03c45f57c3c0c80ec22"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sabre-io/dav/zipball/4258420f15425a5f128fe5cad454e00ab4a68ae5",
-                "reference": "4258420f15425a5f128fe5cad454e00ab4a68ae5",
+                "url": "https://api.github.com/repos/sabre-io/dav/zipball/c1afdc77a95efea6ee40c03c45f57c3c0c80ec22",
+                "reference": "c1afdc77a95efea6ee40c03c45f57c3c0c80ec22",
                 "shasum": ""
             },
             "require": {
@@ -3753,7 +3753,7 @@
                 "ext-imap": "*",
                 "ext-pdo": "*"
             },
-            "time": "2021-01-12T03:39:57+00:00",
+            "time": "2021-02-12T07:54:23+00:00",
             "bin": [
                 "bin/sabredav",
                 "bin/naturalselection"
@@ -3993,17 +3993,17 @@
         },
         {
             "name": "sabre/vobject",
-            "version": "4.3.3",
-            "version_normalized": "4.3.3.0",
+            "version": "4.3.5",
+            "version_normalized": "4.3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sabre-io/vobject.git",
-                "reference": "58f9f9b46a1080c0130bd86f4df9a568aacb9c79"
+                "reference": "d8a0a9ae215a8acfb51afc29101c7344670b9c83"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sabre-io/vobject/zipball/58f9f9b46a1080c0130bd86f4df9a568aacb9c79",
-                "reference": "58f9f9b46a1080c0130bd86f4df9a568aacb9c79",
+                "url": "https://api.github.com/repos/sabre-io/vobject/zipball/d8a0a9ae215a8acfb51afc29101c7344670b9c83",
+                "reference": "d8a0a9ae215a8acfb51afc29101c7344670b9c83",
                 "shasum": ""
             },
             "require": {
@@ -4012,14 +4012,15 @@
                 "sabre/xml": "^2.1"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "~2.16.7",
+                "friendsofphp/php-cs-fixer": "~2.17.1",
                 "phpstan/phpstan": "^0.12",
+                "phpunit/php-invoker": "^2.0 || ^3.1",
                 "phpunit/phpunit": "^7.5 || ^8.5 || ^9.0"
             },
             "suggest": {
                 "hoa/bench": "If you would like to run the benchmark scripts"
             },
-            "time": "2020-11-09T04:31:38+00:00",
+            "time": "2021-02-12T06:28:04+00:00",
             "bin": [
                 "bin/vobject",
                 "bin/generate_vcards"
@@ -6284,6 +6285,6 @@
             "install-path": "../web-auth/webauthn-lib"
         }
     ],
-    "dev": true,
+    "dev": false,
     "dev-package-names": []
 }
diff --git a/composer/installed.php b/composer/installed.php
@@ -6,7 +6,7 @@
     'aliases' => 
     array (
     ),
-    'reference' => 'b792087a9fc062adc19abb014a837c4891401235',
+    'reference' => '6c5e16eb3488ceb6ef5c08147d83d8e567374f23',
     'name' => 'nextcloud/3rdparty',
   ),
   'versions' => 
@@ -288,7 +288,7 @@
       'aliases' => 
       array (
       ),
-      'reference' => 'b792087a9fc062adc19abb014a837c4891401235',
+      'reference' => '6c5e16eb3488ceb6ef5c08147d83d8e567374f23',
     ),
     'nextcloud/lognormalizer' => 
     array (
@@ -594,12 +594,12 @@
     ),
     'sabre/dav' => 
     array (
-      'pretty_version' => '4.1.4',
-      'version' => '4.1.4.0',
+      'pretty_version' => '4.1.5',
+      'version' => '4.1.5.0',
       'aliases' => 
       array (
       ),
-      'reference' => '4258420f15425a5f128fe5cad454e00ab4a68ae5',
+      'reference' => 'c1afdc77a95efea6ee40c03c45f57c3c0c80ec22',
     ),
     'sabre/event' => 
     array (
@@ -630,12 +630,12 @@
     ),
     'sabre/vobject' => 
     array (
-      'pretty_version' => '4.3.3',
-      'version' => '4.3.3.0',
+      'pretty_version' => '4.3.5',
+      'version' => '4.3.5.0',
       'aliases' => 
       array (
       ),
-      'reference' => '58f9f9b46a1080c0130bd86f4df9a568aacb9c79',
+      'reference' => 'd8a0a9ae215a8acfb51afc29101c7344670b9c83',
     ),
     'sabre/xml' => 
     array (

diff --git a/composer/package-versions-deprecated/src/PackageVersions/Versions.php b/composer/package-versions-deprecated/src/PackageVersions/Versions.php
@@ -88,11 +88,11 @@ final class Versions
   'ralouphie/getallheaders' => '3.0.3@120b605dfeb996808c31b6477290a714d356e822',
   'ramsey/collection' => '1.1.1@24d93aefb2cd786b7edd9f45b554aea20b28b9b1',
   'ramsey/uuid' => '4.1.1@cd4032040a750077205918c86049aa0f43d22947',
-  'sabre/dav' => '4.1.4@4258420f15425a5f128fe5cad454e00ab4a68ae5',
+  'sabre/dav' => '4.1.5@c1afdc77a95efea6ee40c03c45f57c3c0c80ec22',
   'sabre/event' => '5.1.2@c120bec57c17b6251a496efc82b732418b49d50a',
   'sabre/http' => '5.1.1@d0aafede6961df6195ce7a8dad49296b0aaee22e',
   'sabre/uri' => '2.2.1@f502edffafea8d746825bd5f0b923a60fd2715ff',
-  'sabre/vobject' => '4.3.3@58f9f9b46a1080c0130bd86f4df9a568aacb9c79',
+  'sabre/vobject' => '4.3.5@d8a0a9ae215a8acfb51afc29101c7344670b9c83',
   'sabre/xml' => '2.2.3@c3b959f821c19b36952ec4a595edd695c216bfc6',
   'scssphp/scssphp' => 'v1.4.1@ba86c963b94ec7ebd6e19d90cdab90d89667dbf7',
   'spomky-labs/base64url' => 'v2.0.4@7752ce931ec285da4ed1f4c5aa27e45e097be61d',
@@ -120,7 +120,7 @@ final class Versions
   'web-auth/cose-lib' => 'v3.3.1@eea6fae63ff5c81bf98c115b1be5f38a69682c16',
   'web-auth/metadata-service' => 'v3.3.1@8488d3a832a38cc81c670fce05de1e515c6e64b1',
   'web-auth/webauthn-lib' => 'v3.3.1@e411527a41c1013512fccdfce61681eb36484c77',
-  'nextcloud/3rdparty' => 'dev-master@b792087a9fc062adc19abb014a837c4891401235',
+  'nextcloud/3rdparty' => 'dev-master@6c5e16eb3488ceb6ef5c08147d83d8e567374f23',
 );
 
     private function __construct()

diff --git a/sabre/dav/lib/CalDAV/Schedule/Plugin.php b/sabre/dav/lib/CalDAV/Schedule/Plugin.php
@@ -486,6 +486,7 @@ public function scheduleLocalDelivery(ITip\Message $iTipMessage)
 
         $currentObject = null;
         $objectNode = null;
+        $oldICalendarData = null;
         $isNewNode = false;
 
         $result = $home->getCalendarObjectByUID($uid);

diff --git a/sabre/dav/lib/CardDAV/Plugin.php b/sabre/dav/lib/CardDAV/Plugin.php
@@ -587,14 +587,21 @@ protected function validateParamFilters(array $vProperties, array $filters, $tes
                 foreach ($vProperties as $vProperty) {
                     // If we got all the way here, we'll need to validate the
                     // text-match filter.
-                    $success = DAV\StringUtil::textMatch($vProperty[$filter['name']]->getValue(), $filter['text-match']['value'], $filter['text-match']['collation'], $filter['text-match']['match-type']);
+                    if (isset($vProperty[$filter['name']])) {
+                        $success = DAV\StringUtil::textMatch(
+                            $vProperty[$filter['name']]->getValue(),
+                            $filter['text-match']['value'],
+                            $filter['text-match']['collation'],
+                            $filter['text-match']['match-type']
+                        );
+                        if ($filter['text-match']['negate-condition']) {
+                            $success = !$success;
+                        }
+                    }
                     if ($success) {
                         break;
                     }
                 }
-                if ($filter['text-match']['negate-condition']) {
-                    $success = !$success;
-                }
             } // else
 
             // There are two conditions where we can already determine whether
@@ -628,15 +635,15 @@ protected function validateTextMatches(array $texts, array $filters, $test)
             $success = false;
             foreach ($texts as $haystack) {
                 $success = DAV\StringUtil::textMatch($haystack, $filter['value'], $filter['collation'], $filter['match-type']);
+                if ($filter['negate-condition']) {
+                    $success = !$success;
+                }
 
                 // Breaking on the first match
                 if ($success) {
                     break;
                 }
             }
-            if ($filter['negate-condition']) {
-                $success = !$success;
-            }
 
             if ($success && 'anyof' === $test) {
                 return true;

diff --git a/sabre/dav/lib/DAV/Browser/Plugin.php b/sabre/dav/lib/DAV/Browser/Plugin.php
@@ -157,6 +157,9 @@ public function httpGet(RequestInterface $request, ResponseInterface $response)
     public function httpPOST(RequestInterface $request, ResponseInterface $response)
     {
         $contentType = $request->getHeader('Content-Type');
+        if (!\is_string($contentType)) {
+            return;
+        }
         list($contentType) = explode(';', $contentType);
         if ('application/x-www-form-urlencoded' !== $contentType &&
             'multipart/form-data' !== $contentType) {

diff --git a/sabre/dav/lib/DAV/FSExt/File.php b/sabre/dav/lib/DAV/FSExt/File.php
@@ -41,7 +41,7 @@ public function put($data)
      *
      * The second argument is the type of update we're doing.
      * This is either:
-     * * 1. append
+     * * 1. append (default)
      * * 2. update based on a start byte
      * * 3. update based on an end byte
      *;
@@ -75,6 +75,9 @@ public function patch($data, $rangeType, $offset = null)
                 $f = fopen($this->path, 'c');
                 fseek($f, $offset, SEEK_END);
                 break;
+            default:
+                $f = fopen($this->path, 'a');
+                break;
         }
         if (is_string($data)) {
             fwrite($f, $data);