[Pkg-owncloud-commits] [php-sabredav] 24/45: Merge branch '1.8' into 2.0
David Prévot
taffit at moszumanska.debian.org
Sat Jan 10 14:20:33 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository php-sabredav.
commit 76f447526012bed6b762a04e60943a093068d80a
Merge: 5fd12cb fd23cfa
Author: Evert Pot <me at evertpot.com>
Date: Fri Jan 2 18:22:26 2015 -0500
Merge branch '1.8' into 2.0
Conflicts:
lib/Sabre/CalDAV/ICSExportPlugin.php
lib/Sabre/CalDAV/Version.php
lib/Sabre/CardDAV/Backend/AbstractBackend.php
lib/Sabre/CardDAV/Backend/PDO.php
lib/Sabre/CardDAV/Version.php
lib/Sabre/DAV/Browser/Plugin.php
lib/Sabre/DAV/Client.php
lib/Sabre/DAV/IProperties.php
lib/Sabre/DAV/Locks/Plugin.php
lib/Sabre/DAV/Property/ResponseList.php
lib/Sabre/DAV/PropertyInterface.php
lib/Sabre/DAV/Server.php
lib/Sabre/DAV/URLUtil.php
lib/Sabre/DAVACL/Version.php
lib/Sabre/HTTP/AWSAuth.php
lib/Sabre/HTTP/AbstractAuth.php
lib/Sabre/HTTP/BasicAuth.php
lib/Sabre/HTTP/DigestAuth.php
lib/Sabre/HTTP/Request.php
lib/Sabre/HTTP/Response.php
lib/Sabre/HTTP/Util.php
lib/Sabre/HTTP/Version.php
lib/Sabre/autoload.php
tests/Sabre/CalDAV/Issue203Test.php
LICENSE | 2 +-
lib/CalDAV/Backend/AbstractBackend.php | 2 +-
lib/CalDAV/Backend/BackendInterface.php | 2 +-
lib/CalDAV/Backend/NotificationSupport.php | 2 +-
lib/CalDAV/Backend/PDO.php | 2 +-
lib/CalDAV/Backend/SharingSupport.php | 2 +-
lib/CalDAV/Calendar.php | 2 +-
lib/CalDAV/CalendarObject.php | 2 +-
lib/CalDAV/CalendarQueryParser.php | 2 +-
lib/CalDAV/CalendarQueryValidator.php | 2 +-
lib/CalDAV/CalendarRootNode.php | 2 +-
lib/CalDAV/Exception/InvalidComponentType.php | 2 +-
lib/CalDAV/ICalendar.php | 2 +-
lib/CalDAV/ICalendarObject.php | 2 +-
lib/CalDAV/IShareableCalendar.php | 2 +-
lib/CalDAV/ISharedCalendar.php | 2 +-
lib/CalDAV/Notifications/Collection.php | 2 +-
lib/CalDAV/Notifications/ICollection.php | 2 +-
lib/CalDAV/Notifications/INode.php | 2 +-
lib/CalDAV/Notifications/INotificationType.php | 2 +-
lib/CalDAV/Notifications/Node.php | 2 +-
lib/CalDAV/Notifications/Notification/Invite.php | 2 +-
lib/CalDAV/Notifications/Notification/InviteReply.php | 2 +-
lib/CalDAV/Notifications/Notification/SystemStatus.php | 2 +-
lib/CalDAV/Plugin.php | 2 +-
lib/CalDAV/Principal/Collection.php | 2 +-
lib/CalDAV/Principal/IProxyRead.php | 2 +-
lib/CalDAV/Principal/IProxyWrite.php | 2 +-
lib/CalDAV/Principal/ProxyRead.php | 2 +-
lib/CalDAV/Principal/ProxyWrite.php | 2 +-
lib/CalDAV/Principal/User.php | 2 +-
lib/CalDAV/Property/AllowedSharingModes.php | 2 +-
lib/CalDAV/Property/Invite.php | 2 +-
lib/CalDAV/Property/ScheduleCalendarTransp.php | 2 +-
lib/CalDAV/Property/SupportedCalendarComponentSet.php | 2 +-
lib/CalDAV/Property/SupportedCalendarData.php | 2 +-
lib/CalDAV/Property/SupportedCollationSet.php | 2 +-
lib/CalDAV/Schedule/IMip.php | 2 +-
lib/CalDAV/Schedule/IOutbox.php | 2 +-
lib/CalDAV/Schedule/Outbox.php | 2 +-
lib/CalDAV/ShareableCalendar.php | 2 +-
lib/CalDAV/SharedCalendar.php | 2 +-
lib/CalDAV/SharingPlugin.php | 2 +-
lib/CalDAV/UserCalendars.php | 2 +-
lib/CardDAV/AddressBook.php | 2 +-
lib/CardDAV/AddressBookQueryParser.php | 2 +-
lib/CardDAV/AddressBookRoot.php | 2 +-
lib/CardDAV/Backend/BackendInterface.php | 2 +-
lib/CardDAV/Card.php | 2 +-
lib/CardDAV/IAddressBook.php | 2 +-
lib/CardDAV/ICard.php | 2 +-
lib/CardDAV/IDirectory.php | 2 +-
lib/CardDAV/Plugin.php | 2 +-
lib/CardDAV/Property/SupportedAddressData.php | 2 +-
lib/CardDAV/UserAddressBooks.php | 2 +-
lib/CardDAV/VCFExportPlugin.php | 2 +-
lib/DAV/Auth/Backend/AbstractBasic.php | 2 +-
lib/DAV/Auth/Backend/AbstractDigest.php | 2 +-
lib/DAV/Auth/Backend/Apache.php | 2 +-
lib/DAV/Auth/Backend/BackendInterface.php | 2 +-
lib/DAV/Auth/Backend/File.php | 2 +-
lib/DAV/Auth/Backend/PDO.php | 2 +-
lib/DAV/Auth/Plugin.php | 2 +-
lib/DAV/Browser/GuessContentType.php | 2 +-
lib/DAV/Browser/MapGetToPropFind.php | 2 +-
lib/DAV/Collection.php | 2 +-
lib/DAV/Exception.php | 2 +-
lib/DAV/Exception/BadRequest.php | 2 +-
lib/DAV/Exception/Conflict.php | 2 +-
lib/DAV/Exception/ConflictingLock.php | 2 +-
lib/DAV/Exception/FileNotFound.php | 2 +-
lib/DAV/Exception/Forbidden.php | 2 +-
lib/DAV/Exception/InsufficientStorage.php | 2 +-
lib/DAV/Exception/InvalidResourceType.php | 2 +-
lib/DAV/Exception/LengthRequired.php | 2 +-
lib/DAV/Exception/LockTokenMatchesRequestUri.php | 2 +-
lib/DAV/Exception/Locked.php | 2 +-
lib/DAV/Exception/MethodNotAllowed.php | 2 +-
lib/DAV/Exception/NotAuthenticated.php | 2 +-
lib/DAV/Exception/NotFound.php | 2 +-
lib/DAV/Exception/NotImplemented.php | 2 +-
lib/DAV/Exception/PaymentRequired.php | 2 +-
lib/DAV/Exception/PreconditionFailed.php | 2 +-
lib/DAV/Exception/ReportNotSupported.php | 2 +-
lib/DAV/Exception/RequestedRangeNotSatisfiable.php | 2 +-
lib/DAV/Exception/ServiceUnavailable.php | 2 +-
lib/DAV/Exception/UnsupportedMediaType.php | 2 +-
lib/DAV/FS/Directory.php | 2 +-
lib/DAV/FS/File.php | 2 +-
lib/DAV/FS/Node.php | 2 +-
lib/DAV/FSExt/Directory.php | 2 +-
lib/DAV/FSExt/File.php | 2 +-
lib/DAV/FSExt/Node.php | 2 +-
lib/DAV/File.php | 2 +-
lib/DAV/ICollection.php | 2 +-
lib/DAV/IExtendedCollection.php | 2 +-
lib/DAV/IFile.php | 2 +-
lib/DAV/INode.php | 2 +-
lib/DAV/IQuota.php | 2 +-
lib/DAV/Locks/Backend/AbstractBackend.php | 2 +-
lib/DAV/Locks/Backend/BackendInterface.php | 2 +-
lib/DAV/Locks/Backend/FS.php | 2 +-
lib/DAV/Locks/Backend/File.php | 2 +-
lib/DAV/Locks/Backend/PDO.php | 2 +-
lib/DAV/Locks/LockInfo.php | 2 +-
lib/DAV/Mount/Plugin.php | 2 +-
lib/DAV/Node.php | 2 +-
lib/DAV/ObjectTree.php | 2 +-
lib/DAV/PartialUpdate/IFile.php | 2 +-
lib/DAV/PartialUpdate/IPatchSupport.php | 2 +-
lib/DAV/PartialUpdate/Plugin.php | 2 +-
lib/DAV/Property.php | 2 +-
lib/DAV/Property/GetLastModified.php | 2 +-
lib/DAV/Property/Href.php | 2 +-
lib/DAV/Property/HrefList.php | 2 +-
lib/DAV/Property/IHref.php | 2 +-
lib/DAV/Property/LockDiscovery.php | 2 +-
lib/DAV/Property/ResourceType.php | 2 +-
lib/DAV/Property/Response.php | 2 +-
lib/DAV/Property/SupportedLock.php | 2 +-
lib/DAV/Property/SupportedReportSet.php | 2 +-
lib/DAV/ServerPlugin.php | 2 +-
lib/DAV/SimpleCollection.php | 2 +-
lib/DAV/SimpleFile.php | 2 +-
lib/DAV/StringUtil.php | 2 +-
lib/DAV/TemporaryFileFilterPlugin.php | 2 +-
lib/DAV/Tree.php | 2 +-
lib/DAV/Tree/Filesystem.php | 2 +-
lib/DAV/UUIDUtil.php | 2 +-
lib/DAV/Version.php | 2 +-
lib/DAV/XMLUtil.php | 2 +-
lib/DAVACL/AbstractPrincipalCollection.php | 2 +-
lib/DAVACL/Exception/AceConflict.php | 2 +-
lib/DAVACL/Exception/NeedPrivileges.php | 2 +-
lib/DAVACL/Exception/NoAbstract.php | 2 +-
lib/DAVACL/Exception/NotRecognizedPrincipal.php | 2 +-
lib/DAVACL/Exception/NotSupportedPrivilege.php | 2 +-
lib/DAVACL/IACL.php | 2 +-
lib/DAVACL/IPrincipal.php | 2 +-
lib/DAVACL/IPrincipalCollection.php | 2 +-
lib/DAVACL/Plugin.php | 2 +-
lib/DAVACL/Principal.php | 2 +-
lib/DAVACL/PrincipalBackend/AbstractBackend.php | 2 +-
lib/DAVACL/PrincipalBackend/BackendInterface.php | 2 +-
lib/DAVACL/PrincipalBackend/PDO.php | 2 +-
lib/DAVACL/PrincipalCollection.php | 2 +-
lib/DAVACL/Property/Acl.php | 2 +-
lib/DAVACL/Property/AclRestrictions.php | 2 +-
lib/DAVACL/Property/CurrentUserPrivilegeSet.php | 2 +-
lib/DAVACL/Property/Principal.php | 2 +-
lib/DAVACL/Property/SupportedPrivilegeSet.php | 2 +-
tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php | 2 +-
tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php | 2 +-
tests/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/DAV/HttpDeleteTest.php | 2 +-
tests/Sabre/DAV/HttpPutTest.php | 2 +-
tests/Sabre/DAV/Mock/Collection.php | 2 +-
tests/Sabre/DAV/Mock/File.php | 2 +-
tests/Sabre/DAVServerTest.php | 2 +-
166 files changed, 166 insertions(+), 166 deletions(-)
diff --cc lib/CalDAV/CalendarRootNode.php
index 8b6b2ca,905155a..cafe622
--- a/lib/CalDAV/CalendarRootNode.php
+++ b/lib/CalDAV/CalendarRootNode.php
@@@ -10,11 -10,9 +10,11 @@@ use Sabre\DAVACL\PrincipalBackend
* This object is responsible for generating a list of calendar-homes for each
* user.
*
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2015 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 {
diff --cc lib/CalDAV/UserCalendars.php
index 0dec127,e2bc36f..58e6c4c
--- a/lib/CalDAV/UserCalendars.php
+++ b/lib/CalDAV/UserCalendars.php
@@@ -2,15 -2,13 +2,15 @@@
namespace Sabre\CalDAV;
-use Sabre\DAV;
-use Sabre\DAVACL;
+use
+ Sabre\DAV,
+ Sabre\DAVACL,
+ Sabre\HTTP\URLUtil;
/**
- * The UserCalenders class contains all calendars associated to one user
+ * The UserCalendars class contains all calendars associated to one user
*
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2015 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://sabre.io/license/ Modified BSD License
*/
diff --cc lib/DAV/Auth/Backend/PDO.php
index a4e4883,1a057e2..8d33b3b
--- a/lib/DAV/Auth/Backend/PDO.php
+++ b/lib/DAV/Auth/Backend/PDO.php
@@@ -3,9 -3,11 +3,9 @@@
namespace Sabre\DAV\Auth\Backend;
/**
- * This is an authentication backend that uses a file to manage passwords.
- *
- * The backend file must conform to Apache's htdigest format
+ * This is an authentication backend that uses a database to manage passwords.
*
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2015 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://sabre.io/license/ Modified BSD License
*/
diff --cc lib/DAV/Locks/Backend/File.php
index 17c40b8,891aa21..b45f216
--- a/lib/DAV/Locks/Backend/File.php
+++ b/lib/DAV/Locks/Backend/File.php
@@@ -5,15 -5,14 +5,15 @@@ namespace Sabre\DAV\Locks\Backend
use Sabre\DAV\Locks\LockInfo;
/**
- * The Lock manager allows you to handle all file-locks centrally.
+ * This Locks backend stores all locking information in a single file.
*
- * This Lock Manager stores all its data in a single file.
+ * Note that this is not nearly as robust as a database. If you are considering
+ * using this backend, keep in mind that the PDO backend can work with SqLite,
+ * which is designed to be a good file-based database.
*
- * Note that this is not nearly as robust as a database, you are encouraged
- * to use the PDO backend instead.
+ * It literally solves the problem this class solves as well, but much better.
*
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2015 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://sabre.io/license/ Modified BSD License
*/
diff --cc tests/Sabre/CalDAV/Issue203Test.php
index 36459f2,dbb3411..80ffe8f
--- a/tests/Sabre/CalDAV/Issue203Test.php
+++ b/tests/Sabre/CalDAV/Issue203Test.php
@@@ -7,7 -7,8 +7,7 @@@ use Sabre\VObject
/**
* This unittest is created to find out why an overwritten DAILY event has wrong DTSTART, DTEND, SUMMARY and RECURRENCEID
*
- * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
- *
+ * @copyright Copyright (C) 2007-2015 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://sabre.io/license/ Modified BSD License
*/
diff --cc tests/Sabre/CalDAV/Schedule/IMip/Mock.php
index c4e9ebb,9906146..e73ca88
--- a/tests/Sabre/CalDAV/Schedule/IMip/Mock.php
+++ b/tests/Sabre/CalDAV/Schedule/IMip/Mock.php
@@@ -5,14 -5,14 +5,14 @@@ namespace Sabre\CalDAV\Schedule\IMip
/**
* iMIP handler.
*
- * This class is responsible for sending out iMIP messages. iMIP is the
- * email-based transport for iTIP. iTIP deals with scheduling operations for
+ * This class is responsible for sending out iMIP messages. iMIP is the
+ * email-based transport for iTIP. iTIP deals with scheduling operations for
* iCalendar objects.
*
- * If you want to customize the email that gets sent out, you can do so by
+ * If you want to customize the email that gets sent out, you can do so by
* extending this class and overriding the sendMessage method.
*
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2015 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://sabre.io/license/ Modified BSD License
*/
diff --cc tests/Sabre/DAV/HttpPutTest.php
index 874c028,625b230..da9f8c1
--- a/tests/Sabre/DAV/HttpPutTest.php
+++ b/tests/Sabre/DAV/HttpPutTest.php
@@@ -8,9 -8,12 +8,9 @@@ use Sabre\HTTP
/**
* Tests related to the PUT request.
*
- * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
+ * @copyright Copyright (C) 2007-2015 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://sabre.io/license/ Modified BSD License
- * @covers Sabre\DAV\Server::httpPut
- * @covers Sabre\DAV\Server::createFile
- * @covers Sabre\DAV\Server::checkPreconditions
*/
class HttpPutTest extends DAVServerTest {
--
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