Merge branch 'master' of github.com:fruux/sabre-dav

Author: evert

.gitignore

@@ -3,6 +3,9 @@ tests/temp
 tests/.sabredav
 tests/cov
 
+# Custom settings for tests
+tests/config.user.php
+
 # ViM
 *.swp
 

CHANGELOG.md

@@ -1,8 +1,15 @@
 ChangeLog
 =========
 
-3.1.0-alpha3 (2015-??-??)
--------------------------
+3.1.1 (????-??-??)
+------------------
+
+* #755: The brower plugin and some operations would break when scheduling and
+  delegation would both be enabled.
+
+
+3.1.0 (2016-01-06)
+------------------
 
 * Better error message when the browser plugin is not enabled.
 * Added a super minimal server example.
@@ -13,7 +20,6 @@ ChangeLog
 * #729: Not all calls to `Sabre\DAV\Tree::getChildren()` were properly cached.
 * #727: Added another workaround to make CalDAV work for Windows 10 clients.
 * #742: Fixes to make sure that vobject 4 is correctly supported.
-* Subtle browser improvements.
 * #726: Better error reporting in `Client::propPatch`. We're now throwing
   exceptions.
 * #608: When a HTTP error is triggered during `Client:propFind`, we're now
@@ -26,6 +32,10 @@ ChangeLog
 * #686: Corrected PDO principal backend's findByURI for email addresses that
   don't match the exact capitalization.
 * #512: The client now has it's own `User-Agent`.
+* #720: Some browser improvements.
+* The zip release ships with [sabre/vobject 4.0.1][vobj],
+  [sabre/http 4.2.1][http], [sabre/event 3.0.0][evnt],
+  [sabre/uri 1.0.1][uri] and [sabre/xml 1.3.0][xml].
 
 
 3.1.0-alpha2 (2015-09-05)
@@ -61,6 +71,12 @@ ChangeLog
   [sabre/uri 1.0.1][uri] and [sabre/xml 1.1.0][xml].
 
 
+3.0.7 (????-??-??)
+------------------
+
+* #752: PHP 7 support for 3.0 branch. (@DeepDiver1975)
+
+
 3.0.6 (2016-01-04)
 ------------------
 
@@ -2133,8 +2149,9 @@ ChangeLog
 
 * First release!
 * Passes litmus: basic, http and copymove test.
-* Fully working in Finder and DavFSv2 Project started: 2007-12-13
+* Fully working in Finder and DavFS2.
 
+Project started: 2007-12-13
 
 [vobj]: http://sabre.io/vobject/
 [evnt]: http://sabre.io/event/

composer.json

@@ -18,7 +18,7 @@
         "sabre/vobject": "~4.0",
         "sabre/event" : ">=2.0.0, <4.0.0",
         "sabre/xml"  : "~1.0",
-        "sabre/http" : "dev-master",
+        "sabre/http" : "^4.2.1",
         "sabre/uri" : "~1.0",
         "ext-dom": "*",
         "ext-pcre": "*",

lib/CalDAV/Plugin.php

