Merge pull request #551 from nextcloud/dependencies/sabre-II

Bump sabre/dav to 4.1
nextcloud · Dec 29, 2020 · 4ff56cd · 4ff56cd
2 parents 8a030d7 + c86fa3e
commit 4ff56cd
Show file tree

Hide file tree

Showing 185 changed files with 276 additions and 965 deletions.
diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
 		"pimple/pimple": "3.2.3",
 		"psr/container": "^1.0",
 		"punic/punic": "^1.6",
-		"sabre/dav": "^4.0.0",
+		"sabre/dav": "^4.1.3",
 		"scssphp/scssphp": "1.0.3",
 		"stecman/symfony-console-completion": "^0.11.0",
 		"swiftmailer/swiftmailer": "^6.0",

diff --git a/composer/InstalledVersions.php b/composer/InstalledVersions.php
@@ -24,12 +24,12 @@ class InstalledVersions
 private static $installed = array (
   'root' => 
   array (
-    'pretty_version' => 'dev-master',
-    'version' => 'dev-master',
+    'pretty_version' => '1.0.0+no-version-set',
+    'version' => '1.0.0.0',
     'aliases' => 
     array (
     ),
-    'reference' => 'aea1df9dcc0ae1b774e15edf07a470198b952e45',
+    'reference' => NULL,
     'name' => 'nextcloud/3rdparty',
   ),
   'versions' => 
@@ -279,12 +279,12 @@ class InstalledVersions
     ),
     'nextcloud/3rdparty' => 
     array (
-      'pretty_version' => 'dev-master',
-      'version' => 'dev-master',
+      'pretty_version' => '1.0.0+no-version-set',
+      'version' => '1.0.0.0',
       'aliases' => 
       array (
       ),
-      'reference' => 'aea1df9dcc0ae1b774e15edf07a470198b952e45',
+      'reference' => NULL,
     ),
     'nextcloud/lognormalizer' => 
     array (

diff --git a/composer/installed.php b/composer/installed.php
@@ -1,12 +1,12 @@
 <?php return array (
   'root' => 
   array (
-    'pretty_version' => 'dev-master',
-    'version' => 'dev-master',
+    'pretty_version' => '1.0.0+no-version-set',
+    'version' => '1.0.0.0',
     'aliases' => 
     array (
     ),
-    'reference' => 'aea1df9dcc0ae1b774e15edf07a470198b952e45',
+    'reference' => NULL,
     'name' => 'nextcloud/3rdparty',
   ),
   'versions' => 
@@ -256,12 +256,12 @@
     ),
     'nextcloud/3rdparty' => 
     array (
-      'pretty_version' => 'dev-master',
-      'version' => 'dev-master',
+      'pretty_version' => '1.0.0+no-version-set',
+      'version' => '1.0.0.0',
       'aliases' => 
       array (
       ),
-      'reference' => 'aea1df9dcc0ae1b774e15edf07a470198b952e45',
+      'reference' => NULL,
     ),
     'nextcloud/lognormalizer' => 
     array (

diff --git a/sabre/dav/.gitignore b/sabre/dav/.gitignore
@@ -6,6 +6,9 @@ tests/cov
 # Custom settings for tests
 tests/config.user.php
 
+# PHPUnit test Cache
+.phpunit.result.cache
+
 # ViM
 *.swp
 
@@ -14,14 +17,9 @@ composer.lock
 vendor
 
 # Composer binaries
-bin/phing
-bin/phpunit
 bin/vobject
 bin/generate_vcards
 bin/phpdocmd
-bin/phpunit
-bin/php-cs-fixer
-bin/sabre-cs-fixer
 
 # Assuming every .php file in the root is for testing
 /*.php
@@ -39,7 +37,4 @@ build.properties
 docs/api
 docs/wikidocs
 
-# Mac
-.DS_Store
-
 .php_cs.cache
diff --git a/sabre/dav/CHANGELOG.md b/sabre/dav/CHANGELOG.md
@@ -1,6 +1,26 @@
 ChangeLog
 =========
 
+4.1.3 (2020-11-09)
+-------------------------
+* #1306: Return 409 when trying to PUT a file into a non-existent collection
+
+4.1.2 (2020-10-04)
+-------------------------
+* #1296: Add experimental support for PHP 8.0
+
+4.1.1 (2020-07-13)
+-------------------------
+* Fix PHPdoc of Tree:move method
+* Allow using custom SAPI implementations
+* Include baseUri in lock responses
+
+4.1.0 (2020-03-20)
+-------------------------
+* Support PHP 7.4
+* Drop support for PHP 7.0
+* CalDAV: send MIME-Version header in scheduling emails
+
 4.0.3 (2020-01-10)
 -------------------------
 * DAV: Streaming PROPFIND server implementation
@@ -234,7 +254,7 @@ ChangeLog
   [sabre/uri 1.1.0][uri] and [sabre/xml 1.4.1][xml].
 
 
-3.1.5 (????-??-??)
+3.1.5 (2018-10-19)
 ------------------
 
 * Fixed: Creating a new calendar on some MySQL configurations caused an error.

diff --git a/sabre/dav/README.md b/sabre/dav/README.md
@@ -16,7 +16,7 @@ Build status
 
 | branch       | status | minimum PHP version |
 | ------------ | ------ | ------------------- |
-| master       | [![Build Status](https://travis-ci.org/sabre-io/dav.svg?branch=master)](https://travis-ci.org/sabre-io/dav) | PHP 7.0 |
+| master       | [![Build Status](https://travis-ci.org/sabre-io/dav.svg?branch=master)](https://travis-ci.org/sabre-io/dav) | PHP 7.1 |
 | 3.1          | [![Build Status](https://travis-ci.org/sabre-io/dav.svg?branch=3.0)](https://travis-ci.org/sabre-io/dav) | PHP 5.5 |
 | 3.0          | [![Build Status](https://travis-ci.org/sabre-io/dav.svg?branch=3.0)](https://travis-ci.org/sabre-io/dav) | PHP 5.4 |
 | 2.1          | [![Build Status](https://travis-ci.org/sabre-io/dav.svg?branch=2.1)](https://travis-ci.org/sabre-io/dav) | PHP 5.4 |

diff --git a/sabre/dav/composer.json b/sabre/dav/composer.json
@@ -14,11 +14,11 @@
         }
     ],
     "require": {
-        "php": ">=7.0.0",
-        "sabre/vobject": "^4.2.0-alpha1",
+        "php": "^7.1.0 || ^8.0",
+        "sabre/vobject": "^4.2.1",
         "sabre/event" : "^5.0",
         "sabre/xml"  : "^2.0.1",
-        "sabre/http" : "^5.0",
+        "sabre/http" : "^5.0.5",
         "sabre/uri" : "^2.0",
         "ext-dom": "*",
         "ext-pcre": "*",
@@ -33,7 +33,9 @@
         "ext-json": "*"
     },
     "require-dev" : {
-        "phpunit/phpunit" : "^6",
+        "friendsofphp/php-cs-fixer": "^2.16.7",
+        "phpstan/phpstan": "^0.12",
+        "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0",
         "evert/phpdoc-md" : "~0.1.0",
         "monolog/monolog": "^1.18"
     },
@@ -50,6 +52,17 @@
             "Sabre\\CardDAV\\" : "lib/CardDAV/"
         }
     },
+    "autoload-dev" : {
+        "psr-4" : {
+            "Sabre\\" : "tests/Sabre/",
+            "Sabre\\CalDAV\\" : "tests/Sabre/CalDAV",
+            "Sabre\\CardDAV\\" : "tests/Sabre/CardDAV",
+            "Sabre\\DAV\\" : "tests/Sabre/DAV",
+            "Sabre\\DAV\\Property\\" : "tests/Sabre/DAV/Xml/Property",
+            "Sabre\\DAVACL\\" : "tests/Sabre/DAVACL",
+            "Sabre\\HTTP\\" : "tests/Sabre/HTTP"
+        }
+    },
     "support" : {
         "forum" : "https://groups.google.com/group/sabredav-discuss",
         "source" : "https://github.com/fruux/sabre-dav"
@@ -58,7 +71,20 @@
         "bin/sabredav",
         "bin/naturalselection"
     ],
-    "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/sabre/dav/lib/CalDAV/Backend/AbstractBackend.php b/sabre/dav/lib/CalDAV/Backend/AbstractBackend.php
@@ -30,8 +30,7 @@ abstract class AbstractBackend implements BackendInterface
      *
      * Read the PropPatch documentation for more info and examples.
      *
-     * @param mixed                $calendarId
-     * @param \Sabre\DAV\PropPatch $propPatch
+     * @param mixed $calendarId
      */
     public function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch)
     {
@@ -46,7 +45,6 @@ public function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch)
      * If the backend supports this, it may allow for some speed-ups.
      *
      * @param mixed $calendarId
-     * @param array $uris
      *
      * @return array
      */
@@ -103,7 +101,6 @@ public function getMultipleCalendarObjects($calendarId, array $uris)
      * to think of.
      *
      * @param mixed $calendarId
-     * @param array $filters
      *
      * @return array
      */
@@ -125,9 +122,6 @@ public function calendarQuery($calendarId, array $filters)
      * This method validates if a filter (as passed to calendarQuery) matches
      * the given object.
      *
-     * @param array $object
-     * @param array $filters
-     *
      * @return bool
      */
     protected function validateFilterForObject(array $object, array $filters)

diff --git a/sabre/dav/lib/CalDAV/Backend/BackendInterface.php b/sabre/dav/lib/CalDAV/Backend/BackendInterface.php
@@ -51,7 +51,6 @@ public function getCalendarsForUser($principalUri);
      *
      * @param string $principalUri
      * @param string $calendarUri
-     * @param array  $properties
      *
      * @return mixed
      */
@@ -69,8 +68,7 @@ public function createCalendar($principalUri, $calendarUri, array $properties);
      *
      * Read the PropPatch documentation for more info and examples.
      *
-     * @param mixed                $calendarId
-     * @param \Sabre\DAV\PropPatch $propPatch
+     * @param mixed $calendarId
      */
     public function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch);
 
