diff options
Diffstat (limited to 'vendor/sabre/dav/lib')
-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 |
3 files changed, 8 insertions, 3 deletions
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'; } |