@@ -89,16 +89,26 @@ function getHTTPMethods($uri) {
      * Returns the path to a principal's calendar home.
      *
      * The return url must not end with a slash.
+     * This function should return null in case a principal did not have
+     * a calendar home.
      *
      * @param string $principalUrl
      * @return string
      */
     function getCalendarHomeForPrincipal($principalUrl) {
 
-        // The default is a bit naive, but it can be overwritten.
-        list(, $nodeName) = Uri\split($principalUrl);
+        // The default behavior for most sabre/dav servers is that there is a
+        // principals root node, which contains users directly under it.
+        //
+        // This function assumes that there are two components in a principal
+        // path. If there's more, we don't return a calendar home. This
+        // excludes things like the calendar-proxy-read principal (which it
+        // should).
+        $parts = explode('/', trim($principalUrl, '/'));
+        if (count($parts) !== 2) return;
+        if ($parts[0] !== 'principals') return;
 
-        return self::CALENDAR_ROOT . '/' . $nodeName;
+        return self::CALENDAR_ROOT . '/' . $parts[1];
 
     }
 
@@ -329,8 +339,9 @@ function propFind(DAV\PropFind $propFind, DAV\INode $node) {
 
             $propFind->handle('{' . self::NS_CALDAV . '}calendar-home-set', function() use ($principalUrl) {
 
-                $calendarHomePath = $this->getCalendarHomeForPrincipal($principalUrl) . '/';
-                return new Href($calendarHomePath);
+                $calendarHomePath = $this->getCalendarHomeForPrincipal($principalUrl);
+                if (is_null($calendarHomePath)) return null;
+                return new Href($calendarHomePath . '/');
 
             });
             // The calendar-user-address-set property is basically mapped to

lib/CalDAV/Schedule/Plugin.php

@@ -210,6 +210,9 @@ function propFind(PropFind $propFind, INode $node) {
             $propFind->handle('{' . self::NS_CALDAV . '}schedule-outbox-URL', function() use ($principalUrl, $caldavPlugin) {
 
                 $calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
+                if (!$calendarHomePath) {
+                    return null;
+                }
                 $outboxPath = $calendarHomePath . '/outbox/';
 
                 return new Href($outboxPath);
@@ -219,6 +222,9 @@ function propFind(PropFind $propFind, INode $node) {
             $propFind->handle('{' . self::NS_CALDAV . '}schedule-inbox-URL', function() use ($principalUrl, $caldavPlugin) {
 
                 $calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
+                if (!$calendarHomePath) {
+                    return null;
+                }
                 $inboxPath = $calendarHomePath . '/inbox/';
 
                 return new Href($inboxPath);
@@ -231,6 +237,10 @@ function propFind(PropFind $propFind, INode $node) {
                 // meantime we just grab the first calendar in the home-set.
                 $calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
 
+                if (!$calendarHomePath) {
+                    return null;
+                }
+
                 $sccs = '{' . self::NS_CALDAV . '}supported-calendar-component-set';
 
                 $result = $this->server->getPropertiesForPath($calendarHomePath, [

lib/CardDAV/Backend/PDO.php

@@ -151,7 +151,7 @@ function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch) {
      * @param string $principalUri
      * @param string $url Just the 'basename' of the url.
      * @param array $properties
-     * @return void
+     * @return int Last insert id
      */
     function createAddressBook($principalUri, $url, array $properties) {
 

lib/CardDAV/Plugin.php

@@ -188,9 +188,10 @@ function propFindEarly(DAV\PropFind $propFind, DAV\INode $node) {
      *
      * @param string $reportName
      * @param \DOMNode $dom
+     * @param mixed $path
      * @return bool
      */
-    function report($reportName, $dom) {
+    function report($reportName, $dom, $path) {
 
         switch ($reportName) {
             case '{' . self::NS_CARDDAV . '}addressbook-multiget' :

lib/DAV/Version.php

@@ -14,6 +14,6 @@ class Version {
     /**
      * Full version number
      */
-    const VERSION = '3.1.0-alpha2';
+    const VERSION = '3.1.1';
 
 }

lib/DAVACL/Plugin.php

@@ -981,9 +981,10 @@ function propPatch($path, DAV\PropPatch $propPatch) {
      *
      * @param string $reportName
      * @param mixed $report
+     * @param mixed $path
      * @return bool
      */
-    function report($reportName, $report) {
+    function report($reportName, $report, $path) {
 
         switch ($reportName) {
 

lib/DAVACL/Xml/Property/SupportedPrivilegeSet.php

@@ -114,7 +114,7 @@ function toHtml(HtmlOutputHelper $html) {
 
         ob_start();
         echo "<ul class=\"tree\">";
-        $traverse($this->getValue(), '');
+        $traverse($this->getValue());
         echo "</ul>\n";
 
         return ob_get_clean();