[Pkg-owncloud-commits] [php-sabredav] 42/275: Merge branch 'master' into calendar-auto-schedule
David Prévot
taffit at moszumanska.debian.org
Thu Sep 25 14:55:49 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 f167b4b9f47fca2d1d0e9326fc23d01953f4b9f2
Merge: 5077c60 dbbc25c
Author: Evert Pot <evert at rooftopsolutions.nl>
Date: Sun Apr 20 20:21:12 2014 -0400
Merge branch 'master' into calendar-auto-schedule
Conflicts:
lib/Sabre/DAVACL/Principal.php
.gitignore | 35 +-
.travis.yml | 2 +-
ChangeLog.md | 12 +-
composer.json | 2 +-
lib/Sabre/CalDAV/Backend/AbstractBackend.php | 44 +--
lib/Sabre/CalDAV/Backend/BackendInterface.php | 42 +--
lib/Sabre/CalDAV/Backend/NotificationSupport.php | 2 +-
lib/Sabre/CalDAV/Backend/PDO.php | 225 ++++---------
lib/Sabre/CalDAV/Backend/SharingSupport.php | 2 +-
lib/Sabre/CalDAV/Backend/SubscriptionSupport.php | 44 +--
lib/Sabre/CalDAV/Backend/SyncSupport.php | 2 +-
lib/Sabre/CalDAV/Calendar.php | 21 +-
lib/Sabre/CalDAV/CalendarObject.php | 2 +-
lib/Sabre/CalDAV/CalendarQueryParser.php | 2 +-
lib/Sabre/CalDAV/CalendarQueryValidator.php | 2 +-
lib/Sabre/CalDAV/CalendarRootNode.php | 2 +-
.../CalDAV/Exception/InvalidComponentType.php | 2 +-
lib/Sabre/CalDAV/ICSExportPlugin.php | 2 +-
lib/Sabre/CalDAV/ICalendar.php | 2 +-
lib/Sabre/CalDAV/ICalendarObject.php | 2 +-
lib/Sabre/CalDAV/IShareableCalendar.php | 2 +-
lib/Sabre/CalDAV/ISharedCalendar.php | 2 +-
lib/Sabre/CalDAV/Notifications/Collection.php | 2 +-
lib/Sabre/CalDAV/Notifications/ICollection.php | 2 +-
lib/Sabre/CalDAV/Notifications/INode.php | 2 +-
.../CalDAV/Notifications/INotificationType.php | 2 +-
lib/Sabre/CalDAV/Notifications/Node.php | 2 +-
.../CalDAV/Notifications/Notification/Invite.php | 2 +-
.../Notifications/Notification/InviteReply.php | 2 +-
.../Notifications/Notification/SystemStatus.php | 2 +-
lib/Sabre/CalDAV/Plugin.php | 3 +-
lib/Sabre/CalDAV/Principal/Collection.php | 2 +-
lib/Sabre/CalDAV/Principal/IProxyRead.php | 2 +-
lib/Sabre/CalDAV/Principal/IProxyWrite.php | 2 +-
lib/Sabre/CalDAV/Principal/ProxyRead.php | 2 +-
lib/Sabre/CalDAV/Principal/ProxyWrite.php | 2 +-
lib/Sabre/CalDAV/Principal/User.php | 2 +-
lib/Sabre/CalDAV/Property/AllowedSharingModes.php | 2 +-
lib/Sabre/CalDAV/Property/Invite.php | 2 +-
.../CalDAV/Property/ScheduleCalendarTransp.php | 2 +-
.../Property/SupportedCalendarComponentSet.php | 2 +-
.../CalDAV/Property/SupportedCalendarData.php | 2 +-
.../CalDAV/Property/SupportedCollationSet.php | 2 +-
lib/Sabre/CalDAV/Schedule/IMip.php | 2 +-
lib/Sabre/CalDAV/Schedule/IOutbox.php | 2 +-
lib/Sabre/CalDAV/Schedule/Outbox.php | 2 +-
lib/Sabre/CalDAV/ShareableCalendar.php | 2 +-
lib/Sabre/CalDAV/SharedCalendar.php | 2 +-
lib/Sabre/CalDAV/SharingPlugin.php | 39 +--
lib/Sabre/CalDAV/Subscriptions/ISubscription.php | 2 +-
lib/Sabre/CalDAV/Subscriptions/Plugin.php | 2 +-
lib/Sabre/CalDAV/Subscriptions/Subscription.php | 48 +--
lib/Sabre/CalDAV/UserCalendars.php | 2 +-
lib/Sabre/CardDAV/AddressBook.php | 48 +--
lib/Sabre/CardDAV/AddressBookQueryParser.php | 10 +-
lib/Sabre/CardDAV/AddressBookRoot.php | 2 +-
lib/Sabre/CardDAV/Backend/AbstractBackend.php | 2 +-
lib/Sabre/CardDAV/Backend/BackendInterface.php | 23 +-
lib/Sabre/CardDAV/Backend/PDO.php | 92 +++---
lib/Sabre/CardDAV/Backend/SyncSupport.php | 2 +-
lib/Sabre/CardDAV/Card.php | 2 +-
lib/Sabre/CardDAV/IAddressBook.php | 2 +-
lib/Sabre/CardDAV/ICard.php | 2 +-
lib/Sabre/CardDAV/IDirectory.php | 2 +-
lib/Sabre/CardDAV/Plugin.php | 55 ++--
.../CardDAV/Property/SupportedAddressData.php | 2 +-
lib/Sabre/CardDAV/UserAddressBooks.php | 2 +-
lib/Sabre/CardDAV/VCFExportPlugin.php | 2 +-
lib/Sabre/DAV/Auth/Backend/AbstractBasic.php | 2 +-
lib/Sabre/DAV/Auth/Backend/AbstractDigest.php | 2 +-
lib/Sabre/DAV/Auth/Backend/Apache.php | 2 +-
lib/Sabre/DAV/Auth/Backend/BackendInterface.php | 2 +-
lib/Sabre/DAV/Auth/Backend/BasicCallBack.php | 2 +-
lib/Sabre/DAV/Auth/Backend/File.php | 2 +-
lib/Sabre/DAV/Auth/Backend/PDO.php | 2 +-
lib/Sabre/DAV/Auth/Plugin.php | 2 +-
lib/Sabre/DAV/Browser/GuessContentType.php | 2 +-
lib/Sabre/DAV/Browser/MapGetToPropFind.php | 2 +-
lib/Sabre/DAV/Browser/Plugin.php | 4 +-
lib/Sabre/DAV/Client.php | 6 +-
lib/Sabre/DAV/Collection.php | 2 +-
lib/Sabre/DAV/CorePlugin.php | 74 ++++-
lib/Sabre/DAV/Exception.php | 2 +-
lib/Sabre/DAV/Exception/BadRequest.php | 2 +-
lib/Sabre/DAV/Exception/Conflict.php | 2 +-
lib/Sabre/DAV/Exception/ConflictingLock.php | 2 +-
lib/Sabre/DAV/Exception/FileNotFound.php | 2 +-
lib/Sabre/DAV/Exception/Forbidden.php | 2 +-
lib/Sabre/DAV/Exception/InsufficientStorage.php | 2 +-
lib/Sabre/DAV/Exception/InvalidResourceType.php | 2 +-
lib/Sabre/DAV/Exception/InvalidSyncToken.php | 2 +-
.../DAV/Exception/LockTokenMatchesRequestUri.php | 2 +-
lib/Sabre/DAV/Exception/Locked.php | 2 +-
lib/Sabre/DAV/Exception/MethodNotAllowed.php | 2 +-
lib/Sabre/DAV/Exception/NotAuthenticated.php | 2 +-
lib/Sabre/DAV/Exception/NotFound.php | 2 +-
lib/Sabre/DAV/Exception/NotImplemented.php | 2 +-
lib/Sabre/DAV/Exception/PaymentRequired.php | 2 +-
lib/Sabre/DAV/Exception/PreconditionFailed.php | 2 +-
lib/Sabre/DAV/Exception/ReportNotSupported.php | 2 +-
.../DAV/Exception/RequestedRangeNotSatisfiable.php | 2 +-
lib/Sabre/DAV/Exception/ServiceUnavailable.php | 2 +-
lib/Sabre/DAV/Exception/TooMuchMatches.php | 2 +-
lib/Sabre/DAV/Exception/UnsupportedMediaType.php | 2 +-
lib/Sabre/DAV/FS/Directory.php | 2 +-
lib/Sabre/DAV/FS/File.php | 2 +-
lib/Sabre/DAV/FS/Node.php | 2 +-
lib/Sabre/DAV/FSExt/Directory.php | 2 +-
lib/Sabre/DAV/FSExt/File.php | 9 +-
lib/Sabre/DAV/FSExt/Node.php | 64 ++--
lib/Sabre/DAV/File.php | 2 +-
lib/Sabre/DAV/ICollection.php | 2 +-
lib/Sabre/DAV/IExtendedCollection.php | 2 +-
lib/Sabre/DAV/IFile.php | 2 +-
lib/Sabre/DAV/IMultiGet.php | 2 +-
lib/Sabre/DAV/INode.php | 2 +-
lib/Sabre/DAV/IProperties.php | 43 +--
lib/Sabre/DAV/IQuota.php | 2 +-
lib/Sabre/DAV/Locks/Backend/AbstractBackend.php | 2 +-
lib/Sabre/DAV/Locks/Backend/BackendInterface.php | 2 +-
lib/Sabre/DAV/Locks/Backend/FS.php | 5 +-
lib/Sabre/DAV/Locks/Backend/File.php | 5 +-
lib/Sabre/DAV/Locks/Backend/PDO.php | 2 +-
lib/Sabre/DAV/Locks/LockInfo.php | 2 +-
lib/Sabre/DAV/Locks/Plugin.php | 37 ++-
lib/Sabre/DAV/Mount/Plugin.php | 2 +-
lib/Sabre/DAV/Node.php | 2 +-
lib/Sabre/DAV/ObjectTree.php | 2 +-
lib/Sabre/DAV/PartialUpdate/IFile.php | 2 +-
lib/Sabre/DAV/PartialUpdate/Plugin.php | 14 +-
lib/Sabre/DAV/PropPatch.php | 344 ++++++++++++++++++++
lib/Sabre/DAV/Property.php | 2 +-
lib/Sabre/DAV/Property/GetLastModified.php | 2 +-
lib/Sabre/DAV/Property/Href.php | 2 +-
lib/Sabre/DAV/Property/HrefList.php | 2 +-
lib/Sabre/DAV/Property/IHref.php | 2 +-
lib/Sabre/DAV/Property/LockDiscovery.php | 2 +-
lib/Sabre/DAV/Property/ResourceType.php | 10 +-
lib/Sabre/DAV/Property/Response.php | 2 +-
lib/Sabre/DAV/Property/ResponseList.php | 2 +-
lib/Sabre/DAV/Property/SupportedLock.php | 2 +-
lib/Sabre/DAV/Property/SupportedReportSet.php | 2 +-
lib/Sabre/DAV/PropertyInterface.php | 2 +-
lib/Sabre/DAV/Server.php | 182 +++--------
lib/Sabre/DAV/ServerPlugin.php | 2 +-
lib/Sabre/DAV/SimpleCollection.php | 9 +-
lib/Sabre/DAV/SimpleFile.php | 2 +-
lib/Sabre/DAV/StringUtil.php | 2 +-
lib/Sabre/DAV/Sync/ISyncCollection.php | 2 +-
lib/Sabre/DAV/Sync/Plugin.php | 9 +-
lib/Sabre/DAV/TemporaryFileFilterPlugin.php | 2 +-
lib/Sabre/DAV/Tree.php | 8 +-
lib/Sabre/DAV/Tree/Filesystem.php | 2 +-
lib/Sabre/DAV/URLUtil.php | 2 +-
lib/Sabre/DAV/UUIDUtil.php | 2 +-
lib/Sabre/DAV/Version.php | 4 +-
lib/Sabre/DAV/XMLUtil.php | 2 +-
lib/Sabre/DAVACL/AbstractPrincipalCollection.php | 2 +-
lib/Sabre/DAVACL/Exception/AceConflict.php | 2 +-
lib/Sabre/DAVACL/Exception/NeedPrivileges.php | 2 +-
lib/Sabre/DAVACL/Exception/NoAbstract.php | 2 +-
.../DAVACL/Exception/NotRecognizedPrincipal.php | 2 +-
.../DAVACL/Exception/NotSupportedPrivilege.php | 2 +-
lib/Sabre/DAVACL/IACL.php | 2 +-
lib/Sabre/DAVACL/IPrincipal.php | 2 +-
lib/Sabre/DAVACL/IPrincipalCollection.php | 4 +-
lib/Sabre/DAVACL/Plugin.php | 62 ++--
lib/Sabre/DAVACL/Principal.php | 22 +-
.../DAVACL/PrincipalBackend/AbstractBackend.php | 2 +-
.../DAVACL/PrincipalBackend/BackendInterface.php | 52 +--
lib/Sabre/DAVACL/PrincipalBackend/PDO.php | 113 ++-----
lib/Sabre/DAVACL/PrincipalCollection.php | 2 +-
lib/Sabre/DAVACL/Property/Acl.php | 2 +-
lib/Sabre/DAVACL/Property/AclRestrictions.php | 2 +-
.../DAVACL/Property/CurrentUserPrivilegeSet.php | 2 +-
lib/Sabre/DAVACL/Property/Principal.php | 2 +-
.../DAVACL/Property/SupportedPrivilegeSet.php | 2 +-
lib/Sabre/autoload.php | 2 +-
tests/Sabre/CalDAV/Backend/AbstractPDOTest.php | 53 +--
tests/Sabre/CalDAV/Backend/AbstractTest.php | 10 +-
tests/Sabre/CalDAV/Backend/Mock.php | 42 ---
.../CalDAV/Backend/MockSubscriptionSupport.php | 53 +--
tests/Sabre/CalDAV/CalendarTest.php | 9 +-
.../CalDAV/ExpandEventsDTSTARTandDTENDTest.php | 2 +-
.../ExpandEventsDTSTARTandDTENDbyDayTest.php | 2 +-
.../Sabre/CalDAV/ExpandEventsDoubleEventsTest.php | 2 +-
tests/Sabre/CalDAV/GetEventsByTimerangeTest.php | 2 +-
tests/Sabre/CalDAV/Issue203Test.php | 2 +-
tests/Sabre/CalDAV/Issue205Test.php | 2 +-
tests/Sabre/CalDAV/Issue211Test.php | 2 +-
tests/Sabre/CalDAV/Issue220Test.php | 2 +-
tests/Sabre/CalDAV/Issue228Test.php | 2 +-
tests/Sabre/CalDAV/Schedule/IMip/Mock.php | 2 +-
tests/Sabre/CalDAV/SharingPluginTest.php | 12 +-
.../CalDAV/Subscriptions/SubscriptionTest.php | 7 +-
.../CalDAV/UserCalendarsSharedCalendarsTest.php | 1 -
tests/Sabre/CalDAV/UserCalendarsTest.php | 1 -
tests/Sabre/CardDAV/AddressBookTest.php | 9 +-
tests/Sabre/CardDAV/Backend/AbstractPDOTest.php | 22 +-
tests/Sabre/CardDAV/Backend/Mock.php | 30 +-
tests/Sabre/CardDAV/PluginTest.php | 10 +-
tests/Sabre/DAV/FSExt/NodeTest.php | 35 +-
tests/Sabre/DAV/GetIfConditionsTest.php | 51 +--
tests/Sabre/DAV/HTTPPreferParsingTest.php | 9 +-
tests/Sabre/DAV/Locks/MSWordTest.php | 2 +-
tests/Sabre/DAV/Locks/PluginTest.php | 22 +-
tests/Sabre/DAV/Mock/PropertiesCollection.php | 96 ++++++
tests/Sabre/DAV/PartialUpdate/PluginTest.php | 16 +
tests/Sabre/DAV/PropPatchTest.php | 357 +++++++++++++++++++++
tests/Sabre/DAV/Property/ResourceTypeTest.php | 6 -
.../Sabre/DAV/Property/SupportedReportSetTest.php | 2 -
tests/Sabre/DAV/ServerPluginTest.php | 1 -
tests/Sabre/DAV/ServerPreconditionTest.php | 117 +++----
tests/Sabre/DAV/ServerPropsInfiniteDepthTest.php | 214 ------------
tests/Sabre/DAV/ServerPropsTest.php | 76 +----
tests/Sabre/DAV/ServerSimpleTest.php | 5 -
tests/Sabre/DAV/ServerUpdatePropertiesTest.php | 51 ++-
tests/Sabre/DAV/Sync/MockSyncCollection.php | 2 +-
tests/Sabre/DAV/TreeTest.php | 21 +-
tests/Sabre/DAVACL/ExpandPropertiesTest.php | 59 +---
tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php | 24 +-
.../DAVACL/PrincipalBackend/AbstractPDOTest.php | 28 +-
tests/Sabre/DAVACL/PrincipalBackend/Mock.php | 71 ++--
tests/Sabre/DAVACL/PrincipalTest.php | 8 +-
tests/Sabre/DAVServerTest.php | 3 +-
tests/Sabre/HTTP/ResponseMock.php | 2 +-
tests/Sabre/HTTP/SapiMock.php | 2 +-
227 files changed, 1868 insertions(+), 1794 deletions(-)
diff --cc lib/Sabre/CalDAV/Backend/PDO.php
index 14db6fd,5ca22fd..5e2ca84
mode 100755,100644..100755
--- a/lib/Sabre/CalDAV/Backend/PDO.php
+++ b/lib/Sabre/CalDAV/Backend/PDO.php
@@@ -16,9 -16,9 +16,9 @@@ us
*
* @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ * @license http://sabre.io/license/ Modified BSD License
*/
-class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport {
+class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, SchedulingSupport {
/**
* We need to specify a max date, because we need to stop *somewhere*
diff --cc lib/Sabre/CalDAV/Calendar.php
index 424da50,de008f2..135bb90
--- a/lib/Sabre/CalDAV/Calendar.php
+++ b/lib/Sabre/CalDAV/Calendar.php
@@@ -14,9 -15,9 +15,9 @@@ us
*
* @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ * @license http://sabre.io/license/ Modified BSD License
*/
-class Calendar implements ICalendar, DAV\IProperties, DAVACL\IACL, DAV\Sync\ISyncCollection, DAV\IMultiGet {
+class Calendar implements ICalendar, DAV\IProperties, DAV\Sync\ISyncCollection, DAV\IMultiGet {
/**
* This is an array with calendar information
diff --cc lib/Sabre/CalDAV/ICalendar.php
index 052221d,0f05470..d09ee24
--- a/lib/Sabre/CalDAV/ICalendar.php
+++ b/lib/Sabre/CalDAV/ICalendar.php
@@@ -13,9 -10,27 +13,9 @@@ us
*
* @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ * @license http://sabre.io/license/ Modified BSD License
*/
-interface ICalendar extends DAV\ICollection {
+interface ICalendar extends ICalendarObjectContainer, DAVACL\IACL {
- /**
- * Performs a calendar-query on the contents of this calendar.
- *
- * The calendar-query is defined in RFC4791 : CalDAV. Using the
- * calendar-query it is possible for a client to request a specific set of
- * object, based on contents of iCalendar properties, date-ranges and
- * iCalendar component types (VTODO, VEVENT).
- *
- * This method should just return a list of (relative) urls that match this
- * query.
- *
- * The list of filters are specified as an array. The exact array is
- * documented by \Sabre\CalDAV\CalendarQueryParser.
- *
- * @param array $filters
- * @return array
- */
- public function calendarQuery(array $filters);
}
--
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