diff options
author | Mario <mario@mariovavti.com> | 2021-01-13 09:50:53 +0000 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2021-01-13 09:50:53 +0000 |
commit | 5eefdc6485b2f6082f6fe5dfd6f1731fae7e3a2a (patch) | |
tree | 7521f4800e393538d19c393c6f495ea2d41cbf5a /vendor/sabre/dav | |
parent | 0bc4c7d1a0e4348018e533be600ad1c648fd97fb (diff) | |
parent | 4d2bcbc5837a7d99dc541595ca8087c335242af0 (diff) | |
download | volse-hubzilla-5eefdc6485b2f6082f6fe5dfd6f1731fae7e3a2a.tar.gz volse-hubzilla-5eefdc6485b2f6082f6fe5dfd6f1731fae7e3a2a.tar.bz2 volse-hubzilla-5eefdc6485b2f6082f6fe5dfd6f1731fae7e3a2a.zip |
Merge branch '5.2RC'5.2
Diffstat (limited to 'vendor/sabre/dav')
-rw-r--r-- | vendor/sabre/dav/.travis.yml | 17 | ||||
-rw-r--r-- | vendor/sabre/dav/CHANGELOG.md | 10 | ||||
-rwxr-xr-x[-rw-r--r--] | vendor/sabre/dav/bin/build.php | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | vendor/sabre/dav/bin/googlecode_upload.py | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | vendor/sabre/dav/bin/migrateto20.php | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | vendor/sabre/dav/bin/migrateto21.php | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | vendor/sabre/dav/bin/migrateto30.php | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | vendor/sabre/dav/bin/migrateto32.php | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | vendor/sabre/dav/bin/sabredav.php | 0 | ||||
-rw-r--r-- | vendor/sabre/dav/composer.json | 4 | ||||
-rw-r--r-- | vendor/sabre/dav/lib/CalDAV/Schedule/Plugin.php | 2 | ||||
-rw-r--r-- | vendor/sabre/dav/lib/DAV/Server.php | 7 | ||||
-rw-r--r-- | vendor/sabre/dav/lib/DAV/Version.php | 2 | ||||
-rw-r--r-- | vendor/sabre/dav/tests/Sabre/DAV/HttpPutTest.php | 20 |
14 files changed, 52 insertions, 10 deletions
diff --git a/vendor/sabre/dav/.travis.yml b/vendor/sabre/dav/.travis.yml index 03d18de2f..95331ac0d 100644 --- a/vendor/sabre/dav/.travis.yml +++ b/vendor/sabre/dav/.travis.yml @@ -16,6 +16,8 @@ env: - SABRE_MYSQLUSER="root" - SABRE_MYSQLPASS="" - SABRE_MYSQLDSN="mysql:host=127.0.0.1;dbname=sabredav_test" + - RUN_PHPCSFIXER="TRUE" + - RUN_PHPUNIT="TRUE" - RUN_PHPSTAN="FALSE" matrix: - PREFER_LOWEST="" TEST_DEPS="" REPORT_COVERAGE="TRUE" WITH_COVERAGE="--coverage-clover=coverage.xml" @@ -23,9 +25,17 @@ env: matrix: include: + - name: 'PHP8' + dist: bionic + php: nightly + env: + - RUN_PHPCSFIXER="FALSE" + - REPORT_COVERAGE="FALSE" - name: 'PHPStan' php: 7.4 env: + - RUN_PHPCSFIXER="FALSE" + - RUN_PHPUNIT="FALSE" - RUN_PHPSTAN="TRUE" - REPORT_COVERAGE="FALSE" - name: 'Test with streaming propfind' @@ -43,15 +53,16 @@ before_script: - mysql -u root -h 127.0.0.1 -e 'create database sabredav_test' - psql -c "create database sabredav_test" -U postgres - psql -c "create user sabredav with PASSWORD 'sabredav';GRANT ALL PRIVILEGES ON DATABASE sabredav_test TO sabredav" -U postgres + - if [ $RUN_PHPCSFIXER == "FALSE" ]; then composer remove --no-update --dev friendsofphp/php-cs-fixer; fi - composer update $PREFER_LOWEST addons: postgresql: "9.5" script: - - if [ $RUN_PHPSTAN == "FALSE" ]; then php vendor/bin/php-cs-fixer fix --dry-run --diff; fi - - if [ $RUN_PHPSTAN == "FALSE" ]; then php vendor/bin/phpunit --configuration tests/phpunit.xml $WITH_COVERAGE $TEST_DEPS; fi - - if [ $RUN_PHPSTAN == "FALSE" ]; then rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini; fi + - if [ $RUN_PHPCSFIXER == "TRUE" ]; then php vendor/bin/php-cs-fixer fix --dry-run --diff; fi + - if [ $RUN_PHPUNIT == "TRUE" ]; then php vendor/bin/phpunit --configuration tests/phpunit.xml $WITH_COVERAGE $TEST_DEPS; fi + - if [ $RUN_PHPUNIT == "TRUE" ]; then rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini; fi - if [ $RUN_PHPSTAN == "TRUE" ]; then composer phpstan; fi after_success: diff --git a/vendor/sabre/dav/CHANGELOG.md b/vendor/sabre/dav/CHANGELOG.md index c84a4f5e4..9db36f927 100644 --- a/vendor/sabre/dav/CHANGELOG.md +++ b/vendor/sabre/dav/CHANGELOG.md @@ -1,6 +1,14 @@ 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 @@ -246,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/vendor/sabre/dav/bin/build.php b/vendor/sabre/dav/bin/build.php index 54174a777..54174a777 100644..100755 --- a/vendor/sabre/dav/bin/build.php +++ b/vendor/sabre/dav/bin/build.php diff --git a/vendor/sabre/dav/bin/googlecode_upload.py b/vendor/sabre/dav/bin/googlecode_upload.py index caafd5ded..caafd5ded 100644..100755 --- a/vendor/sabre/dav/bin/googlecode_upload.py +++ b/vendor/sabre/dav/bin/googlecode_upload.py diff --git a/vendor/sabre/dav/bin/migrateto20.php b/vendor/sabre/dav/bin/migrateto20.php index c7a8d9e35..c7a8d9e35 100644..100755 --- a/vendor/sabre/dav/bin/migrateto20.php +++ b/vendor/sabre/dav/bin/migrateto20.php diff --git a/vendor/sabre/dav/bin/migrateto21.php b/vendor/sabre/dav/bin/migrateto21.php index 909643583..909643583 100644..100755 --- a/vendor/sabre/dav/bin/migrateto21.php +++ b/vendor/sabre/dav/bin/migrateto21.php diff --git a/vendor/sabre/dav/bin/migrateto30.php b/vendor/sabre/dav/bin/migrateto30.php index 25e544c2a..25e544c2a 100644..100755 --- a/vendor/sabre/dav/bin/migrateto30.php +++ b/vendor/sabre/dav/bin/migrateto30.php diff --git a/vendor/sabre/dav/bin/migrateto32.php b/vendor/sabre/dav/bin/migrateto32.php index 57fd35507..57fd35507 100644..100755 --- a/vendor/sabre/dav/bin/migrateto32.php +++ b/vendor/sabre/dav/bin/migrateto32.php diff --git a/vendor/sabre/dav/bin/sabredav.php b/vendor/sabre/dav/bin/sabredav.php index 28341b587..28341b587 100644..100755 --- a/vendor/sabre/dav/bin/sabredav.php +++ b/vendor/sabre/dav/bin/sabredav.php diff --git a/vendor/sabre/dav/composer.json b/vendor/sabre/dav/composer.json index d4190ae5d..fa912faf5 100644 --- a/vendor/sabre/dav/composer.json +++ b/vendor/sabre/dav/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.1.0", + "php": "^7.1.0 || ^8.0", "sabre/vobject": "^4.2.1", "sabre/event" : "^5.0", "sabre/xml" : "^2.0.1", @@ -33,7 +33,7 @@ "ext-json": "*" }, "require-dev" : { - "friendsofphp/php-cs-fixer": "^2.16.3", + "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", diff --git a/vendor/sabre/dav/lib/CalDAV/Schedule/Plugin.php b/vendor/sabre/dav/lib/CalDAV/Schedule/Plugin.php index 6f8f68432..a1f8202ec 100644 --- a/vendor/sabre/dav/lib/CalDAV/Schedule/Plugin.php +++ b/vendor/sabre/dav/lib/CalDAV/Schedule/Plugin.php @@ -609,7 +609,7 @@ class Plugin extends ServerPlugin * @param bool $modified a marker to indicate that the original object * modified by this process */ - protected function processICalendarChange($oldObject = null, VCalendar $newObject, array $addresses, array $ignore = [], &$modified = false) + protected function processICalendarChange($oldObject, VCalendar $newObject, array $addresses, array $ignore = [], &$modified = false) { $broker = new ITip\Broker(); $messages = $broker->parseEvent($newObject, $addresses, $oldObject); diff --git a/vendor/sabre/dav/lib/DAV/Server.php b/vendor/sabre/dav/lib/DAV/Server.php index 37bf282e8..4c213c1bd 100644 --- a/vendor/sabre/dav/lib/DAV/Server.php +++ b/vendor/sabre/dav/lib/DAV/Server.php @@ -1075,7 +1075,12 @@ class Server implements LoggerAwareInterface, EmitterInterface return false; } - $parent = $this->tree->getNodeForPath($dir); + try { + $parent = $this->tree->getNodeForPath($dir); + } catch (Exception\NotFound $e) { + throw new Exception\Conflict('Files cannot be created in non-existent collections'); + } + if (!$parent instanceof ICollection) { throw new Exception\Conflict('Files can only be created as children of collections'); } diff --git a/vendor/sabre/dav/lib/DAV/Version.php b/vendor/sabre/dav/lib/DAV/Version.php index a7f5269bf..70948305e 100644 --- a/vendor/sabre/dav/lib/DAV/Version.php +++ b/vendor/sabre/dav/lib/DAV/Version.php @@ -16,5 +16,5 @@ class Version /** * Full version number. */ - public const VERSION = '4.1.1'; + public const VERSION = '4.1.3'; } diff --git a/vendor/sabre/dav/tests/Sabre/DAV/HttpPutTest.php b/vendor/sabre/dav/tests/Sabre/DAV/HttpPutTest.php index d3932a4c6..543ec652a 100644 --- a/vendor/sabre/dav/tests/Sabre/DAV/HttpPutTest.php +++ b/vendor/sabre/dav/tests/Sabre/DAV/HttpPutTest.php @@ -241,7 +241,7 @@ class HttpPutTest extends DAVServerTest * * @depends testPut */ - public function testPutNoParent() + public function testPutParentIsNotCollection() { $request = new HTTP\Request( 'PUT', @@ -255,6 +255,24 @@ class HttpPutTest extends DAVServerTest } /** + * PUT thats created in a non-existent collection should be rejected. + * + * @depends testPut + */ + public function testPutParentCollectionDoesNotExist() + { + $request = new HTTP\Request( + 'PUT', + '/non-existent-collection/file2', + [], + 'hello' + ); + + $response = $this->request($request); + $this->assertEquals(409, $response->getStatus()); + } + + /** * Finder may sometimes make a request, which gets its content-body * stripped. We can't always prevent this from happening, but in some cases * we can detected this and return an error instead. |