Merge branch '9.0RC'9.0

2 files changed, 4 insertions, 12 deletions

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');