Bump sabre family

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
nextcloud · Aug 21, 2020 · 3779d20 · 3779d20
1 parent 10acc20
commit 3779d20
Show file tree

Hide file tree

Showing 173 changed files with 253 additions and 964 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/composer/installed.json b/composer/installed.json
@@ -3617,17 +3617,17 @@
     },
     {
         "name": "sabre/dav",
-        "version": "4.0.3",
-        "version_normalized": "4.0.3.0",
+        "version": "4.1.1",
+        "version_normalized": "4.1.1.0",
         "source": {
             "type": "git",
             "url": "https://github.com/sabre-io/dav.git",
-            "reference": "b793fb4ce27cf0f981b540ad771281c430ffe818"
+            "reference": "5736f943c90d8d73d04cd8944d8c913811dc7360"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/sabre-io/dav/zipball/b793fb4ce27cf0f981b540ad771281c430ffe818",
-            "reference": "b793fb4ce27cf0f981b540ad771281c430ffe818",
+            "url": "https://api.github.com/repos/sabre-io/dav/zipball/5736f943c90d8d73d04cd8944d8c913811dc7360",
+            "reference": "5736f943c90d8d73d04cd8944d8c913811dc7360",
             "shasum": ""
         },
         "require": {
@@ -3641,25 +3641,27 @@
             "ext-simplexml": "*",
             "ext-spl": "*",
             "lib-libxml": ">=2.7.0",
-            "php": ">=7.0.0",
+            "php": "^7.1.0",
             "psr/log": "^1.0",
             "sabre/event": "^5.0",
-            "sabre/http": "^5.0",
+            "sabre/http": "^5.0.5",
             "sabre/uri": "^2.0",
-            "sabre/vobject": "^4.2.0-alpha1",
+            "sabre/vobject": "^4.2.1",
             "sabre/xml": "^2.0.1"
         },
         "require-dev": {
             "evert/phpdoc-md": "~0.1.0",
+            "friendsofphp/php-cs-fixer": "^2.16.3",
             "monolog/monolog": "^1.18",
-            "phpunit/phpunit": "^6"
+            "phpstan/phpstan": "^0.12",
+            "phpunit/phpunit": "^7.5 || ^8.5 || ^9.0"
         },
         "suggest": {
             "ext-curl": "*",
             "ext-imap": "*",
             "ext-pdo": "*"
         },
-        "time": "2020-01-10T07:52:45+00:00",
+        "time": "2020-07-13T13:38:16+00:00",
         "bin": [
             "bin/sabredav",
             "bin/naturalselection"
@@ -3872,17 +3874,17 @@
     },
     {
         "name": "sabre/vobject",
-        "version": "4.3.0",
-        "version_normalized": "4.3.0.0",
+        "version": "4.3.1",
+        "version_normalized": "4.3.1.0",
         "source": {
             "type": "git",
             "url": "https://github.com/sabre-io/vobject.git",
-            "reference": "5b2248d965160f93053f3a24704794a13a22a1bb"
+            "reference": "a7feca8311462e5da16952454e420b92c20d3586"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/sabre-io/vobject/zipball/5b2248d965160f93053f3a24704794a13a22a1bb",
-            "reference": "5b2248d965160f93053f3a24704794a13a22a1bb",
+            "url": "https://api.github.com/repos/sabre-io/vobject/zipball/a7feca8311462e5da16952454e420b92c20d3586",
+            "reference": "a7feca8311462e5da16952454e420b92c20d3586",
             "shasum": ""
         },
         "require": {
@@ -3892,12 +3894,13 @@
         },
         "require-dev": {
             "friendsofphp/php-cs-fixer": "~2.16.1",
-            "phpunit/phpunit": "^7 || ^8"
+            "phpstan/phpstan": "^0.12",
+            "phpunit/phpunit": "^7.5 || ^8.5 || ^9.0"
         },
         "suggest": {
             "hoa/bench": "If you would like to run the benchmark scripts"
         },
-        "time": "2020-01-31T18:50:58+00:00",
+        "time": "2020-07-13T11:23:30+00:00",
         "bin": [
             "bin/vobject",
             "bin/generate_vcards"
@@ -3971,17 +3974,17 @@
     },
     {
         "name": "sabre/xml",
-        "version": "2.2.0",
-        "version_normalized": "2.2.0.0",
+        "version": "2.2.1",
+        "version_normalized": "2.2.1.0",
         "source": {
             "type": "git",
             "url": "https://github.com/sabre-io/xml.git",
-            "reference": "705f5cbf7f4fb1e3dd47173e3f026892818c8d46"
+            "reference": "41c6ba148966b10cafd31d1a4e5feb1e2138d95c"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/sabre-io/xml/zipball/705f5cbf7f4fb1e3dd47173e3f026892818c8d46",
-            "reference": "705f5cbf7f4fb1e3dd47173e3f026892818c8d46",
+            "url": "https://api.github.com/repos/sabre-io/xml/zipball/41c6ba148966b10cafd31d1a4e5feb1e2138d95c",
+            "reference": "41c6ba148966b10cafd31d1a4e5feb1e2138d95c",
             "shasum": ""
         },
         "require": {
@@ -3994,9 +3997,10 @@
         },
         "require-dev": {
             "friendsofphp/php-cs-fixer": "~2.16.1",
-            "phpunit/phpunit": "^7 || ^8"
+            "phpstan/phpstan": "^0.12",
+            "phpunit/phpunit": "^7.5 || ^8.5 || ^9.0"
         },
-        "time": "2020-01-31T18:52:58+00:00",
+        "time": "2020-05-11T09:44:55+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {

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,18 @@
 ChangeLog
 =========
 
+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

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",
+        "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.3",
+        "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"
+        ]
     }
 }