Merge branch '9.0RC'9.0

1 files changed, 7 insertions, 7 deletions

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)
     {