aboutsummaryrefslogtreecommitdiffstats
path: root/vendor
diff options
context:
space:
mode:
Diffstat (limited to 'vendor')
-rw-r--r--vendor/composer/autoload_classmap.php1
-rw-r--r--vendor/composer/autoload_psr4.php5
-rw-r--r--vendor/composer/autoload_static.php22
-rw-r--r--vendor/composer/installed.json27
-rw-r--r--vendor/composer/installed.php10
-rw-r--r--vendor/sabre/dav/.github/workflows/ci.yml127
-rw-r--r--vendor/sabre/dav/.php_cs.dist12
-rw-r--r--vendor/sabre/dav/.travis.yml73
-rw-r--r--vendor/sabre/dav/composer.json23
-rw-r--r--vendor/sabre/dav/lib/CalDAV/Backend/AbstractBackend.php4
-rw-r--r--vendor/sabre/dav/lib/CalDAV/Backend/PDO.php2
-rw-r--r--vendor/sabre/dav/lib/CalDAV/Backend/SyncSupport.php2
-rw-r--r--vendor/sabre/dav/lib/CalDAV/Calendar.php12
-rw-r--r--vendor/sabre/dav/lib/CalDAV/CalendarHome.php4
-rw-r--r--vendor/sabre/dav/lib/CalDAV/Schedule/IMipPlugin.php7
-rw-r--r--vendor/sabre/dav/lib/CalDAV/Schedule/Plugin.php9
-rw-r--r--vendor/sabre/dav/lib/CalDAV/Xml/Filter/PropFilter.php2
-rw-r--r--vendor/sabre/dav/lib/CardDAV/AddressBook.php14
-rw-r--r--vendor/sabre/dav/lib/CardDAV/AddressBookHome.php4
-rw-r--r--vendor/sabre/dav/lib/CardDAV/Backend/PDO.php2
-rw-r--r--vendor/sabre/dav/lib/CardDAV/Backend/SyncSupport.php2
-rw-r--r--vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php9
-rw-r--r--vendor/sabre/dav/lib/DAV/Client.php108
-rw-r--r--vendor/sabre/dav/lib/DAV/INodeByPath.php36
-rw-r--r--vendor/sabre/dav/lib/DAV/Sync/ISyncCollection.php2
-rw-r--r--vendor/sabre/dav/lib/DAV/Tree.php30
-rw-r--r--vendor/sabre/dav/lib/DAV/Version.php2
-rw-r--r--vendor/sabre/dav/lib/DAV/Xml/Element/Response.php46
-rw-r--r--vendor/sabre/dav/lib/DAV/Xml/Property/Href.php13
-rw-r--r--vendor/sabre/dav/lib/DAVACL/PrincipalBackend/BackendInterface.php2
30 files changed, 248 insertions, 364 deletions
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 2e35ba1e8..440144d89 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -728,6 +728,7 @@ return array(
'Sabre\\DAV\\IMoveTarget' => $vendorDir . '/sabre/dav/lib/DAV/IMoveTarget.php',
'Sabre\\DAV\\IMultiGet' => $vendorDir . '/sabre/dav/lib/DAV/IMultiGet.php',
'Sabre\\DAV\\INode' => $vendorDir . '/sabre/dav/lib/DAV/INode.php',
+ 'Sabre\\DAV\\INodeByPath' => $vendorDir . '/sabre/dav/lib/DAV/INodeByPath.php',
'Sabre\\DAV\\IProperties' => $vendorDir . '/sabre/dav/lib/DAV/IProperties.php',
'Sabre\\DAV\\IQuota' => $vendorDir . '/sabre/dav/lib/DAV/IQuota.php',
'Sabre\\DAV\\Locks\\Backend\\AbstractBackend' => $vendorDir . '/sabre/dav/lib/DAV/Locks/Backend/AbstractBackend.php',
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index 5208f3328..ceeb74ea9 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -18,10 +18,7 @@ return array(
'Sabre\\Uri\\' => array($vendorDir . '/sabre/uri/lib'),
'Sabre\\HTTP\\' => array($vendorDir . '/sabre/http/lib'),
'Sabre\\Event\\' => array($vendorDir . '/sabre/event/lib'),
- 'Sabre\\DAV\\' => array($vendorDir . '/sabre/dav/lib/DAV'),
- 'Sabre\\DAVACL\\' => array($vendorDir . '/sabre/dav/lib/DAVACL'),
- 'Sabre\\CardDAV\\' => array($vendorDir . '/sabre/dav/lib/CardDAV'),
- 'Sabre\\CalDAV\\' => array($vendorDir . '/sabre/dav/lib/CalDAV'),
+ 'Sabre\\' => array($vendorDir . '/sabre/dav/lib'),
'Ramsey\\Uuid\\' => array($vendorDir . '/ramsey/uuid/src'),
'Ramsey\\Collection\\' => array($vendorDir . '/ramsey/collection/src'),
'Psr\\Log\\' => array($vendorDir . '/psr/log/src'),
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 51d669fe5..a92f1e058 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -47,10 +47,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
'Sabre\\Uri\\' => 10,
'Sabre\\HTTP\\' => 11,
'Sabre\\Event\\' => 12,
- 'Sabre\\DAV\\' => 10,
- 'Sabre\\DAVACL\\' => 13,
- 'Sabre\\CardDAV\\' => 14,
- 'Sabre\\CalDAV\\' => 13,
+ 'Sabre\\' => 6,
),
'R' =>
array (
@@ -143,21 +140,9 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
array (
0 => __DIR__ . '/..' . '/sabre/event/lib',
),
- 'Sabre\\DAV\\' =>
+ 'Sabre\\' =>
array (
- 0 => __DIR__ . '/..' . '/sabre/dav/lib/DAV',
- ),
- 'Sabre\\DAVACL\\' =>
- array (
- 0 => __DIR__ . '/..' . '/sabre/dav/lib/DAVACL',
- ),
- 'Sabre\\CardDAV\\' =>
- array (
- 0 => __DIR__ . '/..' . '/sabre/dav/lib/CardDAV',
- ),
- 'Sabre\\CalDAV\\' =>
- array (
- 0 => __DIR__ . '/..' . '/sabre/dav/lib/CalDAV',
+ 0 => __DIR__ . '/..' . '/sabre/dav/lib',
),
'Ramsey\\Uuid\\' =>
array (
@@ -970,6 +955,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
'Sabre\\DAV\\IMoveTarget' => __DIR__ . '/..' . '/sabre/dav/lib/DAV/IMoveTarget.php',
'Sabre\\DAV\\IMultiGet' => __DIR__ . '/..' . '/sabre/dav/lib/DAV/IMultiGet.php',
'Sabre\\DAV\\INode' => __DIR__ . '/..' . '/sabre/dav/lib/DAV/INode.php',
+ 'Sabre\\DAV\\INodeByPath' => __DIR__ . '/..' . '/sabre/dav/lib/DAV/INodeByPath.php',
'Sabre\\DAV\\IProperties' => __DIR__ . '/..' . '/sabre/dav/lib/DAV/IProperties.php',
'Sabre\\DAV\\IQuota' => __DIR__ . '/..' . '/sabre/dav/lib/DAV/IQuota.php',
'Sabre\\DAV\\Locks\\Backend\\AbstractBackend' => __DIR__ . '/..' . '/sabre/dav/lib/DAV/Locks/Backend/AbstractBackend.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 6d0e1d50f..164876320 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1282,17 +1282,17 @@
},
{
"name": "sabre/dav",
- "version": "4.4.0",
- "version_normalized": "4.4.0.0",
+ "version": "4.6.0",
+ "version_normalized": "4.6.0.0",
"source": {
"type": "git",
"url": "https://github.com/sabre-io/dav.git",
- "reference": "b65362abc926520eda2c57e219f022a6c288069d"
+ "reference": "554145304b4a026477d130928d16e626939b0b2a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sabre-io/dav/zipball/b65362abc926520eda2c57e219f022a6c288069d",
- "reference": "b65362abc926520eda2c57e219f022a6c288069d",
+ "url": "https://api.github.com/repos/sabre-io/dav/zipball/554145304b4a026477d130928d16e626939b0b2a",
+ "reference": "554145304b4a026477d130928d16e626939b0b2a",
"shasum": ""
},
"require": {
@@ -1315,18 +1315,18 @@
"sabre/xml": "^2.0.1"
},
"require-dev": {
- "evert/phpdoc-md": "~0.1.0",
- "friendsofphp/php-cs-fixer": "^2.17.1",
- "monolog/monolog": "^1.18",
- "phpstan/phpstan": "^0.12",
- "phpunit/phpunit": "^7.5 || ^8.5 || ^9.0"
+ "friendsofphp/php-cs-fixer": "^2.19",
+ "monolog/monolog": "^1.27 || ^2.0",
+ "phpstan/phpstan": "^0.12 || ^1.0",
+ "phpstan/phpstan-phpunit": "^1.0",
+ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6"
},
"suggest": {
"ext-curl": "*",
"ext-imap": "*",
"ext-pdo": "*"
},
- "time": "2022-06-27T09:07:55+00:00",
+ "time": "2023-12-11T13:01:23+00:00",
"bin": [
"bin/sabredav",
"bin/naturalselection"
@@ -1335,10 +1335,7 @@
"installation-source": "dist",
"autoload": {
"psr-4": {
- "Sabre\\DAV\\": "lib/DAV/",
- "Sabre\\CalDAV\\": "lib/CalDAV/",
- "Sabre\\DAVACL\\": "lib/DAVACL/",
- "Sabre\\CardDAV\\": "lib/CardDAV/"
+ "Sabre\\": "lib/"
}
},
"notification-url": "https://packagist.org/downloads/",
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 8f84c2b16..c938e924b 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
'name' => 'zotlabs/hubzilla',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
- 'reference' => '0092b7c0a4d6cf49c092e2232af63f87be63142b',
+ 'reference' => 'dff906ca69efbb8ae18e9954ec7a937e36b50308',
'type' => 'application',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -188,9 +188,9 @@
),
),
'sabre/dav' => array(
- 'pretty_version' => '4.4.0',
- 'version' => '4.4.0.0',
- 'reference' => 'b65362abc926520eda2c57e219f022a6c288069d',
+ 'pretty_version' => '4.6.0',
+ 'version' => '4.6.0.0',
+ 'reference' => '554145304b4a026477d130928d16e626939b0b2a',
'type' => 'library',
'install_path' => __DIR__ . '/../sabre/dav',
'aliases' => array(),
@@ -313,7 +313,7 @@
'zotlabs/hubzilla' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
- 'reference' => '0092b7c0a4d6cf49c092e2232af63f87be63142b',
+ 'reference' => 'dff906ca69efbb8ae18e9954ec7a937e36b50308',
'type' => 'application',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
diff --git a/vendor/sabre/dav/.github/workflows/ci.yml b/vendor/sabre/dav/.github/workflows/ci.yml
deleted file mode 100644
index f41b38535..000000000
--- a/vendor/sabre/dav/.github/workflows/ci.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-name: continuous-integration
-on:
- push:
- branches:
- - master
- - release/*
- pull_request:
-
-jobs:
- code-analysis:
- runs-on: ubuntu-latest
- name: Code Analysis (PHP ${{ matrix.php-versions }})
- strategy:
- fail-fast: false
- matrix:
- php-versions: [ '7.4' ]
- steps:
- - name: Checkout
- uses: actions/checkout@v2
-
- - name: Setup PHP, with composer and extensions
- uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
- with:
- php-version: ${{ matrix.php-versions }}
- extensions: mbstring, dom, fileinfo, mysql, redis, opcache
- tools: composer
-
- - name: Get composer cache directory
- id: composer-cache
- run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
- - name: Cache composer dependencies
- uses: actions/cache@v2
- with:
- path: ${{ steps.composer-cache.outputs.dir }}
- # Use composer.json for key, if composer.lock is not committed.
- # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
- key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
- restore-keys: ${{ runner.os }}-composer-
-
- - name: Install Composer dependencies
- run: composer install --no-progress --prefer-dist --optimize-autoloader
-
- - name: PHP CS-Fixer
- run: php vendor/bin/php-cs-fixer fix --dry-run --diff
-
- - name: PHPStan
- run: composer phpstan
-
- unit-testing:
- name: PHPUnit (PHP ${{ matrix.php-versions }})
- runs-on: ubuntu-latest
- strategy:
- fail-fast: false
- matrix:
- php-versions: [ '7.1', '7.2', '7.3', '7.4', '8.0' ]
- coverage: [ 'none' ]
- streaming: [ false ]
- include:
- - php-versions: '8.1'
- coverage: 'pcov'
- streaming: true
-
- services:
- mariadb:
- image: mariadb
- env:
- MARIADB_DATABASE: 'sabredav_test'
- MARIADB_ROOT_PASSWORD: root
- ports:
- - 3306:3306
- postgres:
- image: postgres
- env:
- POSTGRES_DB: 'sabredav_test'
- POSTGRES_PASSWORD: postgres
- ports:
- - 5432:5432
- steps:
- - name: Checkout
- uses: actions/checkout@v2
-
- - name: Setup PHP, with composer and extensions
- uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
- with:
- php-version: ${{ matrix.php-versions }}
- extensions: mbstring, dom, fileinfo, pdo_sqlite, pgsql, mysql, redis, opcache
- coverage: ${{ matrix.coverage }}
- tools: composer
-
- - name: Get composer cache directory
- id: composer-cache
- run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
- - name: Cache composer dependencies
- uses: actions/cache@v2
- with:
- path: ${{ steps.composer-cache.outputs.dir }}
- # Use composer.json for key, if composer.lock is not committed.
- # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
- key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
- restore-keys: ${{ runner.os }}-composer-
-
- - name: Install Composer dependencies
- run: composer install --no-progress --prefer-dist --optimize-autoloader
-
- - name: PHPUnit
- if: matrix.streaming == false
- run: vendor/bin/phpunit --verbose --configuration tests/phpunit.xml --coverage-clover=coverage.xml
- env:
- SABRE_MYSQLUSER: root
- SABRE_MYSQLPASS: root
- SABRE_MYSQLDSN: "mysql:host=127.0.0.1;port=3306;dbname=sabredav_test"
- SABRE_PGSQLDSN: "pgsql:host=127.0.0.1;port=5432;dbname=sabredav_test;user=postgres;password=postgres"
-
- - name: PHPUnit (with streaming)
- if: matrix.streaming == true
- run: vendor/bin/phpunit --verbose --configuration tests/phpunit.xml --coverage-clover=coverage.xml
- env:
- SABRE_MYSQLUSER: root
- SABRE_MYSQLPASS: root
- SABRE_MYSQLDSN: "mysql:host=127.0.0.1;port=3306;dbname=sabredav_test"
- SABRE_PGSQLDSN: "pgsql:host=127.0.0.1;port=5432;dbname=sabredav_test;user=postgres;password=postgres"
- RUN_TEST_WITH_STREAMING_PROPFIND: "true"
-
- - uses: codecov/codecov-action@v2
- if: matrix.coverage != 'none'
diff --git a/vendor/sabre/dav/.php_cs.dist b/vendor/sabre/dav/.php_cs.dist
deleted file mode 100644
index c5c78a971..000000000
--- a/vendor/sabre/dav/.php_cs.dist
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-$config = PhpCsFixer\Config::create();
-$config->getFinder()
- ->exclude('vendor')
- ->in(__DIR__);
-$config->setRules([
- '@PSR1' => true,
- '@Symfony' => true
-]);
-
-return $config; \ No newline at end of file
diff --git a/vendor/sabre/dav/.travis.yml b/vendor/sabre/dav/.travis.yml
deleted file mode 100644
index 6214d80b3..000000000
--- a/vendor/sabre/dav/.travis.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-language: php
-sudo: required
-
-branches:
- only:
- - master
-
-php:
- - 7.1
- - 7.2
- - 7.3
- - 7.4
-
-env:
- global:
- - 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"
- - PREFER_LOWEST="--prefer-lowest" TEST_DEPS="tests/Sabre/" REPORT_COVERAGE="FALSE" WITH_COVERAGE=""
-
-matrix:
- include:
- - name: 'PHP8'
- dist: bionic
- php: 8.0
- 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'
- php: 7.2
- env:
- - RUN_TEST_WITH_STREAMING_PROPFIND="TRUE"
- - REPORT_COVERAGE="FALSE"
- fast_finish: true
-
-services:
- - mysql
- - postgresql
-
-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_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:
- - if [ $REPORT_COVERAGE == "TRUE" ]; then bash <(curl -s https://codecov.io/bash); fi
-
-cache:
- directories:
- - $HOME/.composer/cache
diff --git a/vendor/sabre/dav/composer.json b/vendor/sabre/dav/composer.json
index 5f0a44d66..315417339 100644
--- a/vendor/sabre/dav/composer.json
+++ b/vendor/sabre/dav/composer.json
@@ -33,11 +33,11 @@
"ext-json": "*"
},
"require-dev" : {
- "friendsofphp/php-cs-fixer": "^2.17.1",
- "phpstan/phpstan": "^0.12",
- "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0",
- "evert/phpdoc-md" : "~0.1.0",
- "monolog/monolog": "^1.18"
+ "friendsofphp/php-cs-fixer": "^2.19",
+ "monolog/monolog": "^1.27 || ^2.0",
+ "phpstan/phpstan": "^0.12 || ^1.0",
+ "phpstan/phpstan-phpunit": "^1.0",
+ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6"
},
"suggest" : {
"ext-curl" : "*",
@@ -46,21 +46,12 @@
},
"autoload": {
"psr-4" : {
- "Sabre\\DAV\\" : "lib/DAV/",
- "Sabre\\DAVACL\\" : "lib/DAVACL/",
- "Sabre\\CalDAV\\" : "lib/CalDAV/",
- "Sabre\\CardDAV\\" : "lib/CardDAV/"
+ "Sabre\\" : "lib/"
}
},
"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"
+ "Sabre\\" : "tests/Sabre/"
}
},
"support" : {
diff --git a/vendor/sabre/dav/lib/CalDAV/Backend/AbstractBackend.php b/vendor/sabre/dav/lib/CalDAV/Backend/AbstractBackend.php
index c32c86489..c761bff51 100644
--- a/vendor/sabre/dav/lib/CalDAV/Backend/AbstractBackend.php
+++ b/vendor/sabre/dav/lib/CalDAV/Backend/AbstractBackend.php
@@ -78,7 +78,7 @@ abstract class AbstractBackend implements BackendInterface
*
* This default may well be good enough for personal use, and calendars
* that aren't very large. But if you anticipate high usage, big calendars
- * or high loads, you are strongly adviced to optimize certain paths.
+ * or high loads, you are strongly advised to optimize certain paths.
*
* The best way to do so is override this method and to optimize
* specifically for 'common filters'.
@@ -95,7 +95,7 @@ abstract class AbstractBackend implements BackendInterface
* Note that especially time-range-filters may be difficult to parse. A
* time-range filter specified on a VEVENT must for instance also handle
* recurrence rules correctly.
- * A good example of how to interprete all these filters can also simply
+ * A good example of how to interpret all these filters can also simply
* be found in \Sabre\CalDAV\CalendarQueryFilter. This class is as correct
* as possible, so it gives you a good idea on what type of stuff you need
* to think of.
diff --git a/vendor/sabre/dav/lib/CalDAV/Backend/PDO.php b/vendor/sabre/dav/lib/CalDAV/Backend/PDO.php
index 2f48ab982..b9f112cf8 100644
--- a/vendor/sabre/dav/lib/CalDAV/Backend/PDO.php
+++ b/vendor/sabre/dav/lib/CalDAV/Backend/PDO.php
@@ -939,7 +939,7 @@ SQL;
* @param int $syncLevel
* @param int $limit
*
- * @return array
+ * @return array|null
*/
public function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null)
{
diff --git a/vendor/sabre/dav/lib/CalDAV/Backend/SyncSupport.php b/vendor/sabre/dav/lib/CalDAV/Backend/SyncSupport.php
index c7f67d176..bfc1dafc2 100644
--- a/vendor/sabre/dav/lib/CalDAV/Backend/SyncSupport.php
+++ b/vendor/sabre/dav/lib/CalDAV/Backend/SyncSupport.php
@@ -77,7 +77,7 @@ interface SyncSupport extends BackendInterface
* @param int $syncLevel
* @param int $limit
*
- * @return array
+ * @return array|null
*/
public function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null);
}
diff --git a/vendor/sabre/dav/lib/CalDAV/Calendar.php b/vendor/sabre/dav/lib/CalDAV/Calendar.php
index 6e989314d..6c0bf5411 100644
--- a/vendor/sabre/dav/lib/CalDAV/Calendar.php
+++ b/vendor/sabre/dav/lib/CalDAV/Calendar.php
@@ -186,17 +186,17 @@ class Calendar implements ICalendar, DAV\IProperties, DAV\Sync\ISyncCollection,
* The contents of the new file must be a valid ICalendar string.
*
* @param string $name
- * @param resource $calendarData
+ * @param resource $data
*
* @return string|null
*/
- public function createFile($name, $calendarData = null)
+ public function createFile($name, $data = null)
{
- if (is_resource($calendarData)) {
- $calendarData = stream_get_contents($calendarData);
+ if (is_resource($data)) {
+ $data = stream_get_contents($data);
}
- return $this->caldavBackend->createCalendarObject($this->calendarInfo['id'], $name, $calendarData);
+ return $this->caldavBackend->createCalendarObject($this->calendarInfo['id'], $name, $data);
}
/**
@@ -442,7 +442,7 @@ class Calendar implements ICalendar, DAV\IProperties, DAV\Sync\ISyncCollection,
* @param int $syncLevel
* @param int $limit
*
- * @return array
+ * @return array|null
*/
public function getChanges($syncToken, $syncLevel, $limit = null)
{
diff --git a/vendor/sabre/dav/lib/CalDAV/CalendarHome.php b/vendor/sabre/dav/lib/CalDAV/CalendarHome.php
index 159ddcc67..49c54a37a 100644
--- a/vendor/sabre/dav/lib/CalDAV/CalendarHome.php
+++ b/vendor/sabre/dav/lib/CalDAV/CalendarHome.php
@@ -96,10 +96,10 @@ class CalendarHome implements DAV\IExtendedCollection, DAVACL\IACL
*
* This is currently not allowed
*
- * @param string $filename
+ * @param string $name
* @param resource $data
*/
- public function createFile($filename, $data = null)
+ public function createFile($name, $data = null)
{
throw new DAV\Exception\MethodNotAllowed('Creating new files in this collection is not supported');
}
diff --git a/vendor/sabre/dav/lib/CalDAV/Schedule/IMipPlugin.php b/vendor/sabre/dav/lib/CalDAV/Schedule/IMipPlugin.php
index e050ac273..dcaf951ef 100644
--- a/vendor/sabre/dav/lib/CalDAV/Schedule/IMipPlugin.php
+++ b/vendor/sabre/dav/lib/CalDAV/Schedule/IMipPlugin.php
@@ -31,13 +31,6 @@ class IMipPlugin extends DAV\ServerPlugin
protected $senderEmail;
/**
- * ITipMessage.
- *
- * @var ITip\Message
- */
- protected $itipMessage;
-
- /**
* Creates the email handler.
*
* @param string $senderEmail. The 'senderEmail' is the email that shows up
diff --git a/vendor/sabre/dav/lib/CalDAV/Schedule/Plugin.php b/vendor/sabre/dav/lib/CalDAV/Schedule/Plugin.php
index 3cc360f1d..5e5659610 100644
--- a/vendor/sabre/dav/lib/CalDAV/Schedule/Plugin.php
+++ b/vendor/sabre/dav/lib/CalDAV/Schedule/Plugin.php
@@ -605,10 +605,9 @@ class Plugin extends ServerPlugin
*
* This method may update $newObject to add any status changes.
*
- * @param VCalendar|string $oldObject
- * @param array $ignore any addresses to not send messages to
- * @param bool $modified a marker to indicate that the original object
- * modified by this process
+ * @param VCalendar|string|null $oldObject
+ * @param array $ignore any addresses to not send messages to
+ * @param bool $modified a marker to indicate that the original object modified by this process
*/
protected function processICalendarChange($oldObject, VCalendar $newObject, array $addresses, array $ignore = [], &$modified = false)
{
@@ -969,7 +968,7 @@ class Plugin extends ServerPlugin
*
* @return bool
*/
- private function scheduleReply(RequestInterface $request)
+ protected function scheduleReply(RequestInterface $request)
{
$scheduleReply = $request->getHeader('Schedule-Reply');
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Filter/PropFilter.php b/vendor/sabre/dav/lib/CalDAV/Xml/Filter/PropFilter.php
index c9a3cb5ac..f1d66cc0d 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Filter/PropFilter.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Filter/PropFilter.php
@@ -53,7 +53,7 @@ class PropFilter implements XmlDeserializable
'is-not-defined' => false,
'param-filters' => [],
'text-match' => null,
- 'time-range' => false,
+ 'time-range' => [],
];
$att = $reader->parseAttributes();
diff --git a/vendor/sabre/dav/lib/CardDAV/AddressBook.php b/vendor/sabre/dav/lib/CardDAV/AddressBook.php
index 86994f2d5..f5744f644 100644
--- a/vendor/sabre/dav/lib/CardDAV/AddressBook.php
+++ b/vendor/sabre/dav/lib/CardDAV/AddressBook.php
@@ -129,19 +129,19 @@ class AddressBook extends DAV\Collection implements IAddressBook, DAV\IPropertie
* This method may return an ETag.
*
* @param string $name
- * @param resource $vcardData
+ * @param resource $data
*
* @return string|null
*/
- public function createFile($name, $vcardData = null)
+ public function createFile($name, $data = null)
{
- if (is_resource($vcardData)) {
- $vcardData = stream_get_contents($vcardData);
+ if (is_resource($data)) {
+ $data = stream_get_contents($data);
}
// Converting to UTF-8, if needed
- $vcardData = DAV\StringUtil::ensureUTF8($vcardData);
+ $data = DAV\StringUtil::ensureUTF8($data);
- return $this->carddavBackend->createCard($this->addressBookInfo['id'], $name, $vcardData);
+ return $this->carddavBackend->createCard($this->addressBookInfo['id'], $name, $data);
}
/**
@@ -317,7 +317,7 @@ class AddressBook extends DAV\Collection implements IAddressBook, DAV\IPropertie
* @param int $syncLevel
* @param int $limit
*
- * @return array
+ * @return array|null
*/
public function getChanges($syncToken, $syncLevel, $limit = null)
{
diff --git a/vendor/sabre/dav/lib/CardDAV/AddressBookHome.php b/vendor/sabre/dav/lib/CardDAV/AddressBookHome.php
index 884e9b24e..d7365fbe8 100644
--- a/vendor/sabre/dav/lib/CardDAV/AddressBookHome.php
+++ b/vendor/sabre/dav/lib/CardDAV/AddressBookHome.php
@@ -92,10 +92,10 @@ class AddressBookHome extends DAV\Collection implements DAV\IExtendedCollection,
*
* This is currently not allowed
*
- * @param string $filename
+ * @param string $name
* @param resource $data
*/
- public function createFile($filename, $data = null)
+ public function createFile($name, $data = null)
{
throw new DAV\Exception\MethodNotAllowed('Creating new files in this collection is not supported');
}
diff --git a/vendor/sabre/dav/lib/CardDAV/Backend/PDO.php b/vendor/sabre/dav/lib/CardDAV/Backend/PDO.php
index 966d7ba09..4ca9284a9 100644
--- a/vendor/sabre/dav/lib/CardDAV/Backend/PDO.php
+++ b/vendor/sabre/dav/lib/CardDAV/Backend/PDO.php
@@ -452,7 +452,7 @@ class PDO extends AbstractBackend implements SyncSupport
* @param int $syncLevel
* @param int $limit
*
- * @return array
+ * @return array|null
*/
public function getChangesForAddressBook($addressBookId, $syncToken, $syncLevel, $limit = null)
{
diff --git a/vendor/sabre/dav/lib/CardDAV/Backend/SyncSupport.php b/vendor/sabre/dav/lib/CardDAV/Backend/SyncSupport.php
index 071361ed0..6aaad1415 100644
--- a/vendor/sabre/dav/lib/CardDAV/Backend/SyncSupport.php
+++ b/vendor/sabre/dav/lib/CardDAV/Backend/SyncSupport.php
@@ -77,7 +77,7 @@ interface SyncSupport extends BackendInterface
* @param int $syncLevel
* @param int $limit
*
- * @return array
+ * @return array|null
*/
public function getChangesForAddressBook($addressBookId, $syncToken, $syncLevel, $limit = null);
}
diff --git a/vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php b/vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php
index c11d2dd73..491f96908 100644
--- a/vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php
+++ b/vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php
@@ -38,7 +38,7 @@ class AddressBookMultiGetReport implements XmlDeserializable
public $hrefs;
/**
- * The mimetype of the content that should be returend. Usually
+ * The mimetype of the content that should be returned. Usually
* text/vcard.
*
* @var string
@@ -54,6 +54,13 @@ class AddressBookMultiGetReport implements XmlDeserializable
public $version = null;
/**
+ * An array with requested vcard properties.
+ *
+ * @var array
+ */
+ public $addressDataProperties;
+
+ /**
* The deserialize method is called during xml parsing.
*
* This method is called statically, this is because in theory this method
diff --git a/vendor/sabre/dav/lib/DAV/Client.php b/vendor/sabre/dav/lib/DAV/Client.php
index a9de71cdb..1028a6b9d 100644
--- a/vendor/sabre/dav/lib/DAV/Client.php
+++ b/vendor/sabre/dav/lib/DAV/Client.php
@@ -174,27 +174,98 @@ class Client extends HTTP\Client
}
/**
- * Does a PROPFIND request.
+ * Does a PROPFIND request with filtered response returning only available properties.
*
* The list of requested properties must be specified as an array, in clark
* notation.
*
- * The returned array will contain a list of filenames as keys, and
- * properties as values.
+ * Depth should be either 0 or 1. A depth of 1 will cause a request to be
+ * made to the server to also return all child resources.
+ *
+ * For depth 0, just the array of properties for the resource is returned.
+ *
+ * For depth 1, the returned array will contain a list of resource names as keys,
+ * and an array of properties as values.
*
- * The properties array will contain the list of properties. Only properties
- * that are actually returned from the server (without error) will be
+ * The array of properties will contain the properties as keys with their values as the value.
+ * Only properties that are actually returned from the server without error will be
* returned, anything else is discarded.
*
+ * @param 1|0 $depth
+ */
+ public function propFind($url, array $properties, $depth = 0): array
+ {
+ $result = $this->doPropFind($url, $properties, $depth);
+
+ // If depth was 0, we only return the top item
+ if (0 === $depth) {
+ reset($result);
+ $result = current($result);
+
+ return isset($result[200]) ? $result[200] : [];
+ }
+
+ $newResult = [];
+ foreach ($result as $href => $statusList) {
+ $newResult[$href] = isset($statusList[200]) ? $statusList[200] : [];
+ }
+
+ return $newResult;
+ }
+
+ /**
+ * Does a PROPFIND request with unfiltered response.
+ *
+ * The list of requested properties must be specified as an array, in clark
+ * notation.
+ *
* Depth should be either 0 or 1. A depth of 1 will cause a request to be
* made to the server to also return all child resources.
*
- * @param string $url
- * @param int $depth
+ * For depth 0, just the multi-level array of status and properties for the resource is returned.
*
- * @return array
+ * For depth 1, the returned array will contain a list of resources as keys and
+ * a multi-level array containing status and properties as value.
+ *
+ * The multi-level array of status and properties is formatted the same as what is
+ * documented for parseMultiStatus.
+ *
+ * All properties that are actually returned from the server are returned by this method.
+ *
+ * @param 1|0 $depth
+ */
+ public function propFindUnfiltered(string $url, array $properties, int $depth = 0): array
+ {
+ $result = $this->doPropFind($url, $properties, $depth);
+
+ // If depth was 0, we only return the top item
+ if (0 === $depth) {
+ reset($result);
+
+ return current($result);
+ } else {
+ return $result;
+ }
+ }
+
+ /**
+ * Does a PROPFIND request.
+ *
+ * The list of requested properties must be specified as an array, in clark
+ * notation.
+ *
+ * Depth should be either 0 or 1. A depth of 1 will cause a request to be
+ * made to the server to also return all child resources.
+ *
+ * The returned array will contain a list of resources as keys and
+ * a multi-level array containing status and properties as value.
+ *
+ * The multi-level array of status and properties is formatted the same as what is
+ * documented for parseMultiStatus.
+ *
+ * @param 1|0 $depth
*/
- public function propFind($url, array $properties, $depth = 0)
+ private function doPropFind($url, array $properties, $depth = 0): array
{
$dom = new \DOMDocument('1.0', 'UTF-8');
$dom->formatOutput = true;
@@ -232,22 +303,7 @@ class Client extends HTTP\Client
throw new HTTP\ClientHttpException($response);
}
- $result = $this->parseMultiStatus($response->getBodyAsString());
-
- // If depth was 0, we only return the top item
- if (0 === $depth) {
- reset($result);
- $result = current($result);
-
- return isset($result[200]) ? $result[200] : [];
- }
-
- $newResult = [];
- foreach ($result as $href => $statusList) {
- $newResult[$href] = isset($statusList[200]) ? $statusList[200] : [];
- }
-
- return $newResult;
+ return $this->parseMultiStatus($response->getBodyAsString());
}
/**
@@ -385,7 +441,7 @@ class Client extends HTTP\Client
{
return Uri\resolve(
$this->baseUri,
- $url
+ (string) $url
);
}
diff --git a/vendor/sabre/dav/lib/DAV/INodeByPath.php b/vendor/sabre/dav/lib/DAV/INodeByPath.php
new file mode 100644
index 000000000..4d63a33bd
--- /dev/null
+++ b/vendor/sabre/dav/lib/DAV/INodeByPath.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sabre\DAV;
+
+/**
+ * INodeByPath.
+ *
+ * This interface adds a tiny bit of functionality to collections.
+ *
+ * Getting a node that is deep in the tree normally requires going trough each parent node
+ * which can cause a significant performance overhead.
+ *
+ * Implementing this interface allows solving this overhead by directly jumping to the target node.
+ *
+ * @copyright Copyright (C) Robin Appelman (https://icewind.nl/)
+ * @author Robin Appelman (https://icewind.nl/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+interface INodeByPath
+{
+ /**
+ * Returns the INode object for the requested path.
+ *
+ * In case where this collection can not retrieve the requested node
+ * but also can not determine that the node does not exists,
+ * null should be returned to signal that the caller should fallback
+ * to walking the directory tree.
+ *
+ * @param string $path
+ *
+ * @return INode|null
+ */
+ public function getNodeForPath($path);
+}
diff --git a/vendor/sabre/dav/lib/DAV/Sync/ISyncCollection.php b/vendor/sabre/dav/lib/DAV/Sync/ISyncCollection.php
index 4ca69dc89..c829716b7 100644
--- a/vendor/sabre/dav/lib/DAV/Sync/ISyncCollection.php
+++ b/vendor/sabre/dav/lib/DAV/Sync/ISyncCollection.php
@@ -84,7 +84,7 @@ interface ISyncCollection extends DAV\ICollection
* @param int $syncLevel
* @param int $limit
*
- * @return array
+ * @return array|null
*/
public function getChanges($syncToken, $syncLevel, $limit = null);
}
diff --git a/vendor/sabre/dav/lib/DAV/Tree.php b/vendor/sabre/dav/lib/DAV/Tree.php
index 8215e2c39..65b4583ce 100644
--- a/vendor/sabre/dav/lib/DAV/Tree.php
+++ b/vendor/sabre/dav/lib/DAV/Tree.php
@@ -16,7 +16,7 @@ use Sabre\Uri;
* @author Evert Pot (http://evertpot.com/)
* @license http://sabre.io/license/ Modified BSD License
*/
-class Tree
+class Tree implements INodeByPath
{
/**
* The root node.
@@ -62,20 +62,26 @@ class Tree
return $this->rootNode;
}
- // Attempting to fetch its parent
- list($parentName, $baseName) = Uri\split($path);
+ $parts = explode('/', $path);
+ $node = $this->rootNode;
- // If there was no parent, we must simply ask it from the root node.
- if ('' === $parentName) {
- $node = $this->rootNode->getChild($baseName);
- } else {
- // Otherwise, we recursively grab the parent and ask him/her.
- $parent = $this->getNodeForPath($parentName);
-
- if (!($parent instanceof ICollection)) {
+ while (count($parts)) {
+ if (!($node instanceof ICollection)) {
throw new Exception\NotFound('Could not find node at path: '.$path);
}
- $node = $parent->getChild($baseName);
+
+ if ($node instanceof INodeByPath) {
+ $targetNode = $node->getNodeForPath(implode('/', $parts));
+ if ($targetNode instanceof Node) {
+ $node = $targetNode;
+ break;
+ }
+ }
+
+ $part = array_shift($parts);
+ if ('' !== $part) {
+ $node = $node->getChild($part);
+ }
}
$this->cache[$path] = $node;
diff --git a/vendor/sabre/dav/lib/DAV/Version.php b/vendor/sabre/dav/lib/DAV/Version.php
index c6273ef72..345c62d7e 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.4.0';
+ public const VERSION = '4.6.0';
}
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Element/Response.php b/vendor/sabre/dav/lib/DAV/Xml/Element/Response.php
index 79f06a09b..df9291465 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Element/Response.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Element/Response.php
@@ -40,7 +40,7 @@ class Response implements Element
*
* This is currently only used in WebDAV-Sync
*
- * @var string
+ * @var string|null
*/
protected $httpStatus;
@@ -112,13 +112,21 @@ class Response implements Element
*/
public function xmlSerialize(Writer $writer)
{
- if ($status = $this->getHTTPStatus()) {
- $writer->writeElement('{DAV:}status', 'HTTP/1.1 '.$status.' '.\Sabre\HTTP\Response::$statusCodes[$status]);
- }
+ /*
+ * Accordingly to the RFC the element looks like:
+ * <!ELEMENT response (href, ((href*, status)|(propstat+)), error?, responsedescription? , location?) >
+ *
+ * So the response
+ * - MUST contain a href and
+ * - EITHER a status and additional href(s)
+ * OR one or more propstat(s)
+ */
$writer->writeElement('{DAV:}href', $writer->contextUri.\Sabre\HTTP\encodePath($this->getHref()));
$empty = true;
+ $httpStatus = $this->getHTTPStatus();
+ // Add propstat elements
foreach ($this->getResponseProperties() as $status => $properties) {
// Skipping empty lists
if (!$properties || (!is_int($status) && !ctype_digit($status))) {
@@ -130,19 +138,25 @@ class Response implements Element
$writer->writeElement('{DAV:}status', 'HTTP/1.1 '.$status.' '.\Sabre\HTTP\Response::$statusCodes[$status]);
$writer->endElement(); // {DAV:}propstat
}
+
+ // The WebDAV spec only allows the status element on responses _without_ a propstat
if ($empty) {
- /*
- * The WebDAV spec _requires_ at least one DAV:propstat to appear for
- * every DAV:response. In some circumstances however, there are no
- * properties to encode.
- *
- * In those cases we MUST specify at least one DAV:propstat anyway, with
- * no properties.
- */
- $writer->writeElement('{DAV:}propstat', [
- '{DAV:}prop' => [],
- '{DAV:}status' => 'HTTP/1.1 418 '.\Sabre\HTTP\Response::$statusCodes[418],
- ]);
+ if (null !== $httpStatus) {
+ $writer->writeElement('{DAV:}status', 'HTTP/1.1 '.$httpStatus.' '.\Sabre\HTTP\Response::$statusCodes[$httpStatus]);
+ } else {
+ /*
+ * The WebDAV spec _requires_ at least one DAV:propstat to appear for
+ * every DAV:response if there is no status.
+ * In some circumstances however, there are no properties to encode.
+ *
+ * In those cases we MUST specify at least one DAV:propstat anyway, with
+ * no properties.
+ */
+ $writer->writeElement('{DAV:}propstat', [
+ '{DAV:}prop' => [],
+ '{DAV:}status' => 'HTTP/1.1 418 '.\Sabre\HTTP\Response::$statusCodes[418],
+ ]);
+ }
}
}
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Property/Href.php b/vendor/sabre/dav/lib/DAV/Xml/Property/Href.php
index f88ce814a..d4e43da7c 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Property/Href.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Property/Href.php
@@ -35,6 +35,19 @@ class Href implements Element, HtmlOutput
protected $hrefs;
/**
+ * Automatically prefix the url with the server base directory.
+ * Note: use of this property in code was removed in PR:
+ * https://github.com/sabre-io/dav/pull/801
+ * But the property is left here because old data may still exist
+ * that has this property saved.
+ * See discussion in issue:
+ * https://github.com/sabre-io/Baikal/issues/1154.
+ *
+ * @var bool
+ */
+ protected $autoPrefix = true;
+
+ /**
* Constructor.
*
* You must either pass a string for a single href, or an array of hrefs.
diff --git a/vendor/sabre/dav/lib/DAVACL/PrincipalBackend/BackendInterface.php b/vendor/sabre/dav/lib/DAVACL/PrincipalBackend/BackendInterface.php
index 7140a9295..2fd31913d 100644
--- a/vendor/sabre/dav/lib/DAVACL/PrincipalBackend/BackendInterface.php
+++ b/vendor/sabre/dav/lib/DAVACL/PrincipalBackend/BackendInterface.php
@@ -48,7 +48,7 @@ interface BackendInterface
public function getPrincipalByPath($path);
/**
- * Updates one ore more webdav properties on a principal.
+ * Updates one or more webdav properties on a principal.
*
* The list of mutations is stored in a Sabre\DAV\PropPatch object.
* To do the actual updates, you must tell this object which properties