Skip to content

Bump icewind/searchdav to 3.1.0 in master #1643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
artonge merged 1 commit into from
Nov 16, 2023
Merged

Bump icewind/searchdav to 3.1.0 in master #1643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"fusonic/opengraph": "^2.2",
"giggsey/libphonenumber-for-php-lite": "^8.13.12",
"guzzlehttp/guzzle": "^7.5.0",
"icewind/searchdav": "^3.0",
"icewind/searchdav": "^3.1.0",
"icewind/streams": "^0.7.7",
"laravel/serializable-closure": "^1.2.2",
"mexitek/phpcolors": "^1.0",
Expand Down
39 changes: 18 additions & 21 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions composer/autoload_classmap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2414,6 +2414,7 @@
'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',
Expand Down
5 changes: 1 addition & 4 deletions composer/autoload_psr4.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,7 @@
'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'),
'Punic\\' => array($vendorDir . '/punic/punic/src'),
Expand Down
22 changes: 4 additions & 18 deletions composer/autoload_static.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,7 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
'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 (
Expand Down Expand Up @@ -450,21 +447,9 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
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 (
Expand Down Expand Up @@ -3078,6 +3063,7 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
'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',
Expand Down
41 changes: 19 additions & 22 deletions composer/installed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1678,17 +1678,17 @@
},
{
"name": "icewind/searchdav",
"version": "v3.0.1",
"version_normalized": "3.0.1.0",
"version": "v3.1.0",
"version_normalized": "3.1.0.0",
"source": {
"type": "git",
"url": "https://github.com/icewind1991/SearchDAV.git",
"reference": "52c8cfc21bd69271f224671c4924d260b0a8d4fb"
"reference": "8339181df313361da4daee6cb1c7f144f67f8492"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/icewind1991/SearchDAV/zipball/52c8cfc21bd69271f224671c4924d260b0a8d4fb",
"reference": "52c8cfc21bd69271f224671c4924d260b0a8d4fb",
"url": "https://api.github.com/repos/icewind1991/SearchDAV/zipball/8339181df313361da4daee6cb1c7f144f67f8492",
"reference": "8339181df313361da4daee6cb1c7f144f67f8492",
"shasum": ""
},
"require": {
Expand All @@ -1702,7 +1702,7 @@
"phpunit/phpunit": "^8",
"psalm/phar": "^4.3"
},
"time": "2022-04-11T13:02:49+00:00",
"time": "2023-11-14T22:32:04+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
Expand All @@ -1723,7 +1723,7 @@
"description": "sabre/dav plugin to implement rfc5323 SEARCH",
"support": {
"issues": "https://github.com/icewind1991/SearchDAV/issues",
"source": "https://github.com/icewind1991/SearchDAV/tree/v3.0.1"
"source": "https://github.com/icewind1991/SearchDAV/tree/v3.1.0"
},
"install-path": "../icewind/searchdav"
},
Expand Down Expand Up @@ -3862,17 +3862,17 @@
},
{
"name": "sabre/dav",
"version": "4.4.0",
"version_normalized": "4.4.0.0",
"version": "4.5.0",
"version_normalized": "4.5.0.0",
"source": {
"type": "git",
"url": "https://github.com/sabre-io/dav.git",
"reference": "b65362abc926520eda2c57e219f022a6c288069d"
"reference": "7e40343e473f17eab3d1d6ca4ae3e1cdfc6e0fd8"
},
"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/7e40343e473f17eab3d1d6ca4ae3e1cdfc6e0fd8",
"reference": "7e40343e473f17eab3d1d6ca4ae3e1cdfc6e0fd8",
"shasum": ""
},
"require": {
Expand All @@ -3895,18 +3895,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",
"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-11-14T10:48:05+00:00",
"bin": [
"bin/sabredav",
"bin/naturalselection"
Expand All @@ -3915,10 +3915,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/",
Expand Down
16 changes: 8 additions & 8 deletions composer/installed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'name' => 'nextcloud/3rdparty',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => 'b735a43181ab32f3d55783d7726589928db23745',
'reference' => 'd7b9f6f5f0513adc3ed652eb84b1822fb5b53032',
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
Expand Down Expand Up @@ -209,9 +209,9 @@
'dev_requirement' => false,
),
'icewind/searchdav' => array(
'pretty_version' => 'v3.0.1',
'version' => '3.0.1.0',
'reference' => '52c8cfc21bd69271f224671c4924d260b0a8d4fb',
'pretty_version' => 'v3.1.0',
'version' => '3.1.0.0',
'reference' => '8339181df313361da4daee6cb1c7f144f67f8492',
'type' => 'library',
'install_path' => __DIR__ . '/../icewind/searchdav',
'aliases' => array(),
Expand Down Expand Up @@ -310,7 +310,7 @@
'nextcloud/3rdparty' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => 'b735a43181ab32f3d55783d7726589928db23745',
'reference' => 'd7b9f6f5f0513adc3ed652eb84b1822fb5b53032',
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
Expand Down Expand Up @@ -590,9 +590,9 @@
),
),
'sabre/dav' => array(
'pretty_version' => '4.4.0',
'version' => '4.4.0.0',
'reference' => 'b65362abc926520eda2c57e219f022a6c288069d',
'pretty_version' => '4.5.0',
'version' => '4.5.0.0',
'reference' => '7e40343e473f17eab3d1d6ca4ae3e1cdfc6e0fd8',
'type' => 'library',
'install_path' => __DIR__ . '/../sabre/dav',
'aliases' => array(),
Expand Down
1 change: 1 addition & 0 deletions icewind/searchdav/src/DAV/QueryParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ public function __construct() {
'{DAV:}contains' => Operator::class,
'{DAV:}not' => Operator::class,
'{DAV:}is-collection' => Operator::class,
'{DAV:}is-defined' => Operator::class,
'{DAV:}limit' => Limit::class,
];
}
Expand Down
4 changes: 2 additions & 2 deletions sabre/dav/lib/CalDAV/Backend/AbstractBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public function getMultipleCalendarObjects($calendarId, array $uris)
*
* 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'.
Expand All @@ -95,7 +95,7 @@ public function getMultipleCalendarObjects($calendarId, array $uris)
* 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.
Expand Down
2 changes: 1 addition & 1 deletion sabre/dav/lib/CalDAV/Backend/PDO.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,7 @@ public function getCalendarObjectByUID($principalUri, $uid)
* @param int $syncLevel
* @param int $limit
*
* @return array
* @return array|null
*/
public function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null)
{
Expand Down
2 changes: 1 addition & 1 deletion sabre/dav/lib/CalDAV/Backend/SyncSupport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
12 changes: 6 additions & 6 deletions sabre/dav/lib/CalDAV/Calendar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,17 +186,17 @@ public function createDirectory($name)
* 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);
}

/**
Expand Down Expand Up @@ -442,7 +442,7 @@ public function getSyncToken()
* @param int $syncLevel
* @param int $limit
*
* @return array
* @return array|null
*/
public function getChanges($syncToken, $syncLevel, $limit = null)
{
Expand Down
Loading