[Pkg-owncloud-commits] [php-sabredav] 30/42: Merge branch '2.0' into 2.1

David Prévot taffit at moszumanska.debian.org
Fri Nov 28 22:47:50 UTC 2014


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabredav.

commit a6fc446c42b7a50edf20fb7336a1be9dd7513be4
Merge: e09e276 74e2701
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Wed Nov 19 23:49:40 2014 -0500

    Merge branch '2.0' into 2.1
    
    Conflicts:
    	ChangeLog.md
    	lib/CalDAV/CalendarRoot.php
    	lib/DAV/Version.php

 ChangeLog.md                    | 10 ++++++++++
 bin/migrateto20.php             |  4 +++-
 lib/CalDAV/CalendarRootNode.php |  2 ++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --cc ChangeLog.md
index e4e7d1c,3727de4..f1c9507
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -1,114 -1,16 +1,124 @@@
  ChangeLog
  =========
  
 +2.1.0 (2014-??-??)
 +------------------
 +
 +* #541: CalDAV PDO backend didn't respect overridden PDO table names.
 +* #550: Scheduling invites are no longer delivered into shared calendars.
 +* #554: `calendar-multiget` `REPORT` did not work on inbox items.
 +* #555: The `calendar-timezone` property is now respected for floating times
 +  and all-day events in the `calendar-query`, `calendar-multiget` and
 +  `free-busy-query` REPORTs.
 +* #555: The `calendar-timezone` property is also respected for scheduling
 +  free-busy requests.
 +* #547: CalDAV system too aggressively 'corrects' incoming iCalendar data, and
 +  as a result doesn't return an etag for common cases.
 +* The zip release ships with [sabre/vobject 3.3.4][vobj],
 +  [sabre/http 3.0.2][http], and [sabre/event 2.0.1][evnt].
 +
 +
 +2.1.0-alpha2 (2014-10-23)
 +-------------------------
 +
 +* Added: calendar-user-address-set to default principal search properties
 +  list. This should fix iOS attendee autocomplete support.
 +* Changed: Moved all 'notifications' functionality from `Sabre\CalDAV\Plugin`
 +  to a new plugin: `Sabre\CalDAV\Notifications\Plugin`. If you want to use
 +  notifications-related functionality, just add this plugin.
 +* Changed: Accessing the caldav inbox, outbox or notification collection no
 +  longer triggers getCalendarsForUser() on backends.
 +* #533: New invites are no longer delivered to taks-only calendars.
 +* #538: Added `calendarObjectChange` event.
 +* Scheduling speedups.
 +* #539: added `afterResponse` event. (@joserobleda)
 +* Deprecated: All the "tableName" constructor arguments for all the PDO
 +  backends are now deprecated. They still work, but will be removed in the
 +  next major sabredav version. Every argument that is now deprecated can now
 +  be accessed as a public property on the respective backends.
 +* #529: Added getCalendarObjectByUID to PDO backend, speeding up scheduling
 +  operations on large calendars.
 +* The zip release ships with [sabre/vobject 3.3.3][vobj],
 +  [sabre/http 3.0.2][http], and [sabre/event 2.0.1][evnt].
 +
 +
 +2.1.0-alpha1 (2014-09-23)
 +-------------------------
 +
 +* Added: Support for [rfc6638][rfc6638], also known as CalDAV Scheduling.
 +* Added: Automatically converting between vCard 3, 4 and jCard using the
 +  `Accept:` header, in CardDAV reports, and automatically converting from
 +  jCard to vCard upon `PUT`. It's important to note that your backends _may_
 +  now recieve both vCard 3.0 and 4.0.
 +* Added: #444. Collections can now opt-in to support high-speed `MOVE`.
 +* Changed: PropertyStorage backends now have a `move` method.
 +* Added: `beforeMove`, and `afterMove` events.
 +* Changed: A few database changes for the CalDAV PDO backend. Make sure you
 +  run `bin/migrate21.php` to upgrade your database schema.
 +* Changed: CalDAV backends have a new method: `getCalendarObjectByUID`. This
 +  method MUST be implemented by all backends, but the `AbstractBackend` has a
 +  simple default implementation for this.
 +* Changed: `Sabre\CalDAV\UserCalendars` has been renamed to
 +  `Sabre\CalDAV\CalendarHome`.
 +* Changed: `Sabre\CalDAV\CalendarRootNode` has been renamed to
 +  `Sabre\CalDAV\CalendarRoot`.
 +* Changed: The IMipHandler has been completely removed. With CalDAV scheduling
 +  support, it is no longer needed. It's functionality has been replaced by
 +  `Sabre\CalDAV\Schedule\IMipPlugin`, which can now send emails for clients
 +  other than iCal.
 +* Removed: `Sabre\DAV\ObjectTree` and `Sabre\DAV\Tree\FileSystem`. All this
 +  functionality has been merged into `Sabre\DAV\Tree`.
 +* Changed: PrincipalBackend now has a findByUri method.
 +* Changed: `PrincipalBackend::searchPrincipals` has a new optional `test`
 +  argument.
 +* Added: Support for the `{http://calendarserver.org/ns/}email-address-set`
 +  property.
 +* #460: PropertyStorage must move properties during `MOVE` requests.
 +* Changed: Restructured the zip distribution to be a little bit more lean
 +  and consistent.
 +* #524: Full support for the `test="anyof"` attribute in principal-search
 +  `REPORT`.
 +* #472: Always returning lock tokens in the lockdiscovery property.
 +* Directory entries in the Browser plugin are sorted by type and name.
 +  (@aklomp)
 +* #486: It's now possible to return additional properties when an 'allprop'
 +  PROPFIND request is being done. (@aklomp)
 +* Changed: Now return HTTP errors when an addressbook-query REPORT is done
 +  on a uri that's not a vcard. This should help with debugging this common
 +  mistake.
 +* Changed: `PUT` requests with a `Content-Range` header now emit a 400 status
 +  instead of 501, as per RFC7231.
 +* Added: Browser plugin can now display the contents of the
 +  `{DAV:}supported-privilege-set` property.
 +* Added: Now reporting `CALDAV:max-resource-size`, but we're not actively
 +  restricting it yet.
 +* Changed: CalDAV plugin is now responsible for reporting
 +  `CALDAV:supported-collation-set` and `CALDAV:supported-calendar-data`
 +  properties.
 +* Added: Now reporting `CARDDAV:max-resource-size`, but we're not actively
 +  restricting it yet.
 +* Added: Support for `CARDDAV:supported-collation-set`.
 +* Changed: CardDAV plugin is now responsible for reporting
 +  `CARDDAV:supported-address-data`. This functionality has been removed from
 +  the CardDAV PDO backend.
 +* When a REPORT is not supported, we now emit HTTP error 415, instead of 403.
 +* #348: `HEAD` requests now work wherever `GET` also works.
 +* Changed: Lower priority for the iMip plugins `schedule` event listener.
 +* Added: #523 Custom CalDAV backends can now mark any calendar as read-only.
 +* The zip release ships with [sabre/vobject 3.3.3][vobj],
 +  [sabre/http 3.0.0][http], and [sabre/event 2.0.0][evnt].
 +
 +