@@ -143,7 +141,6 @@ public function getCalendarObject($calendarId, $objectUri);
      * If the backend supports this, it may allow for some speed-ups.
      *
      * @param mixed $calendarId
-     * @param array $uris
      *
      * @return array
      */
@@ -247,7 +244,6 @@ public function deleteCalendarObject($calendarId, $objectUri);
      * to think of.
      *
      * @param mixed $calendarId
-     * @param array $filters
      *
      * @return array
      */

diff --git a/sabre/dav/lib/CalDAV/Backend/NotificationSupport.php b/sabre/dav/lib/CalDAV/Backend/NotificationSupport.php
@@ -40,8 +40,7 @@ public function getNotificationsForPrincipal($principalUri);
      *
      * This may be called by a client once it deems a notification handled.
      *
-     * @param string                $principalUri
-     * @param NotificationInterface $notification
+     * @param string $principalUri
      */
     public function deleteNotification($principalUri, NotificationInterface $notification);
 

diff --git a/sabre/dav/lib/CalDAV/Backend/PDO.php b/sabre/dav/lib/CalDAV/Backend/PDO.php
@@ -117,8 +117,6 @@ class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, S
 
     /**
      * Creates the backend.
-     *
-     * @param \PDO $pdo
      */
     public function __construct(\PDO $pdo)
     {
@@ -220,7 +218,6 @@ public function getCalendarsForUser($principalUri)
      *
      * @param string $principalUri
      * @param string $calendarUri
-     * @param array  $properties
      *
      * @return string
      */
@@ -290,8 +287,7 @@ public function createCalendar($principalUri, $calendarUri, array $properties)
      *
      * Read the PropPatch documentation for more info and examples.
      *
-     * @param mixed                $calendarId
-     * @param \Sabre\DAV\PropPatch $propPatch
+     * @param mixed $calendarId
      */
     public function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch)
     {
@@ -483,7 +479,6 @@ public function getCalendarObject($calendarId, $objectUri)
      * If the backend supports this, it may allow for some speed-ups.
      *
      * @param mixed $calendarId
-     * @param array $uris
      *
      * @return array
      */
@@ -760,7 +755,6 @@ public function deleteCalendarObject($calendarId, $objectUri)
      * specific components, and VEVENT time-ranges.
      *
      * @param mixed $calendarId
-     * @param array $filters
      *
      * @return array
      */
@@ -1109,7 +1103,6 @@ public function getSubscriptionsForUser($principalUri)
      *
      * @param string $principalUri
      * @param string $uri
-     * @param array  $properties
      *
      * @return mixed
      */

diff --git a/sabre/dav/lib/CalDAV/Backend/SimplePDO.php b/sabre/dav/lib/CalDAV/Backend/SimplePDO.php
@@ -44,8 +44,6 @@ class SimplePDO extends AbstractBackend
 
     /**
      * Creates the backend.
-     *
-     * @param \PDO $pdo
      */
     public function __construct(\PDO $pdo)
     {
@@ -103,7 +101,6 @@ public function getCalendarsForUser($principalUri)
      *
      * @param string $principalUri
      * @param string $calendarUri
-     * @param array  $properties
      *
      * @return string
      */

diff --git a/sabre/dav/lib/CalDAV/Backend/SubscriptionSupport.php b/sabre/dav/lib/CalDAV/Backend/SubscriptionSupport.php
@@ -58,7 +58,6 @@ public function getSubscriptionsForUser($principalUri);
      *
      * @param string $principalUri
      * @param string $uri
-     * @param array  $properties
      *
      * @return mixed
      */