+ 2.0.6 (????-??-??)
+ ------------------
+ 
+ * Added `Sabre\CalDAV\CalendarRoot` as an alias for
+   `Sabre\CalDAV\CalendarRootNode`. The latter is going to be deprecated in 2.1,
+   so this makes it slightly easier to write code that works in both branches.
+ * #497: Making sure we're initializing the sync-token field with a value after
+   migration.
+ 
+ 
  2.0.5 (2014-10-14)
  ------------------
  
diff --cc lib/CalDAV/CalendarRootNode.php
index 7d4f9db,8b6b2ca..1feed84
--- a/lib/CalDAV/CalendarRootNode.php
+++ b/lib/CalDAV/CalendarRootNode.php
@@@ -11,6 -13,67 +11,8 @@@ namespace Sabre\CalDAV
   * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
   * @author Evert Pot (http://evertpot.com/)
   * @license http://sabre.io/license/ Modified BSD License
+  * @deprecated This class will be removed in a future version of sabredav.
+  *   Use CalendarRoot instead of this class.
   */
 -class CalendarRootNode extends \Sabre\DAVACL\AbstractPrincipalCollection {
 -
 -    /**
 -     * CalDAV backend
 -     *
 -     * @var Sabre\CalDAV\Backend\BackendInterface
 -     */
 -    protected $caldavBackend;
 -
 -    /**
 -     * Constructor
 -     *
 -     * This constructor needs both an authentication and a caldav backend.
 -     *
 -     * By default this class will show a list of calendar collections for
 -     * principals in the 'principals' collection. If your main principals are
 -     * actually located in a different path, use the $principalPrefix argument
 -     * to override this.
 -     *
 -     * @param PrincipalBackend\BackendInterface $principalBackend
 -     * @param Backend\BackendInterface $caldavBackend
 -     * @param string $principalPrefix
 -     */
 -    public function __construct(PrincipalBackend\BackendInterface $principalBackend,Backend\BackendInterface $caldavBackend, $principalPrefix = 'principals') {
 -
 -        parent::__construct($principalBackend, $principalPrefix);
 -        $this->caldavBackend = $caldavBackend;
 -
 -    }
 -
 -    /**
 -     * Returns the nodename
 -     *
 -     * We're overriding this, because the default will be the 'principalPrefix',
 -     * and we want it to be Sabre\CalDAV\Plugin::CALENDAR_ROOT
 -     *
 -     * @return string
 -     */
 -    public function getName() {
 -
 -        return Plugin::CALENDAR_ROOT;
 -
 -    }
 -
 -    /**
 -     * This method returns a node for a principal.
 -     *
 -     * The passed array contains principal information, and is guaranteed to
 -     * at least contain a uri item. Other properties may or may not be
 -     * supplied by the authentication backend.
 -     *
 -     * @param array $principal
 -     * @return \Sabre\DAV\INode
 -     */
 -    public function getChildForPrincipal(array $principal) {
 -
 -        return new UserCalendars($this->caldavBackend, $principal);
 -
 -    }
 -
 +class CalendarRootNode extends CalendarRoot {
  }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git



More information about the Pkg-owncloud-commits mailing list